Skip to content
Snippets Groups Projects
Commit 0b806f84 authored by Anders Høvik's avatar Anders Høvik
Browse files

Fix: fixed merge-conflict

parents d78778da 68d2a7d7
No related branches found
No related tags found
1 merge request!59Feature/inbox
Pipeline #281746 passed with warnings
Stage: install
Stage: build
Stage: test
Stage: lint
Hide whitespace changes
Inline Side-by-side
cypress.config.ts
+ 3
− 1
View file @ 0b806f84
...@@ -3,6 +3,8 @@ import { defineConfig } from 'cypress' ...@@ -3,6 +3,8 @@ import { defineConfig } from 'cypress'
export default defineConfig({ export default defineConfig({
e2e: { e2e: {
specPattern: 'cypress/e2e/**/*.{cy,spec}.{js,jsx,ts,tsx}', specPattern: 'cypress/e2e/**/*.{cy,spec}.{js,jsx,ts,tsx}',
baseUrl: 'http://localhost:5173' baseUrl: 'http://localhost:5173',
viewportHeight: 1080,
viewportWidth: 1920,
} }
}) })
cypress/e2e/BasePage/BasePageView.cy.ts 0 → 100644
+ 67
− 0
View file @ 0b806f84
describe('BasePage test', () => {
beforeEach(() => {
cy.visit('/login');
cy.get('#emailInput input').type('user@example.com');
cy.get('#passwordInput input').type('John1');
cy.get('form').submit();
cy.wait(1000);
cy.visit('/')
});
it('uses menu to visit leaderboard', () => {
cy.get('[data-cy="menu"]').get('[data-cy="leaderboard"]').click();
cy.url().should('include', '/leaderboard');
});
it('uses menu to visit news', () => {
cy.get('[data-cy="menu"]').get('[data-cy="news"]').click();
cy.url().should('include', '/news');
});
it('uses menu to visit store', () => {
cy.get('[data-cy="menu"]').get('[data-cy="store"]').click();
cy.url().should('include', '/shop');
});
it('uses menu to visit roadmap', () => {
cy.get('[data-cy="menu"]').get('[data-cy="savingGoals"]').click();
cy.url().should('include', '/roadmap');
});
it('uses menu to visit user profile', () => {
cy.get('[data-cy="menu"]').get('[data-cy="user"]').click();
cy.get('[data-cy="profile"]').click();
cy.url().should('include', '/profile');
});
it('uses menu to visit budget', () => {
cy.get('[data-cy="menu"]').get('[data-cy="user"]').click();
cy.get('[data-cy="budget"]').click();
cy.url().should('include', '/budget');
});
it('uses menu to visit friends', () => {
cy.get('[data-cy="menu"]').get('[data-cy="user"]').click();
cy.get('[data-cy="friends"]').click();
cy.url().should('include', '/friends');
});
it('uses menu to visit settings', () => {
cy.get('[data-cy="menu"]').get('[data-cy="user"]').click();
cy.get('[data-cy="settings"]').click();
cy.url().should('include', '/settings');
});
it('uses menu to visit feedback', () => {
cy.get('[data-cy="menu"]').get('[data-cy="user"]').click();
cy.get('[data-cy="feedback"]').click();
cy.url().should('include', '/feedback');
});
it('uses menu to log out', () => {
cy.get('[data-cy="menu"]').get('[data-cy="user"]').click();
cy.get('[data-testid="logout"]').click();
cy.wait(1000);
cy.url().should('include', '/login');
});
})
\ No newline at end of file
src/components/BaseComponents/Menu.vue
+ 31
− 24
View file @ 0b806f84
<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">
<router-link class="navbar-brand" id="home" :to="toSavingGoals()"> <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>
</router-link> </router-link>
...@@ -13,20 +13,22 @@ ...@@ -13,20 +13,22 @@
<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">
<router-link class="nav-link text-white" :to="toSavingGoals()"><img <router-link data-cy="savingGoals" class="nav-link text-white"
:to="toSavingGoals()"><img
src="@/assets/icons/saving.svg">Saving goals</router-link> src="@/assets/icons/saving.svg">Saving goals</router-link>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<router-link class="nav-link text-white" :to="toLeaderboard()"><img <router-link data-cy="leaderboard" class="nav-link text-white"
:to="toLeaderboard()"><img
src="@/assets/icons/leaderboard.svg">Leaderboard</router-link> src="@/assets/icons/leaderboard.svg">Leaderboard</router-link>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<router-link class="nav-link text-white" :to="toNews()"><img <router-link data-cy="news" class="nav-link text-white" :to="toNews()"><img
src="@/assets/icons/newsletter.svg">News</router-link> src="@/assets/icons/newsletter.svg">News</router-link>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<router-link class="nav-link text-white" :to="toStore()"><img <router-link data-cy="store" class="nav-link text-white" :to="toStore()"><img
src="@/assets/icons/storefront.svg">Store</router-link> src="@/assets/icons/storefront.svg">Store</router-link>
</li> </li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a data-mdb-dropdown-init class=" nav-link me-3 dropdown-toggle hidden-arrow notification" href="#" id="navbarDropdownMenuLink" <a data-mdb-dropdown-init class=" nav-link me-3 dropdown-toggle hidden-arrow notification" href="#" id="navbarDropdownMenuLink"
...@@ -56,29 +58,34 @@ ...@@ -56,29 +58,34 @@
</ul> </ul>
</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 data-cy="user"
class="nav-link dropdown-toggle username-text text-white "
href="#" role="button"
data-bs-toggle="dropdown" aria-expanded="false"> data-bs-toggle="dropdown" aria-expanded="false">
<img :src="useUserInfoStore().profileImage ? 'http://localhost:8080/api/images/' + useUserInfoStore().profileImage : 'src/assets/userprofile.png'" <img :src="useUserInfoStore().profileImage ? 'http://localhost:8080/api/images/' + useUserInfoStore().profileImage : 'src/assets/userprofile.png'"
style="width: 50px; border: 2px solid black; border-radius: 50%">{{ style="width: 50px; border: 2px solid black; border-radius: 50%">{{
useUserInfoStore().firstname }} useUserInfoStore().firstname }}
</a> </a>
<ul class="dropdown-menu dropdown-username-content"> <ul class="dropdown-menu dropdown-username-content">
<li><router-link class="dropdown-item text-white dropdown-username-link" <li><router-link data-cy="profile"
:to="toUserProfile()"><img src="@/assets/icons/person.svg">User class="dropdown-item text-white dropdown-username-link" :to="toUserProfile()"><img
Profile</router-link></li> src="@/assets/icons/person.svg">User Profile</router-link></li>
<li><router-link class="dropdown-item text-white dropdown-username-link" <li><router-link data-cy="budget"
:to="toBudget()"><img>Budget</router-link></li> 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" <li><router-link data-cy="friends"
:to="toFriends()"><img src="@/assets/icons/friends.svg">Friends</router-link></li> class="dropdown-item text-white dropdown-username-link" :to="toFriends()"><img
<li><router-link class="dropdown-item text-white dropdown-username-link" src="@/assets/icons/friends.svg">Friends</router-link></li>
:to="toSetting()"><img src="@/assets/icons/settings.svg">Settings</router-link></li> <li><router-link data-cy="settings"
<li><router-link class="dropdown-item text-white dropdown-username-link" class="dropdown-item text-white dropdown-username-link" :to="toSetting()"><img
:to="toFeedback()"><img src="@/assets/icons/feedback.svg">Feedback</router-link> src="@/assets/icons/settings.svg">Settings</router-link></li>
</li> <li><router-link data-cy="feedback"
<li><router-link class="dropdown-item text-white dropdown-username-link" class="dropdown-item text-white dropdown-username-link" :to="toFeedback()"><img
:to="toSetting()"><img src="@/assets/icons/admin.svg">Admin</router-link></li> src="@/assets/icons/feedback.svg">Feedback</router-link></li>
<li><a data-testid="logout" class="dropdown-item text-white dropdown-username-link" ref="#" <li><router-link data-cy="admin"
@click="toLogout()"><img src="@/assets/icons/logout.svg">Log out</a></li> 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> </ul>
</li> </li>
<li v-else class="nav-item"> <li v-else class="nav-item">
......
src/views/BasePageView.vue
+ 1
− 1
View file @ 0b806f84
...@@ -7,7 +7,7 @@ import FooterAlternative from "@/components/BaseComponents/FooterAlternative.vue ...@@ -7,7 +7,7 @@ import FooterAlternative from "@/components/BaseComponents/FooterAlternative.vue
<template> <template>
<Menu></Menu> <Menu data-cy="menu"></Menu>
<div style="display: flex; flex-direction: row;"> <div style="display: flex; flex-direction: row;">
<img v-for="item in 7" src="@/assets/coca.webp" style="width: 100%; height: 100px; margin: 5px; border-radius: 1rem;" alt="picture"> <img v-for="item in 7" src="@/assets/coca.webp" style="width: 100%; height: 100px; margin: 5px; border-radius: 1rem;" alt="picture">
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment