Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move support to nav-bar #191

Merged
merged 2 commits into from
Apr 11, 2024
Merged

move support to nav-bar #191

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c936f16
move support to nav-bar
Apr 9, 2024
2729470
Merge branch 'main' into feat/move_support_to_nav-bar
tmilost-bbmri-eric Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/components/NavigationBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<span
v-if="oidcIsAuthenticated"
Expand Down Expand Up @@ -94,6 +107,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",
Expand All @@ -103,7 +117,8 @@ export default {
data () {
return {
roles: [],
logoSrc: activeTheme.activeLogosFiles === "eucaim" ? eucaimLogo : (activeTheme.activeLogosFiles === "canserv" ? canservLogo : bbmriLogo)
logoSrc: activeTheme.activeLogosFiles === "eucaim" ? eucaimLogo : (activeTheme.activeLogosFiles === "canserv" ? canservLogo : bbmriLogo),
featureFlagsFAQ: !!(allFeatureFlags.faqPage === "true" || allFeatureFlags.faqPage === true)
}
},
computed: {
Expand Down
15 changes: 0 additions & 15 deletions src/components/ProfileSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -89,7 +80,6 @@

<script>
import { mapActions } from "vuex"
import allFeatureFlags from "@/config/featureFlags.js"

export default {
name: "ProfileSettings",
Expand All @@ -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(" ")
Expand Down
Loading