Skip to content
Snippets Groups Projects
Commit 438d316a authored by Viktor Gunnar Grevskott's avatar Viktor Gunnar Grevskott
Browse files

Merge branch 'fix/menu-bug' into 'main'

Fix/menu bug

See merge request !54
parents 8f517e29 5399f1e8
No related branches found
No related tags found
1 merge request!54Fix/menu bug
Pipeline #280879 passed with warnings
<template> <template>
<nav id="navBar" class="navbar navbar-expand-xl"> <nav id="navBar" class="navbar navbar-expand-xl">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="#" @click="toSavingGoals" id="home"> <router-link class="navbar-brand" id="home" :to="toSavingGoals()">
<img id="logoImg" src="/src/assets/Sparesti-logo.png" alt="Sparesti-logo" width="60"> <img id="logoImg" src="/src/assets/Sparesti-logo.png" alt="Sparesti-logo" width="60">
<span id="logo" class="text-white">Sparesti</span> <span id="logo" class="text-white">Sparesti</span>
</a> </router-link>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
aria-label="Toggle navigation"> aria-label="Toggle navigation">
...@@ -13,20 +13,20 @@ ...@@ -13,20 +13,20 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ms-auto mb-2 mb-lg-0 ui-menu"> <ul class="navbar-nav ms-auto mb-2 mb-lg-0 ui-menu">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-white" href="#" @click="toSavingGoals"><img <router-link class="nav-link text-white" :to="toSavingGoals()"><img
src="@/assets/icons/saving.svg">Saving goals</a> src="@/assets/icons/saving.svg">Saving goals</router-link>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-white" href="#" @click="toLeaderboard"><img <router-link class="nav-link text-white" :to="toLeaderboard()"><img
src="@/assets/icons/leaderboard.svg">Leaderboard</a> src="@/assets/icons/leaderboard.svg">Leaderboard</router-link>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-white" href="#" @click="toNews"><img <router-link class="nav-link text-white" :to="toNews()"><img
src="@/assets/icons/newsletter.svg">News</a> src="@/assets/icons/newsletter.svg">News</router-link>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-white" href="#" @click="toStore"><img <router-link class="nav-link text-white" :to="toStore()"><img
src="@/assets/icons/storefront.svg">Store</a> src="@/assets/icons/storefront.svg">Store</router-link>
</li> </li>
<li v-if="userStore.isLoggedIn" class="nav-item dropdown"> <li v-if="userStore.isLoggedIn" class="nav-item dropdown">
<a class="nav-link dropdown-toggle username-text text-white " href="#" role="button" <a class="nav-link dropdown-toggle username-text text-white " href="#" role="button"
...@@ -34,20 +34,19 @@ ...@@ -34,20 +34,19 @@
<img src="@/assets/icons/person.svg">{{ useUserInfoStore().firstname}} <img src="@/assets/icons/person.svg">{{ useUserInfoStore().firstname}}
</a> </a>
<ul class="dropdown-menu dropdown-username-content"> <ul class="dropdown-menu dropdown-username-content">
<li><a class="dropdown-item text-white dropdown-username-link" href="#" <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toUserProfile()"><img
@click="toUserProfile"><img src="@/assets/icons/person.svg">User Profile</a></li> src="@/assets/icons/person.svg">User Profile</router-link></li>
<li><a class="dropdown-item text-white dropdown-username-link" href="#" <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toBudget()"><img>Budget</router-link></li>
@click="toBudget">Budget</a></li> <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toFriends()"><img
<li><a class="dropdown-item text-white dropdown-username-link" href="#" src="@/assets/icons/friends.svg">Friends</router-link></li>
@click="toFriends"><img src="@/assets/icons/friends.svg">Friends</a></li> <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toSetting()"><img
<li><a class="dropdown-item text-white dropdown-username-link" href="#" src="@/assets/icons/settings.svg">Settings</router-link></li>
@click="toSetting"><img src="@/assets/icons/settings.svg">Setting</a></li> <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toFeedback()"><img
<li><a class="dropdown-item text-white dropdown-username-link" href="#" src="@/assets/icons/feedback.svg">Feedback</router-link></li>
@click="toFeedback"><img src="@/assets/icons/feedback.svg">Feedback</a></li> <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toSetting()"><img
<li><a class="dropdown-item text-white dropdown-username-link" href="#" src="@/assets/icons/admin.svg">Admin</router-link></li>
@click="toSetting"><img src="@/assets/icons/admin.svg">Admin table</a></li> <li><a data-testid="logout" class="dropdown-item text-white dropdown-username-link" ref="#" @click="toLogout()"><img
<li><a class="dropdown-item text-white dropdown-username-link" href="#" src="@/assets/icons/logout.svg">Log out</a></li>
@click="toLogout" data-testid="logout"><img src="@/assets/icons/logout.svg">Log out</a></li>
</ul> </ul>
</li> </li>
<li v-else class="nav-item"> <li v-else class="nav-item">
...@@ -67,43 +66,43 @@ const router = useRouter(); ...@@ -67,43 +66,43 @@ const router = useRouter();
const userStore : any = useUserInfoStore(); const userStore : any = useUserInfoStore();
function toHome() { function toHome() {
router.push('/') return '/'
} }
function toBudget() { function toBudget() {
router.push('/budget-overview') return '/budget-overview'
} }
function toSavingGoals() { function toSavingGoals() {
router.push('/roadmap') return '/roadmap'
} }
function toLeaderboard() { function toLeaderboard() {
router.push('/leaderboard') return '/leaderboard'
} }
function toNews() { function toNews() {
router.push('/news') return '/news'
} }
function toStore() { function toStore() {
router.push('/shop') return '/shop'
} }
function toSetting() { function toSetting() {
router.push('/settings/profile') return '/settings/profile'
} }
function toFeedback() { function toFeedback() {
router.push('/feedback') return '/feedback'
} }
function toFriends() { function toFriends() {
router.push('/friends') return '/friends'
} }
function toUserProfile() { function toUserProfile() {
router.push('/profile') return '/profile'
} }
function toLogout() { function toLogout() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment