diff --git a/docker-compose-frontend-dev.yml b/docker-compose-frontend-dev.yml index b98aab84..19a25c7c 100644 --- a/docker-compose-frontend-dev.yml +++ b/docker-compose-frontend-dev.yml @@ -18,7 +18,10 @@ services: container_name: ${FRONTEND_DEV_HOST} volumes: - ${FRONTEND}/src:/app/src - - ${FRONTEND}/static:/app/static + - ${FRONTEND}/static/favicon.ico:/app/static/favicon.ico + - ${FRONTEND}/static/manifest.json:/app/static/manifest.json + - ${FRONTEND}/static/tailwind.css:/app/static/tailwind.css + - ${FRONTEND}/static/global.css:/app/static/global.css - ${FRONTEND_STATIC_USER}:/app/static/user ports: - "${FRONTEND_PORT}:3000" diff --git a/frontend/.dockerignore b/frontend/.dockerignore index 9080e2a0..db1498f1 100644 --- a/frontend/.dockerignore +++ b/frontend/.dockerignore @@ -10,3 +10,4 @@ !/static /static/user/notice.md /static/user/env.json +/static/dsfr diff --git a/frontend/Dockerfile b/frontend/Dockerfile index cf44cf6d..c28d3ca7 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -21,9 +21,16 @@ RUN unzip viewerjs-${VIEWERJS_VERSION}.zip RUN mv viewerjs-${VIEWERJS_VERSION}/* ViewerJS #DSFR (Design de l'Etat) -RUN npm install @gouvfr/dsfr -RUN mkdir static/fonts -RUN mv node_modules/@gouvfr/dsfr/dist/fonts/* static/fonts +RUN mkdir -p static/dsfr \ + && cp node_modules/@gouvfr/dsfr/dist/dsfr.module.min.js static/dsfr \ + && cp node_modules/@gouvfr/dsfr/dist/dsfr.module.min.js.map static/dsfr \ + && cp node_modules/@gouvfr/dsfr/dist/dsfr.nomodule.min.js static/dsfr \ + && cp node_modules/@gouvfr/dsfr/dist/dsfr.nomodule.min.js.map static/dsfr \ + && cp node_modules/@gouvfr/dsfr/dist/dsfr.min.css static/dsfr \ + && cp -r node_modules/@gouvfr/dsfr/dist/utility static/dsfr \ + && cp -r node_modules/@gouvfr/dsfr/dist/favicon static/dsfr \ + && cp -r node_modules/@gouvfr/dsfr/dist/icons static/dsfr \ + && cp -r node_modules/@gouvfr/dsfr/dist/fonts static/dsfr # For production, see https://github.com/mikenikles/sapper-on-cloud-run/blob/master/Dockerfile ################################ diff --git a/frontend/src/routes/_layout.svelte b/frontend/src/routes/_layout.svelte index c0494460..3d512472 100644 --- a/frontend/src/routes/_layout.svelte +++ b/frontend/src/routes/_layout.svelte @@ -11,7 +11,6 @@ import Nav from '../layouts/Nav.svelte'; import EmoRating from '../components/emoRating/starrating.svelte' import { clickOutside } from '../components/click-outside.action'; - import "../../node_modules/@gouvfr/dsfr/dist/css/dsfr.css" export let segment; diff --git a/frontend/src/template.html b/frontend/src/template.html index 4ae42738..95462e27 100644 --- a/frontend/src/template.html +++ b/frontend/src/template.html @@ -12,6 +12,9 @@ + + +