From 82d8171ca1e34ae93cdc060cd3deebd16cef9575 Mon Sep 17 00:00:00 2001
From: amit kumar laravel <amitkumar.laravel358@webkul.in>
Date: Thu, 24 Aug 2023 20:49:28 +0530
Subject: [PATCH] :ambulance: Datagrid Code Cleaning

---
 .../Admin/src/Resources/lang/en/app.php       |  15 ++-
 .../email-marketing/events/index.blade.php    |  34 ++++--
 .../subscribers/index.blade.php               |  32 ++++--
 .../views/marketing/sitemaps/index.blade.php  | 105 +++++++++++++++++-
 .../views/settings/currencies/index.blade.php |  28 +++--
 .../settings/exchange_rates/index.blade.php   |  32 ++++--
 .../views/settings/locales/index.blade.php    |  38 +++++--
 7 files changed, 221 insertions(+), 63 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 99878e36bc8..591cef8d0c0 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -534,6 +534,7 @@
                 'last-delete-error' => 'At least one Locale is required.',
 
                 'datagrid' => [
+                    'actions'   => 'Actions',
                     'id'        => 'ID',
                     'name'      => 'Name',
                     'code'      => 'Code',
@@ -565,11 +566,12 @@
                 'create-btn' => 'Create Currency',
 
                 'datagrid' => [
-                    'id'     => 'ID',
-                    'name'   => 'Name',
-                    'code'   => 'Code',
-                    'edit'   => 'Edit',
-                    'delete' => 'Delete',
+                    'id'      => 'ID',
+                    'name'    => 'Name',
+                    'code'    => 'Code',
+                    'edit'    => 'Edit',
+                    'delete'  => 'Delete',
+                    'actions' => 'Actions',
                 ],
 
                 'create' => [
@@ -620,6 +622,7 @@
                     'exchange-rate' => 'Exchange Rate',
                     'edit'          => 'Edit',
                     'delete'        => 'Delete',
+                    'actions'       => 'Actions',
                 ],
             ],
         ],
@@ -1727,6 +1730,7 @@
                         'date'      => 'Date',
                         'edit'      => 'Edit',
                         'delete'    => 'Delete',
+                        'actions'   => 'Actions',
 
                     ],
 
@@ -1757,6 +1761,7 @@
                         'edit'        => 'Edit',
                         'delete'      => 'Delete',
                         'email'       => 'Email',
