From 94604cda1baa8c15b06ab9d5bbd30bc57b739e0e Mon Sep 17 00:00:00 2001
From: Nicolas Drolet <nicolasd@targointernet.com>
Date: Mon, 28 Jul 2025 12:22:51 -0400
Subject: [PATCH] fix(scaffolding): redid some folder structure to be more
 modular, moved some folders from modules to src, general file/folder cleanup.

---
 src/assets/logo-targo-green.svg               |  1 +
 src/boot/i18n.ts                              |  4 +-
 src/{modules => }/css/app.scss                |  0
 src/{modules => }/css/quasar.variables.scss   |  0
 src/{modules => }/i18n/en-ca/index.ts         |  0
 src/{modules => }/i18n/index.ts               |  0
 src/{modules => }/layouts/MainLayout.vue      |  0
 .../{auth.config.ts => auth-constants.ts}     |  0
 .../auth.store.ts => auth/auth-store.ts}      | 16 +++-----
 .../login-popup-authentik-button.vue}         |  0
 .../components/login-popup.vue}               |  0
 .../{api => composables}/use-auth-access.ts   | 10 ++++-
 .../{api => composables}/use-auth-session.ts  | 12 +++++-
 src/modules/auth/services/services-auth.ts    | 30 ++++++++++++++
 src/modules/auth/types/auth-interface.ts      |  8 ++++
 .../use-employee-dashboard.ts}                |  0
 .../api-dealer.ts => dashboard-constants.ts}  |  0
 .../{api/api-shared.ts => dashboard-store.ts} |  0
 .../basic-dashboard.vue}                      |  0
 .../_services-shared.ts}                      |  0
 .../{index.ts => services/services-admin.ts}  |  0
 .../services/services-customer.ts}            |  0
 .../services/services-dealer.ts}              |  0
 .../services/services-support.ts}             |  0
 .../services/services-technician.ts}          |  0
 .../types/dashboard-types.ts}                 |  0
 .../{api => composables}/use-expenses-api.ts  |  0
 .../{api => composables}/use-shift-api.ts     |  0
 .../{api => composables}/use-timesheet-api.ts |  0
 .../services/expense-attachment-services.ts}  |  0
 .../services/expense-services.ts}             |  0
 .../services/timesheet-services.ts}           |  0
 ...sheet-config.ts => timesheet-constants.ts} |  0
 .../timesheets/{ => types}/timesheet-types.ts |  0
 .../components/{ => _shared}/user-add.vue     |  0
 .../components/{ => _shared}/user-update.vue  |  0
 .../users/components/{ => _shared}/user.vue   |  0
 .../customer/customer-profile.vue}            |  0
 .../employee/employee-profile.vue}            |  0
 .../supervisor-staff-profile-list-item.vue}   |  0
 .../supervisor-staff-profile-list.vue}        |  0
 .../supervisor/supervisor-staff.vue           |  0
 src/modules/users/composables/use-accounts.ts |  0
 .../users/composables/use-user-validation.ts  |  0
 src/modules/users/composables/use-users.ts    |  0
 src/modules/users/pages/user-add-page.vue     |  0
 .../users/pages/user-profile-wrapper.vue      |  0
 src/modules/users/services/user-service.ts    |  0
 .../types/user-interface.ts}                  |  0
 src/modules/users/user-store.ts               |  0
 .../pages/page-error.vue => pages/error.vue}  |  0
 .../footer-bars/footer-bar-mobile.vue         | 41 +++----------------
 .../footer-bars/footer-bar-web.vue            |  0
 .../navs => pages}/footer-bars/footer-bar.vue |  0
 src/pages/help.vue                            |  0
 src/pages/index.vue                           |  0
 .../nav-bars/nav-bar-mobile.vue               |  3 +-
 .../navs => pages}/nav-bars/nav-bar-web.vue   |  2 +-
 .../navs => pages}/nav-bars/nav-bar.vue       |  0
 src/{modules => }/router/index.ts             |  0
 src/{modules => }/router/routes.ts            |  0
 src/shared/components/auto-logout.vue         |  0
 .../components/dialogs/dialog-account.vue     |  0
 .../dialogs/dialog-notification.vue           |  0
 .../dialogs/dialog-template-shifts.vue        |  0
 src/shared/components/language-switch.vue     |  0
 src/shared/types/global-interfaces.ts         |  0
 src/{modules => }/stores/alert.store.ts       |  0
 src/{modules => }/stores/index.ts             |  0
 src/{modules => }/stores/store-flag.d.ts      |  0
 src/{modules/shared => }/utils/deep-equal.ts  |  0
 71 files changed, 72 insertions(+), 55 deletions(-)
 create mode 100644 src/assets/logo-targo-green.svg
 rename src/{modules => }/css/app.scss (100%)
 rename src/{modules => }/css/quasar.variables.scss (100%)
 rename src/{modules => }/i18n/en-ca/index.ts (100%)
 rename src/{modules => }/i18n/index.ts (100%)
 rename src/{modules => }/layouts/MainLayout.vue (100%)
 rename src/modules/auth/{auth.config.ts => auth-constants.ts} (100%)
 rename src/modules/{stores/auth.store.ts => auth/auth-store.ts} (77%)
 rename src/modules/auth/{auth.router.ts => components/login-popup-authentik-button.vue} (100%)
 rename src/modules/{dashboard/api/api-admin.ts => auth/components/login-popup.vue} (100%)
 rename src/modules/auth/{api => composables}/use-auth-access.ts (68%)
 rename src/modules/auth/{api => composables}/use-auth-session.ts (71%)
 create mode 100644 src/modules/auth/services/services-auth.ts
 create mode 100644 src/modules/auth/types/auth-interface.ts
 rename src/modules/dashboard/{api/api-customer.ts => composables/use-employee-dashboard.ts} (100%)
 rename src/modules/dashboard/{api/api-dealer.ts => dashboard-constants.ts} (100%)
 rename src/modules/dashboard/{api/api-shared.ts => dashboard-store.ts} (100%)
 rename src/modules/dashboard/{api/api-support.ts => pages/basic-dashboard.vue} (100%)
 rename src/modules/dashboard/{api/api-technician.ts => services/_services-shared.ts} (100%)
 rename src/modules/dashboard/{index.ts => services/services-admin.ts} (100%)
 rename src/modules/{pages/page-help.vue => dashboard/services/services-customer.ts} (100%)
 rename src/modules/{pages/page-index.vue => dashboard/services/services-dealer.ts} (100%)
 rename src/modules/{shared/components/auto-logout.vue => dashboard/services/services-support.ts} (100%)
 rename src/modules/{shared/components/dialogs/dialog-account.vue => dashboard/services/services-technician.ts} (100%)
 rename src/modules/{shared/components/dialogs/dialog-notification.vue => dashboard/types/dashboard-types.ts} (100%)
 rename src/modules/timesheets/{api => composables}/use-expenses-api.ts (100%)
 rename src/modules/timesheets/{api => composables}/use-shift-api.ts (100%)
 rename src/modules/timesheets/{api => composables}/use-timesheet-api.ts (100%)
 rename src/modules/{shared/components/dialogs/dialog-template-shifts.vue => timesheets/services/expense-attachment-services.ts} (100%)
 rename src/modules/{shared/components/language-switch.vue => timesheets/services/expense-services.ts} (100%)
 rename src/modules/{shared/models/models-global.ts => timesheets/services/timesheet-services.ts} (100%)
 rename src/modules/timesheets/{timesheet-config.ts => timesheet-constants.ts} (100%)
 rename src/modules/timesheets/{ => types}/timesheet-types.ts (100%)
 rename src/modules/users/components/{ => _shared}/user-add.vue (100%)
 rename src/modules/users/components/{ => _shared}/user-update.vue (100%)
 rename src/modules/users/components/{ => _shared}/user.vue (100%)
 rename src/modules/users/{api/use-accounts.ts => components/customer/customer-profile.vue} (100%)
 rename src/modules/users/{api/use-users.ts => components/employee/employee-profile.vue} (100%)
 rename src/modules/users/{user-config.ts => components/supervisor/supervisor-staff-profile-list-item.vue} (100%)
 rename src/modules/users/{user-validation.ts => components/supervisor/supervisor-staff-profile-list.vue} (100%)
 create mode 100644 src/modules/users/components/supervisor/supervisor-staff.vue
 create mode 100644 src/modules/users/composables/use-accounts.ts
 create mode 100644 src/modules/users/composables/use-user-validation.ts
 create mode 100644 src/modules/users/composables/use-users.ts
 create mode 100644 src/modules/users/pages/user-add-page.vue
 create mode 100644 src/modules/users/pages/user-profile-wrapper.vue
 create mode 100644 src/modules/users/services/user-service.ts
 rename src/modules/{shared/models/models-user.ts => users/types/user-interface.ts} (100%)
 create mode 100644 src/modules/users/user-store.ts
 rename src/{modules/pages/page-error.vue => pages/error.vue} (100%)
 rename src/{modules/shared/components/navs => pages}/footer-bars/footer-bar-mobile.vue (67%)
 rename src/{modules/shared/components/navs => pages}/footer-bars/footer-bar-web.vue (100%)
 rename src/{modules/shared/components/navs => pages}/footer-bars/footer-bar.vue (100%)
 create mode 100644 src/pages/help.vue
 create mode 100644 src/pages/index.vue
 rename src/{modules/shared/components/navs => pages}/nav-bars/nav-bar-mobile.vue (94%)
 rename src/{modules/shared/components/navs => pages}/nav-bars/nav-bar-web.vue (98%)
 rename src/{modules/shared/components/navs => pages}/nav-bars/nav-bar.vue (100%)
 rename src/{modules => }/router/index.ts (100%)
 rename src/{modules => }/router/routes.ts (100%)
 create mode 100644 src/shared/components/auto-logout.vue
 create mode 100644 src/shared/components/dialogs/dialog-account.vue
 create mode 100644 src/shared/components/dialogs/dialog-notification.vue
 create mode 100644 src/shared/components/dialogs/dialog-template-shifts.vue
 create mode 100644 src/shared/components/language-switch.vue
 create mode 100644 src/shared/types/global-interfaces.ts
 rename src/{modules => }/stores/alert.store.ts (100%)
 rename src/{modules => }/stores/index.ts (100%)
 rename src/{modules => }/stores/store-flag.d.ts (100%)
 rename src/{modules/shared => }/utils/deep-equal.ts (100%)

