fix indentation

resources/scripts/components/InvoiceInformationCard.vue

@@ -1,46 +1,46 @@
 <template>
-  <div class="bg-white shadow overflow-hidden rounded-lg mt-6 dark:bg-gray-800">
+  <div class="bg-white shadow overflow-hidden rounded-lg mt-6">
     <div class="px-4 py-5 sm:px-6">
-      <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-gray-400">
+      <h3 class="text-lg leading-6 font-medium text-gray-900">
         {{ $t('invoices.invoice_information') }}
       </h3>
     </div>
     <div v-if="invoice" class="border-t border-gray-200 px-4 py-5 sm:p-0">
-      <dl class="sm:divide-y sm:divide-gray-200 dark:sm:divide-gray-500">
+      <dl class="sm:divide-y sm:divide-gray-200">
         <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-          <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">
+          <dt class="text-sm font-medium text-gray-500">
             {{ $t('general.from') }}
           </dt>
-          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2   dark:text-gray-100">
+          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
             {{ invoice.company.name }}
           </dd>
         </div>
         <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-          <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">
+          <dt class="text-sm font-medium text-gray-500">
             {{ $t('general.to') }}
           </dt>
-          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2   dark:text-gray-100">
+          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
             {{ invoice.customer.name }}
           </dd>
         </div>
         <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-          <dt class="text-sm font-medium text-gray-500 capitalize dark:text-gray-400 ">
+          <dt class="text-sm font-medium text-gray-500 capitalize">
             {{ $t('invoices.paid_status').toLowerCase() }}
           </dt>
-          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2 ">
+          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
             <BaseInvoiceStatusBadge
               :status="invoice.paid_status"
-              class="px-3 py-1 dark:text-gray-400"
+              class="px-3 py-1"
             >
               {{ invoice.paid_status }}
             </BaseInvoiceStatusBadge>
           </dd>
         </div>
         <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-          <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">
+          <dt class="text-sm font-medium text-gray-500">
             {{ $t('invoices.total') }}
           </dt>
-          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2 dark:border-gray-600 dark:bg-gray-700 dark:text-white">
+          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
             <BaseFormatMoney
               :currency="invoice.currency"
               :amount="invoice.total"
@@ -54,7 +54,7 @@
           <dt class="text-sm font-medium text-gray-500">
             {{ $t('invoices.notes') }}
           </dt>
-          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2 dark:text-gray-100" >
+          <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
             <span v-html="invoice.formatted_notes"></span>
           </dd>
         </div>

resources/scripts/components/base/BaseCard.vue

@@ -1,9 +1,5 @@
 <template>
-  <div
-    class="bg-white rounded-lg shadow dark:bg-gray-800 dark:text-white dark:shadow-glass dark:border dark:border-white/10 dark:bg-gray-800/70 relative"
-  >
-    <BaseDarkHighlight class="z-[-1] mt-10" />
-
+  <div class="bg-white rounded-lg shadow">
     <div
       v-if="hasHeaderSlot"
       class="px-5 py-4 text-black border-b border-gray-100 border-solid"

resources/scripts/components/base/BaseDarkHighlight.vue

@@ -1,21 +0,0 @@
-<template>
-  <div
-    class="
-      hidden
-      top-0
-      w-full
-      absolute
-      ml-auto
-      mr-auto
-      left-0
-      right-0
-      text-center
-      h-full
-      rounded-full
-      bg-highlight/[.10]
-      blur-2xl
-      dark:block
-      z-[-1]
-    "
-  />
-</template>

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()
 }
 

tailwind.config.js

@@ -36,7 +36,6 @@ module.exports = {
           900: withOpacityValue('--color-primary-900'),
         },
         black: '#040405',
-        highlight: 'rgb(56, 189, 248)',
         red: colors.red,
         teal: colors.teal,
         gray: colors.slate,