diff --git a/README.md b/README.md index 443a141..94b1bdf 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,13 @@ docker-compose build citizen-front docker login registry.gitlab.com docker push registry.gitlab.com/champs-libres/geonature-citizen/front ``` +Il est peut-être aussi nécessaire de faire de même pour l'image `media`. + +```bash +docker-compose build media +docker login registry.gitlab.com +docker push registry.gitlab.com/champs-libres/geonature-citizen/media +``` ### 2) Sur le serveur distant ```bash diff --git a/docker-compose.override.yml b/docker-compose.override.yml index c1050bf..26d524a 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -28,6 +28,7 @@ services: - ./patches/settings.ini:/home/appuser/citizen/config/settings.ini - ./patches/frontend/src/conf:/home/appuser/citizen/frontend/src/conf - ./patches/frontend/src/assets:/home/appuser/citizen/frontend/src/assets + - ./patches/frontend/src/custom:/home/appuser/citizen/frontend/src/custom - ./patches/frontend/server.ts:/home/appuser/citizen/frontend/server.ts - ./dist:/home/appuser/citizen/frontend/dist # re files installed by npm install diff --git a/patches/frontend/src/assets/background.jpg b/patches/frontend/src/assets/background.jpg index 8009692..1c514ed 100644 Binary files a/patches/frontend/src/assets/background.jpg and b/patches/frontend/src/assets/background.jpg differ diff --git a/patches/frontend/src/assets/logo-commune-wasseiges.jpg b/patches/frontend/src/assets/logo-commune-wasseiges.jpg new file mode 100644 index 0000000..78c22fc Binary files /dev/null and b/patches/frontend/src/assets/logo-commune-wasseiges.jpg differ diff --git a/patches/frontend/src/assets/logo.png b/patches/frontend/src/assets/logo.png index 71889e0..d9068d0 100644 Binary files a/patches/frontend/src/assets/logo.png and b/patches/frontend/src/assets/logo.png differ diff --git a/patches/frontend/src/assets/logo_dw.png b/patches/frontend/src/assets/logo_dw.png new file mode 100644 index 0000000..a6b8bf1 Binary files /dev/null and b/patches/frontend/src/assets/logo_dw.png differ diff --git a/patches/frontend/src/assets/logo_gal.png b/patches/frontend/src/assets/logo_gal.png new file mode 100644 index 0000000..cd30e06 Binary files /dev/null and b/patches/frontend/src/assets/logo_gal.png differ diff --git a/patches/frontend/src/assets/logo_leader.png b/patches/frontend/src/assets/logo_leader.png new file mode 100644 index 0000000..903ae8c Binary files /dev/null and b/patches/frontend/src/assets/logo_leader.png differ diff --git a/patches/frontend/src/assets/logo_wallonie.png b/patches/frontend/src/assets/logo_wallonie.png new file mode 100644 index 0000000..dcad829 Binary files /dev/null and b/patches/frontend/src/assets/logo_wallonie.png differ diff --git a/patches/frontend/src/conf/map.config.ts b/patches/frontend/src/conf/map.config.ts index 61b2dd4..095e1f9 100644 --- a/patches/frontend/src/conf/map.config.ts +++ b/patches/frontend/src/conf/map.config.ts @@ -9,20 +9,6 @@ export const MAP_CONFIG = { attribution: '© OpenStreetMap contributors, Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France' }, - { - name: "OpenTopoMap", - maxZoom: 19, - layer: "//{s}.opentopomap.org/{z}/{x}/{y}.png", - subdomains: "abc", - attribution: "© OpenTopoMap" - }, - { - name: "Cyclosm - Belgique", - maxZoom: 19, - layer: "//{s}.tiles.champs-libres.be/cyclosm/{z}/{x}/{y}.png", - subdomains: "abc", - attribution: '© OpenStreetMap contributors. Map style by Cyclosm. Tiles by Champs-Libres.' - }, { name: "Imagerie aérienne Wallonie", maxZoom: 20, @@ -32,19 +18,90 @@ export const MAP_CONFIG = { attribution: '© SPW' }, { - name: "Plan de secteur", - minZoom: 12, + name: "Hydrographie", maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/AMENAGEMENT_TERRITOIRE/PDS/MapServer/WMSServer?", - layers: '2', + layer: "//geoservices.wallonie.be/arcgis/services/EAU/RHW/MapServer/WMSServer?", + layers: ['1', '2', '3', '4', '5','6'], wms: true, attribution: '© SPW' }, { - name: "Couverture forestière approximative au 18ème siècle", - minZoom: 13, + name: "MNT (relief)", maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORETANC/MapServer/WMSServer?", + layer: "//geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNT_2013_2014_HILLSHADE/MapServer/WMSServer?", + layers: '0', + wms: true, + attribution: '© SPW' + }, + { + name: "MNS (hauteur de la végétation)", + maxZoom: 20, + layer: "//geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNS_2013_2014_HILLSHADE/MapServer/WMSServer?", + layers: '0', + wms: true, + attribution: '© SPW' + }, + { + name: "Pentes (relief)", + maxZoom: 20, + layer: "//geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNP_CLASSE_2013_2014/MapServer/WMSServer?", + layers: '0', + wms: true, + attribution: '© SPW' + }, + { + name: "Carte des principaux types de sols", + maxZoom: 20, + layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/CNSW__PRINC_TYPES_SOLS/MapServer/WMSServer?", + layers: '0', + wms: true, + attribution: '© SPW' + }, + { + name: "Carte des sols", + minZoom: 8, + maxZoom: 20, + layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/CNSW/MapServer/WMSServer?", + layers: '1', + wms: true, + attribution: '© SPW' + }, + { + name: "Carte d'occupation du sol", + maxZoom: 20, + layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/WALOUS_OCCUPATION_SOL/MapServer/WMSServer?", + layers: '0', + wms: true, + attribution: '© SPW' + }, + { + name: "Carte d'utilisation du sol", + maxZoom: 20, + layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/WALOUS_UTILISATION_SOL/MapServer/WMSServer?", + layers: ['1', '3', '4', '5', '6', '7', '8', '9'], + wms: true, + attribution: '© SPW' + }, + { + name: "Parcellaire agricole anonyme 2019", + maxZoom: 20, + layer: "//geoservices.wallonie.be/arcgis/services/AGRICULTURE/SIGEC_PARC_AGRI_ANON__2019/MapServer/WMSServer?", + layers: '0', + wms: true, + attribution: '© SPW' + }, + { + name: "Natura 2000", + maxZoom: 20, + layer: "//geoservices.wallonie.be/arcgis/services/FAUNE_FLORE/NATURA2000/MapServer/WMSServer?", + layers: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'], + wms: true, + attribution: '© SPW' + }, + { + name: "Masque forestier", + maxZoom: 20, + layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORET/MapServer/WMSServer?", layers: '0', wms: true, attribution: '© SPW' @@ -59,26 +116,10 @@ export const MAP_CONFIG = { attribution: '© SPW' }, { - name: "Carte des sols", - minZoom: 8, + name: "Couverture forestière approximative au 18ème siècle", + minZoom: 13, maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/CNSW/MapServer/WMSServer?", - layers: '1', - wms: true, - attribution: '© SPW' - }, - { - name: "Carte des principaux types de sols", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/CNSW__PRINC_TYPES_SOLS/MapServer/WMSServer?", - layers: '0', - wms: true, - attribution: '© SPW' - }, - { - name: "Carte du dépôt de la guerre (1865 - 1880)", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/CARTES_ANCIENNES/DEPOT_GUERRE_1865_1880/MapServer/WMSServer?", + layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORETANC/MapServer/WMSServer?", layers: '0', wms: true, attribution: '© SPW' @@ -100,65 +141,9 @@ export const MAP_CONFIG = { attribution: '© SPW' }, { - name: "Hydrographie", + name: "Carte du dépôt de la guerre (1865 - 1880)", maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/EAU/RHW/MapServer/WMSServer?", - layers: ['1', '2', '3', '4', '5','6'], - wms: true, - attribution: '© SPW' - }, - { - name: "Limites administratives", - maxZoom: 20, - layer: "//ccff02.minfin.fgov.be/geoservices/arcgis/services/INSPIRE/AU_wms/MapServer/WMSServer?", - layers: ['1', '2', '3', '4'], - wms: true, - attribution: '© CadGIS' - }, - { - name: "Masque forestier", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORET/MapServer/WMSServer?", - layers: '0', - wms: true, - attribution: '© SPW' - }, - { - name: "MNS (hauteur de la végétation)", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNS_2013_2014_HILLSHADE/MapServer/WMSServer?", - layers: '0', - wms: true, - attribution: '© SPW' - }, - { - name: "MNT (relief)", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNT_2013_2014_HILLSHADE/MapServer/WMSServer?", - layers: '0', - wms: true, - attribution: '© SPW' - }, - { - name: "Pentes (relief)", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNP_CLASSE_2013_2014/MapServer/WMSServer?", - layers: '0', - wms: true, - attribution: '© SPW' - }, - { - name: "Natura 2000", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/FAUNE_FLORE/NATURA2000/MapServer/WMSServer?", - layers: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'], - wms: true, - attribution: '© SPW' - }, - { - name: "Parcellaire agricole anonyme 2019", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/AGRICULTURE/SIGEC_PARC_AGRI_ANON__2019/MapServer/WMSServer?", + layer: "//geoservices.wallonie.be/arcgis/services/CARTES_ANCIENNES/DEPOT_GUERRE_1865_1880/MapServer/WMSServer?", layers: '0', wms: true, attribution: '© SPW' @@ -172,36 +157,21 @@ export const MAP_CONFIG = { attribution: '© SPW' }, { - name: "Régions agricoles", + name: "Plan de secteur", + minZoom: 12, maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/LIMITES/LIMITES_REGIONSAGRICOLES/MapServer/WMSServer?", - layers: '0', + layer: "//geoservices.wallonie.be/arcgis/services/AMENAGEMENT_TERRITOIRE/PDS/MapServer/WMSServer?", + layers: '2', wms: true, attribution: '© SPW' }, { - name: "Voiries vicinales désaffectées (SNCB - SNCV)", + name: "Limites administratives", maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/MOBILITE/LIGNES_SNCB_SNCV_DESAFFECT/MapServer/WMSServer?", - layers: '0', + layer: "//ccff02.minfin.fgov.be/geoservices/arcgis/services/INSPIRE/AU_wms/MapServer/WMSServer?", + layers: ['1', '2', '3', '4'], wms: true, - attribution: '© SPW' - }, - { - name: "Carte d'occupation du sol", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/WALOUS_OCCUPATION_SOL/MapServer/WMSServer?", - layers: '0', - wms: true, - attribution: '© SPW' - }, - { - name: "Carte d'utilisation du sol", - maxZoom: 20, - layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/WALOUS_UTILISATION_SOL/MapServer/WMSServer?", - layers: ['1', '3', '4', '5', '6', '7', '8', '9'], - wms: true, - attribution: '© SPW' + attribution: '© CadGIS' }, ], CENTER: [46.52863469527167, 2.43896484375], diff --git a/patches/frontend/src/custom/about/about.css b/patches/frontend/src/custom/about/about.css new file mode 100644 index 0000000..e69de29 diff --git a/patches/frontend/src/custom/about/about.html b/patches/frontend/src/custom/about/about.html new file mode 100644 index 0000000..1967ff7 --- /dev/null +++ b/patches/frontend/src/custom/about/about.html @@ -0,0 +1,11 @@ +
BiomMap est un projet collaboratif qui a pour objectif de rassembler un maximum de connaissances à propos du maillage écologique d’un territoire. L’ensemble des informations collectées permettra notamment de mettre en avant des enjeux de protection et de valorisation de la biodiversité locale afin de permettre une meilleure intégration de ce sujet dans les politiques communales d'aménagements du territoire.
+Il s’agit d’un prototype porté par la Commune de Wasseiges et le GAL Meuse@Campagnes et soutenu financièrement par La Wallonie, Digital Wallonia et l’Union Européenne via des fonds FEADER (mesure LEADER).
+Pour en savoir plus, consultez www.biommap.be.
+Le maillage écologique constitue l’infrastructure écologique fine d’un territoire local. Les éléments du maillage sont les petits éléments du paysage, linéaires ou ponctuels, les biotopes de faible surface ou à structure linéaire. Il s’agit, par exemple, des arbres isolés, haies, bandes boisées, bosquets, cours d’eau, mares, talus, bords de routes, bords de terres cultivées, etc. +Ces éléments du maillage constituent les couloirs de liaison entre les zones de grand intérêt biologique (sanctuaires, zones centrales, zones de développement). C’est leur densité, leur qualité et leur continuité qui déterminent leur intérêt pour jouer efficacement un rôle dans les liaisons écologiques. +La reconnaissance du maillage écologique est importante car il s’agit de la présence de la nature dans l’ensemble de l’espace ; c’est la « nature ordinaire ».
+(D’après : E. Melin 1997 – La problématique du réseau écologique – Bases théoriques et perspectives d’une stratégie écologique d’occupation et de gestion de l’espace)
+La création d'un compte n'est pas obligatoire pour pouvoir partager ses observations mais celle-ci est vivement recommandée. En effet, il est important pour nous de pouvoir associer une donnée à un observateur et de pouvoir le contacter si besoin pour vérifier, analyser et ainsi valoriser sa donnée.
\ No newline at end of file diff --git a/patches/frontend/src/custom/custom.css b/patches/frontend/src/custom/custom.css new file mode 100644 index 0000000..288b043 --- /dev/null +++ b/patches/frontend/src/custom/custom.css @@ -0,0 +1,22 @@ +/************************************* + * Global css style overlay * + * Uncomment and adapt or add styles * + *************************************/ + + +/* COLORS */ + +:root { + --default-font-color: #5d6970; + --primary: #00a99d; + --dark-primary: #0a998f; + --secondary: #60b15c; + --secondary-gradient: #57a154; + --ternary: #45765c; + --list-toggler-width: 21px; + --list-obs-offset: 170px; + --router-outlet-offset: 113px; + --modal-header-bg-moz: moz-linear-gradient(top, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); + --modal-header-bg-webkit: moz-linear-gradient(top, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); + --modal-header-bg-linear: linear-gradient(to bottom, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); +} \ No newline at end of file diff --git a/patches/frontend/src/custom/footer/footer.css b/patches/frontend/src/custom/footer/footer.css new file mode 100644 index 0000000..1791a4e --- /dev/null +++ b/patches/frontend/src/custom/footer/footer.css @@ -0,0 +1,34 @@ +footer{ + margin-top: 20px; + padding: 20px 0px; + text-align: center; + background: rgb(226, 226, 226); +} + +footer p, footer div{ + margin: 0 auto; + max-width: 80%; +} + +footer div{ + margin-bottom: 20px; +} + +footer div a { + text-decoration: none; + color: var(--secondary) !important; +} + +footer div a:hover { + border-bottom: solid 1px black; +} + +footer div.logo { + display: flex; + justify-content: space-evenly; +} + +footer div.logo img { + height: 90px; + margin: 3px; +} \ No newline at end of file diff --git a/patches/frontend/src/custom/footer/footer.html b/patches/frontend/src/custom/footer/footer.html new file mode 100644 index 0000000..e335251 --- /dev/null +++ b/patches/frontend/src/custom/footer/footer.html @@ -0,0 +1,15 @@ + + diff --git a/patches/frontend/src/custom/home/home.css b/patches/frontend/src/custom/home/home.css new file mode 100644 index 0000000..e69de29 diff --git a/patches/frontend/src/custom/home/home.html b/patches/frontend/src/custom/home/home.html new file mode 100644 index 0000000..e69de29 diff --git a/patches/frontend/src/custom/images/favicon.ico b/patches/frontend/src/custom/images/favicon.ico new file mode 100644 index 0000000..2f795e0 Binary files /dev/null and b/patches/frontend/src/custom/images/favicon.ico differ