Merge branch 'main' into ups-main

devops/docker/local/client_app/Dockerfile

@@ -0,0 +1,28 @@
+# Use Node.js LTS (Long Term Support) image
+FROM node:18.20.5-alpine AS base
+
+# Create app directory
+WORKDIR /app
+
+# Copy package files
+COPY package*.json ./
+
+# Install dependencies
+RUN npm install
+RUN npm install --save-dev @babel/plugin-proposal-private-property-in-object
+
+# Run
+FROM base
+
+COPY --from=base /app/node_modules /app/node_modules
+
+# Expose the development port
+EXPOSE 3000
+
+# Set host to allow external connections
+ENV HOST=0.0.0.0
+ENV PORT=3000
+ENV NODE_OPTIONS="--openssl-legacy-provider"
+
+# Start development server
+CMD ["npm", "run", "dev"]

devops/docker/local/nginx/Dockerfile

@@ -1,50 +1,8 @@
-FROM node:18.12.1-alpine as build
-
-# Set the working directory inside the container
-WORKDIR /app
-
-# Copy the package.json and package-lock.json files to the container
-COPY package*.json ./
-
-# Install the dependencies
-RUN npm install
-
-RUN npm install --save-dev @babel/plugin-proposal-private-property-in-object
-
-# Set the NODE_OPTIONS environment variable
-ENV NODE_OPTIONS="--openssl-legacy-provider"
-
-
-# Copy the entire app directory to the container
-COPY . .
-
-# Generate the Nuxt.js static files
-RUN npm version patch --git-tag-version false && npx nuxt generate
-
 # Use the official Nginx image as the base image
 FROM nginx:1.22.1
 
-ARG ENV_TYPE
-ARG WEB_FOLDER
-
 # WORKDIR /var/www/indrz
 WORKDIR /usr/share/nginx/html
 
-# COPY devops/docker/local/nginx/conf/allowed.conf /etc/nginx/allowed.conf
-# COPY devops/docker/local/nginx/conf/locations.conf /etc/nginx/locations.conf
-
-
 # Copy the NGINX configuration file to the container
 COPY devops/docker/local/nginx/conf/default-dev.conf /etc/nginx/conf.d/default.conf
-
-# RUN mkdir -p /var/www/indrz
-
-# Copy the built static site from the previous stage to the container
-#COPY --from=build ./app/dist/ /var/www/indrz
-COPY --from=build ./app/dist /usr/share/nginx/html
-
-# Expose port 80
-# EXPOSE 80
-
-# Start Nginx when the container starts
-# CMD ["nginx", "-g", "daemon off;"]

devops/docker/local/nginx/conf/default-dev.conf

