From f47fb8609b86044213ec496b7c3ca4e42bddce73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20H=C3=B8vik?= <andehovi@stud.ntnu.no>
Date: Mon, 29 Apr 2024 08:47:45 +0200
Subject: [PATCH] Fix: Change from a-links to router-links in menubar
---
src/components/BaseComponents/Menu.vue | 53 +++++++++++++-------------
1 file changed, 26 insertions(+), 27 deletions(-)
diff --git a/src/components/BaseComponents/Menu.vue b/src/components/BaseComponents/Menu.vue
index b9f83c3..0499095 100644
--- a/src/components/BaseComponents/Menu.vue
+++ b/src/components/BaseComponents/Menu.vue
@@ -13,20 +13,20 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ms-auto mb-2 mb-lg-0 ui-menu">
<li class="nav-item">
- <a class="nav-link text-white" href="#" @click="toSavingGoals"><img
- src="@/assets/icons/saving.svg">Saving goals</a>
+ <router-link class="nav-link text-white" to="/roadmap"><img
+ src="@/assets/icons/saving.svg">Saving goals</router-link>
</li>
<li class="nav-item">
- <a class="nav-link text-white" href="#" @click="toLeaderboard"><img
- src="@/assets/icons/leaderboard.svg">Leaderboard</a>
+ <router-link class="nav-link text-white" to="/leaderboard"><img
+ src="@/assets/icons/leaderboard.svg">Leaderboard</router-link>
</li>
<li class="nav-item">
- <a class="nav-link text-white" href="#" @click="toNews"><img
- src="@/assets/icons/newsletter.svg">News</a>
+ <router-link class="nav-link text-white" to="/news"><img
+ src="@/assets/icons/newsletter.svg">News</router-link>
</li>
<li class="nav-item">
- <a class="nav-link text-white" href="#" @click="toStore"><img
- src="@/assets/icons/storefront.svg">Store</a>
+ <router-link class="nav-link text-white" to="/shop"><img
+ src="@/assets/icons/storefront.svg">Store</router-link>
</li>
<li v-if="userStore.isLoggedIn" class="nav-item dropdown">
<a class="nav-link dropdown-toggle username-text text-white " href="#" role="button"
@@ -34,20 +34,19 @@
<img src="@/assets/icons/person.svg">{{ useUserInfoStore().firstname}}
</a>
<ul class="dropdown-menu dropdown-username-content">
- <li><a class="dropdown-item text-white dropdown-username-link" href="#"
- @click="toUserProfile"><img src="@/assets/icons/person.svg">User Profile</a></li>
- <li><a class="dropdown-item text-white dropdown-username-link" href="#"
- @click="toBudget">Budget</a></li>
- <li><a class="dropdown-item text-white dropdown-username-link" href="#"
- @click="toFriends"><img src="@/assets/icons/friends.svg">Friends</a></li>
- <li><a class="dropdown-item text-white dropdown-username-link" href="#"
- @click="toSetting"><img src="@/assets/icons/settings.svg">Setting</a></li>
- <li><a class="dropdown-item text-white dropdown-username-link" href="#"
- @click="toFeedback"><img src="@/assets/icons/feedback.svg">Feedback</a></li>
- <li><a class="dropdown-item text-white dropdown-username-link" href="#"
- @click="toSetting"><img src="@/assets/icons/admin.svg">Admin table</a></li>
- <li><a class="dropdown-item text-white dropdown-username-link" href="#"
- @click="toLogout" data-testid="logout"><img src="@/assets/icons/logout.svg">Log out</a></li>
+ <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toUserProfile()"><img
+ src="@/assets/icons/person.svg">User Profile</router-link></li>
+ <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toBudget()"><img>Budget</router-link></li>
+ <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toFriends()"><img
+ src="@/assets/icons/friends.svg">Friends</router-link></li>
+ <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toSetting()"><img
+ src="@/assets/icons/settings.svg">Settings</router-link></li>
+ <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toFeedback()"><img
+ src="@/assets/icons/feedback.svg">Feedback</router-link></li>
+ <li><router-link class="dropdown-item text-white dropdown-username-link" :to="toSetting()"><img
+ src="@/assets/icons/admin.svg">Admin</router-link></li>
+ <li><a class="dropdown-item text-white dropdown-username-link" ref="#" @click="toLogout()"><img
+ src="@/assets/icons/logout.svg">Log out</a></li>
</ul>
</li>
<li v-else class="nav-item">
@@ -71,7 +70,7 @@ function toHome() {
}
function toBudget() {
- router.push('/budget-overview')
+ return '/budget-overview'
}
function toSavingGoals() {
@@ -91,19 +90,19 @@ function toStore() {
}
function toSetting() {
- router.push('/settings/profile')
+ return '/settings/profile'
}
function toFeedback() {
- router.push('/feedback')
+ return '/feedback'
}
function toFriends() {
- router.push('/friends')
+ return '/friends'
}
function toUserProfile() {
- router.push('/profile')
+ return '/profile'
}
function toLogout() {
--
GitLab