Merge branch 'staging' into dev

.github/workflows/ppd.yml

@@ -8,6 +8,11 @@ env:
   PROJECT_ID: c0ed1e9e-d945-461f-920c-98c844ef1ad4
   NAMESPACE_ID: a052faf9-a712-41d7-bbfa-8293ee948e70
   CONTAINER_REGISTRY_ENDPOINT: rg.fr-par.scw.cloud/funcscwlecoffreppdw9e10llz
+  
+  PROJECT_ID_LECOFFRE: 72d08499-37c2-412b-877e-f8af0471654a
+  NAMESPACE_ID_LECOFFRE: e975f056-967e-43fe-b237-84bfa8032e64
+  CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffreppdmp73pool
+  
   IMAGE_NAME: front
   CONTAINER_NAME: front
 
@@ -36,6 +41,30 @@ jobs:
         run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }}
       - name: Push the Docker Image to Scaleway Container Registry
         run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }}
+  build-and-push-image-lecoffre:
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+        - name: Setup SSH
+          run: |
+            mkdir -p ~/.ssh
+            echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+            chmod 600 ~/.ssh/id_rsa
+            ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+          env:
+            SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        - name: Copy SSH
+          run: cp ~/.ssh/id_rsa id_rsa
+        - name: Login to Scaleway Container Registry
+          uses: docker/login-action@v3
+          with:
+            username: nologin
+            password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+            registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
+        - name: Build the Docker Image
+          run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+        - name: Push the Docker Image to Scaleway Container Registry
+          run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
   deploy-to-scaleway:
     needs: build-and-push-image
     runs-on: ubuntu-latest
@@ -71,3 +100,39 @@ jobs:
           SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
           SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }}
           SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }}
+  deploy-to-scaleway-lecoffre:
+    needs: build-and-push-image-lecoffre
+    runs-on: ubuntu-latest
+    environment: preprod
+    steps:
+      - name: Install CLI
+        uses: scaleway/action-scw@v0
+      - name: Get container ID
+        run: |
+          echo "CONTAINER_ID=$(scw container container list namespace-id=${{env.NAMESPACE_ID_LECOFFRE}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV
+        env:
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
+      - name: Deploy the container based on the new image
+        run: |
+            env_string=""
+            while IFS= read -r line; do
+              if [[ "$line" == *"="* ]]; then
+                key=$(echo "$line" | cut -d '=' -f 1)
+                value=$(echo "$line" | cut -d '=' -f 2-)
+                if [[ -n "$key" ]]; then
+                  env_string+="environment-variables.$key=$value "
+                fi
+              fi
+            done <<< "$ENV_VARS"
+            env_string=$(echo $env_string | sed 's/ $//')
+            scw container container update ${{ env.CONTAINER_ID }} $env_string       
+        env:
+          ENV_VARS: ${{ secrets.ENV }}
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
+        

.github/workflows/prd.yml

@@ -8,6 +8,11 @@ env:
   PROJECT_ID: c0ed1e9e-d945-461f-920c-98c844ef1ad4
   NAMESPACE_ID: 17374437-5428-468c-9f41-d89787ffce0e
   CONTAINER_REGISTRY_ENDPOINT: rg.fr-par.scw.cloud/funcscwlecoffreprdg7h5bbub
+  
+  PROJECT_ID_LECOFFRE: 72d08499-37c2-412b-877e-f8af0471654a
+  NAMESPACE_ID_LECOFFRE: 8fbbce9d-31d1-4368-94c4-445e79f10834
+  CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffreprdjulp9mam
+
   IMAGE_NAME: front
   CONTAINER_NAME: front
 
@@ -36,10 +41,34 @@ jobs:
         run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }}
       - name: Push the Docker Image to Scaleway Container Registry
         run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }}
+  build-and-push-image-lecoffre:
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+        - name: Setup SSH
+          run: |
+            mkdir -p ~/.ssh
+            echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+            chmod 600 ~/.ssh/id_rsa
+            ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+          env:
+            SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        - name: Copy SSH
+          run: cp ~/.ssh/id_rsa id_rsa
+        - name: Login to Scaleway Container Registry
+          uses: docker/login-action@v3
+          with:
+            username: nologin
+            password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+            registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
+        - name: Build the Docker Image
+          run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+        - name: Push the Docker Image to Scaleway Container Registry
+          run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
   deploy-to-scaleway:
     needs: build-and-push-image
     runs-on: ubuntu-latest
-    environment: prod
+    environment: preprod
     steps:
       - name: Install CLI
         uses: scaleway/action-scw@v0
@@ -71,3 +100,39 @@ jobs:
           SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
           SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }}
           SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }}
+  deploy-to-scaleway-lecoffre:
+    needs: build-and-push-image-lecoffre
+    runs-on: ubuntu-latest
+    environment: preprod
+    steps:
+      - name: Install CLI
+        uses: scaleway/action-scw@v0
+      - name: Get container ID
+        run: |
+          echo "CONTAINER_ID=$(scw container container list namespace-id=${{env.NAMESPACE_ID_LECOFFRE}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV
+        env:
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
+      - name: Deploy the container based on the new image
+        run: |
+            env_string=""
+            while IFS= read -r line; do
+              if [[ "$line" == *"="* ]]; then
+                key=$(echo "$line" | cut -d '=' -f 1)
+                value=$(echo "$line" | cut -d '=' -f 2-)
+                if [[ -n "$key" ]]; then
+                  env_string+="environment-variables.$key=$value "
+                fi
+              fi
+            done <<< "$ENV_VARS"
+            env_string=$(echo $env_string | sed 's/ $//')
+            scw container container update ${{ env.CONTAINER_ID }} $env_string       
+        env:
+          ENV_VARS: ${{ secrets.ENV }}
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
+        

