Merge pull request #191 from BBMRI-ERIC/feat/move_support_to_nav-bar

Move support page tab to Navigation bar
BBMRI-ERIC · Apr 11, 2024 · ce1a1a0 · ce1a1a0
2 parents 214afdb + 2729470
commit ce1a1a0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/components/NavigationBar.vue b/src/components/NavigationBar.vue
@@ -57,6 +57,19 @@
               Your biobank
             </router-link>
           </li>
+          <li
+            v-if="featureFlagsFAQ"
+            class="nav-item"
+          >
+            <router-link
+              class="nav-link active nav-option"
+              :class="$route.path === '/FAQ' ? 'text-navbar-active-text' : 'text-navbar-text'"
+              to="/FAQ"
+            >
+              <i class="bi bi-people" />
+              Support
+            </router-link>
+          </li>
         </ul>
         <div
           v-if="oidcIsAuthenticated && returnCurrentMode"
@@ -105,6 +118,7 @@ import activeTheme from "../config/theme.js"
 import bbmriLogo from "../assets/images/bbmri/nav-bar-bbmri.png"
 import eucaimLogo from "../assets/images/eucaim/nav-bar-eucaim.png"
 import canservLogo from "../assets/images/canserv/nav-bar-canserv.png"
+import allFeatureFlags from "@/config/featureFlags.js"
 
 export default {
   name: "NavigationBar",
@@ -115,6 +129,7 @@ export default {
     return {
       roles: [],
       logoSrc: activeTheme.activeLogosFiles === "eucaim" ? eucaimLogo : (activeTheme.activeLogosFiles === "canserv" ? canservLogo : bbmriLogo),
+      featureFlagsFAQ: !!(allFeatureFlags.faqPage === "true" || allFeatureFlags.faqPage === true),
       backendEnvironment: ""
     }
   },

diff --git a/src/components/ProfileSettings.vue b/src/components/ProfileSettings.vue
@@ -64,15 +64,6 @@
           Access Policy
         </a>
       </li>
-      <li v-if="featureFlagsFAQ">
-        <router-link
-          class="dropdown-item text-primary-text"
-          to="/FAQ"
-        >
-          <i class="bi bi-people" />
-          Support
-        </router-link>
-      </li>
       <li><hr class="dropdown-divider"></li>
       <li class="text-center sign-out">
         <button
@@ -89,7 +80,6 @@
 
 <script>
 import { mapActions } from "vuex"
-import allFeatureFlags from "@/config/featureFlags.js"
 
 export default {
   name: "ProfileSettings",
@@ -103,11 +93,6 @@ export default {
       default: false
     }
   },
-  data () {
-    return {
-      featureFlagsFAQ: !!(allFeatureFlags.faqPage === "true" || allFeatureFlags.faqPage === true)
-    }
-  },
   computed: {
     returnAcronymOfName () {
       const words = this.user?.name.split(" ")