From d0f2cd4c95d921a9281b891ddc9f42bda6aec10f Mon Sep 17 00:00:00 2001 From: Arthur Dodin Date: Wed, 24 Jun 2026 14:19:47 +0200 Subject: [PATCH 1/2] feat: roadbook can be disable by empty env var --- .../src/components/roadbook/roadbookCard.tsx | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/roadbook/roadbookCard.tsx b/frontend/src/components/roadbook/roadbookCard.tsx index 1d30ca4..456d8c7 100644 --- a/frontend/src/components/roadbook/roadbookCard.tsx +++ b/frontend/src/components/roadbook/roadbookCard.tsx @@ -3,7 +3,12 @@ import { Link } from "react-router-dom"; import { Button } from "../ui/button"; import { Card } from "../ui/card"; -export const RoadBookCard = () => ( +export const RoadBookCard = () => { + + const roadbookUrlFrench = import.meta.env.VITE_ROADBOOK_URL_FRENCH; + const roadbookUrlEnglish = import.meta.env.VITE_ROADBOOK_URL_ENGLISH; + + return (

@@ -27,19 +32,28 @@ export const RoadBookCard = () => (

- - - - {/* - - */} -

An english version will be available soon !

+ {roadbookUrlFrench ? ( + + + + ) : ( +

+ Le Roadbook n'est pas encore disponible. +

+ )} + {roadbookUrlEnglish ? ( + + + + ) : ( +

An english version will be available soon !

+ )}
-); +)}; From 7e47caeca26e7b1464e2222bbe80180c2ed34272 Mon Sep 17 00:00:00 2001 From: Arthur Dodin Date: Wed, 24 Jun 2026 14:20:00 +0200 Subject: [PATCH 2/2] fix(ci): best control of github env & vars --- .github/workflows/ci.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 47fb8aa..a0881c2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -77,7 +77,7 @@ jobs: build-front: runs-on: self-hosted - if : github.event_name == 'pull_request' + if : github.event_name == 'pull_request' needs: - lint-front steps: @@ -101,6 +101,7 @@ jobs: deploy-api: runs-on: self-hosted if : github.event_name == 'push' + environment: ${{ github.ref == 'refs/heads/dev' && 'development' || 'production' }} needs: - lint-api steps: @@ -128,6 +129,7 @@ jobs: deploy-front: runs-on: self-hosted if : github.event_name == 'push' + environment: ${{ github.ref == 'refs/heads/dev' && 'development' || 'production' }} needs: - lint-front steps: @@ -150,11 +152,11 @@ jobs: context: ./frontend push: true build-args: | - VITE_API_URL=${{ github.ref == 'refs/heads/prod' && 'https://integration.utt.fr/api' || 'https://integration.dev.uttnetgroup.fr/api' }} - VITE_SERVICE_URL=${{ github.ref == 'refs/heads/prod' && 'https://integration.utt.fr/' || 'https://integration.dev.uttnetgroup.fr/' }} - VITE_ANALYTICS_WEBSITE_ID=${{ github.ref == 'refs/heads/prod' && secrets.ANALYTICS_WEBSITE_ID_PROD || secrets.ANALYTICS_WEBSITE_ID_DEV }} - VITE_ROADBOOK_URL_FRENCH=${{ secrets.ROADBOOK_URL_FRENCH }} - VITE_ROADBOOK_URL_ENGLISH=${{ secrets.ROADBOOK_URL_ENGLISH }} - VITE_CAS_LOGIN_URL=${{ secrets.CAS_LOGIN_URL }} + VITE_API_URL=${{ vars.API_URL }} + VITE_SERVICE_URL=${{ vars.SERVICE_URL }} + VITE_ANALYTICS_WEBSITE_ID=${{ secrets.ANALYTICS_WEBSITE_ID }} + VITE_ROADBOOK_URL_FRENCH=${{ vars.ROADBOOK_URL_FRENCH }} + VITE_ROADBOOK_URL_ENGLISH=${{ vars.ROADBOOK_URL_ENGLISH }} + VITE_CAS_LOGIN_URL=${{ vars.CAS_LOGIN_URL }} tags: | ${{ secrets.REGISTRY_URL }}/integration/front:${{ github.ref == 'refs/heads/prod' && 'prod' || 'dev' }}