optimized ui/ux of menus and customer

resources/views/segments/customer/AvisaCustomer/AvisaCustomer.blade.php

@@ -226,7 +226,7 @@
                                        class="btn btn-outline-primary btn-sm ">
                                         <i class="ri-eye-line"></i>
                                     </a>
-                                    @if($inv->status != 'COMPLETED' && $inv->created_at->timestamp <  (time() - 3600) )
+                                    @if($inv->status != 'COMPLETED' && $inv->created_at->timestamp >  (time() - 3600) )
                                         <a href="#" class="btn btn-outline-primary btn-sm ms-2">
                                             <i class="ri-secure-payment-line"></i>
                                             {{__("Pay now")}}

resources/views/segments/index/InlineMap/InlineMap.js

@@ -1,33 +1,37 @@
 import L from 'leaflet';
 
-var map,marker ;
+var map, marker;
-window.addEventListener('load',function () {
+window.addEventListener('load', function () {
+    try {
 
-    // delete L.icon.default.prototype._getIconUrl ;
+        // delete L.icon.default.prototype._getIconUrl ;
-    if (!import.meta.env.DEV){
+        if (!import.meta.env.DEV) {
-        L.Icon.Default.mergeOptions({
+            L.Icon.Default.mergeOptions({
-            iconRetinaUrl: "/assets/vendor/leaflet/marker-icon-2x.png",
+                iconRetinaUrl: "/assets/vendor/leaflet/marker-icon-2x.png",
-            iconUrl: "/assets/vendor/leaflet/marker-icon.png",
+                iconUrl: "/assets/vendor/leaflet/marker-icon.png",
-            shadowUrl: "/assets/vendor/leaflet/marker-shadow.png"
+                shadowUrl: "/assets/vendor/leaflet/marker-shadow.png"
-        });
+            });
-    }
+        }
-    if (document.querySelectorAll('#mapContainer').length != 0) {
+        if (document.querySelectorAll('#mapContainer').length != 0) {
-        const lat = parseFloat(document.querySelector('#maplat').value);
+            const lat = parseFloat(document.querySelector('#maplat').value);
-        const lng = parseFloat(document.querySelector('#maplng').value);
+            const lng = parseFloat(document.querySelector('#maplng').value);
-        const zoom = parseInt(document.querySelector('#mapzoom').value);
+            const zoom = parseInt(document.querySelector('#mapzoom').value);
-        map = L.map(document.querySelector('#mapContainer')).setView([lat, lng], zoom);
+            map = L.map(document.querySelector('#mapContainer')).setView([lat, lng], zoom);
 
-        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-            attribution: '© openstreetmap',
+                attribution: '© openstreetmap',
-            attributionControl: false,
+                attributionControl: false,
-        }).addTo(map);
+            }).addTo(map);
 
-        map.attributionControl.setPrefix('xShop');
+            map.attributionControl.setPrefix('xShop');
 
-        if (this.marker) {
+            if (this.marker) {
-            map.removeLayer(marker);
+                map.removeLayer(marker);
-        }
+            }
 
-        marker = L.marker({lat: lat, lng: lng}).addTo(map);
+            marker = L.marker({lat: lat, lng: lng}).addTo(map);
+        }
+    } catch {
     }
+
 });

resources/views/segments/menu/AplMenu/AplMenu.blade.php

@@ -86,7 +86,7 @@
                 <i class="ri-search-line"></i>
             </a>
         </li>
-        <li>
+        <li class="icon-menu">
             <a href="{{route('client.card')}}">
                 <i class="ri-shopping-bag-2-line"></i>
                 <span class="badge bg-danger card-count">
@@ -96,6 +96,19 @@
                 </span>
             </a>
         </li>
+        @if(auth('customer')->check())
+        <li class="icon-menu">
+            <a href="{{route('client.profile')}}">
+                <i class="ri-user-line"></i>
+            </a>
+        </li>
+        @else
+        <li class="icon-menu">
+            <a href="{{route('client.sign-in')}}">
+                <i class="ri-user-line"></i>
+            </a>
+        </li>
+        @endif
         <li id="toggler-menu" class="icon-menu">
             <a href="#">
                 <i class="ri-menu-line"></i>

resources/views/segments/menu/AplMenu/AplMenu.scss

@@ -36,6 +36,7 @@
         margin: 0 auto;
 
         > li {
+            flex: 1;
             color: white;
             text-align: center;
             height: 47px;
@@ -98,6 +99,10 @@
                 display: block;
                 padding: .7rem 0;
             }
+
+            &.icon-menu{
+                flex-grow: .4;
+            }
         }
     }
 
@@ -150,4 +155,6 @@
     ~header{
         margin-top: 44px;
     }
+
+
 }

resources/views/segments/menu/RecetMenu/RecetMenu.blade.php

@@ -21,6 +21,16 @@
                     @endif
                 </span>
             </a>
+
+        @if(auth('customer')->check())
+                <a href="{{route('client.profile')}}"  class="d-inline-block px-1 card-link">
+                    <i class="ri-user-line"></i>
+                </a>
+        @else
+                <a href="{{route('client.sign-in')}}"  class="d-inline-block px-1 card-link">
+                    <i class="ri-user-line"></i>
+                </a>
+        @endif
             @if(config('app.xlang.active'))
                 @foreach(\App\Models\XLang::all() as $lang)
                     @if($lang->tag != app()->getLocale())

resources/views/segments/menu/RecetMenu/RecetMenu.scss

@@ -21,7 +21,7 @@
                 padding:  1rem;
                 color: black;
                 &:hover{
-                    color: var(--xshop-primary);
+                    color: var(--xshop-secondary);
                 }
             }
             &:first-child{
@@ -34,7 +34,7 @@
             padding: 5px !important;
             margin: 0;
             i{
-                font-size: 25px;
+                font-size: 22px;
             }
         }
 }