From b307f33ab04f6e6b14fc8105f89392443965801f Mon Sep 17 00:00:00 2001 From: Nicolas Drolet Date: Fri, 14 Nov 2025 17:00:27 -0500 Subject: [PATCH 1/3] refactor(timesheet): add at least some updates to approved shift look, maybe more??? --- quasar.config.ts | 2 +- .../components/login-connection-panel.vue | 2 +- .../shared/menu-panel-input-field.vue | 2 +- .../shared/menu-panel-select-field.vue | 2 +- .../components/page-header-template.vue | 34 +- .../components/expense-dialog-form.vue | 94 ++-- .../components/expense-dialog-list-item.vue | 35 +- .../components/shift-list-day-row.vue | 469 +++++++++--------- .../timesheets/components/shift-list-day.vue | 17 +- .../timesheets/components/shift-list.vue | 217 ++++---- .../components/timesheet-wrapper.vue | 2 +- src/modules/timesheets/utils/expense.util.ts | 17 + src/stores/expense-store.ts | 1 + 13 files changed, 482 insertions(+), 412 deletions(-) diff --git a/quasar.config.ts b/quasar.config.ts index 30f789f..47e6b1f 100644 --- a/quasar.config.ts +++ b/quasar.config.ts @@ -105,7 +105,7 @@ export default defineConfig((ctx) => { notify: { color: 'primary', }, - dark: false, + dark: 'auto', }, // iconSet: 'material-icons', // Quasar icon set diff --git a/src/modules/auth/components/login-connection-panel.vue b/src/modules/auth/components/login-connection-panel.vue index bc8501d..b37c45d 100644 --- a/src/modules/auth/components/login-connection-panel.vue +++ b/src/modules/auth/components/login-connection-panel.vue @@ -37,7 +37,7 @@ label-color="accent" class="rounded-5 inset-shadow bg-blue-grey-1" label-slot - input-class="text-weight-medium text-h6" + input-class="text-weight-medium text-h6 text-primary" > \ No newline at end of file diff --git a/src/modules/timesheets/components/expense-dialog-list.vue b/src/modules/timesheets/components/expense-dialog-list.vue index 2d0b364..8d32e57 100644 --- a/src/modules/timesheets/components/expense-dialog-list.vue +++ b/src/modules/timesheets/components/expense-dialog-list.vue @@ -5,6 +5,7 @@ import { computed } from 'vue'; import { useTimesheetStore } from 'src/stores/timesheet-store'; import ExpenseDialogListItem from 'src/modules/timesheets/components/expense-dialog-list-item.vue'; + import ExpenseDialogListItemMobile from 'src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue'; const timesheet_store = useTimesheetStore(); @@ -38,14 +39,25 @@ - - + > + + + + \ No newline at end of file diff --git a/src/modules/timesheets/components/expense-dialog.vue b/src/modules/timesheets/components/expense-dialog.vue index d0a94fc..16cad31 100644 --- a/src/modules/timesheets/components/expense-dialog.vue +++ b/src/modules/timesheets/components/expense-dialog.vue @@ -5,6 +5,7 @@ import { useExpensesStore } from 'src/stores/expense-store'; import ExpenseDialogList from 'src/modules/timesheets/components/expense-dialog-list.vue'; import ExpenseDialogForm from 'src/modules/timesheets/components/expense-dialog-form.vue'; + import ExpenseDialogFormMobile from 'src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue'; import ExpenseDialogHeader from 'src/modules/timesheets/components/expense-dialog-header.vue'; const expense_store = useExpensesStore(); @@ -18,8 +19,10 @@ transition-hide="jump-down" > @@ -38,8 +41,13 @@ + + - +
+ + +
diff --git a/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue b/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue new file mode 100644 index 0000000..59f84a2 --- /dev/null +++ b/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue @@ -0,0 +1,317 @@ + + + \ No newline at end of file diff --git a/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue b/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue new file mode 100644 index 0000000..03fba5b --- /dev/null +++ b/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue @@ -0,0 +1,150 @@ + + + \ No newline at end of file diff --git a/src/pages/login-page.vue b/src/pages/login-page.vue index 539f0ee..d77229c 100644 --- a/src/pages/login-page.vue +++ b/src/pages/login-page.vue @@ -4,10 +4,10 @@