Skip to content
Snippets Groups Projects
Commit 1b9cd427 authored by Oda Alida Fønstelien Hjelljord's avatar Oda Alida Fønstelien Hjelljord
Browse files

Merge branch 'navbar-loggedout-fix' into 'main'

display "logg inn" and hide buttons in navbar when logged out

See merge request !134
parents 4cd9f0b2 9f59c0c4
No related branches found
No related tags found
1 merge request!134display "logg inn" and hide buttons in navbar when logged out
Pipeline #181767 failed
...@@ -11,14 +11,22 @@ ...@@ -11,14 +11,22 @@
/> />
</div> </div>
<ul class="flex justify-between"> <ul class="flex justify-between">
<li class="cursor-pointer" @click="$router.push('/newItem')"> <li
class="cursor-pointer"
v-if="this.$store.state.user.token !== null"
@click="$router.push('/newItem')"
>
<PlusIcon <PlusIcon
class="m-6 md:mr-2 h-7 text-primary-medium float-left" class="m-6 md:mr-2 h-7 text-primary-medium float-left"
alt="Legg til" alt="Legg til"
/> />
<a class="hidden md:block mt-7 text-sm float-right">Legg til</a> <a class="hidden md:block mt-7 text-sm float-right">Legg til</a>
</li> </li>
<li class="cursor-pointer" @click="loadMessages"> <li
class="cursor-pointer"
v-if="this.$store.state.user.token !== null"
@click="loadMessages"
>
<div class="notification-container"> <div class="notification-container">
<ChatAlt2Icon <ChatAlt2Icon
class="m-6 md:mr-2 h-7 text-primary-medium float-left" class="m-6 md:mr-2 h-7 text-primary-medium float-left"
...@@ -33,7 +41,14 @@ ...@@ -33,7 +41,14 @@
class="m-6 md:mr-2 h-7 text-primary-medium float-left" class="m-6 md:mr-2 h-7 text-primary-medium float-left"
alt="Profil" alt="Profil"
/> />
<a class="hidden md:block mr-4 mt-7 text-sm float-right">Profil</a> <a
v-if="this.$store.state.user.token !== null"
class="hidden md:block mr-4 mt-7 text-sm float-right"
>Profil</a
>
<a v-else class="hidden md:block mr-4 mt-7 text-sm float-right"
>Logg inn</a
>
</li> </li>
</ul> </ul>
</nav> </nav>
......
import { mount } from "@vue/test-utils"; import { shallowMount } from "@vue/test-utils";
import NavBar from "@/components/BaseComponents/NavBar.vue"; import NavBar from "@/components/BaseComponents/NavBar.vue";
import { store, $store } from "../../mock-store";
describe("NavBar component", () => { describe("NavBar component", () => {
let wrapper; let wrapper;
beforeEach(() => { beforeEach(() => {
wrapper = mount(NavBar); wrapper = shallowMount(NavBar, {
global: {
mocks: {
store,
$store,
},
},
});
}); });
it("is instantiated", () => { it("is instantiated", () => {
......
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