diff --git a/src/assets/targo-default-avatar.png b/src/assets/targo-default-avatar.png index 1893831..a6751b2 100644 Binary files a/src/assets/targo-default-avatar.png and b/src/assets/targo-default-avatar.png differ diff --git a/src/boot/axios.ts b/src/boot/axios.ts index cda3340..0ad51d2 100644 --- a/src/boot/axios.ts +++ b/src/boot/axios.ts @@ -14,7 +14,7 @@ declare module 'vue' { // good idea to move this instance creation inside of the // "export default () => {}" function below (which runs individually // for each client) -const api = axios.create({ baseURL: import.meta.env.VITE_TARGO_BACKEND_URL }); +const api = axios.create({ baseURL: import.meta.env.VITE_TARGO_BACKEND_AUTH_URL }); export default defineBoot(({ app }) => { // for use inside Vue files (Options API) through this.$axios and this.$api 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 fce462c..1c592ed 100644 --- a/src/i18n/en-ca/index.ts +++ b/src/i18n/en-ca/index.ts @@ -140,20 +140,16 @@ export default { card_4: 'Customers', }, usersListPage: { - tableHeader: 'Users list', - search_input: 'Search', - tableCol_1: 'Status', - tableCol_2: 'First name', - tableCol_3: 'Last name', - tableCol_4: 'Email', - tableCol_5: 'Phone number', - tableCol_6: 'User type', - tableCol_7: 'Role', - tableCol_8: 'Created by', - tableCol_9: 'Supervisor', - activeStatus: 'Active', - unActiveStatus: 'Unactive', - addButton: 'Click here to add a new user', + tableHeader: 'Employee list', + searchInput: 'Search', + userListFirstName: 'First name', + userListLastName: 'Last name', + userListEmail: 'Email', + userListPhone: 'Phone number', + userListRole: 'Role', + userListSupervisor: 'Supervisor', + userListCompany: 'Company', + addButton: 'Add Employee', customer: 'Customer', dealer: 'Dealer', employee: 'Employee', @@ -161,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 7f9db97..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', @@ -372,20 +375,16 @@ export default { unlockToolTip: 'Déverrouiller la semaine', }, usersListPage: { - tableHeader: 'Liste des utilisateurs', - search_input: 'Rechercher', - tableCol_1: 'État', - tableCol_2: 'Prénom', - tableCol_3: 'Nom de famille', - tableCol_4: 'Email', - tableCol_5: 'Numéro de téléphone', - tableCol_6: 'Type d’utilisateur', - tableCol_7: 'Role', - tableCol_8: 'Créé par', - tableCol_9: 'Superviseur', - activeStatus: 'Actif', - unActiveStatus: 'Inactif', - addButton: 'Cliquez ici pour ajouter un nouvel utilisateur', + tableHeader: 'Liste d’employées', + searchInput: 'rechercher', + userListFirstName: 'prénom', + userListLastName: 'nom de famille', + userListEmail: 'courriel', + userListPhone: '# téléphone', + userListRole: 'rôle', + userListSupervisor: 'superviseur', + userListCompany: 'Compagnie', + addButton: 'Ajouter employé', customer: 'Client', dealer: 'Marchand', employee: 'Employé', diff --git a/src/layouts/main-layout.vue b/src/layouts/main-layout.vue index 517723a..4ea70aa 100644 --- a/src/layouts/main-layout.vue +++ b/src/layouts/main-layout.vue @@ -10,7 +10,7 @@ - + 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-profile-list-item.vue b/src/modules/employee-list/components/supervisor/supervisor-crew-profile-list-item.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/components/supervisor/supervisor-crew-profile-list.vue b/src/modules/employee-list/components/supervisor/supervisor-crew-profile-list.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 new file mode 100644 index 0000000..5da5f32 --- /dev/null +++ b/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue @@ -0,0 +1,54 @@ + + + \ No newline at end of file diff --git a/src/modules/employee-list/components/supervisor/supervisor-crew-table.vue b/src/modules/employee-list/components/supervisor/supervisor-crew-table.vue new file mode 100644 index 0000000..62f8989 --- /dev/null +++ b/src/modules/employee-list/components/supervisor/supervisor-crew-table.vue @@ -0,0 +1,79 @@ + + + \ No newline at end of file diff --git a/src/modules/employee-list/components/supervisor/supervisor-crew.vue b/src/modules/employee-list/components/supervisor/supervisor-crew.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/composables/use-accounts.ts b/src/modules/employee-list/composables/use-accounts.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/composables/use-employee-api.ts b/src/modules/employee-list/composables/use-employee-api.ts new file mode 100644 index 0000000..12ec52f --- /dev/null +++ b/src/modules/employee-list/composables/use-employee-api.ts @@ -0,0 +1,18 @@ +import { useEmployeeStore } from "src/stores/employee-store"; + +export const useEmployeeListApi = () => { + const employeeListStore = useEmployeeStore(); + + const getEmployeeList = (): Promise => { + return employeeListStore.getEmployeeList(); + }; + + const getEmployeeDetails = (email: string): Promise => { + return employeeListStore.getEmployeeDetails(email); + } + + return { + getEmployeeList, + getEmployeeDetails, + }; +}; \ No newline at end of file diff --git a/src/modules/employee-list/composables/use-user-validation.ts b/src/modules/employee-list/composables/use-user-validation.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/composables/use-users.ts b/src/modules/employee-list/composables/use-users.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/employee-store.ts b/src/modules/employee-list/employee-store.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/components/_shared/user-container-add.vue b/src/modules/employee-list/pages/supervisor-crew-add-employee-page.vue similarity index 100% rename from src/modules/employee-list/components/_shared/user-container-add.vue rename to src/modules/employee-list/pages/supervisor-crew-add-employee-page.vue diff --git a/src/modules/employee-list/pages/supervisor-crew-page.vue b/src/modules/employee-list/pages/supervisor-crew-page.vue new file mode 100644 index 0000000..70471a2 --- /dev/null +++ b/src/modules/employee-list/pages/supervisor-crew-page.vue @@ -0,0 +1,14 @@ + + + \ No newline at end of file diff --git a/src/modules/employee-list/pages/user-add-page.vue b/src/modules/employee-list/pages/user-add-page.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/pages/user-profile-wrapper.vue b/src/modules/employee-list/pages/user-profile-wrapper.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/services/services-employee-list.ts b/src/modules/employee-list/services/services-employee-list.ts new file mode 100644 index 0000000..cc36b98 --- /dev/null +++ b/src/modules/employee-list/services/services-employee-list.ts @@ -0,0 +1,17 @@ +// /* eslint-disable */ +import { api } from 'src/boot/axios'; +import type { EmployeeListTableItem } from '../types/employee-list-table-interface'; +import type { EmployeeProfile } from '../types/employee-profile-interface'; + + +export const EmployeeListService = { + getEmployeeList: async (): Promise => { + const response = await api.get('/employees/employee-list') + return response.data; + }, + + getEmployeeDetails: async (email: string): Promise => { + const response = await api.get('employees/profile/' + email); + return response.data; + }, +}; \ No newline at end of file diff --git a/src/modules/employee-list/services/user-service.ts b/src/modules/employee-list/services/user-service.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/modules/employee-list/types/employee-list-table-interface.ts b/src/modules/employee-list/types/employee-list-table-interface.ts new file mode 100644 index 0000000..43feb85 --- /dev/null +++ b/src/modules/employee-list/types/employee-list-table-interface.ts @@ -0,0 +1,8 @@ +export interface EmployeeListTableItem { + first_name: string; + last_name: string; + email: string; + supervisor_full_name: string | null; + company_name: number; + job_title: string; +}; \ No newline at end of file diff --git a/src/modules/employee-list/types/employee-profile-interface.ts b/src/modules/employee-list/types/employee-profile-interface.ts new file mode 100644 index 0000000..9285c85 --- /dev/null +++ b/src/modules/employee-list/types/employee-profile-interface.ts @@ -0,0 +1,12 @@ +export interface EmployeeProfile { + first_name: string; + last_name: string; + supervisor_full_name: string; + company_name: number; + job_title: string; + email: string; + phone_number: number; + first_work_day: string; + last_work_day: string; + residence: string; +} \ No newline at end of file diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue index b63112c..ee23bba 100644 --- a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue +++ b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue @@ -70,7 +70,7 @@
{{ props.row.employee_name }}
- {{ col.value }} + {{ col.value }} {{ col.label }}
diff --git a/src/pages/test-page.vue b/src/pages/test-page.vue index b5cd91a..5ab28f6 100644 --- a/src/pages/test-page.vue +++ b/src/pages/test-page.vue @@ -12,7 +12,7 @@