Merge branch 'develop'

Author: samberrry

src/Controllers/BinshopsAdminController.php

@@ -3,6 +3,8 @@
 namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
+use BinshopsBlog\Laravel\Fulltext\Search;
+use BinshopsBlog\Models\BinshopsCategory;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use BinshopsBlog\Interfaces\BaseRequestInterface;
@@ -46,7 +48,6 @@ public function __construct()
         }
     }
 
-
     /**
      * View all posts
      *
@@ -469,4 +470,34 @@ protected function check_if_same_post_exists($slug, $lang_id, $post_id){
             return false;
         }
     }
+
+    /**
+     * Show the search results for $_GET['s']
+     *
+     * @param Request $request
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws \Exception
+     */
+    public function searchBlog(Request $request)
+    {
+        if (!config("binshopsblog.search.search_enabled")) {
+            throw new \Exception("Search is disabled");
+        }
+        $query = $request->get("s");
+        $search = new Search();
+        $search_results = $search->run($query);
+
+        \View::share("title", "Search results for " . e($query));
+
+        $rootList = BinshopsCategory::roots()->get();
+        BinshopsCategory::loadSiblingsWithList($rootList);
+
+        $language_id = $request->get('language_id');
+
+        return view("binshopsblog_admin::index", [
+            'search' => true,
+            'post_translations'=>$search_results,
+            'language_id' => $language_id
+        ]);
+    }
 }

src/Views/binshopsblog_admin/index.blade.php

@@ -1,10 +1,22 @@
 @extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
+    @if($post_translations)
+        <div class='search-form-outer mb-3'>
+            <form method='get' action='{{route("binshopsblog.admin.searchblog", app('request')->get('locale'))}}' class='text-center'>
+                <input style="display: inline-block; width: 50%" type='text' name='s' placeholder='Search...' class='form-control' value='{{\Request::get("s")}}'>
+                <input style="display: inline-block" type='submit' value='Search' class='btn btn-primary m-2'>
+            </form>
+        </div>
 
-    <h5>Admin - Manage Blog Posts</h5>
+        <h5>Manage Blog Posts</h5>
+    @endif
 
     @forelse($post_translations as $post)
+        @if(isset($post->indexable))
+            <?php $post = $post->indexable; ?>
+        @endif
+
         <div class="card m-4" style="">
             <div class="card-body">
                 <h5 class='card-title'><a class="a-link-cart-color" href='{{$post->url(app('request')->get('locale'))}}'>{{$post->title}}</a></h5>
@@ -91,11 +103,12 @@
             </div>
         </div>
     @empty
-        <div class='alert alert-warning'>No posts to show you. Why don't you add one?</div>
-    @endforelse
-
-    {{--    <div class='text-center'>--}}
-    {{--        {{$posts->appends( [] )->links()}}--}}
-    {{--    </div>--}}
+        @if(empty($search))
+            <h5>Manage Blog Posts</h5>
 
+            <div class='alert alert-warning'>No posts to show you. Why don't you add one?</div>
+        @else
+            <div class='alert alert-warning'>There were no results for this search!</div>
+        @endif
+    @endforelse
 @endsection

src/routes.php

@@ -50,6 +50,10 @@
     /* Admin backend routes - CRUD for posts, categories, and approving/deleting submitted comments */
     Route::group(['prefix' => config('binshopsblog.admin_prefix', 'blog_admin')], function () {
 
+        Route::get('/search',
+            'BinshopsAdminController@searchBlog')
+            ->name('binshopsblog.admin.searchblog');
+
         Route::get('/setup', 'BinshopsAdminSetupController@setup')
             ->name('binshopsblog.admin.setup');