fix indentation

resources/scripts/components/base/base-table/BaseTable.vue

@@ -7,11 +7,18 @@
             relative
             overflow-hidden
             bg-white
-            border-b border-gray-200
+            border-b
+            border-gray-200
             shadow
             sm:rounded-lg
-          "
+            dark:shadow-glass
+            dark:border
+            dark:border-white/10
+            dark:bg-gray-800/70
+            "
         >
+          <BaseDarkHighlight v-if="darkHighlight" class="z-[-1]" />
+
           <slot name="header" />
           <table :class="tableClass">
             <thead :class="theadClass">
@@ -51,7 +58,11 @@
               <tr
                 v-for="placeRow in placeholderCount"
                 :key="placeRow"
-                :class="placeRow % 2 === 0 ? 'bg-white' : 'bg-gray-50'"
+                :class="
+                  placeRow % 2 === 0
+                    ? 'bg-white dark:bg-gray-800'
+                    : 'bg-gray-50 dark:bg-gray-800'
+                "
               >
                 <td
                   v-for="column in columns"
@@ -75,7 +86,11 @@
               <tr
                 v-for="(row, index) in sortedRows"
                 :key="index"
-                :class="index % 2 === 0 ? 'bg-white' : 'bg-gray-50'"
+                :class="
+                  index % 2 === 0
+                    ? 'bg-white dark:bg-transparent'
+                    : 'bg-gray-50 dark:bg-gray-700/20 dark:border-y dark:border-gray-600'
+                "
               >
                 <td
                   v-for="column in columns"
@@ -103,7 +118,10 @@
               justify-center
               w-full
               h-full
-              bg-white bg-opacity-60
+              bg-white
+              bg-opacity-60
+              dark:bg-gray-700
+              dark:bg-opacity-60
             "
           >
             <SpinnerIcon class="w-10 h-10 text-primary-500" />
