Fix Docker and Server Settings

.env.sample

@@ -1,7 +1,9 @@
 # the base_href if you're serving your front in an url like www.example.com/geoshop
 FRONT_HREF=/geoshop
-API_BASE_URL=http://localhost:5007
+# API_BASE_URL=http://localhost:5007
+API_BASE_URL=http://localhost:8000/
 # the base href of your backend
 ROOTURL=/geoshop_api
 # where are metadata and product images? This is concatenated with relative paths coming from backend
-MEDIA_URL=https://some.server.com/geoshop_media
+# MEDIA_URL=https://some.server.com/geoshop_media
+MEDIA_URL=

Dockerfile

@@ -1,19 +1,20 @@
 # Build with node
 FROM node:22.6.0-slim AS builder
-WORKDIR /usr/src/app
 
-COPY package*.json ./
+WORKDIR /usr/app
+
+COPY package*.json ./.
 RUN npm ci
 
 COPY . .
 
 RUN npm run build
-
 # Serve with nginx unpprevileged
 FROM nginxinc/nginx-unprivileged:stable
 
 # copy server config
+# TODO this config will change
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 
 # Copy build artifacts
-COPY --from=builder /usr/src/app/dist/ /usr/share/nginx/html
+COPY --from=builder /usr/app/dist/ /usr/share/nginx/html

Makefile

@@ -3,6 +3,7 @@ DOCKER_TAG ?= latest
 
 export DOCKER_BUILDKIT=1
 
+
 .DEFAULT_GOAL := help
 
 .PHONY: install

angular.json

@@ -5,13 +5,10 @@
   "projects": {
     "front": {
       "i18n": {
-        "sourceLocale": "en-US",
+        "sourceLocale": "fr-CH",
         "locales": {
           "de": {
             "translation": "src/locale/messages.de.xlf"
-          },
-          "en": {
-            "translation": "src/locale/messages.en.xlf"
           }
         }
       },
@@ -37,6 +34,7 @@
               "src/assets/favicon.ico",
               "src/assets"
             ],
+            "localize": ["de"],
             "styles": [
               "node_modules/ol/ol.css",
               "node_modules/ol-geocoder/dist/ol-geocoder.min.css",
@@ -91,9 +89,6 @@
               "vendorChunk": true,
               "buildOptimizer": false
             },
-            "en": {
-              "localize": ["en"]
-            },
             "de": {
               "localize": ["de"]
             }
@@ -112,9 +107,6 @@
             "development":{
               "browserTarget": "front:build:development"
             },
-            "en": {
-              "browserTarget": "front:build:development,en"
-            },
             "de": {
               "browserTarget": "front:build:development,de"
             }

nginx/default.conf

@@ -4,7 +4,16 @@ server {
     root /usr/share/nginx/html;
     index index.html;
 
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
     location / {
-        try_files $uri $uri/ =404;
+        try_files $uri $uri/ /index.html =404;
+    }
+
+    location /welcome {
+        rewrite ^/welcome/?$ / break;
     }
-}
+}

src/assets/configs/config.json.tmpl

@@ -1,8 +1,8 @@
 {
-  "apiUrl": "${API_BASE_URL}${ROOTURL}",
+  "apiUrl": "${API_BASE_URL}/${API_ROOTURL}",
   "mediaUrl": "${MEDIA_URL}",
   "baseMapUrl": "https://wmts.geo.admin.ch/1.0.0/{layer}/{style}/current/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}",
-  "geocoderUrl": "https://sitn.ne.ch/search",
+  "geocoderUrl": "https://nominatim.openstreetmap.org/search",
   "geocoderLayers": [
     "adresses_sitn", "nom_local_lieu_dit", "search_cours_eau",
     "batiments_ofs", "axe_rue", "ImmeublesCanton", "communes", "cadastres",