@@ -9,6 +9,15 @@ server {
     # set client max upload body size to#
     client_max_body_size 50M;
 
+    location / {
+		proxy_pass http://frontend:3000;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# 		root /usr/share/nginx/html;
+#       index index.html index.htm;
+    }
+
     # API Django backend
     location /api {
         proxy_pass http://indrz_api:8000;
@@ -42,11 +51,6 @@ server {
         proxy_set_header X-Script-Name /geoserver;
     }
 
-	location / {
-		# root /var/www/indrz;
-		root /usr/share/nginx/html;
-        index index.html index.htm;
-    }
 
     error_page 500 502 503 504 /50x.html;
     location = /50x.html {

devops/docker/production/nginx/conf/default-prod.conf

@@ -18,7 +18,13 @@ server {
     # set client max upload body size to#
     client_max_body_size 50M;
 
-        # API Django backend
+    # client static pwa app files
+    location / {
+		root /usr/share/nginx/html;
+        index index.html index.htm;
+    }
+
+    # API Django backend
     location /api {
         proxy_pass http://indrz_api:8000;
         proxy_set_header Host $host;
@@ -27,15 +33,15 @@ server {
 
     }
 
-    # STATIC files
+    # STATIC files for Django
     location /static {
         alias /opt/data/static/;
         expires 30d;
         access_log off;
         add_header Cache-Control "public";
     }
 
-    # MEDIA backend uploads
+    # MEDIA backend uploads for Django
     location /media {
         alias /opt/data/media/;
         access_log off;
@@ -52,25 +58,6 @@ server {
         proxy_set_header X-Script-Name /geoserver;
     }
 
-	location / {
-		# root /var/www/indrz;
-		root /usr/share/nginx/html;
-        index index.html index.htm;
-
-        allow 78.142.65.164; # michael home
-        allow 143.205.172.22; # michael office
-
-        allow 143.205.99.66;
-        allow 143.205.98.160;
-        allow 143.205.99.146;
-        allow 143.205.98.174;
-        allow 143.205.99.139;
-        allow 143.205.196.24;
-
-        allow 143.205.70.223; # stefan bibliothek
-        allow 143.205.70.68; # georg bibliothek
-        deny all;
-    }
 
     ssl_certificate /etc/ssl/yourCertHere.crt;
     ssl_certificate_key /etc/ssl/yourKeyHere.key;
@@ -92,7 +79,6 @@ server {
     # ssl_stapling on;
     # ssl_stapling_verify on;
 
-
     error_page 500 502 503 504 /50x.html;
     location = /50x.html {
         root /usr/share/nginx/html;

assets/css/ol.scss → src/assets/css/ol.scss

@@ -22,3 +22,9 @@
   pointer-events:none !important;
   cursor:none !important;
 }
+.ol-selectable{
+    -webkit-touch-callout: none !important;
+    -webkit-user-select: none !important;
+    -moz-user-select: none !important;
+     user-select: none  !important;
+}

assets/locale/de.json → src/assets/locale/de.json

@@ -56,5 +56,6 @@
   "label_building_plz": "Plz",
   "label_building_adress": "Adresse",
   "pdf_title": "Universität Plan",
-  "poi_pictures": "Bilder"
+  "poi_pictures": "Bilder",
+  "label_external_id": "ID"
 }

assets/locale/en.json → src/assets/locale/en.json

@@ -56,5 +56,6 @@
   "label_building_plz": "Postal Code",
   "label_building_adress": "Adress",
   "pdf_title": "University Plan",
-  "poi_pictures": "Pictures"
+  "poi_pictures": "Pictures",
+  "label_external_id": "ID"
 }

components/BaseMap.vue → src/components/BaseMap.vue

@@ -37,7 +37,7 @@ export default {
   data () {
     return {
       map: null,
-      center: [1822279.3104, 6139940.224],
+      center: [1822139.88, 6139957.53],
       zoom: 18,
       layers: {},
       activeLayers: [],
@@ -69,6 +69,7 @@ export default {
         controls: defaultControls().extend([mousePositionControl]),
         target: 'map',
         layers: [
+          // greyBmapat, myMapLayer
           greyBmapat
         ],
         view: new View({
@@ -109,7 +110,8 @@ export default {
 
         if (selected) {
           this.featureProperties = [
-            { key: 'OrgCode', value: selected.get('orgcode') },
+            { key: 'Code', value: selected.get('orgcode') },
+            { key: 'Organization', value: selected.get('name') },
             { key: 'Main Use', value: selected.get('mainuse') },
             { key: 'Room Code', value: selected.get('room_code') }
           ];

components/CampusSearch.vue → src/components/CampusSearch.vue

@@ -122,6 +122,14 @@
         <template v-slot:item="{ item }">
           <v-list-item-icon style="margin-right: 16px">
             <v-img
+              v-if="item.icon"
+              :src="item.icon"
+              contain
+              max-height="24"
+              max-width="24"
+            />
+            <v-img
+              v-else
               :src="getIconUrl(item.src_icon)"
               contain
               max-height="24"

components/Help.vue → src/components/Help.vue

@@ -1,14 +1,15 @@
 <template>
   <v-dialog
     v-model="dialog"
+    scrollable
     max-width="700"
   >
     <v-card>
-      <v-card-title class="headline" />
+      <v-card-title class="text-h4">
+        Hilfe
+      </v-card-title>
+      <v-divider />
       <v-card-text>
-        <h1>Hilfe</h1>
-        <p />
-
         <div>
           <p>
             INDRZ bietet eine
@@ -320,14 +321,24 @@
           </p>
         </div>
       </v-card-text>
+      <v-divider />
+      <v-card-actions>
+        <v-spacer />
+        <v-btn
+          color="blue darken-1"
+          text
+          @click="dialog = false"
+        >
+          Close
+        </v-btn>
+      </v-card-actions>
     </v-card>
   </v-dialog>
 </template>
 
 <script>
 export default {
   name: 'Help',
-
   props: {
     show: {
       type: Boolean,

components/IndrzMap.vue → src/components/IndrzMap.vue

@@ -47,8 +47,8 @@ import RouteHandler from '../util/RouteHandler';
 import POIHandler from '../util/POIHandler';
 import InfoOverlay from '../components/infoOverlay';
 import 'ol/ol.css';
-import config from '../util/indrzConfig';
 import menuHandler from '../util/menuHandler';
+import config from '../util/indrzConfig';
 import ShareOverlay from './share-overlay/shareOverlay';
 import Terms from './Terms';
 import Help from './Help';
@@ -220,28 +220,12 @@ export default {
       this.$emit('open-poi-drawer', {
         feature: properties
       })
-      const coordinate = this.objCenterCoords;
       const featureCenter = !this.routeDrawer
         ? { data: { type: 'Feature', id: properties.id, properties: properties, geometry: { coordinates: this.objCenterCoords, type: 'MultiPolygon' } } }
         : { type: 'Feature', id: properties.id, ...{ properties, geometry: { coordinates: this.coordinates, type: 'MultiPolygon' } } }
-      if (!this.routeDrawer) {
-        if (this.isMobile) {
-          const elm = document.querySelector('.v-navigation-drawer--open');
-          const drawerHeight = elm.offsetHeight;
-          const pixel = this.map.getPixelFromCoordinate(coordinate);
-          pixel[1] += drawerHeight / 6;
-          const mobileCoordinate = this.map.getCoordinateFromPixel(pixel);
-          this.map.getView().animate({
-            duration: 2000,
-            center: mobileCoordinate
-          });
-        } else {
-          this.map.getView().animate({
-            center: coordinate,
-            duration: 2000
-          });
-        }
-      } else { this.$nextTick(() => { this.$bus.$emit('goTo', featureCenter) }) }
+      if (this.routeDrawer) {
+        this.$nextTick(() => { this.$bus.$emit('goTo', featureCenter) })
+      }
     },
     async loadMapWithParams (searchString) {
       const query = queryString.parse(searchString || location.search);
@@ -295,6 +279,7 @@ export default {
         this.$emit('clearSearch');
       }
       this.$emit('open-poi-drawer', {})
+      this.$emit('open-poi-drawer', {})
     },
     onShareButtonClick (isRouteShare) {
       const shareOverlay = this.$refs.shareOverlay;