¨4.0.1¨

Modules/Admin/Resources/views/components/page/index_table.blade.php

@@ -40,7 +40,7 @@
     @endpush
 
     @push('scripts')
-        <script>
+        <script type="module">
             @if (isset($buttons) && in_array('create', $buttons))
                 keypressAction([
                     { key: 'c', route: '{{ route("admin.{$resource}.create") }}'}
@@ -54,10 +54,10 @@
             Mousetrap.bind('backspace', function () {
                 $('.btn-delete').trigger('click');
             });
-
+            
             @isset($resource)
                 DataTable.setRoutes('#{{ $resource }}-table .table', {
-                    index: '{{ "admin.{$resource}.index" }}',
+                    table: '{{ "admin.{$resource}.table" }}',
                     edit: '{{ "admin.{$resource}.edit" }}',
                     destroy: '{{ "admin.{$resource}.destroy" }}',
                 });

Modules/Admin/Resources/views/dashboard/grids/total_customers.blade.php

@@ -1,8 +1,9 @@
 <div class="col-lg-3 col-md-6 col-sm-6">
     <div class="single-grid total-customers">
-        <h4>{{ trans('admin::dashboard.total_customers') }}</h4>
+        <i class="fa fa-users" aria-hidden="true"></i>
 
-        <i class="fa fa-users pull-left" aria-hidden="true"></i>
-        <span class="pull-right">{{ $totalCustomers }}</span>
+        <span class="title">{{ trans('admin::dashboard.total_customers') }}</span>
+
+        <span class="count">{{ $totalCustomers }}</span>
     </div>
 </div>

Modules/Admin/Resources/views/dashboard/grids/total_orders.blade.php

@@ -1,8 +1,9 @@
 <div class="col-lg-3 col-md-6 col-sm-6">
     <div class="single-grid total-orders">
-        <h4>{{ trans('admin::dashboard.total_orders') }}</h4>
+        <i class="fa fa-shopping-cart" aria-hidden="true"></i>
 
-        <i class="fa fa-shopping-cart pull-left" aria-hidden="true"></i>
-        <span class="pull-right">{{ $totalOrders }}</span>
+        <span class="title">{{ trans('admin::dashboard.total_orders') }}</span>
+
+        <span class="count">{{ $totalOrders }}</span>
     </div>
 </div>

Modules/Admin/Resources/views/dashboard/grids/total_products.blade.php

@@ -1,8 +1,9 @@
 <div class="col-lg-3 col-md-6 col-sm-6">
     <div class="single-grid total-products">
-        <h4>{{ trans('admin::dashboard.total_products') }}</h4>
-
         <i class="fa fa-cubes" aria-hidden="true"></i>
-        <span class="pull-right">{{ $totalProducts }}</span>
+
+        <span class="title">{{ trans('admin::dashboard.total_products') }}</span>
+
+        <span class="count">{{ $totalProducts }}</span>
     </div>
 </div>

Modules/Admin/Resources/views/dashboard/grids/total_sales.blade.php

@@ -1,8 +1,9 @@
 <div class="col-lg-3 col-md-6 col-sm-6">
     <div class="single-grid total-sales">
-        <h4>{{ trans('admin::dashboard.total_sales') }}</h4>
+        <i class="fa fa-money" aria-hidden="true"></i>
 
-        <i class="fa fa-money pull-left" aria-hidden="true"></i>
-        <span class="pull-right">{{ $totalSales->format() }}</span>
+        <span class="title">{{ trans('admin::dashboard.total_sales') }}</span>
+        
+        <span class="count">{{ $totalSales->format() }}</span>
     </div>
 </div>

Modules/Admin/Resources/views/dashboard/index.blade.php

@@ -3,7 +3,7 @@
 @section('title', trans('admin::dashboard.dashboard'))
 
 @section('content_header')
-    <h2 class="pull-left">{{ trans('admin::dashboard.dashboard') }}</h2>
+    <h3 class="pull-left">{{ trans('admin::dashboard.dashboard') }}</h3>
 @endsection
 
 @section('content')
@@ -44,3 +44,10 @@
         </div>
     </div>
 @endsection
+
+@push('globals')
+    @vite([
+        "Modules/Admin/Resources/assets/sass/dashboard.scss",
+        "Modules/Admin/Resources/assets/js/dashboard.js",
+    ])
+@endpush

Modules/Admin/Resources/views/dashboard/panels/latest_orders.blade.php

@@ -1,6 +1,6 @@
 <div class="dashboard-panel">
     <div class="grid-header">
-        <h4><i class="fa fa-shopping-cart" aria-hidden="true"></i>{{ trans('admin::dashboard.latest_orders') }}</h4>
+        <h5>{{ trans('admin::dashboard.latest_orders') }}</h5>
     </div>
 
     <div class="clearfix"></div>

Modules/Admin/Resources/views/dashboard/panels/latest_reviews.blade.php

@@ -1,6 +1,6 @@
 <div class="dashboard-panel">
     <div class="grid-header">
-        <h4><i class="fa fa-comments-o" aria-hidden="true"></i>{{ trans('admin::dashboard.latest_reviews') }}</h4>
+        <h5>{{ trans('admin::dashboard.latest_reviews') }}</h5>
     </div>
 
     <div class="clearfix"></div>

Modules/Admin/Resources/views/dashboard/panels/latest_search_terms.blade.php

@@ -1,6 +1,6 @@
 <div class="dashboard-panel">
     <div class="grid-header">
-        <h4><i class="fa fa-search" aria-hidden="true"></i>{{ trans('admin::dashboard.latest_search_terms') }}</h4>
+        <h5>{{ trans('admin::dashboard.latest_search_terms') }}</h5>
     </div>
 
     <div class="clearfix"></div>

Modules/Admin/Resources/views/dashboard/panels/sales_analytics.blade.php

@@ -1,8 +1,6 @@
-<div class="sales-analytics">
+<div class="dashboard-panel sales-analytics">
     <div class="grid-header clearfix">
-        <h4>
-            <i class="fa fa-bar-chart" aria-hidden="true"></i>{{ trans('admin::dashboard.sales_analytics_title') }}
-        </h4>
+        <h5>{{ trans('admin::dashboard.sales_analytics_title') }}</h5>
     </div>
 
     <div class="canvas">

Modules/Admin/Resources/views/layout.blade.php

@@ -1,60 +1,57 @@
 <!DOCTYPE html>
 <html lang="{{ locale() }}">
+    <head>
+        <base href="{{ url('/') }}">
+        <meta charset="UTF-8">
+        <meta name="csrf-token" content="{{ csrf_token() }}">
 
-<head>
-    <base href="{{ url('/') }}">
-    <meta charset="UTF-8">
-    <meta name="csrf-token" content="{{ csrf_token() }}">
+        <title>
+            @yield('title') - {{ setting('store_name') }} {{trans('admin::admin.admin')}}
+        </title>
 
-    <title>
-        @yield('title') - {{ setting('store_name') }} Admin
-    </title>
+        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
 
-    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+        <link rel="preconnect" href="https://fonts.googleapis.com">
+        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+        <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap" rel="stylesheet">
 
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:600|Roboto:400,500" rel="stylesheet">
+        @vite([
+            'Modules/Admin/Resources/assets/sass/main.scss',
+            'Modules/Admin/Resources/assets/js/main.js',
+            'Modules/Admin/Resources/assets/js/app.js'
+        ])
 
-    @foreach ($assets->allCss() as $css)
-        <link media="all" type="text/css" rel="stylesheet" href="{{ v($css) }}">
-    @endforeach
+        @stack('styles')
 
-    @stack('styles')
+        @include('admin::partials.globals')
+    </head>
 
-    @include('admin::partials.globals')
-</head>
+    <body class="skin-blue sidebar-mini offcanvas clearfix {{ is_rtl() ? 'rtl' : 'ltr' }}" dir>
+        <div class="left-side"></div>
 
-<body class="skin-blue sidebar-mini offcanvas clearfix {{ is_rtl() ? 'rtl' : 'ltr' }}">
-    <div class="left-side"></div>
+        @include('admin::partials.sidebar')
 
-    @include('admin::partials.sidebar')
+        <div class="wrapper">
+            <div class="content-wrapper">
+                @include('admin::partials.top_nav')
 
-    <div class="wrapper">
-        <div class="content-wrapper">
-            @include('admin::partials.top_nav')
+                <section class="content-header clearfix">
+                    @yield('content_header')
+                </section>
 
-            <section class="content-header clearfix">
-                @yield('content_header')
-            </section>
+                <section class="content">
+                    @include('admin::partials.notification')
 
-            <section class="content">
-                @include('admin::partials.notification')
+                    @yield('content')
+                </section>
 
-                @yield('content')
-            </section>
-
-            <div id="notification-toast"></div>
+                <div id="notification-toast"></div>
+            </div>
         </div>
-    </div>
 
-    @include('admin::partials.footer')
-
-    @include('admin::partials.confirmation_modal')
-
-    @foreach ($assets->allJs() as $js)
-        <script src="{{ v($js) }}"></script>
-    @endforeach
-
-    @stack('scripts')
-</body>
+        @include('admin::partials.footer')
+        @include('admin::partials.confirmation_modal')
 
+        @stack('scripts')
+    </body>
 </html>

Modules/Admin/Resources/views/partials/confirmation_modal.blade.php

@@ -6,7 +6,7 @@
                     <i class="fa fa-times" aria-hidden="true"></i>
                 </button>
 
-                <h3 class="modal-title">{{ trans('admin::admin.delete.confirmation') }}</h3>
+                <h4 class="modal-title">{{ trans('admin::admin.delete.confirmation') }}</h4>
             </div>
 
             <div class="modal-body">

Modules/Admin/Resources/views/partials/footer.blade.php

@@ -4,7 +4,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <a type="button" class="close" data-dismiss="modal" aria-label="Close">&times;</a>
-                <h4 class="modal-title">{{ trans('admin::admin.shortcuts.available_shortcuts') }}</h4>
+                <h5 class="modal-title">{{ trans('admin::admin.shortcuts.available_shortcuts') }}</h5>
             </div>
 
             <div class="modal-body">
@@ -21,7 +21,11 @@
 
 <footer class="main-footer">
     <div class="pull-right hidden-xs">
-        <span>v{{ fleetcart_version() }}</span>
+        <span>
+            <strong>
+                v{{ fleetcart_version() }}
+            </strong>
+        </span>
     </div>
 
     <a href="#" data-toggle="modal" data-target="#keyboard-shortcuts-modal">
@@ -30,6 +34,6 @@
 
     <span>
         Copyright &copy; {{ date('Y') }} <a href="{{ route('home') }}"
-            target="_blank">{{ setting('store_name') }}</a>
+            target="_blank"><strong>{{ setting('store_name') }}</strong></a>
     </span>
 </footer>

Modules/Admin/Resources/views/partials/globals.blade.php

@@ -12,7 +12,6 @@
 
     FleetCart.langs['admin::admin.buttons.delete'] = '{{ trans('admin::admin.buttons.delete') }}';
     FleetCart.langs['media::media.file_manager.title'] = '{{ trans('media::media.file_manager.title') }}';
-    FleetCart.langs['media::messages.image_has_been_added'] = '{{ trans('media::messages.image_has_been_added') }}';
 </script>
 
 @stack('globals')

Modules/Admin/Resources/views/partials/notification.blade.php

@@ -1,23 +1,18 @@
 @if (session()->has('success'))
-    <div class="alert alert-success fade in alert-dismissable clearfix">
+    <div class="alert alert-success fade in alert-dismissible clearfix">
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
 
-        <div class="alert-icon">
-            <i class="fa fa-check" aria-hidden="true"></i>
-        </div>
-
         <span class="alert-text">{{ session('success') }}</span>
     </div>
 @endif
 
 @if (session()->has('error'))
-    <div class="alert alert-danger fade in alert-dismissable clearfix">
+    <div class="alert alert-danger fade in alert-dismissible clearfix">
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
 
-        <div class="alert-icon">
-            <i class="fa fa-exclamation" aria-hidden="true"></i>
-        </div>
-
         <span class="alert-text">{{ session('error') }}</span>
     </div>
 @endif
+
+
+@stack('notifications')

Modules/Admin/Resources/views/partials/top_nav.blade.php

@@ -1,13 +1,17 @@
 <nav class="navbar navbar-static-top clearfix">
     <ul class="nav navbar-nav clearfix">
         <li class="visit-store hidden-sm hidden-xs">
-            <a href="{{ route('home') }}">
-                <i class="fa fa-desktop"></i>
+            <a href="{{ route('home') }}" target="_blank">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+                    <title>storefront-outline</title>
+                    <path d="M5.06 3C4.63 3 4.22 3.14 3.84 3.42S3.24 4.06 3.14 4.5L2.11 8.91C1.86 10 2.06 10.95 2.72 11.77L3 12.05V19C3 19.5 3.2 20 3.61 20.39S4.5 21 5 21H19C19.5 21 20 20.8 20.39 20.39S21 19.5 21 19V12.05L21.28 11.77C21.94 10.95 22.14 10 21.89 8.91L20.86 4.5C20.73 4.06 20.5 3.7 20.13 3.42C19.77 3.14 19.38 3 18.94 3H5.06M18.89 4.97L19.97 9.38C20.06 9.81 19.97 10.2 19.69 10.55C19.44 10.86 19.13 11 18.75 11C18.44 11 18.17 10.9 17.95 10.66C17.73 10.43 17.61 10.16 17.58 9.84L16.97 5L18.89 4.97M5.06 5H7.03L6.42 9.84C6.3 10.63 5.91 11 5.25 11C4.84 11 4.53 10.86 4.31 10.55C4.03 10.2 3.94 9.81 4.03 9.38L5.06 5M9.05 5H11V9.7C11 10.05 10.89 10.35 10.64 10.62C10.39 10.88 10.08 11 9.7 11C9.36 11 9.07 10.88 8.84 10.59S8.5 10 8.5 9.66V9.5L9.05 5M13 5H14.95L15.5 9.5C15.58 9.92 15.5 10.27 15.21 10.57C14.95 10.87 14.61 11 14.2 11C13.89 11 13.61 10.88 13.36 10.62C13.11 10.35 13 10.05 13 9.7V5M7.45 12.05C8.08 12.67 8.86 13 9.8 13C10.64 13 11.38 12.67 12 12.05C12.69 12.67 13.45 13 14.3 13C15.17 13 15.92 12.67 16.55 12.05C17.11 12.67 17.86 13 18.8 13H19.03V19H5V13H5.25C6.16 13 6.89 12.67 7.45 12.05Z" />
+                </svg>
+                
                 {{ trans('admin::admin.visit_store') }}
             </a>
         </li>
 
-        <li class="dropdown top-nav-menu pull-right">
+        <li class="user dropdown top-nav-menu pull-right">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                 <i class="fa fa-user-circle-o"></i><span>{{ $currentUser->first_name }}</span>
             </a>