Integration part

.dockerignore

@@ -12,3 +12,8 @@
 !geoportal/geomapfish_geoportal/static
 !geoportal/geomapfish_geoportal/locale
 geoportal/geomapfish_geoportal/locale/*.pot
+!webcomponents
+!package.json
+!package-lock.json
+!tsconfig.json
+!vite.config.ts

.github/dependabot.yaml

@@ -0,0 +1,28 @@
+version: 2
+updates:
+  - package-ecosystem: pip
+    directory: custom
+    schedule:
+      interval: daily
+      time: '04:00'
+    ignore:
+      - dependency-name: none
+
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: daily
+    ignore:
+      - dependency-name: none
+  - package-ecosystem: docker
+    directory: '/custom'
+    schedule:
+      interval: daily
+    ignore:
+      - dependency-name: none
+  - package-ecosystem: pip
+    directory: '/custom'
+    schedule:
+      interval: daily
+    ignore:
+      - dependency-name: none

.github/workflows/main.yaml

@@ -15,7 +15,7 @@ jobs:
   checks:
     runs-on: ubuntu-20.04
     name: Checks
-    timeout-minutes: 10
+    timeout-minutes: 20
 
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -18,3 +18,4 @@ __pycache__/
 /print/print-apps/geomapfish/config.yaml
 /mapserver/tinyows.xml
 /yandex
+/node_modules

.hadolint.yaml

@@ -0,0 +1,3 @@
+ignored:
+  - DL3008 # pin version: https://github.com/hadolint/hadolint/wiki/DL3008
+  - DL3003 # use workdir: https://github.com/hadolint/hadolint/wiki/DL3003

.prettierignore

@@ -1 +1,2 @@
 *.min.js
+custom/Pipfile.lock

Dockerfile

@@ -76,3 +76,21 @@ VOLUME /etc/geomapfish \
     /etc/gunicorn \
     /etc/haproxy_dev \
     /etc/haproxy
+
+###############################################################################
+
+FROM node:16-slim AS custom-build
+
+WORKDIR /app
+COPY package.json ./
+
+RUN npm install
+
+COPY tsconfig.json vite.config.ts ./
+COPY webcomponents/ ./webcomponents/
+RUN npm run build
+
+###############################################################################
+
+FROM gmf_config AS config
+COPY --from=custom-build /app/dist/ /etc/geomapfish/static/custom/

ci/config.yaml

@@ -1,14 +1,12 @@
 ---
 checks:
-  black: False
-  isort: False
-  prettier: False
   codespell: False
-  eof: False
   required_workflows: False
-  dependabot_config: False
-  prospector_config: False
   setup: False
+  dependabot: False
+  black:
+    ignore_patterns_re:
+      - custom/custom/alembic/script\.py\.mako
 
 version:
   branch_to_version_re:

docker-compose.override.sample.yaml

@@ -11,7 +11,6 @@ services:
   #     - './qgisserver:/etc/qgisserver/'
 
   geoportal:
-    image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}
     user: root
     volumes:
       # For Python project development.
@@ -31,9 +30,6 @@ services:
     ports:
       - 5678:5678 # For remote debugging using Visual Studio Code
 
-  alembic:
-    image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}
-
   # Also uncomment the PRINT_URL in geoportal
   # print:
   #   extends:
@@ -64,17 +60,11 @@ services:
     environment:
       - TILECLOUD_CHAIN_LOG_LEVEL=DEBUG
 
-  # For Javascript project development.
-  # The debug application will be available at ``https://<host>/<entry_point>/dev/<interface>.html``.
-  # webpack_dev_server:
-  #   # Uncomment these lines when you want to debug respectively the project js, ngeo js and/or the gmf contrib js.
-  #   # Adapt the path for ngeo / gmf contrib to point where you have checkouted the code.
-  #   # volumes:
-  #   #   - ./geoportal/${PACKAGE}_geoportal/static-ngeo:/app/${PACKAGE}_geoportal/static-ngeo
-  #   #   - ./../ngeo/src:/usr/lib/node_modules/ngeo/src
-  #   #   - ./../ngeo/contribs:/usr/lib/node_modules/ngeo/contribs
-  #   volumes_from:
-  #     - config:rw
-  #   extends:
-  #     file: docker-compose-lib.yaml
-  #     service: webpack_dev_server
+  custom:
+    command:
+      - /usr/local/bin/gunicorn
+      - --reload
+      - --paste
+      - development.ini
+    volumes:
+      - ./custom/custom:/app/custom

docker-compose.yaml

@@ -115,6 +115,16 @@ services:
     environment:
       - PGSCHEMA
 
+  custom:
+    image: ${DOCKER_BASE}-custom:${DOCKER_TAG}
+    build:
+      context: custom
+      args:
+        GIT_HASH: ${GIT_HASH}
+    environment:
+      - GUNICORN_CMD_ARGS=${GUNICORN_PARAMS}
+      - VISIBLE_WEB_HOST
+
   front:
     extends:
       file: docker-compose-lib.yaml

geoportal/geomapfish_geoportal/static/css/desktop_alt.css

@@ -0,0 +1,23 @@
+.logo {
+  background-image: url('../images/logo.svg');
+  height: 2.8rem;
+  margin-left: 0.62rem;
+  background-repeat: no-repeat;
+  background-size: auto 2.8rem;
+}
+.logo span {
+  left: 18.5rem;
+  position: absolute;
+  bottom: 0.2rem;
+}
+.logo span::before {
+  content: 'by Camptocamp';
+}
+.logo-right {
+  height: 2.8rem;
+  background-repeat: no-repeat;
+  background-size: auto 2.8rem;
+  position: absolute;
+  top: 0;
+  right: 0;
+}