Merge pull request #434 from nasirkhan/update

Backend sidebar toggle issue fixed
nasirkhan · Jun 30, 2023 · 14da040 · 14da040
2 parents 0b070d0 + 0bc26a0
commit 14da040
Show file tree

Hide file tree

Showing 16 changed files with 244 additions and 242 deletions.
diff --git a/Modules/Article/Http/Controllers/Backend/CategoriesController.php b/Modules/Article/Http/Controllers/Backend/CategoriesController.php
@@ -9,7 +9,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Modules\Article\Http\Requests\Backend\CategoriesRequest;
 use Yajra\DataTables\DataTables;

diff --git a/Modules/Article/Http/Controllers/Backend/PostsController.php b/Modules/Article/Http/Controllers/Backend/PostsController.php
@@ -9,7 +9,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Modules\Article\Entities\Category;
 use Modules\Article\Events\PostCreated;

diff --git a/Modules/Comment/Http/Controllers/Backend/CommentsController.php b/Modules/Comment/Http/Controllers/Backend/CommentsController.php
@@ -9,7 +9,6 @@
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Modules\Comment\Http\Requests\Backend\CommentsRequest;
 use Modules\Comment\Notifications\NewCommentAdded;

diff --git a/Modules/Comment/Http/Controllers/Frontend/CommentsController.php b/Modules/Comment/Http/Controllers/Frontend/CommentsController.php
@@ -8,7 +8,6 @@
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Modules\Comment\Http\Requests\Frontend\CommentsRequest;
 use Modules\Comment\Notifications\NewCommentAdded;

diff --git a/app/Http/Controllers/Auth/SocialLoginController.php b/app/Http/Controllers/Auth/SocialLoginController.php
@@ -63,7 +63,7 @@ public function handleProviderCallback($provider)
     /**
      * Return user if exists; create and return if doesn't.
      *
-     * @param $githubUser
+     * @param  $githubUser
      * @return User
      */
     private function findOrCreateUser($socialUser, $provider)

diff --git a/app/Http/Controllers/Backend/BackendBaseController.php b/app/Http/Controllers/Backend/BackendBaseController.php
@@ -7,7 +7,6 @@
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Yajra\DataTables\DataTables;
 

diff --git a/app/Http/Middleware/GenerateMenus.php b/app/Http/Middleware/GenerateMenus.php
@@ -3,7 +3,6 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Illuminate\Support\Facades\Request;
 
 class GenerateMenus
 {

diff --git a/app/helpers.php b/app/helpers.php
@@ -1,8 +1,5 @@
 <?php
 
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-
 /*
  * Global helpers file with misc functions.
  */

diff --git a/public/build/assets/app-backend-0aaea569.js → public/build/assets/app-backend-3c0c863b.js b/public/build/assets/app-backend-0aaea569.js → public/build/assets/app-backend-3c0c863b.js
diff --git a/public/build/assets/app-frontend-38fcff6a.css b/public/build/assets/app-frontend-38fcff6a.css
diff --git a/public/build/assets/app-frontend-63396793.js b/public/build/assets/app-frontend-63396793.js
diff --git a/public/build/manifest.json b/public/build/manifest.json
@@ -32,17 +32,20 @@
     "src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.woff2"
   },
   "resources/css/app-frontend.css": {
-    "file": "assets/app-frontend-fbb9abd7.css",
+    "file": "assets/app-frontend-38fcff6a.css",
+
     "isEntry": true,
     "src": "resources/css/app-frontend.css"
   },
   "resources/js/app-backend.js": {
-    "file": "assets/app-backend-0aaea569.js",
+    "file": "assets/app-backend-3c0c863b.js",
     "isEntry": true,
     "src": "resources/js/app-backend.js"
   },
   "resources/js/app-frontend.js": {
-    "file": "assets/app-frontend-5f2a059f.js",
+
+    "file": "assets/app-frontend-63396793.js",
+
     "isEntry": true,
     "src": "resources/js/app-frontend.js"
   },

diff --git a/resources/js/app-backend.js b/resources/js/app-backend.js
@@ -1,5 +1,6 @@
 // Import all of CoreUI's CSS
-import * as coreui from '@coreui/coreui'
+import * as coreui from '@coreui/coreui';
+window.coreui = coreui;
 
 import "/node_modules/simplebar/dist/simplebar.min.js";
 import "/resources/js/laravel.js";

diff --git a/resources/views/backend/includes/sidebar.blade.php b/resources/views/backend/includes/sidebar.blade.php
@@ -1,15 +1,9 @@
 <div class="sidebar sidebar-dark sidebar-fixed" id="sidebar">
     <div class="sidebar-brand d-none d-md-flex">
-        <a href="{{route("backend.dashboard")}}">
-            <img class="sidebar-brand-full" src="{{asset("img/backend-logo.jpg")}}" height="46" alt="{{ app_name() }}">
-            <img class="sidebar-brand-narrow" src="{{asset("img/backend-logo-square.jpg")}}" height="46" alt="{{ app_name() }}">
+        <a href="{{route('backend.dashboard')}}">
+            <img class="sidebar-brand-full" src="{{asset('img/backend-logo.jpg')}}" height="46" alt="{{ app_name() }}">
+            <img class="sidebar-brand-narrow" src="{{asset('img/backend-logo-square.jpg')}}" height="46" alt="{{ app_name() }}">
         </a>
-        <!-- <svg class="sidebar-brand-full" width="118" height="46" alt="CoreUI Logo">
-            <use xlink:href="assets/brand/coreui.svg#full"></use>
-        </svg>
-        <svg class="sidebar-brand-narrow" width="46" height="46" alt="CoreUI Logo">
-            <use xlink:href="assets/brand/coreui.svg#signet"></use>
-        </svg> -->
     </div>
 
     {!! $admin_sidebar->asUl( ['class' => 'sidebar-nav', 'data-coreui'=>'navigation', 'data-simplebar'], ['class' => 'nav-group-items'] ) !!}

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -6,7 +6,6 @@ module.exports = {
         './storage/framework/views/*.php',
         './resources/views/**/*.blade.php',
         './Modules/**/Resources/views/**/*.blade.php',
-
     ],
 
     theme: {

diff --git a/yarn.lock b/yarn.lock