Merge branch 'refs/heads/46-change-naming-of-the-app' into 49-html-ed…

…itor-replacement # Conflicts: # frontend/package-lock.json # frontend/src/core/core.router.ts
it-at-m · Sep 11, 2024 · 2d7ab14 · 2d7ab14
2 parents 60c60f9 + 9f253a2
commit 2d7ab14
Show file tree

Hide file tree

Showing 67 changed files with 1,183 additions and 1,091 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,4 +29,7 @@ dist/
 nbdist/
 .nb-gradle/
 
+# Intellij
+.run/kobit-frontend.run.xml
+
 
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ Prerequisite digital accessibility and mobile-first
 
 **Zusammenfassung**
 
-Konfliktbegleitungs Web Application für staatliche Organisationen und Unternehmen
+Unterstützungs Finder Online Web Application für staatliche Organisationen und Unternehmen
 
 Die KoBITApp hilft dem Nutzer, der ein Problem/Konflikt hat, indem sie eine Übersicht über die Anlaufstellen gibt,
 Unterstützung der richtigen Anlaufstellen in der jeweiligen Situation bietet und zentral Informationen und

diff --git a/apigateway/src/main/resources/application-local.yml b/apigateway/src/main/resources/application-local.yml
@@ -1,5 +1,8 @@
-spring:
+logging:
+  level:
+    root: warn
 
+spring:
   # Define the local keycloak realm here
   realm: ${REALM}
 
@@ -16,6 +19,8 @@ spring:
             allowedOrigins:
               - "http://localhost:8081"
               - "http://127.0.0.1:8081"
+            allowed-origin-patterns:
+              - "https://*.muenchen.de"
             allowedMethods: "*"
             allowedHeaders: "*"
             allowCredentials: true

diff --git a/apigateway/src/main/resources/application.yml b/apigateway/src/main/resources/application.yml
@@ -56,7 +56,7 @@ spring:
             issuer-uri: ${KEYCLOAK_URI}
         registration:
           keycloak:
-            client-id: kobit
+            client-id: ${client-id:kobit}
             client-secret: ${client-secret}
             scope:
               - LHM

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -3,9 +3,10 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
+
     "init": "npm install",
     "serve": "vue-cli-service serve --port 8081 --openssl-legacy-provider",
-    "build": "vue-cli-service lint --fix && vue-cli-service build --openssl-legacy-provider",
+    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service lint --fix && vue-cli-service build --openssl-legacy-provider",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint --fix",
     "create-feature": "bash ./scripts/createFeature.sh"

diff --git a/frontend/public/images/favicon.ico b/frontend/public/images/favicon.ico
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>images/favicon.ico">
-    <title>KoBIT</title>
+    <title>UFO</title>
 </head>
 <body>
 <noscript>