From 7d4b7236dd292f2680af8f23d334885b5b317e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9rick=20Pruneau?= Date: Thu, 12 Mar 2026 09:39:20 -0400 Subject: [PATCH 1/3] Update du docker compose Ceci est la version en prod en ayant enlever les informations sensibles dans le Dockerfile des deux services. Tout est maintenant avec des variables d'environnements. --- docker-compose.yaml | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f09bd4c..e327356 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,26 +1,37 @@ --- name: app-targo services: - backend: - build: - context: https://git.targo.ca/Targo/targo_backend.git - args: - - CALLBACK_URL=http://${SERVER_IP}:${BACKEND_PUBLIC_PORT}/auth/callback + backend: + image: git.targo.ca/targo/targo-backend-staging:latest environment: - - REDIRECT_URL_DEV=http://${SERVER_IP}:${FRONTEND_PUBLIC_PORT}/#/login-success + AUTHENTIK_ISSUER: "${OIDC_ISSUER}" + AUTHENTIK_CLIENT_ID: "${OIDC_CLIENT_ID}" + AUTHENTIK_CLIENT_SECRET: "${OIDC_CLIENT_SECRET}" + AUTHENTIK_AUTH_URL: "${OIDC_AUTH_URL}" + AUTHENTIK_TOKEN_URL: "${OIDC_TOKEN_URL}" + AUTHENTIK_USERINFO_URL: "${OIDC_USERINFO_URL}" + AUTHENTIK_CALLBACK_URL: "${CALLBACK_URL}" + REDIRECT_URL_DEV: "https://${URL}/#/login-success" + DATABASE_URL: "${DATABASE_URL}" + + ### A ENLEVER SI CE N'EST PAS DANS PORTAINER ### env_file: - stack.env + ####### + ports: - ${BACKEND_PUBLIC_PORT}:3000 frontend: - build: - context: https://git.targo.ca/Targo/targo_frontend.git - args: - - BACKEND_URL=http://${SERVER_IP}:${BACKEND_PUBLIC_PORT}/ - volumes: - - .:/app + image: git.targo.ca/targo/targo-frontend-staging:latest env_file: - stack.env + environment: + # Where your built files live in the container + ASSET_DIR: /usr/share/nginx/html + # Prefix used for placeholder detection + APP_PREFIX: PREFIX_ + # Real values for your frontend to consume + PREFIX_BACKEND_URL: "https://be-staging.app.targo.ca/" ports: - ${FRONTEND_PUBLIC_PORT}:80 \ No newline at end of file From d4cbb90819af90bef087b9a4a2b277afe3031cb9 Mon Sep 17 00:00:00 2001 From: Matthieu Haineault Date: Mon, 16 Mar 2026 09:43:25 -0400 Subject: [PATCH 2/3] feat(csv): modified the generated name of the csv file to match the accounting needs. --- src/modules/timesheet-approval/components/overview-report.vue | 2 +- src/modules/timesheets/components/shift-list.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/timesheet-approval/components/overview-report.vue b/src/modules/timesheet-approval/components/overview-report.vue index a829fbb..ee2cf83 100644 --- a/src/modules/timesheet-approval/components/overview-report.vue +++ b/src/modules/timesheet-approval/components/overview-report.vue @@ -43,7 +43,7 @@ const onClickedDownload = async () => { const types = Object.entries(report_filter_options.value) .filter(([key, value]) => value && ['shifts', 'expenses', 'holiday', 'vacation'].includes(key)).map(([key]) => key).join('-'); - const file_name = `Desjardins_${companies}_${types}_${new Date().toISOString().split('T')[0]}.csv`; + const file_name = `${companies}_${types}_${timesheet_store.pay_period?.pay_period_no}-${timesheet_store.pay_period?.pay_year}_${timesheet_store.pay_period?.period_start}-${timesheet_store.pay_period?.period_end}.csv`; const blob = new Blob([data], { type: 'text/csv;charset=utf-8;' }); const url = window.URL.createObjectURL(blob); diff --git a/src/modules/timesheets/components/shift-list.vue b/src/modules/timesheets/components/shift-list.vue index f1f04b7..ef0cc42 100644 --- a/src/modules/timesheets/components/shift-list.vue +++ b/src/modules/timesheets/components/shift-list.vue @@ -101,7 +101,8 @@
Date: Mon, 16 Mar 2026 11:03:00 -0400 Subject: [PATCH 3/3] fix(csv): fix the name of the csv file to match : period year, period num, company, type of rows, period start and period end dates --- src/modules/timesheet-approval/components/overview-report.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/timesheet-approval/components/overview-report.vue b/src/modules/timesheet-approval/components/overview-report.vue index ee2cf83..6bed558 100644 --- a/src/modules/timesheet-approval/components/overview-report.vue +++ b/src/modules/timesheet-approval/components/overview-report.vue @@ -43,7 +43,7 @@ const onClickedDownload = async () => { const types = Object.entries(report_filter_options.value) .filter(([key, value]) => value && ['shifts', 'expenses', 'holiday', 'vacation'].includes(key)).map(([key]) => key).join('-'); - const file_name = `${companies}_${types}_${timesheet_store.pay_period?.pay_period_no}-${timesheet_store.pay_period?.pay_year}_${timesheet_store.pay_period?.period_start}-${timesheet_store.pay_period?.period_end}.csv`; + const file_name = `${timesheet_store.pay_period?.pay_year}-${timesheet_store.pay_period?.pay_period_no}_${companies}_${types}_${timesheet_store.pay_period?.period_start}-${timesheet_store.pay_period?.period_end}.csv`; const blob = new Blob([data], { type: 'text/csv;charset=utf-8;' }); const url = window.URL.createObjectURL(blob);