@@ -163,9 +181,12 @@ const props = defineProps({
   sortOrder: { type: String, default: '' },
   tableClass: {
     type: String,
-    default: 'min-w-full divide-y divide-gray-200',
+    default: 'min-w-full divide-y divide-gray-200 dark:divide-gray-600',
+  },
+  theadClass: {
+    type: String,
+    default: 'bg-gray-50 dark:bg-gray-800 dark:text-white',
   },
-  theadClass: { type: String, default: 'bg-gray-50' },
   tbodyClass: { type: String, default: '' },
   noResultsMessage: {
     type: String,
@@ -186,6 +207,10 @@ const props = defineProps({
     type: Number,
     default: 3,
   },
+  darkHighlight: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 let rows = reactive([])
@@ -236,7 +261,7 @@ function getColumn(columnName) {
 
 function getThClass(column) {
   let classes =
-    'whitespace-nowrap px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider'
+    'whitespace-nowrap px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-white'
 
   if (column.defaultThClass) {
     classes = column.defaultThClass
@@ -256,7 +281,8 @@ function getThClass(column) {
 }
 
 function getTdClass(column) {
-  let classes = 'px-6 py-4 text-sm text-gray-500 whitespace-nowrap'
+  let classes =
+    'px-6 py-4 text-sm text-gray-500 whitespace-nowrap dark:text-gray-300'
 
   if (column.defaultTdClass) {
     classes = column.defaultTdClass
@@ -309,6 +335,7 @@ function changeSorting(column) {
   }
 
   if (!usesLocalData.value) {
+    if (pagination.value) pagination.value.currentPage = 1
     mapDataToRows()
   }
 }
@@ -326,7 +353,9 @@ async function pageChange(page) {
   await mapDataToRows()
 }
 
-async function refresh() {
+async function refresh(isPreservePage = false) {
+  if (pagination.value && !isPreservePage) pagination.value.currentPage = 1
+
   await mapDataToRows()
 }
 

resources/scripts/components/base/base-table/BaseTablePagination.vue

@@ -10,14 +10,13 @@
       bg-white
       border-t border-gray-200
       sm:px-6
-      dark:bg-transparent dark:border-white/10
     "
   >
     <div class="flex justify-between flex-1 sm:hidden">
       <a
         href="#"
         :class="{
-          'disabled cursor-normal pointer-events-none !bg-gray-100 !text-gray-400 dark:!bg-gray-800 dark:!text-gray-500':
+          'disabled cursor-normal pointer-events-none !bg-gray-100 !text-gray-400':
             pagination.currentPage === 1,
         }"
         class="
@@ -33,7 +32,6 @@
           border border-gray-300
           rounded-md
           hover:bg-gray-50
-          dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300
         "
         @click="pageClicked(pagination.currentPage - 1)"
       >
@@ -42,7 +40,7 @@
       <a
         href="#"
         :class="{
-          'disabled cursor-default pointer-events-none !bg-gray-100 !text-gray-400 dark:!bg-gray-800 dark:!text-gray-500':
+          'disabled cursor-default pointer-events-none !bg-gray-100 !text-gray-400':
             pagination.currentPage === pagination.totalPages,
         }"
         class="
@@ -59,7 +57,6 @@
           border border-gray-300
           rounded-md
           hover:bg-gray-50
-          dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300
         "
         @click="pageClicked(pagination.currentPage + 1)"
       >
@@ -68,12 +65,12 @@
     </div>
     <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
       <div>
-        <p class="text-sm text-gray-700 dark:text-gray-400">
+        <p class="text-sm text-gray-700">
           Showing
           {{ ' ' }}
           <span
             v-if="pagination.limit && pagination.currentPage"
-            class="font-medium dark:text-gray-200"
+            class="font-medium"
           >
             {{
               pagination.currentPage * pagination.limit - (pagination.limit - 1)
@@ -84,7 +81,7 @@
           {{ ' ' }}
           <span
             v-if="pagination.limit && pagination.currentPage"
-            class="font-medium dark:text-gray-200"
+            class="font-medium"
           >
             <span
               v-if="
@@ -101,7 +98,7 @@
           {{ ' ' }}
           of
           {{ ' ' }}
-          <span v-if="pagination.totalCount" class="font-medium dark:text-gray-200">
+          <span v-if="pagination.totalCount" class="font-medium">
             {{ pagination.totalCount }}
           </span>
           {{ ' ' }}
@@ -116,7 +113,7 @@
           <a
             href="#"
             :class="{
-              'disabled cursor-normal pointer-events-none !bg-gray-100 !text-gray-400 dark:!bg-gray-800 dark:!text-gray-500':
+              'disabled cursor-normal pointer-events-none !bg-gray-100 !text-gray-400':
                 pagination.currentPage === 1,
             }"
             class="
@@ -132,7 +129,6 @@
               border border-gray-300
               rounded-l-md
               hover:bg-gray-50
-              dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300
             "
             @click="pageClicked(pagination.currentPage - 1)"
           >
@@ -144,9 +140,9 @@
             href="#"
             aria-current="page"
             :class="{
-              'z-10 bg-primary-50 border-primary-500 text-primary-600 dark:bg-primary-500 dark:text-white':
+              'z-10 bg-primary-50 border-primary-500 text-primary-600':
                 isActive(1),
-              'bg-white border-gray-300 text-gray-500 hover:bg-gray-50 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300':
+              'bg-white border-gray-300 text-gray-500 hover:bg-gray-50':
                 !isActive(1),
             }"
             class="
@@ -177,7 +173,6 @@
               text-gray-700
               bg-white
               border border-gray-300
-              dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300
             "
           >
             ...
@@ -187,9 +182,9 @@
             :key="page"
             href="#"
             :class="{
-              'z-10 bg-primary-50 border-primary-500 text-primary-600 dark:bg-primary-500 dark:text-white':
+              'z-10 bg-primary-50 border-primary-500 text-primary-600':
                 isActive(page),
-              'bg-white border-gray-300 text-gray-500 hover:bg-gray-50 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300':
+              'bg-white border-gray-300 text-gray-500 hover:bg-gray-50':
                 !isActive(page),
               disabled: page === '...',
             }"
@@ -225,7 +220,6 @@
               text-gray-700
               bg-white
               border border-gray-300
-              dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300
             "
           >
             ...
@@ -235,9 +229,9 @@
             href="#"
             aria-current="page"
             :class="{
-              'z-10 bg-primary-50 border-primary-500 text-primary-600 dark:bg-primary-500 dark:text-white':
+              'z-10 bg-primary-50 border-primary-500 text-primary-600':
                 isActive(pagination.totalPages),
-              'bg-white border-gray-300 text-gray-500 hover:bg-gray-50 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300':
+              'bg-white border-gray-300 text-gray-500 hover:bg-gray-50':
                 !isActive(pagination.totalPages),
             }"
             class="
@@ -269,10 +263,9 @@
               border border-gray-300
               rounded-r-md
               hover:bg-gray-50
-              dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300
             "
             :class="{
-              'disabled cursor-default pointer-events-none !bg-gray-100 !text-gray-400 dark:!bg-gray-800 dark:!text-gray-500':
+              'disabled cursor-default pointer-events-none !bg-gray-100 !text-gray-400':
                 pagination.currentPage === pagination.totalPages,
             }"
             @click="pageClicked(pagination.currentPage + 1)"