enabled delete confirmation in settings, post queries optimized, ext-mbstring required

Famaxis · Famaxis · commit 5e2bb0a8ba93 · 2021-03-06T00:26:40.000+05:00
diff --git a/app/Http/Controllers/Backend/SettingController.php b/app/Http/Controllers/Backend/SettingController.php
@@ -20,6 +20,7 @@ public function update()
         $settings->update([
             'site_name'        => request('site_name'),
             'comments_allowed' => request('comments_allowed'),
+            'confirm_deletion' => request('confirm_deletion'),
             'main_template'    => request('main_template'),
         ]);
 
diff --git a/app/Http/Controllers/Frontend/PostController.php b/app/Http/Controllers/Frontend/PostController.php
@@ -14,7 +14,7 @@ public function index()
         $currentPage = isset($_GET['page']) ? (int)$_GET['page'] : 1;
         $posts = cache()->remember('index-posts-' . $currentPage, 86400, function () {
             return Post::published()
-                ->with('comments:post_id')
+                ->withCount('comments')
                 ->with('tagged')
                 ->orderBy('created_at', 'desc')
                 ->paginate(5)
@@ -33,11 +33,12 @@ public function fetchByTag(Tag $tag)
     {
         $slug = $tag->slug;
         $posts = Post::withAnyTag([$slug])
-            ->with('comments:post_id')
+            ->withCount('comments')
             ->published()
             ->orderBy('created_at', 'desc')
             ->with('tagged')
-            ->paginate(5);
+            ->paginate(5)
+            ->onEachSide(1);
 
         return view('frontend.posts.index', compact('posts', 'tag'));
     }
diff --git a/app/Http/Controllers/Frontend/ResourceController.php b/app/Http/Controllers/Frontend/ResourceController.php
@@ -8,11 +8,13 @@
 
 class ResourceController extends Controller
 {
+    // is requested slug relevant to post or page?
     public function show($request)
     {
         if (Post::where('slug', $request)->first()) {
             $resource = Post::where('slug', $request)
                 ->with('comments.user')
+                ->with('tagged')
                 ->first();
             return $this->showPost($resource);
         }
@@ -22,33 +24,29 @@ public function show($request)
             return $this->showPage($resource);
         }
 
+        // if there is no resource with this slug
         return abort('404');
     }
 
     public function showPost($resource)
     {
-        // optimizing queries number
-        if ($resource->tagNames()) {
-            $tags = Post::existingTags()->pluck('name');
-        } else {
-            $tags = [];
-        }
-
-        $next = Post::where('id', '>', $resource->id)
+        $next = Post::select(['slug'])
+            ->where('id', '>', $resource->id)
             ->published()
             ->oldest('id')
             ->first();
-        $prev = Post::where('id', '<', $resource->id)
+        $prev = Post::select(['slug'])
+            ->where('id', '<', $resource->id)
             ->published()
             ->latest('id')
             ->first();
 
         // view for custom template
         if ($resource->custom_template) {
-            return view('frontend.posts.single-custom', compact('resource', 'next', 'prev', 'tags'));
+            return view('frontend.posts.single-custom', compact('resource', 'next', 'prev'));
         }
         // view for default template
-        return view('frontend.posts.single', compact('resource', 'next', 'prev', 'tags'));
+        return view('frontend.posts.single', compact('resource', 'next', 'prev'));
     }
 
     public function showPage($resource)
@@ -58,8 +56,7 @@ public function showPage($resource)
             // for common templates
             $next = null;
             $prev = null;
-            $tags = null;
-            return view('frontend.pages.single-custom', compact('resource', 'next', 'prev', 'tags'));
+            return view('frontend.pages.single-custom', compact('resource', 'next', 'prev'));
         }
         // view for default template
         return view('frontend.pages.single', compact('resource'));
diff --git a/app/Services/MetadataHandler.php b/app/Services/MetadataHandler.php
@@ -50,7 +50,6 @@ public static function generateFirstSentence($contents, $description)
         }
         // if there is nothing that we can extract, set the default value
         return 'Post';
-
     }
 
     public static function prepareFirstSentence ($contents, $description)
@@ -66,9 +65,7 @@ public static function prepareFirstSentence ($contents, $description)
         $contents = strip_tags($contents);
 
         // removing some possible misprints