+                        'actions'     => 'Actions',
                     ],
 
                     'edit'  => [
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/index.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/index.blade.php
index 5caf8b9d97f..322644f4578 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/index.blade.php
@@ -18,8 +18,8 @@
             </div>
         </div>
 
-        {{-- Added For Shimmer --}}
-        <x-admin::datagrid src="{{ route('admin.events.index') }}"></x-admin::datagrid>
+        {{-- DataGrid Shimmer --}}
+        <x-admin::shimmer.datagrid></x-admin::shimmer.datagrid>
     </v-events>
 
     @pushOnce('scripts')
@@ -51,31 +51,41 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                 <!-- Datagrid Header -->
                 <template #header="{ columns, records, sortPage}">
                     <div class="row grid grid-cols-4 grid-rows-1 gap-[10px] items-center px-[16px] py-[10px] border-b-[1px] text-gray-600 bg-gray-50 font-semibold">
+                        <!-- Id -->
                         <div
-                            class="cursor-pointer"
+                            class="flex gap-[10px] cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'id'))"
                         >
-                            <div class="flex gap-[10px]">
-                                <p class="text-gray-600">ID</p>
-                            </div>
+                            <p class="text-gray-600">
+                                @lang('admin::app.marketing.email-marketing.events.index.datagrid.id')
+                            </p>
                         </div>
-        
+
+                        <!-- Name -->
                         <div
                             class="cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'name'))"
                         >
-                            <p class="text-gray-600">Name</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.marketing.email-marketing.events.index.datagrid.name')
+                            </p>
                         </div>
-        
+
+                        <!-- Date -->
                         <div
                             class="cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'date'))"
                         >
-                            <p class="text-gray-600">Date</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.marketing.email-marketing.events.index.datagrid.date')
+                            </p>
                         </div>
-        
+
+                        <!-- Actions -->
                         <div class="cursor-pointer flex justify-end">
-                            <p class="text-gray-600">Actions</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.marketing.email-marketing.events.index.datagrid.actions')
+                            </p>
                         </div>
                     </div>
                 </template>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/index.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/index.blade.php
index fc09a02f0df..2afd92878b0 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/index.blade.php
@@ -11,8 +11,8 @@
     </div>
 
     <v-subscribers>
-        {{-- Added For Shimmer --}}
-        <x-admin::datagrid></x-admin::datagrid>
+        {{-- DataGrid Shimmer --}}
+        <x-admin::shimmer.datagrid></x-admin::shimmer.datagrid>
     </v-subscribers>
 
     @pushOnce('scripts')
@@ -26,31 +26,41 @@
                     <!-- DataGrid Header -->
                     <template #header="{ columns, records, sortPage}">
                         <div class="row grid grid-cols-4 grid-rows-1 gap-[10px] items-center px-[16px] py-[10px] border-b-[1px] text-gray-600 bg-gray-50 font-semibold">
+                            <!-- Id -->
                             <div
-                                class="cursor-pointer"
+                                class="flex gap-[10px] cursor-pointer"
                                 @click="sortPage(columns.find(column => column.index === 'id'))"
                             >
-                                <div class="flex gap-[10px]">
-                                    <p class="text-gray-600">ID</p>
-                                </div>
+                                <p class="text-gray-600">
+                                    @lang('admin::app.marketing.email-marketing.newsletters.index.datagrid.id')
+                                </p>
                             </div>
             
+                            <!-- Status -->
                             <div
                                 class="cursor-pointer"
                                 @click="sortPage(columns.find(column => column.index === 'status'))"
                             >
-                                <p class="text-gray-600">Subscribed</p>
+                                <p class="text-gray-600">
+                                    @lang('admin::app.marketing.email-marketing.newsletters.index.datagrid.subscribed')
+                                </p>
                             </div>
-            
+
+                            <!-- Email -->
                             <div
                                 class="cursor-pointer"
                                 @click="sortPage(columns.find(column => column.index === 'email'))"
                             >
-                                <p class="text-gray-600">Email</p>
+                                <p class="text-gray-600">
+                                    @lang('admin::app.marketing.email-marketing.newsletters.index.datagrid.email')
+                                </p>
                             </div>
-            
+
+                            <!-- Actions -->
                             <div class="cursor-pointer flex justify-end">
-                                <p class="text-gray-600">Actions</p>
+                                <p class="text-gray-600">
+                                    @lang('admin::app.marketing.email-marketing.newsletters.index.datagrid.actions')
+                                </p>
                             </div>
                         </div>
                     </template>
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/index.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/index.blade.php
index da7adce71be..d331c43a98b 100644
--- a/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/index.blade.php
@@ -5,7 +5,22 @@
     </x-slot:title>
 
     {{-- Create Sitemap Vue Component --}}
-    <v-create-sitemaps><v-create-sitemaps/>
+    <v-create-sitemaps>
+        <div class="flex gap-[16px] justify-between items-center max-sm:flex-wrap">
+            <p class="text-[20px] text-gray-800 font-bold">
+                @lang('admin::app.marketing.sitemaps.index.title')
+            </p>
+
+            <!-- Create Button -->
+            <div class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-gray-50 font-semibold cursor-pointer">
+                @lang('admin::app.marketing.sitemaps.create.create-btn')
+            </div>
+        </div>
+
+        {{-- Added For Shimmer --}}
+        {{-- <x-admin::datagrid></x-admin::datagrid> --}}
+        <x-admin::shimmer.datagrid></x-admin::shimmer.datagrid>
+    <v-create-sitemaps/>
     
     @pushOnce('scripts')
         <script 
@@ -17,7 +32,7 @@
                     @lang('admin::app.marketing.sitemaps.index.title')
                 </p>
 
-                <!-- Cancel Button -->
+                <!-- Create Button -->
                 <div 
                     class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-gray-50 font-semibold cursor-pointer"
                     @click="$refs.sitemap.toggle()"
@@ -26,7 +41,91 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                 </div>
             </div>
 
-            <x-admin::datagrid src="{{ route('admin.sitemaps.index') }}"></x-admin::datagrid>
+            <x-admin::datagrid
+                src="{{ route('admin.sitemaps.index') }}"
+                ref="datagrid"
+            >
+                <!-- Datagrid Header -->
+                <template #header="{ columns, records, sortPage, applied }">
+                    <div class="row grid grid-cols-5 grid-rows-1 gap-[10px] items-center px-[16px] py-[10px] border-b-[1px] text-gray-600 bg-gray-50 font-semibold">
+                        <div
+                            class="cursor-pointer"
+                            @click="sortPage(columns.find(column => column.index === 'id'))"
+                        >
+                            <div class="flex gap-[10px]">
+                                <p class="text-gray-600">ID</p>
+                            </div>
+                        </div>
+        
+                        <div
+                            class="cursor-pointer"
+                            @click="sortPage(columns.find(column => column.index === 'name'))"
+                        >
+                            <p class="text-gray-600">File name</p>
+                        </div>
+        
+                        <div
+                            class="cursor-pointer"
+                            @click="sortPage(columns.find(column => column.index === 'date'))"
+                        >
+                            <p class="text-gray-600">Path</p>
+                        </div>
+        
+                        <div
+                            class="cursor-pointer"
+                            @click="sortPage(columns.find(column => column.index === 'date'))"
+                        >
+                            <p class="text-gray-600">Link for Google</p>
+                        </div>
+
+                        <div class="cursor-pointer flex justify-end">
+                            <p class="text-gray-600">Actions</p>
+                        </div>
+                    </div>
+                </template>
+
+                <!-- DataGrid Body -->
+                <template #body="{ columns, records }">
+                    <div
+                        v-for="record in records"
+                        class="row grid gap-[10px] items-center px-[16px] py-[16px] border-b-[1px] border-gray-300 text-gray-600 transition-all hover:bg-gray-100"
+                        style="grid-template-columns: repeat(5, 1fr);"
+                    >
+                        <!-- Id -->
+                        <p v-text="record.id"></p>
+
+                        <!-- File Name -->
+                        <p v-text="record.file_name"></p>
+
+                        <!-- Path -->
+                        <p v-text="record.path"></p>
+
+                        <!-- URL -->
+                        <p v-text="record.url"></p>
+
+                        <!-- Actions -->
+                        <div class="flex justify-end">
+                            <a @click="id=1; editModal(record.id)">
+                                <span
+                                    :class="record.actions['0'].icon"
+                                    class="cursor-pointer rounded-[6px] p-[6px] text-[24px] transition-all hover:bg-gray-100 max-sm:place-self-center"
+                                    :title="record.actions['0'].title"
+                                >
+                                </span>
+                            </a>
+
+                            <a @click="deleteModal(record.actions['1']?.url)">
+                                <span
+                                    :class="record.actions['1'].icon"
+                                    class="cursor-pointer rounded-[6px] p-[6px] text-[24px] transition-all hover:bg-gray-100 max-sm:place-self-center"
+                                    :title="record.actions['1'].title"
+                                >
+                                </span>
+                            </a>
+                        </div>
+                    </div>
+                </template>
+            </x-admin::datagrid>
 
             <!-- Model Form -->
             <x-admin::form
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php
index 5198b68ac7e..02246f6f9ab 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php
@@ -20,8 +20,8 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
             </div>
         </div>
 
-        {{-- Added For Shimmer --}}
-        <x-admin::datagrid></x-admin::datagrid>
+        {{-- DataGrid Shimmer --}}
+        <x-admin::shimmer.datagrid></x-admin::shimmer.datagrid>
     </v-currencies>
 
     @pushOnce('scripts')
@@ -47,31 +47,41 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                 <!-- DataGrid Header -->
                 <template #header="{ columns, records, sortPage}">
                     <div class="row grid grid-cols-4 grid-rows-1 gap-[10px] items-center px-[16px] py-[10px] border-b-[1px] text-gray-600 bg-gray-50 font-semibold">
+                        <!-- ID -->
                         <div
-                            class="cursor-pointer"
+                            class="flex gap-[10px] cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'id'))"
                         >
-                            <div class="flex gap-[10px]">
-                                <p class="text-gray-600">ID</p>
-                            </div>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.currencies.index.datagrid.id')
+                            </p>
                         </div>
 
+                        <!-- Code -->
                         <div
                             class="cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'code'))"
                         >
-                            <p class="text-gray-600">Code</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.currencies.index.datagrid.code')
+                            </p>
                         </div>
 
+                        <!-- Name -->
                         <div
                             class="cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'name'))"
                         >
-                            <p class="text-gray-600">Name</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.currencies.index.datagrid.name')
+                            </p>
                         </div>
 
+                        <!-- Actions -->
                         <div class="cursor-pointer flex justify-end">
-                            <p class="text-gray-600">Actions</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.currencies.index.datagrid.actions')
+                            </p>
                         </div>
                     </div>
                 </template>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php
index cfa73c709e3..b4281e31a1a 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php
@@ -21,8 +21,8 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
             </div>
         </div>
 
-        {{-- Added For Shimmer --}}
-        <x-admin::datagrid></x-admin::datagrid>
+        {{-- DataGrid Shimmer --}}
+        <x-admin::shimmer.datagrid></x-admin::shimmer.datagrid>
     </v-exchange-rates>
 
     @pushOnce('scripts')
@@ -56,31 +56,41 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                 <!-- DataGrid Header -->
                 <template #header="{ columns, records, sortPage}">
                     <div class="row grid grid-cols-4 grid-rows-1 gap-[10px] items-center px-[16px] py-[10px] border-b-[1px] text-gray-600 bg-gray-50 font-semibold">
+                        <!-- ID -->
                         <div
-                            class="cursor-pointer"
+                            class="flex gap-[10px] cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'currency_exchange_id'))"
                         >
-                            <div class="flex gap-[10px]">
-                                <p class="text-gray-600">ID</p>
-                            </div>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.exchange-rates.index.datagrid.id')
+                            </p>
                         </div>
-        
+
+                        <!-- Currency Name -->
                         <div
                             class="cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'currency_name'))"
                         >
-                            <p class="text-gray-600">Currency Name</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.exchange-rates.index.datagrid.currency-name')
+                            </p>
                         </div>
-        
+
+                        <!-- Exchange Rate -->
                         <div
                             class="cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'currency_rate'))"
                         >
-                            <p class="text-gray-600">Exchange Rate</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.exchange-rates.index.datagrid.exchange-rate')
+                            </p>
                         </div>
         
+                        <!-- Actions -->
                         <div class="cursor-pointer flex justify-end">
-                            <p class="text-gray-600">Actions</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.exchange-rates.index.datagrid.actions')
+                            </p>
                         </div>
                     </div>
                 </template>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php
index a662665030c..ec9184a959e 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php
@@ -19,7 +19,8 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
             </div>
         </div>
 
-        <x-admin::datagrid></x-admin::datagrid>
+        {{-- DataGrid Shimmer --}}
+        <x-admin::shimmer.datagrid></x-admin::shimmer.datagrid>
     </v-locales>
 
     @pushOnce('scripts')
@@ -44,38 +45,51 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                 <!-- DataGrid Header -->
                 <template #header="{ columns, records, sortPage}">
                     <div class="row grid grid-cols-5 grid-rows-1 gap-[10px] items-center px-[16px] py-[10px] border-b-[1px] text-gray-600 bg-gray-50 font-semibold">
+                        <!-- Id -->
                         <div
-                            class="cursor-pointer"
+                            class="flex gap-[10px] cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'id'))"
                         >
-                            <div class="flex gap-[10px]">
-                                <p class="text-gray-600">ID</p>
-                            </div>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.locales.index.datagrid.id')
+                            </p>
                         </div>
 
+                        <!-- Code -->
                         <div
                             class="cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'code'))"
                         >
-                            <p class="text-gray-600">Code</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.locales.index.datagrid.code')
+                            </p>
                         </div>
 
+                        <!-- Name -->
                         <div
                             class="cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'name'))"
                         >
-                            <p class="text-gray-600">Name</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.locales.index.datagrid.name')
+                            </p>
                         </div>
 
+                        <!-- Direction -->
                         <div
                             class="cursor-pointer"
                             @click="sortPage(columns.find(column => column.index === 'direction'))"
                         >
-                            <p class="text-gray-600">Direction</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.locales.index.datagrid.direction')
+                            </p>
                         </div>
 
+                        <!-- Actions -->
                         <div class="cursor-pointer flex justify-end">
-                            <p class="text-gray-600">Actions</p>
+                            <p class="text-gray-600">
+                                @lang('admin::app.settings.locales.index.datagrid.actions')
+                            </p>
                         </div>
                     </div>
                 </template>
@@ -90,13 +104,13 @@ class="row grid gap-[10px] items-center px-[16px] py-[16px] border-b-[1px] borde
                         <!-- Id -->
                         <p v-text="record.id"></p>
 
-                        <!-- Status -->
+                        <!-- Code -->
                         <p v-text="record.code"></p>
 
-                        <!-- Email -->
+                        <!-- Name -->
                         <p v-text="record.name"></p>
 
-                        <!-- Email -->
+                        <!-- Direction -->
                         <p v-text="record.direction"></p>
 
                         <!-- Actions -->