WildCodeSchool
diff --git a/‎.github/workflows/frontend.yml‎
Lines changed: 6 additions & 0 deletions b/‎.github/workflows/frontend.yml‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎.github/workflows/prod-frontend.yml‎
Lines changed: 8 additions & 0 deletions b/‎.github/workflows/prod-frontend.yml‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎backend/package.json‎
Lines changed: 0 additions & 3 deletions b/‎backend/package.json‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎backend/src/resolvers/UserResolver.ts‎
Lines changed: 0 additions & 3 deletions b/‎backend/src/resolvers/UserResolver.ts‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎frontend/Dockerfile.prod‎
Lines changed: 31 additions & 10 deletions b/‎frontend/Dockerfile.prod‎
Lines changed: 31 additions & 10 deletions
diff --git a/‎frontend/src/components/ReCaptcha/ReCaptcha.tsx‎
Lines changed: 22 additions & 23 deletions b/‎frontend/src/components/ReCaptcha/ReCaptcha.tsx‎
Lines changed: 22 additions & 23 deletions
diff --git a/‎frontend/src/pages/Sign/sign.tsx‎
Lines changed: 5 additions & 8 deletions b/‎frontend/src/pages/Sign/sign.tsx‎
Lines changed: 5 additions & 8 deletions
diff --git a/‎frontend/vite.config.ts‎
Lines changed: 0 additions & 2 deletions b/‎frontend/vite.config.ts‎
Lines changed: 0 additions & 2 deletions
@@ -4,13 +4,19 @@ on:
     push:
         paths:
             - 'frontend/**'
+    pull_request:
+        paths:
+            - 'frontend/**'
 
 jobs:
     lint:
         runs-on: ubuntu-latest
         steps:
             - name: Récupération du code
               uses: actions/checkout@v4
+              with:
+                  ref: ${{ github.event.pull_request.head.sha || github.sha }}
+                  fetch-depth: 0
 
             - name: Installation des dépendances
               run: |
 
@@ -4,14 +4,22 @@ on:
   pull_request:
     types: [closed]
     branches: ["main"]
+  push:
+    branches: ["main"]
+    paths:
+      - 'frontend/**'
 
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    # Ne builder que si la PR a été mergée (pas juste fermée)
+    if: github.event.pull_request.merged == true || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
 
       - uses: docker/login-action@v1
         name: Login to Docker Hub
 
