From 38b8973f026eab54dfb427dbb30f519a51fa0e28 Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Thu, 8 Sep 2022 12:03:12 +0200
Subject: [PATCH] - bind app urls via constant APP_URL in menu navigation
 (because of one di subdomain)

---
 src/App2.vue     | 12 ++++++------
 src/app2.ts      |  7 ++++++-
 src/constants.ts |  3 +++
 vue.config.js    |  1 +
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/App2.vue b/src/App2.vue
index ce61206..b54c296 100644
--- a/src/App2.vue
+++ b/src/App2.vue
@@ -3,7 +3,7 @@
 
     <nav class="navbar navbar-light border-bottom" role="navigation" aria-label="main navigation">
         <div class="navbar-brand">
-            <a class="navbar-item" href="/">
+            <a class="navbar-item" v-bind:href="app_url">
                 <!-- <img src="./assets/images/TETHYS-Logo.svg" width="240px" height="86" alt="TETHYS Logo" /> -->
                 <img src="./assets/images/TETHYS-Logo.svg" width="240" height="86" />
             </a>
@@ -16,19 +16,19 @@
         <div id="navMenu" class="navbar-menu" :class="active ? 'is-active' : ''">
             <ul class="navbar-start" style="flex-grow: 1; justify-content: center">
                 <li class="navbar-item">
-                    <a class="navbar-link is-arrowless active" href="//tethys.at">STARTSEITE</a>
+                    <a class="navbar-link is-arrowless active" v-bind:href="app_url">STARTSEITE</a>
                     <!-- <router-link class="navbar-link is-arrowless" to="/">STARTSEITE</router-link> -->
                 </li>
                 <li class="navbar-item">
-                    <a class="navbar-link is-arrowless" href="//tethys.at/search">SEARCH</a>
+                    <a class="navbar-link is-arrowless" v-bind:href="search_url">SEARCH</a>
                     <!-- <router-link class="navbar-link is-arrowless" to="/search">SEARCH</router-link> -->
                 </li>
                 <li class="navbar-item">
-                    <a class="navbar-link is-arrowless" href="//tethys.at/services">SERVICES</a>
+                    <a class="navbar-link is-arrowless" v-bind:href="service_url">SERVICES</a>
                     <!-- <router-link class="navbar-link is-arrowless" to="/services">SERVICES</router-link> -->
                 </li>
                 <li class="navbar-item">
-                    <a class="navbar-link is-arrowless" href="//tethys.at/help">HELP</a>
+                    <a class="navbar-link is-arrowless" bind:href="help_url">HELP</a>
                     <!-- <router-link class="navbar-link is-arrowless" to="/help">HELP</router-link> -->
                 </li>
                 <!-- <li class="navbar-item">
@@ -38,7 +38,7 @@
                     <a class="navbar-link is-arrowless" href="#">HELP</a>
                 </li> -->
                 <li class="navbar-item">
-                    <a class="navbar-link is-arrowless" href="//tethys.at/oai">OAI</a>
+                    <a class="navbar-link is-arrowless" bind:href="oai_url">OAI</a>
                     <!-- <router-link target="_blank" class="navbar-link is-arrowless" to="/oai">OAI</router-link> -->
                 </li>
                 <!-- 
diff --git a/src/app2.ts b/src/app2.ts
index 1b10854..f407e62 100644
--- a/src/app2.ts
+++ b/src/app2.ts
@@ -12,7 +12,7 @@ import ContactViewComponent from "./views/contact-view/contact-view-component.vu
 import SitelinkViewComponent from "./views/sitelink-view/sitelink-view-component.vue";
 import ImprintViewComponent from "./views/imprint-view/imprint-view-component.vue";
 import TermsViewComponent from "./views/terms-view/terms-view-component";
-import { VUE_APP_PORTAL } from "./constants";
+import { APP_URL, VUE_APP_PORTAL } from "./constants";
 // import VsInput from "./components/vs-input/vs-input.vue";
 // import VsResult from "./components/vs-result/vs-result.vue";
 // import FacetCategory from "./components/face-category/facet-category.vue";
@@ -47,6 +47,11 @@ import { VUE_APP_PORTAL } from "./constants";
 export default class App2 extends Vue {
     public active = false;
     public portal = VUE_APP_PORTAL + "/login";
+    public app_url = APP_URL;
+    public search_url = APP_URL + "/search";
+    public service_url = APP_URL + "/services";
+    public help_url = APP_URL + "/help";
+    public oai_url = APP_URL + "/oai";
 
     mounted(): void {
         // const $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll(".navbar-burger"), 0);
diff --git a/src/constants.ts b/src/constants.ts
index 7d1a3b6..1f87e03 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,17 +1,20 @@
 // declare const POINT_URL: string;
 // declare const EDGE_URL: string;
+declare const APP_URL: string;
 declare const VUE_APP_PORTAL: string;
 declare const SOLR_HOST: string;
 declare const SOLR_CORE: string;
 
 // const _EDGE_URL = EDGE_URL;
 // const _POINT_URL = POINT_URL;
+const _APP_URL = APP_URL;
 const _VUE_APP_PORTAL = VUE_APP_PORTAL;
 const _SOLR_HOST = SOLR_HOST;
 const _SOLR_CORE = SOLR_CORE;
 
 // export { _EDGE_URL as EDGE_URL };
 // export { _POINT_URL as POINT_URL };
+export { _APP_URL as APP_URL };
 export { _VUE_APP_PORTAL as VUE_APP_PORTAL };
 export { _SOLR_HOST as SOLR_HOST };
 export { _SOLR_CORE as SOLR_CORE };
diff --git a/vue.config.js b/vue.config.js
index 8c3fe34..4bf8525 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -30,6 +30,7 @@ module.exports = {
     configureWebpack: {
         plugins: [
             new webpack.DefinePlugin({
+                APP_URL: JSON.stringify(process.env.APP_URL),
                 VUE_APP_PORTAL: JSON.stringify(process.env.VUE_APP_PORTAL),
                 SOLR_HOST: JSON.stringify(process.env.SOLR_HOST),
                 SOLR_CORE: JSON.stringify(process.env.SOLR_CORE),