optimized ui/ux of menus and customer

pull/49/head
A1Gard 4 months ago
parent 9332f1e9d2
commit e9402cac80

@ -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")}}

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

@ -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>

@ -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;
}
}

@ -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())

@ -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;
}
}
}

Loading…
Cancel
Save