@@ -47,10 +47,7 @@
     },
     "devDependencies": {
         "@faker-js/faker": "^9.6.0",
-<<<<<<< HEAD
-=======
         "@types/cors": "^2.8.17",
->>>>>>> origin/dev
         "@types/form-data": "^2.5.2",
         "@types/jsonwebtoken": "^9.0.8",
         "@types/node": "^22.13.2",
 
@@ -11,10 +11,7 @@ import {
     calculateStoragePercentage,
     formatFileSize,
 } from '@/utils/storageUtils';
-<<<<<<< HEAD
-=======
 import { verifyRecaptchaToken } from '@/utils/recaptchaUtils';
->>>>>>> origin/dev
 import * as argon2 from 'argon2';
 import { IsEmail, Length, Matches } from 'class-validator';
 import jwt, { Secret } from 'jsonwebtoken';
 
@@ -1,15 +1,26 @@
-FROM node:lts-alpine AS builder
+FROM node:22-alpine AS builder
+
+# Mettre à jour npm vers la dernière version
+RUN npm install -g npm@latest
+
+# Argument pour définir l'environnement (PROD, STAGING, DEV)
+ARG BUILD_ENV=PROD
+ENV VITE_ENVIRONMENT=${BUILD_ENV}
+
+# Argument optionnel pour la clé reCAPTCHA
+ARG VITE_RECAPTCHA_SITE_KEY
+ENV VITE_RECAPTCHA_SITE_KEY=${VITE_RECAPTCHA_SITE_KEY}
+
 WORKDIR /app
 COPY package.json package.json
 COPY package-lock.json package-lock.json
 # Retry npm install avec délai en cas d'erreur E429 (rate limiting)
 RUN npm config set registry https://registry.npmjs.org/ && \
-    for i in 1 2 3; do \
-    npm ci && break || { \
-    echo "npm install failed, attempt $i/3. Retrying in 30 seconds..." && \
-    sleep 30; \
-    } \
-    done
+    npm ci --verbose || { \
+    echo "npm install failed, retrying..." && \
+    sleep 30 && \
+    npm ci --verbose; \
+    }
 COPY public public
 COPY src src
 COPY codegen.ts codegen.ts
@@ -18,9 +29,19 @@ COPY tsconfig.app.json tsconfig.app.json
 COPY tsconfig.json tsconfig.json
 COPY tsconfig.node.json tsconfig.node.json
 COPY vite.config.ts vite.config.ts
-COPY .env.production .env
-# BUILD l'application
-RUN npm run build
+
+# Créer le fichier .env avec les variables d'environnement
+RUN echo "VITE_ENVIRONMENT=${BUILD_ENV}" > .env && \
+    if [ -n "${VITE_RECAPTCHA_SITE_KEY}" ]; then \
+    echo "VITE_RECAPTCHA_SITE_KEY=${VITE_RECAPTCHA_SITE_KEY}" >> .env; \
+    fi
+
+# BUILD l'application avec logs détaillés
+RUN echo "Building with VITE_ENVIRONMENT=${BUILD_ENV}" && \
+    echo "Building with VITE_RECAPTCHA_SITE_KEY=${VITE_RECAPTCHA_SITE_KEY:+***}" && \
+    cat .env && \
+    npm run build
+
 # Stage 2: Servir avec nginx
 FROM nginx:alpine
 COPY --from=builder /app/dist /usr/share/nginx/html
 
@@ -28,20 +28,12 @@ declare global {
 }
 
 export const ReCAPTCHA = ({ onSuccess, onError }: ReCAPTCHAProps) => {
-<<<<<<< HEAD
-    const { isDev } = useEnv();
-    const testSiteKey = '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI';
-
-    const resolvedSiteKey =
-        isDev
-=======
     const { isDev, isStaging } = useEnv();
     const testSiteKey = '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI';
 
     // Utiliser la clé de test en dev, ou en staging si la clé n'est pas configurée
     const resolvedSiteKey =
         isDev || (isStaging && !import.meta.env?.VITE_RECAPTCHA_SITE_KEY)
->>>>>>> origin/dev
             ? testSiteKey
             : import.meta.env?.VITE_RECAPTCHA_SITE_KEY;
 
@@ -56,7 +48,9 @@ export const ReCAPTCHA = ({ onSuccess, onError }: ReCAPTCHAProps) => {
         }
 
         const scriptId = 'google-recaptcha-script';
-        const existing = document.getElementById(scriptId) as HTMLScriptElement | null;
+        const existing = document.getElementById(
+            scriptId,
+        ) as HTMLScriptElement | null;
 
         const onLoad = () => {
             setScriptLoaded(true);
@@ -65,11 +59,13 @@ export const ReCAPTCHA = ({ onSuccess, onError }: ReCAPTCHAProps) => {
         if (!existing) {
             const script = document.createElement('script');
             script.id = scriptId;
-            script.src = 'https://www.google.com/recaptcha/api.js?render=explicit';
+            script.src =
+                'https://www.google.com/recaptcha/api.js?render=explicit';
             script.async = true;
             script.defer = true;
             script.onload = onLoad;
-            script.onerror = () => onError?.(new Error('Failed to load reCAPTCHA script'));
+            script.onerror = () =>
+                onError?.(new Error('Failed to load reCAPTCHA script'));
             document.body.appendChild(script);
         } else if (existing && window.grecaptcha) {
             // Script already present and grecaptcha available
@@ -89,18 +85,21 @@ export const ReCAPTCHA = ({ onSuccess, onError }: ReCAPTCHAProps) => {
         // Wait until grecaptcha fully initializes (render is available)
         window.grecaptcha.ready(() => {
             try {
-                const id = window.grecaptcha!.render(containerRef.current as HTMLDivElement, {
-                    sitekey: resolvedSiteKey,
-                    callback: (token: string) => {
-                        onSuccess(token);
-                    },
-                    'expired-callback': () => {
-                        onError?.(new Error('reCAPTCHA expired'));
-                    },
-                    'error-callback': () => {
-                        onError?.(new Error('reCAPTCHA error'));
+                const id = window.grecaptcha!.render(
+                    containerRef.current as HTMLDivElement,
+                    {
+                        sitekey: resolvedSiteKey,
+                        callback: (token: string) => {
+                            onSuccess(token);
+                        },
+                        'expired-callback': () => {
+                            onError?.(new Error('reCAPTCHA expired'));
+                        },
+                        'error-callback': () => {
+                            onError?.(new Error('reCAPTCHA error'));
+                        },
                     },
-                });
+                );
                 setWidgetId(id);
             } catch {
                 onError?.(new Error('Failed to initialize reCAPTCHA'));
@@ -127,4 +126,4 @@ export const ReCAPTCHA = ({ onSuccess, onError }: ReCAPTCHAProps) => {
     }
 
     return <div ref={containerRef} />;
-};
+};
@@ -12,16 +12,17 @@ const Sign = () => {
     const [isSubmitted, setIsSubmitted] = useState(false);
     const [userEmail, setUserEmail] = useState<string>('');
 
-    const handleSubmit = async (email: string, password: string, recaptchaToken?: string) => {
+    const handleSubmit = async (
+        email: string,
+        password: string,
+        recaptchaToken?: string,
+    ) => {
         try {
             const response = await register({
                 variables: {
                     data: { email, password },
                     lang: i18n.language as 'fr' | 'en',
-<<<<<<< HEAD
-=======
                     recaptchaToken,
->>>>>>> origin/dev
                 },
             });
             if (response.data?.register) {
@@ -45,11 +46,7 @@ const Sign = () => {
             title={t('auth.signup.title')}
             onSubmit={handleSubmit}
             loading={loading}
-<<<<<<< HEAD
-            // requireCaptcha - temporairement désactivé
-=======
             requireCaptcha={true}
->>>>>>> origin/dev
             links={
                 <span>
                     {t('auth.signup.links.terms')}{' '}
 
@@ -3,8 +3,6 @@ import react from '@vitejs/plugin-react';
 import path from 'path';
 import { defineConfig, UserConfig, loadEnv } from 'vite';
 
-import 'dotenv/config';
-
 // https://vite.dev/config/
 export default defineConfig(({ mode }) => {
     const env = loadEnv(mode, process.cwd(), '');