Merge pull request #1702 from suraj-webkul/user-datagrid-refactor

[2.0]: fix users index page console error, ui and refactor code.

Author: devansh-webkul

packages/Webkul/Admin/src/Resources/views/components/media/images.blade.php

@@ -16,7 +16,7 @@
     height="{{ $height }}"
     :errors="errors"
 >
-    <x-admin::shimmer.image class="h-[110px] w-[110px] rounded" />
+    <x-admin::shimmer.image class="h-[120px] w-[120px] rounded" />
 </v-media-images>
 
 @pushOnce('scripts')

packages/Webkul/Admin/src/Resources/views/configuration/edit.blade.php

@@ -80,4 +80,4 @@ class="primary-button"
     </x-admin::form>
 
     {!! view_render_event('admin.configuration.edit.form_controls.after') !!}
-</x-admin::layouts>
+</x-admin::layouts>

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

@@ -4,6 +4,9 @@
         @lang('admin::app.configuration.index.title')
     </x-slot>
 
+    <!-- Breadcrumbs -->
+    <x-admin::breadcrumbs name="configuration" />
+
     {!! view_render_event('admin.configuration.index.header.before') !!}
 
     <!-- Heading of the page -->

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

@@ -36,11 +36,9 @@
                             class="flex max-w-[360px] items-center gap-2 rounded-lg p-2 transition-all hover:bg-gray-100 dark:hover:bg-gray-950"
                             href="{{ $child->getUrl() }}"
                         >
-                            @if ($icon = $child->getIcon())
-                                <div class="rounded-lg bg-gray-100 p-3 dark:bg-gray-800">
-                                    <i class="{{ $child->getIcon() }} text-3xl "></i>
-                                </div>
-                            @endif
+                            <div class="rounded-lg bg-gray-100 p-3 dark:bg-gray-800">
+                                <i class="{{ $child->getIcon() }} text-3xl"></i>
+                            </div>
 
                             <div class="grid">
                                 <p class="mb-1.5 text-base font-semibold text-gray-800 dark:text-white">
@@ -57,4 +55,4 @@ class="flex max-w-[360px] items-center gap-2 rounded-lg p-2 transition-all hover
             </div>
         @endforeach
     </div>
-</x-admin::layouts>
+</x-admin::layouts>

packages/Webkul/Admin/src/Resources/views/settings/users/index.blade.php

@@ -92,37 +92,27 @@ class="icon-checkbox-outline peer-checked:icon-checkbox-select cursor-pointer ro
                             <!-- Users Id -->
                             <p>@{{ record.id }}</p>
         
-                            <!-- Users Name -->
-                            <p>
-                                <div class="flex items-center gap-2.5">
-                                    <div
-                                        class="border-3 mr-2 inline-block h-9 w-9 overflow-hidden rounded-full border-gray-800 text-center align-middle"
-                                        v-if="record.name.image"
-                                    >
-                                        <img
-                                            class="h-9 w-9"
-                                            :src="record.name.image"
-                                            alt="record.name"
-                                        />
-                                    </div>
-
-                                    <div
-                                        class="profile-info-icon"
-                                        v-else
-                                    >
-                                        <button class="flex h-9 w-9 cursor-pointer items-center justify-center rounded-full bg-blue-400 text-sm font-semibold leading-6 text-white transition-all hover:bg-blue-500 focus:bg-blue-500">
-                                            @{{ record.name.name[0].toUpperCase() }}
-                                        </button>
-                                    </div>
-
-                                    <div class="text-sm">
-                                        @{{ record.name.name }}
-                                    </div>
+                            <!-- Users Name and Profile -->
+                            <div class="flex items-center gap-2.5">
+                                <template v-if="record.name.image">
+                                    <img
+                                        class="flex h-9 w-9 items-center justify-center rounded-full"
+                                        :src="record.name.image"
+                                        alt="record.name"
+                                    />
+                                </template>
+
+                                <template v-else>
+                                    <x-admin::avatar ::name="record.name.name"/>
+                                </template>
+
+                                <div class="text-sm">
+                                    @{{ record.name.name }}
                                 </div>
-                            </p>
+                            </div>
 
                             <!-- Users Email -->
-                            <p>@{{ record.email }}</p>
+                            <p class="truncate">@{{ record.email }}</p>
 
                             <!-- Users Status -->
                             <span

packages/Webkul/WebForm/src/Resources/lang/en/app.php

@@ -2,19 +2,19 @@
 
 return [
     'acl' => [
-        'title'  => 'نماذج الويب',
-        'view'   => 'عرض',
-        'create' => 'إنشاء',
-        'edit'   => 'تحرير',
-        'delete' => 'حذف',
+        'title'  => 'Web Forms',
+        'view'   => 'View',
+        'create' => 'Create',
+        'edit'   => 'Edit',
+        'delete' => 'Delete',
     ],
 
     'menu' => [
-        'title'      => 'نماذج الويب',
-        'title-info' => 'إضافة، تعديل أو حذف نماذج الويب من CRM',
+        'title'      => 'Web Forms',
+        'title-info' => 'Add, edit, or delete web forms from the CRM',
     ],
 
     'validations' => [
-        'invalid-phone-number' => 'رقم الهاتف غير صالح',
+        'invalid-phone-number' => 'Invalid phone number',
     ],
 ];