Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development

packages/Webkul/Admin/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/admin.js": "/js/admin.js?id=023cc2617cd2c87483ac",
+    "/js/admin.js": "/js/admin.js?id=285294872bb45e4bbd10",
     "/css/admin.css": "/css/admin.css?id=a71a72c31d6ac0fe375f"
 }

packages/Webkul/Admin/src/Providers/AdminServiceProvider.php

@@ -72,6 +72,7 @@ class AdminServiceProvider extends ServiceProvider
                 if (! bouncer()->hasPermission($item['key'])) {
                     continue;
                 }
+
                 if ($index + 1 < count(config('menu.admin')) && $permissionType != 'all') {
                     $permission = config('menu.admin')[$index + 1];
 

packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php

@@ -10,8 +10,4 @@
             </li>
         @endforeach
     </ul>
-
-    {{-- <div class="open-nav-aside">
-        <i class="icon angle-right-icon open-icon"></i>
-    </div> --}}
 </div>

packages/Webkul/Admin/webpack.mix.js

@@ -12,7 +12,7 @@ mix.disableNotifications();
 
 mix.js(__dirname + "/src/Resources/assets/js/app.js", "js/admin.js")
     .copyDirectory( __dirname + '/src/Resources/assets/images', publicPath + '/images')
-    .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/admin.css")
+    .sass(__dirname + "/src/Resources/assets/scss/app.scss", "css/admin.css")
     .options({
         processCssUrls: false
     });

packages/Webkul/Shop/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/shop.js": "/js/shop.js?id=412d129ed770afb5dee3",
+    "/js/shop.js": "/js/shop.js?id=7019dbe8734e305c1885",
     "/css/shop.css": "/css/shop.css?id=068329de73da5012af0d"
 }

packages/Webkul/Shop/webpack.mix.js

@@ -12,7 +12,7 @@ mix.disableNotifications();
 
 mix.js([__dirname + "/src/Resources/assets/js/app.js"], "js/shop.js")
     .copyDirectory(__dirname + "/src/Resources/assets/images", publicPath + "/images")
-    .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/shop.css")
+    .sass(__dirname + "/src/Resources/assets/scss/app.scss", "css/shop.css")
     .options({
         processCssUrls: false
     });

packages/Webkul/Ui/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/ui.js": "/js/ui.js?id=0219a3829322d1811a09",
-    "/css/ui.css": "/css/ui.css?id=60a9d7816658e7caaf81"
-}
+    "/js/ui.js": "/js/ui.js?id=15e57b2241e111fc53cf",
+    "/css/ui.css": "/css/ui.css?id=4182d1885ef5a460a94d"
+}

packages/Webkul/Ui/src/Resources/assets/scss/app.scss

@@ -41,7 +41,22 @@ h1 {
 }
 
 h2 {
-    font-size: 18px;
+    font-size: 24px;
+    color: $font-color;
+}
+
+h3 {
+    font-size: 20px;
+    color: $font-color;
+}
+
+h4 {
+    font-size: 16px;
+    color: $font-color;
+}
+
+h5 {
+    font-size: 12px;
     color: $font-color;
 }
 

packages/Webkul/Ui/webpack.mix.js

@@ -20,7 +20,7 @@ mix.js(
     "js/ui.js"
 )
     .copy(__dirname + "/src/Resources/assets/images", publicPath + "/images")
-    .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/ui.css")
+    .sass(__dirname + "/src/Resources/assets/scss/app.scss", "css/ui.css")
     .options({
         processCssUrls: false
     });

packages/Webkul/User/src/Http/Middleware/Bouncer.php

@@ -29,8 +29,6 @@ class Bouncer
 
     public function checkIfAuthorized($request)
     {
-        // dd(auth()->guard('admin')->user()->role);
-
         if (! $role = auth()->guard('admin')->user()->role)
             abort(401, 'This action is unauthorized.');