From e7dca3bd97c4a79cf4d14ed18bd849c23c43b9b5 Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 23 Jun 2021 21:15:46 +0200 Subject: [PATCH] fix proper way of build the front container with custom patch files --- Dockerfile-front | 10 +-- README.md | 7 ++ patches/frontend/src/conf/app.config.ts.dist | 72 ++++++++++++++++++++ 3 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 patches/frontend/src/conf/app.config.ts.dist diff --git a/Dockerfile-front b/Dockerfile-front index 0f10a4c..5ce857b 100644 --- a/Dockerfile-front +++ b/Dockerfile-front @@ -14,18 +14,10 @@ COPY patches/settings.ini /home/appuser/citizen/config/settings.ini COPY patches/frontend/src/conf /home/appuser/citizen/frontend/src/conf COPY patches/frontend/src/assets /home/appuser/citizen/frontend/src/assets COPY patches/frontend/server.ts /home/appuser/citizen/frontend/server.ts - +COPY patches/frontend/src/custom /home/appuser/citizen/frontend/src/custom WORKDIR /home/appuser/citizen/frontend -RUN cp src/custom/custom.css.template src/custom/custom.css -RUN cp src/custom/about/about.css.template src/custom/about/about.css -RUN cp src/custom/about/about.html.template src/custom/about/about.html -RUN cp src/custom/footer/footer.css.template src/custom/footer/footer.css -RUN cp src/custom/footer/footer.html.template src/custom/footer/footer.html -RUN cp src/custom/home/home.css.template src/custom/home/home.css -RUN cp src/custom/home/home.html.template src/custom/home/home.html - # aoir google response ENV NG_CLI_ANALYTICS=false RUN npm install diff --git a/README.md b/README.md index 94b1bdf..6853f82 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,13 @@ Redirige de 8080 vers autres services : ## Deploiement sur un serveur distant + +### 0) Si on change le fichier app.config.ts + +```bash +scp patches/frontend/src/conf/app.config.ts.dist user@domain.org:/path/to/app.config.ts +``` + ### 1) Reconstruire l'image front en local ```bash diff --git a/patches/frontend/src/conf/app.config.ts.dist b/patches/frontend/src/conf/app.config.ts.dist new file mode 100644 index 0000000..4af62eb --- /dev/null +++ b/patches/frontend/src/conf/app.config.ts.dist @@ -0,0 +1,72 @@ +export const AppConfig = { + appName: "BiomMap – la biodiversité à Wasseiges", + API_ENDPOINT:"http://liveche.champs-libres.be:8080/api", + API_TAXHUB:"http://liveche.champs-libres.be:8080/taxhub/api/", + FRONTEND:{ + PROD_MOD:true, + MULTILINGUAL:false, + DISPLAY_FOOTER: true, + DISPLAY_TOPBAR: true, + DISPLAY_SIDEBAR: true, + DISPLAY_STATS: true, + DISPLAY_BADGES: true, + NEW_OBS_FORM_MODAL_VERSION: true + }, + META: { + keywords: 'biodiversite enquetes participatif observations', + }, + about: true, + URL_APPLICATION:"http://liveche.champs-libres.be:8080/", + REWARDS: true, + termsOfUse: { + fr: "assets/cgu.pdf", + en: "assets/termsOfUse.pdf" + }, + signup:true, + email_contact:false, + platform_intro: { + fr: "La biodiversité
à Wasseiges", + en: "Biodiversity
in Wasseiges" + }, + platform_teaser: { + fr: "Aidez-nous à mieux connaitre la biodiversité de la commune en partageant ici vos observations. Débutant ou expérimenté, tout le monde peut participer !", + en: "Hae duae provinciae bello quondam piratico catervis mixtae praedonum a Servilio pro consule missae sub iugum factae sunt vectigales. et hae quidem regiones velut in prominenti terrarum lingua positae ob orbe eoo monte Amano disparantur." + }, + platform_participate: { + fr: "PARTICIPER AU PROGRAMME", + en: "PARTICIPATE" + }, + programs_label: { + fr: "Programmes", + en: "Surveys" + }, + program_label: { + fr: "Le programme", + en: "Survey" + }, + program_share_an_observation: { + fr: "PARTAGER UNE OBSERVATION", + en: "SHARE AN OBSERVATION" + }, + program_add_an_observation: { + fr: "AJOUTER UNE OBSERVATION", + en: "CONTRIBUTE AN OBSERVATION" + }, + program_allow_email_contact: { + fr: "J'accepte que mon adresse e-mail puisse être utilisée pour recontacter à propos de mon observation", + en : "I agree that my e-mail address can be used to recontact about my observation" + }, + taxonSelectInputThreshold: 7, + taxonAutocompleteInputThreshold: 12, + taxonAutocompleteFields: [ + "nom_complet", + "nom_vern", + "nom_vern_eng", + "cd_nom" + ], + taxonDisplaySciName: true, + program_list_observers_names: true, + program_list_sort: "-timestamp_create", + details_espece_url: "/cd_nom/", // !! gardez bien le cd_nom/ dans l'url + registration_message : "Vous inscrire vous permet de gérer vos observations" +}