diff --git a/src/css/app.scss b/src/css/app.scss index cce9126..74df4ee 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -18,4 +18,8 @@ } .bg-authentik-orange { background: #fd4b2d !important; +} + +.q-table tbody tr:hover { + background: #00ff260c; } \ No newline at end of file diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts index 77ddbae..1c592ed 100644 --- a/src/i18n/en-ca/index.ts +++ b/src/i18n/en-ca/index.ts @@ -149,7 +149,7 @@ export default { userListRole: 'Role', userListSupervisor: 'Supervisor', userListCompany: 'Company', - addButton: 'Click here to add a new user', + addButton: 'Add Employee', customer: 'Customer', dealer: 'Dealer', employee: 'Employee', @@ -157,6 +157,9 @@ export default { admin: 'Administrator', support: 'Support', }, + shared:{ + searchBar: 'Search', + }, editUserPage: { title: 'Edit Account', passwordTitle: 'Reset Password', diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts index ba465c4..59dfd5b 100644 --- a/src/i18n/fr-ca/index.ts +++ b/src/i18n/fr-ca/index.ts @@ -226,6 +226,9 @@ export default { submit: 'Envoyer', cancel: 'Annuler', }, + shared:{ + searchBar: 'Rechercher', + }, shiftColumns: { title: 'Quarts de travail', column_1: 'Type', @@ -381,7 +384,7 @@ export default { userListRole: 'rôle', userListSupervisor: 'superviseur', userListCompany: 'Compagnie', - addButton: 'Cliquez ici pour ajouter un nouvel utilisateur', + addButton: 'Ajouter employé', customer: 'Client', dealer: 'Marchand', employee: 'Employé', diff --git a/src/modules/employee-list/components/_shared/user-container-add.vue b/src/modules/employee-list/components/_shared/user-container-add.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/components/_shared/user-container-update.vue b/src/modules/employee-list/components/_shared/user-container-update.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/components/_shared/user-container.vue b/src/modules/employee-list/components/_shared/user-container.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/components/employee/employee-list-add-modify-dialog.vue b/src/modules/employee-list/components/employee/employee-list-add-modify-dialog.vue new file mode 100644 index 0000000..5c1fffe --- /dev/null +++ b/src/modules/employee-list/components/employee/employee-list-add-modify-dialog.vue @@ -0,0 +1,16 @@ + + + \ No newline at end of file diff --git a/src/modules/employee-list/components/employee/employee-profile.vue b/src/modules/employee-list/components/employee/employee-profile.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue b/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue index 38dbd2f..5da5f32 100644 --- a/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue +++ b/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue @@ -1,19 +1,34 @@ \ No newline at end of file diff --git a/src/modules/employee-list/composables/use-employee-api.ts b/src/modules/employee-list/composables/use-employee-api.ts index cddc3ac..12ec52f 100644 --- a/src/modules/employee-list/composables/use-employee-api.ts +++ b/src/modules/employee-list/composables/use-employee-api.ts @@ -3,50 +3,16 @@ import { useEmployeeStore } from "src/stores/employee-store"; export const useEmployeeListApi = () => { const employeeListStore = useEmployeeStore(); - const getEmployeeList = () => { - employeeListStore.getEmployeeList().catch(err => { - console.log("Ran into an API error fetching employee list: ", err); - }); + const getEmployeeList = (): Promise => { + return employeeListStore.getEmployeeList(); }; + const getEmployeeDetails = (email: string): Promise => { + return employeeListStore.getEmployeeDetails(email); + } + return { getEmployeeList, + getEmployeeDetails, }; -}; - -// import { useAuthStore } from "../../../stores/auth-store"; -// import type { User } from "src/modules/shared/types/user-interface"; - -// export const useAuthApi = () => { -// const authStore = useAuthStore(); - - - -// const login = () => { -// authStore.login(); -// }; - -// const oidcLogin = () => { -// authStore.oidcLogin(); -// }; - -// const logout = () => { -// authStore.logout(); -// }; - -// const isAuthorizedUser = () => { -// return authStore.isAuthorizedUser; -// }; - -// const setUser = (currentUser: User) => { -// authStore.user = currentUser; -// } - -// return { -// login, -// oidcLogin, -// logout, -// isAuthorizedUser, -// setUser, -// }; -// }; \ No newline at end of file +}; \ No newline at end of file diff --git a/src/modules/employee-list/pages/supervisor-crew-page.vue b/src/modules/employee-list/pages/supervisor-crew-page.vue index 90523ce..70471a2 100644 --- a/src/modules/employee-list/pages/supervisor-crew-page.vue +++ b/src/modules/employee-list/pages/supervisor-crew-page.vue @@ -1,10 +1,11 @@