Add global cache site settings

MilesPong · Jul 13, 2017 · cb78ed5 · cb78ed5
1 parent f7d9a32
commit cb78ed5
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 15 deletions.
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
@@ -14,4 +14,27 @@ class Setting extends Model
      * @var array
      */
     protected $fillable = ['key', 'value', 'tag'];
+
+    /**
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param string $tag
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeTag($query, $tag = null)
+    {
+        if (is_null($tag)) {
+            return $query;
+        }
+
+        return $query->where('tag', $tag);
+    }
+
+    /**
+     * @param null $tag
+     * @return mixed
+     */
+    public function formatData($tag = null)
+    {
+        return $this->tag($tag)->pluck('value', 'key')->toArray();
+    }
 }
diff --git a/app/Observers/SettingObserver.php b/app/Observers/SettingObserver.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Setting;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * Class TagObserver
+ * @package App\Observers
+ */
+class SettingObserver extends BaseObserver
+{
+    /**
+     * @param Setting $setting
+     */
+    public function saved(Setting $setting)
+    {
+        Cache::forget($this->cacheHelper->keySiteSettings());
+    }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -4,10 +4,15 @@
 
 use App\Models\Category;
 use App\Models\Post;
+use App\Models\Setting;
 use App\Models\Tag;
 use App\Observers\CategoryObserver;
 use App\Observers\PostObserver;
+use App\Observers\SettingObserver;
 use App\Observers\TagObserver;
+use App\Repositories\Contracts\SettingRepository;
+use App\Services\CacheHelper;
+use Illuminate\Contracts\Container\Container;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\ServiceProvider;
 
@@ -27,6 +32,13 @@ public function boot()
         Post::observe(PostObserver::class);
         Tag::observe(TagObserver::class);
         Category::observe(CategoryObserver::class);
+        Setting::observe(SettingObserver::class);
+
+        $this->app->singleton('settings', function (Container $app) {
+            return $app['cache']->rememberForever(CacheHelper::keySiteSettings(), function () use ($app) {
+                return $app->make(SettingRepository::class)->siteSettings();
+            });
+        });
     }
 
     /**

diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php
@@ -26,12 +26,6 @@ public function boot()
         View::composer('widgets.tag', TagsComposer::class);
         View::composer('widgets.hot', HotPostsComposer::class);
         View::composer('partials.comment', CommentComposer::class);
-        View::composer('layouts.app', function (\Illuminate\View\View $view) {
-            $view->with([
-                'keywords' => '',
-                'description' => ''
-            ]);
-        });
     }
 
     /**

diff --git a/app/Repositories/Contracts/SettingRepository.php b/app/Repositories/Contracts/SettingRepository.php
@@ -8,5 +8,9 @@
  */
 interface SettingRepository extends RepositoryInterface
 {
-
+    /**
+     * @param null $tag
+     * @return mixed
+     */
+    public function siteSettings($tag = null);
 }
diff --git a/app/Repositories/Eloquent/SettingRepositoryEloquent.php b/app/Repositories/Eloquent/SettingRepositoryEloquent.php
@@ -18,4 +18,17 @@ public function model()
     {
         return Setting::class;
     }
+
+    /**
+     * @param null $tag
+     * @return array|mixed
+     */
+    public function siteSettings($tag = null)
+    {
+        if (method_exists($this->model, $method = 'formatData')) {
+            return call_user_func_array([$this->model, $method], [$tag]);
+        }
+
+        return [];
+    }
 }
diff --git a/app/Services/CacheHelper.php b/app/Services/CacheHelper.php
@@ -150,4 +150,12 @@ public function keyPaginate($table)
     {
         return sprintf(self::KEY_FORMAT, $table, 'paginate-' . request()->input('page', 1));
     }
+
+    /**
+     * @return string
+     */
+    public static function keySiteSettings()
+    {
+        return 'site.settings';
+    }
 }
diff --git a/app/helpers.php b/app/helpers.php
@@ -83,3 +83,13 @@ function isAdmin()
         return auth()->check() && auth()->user()->isAdmin();
     }
 }
+
+if (!function_exists('setting')) {
+    /**
+     * @param $key
+     * @return mixed
+     */
+    function setting($key) {
+        return array_get(app('settings'), $key);
+    }
+}
diff --git a/resources/views/categories/show.blade.php b/resources/views/categories/show.blade.php
@@ -4,8 +4,8 @@
     {{ $category->name }} | @parent
 @endsection
 
-@section('keywords'){!! $category->name !!}@endsection
-@section('description'){!! $category->description !!}@endsection
+@section('keywords'){{ $category->name }}@endsection
+@section('description'){{ $category->description }}@endsection
 
 @section('content')
     @component('components.header')

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -15,8 +15,8 @@
 
     <title>@section('title'){{ config('app.name', 'Laravel') }}@show</title>
 
-    <meta name="keywords" content="@section('keywords'){{ $keywords or '' }}@show">
-    <meta name="description" content="@section('description'){{ $description or '' }}@show">
+    <meta name="keywords" content="@section('keywords'){{ setting('keywords') }}@show">
+    <meta name="description" content="@section('description'){{ setting('description') }}@show">
 
     {{--<!--Import Google Icon Font-->--}}
     {{--<link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">--}}

diff --git a/resources/views/posts/show.blade.php b/resources/views/posts/show.blade.php
@@ -4,8 +4,8 @@
 {{ $post->title }} | @parent
 @endsection
 
-@section('keywords'){!! $post->tags->implode('name', ',') !!}@endsection
-@section('description'){!! $post->description !!}@endsection
+@section('keywords'){{ $post->tags->implode('name', ',') }}@endsection
+@section('description'){{ $post->description }}@endsection
 
 @section('content')
     @component('components.header')

diff --git a/resources/views/tags/show.blade.php b/resources/views/tags/show.blade.php
@@ -4,8 +4,8 @@
     {{ $tag->name }} | @parent
 @endsection
 
-@section('keywords'){!! $tag->name !!}@endsection
-@section('description'){!! $tag->description !!}@endsection
+@section('keywords'){{ $tag->name }}@endsection
+@section('description'){{ $tag->description }}@endsection
 
 @section('content')
     @component('components.header')