Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🛠️ [v2.0] : Fixed issue #1823 #1877

Open
wants to merge 1 commit into
base: 2.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<div class="row grid grid-cols-3 items-center gap-2.5 border-b px-4 py-4 text-gray-600 dark:border-gray-800 dark:text-gray-300">
<div class="shimmer mb-0.5 h-6 w-6"></div>

<div class="shimmer h-[17px] w-[100px]"></div>

<div class="flex gap-2.5 place-self-end">
<div class="shimmer my-1 h-7 w-7 p-1.5"></div>

<div class="shimmer my-1 h-7 w-7 p-1.5"></div>

<div class="shimmer my-1 h-7 w-7 p-1.5"></div>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div class="row grid grid-cols-3 items-center gap-2.5 border-b px-4 py-2.5 dark:border-gray-800">
<div class="shimmer h-[26px] w-6"></div>

<div class="shimmer h-[17px] w-[100px]"></div>

<div class="shimmer h-[17px] w-[100px] place-self-end"></div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<div>
<x-admin::shimmer.datagrid.toolbar />

<div class="flex">
<div class="w-full">
<div class="table-responsive box-shadow grid w-full overflow-hidden rounded border border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
<x-admin::shimmer.settings.web-forms.head />

<x-admin::shimmer.settings.web-forms.body />
</div>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class="primary-button"
</div>

<!-- DataGrid Shimmer -->
<x-admin::shimmer.datagrid />
<x-admin::shimmer.settings.web-forms />
</div>
</v-webform>

Expand Down Expand Up @@ -75,9 +75,38 @@ class="primary-button"
</div>

{!! view_render_event('admin.settings.web_forms.index.datagrid.before') !!}

<!-- DataGrid -->
<x-admin::datagrid :src="route('admin.settings.web_forms.index')" />

<!-- Datagrid -->
<x-admin::datagrid
:src="route('admin.settings.web_forms.index')"
ref="datagrid"
>
<template #header="{
isLoading,
available,
applied,
selectAll,
sort,
performAction
}">
<template v-if="isLoading">
<x-admin::shimmer.settings.web-forms.head />
</template>
</template>

<template #body="{
isLoading,
available,
applied,
selectAll,
sort,
performAction
}">
<template v-if="isLoading">
<x-admin::shimmer.settings.web-forms.body />
</template>
</template>
</x-admin::datagrid>

{!! view_render_event('admin.settings.web_forms.index.datagrid.after') !!}
</div>
Expand Down
1 change: 0 additions & 1 deletion packages/Webkul/WebForm/src/DataGrids/WebFormDataGrid.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public function prepareColumns(): void
'label' => trans('admin::app.settings.webforms.index.datagrid.title'),
'type' => 'string',
'sortable' => true,
'sortable' => true,
'searchable' => true,
'filterable' => true,
]);
Expand Down
1 change: 0 additions & 1 deletion public/admin/build/assets/app-2ab2a07d.css

This file was deleted.

1 change: 1 addition & 0 deletions public/admin/build/assets/app-5f9d8841.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/admin/build/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
"src": "node_modules/vue-cal/dist/i18n/zh-hk.es.js"
},
"src/Resources/assets/css/app.css": {
"file": "assets/app-2ab2a07d.css",
"file": "assets/app-5f9d8841.css",
"isEntry": true,
"src": "src/Resources/assets/css/app.css"
},
Expand Down
Loading