Merge branch 'staging' into dev

2024-04-29 14:36:58 +02:00 · 2024-04-29 14:36:58 +02:00 · ccc5912d8a
commit ccc5912d8a
parent 30b0cb2d09 805143c49a
5 changed files with 9 additions and 190 deletions
--- a/.github/workflows/ppd.yml
+++ b/.github/workflows/ppd.yml
@ -4,11 +4,7 @@ on:
  push:
    branches: [preprod]

-env:
-  PROJECT_ID: c0ed1e9e-d945-461f-920c-98c844ef1ad4
-  NAMESPACE_ID: a052faf9-a712-41d7-bbfa-8293ee948e70
-  CONTAINER_REGISTRY_ENDPOINT: rg.fr-par.scw.cloud/funcscwlecoffreppdw9e10llz
-  
+env:  
  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
@ -17,30 +13,6 @@ env:
  CONTAINER_NAME: front

 jobs:
-  build-and-push-image:
-    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 }}
-          registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT }}
-      - name: Build the Docker Image
-        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:
@ -65,41 +37,6 @@ jobs:
          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: 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}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV
-        env:
-          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
-          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
-          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }}
-          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }}
-      - 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 }}
-          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
--- a/.github/workflows/prd.yml
+++ b/.github/workflows/prd.yml
@ -5,9 +5,6 @@ on:
    branches: [main]

 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
@ -17,30 +14,6 @@ env:
  CONTAINER_NAME: front

 jobs:
-  build-and-push-image:
-    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 }}
-          registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT }}
-      - name: Build the Docker Image
-        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:
@ -65,45 +38,10 @@ jobs:
          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: 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}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV
-        env:
-          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
-          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
-          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }}
-          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }}
-      - 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 }}
-          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
+    environment: prod
    steps:
      - name: Install CLI
        uses: scaleway/action-scw@v0
--- a/.github/workflows/stg.yml
+++ b/.github/workflows/stg.yml
@ -5,9 +5,6 @@ on:
    branches: [staging]

 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
@ -17,30 +14,6 @@ env:
  CONTAINER_NAME: front

 jobs:
-  build-and-push-image:
-    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 }}
-          registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT }}
-      - name: Build the Docker Image
-        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:
@ -65,41 +38,6 @@ jobs:
        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: 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}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV
-        env:
-          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
-          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
-          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }}
-          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }}
-      - 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 }}
-          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
--- a/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx
+++ b/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx
@ -159,7 +159,9 @@ export default class BurgerModal extends React.Component<IProps, IState> {
 					/>
 					<div className={classes["separator"]} />
 					<NavigationLink path={Module.getInstance().get().modules.pages.MyAccount.props.path} text="Mon compte" />
-					<NavigationLink target="_blank" path="/CGU_LeCoffre_io.pdf" text="CGU" />
+					<NavigationLink target="blank" path="https://tally.so/r/mBGaNY" text="Support" />
+
+					<NavigationLink target="blank" path="/CGU_LeCoffre_io.pdf" text="CGU" />
 					<LogOutButton />
 				</div>
 			</>
--- a/src/front/Components/DesignSystem/Header/classes.module.scss
+++ b/src/front/Components/DesignSystem/Header/classes.module.scss
@ -53,6 +53,10 @@
 			> :first-child {
 				margin-right: 32px;
 			}
+
+			@media (max-width: $screen-s) {
+				display: none;
+			}
 		}
 	}