Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
idatt2106-2024-07
frontend
Merge requests
!54
Fix/menu bug
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fix/menu bug
fix/menu-bug
into
main
Overview
0
Commits
4
Pipelines
1
Changes
1
Merged
Anders Høvik
requested to merge
fix/menu-bug
into
main
1 year ago
Overview
0
Commits
4
Pipelines
1
Changes
1
Expand
Fixed double tap bug on menubar with changing from a-links to router-links except on logout
0
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
5399f1e8
4 commits,
1 year ago
1 file
+
33
−
34
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/components/BaseComponents/Menu.vue
+
33
−
34
Options
<
template
>
<nav
id=
"navBar"
class=
"navbar navbar-expand-xl"
>
<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"
>
<span
id=
"logo"
class=
"text-white"
>
Sparesti
</span>
</
a
>
</
router-link
>
<button
class=
"navbar-toggler"
type=
"button"
data-bs-toggle=
"collapse"
data-bs-target=
"#navbarSupportedContent"
aria-controls=
"navbarSupportedContent"
aria-expanded=
"false"
aria-label=
"Toggle navigation"
>
@@ -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
=
"toSavingGoals
()
"
><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
=
"toLeaderboard
()
"
><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
=
"toNews
()
"
><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
=
"toStore
()
"
><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
data-testid=
"logout"
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"
>
@@ -67,43 +66,43 @@ const router = useRouter();
const
userStore
:
any
=
useUserInfoStore
();
function
toHome
()
{
r
outer
.
push
(
'
/
'
)
r
eturn
'
/
'
}
function
toBudget
()
{
r
outer
.
push
(
'
/budget-overview
'
)
r
eturn
'
/budget-overview
'
}
function
toSavingGoals
()
{
r
outer
.
push
(
'
/roadmap
'
)
r
eturn
'
/roadmap
'
}
function
toLeaderboard
()
{
r
outer
.
push
(
'
/leaderboard
'
)
r
eturn
'
/leaderboard
'
}
function
toNews
()
{
r
outer
.
push
(
'
/news
'
)
r
eturn
'
/news
'
}
function
toStore
()
{
r
outer
.
push
(
'
/shop
'
)
r
eturn
'
/shop
'
}
function
toSetting
()
{
r
outer
.
push
(
'
/settings/profile
'
)
r
eturn
'
/settings/profile
'
}
function
toFeedback
()
{
r
outer
.
push
(
'
/feedback
'
)
r
eturn
'
/feedback
'
}
function
toFriends
()
{
r
outer
.
push
(
'
/friends
'
)
r
eturn
'
/friends
'
}
function
toUserProfile
()
{
router
.
push
(
'
/profile
'
)
return
'
/profile
'
}
function
toLogout
()
{
Loading