Zones -Add features

shopperlabs · Apr 26, 2024 · 1cddc0e · 1cddc0e
1 parent 3afdb5c
commit 1cddc0e
Show file tree

Hide file tree

Showing 72 changed files with 54,433 additions and 1,832 deletions.
diff --git a/packages/admin/config/components/setting.php b/packages/admin/config/components/setting.php
@@ -25,6 +25,7 @@
         'payment' => Pages\Settings\Payment::class,
         'team-index' => Pages\Settings\Team\Index::class,
         'team-roles' => Pages\Settings\Team\RolePermission::class,
+        'zones' => Pages\Settings\Zones::class,
     ],
 
     /*
@@ -48,8 +49,10 @@
         'settings.legal.form' => Components\Settings\Legal\PolicyForm::class,
         'settings.team.permissions' => Components\Settings\Team\Permissions::class,
         'settings.team.users' => Components\Settings\Team\UsersRole::class,
+        'settings.zones.detail' => Components\Settings\Zones\Detail::class,
 
         'slide-overs.create-team-member' => Livewire\SlideOvers\CreateTeamMember::class,
+        'slide-overs.zone-form' => Livewire\SlideOvers\ZoneForm::class,
     ],
 
 ];
diff --git a/packages/admin/config/settings.php b/packages/admin/config/settings.php
@@ -18,47 +18,54 @@
 
     'items' => [
         [
-            'name' => 'General',
-            'description' => 'View and update your store information.',
+            'name' => 'shopper::pages/settings/menu.general',
+            'description' => 'shopper::pages/settings/menu.general_description',
             'icon' => 'untitledui-sliders',
             'route' => 'shopper.settings.shop',
             'permission' => null,
         ],
         [
-            'name' => 'Staff & permissions',
-            'description' => 'View and manage what staff can see or do in your store.',
+            'name' => 'shopper::pages/settings/menu.staff',
+            'description' => 'shopper::pages/settings/menu.staff_description',
             'icon' => 'untitledui-shield-separator',
             'route' => 'shopper.settings.users',
             'permission' => null,
         ],
         [
-            'name' => 'Locations',
-            'description' => 'Manage the places you stock inventory and sell products.',
+            'name' => 'shopper::pages/settings/menu.location',
+            'description' => 'shopper::pages/settings/menu.location_description',
             'icon' => 'untitledui-marker-pin-flag',
             'route' => 'shopper.settings.inventories',
             'permission' => null,
         ],
         //        [
-        //            'name' => 'Analytics',
-        //            'description' => 'Get a better understanding of where your traffic is coming from.',
+        //            'name' => 'shopper::pages/settings/menu.analytic',
+        //            'description' => 'shopper::pages/settings/menu.analytic_description',
         //            'icon' => 'untitledui-pie-chart',
         //            'route' => 'shopper.settings.analytics',
         //            'permission' => null,
         //        ],
         [
-            'name' => 'Payment methods',
-            'description' => 'Add different payment methods for your customers.',
+            'name' => 'shopper::pages/settings/menu.payment',
+            'description' => 'shopper::pages/settings/menu.payment_description',
             'icon' => 'untitledui-coins-hand',
             'route' => 'shopper.settings.payments',
             'permission' => null,
         ],
         [
-            'name' => 'Legal',
-            'description' => "Manage your store's legal pages such as privacy, terms.",
+            'name' => 'shopper::pages/settings/menu.legal',
+            'description' => 'shopper::pages/settings/menu.legal_description',
             'icon' => 'untitledui-file-lock-02',
             'route' => 'shopper.settings.legal',
             'permission' => null,
         ],
+        [
+            'name' => 'shopper::pages/settings/menu.zone',
+            'description' => 'shopper::pages/settings/menu.zone_description',
+            'icon' => 'untitledui-globe-05',
+            'route' => 'shopper.settings.zones',
+            'permission' => null,
+        ],
     ],
 
 ];
diff --git a/packages/admin/package.json b/packages/admin/package.json
@@ -30,6 +30,7 @@
     "prettier-plugin-blade": "^2",
     "prettier-plugin-tailwindcss": "^0.5.10",
     "resolve-url-loader": "^2.3.1",
+    "shiki": "^1.3.0",
     "sortablejs": "^1.15.0",
     "tailwindcss": "^3.4.1"
   },

diff --git a/packages/admin/public/shopper.css b/packages/admin/public/shopper.css
@@ -3535,6 +3535,14 @@ html {
   position: sticky;
 }
 
+.-inset-2 {
+  inset: -0.5rem;
+}
+
+.-inset-2\.5 {
+  inset: -0.625rem;
+}
+
 .inset-0 {
   inset: 0px;
 }
@@ -3625,10 +3633,6 @@ html {
   top: 2.5rem;
 }
 
-.top-14 {
-  top: 3.5rem;
-}
-
 .top-16 {
   top: 4rem;
 }
@@ -3681,18 +3685,10 @@ html {
   grid-column: var(--col-span-default);
 }
 
-.col-span-2 {
-  grid-column: span 2 / span 2;
-}
-
 .col-span-3 {
   grid-column: span 3 / span 3;
 }
 
-.col-span-6 {
-  grid-column: span 6 / span 6;
-}
-
 .col-span-full {
   grid-column: 1 / -1;
 }
@@ -4346,6 +4342,10 @@ html {
   width: 100vw;
 }
 
+.w-1\/4 {
+  width: 25%;
+}
+
 .min-w-0 {
   min-width: 0px;
 }
@@ -5152,6 +5152,10 @@ html {
   overflow-y: hidden;
 }
 
+.overflow-x-scroll {
+  overflow-x: scroll;
+}
+
 .overflow-y-scroll {
   overflow-y: scroll;
 }
@@ -5786,6 +5790,11 @@ html {
   padding-right: 1.5rem;
 }
 
+.px-8 {
+  padding-left: 2rem;
+  padding-right: 2rem;
+}
+
 .py-0 {
   padding-top: 0px;
   padding-bottom: 0px;
@@ -6543,6 +6552,11 @@ html {
   --tw-ring-color: rgb(220 38 38 / var(--tw-ring-opacity));
 }
 
+.ring-gray-100 {
+  --tw-ring-opacity: 1;
+  --tw-ring-color: rgba(var(--gray-100), var(--tw-ring-opacity));
+}
+
 .ring-gray-100\/50 {
   --tw-ring-color: rgba(var(--gray-100), 0.5);
 }
@@ -9211,6 +9225,18 @@ dark .treeselect-list__item--checked,
   padding: 2px 4px 2px 40px;
 }
 
+.shiki {
+  --tw-bg-opacity: 1 !important;
+  background-color: rgba(var(--gray-50), var(--tw-bg-opacity)) !important;
+  padding: 1rem;
+}
+
+html.dark .shiki,
+html.dark .shiki span {
+  color: var(--shiki-dark) !important;
+  background-color: var(--shiki-dark-bg) !important;
+}
+
 :is(.dark .dark\:prose-invert) {
   --tw-prose-body: var(--tw-prose-invert-body);
   --tw-prose-headings: var(--tw-prose-invert-headings);
@@ -10007,6 +10033,11 @@ dark .treeselect-list__item--checked,
   color: rgb(59 130 246 / var(--tw-text-opacity));
 }
 
+:is(.dark .dark\:text-primary-700) {
+  --tw-text-opacity: 1;
+  color: rgb(29 78 216 / var(--tw-text-opacity));
+}
+
 :is(.dark .dark\:text-red-400) {
   --tw-text-opacity: 1;
   color: rgb(248 113 113 / var(--tw-text-opacity));
@@ -10461,10 +10492,6 @@ dark .treeselect-list__item--checked,
     height: 2.5rem;
   }
 
-  .sm\:h-12 {
-    height: 3rem;
-  }
-
   .sm\:h-screen {
     height: 100vh;
   }
@@ -10473,14 +10500,6 @@ dark .treeselect-list__item--checked,
     width: 2.5rem;
   }
 
-  .sm\:w-12 {
-    width: 3rem;
-  }
-
-  .sm\:w-64 {
-    width: 16rem;
-  }
-
   .sm\:w-\[calc\(100\%\+3rem\)\] {
     width: calc(100% + 3rem);
   }
@@ -10698,10 +10717,6 @@ dark .treeselect-list__item--checked,
     padding: 2.5rem;
   }
 
-  .sm\:p-5 {
-    padding: 1.25rem;
-  }
-
   .sm\:p-6 {
     padding: 1.5rem;
   }
@@ -10991,6 +11006,14 @@ dark .treeselect-list__item--checked,
 }
 
 @media (min-width: 1024px) {
+  .lg\:sticky {
+    position: sticky;
+  }
+
+  .lg\:top-4 {
+    top: 1rem;
+  }
+
   .lg\:top-\[3\.8rem\] {
     top: 3.8rem;
   }
@@ -11011,10 +11034,6 @@ dark .treeselect-list__item--checked,
     grid-column: span 3 / span 3;
   }
 
-  .lg\:col-span-4 {
-    grid-column: span 4 / span 4;
-  }
-
   .lg\:col-start-\[--col-start-lg\] {
     grid-column-start: var(--col-start-lg);
   }
@@ -11239,6 +11258,14 @@ dark .treeselect-list__item--checked,
     border-top-width: 0px;
   }
 
+  .lg\:p-5 {
+    padding: 1.25rem;
+  }
+
+  .lg\:p-6 {
+    padding: 1.5rem;
+  }
+
   .lg\:px-0 {
     padding-left: 0px;
     padding-right: 0px;
@@ -11286,6 +11313,10 @@ dark .treeselect-list__item--checked,
     padding-bottom: 0.375rem;
   }
 
+  .lg\:pr-4 {
+    padding-right: 1rem;
+  }
+
   .lg\:pt-10 {
     padding-top: 2.5rem;
   }

diff --git a/packages/admin/public/shopper.js b/packages/admin/public/shopper.js
diff --git a/packages/admin/resources/css/components/shiki.css b/packages/admin/resources/css/components/shiki.css
@@ -0,0 +1,9 @@
+.shiki {
+  @apply p-4 !bg-gray-50;
+}
+
+html.dark .shiki,
+html.dark .shiki span {
+  color: var(--shiki-dark) !important;
+  background-color: var(--shiki-dark-bg) !important;
+}
diff --git a/packages/admin/resources/css/shopper.css b/packages/admin/resources/css/shopper.css
@@ -7,6 +7,7 @@
 @import 'components/filament.css';
 @import 'components/intl-phone.css';
 @import 'components/treeselect.css';
+@import 'components/shiki.css';
 
 @layer base {
     html {

diff --git a/packages/admin/resources/js/components/code-preview.js b/packages/admin/resources/js/components/code-preview.js
@@ -0,0 +1,25 @@
+import { codeToHtml } from 'shiki'
+
+const CodePreview = ({ code, lang, themes }) => {
+    return {
+        code,
+        lang,
+        themes,
+        previewCode: null,
+
+        async init() {
+            this.previewCode = await codeToHtml(this.code, {
+                lang,
+                themes: this.themes,
+            })
+
+            this.$el.innerHTML = this.previewCode
+        },
+
+        destroy() {
+            this.previewCode = null
+        },
+    }
+}
+
+export default CodePreview
diff --git a/packages/admin/resources/js/index.js b/packages/admin/resources/js/index.js
@@ -1,9 +1,11 @@
 import SlideOverPanel from './components/panel'
 import SelectTree from './components/select-tree'
+import CodePreview from './components/code-preview'
 import './components/sortable'
 
 window.SlideOverPanel = SlideOverPanel
 window.selectTree = SelectTree
+window.codePreview = CodePreview
 
 document.addEventListener('alpine:init', () => {
     const theme = localStorage.getItem('theme') ?? 'system'

diff --git a/packages/admin/resources/lang/en.json b/packages/admin/resources/lang/en.json
diff --git a/packages/admin/resources/lang/en/forms.php b/packages/admin/resources/lang/en/forms.php
@@ -45,6 +45,7 @@
         'street_address' => 'Street Address',
         'street_address_plus' => 'Apartment, suite, etc.',
         'country' => 'Country',
+        'countries' => 'Countries',
         'city' => 'City',
         'postal_code' => 'Postal / Zip code',
         'photo' => 'Picture',
@@ -136,6 +137,7 @@
         'select_inventory' => 'Select inventory',
         'choose_currency' => 'Choose currency',
         'select_country' => 'Choose a Country',
+        'select_countries' => 'Choose countries',
         'search_by' => 'Search by :label',
         'leave_comment' => 'Leave notes for this customer',
         'search_payment' => 'Search payment by provider name',