diff --git a/src/assets/logo-targo-green.svg b/src/assets/logo-targo-green.svg
new file mode 100644
index 0000000..a3e9f51
--- /dev/null
+++ b/src/assets/logo-targo-green.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 326.39 70.35"><defs><style>.cls-1{fill:#019547;}</style></defs><path class="cls-1" d="M25.83,15H8.41a4.14,4.14,0,0,1-3.89-2.71L0,1.18H66.59L62.07,12.27A4.14,4.14,0,0,1,58.18,15H40.76V69.19H25.81Z"/><path class="cls-1" d="M90.74.68h18.55a5.63,5.63,0,0,1,5.63,5.6l.26,62.91H99.55L99.76,54H71.87L66.41,65.51a6.45,6.45,0,0,1-5.84,3.68H49.35L73.53,12.11A18.7,18.7,0,0,1,90.74.68M100,40.73l.07-26h-8a6.75,6.75,0,0,0-6.26,4.18L76.73,40.73Z"/><path class="cls-1" d="M124.51,6.81a5.64,5.64,0,0,1,5.65-5.65H155.6c8.64,0,15.37,2.44,19.81,6.91,3.81,3.78,5.84,9.14,5.84,15.53v.18c0,11-5.92,17.87-14.59,21.1l16.61,24.29h-14a6.51,6.51,0,0,1-5.39-2.87L151.21,47.41H139.44V69.17h-15Zm30.12,27.41c7.28,0,11.45-3.89,11.45-9.62v-.21c0-6.42-4.46-9.7-11.74-9.7H139.46V34.22Z"/><path class="cls-1" d="M184.74,35.37v-.18C184.74,15.85,199.8,0,220.4,0,232.65,0,240,3.31,247.13,9.33l-6.28,7.57a5.18,5.18,0,0,1-6.84,1,23.71,23.71,0,0,0-14.11-4.13c-10.88,0-19.52,9.62-19.52,21.18v.19c0,12.43,8.54,21.57,20.6,21.57a24,24,0,0,0,14.09-4.07V42.91h-8.68A6.41,6.41,0,0,1,220,36.53V30h29.54V59.52a44,44,0,0,1-29,10.78c-21.18,0-35.74-14.8-35.74-34.93"/><path class="cls-1" d="M254.09,35.37v-.18C254.09,15.85,269.33,0,290.33,0s36.06,15.66,36.06,35v.18c0,19.34-15.27,35.19-36.24,35.19s-36.06-15.64-36.06-35m56.63,0v-.18c0-11.67-8.54-21.39-20.6-21.39S269.73,23.34,269.73,35v.18c0,11.67,8.54,21.37,20.6,21.37S310.72,47,310.72,35.37"/></svg>
diff --git a/src/boot/i18n.ts b/src/boot/i18n.ts
index 4b58b2f..c351b01 100644
--- a/src/boot/i18n.ts
+++ b/src/boot/i18n.ts
@@ -5,7 +5,7 @@ import messages from 'src/modules/i18n';
 
 export type MessageLanguages = keyof typeof messages;
 // Type-define 'en-US' as the master schema for the resource