.github/workflows/stg.yml

@@ -8,6 +8,11 @@ env:
   PROJECT_ID: c0ed1e9e-d945-461f-920c-98c844ef1ad4
   NAMESPACE_ID: 9f949ff2-97bc-4979-ade2-1994dcaabde0
   CONTAINER_REGISTRY_ENDPOINT: rg.fr-par.scw.cloud/funcscwlecoffrestgqhhn4ixh
+  
+  PROJECT_ID_LECOFFRE: 72d08499-37c2-412b-877e-f8af0471654a
+  NAMESPACE_ID_LECOFFRE: f8137e85-47ad-46a5-9e2e-18af5de829c5
+  CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffrestgbqbfhtv6
+
   IMAGE_NAME: front
   CONTAINER_NAME: front
 
@@ -36,6 +41,30 @@ jobs:
         run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }}
       - name: Push the Docker Image to Scaleway Container Registry
         run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }}
+  build-and-push-image-lecoffre:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup SSH
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+      - name: Copy SSH
+        run: cp ~/.ssh/id_rsa id_rsa
+      - name: Login to Scaleway Container Registry
+        uses: docker/login-action@v3
+        with:
+          username: nologin
+          password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+          registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
+      - name: Build the Docker Image
+        run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+      - name: Push the Docker Image to Scaleway Container Registry
+        run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
   deploy-to-scaleway:
     needs: build-and-push-image
     runs-on: ubuntu-latest
@@ -71,3 +100,38 @@ jobs:
           SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
           SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }}
           SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }}
+  deploy-to-scaleway-lecoffre:
+    needs: build-and-push-image-lecoffre
+    runs-on: ubuntu-latest
+    environment: staging
+    steps:
+      - name: Install CLI
+        uses: scaleway/action-scw@v0
+      - name: Get container ID
+        run: |
+          echo "CONTAINER_ID=$(scw container container list namespace-id=${{env.NAMESPACE_ID_LECOFFRE}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV
+        env:
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
+      - name: Deploy the container based on the new image
+        run: |
+            env_string=""
+            while IFS= read -r line; do
+              if [[ "$line" == *"="* ]]; then
+                key=$(echo "$line" | cut -d '=' -f 1)
+                value=$(echo "$line" | cut -d '=' -f 2-)
+                if [[ -n "$key" ]]; then
+                  env_string+="environment-variables.$key=$value "
+                fi
+              fi
+            done <<< "$ENV_VARS"
+            env_string=$(echo $env_string | sed 's/ $//')
+            scw container container update ${{ env.CONTAINER_ID }} $env_string       
+        env:
+          ENV_VARS: ${{ secrets.ENV }}
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}

devops/ppd.values.yaml

@@ -18,10 +18,10 @@ lecoffreFront:
         limits:
             memory: 2Gi
     ingress:
-        host: app.ppd.lecoffre.smart-chain.fr
+        host: app-tp.ppd.lecoffre.smart-chain.fr
         tls:
             hosts:
-                - app.ppd.lecoffre.smart-chain.fr
+                - app-tp.ppd.lecoffre.smart-chain.fr
             secretName: front-tls
         annotations:
             kubernetes.io/ingress.class: nginx

src/front/Components/LayoutTemplates/DefaultLayout.tsx

@@ -7,7 +7,7 @@ export const DefaultLayout = ({ children }: DefaultLayoutProps) => {
 	return (
 		<>
 			<Head>
-				<title>LECoffre</title>
+				<title>LEcoffre</title>
 				{/* <link rel="shortcut icon" href="/favicon.svg" /> */}
 			</Head>
 			<main>

src/front/Components/Layouts/Login/index.tsx

@@ -63,7 +63,7 @@ export default function Login() {
 				<Typography typo={ITypo.P_18}>
 					<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
 				</Typography>
-				<Link href="mailto:g.texier@notaires.fr">
+				<Link href="mailto:support@lecoffre.io">
 					<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
 				</Link>
 			</div>

src/front/Components/Layouts/LoginCallback/index.tsx

@@ -72,7 +72,7 @@ export default function LoginCallBack() {
 				<Typography typo={ITypo.P_18}>
 					<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
 				</Typography>
-				<Link href="mailto:g.texier@notaires.fr">
+				<Link href="mailto:support@lecoffre.io">
 					<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
 				</Link>
 			</div>

src/front/Components/Layouts/LoginCallbackCustomer/index.tsx

@@ -58,7 +58,7 @@ export default function LoginCallBackCustomer() {
 				<Typography typo={ITypo.P_18}>
 					<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
 				</Typography>
-				<Link href="mailto:g.texier@notaires.fr">
+				<Link href="mailto:support@lecoffre.io">
 					<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
 				</Link>
 			</div>

src/front/Components/Layouts/LoginCustomer/StepEmail/index.tsx

@@ -54,7 +54,7 @@ export default function StepEmail(props: IProps) {
 			{/* <Typography typo={ITypo.P_18}>
 					<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
 				</Typography>
-				<Link href="mailto:g.texier@notaires.fr">
+				<Link href="mailto:support@lecoffre.io">
 					<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
 				</Link> */}
 		</div>

src/front/Components/Layouts/LoginHome/index.tsx

@@ -37,7 +37,7 @@ export default function LoginHome() {
 					<Typography typo={ITypo.P_18}>
 						<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
 					</Typography>
-					<Link href="mailto:g.texier@notaires.fr">
+					<Link href="mailto:support@lecoffre.io">
 						<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
 					</Link>
 				</div>