diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index da2103432..c368be0bb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,7 +33,7 @@ repos: - id: integrity-updater exclude: |- (?x)^( - ui/interfaces/desktop_alt\.html + ui/.*\.html )$ - repo: https://github.com/PyCQA/autoflake rev: v2.3.1 diff --git a/.secretsignore b/.secretsignore index c764736a3..fde2b7ce4 100644 --- a/.secretsignore +++ b/.secretsignore @@ -1,2 +1,2 @@ -/geoportal/interfaces/desktop_alt.html.mako -/ui/interfaces/desktop_alt.html +[secrets] +AIzaSyA3NVIy-HOYT0a0CkChA6nFwqEFqHYWBVk diff --git a/Dockerfile b/Dockerfile index 623f3329a..325552f34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,16 +98,13 @@ COPY ui/package.json ui/package-lock.json ./ RUN npm install --ignore-scripts COPY ui/ ./ -#COPY ui/tsconfig.json vite.config.ts ./ -#COPY ui/interfaces/ ./interfaces/ -#COPY ui/src/ ./src/ -RUN ls -l && \ - ls -l src && \ - NODE_ENV=production npm run build +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/interfaces/* /etc/static-frontend/ -COPY --from=ui-build /app/dist/assets /etc/static-frontend/ + +COPY --from=ui-build /app/dist/* /etc/static-frontend/ +VOLUME /etc/static-frontend/ diff --git a/geoportal/vars.yaml b/geoportal/vars.yaml index 7d5fa45b2..a9675e3a5 100644 --- a/geoportal/vars.yaml +++ b/geoportal/vars.yaml @@ -42,14 +42,19 @@ vars: default: True - name: mobile - name: iframe_api + - name: iframe_api_renovated + type: custom + html: iframe_api.html - name: desktop_alt type: canvas layout: desktop - name: desktop_renovated type: custom + html: desktop.html - name: mobile_alt - name: mobile_renovated type: custom + html: mobile.html - name: oeedit interfaces_config: diff --git a/ui/README.md b/ui/README.md new file mode 100644 index 000000000..03783e98d --- /dev/null +++ b/ui/README.md @@ -0,0 +1,21 @@ +# The renovate interface + +The renovate interface is the desktop, mobile and iframe_api interfaces from ngeo that uses the ngeo directly (renovate). + +## Development + +The server application should be started previously, you can start it by running: + +```bash +cd ../ +./build +docker compose up -d +``` + +To start the development server, run: + +```bash +npm run dev +``` + +Open the application in your browser at [http://localhost:3002/static-frontend/desktop.html](http://localhost:3002/static-frontend/desktop.html), fir the desktop interface. diff --git a/ui/interfaces/desktop_alt.html b/ui/desktop.html similarity index 98% rename from ui/interfaces/desktop_alt.html rename to ui/desktop.html index a185aeba5..6fcdd2733 100644 --- a/ui/interfaces/desktop_alt.html +++ b/ui/desktop.html @@ -5,8 +5,8 @@ - - + +