From c1ce7e36cb151c35dfc6894815b26a353192d373 Mon Sep 17 00:00:00 2001 From: Nicolas Drolet Date: Fri, 8 Aug 2025 17:03:19 -0400 Subject: [PATCH] feat(approvals): Create timesheet approval page, begin scaffolding and building store, services, api, set up backend connecting logic --- src/css/quasar.variables.scss | 4 +-- src/i18n/en-ca/index.ts | 4 +-- src/i18n/fr-ca/index.ts | 4 +-- src/modules/auth/composables/use-auth-api.ts | 2 +- src/modules/auth/pages/auth-login.vue | 4 +-- src/modules/auth/types/auth-interface.ts | 2 +- src/pages/error-page.vue | 38 +++++++++----------- src/router/routes.ts | 12 +++++-- 8 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 20978f3..c257cfe 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -13,8 +13,8 @@ // Tip: Use the "Theme Builder" on Quasar's documentation website. $primary: #019547; -$secondary: #EFFFEF; -$accent: #4ada86; +$secondary: #DAE0E7; +$accent: #81AFE3; $dark-font: #305530; $dark: #323232; diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts index 0abf782..13a0655 100644 --- a/src/i18n/en-ca/index.ts +++ b/src/i18n/en-ca/index.ts @@ -32,8 +32,8 @@ export default { userMenuCalendar: 'Calendar', }, notFoundPage: { - pageTitle: 'Oops. Nothing here...', - backButton: 'Go to the home page', + pageText: 'We cannot seem to find the page you are looking for, sorry!', + backButton: 'Take me back!', }, loginPage: { title: 'Log in to Targo', diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts index b3b61f9..f6ef5c9 100644 --- a/src/i18n/fr-ca/index.ts +++ b/src/i18n/fr-ca/index.ts @@ -171,8 +171,8 @@ export default { userMenuCalendar: 'Calendrier annuel', }, notFoundPage: { - pageTitle: 'Oops. Rien ici...', - backButton: 'Aller à la page d’accueil', + pageText: 'On ne semble pas trouver la page que vous cherchez, désolé!', + backButton: 'Je veux retourner en arrière!', }, notificationDialog: { notice: 'Notification', diff --git a/src/modules/auth/composables/use-auth-api.ts b/src/modules/auth/composables/use-auth-api.ts index 6f14402..8a7b8c2 100644 --- a/src/modules/auth/composables/use-auth-api.ts +++ b/src/modules/auth/composables/use-auth-api.ts @@ -1,5 +1,5 @@ import { useAuthStore } from "../../../stores/auth-store"; -import type { User } from "src/modules/users/types/user-interface"; +import type { User } from "src/modules/shared/types/user-interface"; export const useAuthApi = () => { const authStore = useAuthStore(); diff --git a/src/modules/auth/pages/auth-login.vue b/src/modules/auth/pages/auth-login.vue index 012d43d..d08ca9d 100644 --- a/src/modules/auth/pages/auth-login.vue +++ b/src/modules/auth/pages/auth-login.vue @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/src/router/routes.ts b/src/router/routes.ts index 0c13dc2..18509ef 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,4 +1,5 @@ import type { RouteRecordRaw } from 'vue-router'; +import { RouteNames } from './router-constants'; const routes: RouteRecordRaw[] = [ { @@ -8,22 +9,27 @@ const routes: RouteRecordRaw[] = [ children: [ { path: '', - name: 'dashboard', + name: RouteNames.DASHBOARD, component: () => import('src/pages/test-page.vue'), }, + { + path: 'timesheet-approvals', + name: RouteNames.TIMESHEET_APPROVALS, + component: () => import('src/modules/timesheet-approval/pages/timesheet-approval.vue'), + }, ], }, { path: '/v1/login', - name: 'login', + name: RouteNames.LOGIN, component: () => import('src/modules/auth/pages/auth-login.vue'), meta: { requiresAuth: false }, }, { path: '/login-success', - name: 'login-success', + name: RouteNames.LOGIN_SUCCESS, component: () => import('src/modules/auth/pages/auth-login-popup-success.vue'), meta: { requiresAuth: false }, },