-        $contents = str_replace(" .", ".", $contents);
-        $contents = str_replace(" ?", "?", $contents);
-        $contents = str_replace(" !", "!", $contents);
+        $contents = str_replace([" .", " ?", " !"], [".", "?", "!"], $contents);
 
         // first sentence from the content
         if (preg_match('/^.*[^\s](\.|\?|\!)/U', $contents, $match)) {
diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.4|^8.0",
+        "ext-mbstring": "*",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
diff --git a/database/migrations/2021_01_26_124947_create_settings_table.php b/database/migrations/2021_01_26_124947_create_settings_table.php
@@ -18,6 +18,7 @@ public function up()
             $table->string('site_name')->default('My blog');
             $table->string('main_template')->default('blue');
             $table->boolean('comments_allowed')->default(true)->nullable();
+            $table->boolean('confirm_deletion')->default(false)->nullable();
         });
     }
 
diff --git a/database/seeders/SettingSeeder.php b/database/seeders/SettingSeeder.php
@@ -13,6 +13,7 @@ public function run()
             'site_name'        => 'My blog',
             'main_template'    => 'blue',
             'comments_allowed' => true,
+            'confirm_deletion' => false,
         ]);
     }
 }
diff --git a/public/css/style.css b/public/css/style.css
@@ -130,7 +130,7 @@ header.container {
 .settings {
     border-bottom: 1px solid var(--darker-optional) !important;
     width: fit-content;
-    padding: 1rem !important;
+    padding: 0.5rem !important;
 }
 
 .mini-heading {
diff --git a/resources/views/backend/pages/index.blade.php b/resources/views/backend/pages/index.blade.php
@@ -26,7 +26,11 @@
                     <form action="{{route('pages.destroy', $page->slug)}}" method="POST">
                         @method('DELETE')
                         @csrf
-                        <button type="submit" class="paper-btn btn-danger-outline">Delete</button>
+                        <button type="submit" class="paper-btn btn-danger-outline"
+                                @if($settings->confirm_deletion)
+                                onclick="return confirm('Are you sure?')"
+                                @endif
+                        >Delete</button>
                     </form>
                 </td>
             </tr>
diff --git a/resources/views/backend/posts/index.blade.php b/resources/views/backend/posts/index.blade.php
@@ -37,7 +37,11 @@ class="unpublished"
                     <form action="{{route('posts.destroy', $post->slug)}}" method="POST">
                         @method('DELETE')
                         @csrf
-                        <button type="submit" class="paper-btn btn-danger-outline" onclick="return confirm('Are you sure?')">Delete</button>
+                        <button type="submit" class="paper-btn btn-danger-outline"
+                                @if($settings->confirm_deletion)
+                                onclick="return confirm('Are you sure?')"
+                                @endif
+>Delete</button>
                     </form>
                 </td>
             </tr>
diff --git a/resources/views/backend/settings.blade.php b/resources/views/backend/settings.blade.php
@@ -13,19 +13,31 @@
         <fieldset class="form-group settings">
             <label class="paper-switch-2">
                 <input id="comments_allowed" name="comments_allowed" type="checkbox" value="1"
-                       @if($settings->comments_allowed)
-                       checked
-                       @endif
+                        {{ ($settings->comments_allowed) ? 'checked' : '' }}
                 />
                 <span class="paper-switch-slider round"></span>
             </label>
             <label for="comments_allowed" class="paper-switch-2-label">
                 Allow comments?
             </label>
+            <p class="annotation">Existing comments still will be shown.</p>
         </fieldset>
 
         <fieldset class="form-group settings">
-            <legend>Pick a color theme:</legend>
+            <label class="paper-switch-2">
+                <input id="confirm_deletion" name="confirm_deletion" type="checkbox" value="1"
+                        {{ ($settings->confirm_deletion) ? 'checked' : '' }}
+                />
+                <span class="paper-switch-slider round"></span>
+            </label>
+            <label for="confirm_deletion" class="paper-switch-2-label">
+                Confirm deletion?
+            </label>
+            <p class="annotation">This is about posts, pages and templates. Not the comments.</p>
+        </fieldset>
+
+        <fieldset class="form-group settings">
+            <legend>Pick a main color theme:</legend>
             <label for="blue" class="paper-radio">
                 <input type="radio" name="main_template" id="blue" value="blue" {{ ($settings->main_template==='blue')? "checked" : "" }} >
                 <span>Blue</span>
diff --git a/resources/views/backend/templates/index.blade.php b/resources/views/backend/templates/index.blade.php
@@ -28,7 +28,11 @@
                     <form action="{{route('templates.destroy', $template->id)}}" method="POST">
                         @method('DELETE')
                         @csrf
-                        <button type="submit" class="paper-btn btn-danger-outline">Delete</button>
+                        <button type="submit" class="paper-btn btn-danger-outline"
+                                @if($settings->confirm_deletion)
+                                onclick="return confirm('Are you sure?')"
+                                @endif
+                        >Delete</button>
                     </form>
                 </td>
             </tr>
diff --git a/resources/views/frontend/pages/single-custom.blade.php b/resources/views/frontend/pages/single-custom.blade.php
@@ -14,7 +14,7 @@
 @endsection
 
 @section('content')
-    @include('templates/' . $resource->template->file, compact('resource', 'tags', 'next', 'prev'))
+    @include('templates/' . $resource->template->file, compact('resource', 'next', 'prev'))
 @endsection
 
 @section('scripts')
diff --git a/resources/views/frontend/posts/index.blade.php b/resources/views/frontend/posts/index.blade.php
@@ -5,6 +5,7 @@
         @if(Route::current()->getName() === 'front.posts.fetch')
             <h2>Posts tagged with {!! $tag->name !!}</h2>
         @endif
+
             @foreach($posts as $post)
 
                 <div class="border border-primary row flex-edges margin padding-large
@@ -45,9 +46,8 @@
                         </p>
 
 
-                            @if($post->comments->count())
-                                <p><a href="{{ route('front.resource.show', $post->slug) . '#comments' }}">Comments: {{ $post->comments->count() }}</a></p>
-
+                            @if($post->comments_count)
+                                <p><a href="{{ route('front.resource.show', $post->slug) . '#comments' }}">Comments: {{ $post->comments_count }}</a></p>
                             @endif
 
 
diff --git a/resources/views/frontend/posts/single-custom.blade.php b/resources/views/frontend/posts/single-custom.blade.php
@@ -14,7 +14,7 @@
 @endsection
 
 @section('content')
-    @include('templates/' . $resource->template->file, compact('resource', 'tags', 'next', 'prev'))
+    @include('templates/' . $resource->template->file, compact('resource', 'next', 'prev'))
 @endsection
 
 @section('scripts')
diff --git a/resources/views/frontend/posts/single.blade.php b/resources/views/frontend/posts/single.blade.php
@@ -42,9 +42,9 @@
             <a href="{{ route('front.posts') }}">On main page</a>
         </p>
 
-        @foreach($resource->tags as $tag)
+        @foreach($resource->tagged as $tagged)
             <a class="paper-btn btn-small"
-               href="{{ route('front.posts.fetch', $tag->slug) }}">{{ $tag->name }}</a>
+               href="{{ route('front.posts.fetch', $tagged->tag_slug) }}">{{ $tagged->tag_name }}</a>
         @endforeach
         <hr class="margin-large">
 
diff --git a/resources/views/layouts/frontend.blade.php b/resources/views/layouts/frontend.blade.php
@@ -3,7 +3,6 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-
 @yield('meta')
 
 <!-- CSRF Token -->

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public function up()`
`18`	`18`	`$table->string('site_name')->default('My blog');`
`19`	`19`	`$table->string('main_template')->default('blue');`
`20`	`20`	`$table->boolean('comments_allowed')->default(true)->nullable();`
	`21`	`+ $table->boolean('confirm_deletion')->default(false)->nullable();`
`21`	`22`	`});`
`22`	`23`	`}`
`23`	`24`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public function run()`
`13`	`13`	`'site_name' => 'My blog',`
`14`	`14`	`'main_template' => 'blue',`
`15`	`15`	`'comments_allowed' => true,`
	`16`	`+ 'confirm_deletion' => false,`
`16`	`17`	`]);`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ header.container {`
`130`	`130`	`.settings {`
`131`	`131`	`border-bottom: 1px solid var(--darker-optional) !important;`
`132`	`132`	`width: fit-content;`
`133`		`- padding: 1rem !important;`
	`133`	`+ padding: 0.5rem !important;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`.mini-heading {`