Merge pull request #246 from viralsolani/develop

Merge Develop to master

Author: viralsolani

README.md

@@ -54,6 +54,9 @@ Generate a new application key
 
     php artisan key:generate
 
+Generate a new JWT secret key (If you want to use API)
+    php artisan jwt:secret
+
 Generate a new JWT authentication secret key
 
     php artisan jwt:secret
@@ -79,7 +82,7 @@ For generating the files of unisharp file manager
     php artisan vendor:publish --tag=lfm_public
 
 For linking storage folder in public
-    
+
     php artisan storage:link
 
 Start the local development server

app/Http/Breadcrumbs/Backend/Access.php

@@ -1,16 +1,16 @@
 <?php
 
-Breadcrumbs::register('admin.blogcategories.index', function ($breadcrumbs) {
+Breadcrumbs::register('admin.blogCategories.index', function ($breadcrumbs) {
     $breadcrumbs->parent('admin.dashboard');
-    $breadcrumbs->push(trans('menus.backend.blogcategories.management'), route('admin.blogcategories.index'));
+    $breadcrumbs->push(trans('menus.backend.blogcategories.management'), route('admin.blogCategories.index'));
 });
 
-Breadcrumbs::register('admin.blogcategories.create', function ($breadcrumbs) {
-    $breadcrumbs->parent('admin.blogcategories.index');
-    $breadcrumbs->push(trans('menus.backend.blogcategories.create'), route('admin.blogcategories.create'));
+Breadcrumbs::register('admin.blogCategories.create', function ($breadcrumbs) {
+    $breadcrumbs->parent('admin.blogCategories.index');
+    $breadcrumbs->push(trans('menus.backend.blogcategories.create'), route('admin.blogCategories.create'));
 });
 
-Breadcrumbs::register('admin.blogcategories.edit', function ($breadcrumbs, $id) {
-    $breadcrumbs->parent('admin.blogcategories.index');
-    $breadcrumbs->push(trans('menus.backend.blogcategories.edit'), route('admin.blogcategories.edit', $id));
+Breadcrumbs::register('admin.blogCategories.edit', function ($breadcrumbs, $id) {
+    $breadcrumbs->parent('admin.blogCategories.index');
+    $breadcrumbs->push(trans('menus.backend.blogcategories.edit'), route('admin.blogCategories.edit', $id));
 });

app/Http/Breadcrumbs/Backend/Blog_Category.php

@@ -1,16 +1,16 @@
 <?php
 
-Breadcrumbs::register('admin.blogtags.index', function ($breadcrumbs) {
+Breadcrumbs::register('admin.blogTags.index', function ($breadcrumbs) {
     $breadcrumbs->parent('admin.dashboard');
-    $breadcrumbs->push(trans('menus.backend.blogtags.management'), route('admin.blogtags.index'));
+    $breadcrumbs->push(trans('menus.backend.blogtags.management'), route('admin.blogTags.index'));
 });
 
-Breadcrumbs::register('admin.blogtags.create', function ($breadcrumbs) {
-    $breadcrumbs->parent('admin.blogtags.index');
-    $breadcrumbs->push(trans('menus.backend.blogtags.create'), route('admin.blogtags.create'));
+Breadcrumbs::register('admin.blogTags.create', function ($breadcrumbs) {
+    $breadcrumbs->parent('admin.blogTags.index');
+    $breadcrumbs->push(trans('menus.backend.blogtags.create'), route('admin.blogTags.create'));
 });
 
-Breadcrumbs::register('admin.blogtags.edit', function ($breadcrumbs, $id) {
-    $breadcrumbs->parent('admin.blogtags.index');
-    $breadcrumbs->push(trans('menus.backend.blogtags.edit'), route('admin.blogtags.edit', $id));
+Breadcrumbs::register('admin.blogTags.edit', function ($breadcrumbs, $id) {
+    $breadcrumbs->parent('admin.blogTags.index');
+    $breadcrumbs->push(trans('menus.backend.blogtags.edit'), route('admin.blogTags.edit', $id));
 });

app/Http/Breadcrumbs/Backend/Blog_Tag.php

@@ -32,9 +32,11 @@ public function __construct(BlogCategoriesRepository $repository)
     public function index(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
+        $orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
+        $sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
 
         return BlogCategoriesResource::collection(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 

app/Http/Controllers/Api/V1/BlogCategoriesController.php

@@ -30,9 +30,11 @@ public function __construct(BlogTagsRepository $repository)
     public function index(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
+        $orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
+        $sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
 
         return BlogTagsResource::collection(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 

app/Http/Controllers/Api/V1/BlogTagsController.php

@@ -30,9 +30,11 @@ public function __construct(BlogsRepository $repository)
     public function index(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
+        $orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
+        $sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
 
         return BlogsResource::collection(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 

app/Http/Controllers/Api/V1/BlogsController.php

@@ -30,9 +30,11 @@ public function __construct(UserRepository $repository)
     public function index(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
+        $orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
+        $sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
 
         return UserResource::collection(
-            $this->repository->getForDataTable(0, false)->paginate($limit)
+            $this->repository->getForDataTable(0, false)->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 }

app/Http/Controllers/Api/V1/DeactivatedUsersController.php

@@ -30,9 +30,11 @@ public function __construct(UserRepository $repository)
     public function index(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
+        $orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
+        $sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
 
         return UserResource::collection(
-            $this->repository->getForDataTable(0, true)->paginate($limit)
+            $this->repository->getForDataTable(0, true)->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }
 }

app/Http/Controllers/Api/V1/DeletedUsersController.php

@@ -30,9 +30,11 @@ public function __construct(FaqsRepository $repository)
     public function index(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
+        $orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
+        $sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
 
         return FaqsResource::collection(
-            $this->repository->getForDataTable()->paginate($limit)
+            $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
         );
     }