Merge pull request #1380 from suraj-webkul/fix-mail-datagrid

fix mail datagrid.

Author: jitendra-webkul

packages/Webkul/Admin/src/Resources/assets/css/app.css

@@ -622,11 +622,12 @@
 /*--------------------------------- New UI CSS --------------------------------------------------------------- */
 
 .sidebar-rounded::after {
-    @apply w-[30px] h-[30px] top-[5px] right-[-30px] absolute rounded-tl-[58%] shadow-[-8px_-5px_0px_1px_rgba(255,255,255,1)] ;
-    content: "";
-    pointer-events: none;
+  @apply w-[30px] h-[30px] top-[5px] right-[-30px] absolute rounded-tl-[58%] shadow-[-8px_-5px_0px_1px_rgba(255,255,255,1)] dark:shadow-[-8px_-5px_0px_1px_rgba(17,24,39,1)] ;
+  content: "";
+  pointer-events: none;
 }
 
+
 .tox.tox-silver-sink.tox-tinymce-aux {
     z-index: 99999;
 }

packages/Webkul/Admin/src/Resources/views/components/layouts/header/index.blade.php

@@ -80,7 +80,7 @@ class="block w-full rounded-3xl border bg-white px-10 py-1.5 leading-6 text-gray
                                 <!-- Link to send new Mail-->
                                 @if (bouncer()->hasPermission('mail.create'))
                                     <div class="rounded-lg bg-white p-2 hover:bg-gray-100">
-                                        <a href="{{ route('admin.mail.index', ['route' => 'compose']) }}">
+                                        <a href="{{ route('admin.mail.index', ['route' => 'inbox']) }}">
                                             <div class="flex flex-col gap-1">
                                                 <i class="icon-mail text-2xl text-gray-600"></i>
 
@@ -158,7 +158,7 @@ class="block w-full rounded-3xl border bg-white px-10 py-1.5 leading-6 text-gray
                                 <!-- Link to create new User-->
                                 @if (bouncer()->hasPermission('settings.user.users.create'))
                                     <div class="rounded-lg bg-white p-2 hover:bg-gray-100">
-                                        <a href="{{ route('admin.settings.users.create') }}">
+                                        <a href="{{ route('admin.settings.users.index') }}">
                                             <div class="flex flex-col gap-1">
                                                 <i class="icon-user text-2xl text-gray-600"></i>
 

packages/Webkul/Admin/src/Resources/views/mail/index.blade.php

@@ -49,10 +49,69 @@ class="primary-button"
             {!! view_render_event('krayin.admin.mail.'.request('route').'.datagrid.before') !!}
 
             <!-- DataGrid -->
-            <x-admin::datagrid
+           <!-- DataGrid -->
+           <x-admin::datagrid
                 ref="datagrid"
                 src="{{ route('admin.mail.index', request('route')) }}"
-            />
+            >
+                <template #body="{
+                    isLoading,
+                    available,
+                    applied,
+                    selectAll,
+                    sort,
+                    performAction
+                }">
+                    <template v-if="isLoading">
+                        <x-admin::shimmer.datagrid.table.body />
+                    </template>
+        
+                    <template v-else>
+                        <div
+                            v-for="record in available.records"
+                            class="row grid items-center gap-2.5 border-b px-4 py-4 text-gray-600 transition-all hover:bg-gray-50 dark:border-gray-800 dark:text-gray-300 dark:hover:bg-gray-950"
+                            :style="`grid-template-columns: repeat(${gridsCount}, minmax(0, 1fr))`"
+                        >
+                            <!-- Group ID -->
+                            <p>@{{ record.id }}</p>
+
+                            <!-- Attachments -->
+                            <p
+                                :class="record.attachments ? 'icon-attachmetent' : ''"
+                                v-html="record.attachments"
+                            ></p>
+
+                            <!-- Name -->
+                            <p>@{{ record.name }}</p>
+        
+                            <!-- Subject -->
+                            <p v-html="record.subject"></p>
+
+                            <!-- Created At -->
+                            <p v-html="record.created_at"></p>
+        
+                            <!-- Actions -->
+                            <div class="flex justify-end">
+                                <a @click="selectedMail=true; editModal(record.actions.find(action => action.index === 'edit'))">
+                                    <span
+                                        :class="record.actions.find(action => action.index === 'edit')?.icon"
+                                        class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center"
+                                    >
+                                    </span>
+                                </a>
+
+                                <a @click="performAction(record.actions.find(action => action.index === 'delete'))">
+                                    <span
+                                        :class="record.actions.find(action => action.index === 'delete')?.icon"
+                                        class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center"
+                                    >
+                                    </span>
+                                </a>
+                            </div>
+                        </div>
+                    </template>
+                </template>
+            </x-admin::datagrid>
 
             {!! view_render_event('krayin.admin.mail.'.request('route').'.datagrid.after') !!}
 
@@ -268,6 +327,22 @@ class="primary-button"
                     };
                 },
 
+                computed: {
+                    gridsCount() {
+                        let count = this.$refs.datagrid.available.columns.length;
+
+                        if (this.$refs.datagrid.available.actions.length) {
+                            ++count;
+                        }
+
+                        if (this.$refs.datagrid.available.massActions.length) {
+                            ++count;
+                        }
+
+                        return count;
+                    },
+                },
+
                 methods: {
                     toggleModal() {
                         this.$refs.toggleComposeModal.toggle();

packages/Webkul/Admin/src/Routes/settings-routes.php

@@ -148,8 +148,6 @@
         Route::controller(UserController::class)->prefix('users')->group(function () {
             Route::get('', 'index')->name('admin.settings.users.index');
 
-            Route::get('create', 'create')->name('admin.settings.users.create');
-
             Route::post('create', 'store')->name('admin.settings.users.store');
 
             Route::get('edit/{id?}', 'edit')->name('admin.settings.users.edit');