diff --git a/app/assets/styles/overrides-components.scss b/app/assets/styles/overrides-components.scss index adc74d6..a81d8f9 100644 --- a/app/assets/styles/overrides-components.scss +++ b/app/assets/styles/overrides-components.scss @@ -7,7 +7,7 @@ :root { // somehow this value keeps picking dark mode values despite [data-theme]="light" - --bulma-hr-background-color: var(--bulma-grey-90); + --bulma-hr-background-color: var(--bulma-white-ter); } .title, diff --git a/app/components/TopMenu.vue b/app/components/TopMenu.vue index 5761aed..27707ba 100644 --- a/app/components/TopMenu.vue +++ b/app/components/TopMenu.vue @@ -56,7 +56,7 @@ v-if="!v.submenu" :class="[ 'navbar-item rounded-lg is-clipped font-medium', - currentTab.code === v.code ? 'has-text-primary-50 has-background-primary-95' : 'has-text-grey-30', + currentTab.code === v.code ? 'has-text-primary-50 has-background-primary-95' : 'has-text-grey-dark', ]" style="font-size: 13.5px" @click="changeTab(v)" @@ -70,7 +70,7 @@
@@ -21,8 +21,7 @@ export default { display: flex; align-items: center; justify-content: center; - background-color: var(--grey-100); - border: 1px solid hsl(0, 0%, 85%); + border: var(--bulma-grey-lighter); border-radius: 50%; } diff --git a/app/components/dashboard/DeliveryInteractive.vue b/app/components/dashboard/DeliveryInteractive.vue index ee0b4dc..48ee74a 100644 --- a/app/components/dashboard/DeliveryInteractive.vue +++ b/app/components/dashboard/DeliveryInteractive.vue @@ -538,6 +538,6 @@ border-left-width: 1px; } .border-gray-300 { - border-color: var(--bulma-grey-85); + border-color: var(--bulma-grey-lighter); } diff --git a/app/components/dashboard/Driver.vue b/app/components/dashboard/Driver.vue index dd174de..4addf55 100644 --- a/app/components/dashboard/Driver.vue +++ b/app/components/dashboard/Driver.vue @@ -12,7 +12,7 @@ const props = defineProps({
diff --git a/app/components/dashboard/TopProduct.vue b/app/components/dashboard/TopProduct.vue index 90cf59f..9cce1c0 100644 --- a/app/components/dashboard/TopProduct.vue +++ b/app/components/dashboard/TopProduct.vue @@ -13,7 +13,7 @@ const { $shortenCurrency } = useNuxtApp();

{{ name }}

-

Đã bán {{ sold_count }} sản phẩm

+

Đã bán {{ sold_count }} sản phẩm

{{ $shortenCurrency(revenue) }}

diff --git a/app/components/datatable/TableSetting.vue b/app/components/datatable/TableSetting.vue index 89e24a2..ea2c58c 100644 --- a/app/components/datatable/TableSetting.vue +++ b/app/components/datatable/TableSetting.vue @@ -234,8 +234,8 @@ input[type="color"]::-webkit-color-swatch { .box { box-shadow: none; - border: 1px solid var(--bulma-grey-90); - background-color: var(--bulma-grey-95); + border: 1px solid var(--bulma-grey-lighter); + background-color: var(--bulma-white-bis); height: 100%; } diff --git a/app/components/datatable/TimeOption.vue b/app/components/datatable/TimeOption.vue index 0d07589..eaafd86 100644 --- a/app/components/datatable/TimeOption.vue +++ b/app/components/datatable/TimeOption.vue @@ -2,7 +2,7 @@
{{ v.name }} @@ -32,7 +32,7 @@ 'tag rounded-md w-5 h-6 fs-13', v.code === current ? 'font-bold has-text-orange has-background-orange-90' - : 'font-medium has-text-grey-40 has-background-grey-90', + : 'font-medium has-text-grey has-background-grey-white-ter', ]" >{{ v.count }} diff --git a/app/components/datepicker/PickDay.vue b/app/components/datepicker/PickDay.vue index 9659e61..9ee71f2 100644 --- a/app/components/datepicker/PickDay.vue +++ b/app/components/datepicker/PickDay.vue @@ -68,7 +68,7 @@ > {{ m.dayPrint }} @@ -84,7 +84,7 @@ { 'has-background-primary-50 has-text-white': m.date === curdate, 'has-background-success-50 has-text-white': m.date === today, - 'has-text-grey-70': m.currentMonth !== m.monthCondition, + 'has-text-grey-light': m.currentMonth !== m.monthCondition, }, ]" > diff --git a/app/components/imports/Color.vue b/app/components/imports/Color.vue index 8685e8d..6258af2 100644 --- a/app/components/imports/Color.vue +++ b/app/components/imports/Color.vue @@ -7,6 +7,6 @@ const props = defineProps({ diff --git a/app/components/imports/Imports.vue b/app/components/imports/Imports.vue index 7f29009..b79b321 100644 --- a/app/components/imports/Imports.vue +++ b/app/components/imports/Imports.vue @@ -1,9 +1,31 @@ diff --git a/app/components/orders/OrderHistoryTab.vue b/app/components/orders/OrderHistoryTab.vue index d24e614..318da8a 100644 --- a/app/components/orders/OrderHistoryTab.vue +++ b/app/components/orders/OrderHistoryTab.vue @@ -79,7 +79,7 @@ const historyItems = [

diff --git a/app/components/orders/OrderKanbanCard.vue b/app/components/orders/OrderKanbanCard.vue index ad5e9cf..5aeb02f 100644 --- a/app/components/orders/OrderKanbanCard.vue +++ b/app/components/orders/OrderKanbanCard.vue @@ -23,7 +23,7 @@ const emit = defineEmits(["selectOrder", "unselect"]);
-

{{ order.customer__name }}

+

{{ order.customer__name }}

{{ order.customer__phone }}

@@ -31,12 +31,12 @@ const emit = defineEmits(["selectOrder", "unselect"]);
-

+

{{ $shortenCurrency(order.total) }}

{{ order.order__products.length }} sản phẩm

-
+

-
+

Tổng tiền

{{ $numtoString(order.total, { hasUnit: true }) }} diff --git a/app/components/orders/OrderProductTab.vue b/app/components/orders/OrderProductTab.vue index 069fdd5..1ca1016 100644 --- a/app/components/orders/OrderProductTab.vue +++ b/app/components/orders/OrderProductTab.vue @@ -12,7 +12,7 @@ const { $numtoString } = useNuxtApp();

{{ product.name }}

@@ -20,7 +20,7 @@ const { $numtoString } = useNuxtApp(); {{ $numtoString(product.total, { hasUnit: true }) }}

-
+

SL: {{ product.quantity }}

Đơn giá: {{ $numtoString(product.unit_price, { hasUnit: true }) }}

diff --git a/app/components/orders/OrderReceiptTab.vue b/app/components/orders/OrderReceiptTab.vue index 7e9c6c9..5dd813f 100644 --- a/app/components/orders/OrderReceiptTab.vue +++ b/app/components/orders/OrderReceiptTab.vue @@ -9,7 +9,7 @@ const props = defineProps({

Chưa có hoá đơn

diff --git a/app/components/orders/OrdersKanban.vue b/app/components/orders/OrdersKanban.vue index 2228049..a01bf56 100644 --- a/app/components/orders/OrdersKanban.vue +++ b/app/components/orders/OrdersKanban.vue @@ -25,7 +25,7 @@ const emit = defineEmits(["selectOrder", "unselect"]); `has-background-${status.color}-90`, ]" > -

{{ status.name }}

+

{{ status.name }}

o.status === status.id).length }}

-
-
+
+
`var(--bulma-${props.color}-85)`);
diff --git a/app/components/snackbar/SnackBar.vue b/app/components/snackbar/SnackBar.vue index 17cb1f2..f9a87b9 100644 --- a/app/components/snackbar/SnackBar.vue +++ b/app/components/snackbar/SnackBar.vue @@ -34,13 +34,11 @@ function loadDynamicComponent() { watchEffect(() => { loadDynamicComponent(); }); -setTimeout(() => store.commit("snackbar", undefined), 3900); +// setTimeout(() => store.commit("snackbar", undefined), 3900);