-export type MessageSchema = typeof messages['en-CA'];
+export type MessageSchema = typeof messages['en-ca'];
 
 // See https://vue-i18n.intlify.dev/guide/advanced/typescript.html#global-resource-schema-type-definition
 /* eslint-disable @typescript-eslint/no-empty-object-type */
@@ -23,7 +23,7 @@ declare module 'vue-i18n' {
 
 export default defineBoot(({ app }) => {
   const i18n = createI18n<{ message: MessageSchema }, MessageLanguages>({
-    locale: 'en-CA',
+    locale: 'en-ca',
     legacy: false,
     messages,
   });
diff --git a/src/modules/css/app.scss b/src/css/app.scss
similarity index 100%
rename from src/modules/css/app.scss
rename to src/css/app.scss
diff --git a/src/modules/css/quasar.variables.scss b/src/css/quasar.variables.scss
similarity index 100%
rename from src/modules/css/quasar.variables.scss
rename to src/css/quasar.variables.scss
diff --git a/src/modules/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts
similarity index 100%
rename from src/modules/i18n/en-ca/index.ts
rename to src/i18n/en-ca/index.ts
diff --git a/src/modules/i18n/index.ts b/src/i18n/index.ts
similarity index 100%
rename from src/modules/i18n/index.ts
rename to src/i18n/index.ts
diff --git a/src/modules/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
similarity index 100%
rename from src/modules/layouts/MainLayout.vue
rename to src/layouts/MainLayout.vue
diff --git a/src/modules/auth/auth.config.ts b/src/modules/auth/auth-constants.ts
similarity index 100%
rename from src/modules/auth/auth.config.ts
rename to src/modules/auth/auth-constants.ts
diff --git a/src/modules/stores/auth.store.ts b/src/modules/auth/auth-store.ts
similarity index 77%
rename from src/modules/stores/auth.store.ts
rename to src/modules/auth/auth-store.ts
index ce36a1c..429a120 100644
--- a/src/modules/stores/auth.store.ts
+++ b/src/modules/auth/auth-store.ts
@@ -1,27 +1,21 @@
 import { defineStore } from "pinia";
 import router from "src/modules/router";
 import { api } from "src/boot/axios";
-import { User } from "../shared/components/models/models-user";
+import { User } from "src/modules/users/types/user-interface";
+import { AuthState } from "./types/auth-interface";
 
 
-interface AuthState {
-  token: string | null;
-  user: User;
-  loading: boolean;
-  error: string | null;
-}
-
 export const useAuthStore = defineStore('auth', {
   state: (): AuthState => ({
-    token: null,
+    token: "",
     user:  {
       firstName: 'Guest',
       lastName: 'Guest',
       email: 'guest@guest.com',
       role: 'guest'
-    },
+    } as User,
     loading: false,
-    error: null,
+    error: "",
   }),
 
   getters: {
diff --git a/src/modules/auth/auth.router.ts b/src/modules/auth/components/login-popup-authentik-button.vue
similarity index 100%
rename from src/modules/auth/auth.router.ts
rename to src/modules/auth/components/login-popup-authentik-button.vue
diff --git a/src/modules/dashboard/api/api-admin.ts b/src/modules/auth/components/login-popup.vue
similarity index 100%
rename from src/modules/dashboard/api/api-admin.ts
rename to src/modules/auth/components/login-popup.vue
diff --git a/src/modules/auth/api/use-auth-access.ts b/src/modules/auth/composables/use-auth-access.ts
similarity index 68%
rename from src/modules/auth/api/use-auth-access.ts
rename to src/modules/auth/composables/use-auth-access.ts
index 6261a1a..811d99a 100644
--- a/src/modules/auth/api/use-auth-access.ts
+++ b/src/modules/auth/composables/use-auth-access.ts
@@ -1,4 +1,4 @@
-import { useAuthStore } from "src/modules/stores/auth.store";
+import { useAuthStore } from "src/modules/auth/auth-store";
 
 export const useAuthAccess = () => {
     const authStore = useAuthStore();
@@ -14,4 +14,10 @@ export const useAuthAccess = () => {
     const forgotPassword = async (email: string) => {
         return authStore.forgotPassword(email);
     };
-}
\ No newline at end of file
+
+    return {
+        isLoggedIn,
+        isAuthorizedUser,
+        forgotPassword,
+    };
+};
\ No newline at end of file
diff --git a/src/modules/auth/api/use-auth-session.ts b/src/modules/auth/composables/use-auth-session.ts
similarity index 71%
rename from src/modules/auth/api/use-auth-session.ts
rename to src/modules/auth/composables/use-auth-session.ts
index 77fe5cb..7f3abbe 100644
--- a/src/modules/auth/api/use-auth-session.ts
+++ b/src/modules/auth/composables/use-auth-session.ts
@@ -1,4 +1,4 @@
-import { useAuthStore } from "src/modules/stores/auth.store";
+import { useAuthStore } from "src/modules/auth/auth-store";
 
 export const useAuthSession = () => {
     const authStore = useAuthStore();
@@ -22,4 +22,12 @@ export const useAuthSession = () => {
     const setAuthToken = (token: string) => {
         return authStore.setAuthToken( token );
     };
-}
\ No newline at end of file
+
+    return {
+        login,
+        oidcLogin,
+        logout,
+        setUser,
+        setAuthToken,
+    };
+};
\ No newline at end of file
diff --git a/src/modules/auth/services/services-auth.ts b/src/modules/auth/services/services-auth.ts
new file mode 100644
index 0000000..9e7a54e
--- /dev/null
+++ b/src/modules/auth/services/services-auth.ts
@@ -0,0 +1,30 @@
+import { api } from 'src/boot/axios';
+
+export const AuthService = {
+    // Will likely be deprecated and relegated to Authentik
+    login: (credentials: { email: string; password: string }) => {
+        // TODO: possibly add some kind of login logic, but will most likely be redirected
+        //       to Authentik as well.
+        api.post('/auth/login', credentials)
+    },
+
+    oidcLogin: () => {
+        // TODO: OIDC login logic
+        api.post('/auth/oidclogin');
+    },
+
+    logout: () => {
+        // TODO: logout logic
+        api.post('/auth/logout')
+    },
+
+    refreshToken: () => {
+        // TODO: token refresh logic
+        api.post('/auth/refresh')
+    },
+
+    getProfile: () => {
+        // TODO: user info fetch logic
+        api.get('/auth/me')
+    },
+};
diff --git a/src/modules/auth/types/auth-interface.ts b/src/modules/auth/types/auth-interface.ts
new file mode 100644
index 0000000..e1bc12c
--- /dev/null
+++ b/src/modules/auth/types/auth-interface.ts
@@ -0,0 +1,8 @@
+import { User } from "src/modules/users/types/user-interface";
+
+export interface AuthState {
+  token: string;
+  user: User;
+  loading: boolean;
+  error: string;
+}
diff --git a/src/modules/dashboard/api/api-customer.ts b/src/modules/dashboard/composables/use-employee-dashboard.ts
similarity index 100%
rename from src/modules/dashboard/api/api-customer.ts
rename to src/modules/dashboard/composables/use-employee-dashboard.ts
diff --git a/src/modules/dashboard/api/api-dealer.ts b/src/modules/dashboard/dashboard-constants.ts
similarity index 100%
rename from src/modules/dashboard/api/api-dealer.ts
rename to src/modules/dashboard/dashboard-constants.ts
diff --git a/src/modules/dashboard/api/api-shared.ts b/src/modules/dashboard/dashboard-store.ts
similarity index 100%
rename from src/modules/dashboard/api/api-shared.ts
rename to src/modules/dashboard/dashboard-store.ts
diff --git a/src/modules/dashboard/api/api-support.ts b/src/modules/dashboard/pages/basic-dashboard.vue
similarity index 100%
rename from src/modules/dashboard/api/api-support.ts
rename to src/modules/dashboard/pages/basic-dashboard.vue
diff --git a/src/modules/dashboard/api/api-technician.ts b/src/modules/dashboard/services/_services-shared.ts
similarity index 100%
rename from src/modules/dashboard/api/api-technician.ts
rename to src/modules/dashboard/services/_services-shared.ts
diff --git a/src/modules/dashboard/index.ts b/src/modules/dashboard/services/services-admin.ts
similarity index 100%
rename from src/modules/dashboard/index.ts
rename to src/modules/dashboard/services/services-admin.ts
diff --git a/src/modules/pages/page-help.vue b/src/modules/dashboard/services/services-customer.ts
similarity index 100%
rename from src/modules/pages/page-help.vue
rename to src/modules/dashboard/services/services-customer.ts
diff --git a/src/modules/pages/page-index.vue b/src/modules/dashboard/services/services-dealer.ts
similarity index 100%
rename from src/modules/pages/page-index.vue
rename to src/modules/dashboard/services/services-dealer.ts
diff --git a/src/modules/shared/components/auto-logout.vue b/src/modules/dashboard/services/services-support.ts
similarity index 100%
rename from src/modules/shared/components/auto-logout.vue
rename to src/modules/dashboard/services/services-support.ts
diff --git a/src/modules/shared/components/dialogs/dialog-account.vue b/src/modules/dashboard/services/services-technician.ts
similarity index 100%
rename from src/modules/shared/components/dialogs/dialog-account.vue
rename to src/modules/dashboard/services/services-technician.ts
diff --git a/src/modules/shared/components/dialogs/dialog-notification.vue b/src/modules/dashboard/types/dashboard-types.ts
similarity index 100%
rename from src/modules/shared/components/dialogs/dialog-notification.vue
rename to src/modules/dashboard/types/dashboard-types.ts
diff --git a/src/modules/timesheets/api/use-expenses-api.ts b/src/modules/timesheets/composables/use-expenses-api.ts
similarity index 100%
rename from src/modules/timesheets/api/use-expenses-api.ts
rename to src/modules/timesheets/composables/use-expenses-api.ts
diff --git a/src/modules/timesheets/api/use-shift-api.ts b/src/modules/timesheets/composables/use-shift-api.ts
similarity index 100%
rename from src/modules/timesheets/api/use-shift-api.ts
rename to src/modules/timesheets/composables/use-shift-api.ts
diff --git a/src/modules/timesheets/api/use-timesheet-api.ts b/src/modules/timesheets/composables/use-timesheet-api.ts
similarity index 100%
rename from src/modules/timesheets/api/use-timesheet-api.ts
rename to src/modules/timesheets/composables/use-timesheet-api.ts
diff --git a/src/modules/shared/components/dialogs/dialog-template-shifts.vue b/src/modules/timesheets/services/expense-attachment-services.ts
similarity index 100%
rename from src/modules/shared/components/dialogs/dialog-template-shifts.vue
rename to src/modules/timesheets/services/expense-attachment-services.ts
diff --git a/src/modules/shared/components/language-switch.vue b/src/modules/timesheets/services/expense-services.ts
similarity index 100%
rename from src/modules/shared/components/language-switch.vue
rename to src/modules/timesheets/services/expense-services.ts
diff --git a/src/modules/shared/models/models-global.ts b/src/modules/timesheets/services/timesheet-services.ts
similarity index 100%
rename from src/modules/shared/models/models-global.ts
rename to src/modules/timesheets/services/timesheet-services.ts
diff --git a/src/modules/timesheets/timesheet-config.ts b/src/modules/timesheets/timesheet-constants.ts
similarity index 100%
rename from src/modules/timesheets/timesheet-config.ts
rename to src/modules/timesheets/timesheet-constants.ts
diff --git a/src/modules/timesheets/timesheet-types.ts b/src/modules/timesheets/types/timesheet-types.ts
similarity index 100%
rename from src/modules/timesheets/timesheet-types.ts
rename to src/modules/timesheets/types/timesheet-types.ts
diff --git a/src/modules/users/components/user-add.vue b/src/modules/users/components/_shared/user-add.vue
similarity index 100%
rename from src/modules/users/components/user-add.vue
rename to src/modules/users/components/_shared/user-add.vue
diff --git a/src/modules/users/components/user-update.vue b/src/modules/users/components/_shared/user-update.vue
similarity index 100%
rename from src/modules/users/components/user-update.vue
rename to src/modules/users/components/_shared/user-update.vue
diff --git a/src/modules/users/components/user.vue b/src/modules/users/components/_shared/user.vue
similarity index 100%
rename from src/modules/users/components/user.vue
rename to src/modules/users/components/_shared/user.vue
diff --git a/src/modules/users/api/use-accounts.ts b/src/modules/users/components/customer/customer-profile.vue
similarity index 100%
rename from src/modules/users/api/use-accounts.ts
rename to src/modules/users/components/customer/customer-profile.vue
diff --git a/src/modules/users/api/use-users.ts b/src/modules/users/components/employee/employee-profile.vue
similarity index 100%
rename from src/modules/users/api/use-users.ts
rename to src/modules/users/components/employee/employee-profile.vue
diff --git a/src/modules/users/user-config.ts b/src/modules/users/components/supervisor/supervisor-staff-profile-list-item.vue
similarity index 100%
rename from src/modules/users/user-config.ts
rename to src/modules/users/components/supervisor/supervisor-staff-profile-list-item.vue
diff --git a/src/modules/users/user-validation.ts b/src/modules/users/components/supervisor/supervisor-staff-profile-list.vue
similarity index 100%
rename from src/modules/users/user-validation.ts
rename to src/modules/users/components/supervisor/supervisor-staff-profile-list.vue
diff --git a/src/modules/users/components/supervisor/supervisor-staff.vue b/src/modules/users/components/supervisor/supervisor-staff.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/users/composables/use-accounts.ts b/src/modules/users/composables/use-accounts.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/users/composables/use-user-validation.ts b/src/modules/users/composables/use-user-validation.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/users/composables/use-users.ts b/src/modules/users/composables/use-users.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/users/pages/user-add-page.vue b/src/modules/users/pages/user-add-page.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/users/pages/user-profile-wrapper.vue b/src/modules/users/pages/user-profile-wrapper.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/users/services/user-service.ts b/src/modules/users/services/user-service.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/shared/models/models-user.ts b/src/modules/users/types/user-interface.ts
similarity index 100%
rename from src/modules/shared/models/models-user.ts
rename to src/modules/users/types/user-interface.ts
diff --git a/src/modules/users/user-store.ts b/src/modules/users/user-store.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/pages/page-error.vue b/src/pages/error.vue
similarity index 100%
rename from src/modules/pages/page-error.vue
rename to src/pages/error.vue
diff --git a/src/modules/shared/components/navs/footer-bars/footer-bar-mobile.vue b/src/pages/footer-bars/footer-bar-mobile.vue
similarity index 67%
rename from src/modules/shared/components/navs/footer-bars/footer-bar-mobile.vue
rename to src/pages/footer-bars/footer-bar-mobile.vue
index e7a7812..eff9296 100644
--- a/src/modules/shared/components/navs/footer-bars/footer-bar-mobile.vue
+++ b/src/pages/footer-bars/footer-bar-mobile.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
   import { ref } from 'vue';
   import { useRouter, useRoute } from 'vue-router';
-  import { useAuthStore } from 'src/modules/stores/auth.store';
+  import { useAuthStore } from 'src/modules/auth/auth-store';
   // import { getInitials } from 'src/helpers/object';
 
   const route = useRoute();
@@ -35,46 +35,21 @@
 
 <template>
   <q-footer bordered class="bg-white">
-    <q-tabs
-      no-caps
-      active-color="primary"
-      indicator-color="transparent"
-      class="text-grey-8"
-    >
+    <q-tabs no-caps active-color="primary" indicator-color="transparent" class="text-grey-8">
       <q-tab name="home" icon="home" @click="goToHome" />
       <!-- <q-tab name="help" icon="help" @click="goToHelp" /> -->
       <q-tab name="menu" icon="menu" @click="toggleLeftDrawer" />
       <q-drawer v-model="leftDrawerOpen" side="right">
-        <q-scroll-area
-          style="
-            height: calc(100% - 150px);
-            margin-top: 150px;
-            border-right: 1px solid #ddd;
-          "
-        >
+        <q-scroll-area style="height: calc(100% - 150px); margin-top: 150px; border-right: 1px solid #ddd;">
           <q-list padding>
-            <q-item
-              clickable
-              v-ripple
-              :active="route.path === '/users'"
-              active-class="bg-primary text-white"
-              @click="goToUsers"
-              v-if="userRole === 'admin'"
-            >
+            <q-item clickable v-ripple :active="route.path === '/users'" active-class="bg-primary text-white" @click="goToUsers" v-if="userRole === 'admin'">
               <q-item-section avatar>
                 <q-icon name="list" />
               </q-item-section>
 
               <q-item-section> {{ $t('navBar.navItem_1') }} </q-item-section>
             </q-item>
-            <q-item
-              clickable
-              v-ripple
-              :active="route.path === '/time_sheet_validations'"
-              active-class="bg-primary text-white"
-              @click="goToShiftsValidations"
-              v-if="userRole === 'admin'"
-            >
+            <q-item clickable v-ripple :active="route.path === '/time_sheet_validations'" active-class="bg-primary text-white" @click="goToShiftsValidations" v-if="userRole === 'admin'">
               <q-item-section avatar>
                 <q-icon name="supervisor_account" />
               </q-item-section>
@@ -84,11 +59,7 @@
           </q-list>
         </q-scroll-area>
 
-        <q-img
-          class="absolute-top"
-          src="https://cdn.quasar.dev/img/material.png"
-          style="height: 150px"
-        >
+        <q-img class="absolute-top" src="https://cdn.quasar.dev/img/material.png" style="height: 150px">
           <div class="absolute-bottom bg-transparent">
             <!-- <q-avatar color="primary" size="68px" class="q-mb-sm">
               {{
diff --git a/src/modules/shared/components/navs/footer-bars/footer-bar-web.vue b/src/pages/footer-bars/footer-bar-web.vue
similarity index 100%
rename from src/modules/shared/components/navs/footer-bars/footer-bar-web.vue
rename to src/pages/footer-bars/footer-bar-web.vue
diff --git a/src/modules/shared/components/navs/footer-bars/footer-bar.vue b/src/pages/footer-bars/footer-bar.vue
similarity index 100%
rename from src/modules/shared/components/navs/footer-bars/footer-bar.vue
rename to src/pages/footer-bars/footer-bar.vue
diff --git a/src/pages/help.vue b/src/pages/help.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/index.vue b/src/pages/index.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/shared/components/navs/nav-bars/nav-bar-mobile.vue b/src/pages/nav-bars/nav-bar-mobile.vue
similarity index 94%
rename from src/modules/shared/components/navs/nav-bars/nav-bar-mobile.vue
rename to src/pages/nav-bars/nav-bar-mobile.vue
index 2a7e3c2..bd32651 100644
--- a/src/modules/shared/components/navs/nav-bars/nav-bar-mobile.vue
+++ b/src/pages/nav-bars/nav-bar-mobile.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
   import { useRoute } from 'vue-router';
   import { computed } from 'vue';
-  import { useAuthStore } from 'src/modules/stores/auth.store';
+  import { useAuthStore } from 'src/modules/auth/auth-store';
   // import dialogs from 'src/components/dialogs';
 
   const authStore = useAuthStore();
@@ -19,7 +19,6 @@
   );
 </script>
 
-
 <template>
   <q-toolbar v-if="!isBackRoute">
     <q-toolbar-title>
diff --git a/src/modules/shared/components/navs/nav-bars/nav-bar-web.vue b/src/pages/nav-bars/nav-bar-web.vue
similarity index 98%
rename from src/modules/shared/components/navs/nav-bars/nav-bar-web.vue
rename to src/pages/nav-bars/nav-bar-web.vue
index 5586750..1a3505e 100644
--- a/src/modules/shared/components/navs/nav-bars/nav-bar-web.vue
+++ b/src/pages/nav-bars/nav-bar-web.vue
@@ -96,7 +96,7 @@
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 // import { getInitials } from 'src/helpers/object';
-import { useAuthStore } from 'src/modules/stores/auth.store';
+import { useAuthStore } from 'src/modules/auth/auth-store';
 import LangSwitch from 'src/components/LangSwitch.vue';
 // import dialogs from 'src/components/dialogs';
 // import authenticationApi from 'src/composables/useAuthentication';
diff --git a/src/modules/shared/components/navs/nav-bars/nav-bar.vue b/src/pages/nav-bars/nav-bar.vue
similarity index 100%
rename from src/modules/shared/components/navs/nav-bars/nav-bar.vue
rename to src/pages/nav-bars/nav-bar.vue
diff --git a/src/modules/router/index.ts b/src/router/index.ts
similarity index 100%
rename from src/modules/router/index.ts
rename to src/router/index.ts
diff --git a/src/modules/router/routes.ts b/src/router/routes.ts
similarity index 100%
rename from src/modules/router/routes.ts
rename to src/router/routes.ts
diff --git a/src/shared/components/auto-logout.vue b/src/shared/components/auto-logout.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/shared/components/dialogs/dialog-account.vue b/src/shared/components/dialogs/dialog-account.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/shared/components/dialogs/dialog-notification.vue b/src/shared/components/dialogs/dialog-notification.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/shared/components/dialogs/dialog-template-shifts.vue b/src/shared/components/dialogs/dialog-template-shifts.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/shared/components/language-switch.vue b/src/shared/components/language-switch.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/shared/types/global-interfaces.ts b/src/shared/types/global-interfaces.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/stores/alert.store.ts b/src/stores/alert.store.ts
similarity index 100%
rename from src/modules/stores/alert.store.ts
rename to src/stores/alert.store.ts
diff --git a/src/modules/stores/index.ts b/src/stores/index.ts
similarity index 100%
rename from src/modules/stores/index.ts
rename to src/stores/index.ts
diff --git a/src/modules/stores/store-flag.d.ts b/src/stores/store-flag.d.ts
similarity index 100%
rename from src/modules/stores/store-flag.d.ts
rename to src/stores/store-flag.d.ts
diff --git a/src/modules/shared/utils/deep-equal.ts b/src/utils/deep-equal.ts
similarity index 100%
rename from src/modules/shared/utils/deep-equal.ts
rename to src/utils/deep-equal.ts