Merge branch 'develop' into trunk

.gitlab-ci.yml

@@ -1,23 +1,23 @@
 include:
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "lint/lint.yml"
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "security/security.yml"
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "build/build.yml"
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "test/test.yml"
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "deploy/deploy.yml"
+- project: "ldc-web/shared-ci"
+  ref: "main"
+  file: "lint/lint.yml"
+- project: "ldc-web/shared-ci"
+  ref: "main"
+  file: "security/security.yml"
+- project: "ldc-web/shared-ci"
+  ref: "main"
+  file: "build/docker-multistage.yml"
+- project: "ldc-web/shared-ci"
+  ref: "main"
+  file: "test/test.yml"
+- project: "ldc-web/shared-ci"
+  ref: "main"
+  file: "deploy/deploy.yml"
 
 stages:
-  - lint
-  - security
-  - build
-  - test
-  - deploy
+- lint
+- security
+- build
+- test
+- deploy

Dockerfile

@@ -1,5 +1,45 @@
+FROM composer:2.8 AS vendor
+
+ARG GITLAB_USER
+ARG GITLAB_PASSWORD
+
+COPY database/ database/
+
+COPY composer.json composer.json
+COPY composer.lock composer.lock
+
+RUN composer config gitlab-token.lab.s-web.fr ${GITLAB_USER} ${GITLAB_PASSWORD}
+RUN composer install \
+    --ignore-platform-reqs \
+    --no-interaction \
+    --no-plugins \
+    --no-scripts \
+    --no-dev \
+    --optimize-autoloader \
+    --classmap-authoritative \
+    --prefer-dist
+
+FROM node:20.18 AS frontend
+
+ARG GITLAB_PASSWORD
+
+RUN mkdir -p /app/public/build
+
+COPY package*.json tsconfig.json vite.config.ts .eslintrc.json .stylelintrc.json /app/
+COPY resources/ /app/resources/
+WORKDIR /app
+RUN npm config set @ldc-web:registry https://lab.s-web.fr/api/v4/packages/npm/
+RUN npm config set -- '//lab.s-web.fr/api/v4/packages/npm/:_authToken' "${GITLAB_PASSWORD}"
+RUN npm ci && npm run prod
+
 FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.3:latest
-COPY --chown=www-data:www-data . /app/srcs
+
+ARG USER=www-data
+
+COPY --chown=${USER}:${USER} . /app/srcs
+COPY --from=vendor --chown=${USER}:${USER} /app/vendor/ /app/vendor/
+COPY --from=frontend --chown=${USER}:${USER}  /app/public/build/ /app/public/build/
+
 USER root
 RUN chmod -R 755 /app/srcs/storage
-USER www-data
+USER ${USER}

resources/views/club/pages/customers/partials/customer-info-form.blade.php

@@ -8,7 +8,7 @@
         ];
     @endphp
     <fieldset class="row mb-3">
-        <legend class="col-12 f-bourton-base mb-4">{{ __('Mes informations personelles') }}</legend>
+        <legend class="col-12 f-bourton-base mb-4">{{ __('Mes informations personnelles') }}</legend>
 
         @include('club.pages.customers.partials.customer-fields')
 

resources/views/fo/partials/commitments/list-pages.blade.php

@@ -78,7 +78,7 @@
         </div>
         @if (isset($showBtn) && $showBtn)
             <div class="col-12 pb-5 text-center">
-                <a class="btn btn-secondary" href="#FIXME:page engagements"
+                <a class="btn btn-secondary" href="{{ route('fo.commitments.brand') }}"
                     title="{{ __('Découvrir nos engagements') }}">{{ str(__('découvrir nos engagements'))->ucFirst() }}</a>
             </div>
         @endif