Merge pull request bagisto#7707 from jitendra-webkul/2.0.0

Changed flash vue component name, Category header fixed

packages/Webkul/Shop/src/Resources/views/components/flash-group/index.blade.php

@@ -1,7 +1,7 @@
-<flash-group ref='flashes'></flash-group>
+<v-flash-group ref='flashes'></v-flash-group>
 
 @pushOnce('scripts')
-    <script type="text/x-template" id="flash-group-template">
+    <script type="text/x-template" id="v-flash-group-template">
         <transition-group
             tag='div'
             name="flash-group"
@@ -12,8 +12,8 @@ class='grid gap-[10px] fixed top-[20px] right-[20px] z-[1]'
     </script>
 
     <script type="module">
-        app.component('flash-group', {
-            template: '#flash-group-template',
+        app.component('v-flash-group', {
+            template: '#v-flash-group-template',
 
             data() {
                 return {

packages/Webkul/Shop/src/Resources/views/components/flash-group/item.blade.php

@@ -1,12 +1,12 @@
-<flash-item
+<v-flash-item
     v-for='flash in flashes'
     :key='flash.uid'
     :flash="flash"
     @onRemove="remove($event)"
-></flash-item>
+></v-flash-item>
 
 @pushOnce('scripts')
-    <script type="text/x-template" id="flash-item-template">
+    <script type="text/x-template" id="v-flash-item-template">
         <div
             class="flex gap-[46px] justify-between px-[20px] py-[12px] rounded-[8px] max-w-[408px]"
             :style="typeStyles[flash.type]['container']"
@@ -27,8 +27,8 @@ class="icon-cancel cursor-pointer max-h-[16px] max-w-[16px]"
     </script>
 
     <script type="module">
-        app.component('flash-item', {
-            template: '#flash-item-template',
+        app.component('v-flash-item', {
+            template: '#v-flash-item-template',
 
             props: ['flash'],
 

packages/Webkul/Shop/src/Resources/views/components/layouts/header/desktop/bottom.blade.php

@@ -48,27 +48,29 @@ class="bs-logo bg-[position:-5px_-3px] bs-main-sprite w-[131px] h-[29px] inline-
                             class="hidden group-hover:block max-h-[580px] max-w-[1260px] overflow-auto overflow-x-auto -left-[35px] w-max absolute top-[54px] bg-white p-[35px] border border-b-0 border-l-0 border-r-0 border-t-[1px] border-[#F3F3F3]"
                         >
                             <div class="flex aigns gap-x-[70px] justify-between">
-                                <div class="grid grid-cols-[1fr] gap-[20px] content-start w-full flex-auto min-w-max max-w-[150px]">
-                                    @foreach ($firstLevelCategory->children as $secondLevelCategory)
-                                        <p class="text-navyBlue font-medium">
-                                            <a href="{{ $secondLevelCategory->url }}">
-                                                {{ $secondLevelCategory->name }}
-                                            </a>
-                                        </p>
-
-                                        @if ($secondLevelCategory->children->isNotEmpty())
-                                            <ul class="grid grid-cols-[1fr] gap-[12px]">
-                                                @foreach ($secondLevelCategory->children as $thirdLevelCategory)
-                                                    <li class="text-[14px] font-medium text-[#7D7D7D]">
-                                                        <a href="{{ $thirdLevelCategory->url }}">
-                                                            {{ $thirdLevelCategory->name }}
-                                                        </a>
-                                                    </li>
-                                                @endforeach
-                                            </ul>
-                                        @endif
-                                    @endforeach
-                                </div>
+                                @foreach ($firstLevelCategory->children->chunk(2) as $pair)
+                                    <div class="grid grid-cols-[1fr] gap-[20px] content-start w-full flex-auto min-w-max max-w-[150px]">
+                                        @foreach ($pair as $secondLevelCategory)
+                                            <p class="text-navyBlue font-medium">
+                                                <a href="{{ $secondLevelCategory->url }}">
+                                                    {{ $secondLevelCategory->name }}
+                                                </a>
+                                            </p>
+
+                                            @if ($secondLevelCategory->children->isNotEmpty())
+                                                <ul class="grid grid-cols-[1fr] gap-[12px]">
+                                                    @foreach ($secondLevelCategory->children as $thirdLevelCategory)
+                                                        <li class="text-[14px] font-medium text-[#7D7D7D]">
+                                                            <a href="{{ $thirdLevelCategory->url }}">
+                                                                {{ $thirdLevelCategory->name }}
+                                                            </a>
+                                                        </li>
+                                                    @endforeach
+                                                </ul>
+                                            @endif
+                                        @endforeach
+                                    </div>
+                                @endforeach
                             </div>
                         </div>
                     @endif

packages/Webkul/Shop/src/Resources/views/components/shimmer/image/index.blade.php

@@ -0,0 +1,49 @@
+{{-- <x-shop::shimmer.image
+    class="rounded-sm bg-[#F5F5F5] group-hover:scale-105 transition-all duration-300 w-[291px] h-[300px]"
+    width="291"
+    height="300"
+    ::src="product.base_image.medium_image_url"
+></x-shop::shimmer.image> --}}
+
+
+<v-shimmer-image {{ $attributes }}>
+    <div {{ $attributes->merge(['class' => 'shimmer']) }}>
+    </div>
+</v-shimmer-image>
+
+@pushOnce('scripts')
+    <script type="text/x-template" id="v-shimmer-image-template">
+        <div
+            class="shimmer"
+            v-bind="$attrs"
+            v-show="isLoading"
+        >
+        </div>
+
+        <img
+            v-bind="$attrs"
+            :src="src"
+            @load="onLoad"
+            v-show="! isLoading"
+        >
+    </script>
+
+    <script type="module">
+        app.component('v-shimmer-image', {
+            template: '#v-shimmer-image-template',
+
+            props: ['src'],
+
+            data() {
+                return {
+                    isLoading: true,
+                };
+            },
+            methods: {
+                onLoad() {
+                    this.isLoading = false;
+                },
+            },
+        });
+    </script>
+@endPushOnce

public/themes/default/build/manifest.json

@@ -1,6 +1,6 @@
 {
   "src/Resources/assets/css/app.css": {
-    "file": "assets/app-1b775506.css",
+    "file": "assets/app-ceacc114.css",
     "isEntry": true,
     "src": "src/Resources/assets/css/app.css"
   },
@@ -209,7 +209,7 @@
     "src": "src/Resources/assets/images/womens.png"
   },
   "src/Resources/assets/js/app.js": {
-    "file": "assets/app-319e4a6f.js",
+    "file": "assets/app-e74e3f41.js",
     "isEntry": true,
     "src": "src/Resources/assets/js/app.js"
   }