Skip to content

Commit

Permalink
Merge pull request bagisto#8024 from amit-webkul/orderDatagrid
Browse files Browse the repository at this point in the history 
🚑 Datagrid Code Cleaning
  • Loading branch information
@jitendra-webkul
jitendra-webkul committed Aug 25, 2023
2 parents d3b8c96 + 82d8171 commit 0721592
Show file tree
Hide file tree
Showing 7 changed files with 221 additions and 63 deletions.
15 changes: 10 additions & 5 deletions packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,7 @@
'last-delete-error' => 'At least one Locale is required.',

'datagrid' => [
'actions' => 'Actions',
'id' => 'ID',
'name' => 'Name',
'code' => 'Code',
Expand Down Expand Up @@ -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' => [
Expand Down Expand Up @@ -620,6 +622,7 @@
'exchange-rate' => 'Exchange Rate',
'edit' => 'Edit',
'delete' => 'Delete',
'actions' => 'Actions',
],
],
],
Expand Down Expand Up @@ -1727,6 +1730,7 @@
'date' => 'Date',
'edit' => 'Edit',
'delete' => 'Delete',
'actions' => 'Actions',

],

Expand Down Expand Up @@ -1757,6 +1761,7 @@
'edit' => 'Edit',
'delete' => 'Delete',
'email' => 'Email',
'actions' => 'Actions',
],

'edit' => [
Expand Down
34 changes: 22 additions & 12 deletions packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/events/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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>
Expand Down
32 changes: 21 additions & 11 deletions ...es/Webkul/Admin/src/Resources/views/marketing/email-marketing/subscribers/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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>
Expand Down
105 changes: 102 additions & 3 deletions packages/Webkul/Admin/src/Resources/views/marketing/sitemaps/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()"
Expand All @@ -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
Expand Down
28 changes: 19 additions & 9 deletions packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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>
Expand Down
Loading

0 comments on commit 0721592

Please sign in to comment.