Merge pull request #12 from camptocamp/GSGGR-186-open-geoshop-window

GSGGR-186 open geoshop window
camptocamp · Jan 6, 2025 · e23367f · e23367f
2 parents d3a8f6d + dc7c8dc
commit e23367f
Show file tree

Hide file tree

Showing 79 changed files with 7,506 additions and 2,246 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -12,3 +12,7 @@
 !geoportal/geogr_gmf_geoportal/static
 !geoportal/geogr_gmf_geoportal/locale
 geoportal/geogr_gmf_geoportal/locale/*.pot
+!ui
+ui/dist/
+ui/node_modules/
+ui/static/fa-*
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ __pycache__/
 /geoportal/geogr_gmf_geoportal/static/robot.txt
 /print/print-apps/geogr_gmf/config.yaml
 /mapserver/tinyows.xml
+/node_modules
+node_modules
diff --git a/CONST_create_template/geoportal/interfaces/desktop_alt.html.mako b/CONST_create_template/geoportal/interfaces/desktop_alt.html.mako
diff --git a/Dockerfile b/Dockerfile
@@ -73,3 +73,27 @@ VOLUME /etc/geomapfish \
     /usr/local/tomcat/webapps/ROOT/print-apps \
     /etc/haproxy_dev \
     /etc/haproxy
+
+###############################################################################
+
+FROM node:20.18.0-slim AS ui-build
+
+WORKDIR /app
+COPY ui/package.json ui/package-lock.json ./
+
+RUN npm install --ignore-scripts
+
+COPY ui/ ./
+ARG VITE_GEOSHOP_URL
+ENV VITE_GEOSHOP_URL=$VITE_GEOSHOP_URL
+RUN NODE_ENV=production npm run build
+
+###############################################################################
+
+FROM gmf_config AS config
+
+#COPY --from=webcomponent-build /app/dist/ /etc/geomapfish/static/custom/
+
+COPY --from=ui-build /app/dist/* /etc/static-frontend/
+COPY --from=ui-build /app/node_modules/ngeo/dist/fa-* /etc/static-frontend/
+VOLUME /etc/static-frontend/
diff --git a/ci/config.yaml b/ci/config.yaml
@@ -21,4 +21,3 @@ publish:
       repository: camptocamp/argocd-gs-ugsp-apps
     images:
       - name: camptocamp/geogr_gmf-config
-      - name: camptocamp/geogr_gmf-geoportal
diff --git a/docker-compose-lib.yaml b/docker-compose-lib.yaml
@@ -11,6 +11,7 @@ services:
         GEOMAPFISH_VERSION: ${GEOMAPFISH_VERSION}
         GEOMAPFISH_MAIN_VERSION: ${GEOMAPFISH_MAIN_VERSION}
         GEOMAPFISH_MAIN_MINOR_VERSION: ${GEOMAPFISH_MAIN_MINOR_VERSION}
+        VITE_GEOSHOP_URL: ${VITE_GEOSHOP_URL}
     user: www-data
     environment:
       - VISIBLE_WEB_HOST

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -76,7 +76,7 @@ services:
   geoportal:
     extends:
       file: docker-compose-lib.yaml
-      service: geoportal-advance
+      service: geoportal
     volumes_from:
       - config:ro
     volumes:
@@ -88,7 +88,9 @@ services:
   alembic:
     extends:
       file: docker-compose-lib.yaml
-      service: alembic-advance
+      service: alembic
+    # environment:
+    #   - PGSCHEMA
 
   front:
     extends:

diff --git a/env.project b/env.project
@@ -70,3 +70,4 @@ C2C_USE_SESSION=true
 OPENID_CONNECT_ENABLED=true
 OIDC_ISSUER_URL=https://ugsp-sso-test.camptocamp.com
 OIDC_CLIENT_ID="280710674965926769@geomapfish"
+VITE_GEOSHOP_URL=ugsp-geoshop-test.camptocamp.com
diff --git a/geoportal/.prospector.yaml b/geoportal/.prospector.yaml
diff --git a/geoportal/Dockerfile b/geoportal/Dockerfile
diff --git a/geoportal/Makefile b/geoportal/Makefile
diff --git a/geoportal/alembic.ini b/geoportal/alembic.ini
diff --git a/geoportal/alembic.yaml b/geoportal/alembic.yaml
diff --git a/geoportal/development.ini b/geoportal/development.ini