From e8db2c2b458bcae592609d5a5bc3f1b333651b25 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Tue, 24 Jan 2023 21:55:09 +0100
Subject: [PATCH] feat: header improvements

---
 cypress/e2e/list/list-view-list.spec.ts       |   6 +-
 cypress/e2e/list/list.spec.ts                 |  10 +-
 cypress/e2e/list/prepareLists.ts              |   2 +-
 cypress/e2e/user/logout.spec.ts               |   4 +-
 cypress/e2e/user/settings.spec.ts             |   2 +-
 src/components/home/TheNavigation.vue         | 371 ++++++++----------
 src/components/misc/dropdown.vue              |   3 +-
 .../notifications/notifications.vue           |  16 +-
 src/styles/common-imports.scss                |   3 +-
 src/styles/custom-properties/colors.scss      |   4 +-
 10 files changed, 194 insertions(+), 227 deletions(-)

diff --git a/cypress/e2e/list/list-view-list.spec.ts b/cypress/e2e/list/list-view-list.spec.ts
index 0601894d4f..e2af1319f8 100644
--- a/cypress/e2e/list/list-view-list.spec.ts
+++ b/cypress/e2e/list/list-view-list.spec.ts
@@ -14,9 +14,9 @@ describe('List View List', () => {
 		cy.visit('/lists/1')
 		cy.url()
 			.should('contain', '/lists/1/list')
-		cy.get('.list-title h1')
+		cy.get('.list-title')
 			.should('contain', 'First List')
-		cy.get('.list-title .dropdown')
+		cy.get('.list-title-dropdown')
 			.should('exist')
 		cy.get('p')
 			.contains('This list is currently empty.')
@@ -62,7 +62,7 @@ describe('List View List', () => {
 		})
 		cy.visit(`/lists/${lists[1].id}/`)
 
-		cy.get('.list-title .icon')
+		cy.get('.list-title-wrapper .icon')
 			.should('not.exist')
 		cy.get('input.input[placeholder="Add a new task..."')
 			.should('not.exist')
diff --git a/cypress/e2e/list/list.spec.ts b/cypress/e2e/list/list.spec.ts
index 6f7c0b3a4d..5f92e2adfb 100644
--- a/cypress/e2e/list/list.spec.ts
+++ b/cypress/e2e/list/list.spec.ts
@@ -30,7 +30,7 @@ describe('Lists', () => {
 			.should('contain', 'Success')
 		cy.url()
 			.should('contain', '/lists/')
-		cy.get('.list-title h1')
+		cy.get('.list-title')
 			.should('contain', 'New List')
 	})
 
@@ -51,7 +51,7 @@ describe('Lists', () => {
 		const newListName = 'New list name'
 
 		cy.visit('/lists/1')
-		cy.get('.list-title h1')
+		cy.get('.list-title')
 			.should('contain', 'First List')
 
 		cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .menu-list-dropdown-trigger')
@@ -67,7 +67,7 @@ describe('Lists', () => {
 
 		cy.get('.global-notification')
 			.should('contain', 'Success')
-		cy.get('.list-title h1')
+		cy.get('.list-title')
 			.should('contain', newListName)
 			.should('not.contain', lists[0].title)
 		cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child')
@@ -104,9 +104,9 @@ describe('Lists', () => {
 	it('Should archive a list', () => {
 		cy.visit(`/lists/${lists[0].id}`)
 		
-		cy.get('.list-title .dropdown')
+		cy.get('.list-title-dropdown')
 			.click()
-		cy.get('.list-title .dropdown .dropdown-menu .dropdown-item')
+		cy.get('.list-title-dropdown .dropdown-menu .dropdown-item')
 			.contains('Archive')
 			.click()
 		cy.get('.modal-content')
diff --git a/cypress/e2e/list/prepareLists.ts b/cypress/e2e/list/prepareLists.ts
index 8fa70e9c78..ac036625ec 100644
--- a/cypress/e2e/list/prepareLists.ts
+++ b/cypress/e2e/list/prepareLists.ts
@@ -11,7 +11,7 @@ export function createLists() {
 	return lists
 }
 
-export function prepareLists(setLists = () => {}) {
+export function prepareLists(setLists = (...args: any[]) => {}) {
 	beforeEach(() => {
 		const lists = createLists()
 		setLists(lists)
diff --git a/cypress/e2e/user/logout.spec.ts b/cypress/e2e/user/logout.spec.ts
index aeb07e5878..30a6d18d8a 100644
--- a/cypress/e2e/user/logout.spec.ts
+++ b/cypress/e2e/user/logout.spec.ts
@@ -2,9 +2,9 @@ import {createFakeUserAndLogin} from '../../support/authenticateUser'
 import {createLists} from '../list/prepareLists'
 
 function logout() {
-	cy.get('.navbar .user .username')
+	cy.get('.navbar .username-dropdown-trigger')
 		.click()
-	cy.get('.navbar .user .dropdown-menu .dropdown-item')
+	cy.get('.navbar .dropdown-item')
 		.contains('Logout')
 		.click()
 }
diff --git a/cypress/e2e/user/settings.spec.ts b/cypress/e2e/user/settings.spec.ts
index ca4c3427a7..6e73188d47 100644
--- a/cypress/e2e/user/settings.spec.ts
+++ b/cypress/e2e/user/settings.spec.ts
@@ -37,7 +37,7 @@ describe('User Settings', () => {
 
 		cy.get('.global-notification')
 			.should('contain', 'Success')
-		cy.get('.navbar .user .username')
+		cy.get('.navbar .username-dropdown-trigger .username')
 			.should('contain', 'Lorem Ipsum')
 	})
 })
diff --git a/src/components/home/TheNavigation.vue b/src/components/home/TheNavigation.vue
index bed6764fa1..1bda78d3e8 100644
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@@ -2,95 +2,90 @@
 	<header
 		:class="{'has-background': background, 'menu-active': menuActive}"
 		aria-label="main navigation"
-		class="navbar main-theme is-fixed-top d-print-none"
+		class="navbar d-print-none"
 	>
 		<router-link :to="{name: 'home'}" class="logo-link">
 			<Logo width="164" height="48"/>
 		</router-link>
+
 		<MenuButton class="menu-button"/>
-		<div class="list-title" ref="listTitle" v-show="currentList.id">
-			<template v-if="currentList.id">
-				<h1
-					:style="{ 'opacity': currentList.title === '' ? '0': '1' }"
-					class="title">
-					{{ currentList.title === '' ? $t('misc.loading') : getListTitle(currentList) }}
-				</h1>
 
-				<BaseButton :to="{name: 'list.info', params: {listId: currentList.id}}" class="info-button">
-					<icon icon="circle-info"/>
-				</BaseButton>
+		<div
+			v-if="currentList.id"
+			class="list-title-wrapper"
+		>
+			<h1 class="list-title">{{ currentList.title === '' ? $t('misc.loading') : getListTitle(currentList) }}</h1>
+			
+			<BaseButton :to="{name: 'list.info', params: {listId: currentList.id}}" class="list-title-button">
+				<icon icon="circle-info"/>
+			</BaseButton>
 
-				<list-settings-dropdown v-if="canWriteCurrentList && currentList.id !== -1" :list="currentList"/>
-			</template>
+			<list-settings-dropdown
+				v-if="canWriteCurrentList && currentList.id !== -1"
+				class="list-title-dropdown"
+				:list="currentList"
+			>
+				<template #trigger="{toggleOpen}">
+					<BaseButton class="list-title-button" @click="toggleOpen">
+						<icon icon="ellipsis-h" class="icon"/>
+					</BaseButton>
+				</template>
+			</list-settings-dropdown>
 		</div>
 
 		<div class="navbar-end">
 			<BaseButton
 				@click="openQuickActions"
-				class="trigger-button pr-0"
+				class="trigger-button"
 				v-shortcut="'Control+k'"
 				:title="$t('keyboardShortcuts.quickSearch')"
 			>
 				<icon icon="search"/>
 			</BaseButton>
-			<notifications/>
-			<div class="user">
-				<dropdown class="is-right" ref="usernameDropdown">
-					<template #trigger="{toggleOpen}">
-						<x-button
-							class="username-dropdown-trigger"
-							@click="toggleOpen()"
-							variant="secondary"
-							:shadow="false"
-						>
-							<img :src="authStore.avatarUrl" alt="" class="avatar" width="40" height="40"/>
-							<span class="username">{{ authStore.userDisplayName }}</span>
-							<span class="icon is-small">
-								<icon icon="chevron-down"/>
-							</span>
-						</x-button>
-					</template>
+			<Notifications />
+			<dropdown>
+				<template #trigger="{toggleOpen, open}">
+					<BaseButton
+						class="username-dropdown-trigger"
+						@click="toggleOpen"
+						variant="secondary"
+						:shadow="false"
+					>
+						<img :src="authStore.avatarUrl" alt="" class="avatar" width="40" height="40"/>
+						<span class="username">{{ authStore.userDisplayName }}</span>
+						<span class="icon is-small" :style="{
+							transform: open ? 'rotate(180deg)' : 'rotate(0)',
+						}">
+							<icon icon="chevron-down"/>
+						</span>
+					</BaseButton>
+				</template>
 
-					<dropdown-item
-						:to="{name: 'user.settings'}"
-					>
-						{{ $t('user.settings.title') }}
-					</dropdown-item>
-					<dropdown-item
-						v-if="imprintUrl"
-						:href="imprintUrl"
-					>
-						{{ $t('navigation.imprint') }}
-					</dropdown-item>
-					<dropdown-item
-						v-if="privacyPolicyUrl"
-						:href="privacyPolicyUrl"
-					>
-						{{ $t('navigation.privacy') }}
-					</dropdown-item>
-					<dropdown-item
-						@click="baseStore.setKeyboardShortcutsActive(true)"
-					>
-						{{ $t('keyboardShortcuts.title') }}
-					</dropdown-item>
-					<dropdown-item
-						:to="{name: 'about'}"
-					>
-						{{ $t('about.title') }}
-					</dropdown-item>
-					<dropdown-item
-						@click="authStore.logout()"
-					>
-						{{ $t('user.auth.logout') }}
-					</dropdown-item>
-				</dropdown>
-			</div>
+				<dropdown-item :to="{name: 'user.settings'}">
+					{{ $t('user.settings.title') }}
+				</dropdown-item>
+				<dropdown-item v-if="imprintUrl" :href="imprintUrl">
+					{{ $t('navigation.imprint') }}
+				</dropdown-item>
+				<dropdown-item v-if="privacyPolicyUrl" :href="privacyPolicyUrl">
+					{{ $t('navigation.privacy') }}
+				</dropdown-item>
+				<dropdown-item @click="baseStore.setKeyboardShortcutsActive(true)">
+					{{ $t('keyboardShortcuts.title') }}
+				</dropdown-item>
+				<dropdown-item :to="{name: 'about'}">
+					{{ $t('about.title') }}
+				</dropdown-item>
+				<dropdown-item @click="authStore.logout()">
+					{{ $t('user.auth.logout') }}
+				</dropdown-item>
+			</dropdown>
 		</div>
 	</header>
 </template>
 
 <script setup lang="ts">
-import {ref, computed, onMounted, nextTick} from 'vue'
+import {computed} from 'vue'
 
 import {RIGHTS as Rights} from '@/constants/rights'
 
@@ -120,182 +115,152 @@ const configStore = useConfigStore()
 const imprintUrl = computed(() => configStore.legal.imprintUrl)
 const privacyPolicyUrl = computed(() => configStore.legal.privacyPolicyUrl)
 
-const usernameDropdown = ref()
-const listTitle = ref()
-onMounted(async () => {
-	await nextTick()
-	if (typeof usernameDropdown.value === 'undefined' || typeof listTitle.value === 'undefined') {
-		return
-	}
-
-	const usernameWidth = usernameDropdown.value.$el.clientWidth
-	listTitle.value.style.setProperty('--nav-username-width', `${usernameWidth}px`)
-})
-
 function openQuickActions() {
 	baseStore.setQuickActionsActive(true)
 }
 </script>
 
 <style lang="scss" scoped>
-$vikunja-nav-logo-full-width: 164px;
 $user-dropdown-width-mobile: 5rem;
 
-$hamburger-menu-icon-spacing: 1rem;
-$hamburger-menu-icon-width: 28px;
+.navbar {
+	--navbar-button-min-width: 40px;
+	--navbar-gap-width: 1rem;
+	--navbar-icon-size: 1.25rem;
+
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+
+	display: flex;
+	justify-content: space-between;
+	gap: var(--navbar-gap-width);
+
+	background: var(--site-background);
+
+	@media screen and (max-width: $tablet) {
+		padding-right: .5rem;
+	}
+
+	@media screen and (min-width: $tablet) {
+		padding-left: 2rem;
+		padding-right: 1rem;
+		align-items: stretch;
+	}
+
+	&.menu-active {
+		@media screen and (max-width: $tablet) {
+			z-index: 0;
+		}
+	}
+
+	// FIXME: notifications should provide a slot for the icon instead, so that we can style it as we want
+	:deep() {
+		.trigger-button {
+			color: var(--grey-400);
+			font-size: var(--navbar-icon-size);
+		}
+	}
+}
 
 .logo-link {
 	display: none;
-	padding: 0.5rem 0.75rem;
-
+	
 	@media screen and (min-width: $tablet) {
 		align-self: stretch;
 		display: flex;
 		align-items: center;
-		padding-left: 2rem;
-		margin-right: 1.5rem;
+		margin-right: .5rem;
 	}
 }
 
 .menu-button {
-	align-self: stretch;
 	margin-right: auto;
+	align-self: stretch;
+	flex: 0 0 auto;
 
 	@media screen and (max-width: $tablet) {
-		margin-left: $hamburger-menu-icon-spacing;
+		margin-left: 1rem;
 	}
 }
 
-.navbar.main-theme {
-	background: var(--site-background);
-	justify-content: space-between;
+.list-title-wrapper {
+	margin-inline: auto;
+	display: flex;
 	align-items: center;
 
-	@media screen and (max-width: $desktop) {
-		display: flex;
-		justify-content: space-between;
-	}
+	// this makes the truncated text of the list title work
+	// inside the flexbox parent
+	min-width: 0;
 
-	.title {
-		margin: 0;
-		font-size: 1.75rem;
-		text-overflow: ellipsis;
-		overflow: hidden;
-		white-space: nowrap;
-	}
-
-	.navbar-end {
-		margin-left: 0;
-		align-items: center;
-		display: flex;
-	}
-
-	@media screen and (max-width: $tablet) {
-		&.menu-active {
-			z-index: 0;
-		}
-
-		.user {
-			width: $user-dropdown-width-mobile;
-
-			.username-dropdown-trigger {
-				line-height: 1;
-				padding: 0 0.25rem;
-				height: 1rem;
-
-				.icon {
-					width: .5rem;
-				}
-			}
-
-			.username {
-				display: none;
-			}
-		}
-	}
-}
-
-.navbar {
-	// FIXME: notifications should provide a slot for the icon instead, so that we can style it as we want
-	:deep() {
-		.trigger-button {
-			cursor: pointer;
-			color: var(--grey-400);
-			padding: .5rem;
-			font-size: 1.25rem;
-			position: relative;
-		}
-
-		> * > .trigger-button {
-			width: $navbar-icon-width;
-		}
-	}
-
-	.user {
-		display: flex;
-		align-items: center;
-
-		span {
-			font-family: $vikunja-font;
-		}
-
-		.avatar {
-			border-radius: 100%;
-			vertical-align: middle;
-			height: 40px;
-			margin-right: .5rem;
-		}
-
-		.username-dropdown-trigger {
-			background: none;
-
-			&:focus:not(:active), &:active {
-				outline: none !important;
-				box-shadow: none !important;
-			}
-		}
+	@media screen and (min-width: $tablet) {
+		padding-inline: var(--navbar-gap-width);
 	}
 }
 
 .list-title {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-
-	$edit-icon-width: 1rem;
+	font-size: 1rem;
+	// We need the following for overflowing ellipsis to work
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
 
 	@media screen and (min-width: $tablet) {
-		// We need a fixed width for overflowing ellipsis to work
-		--nav-username-width: 0;
-		width: calc(100vw - #{$user-dropdown-width-mobile} - #{2 * $hamburger-menu-icon-spacing} - #{$hamburger-menu-icon-width} - #{$edit-icon-width} - #{2 * $navbar-icon-width} - #{$vikunja-nav-logo-full-width} - var(--nav-username-width));
+		font-size: 1.75rem;
 	}
+}
+
+.list-title-dropdown {
+	align-self: stretch;
+
+	.list-title-button {
+		flex-grow: 1;
+	}
+}
+
+.list-title-button {
+	align-self: stretch;
+	min-width: var(--navbar-button-min-width);
+	display: flex;
+	place-items: center;
+	justify-content: center;
+	font-size: var(--navbar-icon-size);
+	color: var(--grey-400);
+}
+
+.navbar-end {
+	margin-left: auto;
+	flex: 0 0 auto;
+	display: flex;
+	align-items: stretch;
+
+	> * {
+		min-width: var(--navbar-button-min-width);
+	}
+}
+
+.username-dropdown-trigger {
+	padding-left: 1rem;
+	display: inline-flex;
+	align-items: center;
+	text-transform: uppercase;
+	font-size: .85rem;
+	font-weight: 700;
+}
+
+.username {
+	font-family: $vikunja-font;
 
 	@media screen and (max-width: $tablet) {
-		// We need a fixed width for overflowing ellipsis to work
-		width: calc(100vw - #{$user-dropdown-width-mobile} - #{2 * $hamburger-menu-icon-spacing} - #{$hamburger-menu-icon-width} - #{$edit-icon-width} - #{2 * $navbar-icon-width});
-	}
-
-	h1 {
-		margin: 0;
-	}
-
-	:deep(.dropdown-trigger) {
-		color: var(--grey-400);
-		margin-left: .5rem;
-		height: 1rem;
-		width: 1rem;
-		cursor: pointer;
+		display: none;
 	}
 }
 
-.info-button {
-	text-align: center;
-	height: 1.25rem;
-	line-height: 1.25rem;
-	width: 2rem;
-	margin-top: .25rem;
-	padding: 0 .5rem;
-	color: var(--grey-400);
-	margin-left: .5rem;
+.avatar {
+	border-radius: 100%;
+	vertical-align: middle;
+	height: 40px;
+	margin-right: .5rem;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/misc/dropdown.vue b/src/components/misc/dropdown.vue
index 5b0fcdd697..6bc9eb6f85 100644
--- a/src/components/misc/dropdown.vue
+++ b/src/components/misc/dropdown.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="dropdown" ref="dropdown">
-		<slot name="trigger" :close="close" :toggleOpen="toggleOpen">
+		<slot name="trigger" :close="close" :toggleOpen="toggleOpen" :open="open">
 			<BaseButton class="dropdown-trigger is-flex" @click="toggleOpen">
 				<icon :icon="triggerIcon" class="icon"/>
 			</BaseButton>
@@ -56,7 +56,6 @@ onClickOutside(dropdown, (e: Event) => {
 .dropdown {
 	display: inline-flex;
 	position: relative;
-	vertical-align: top;
 }
 
 .dropdown-menu {
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 0e76249e12..7e3c3699be 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -1,11 +1,11 @@
 <template>
 	<div class="notifications">
-		<div class="is-flex is-justify-content-center">
-			<BaseButton @click.stop="showNotifications = !showNotifications" class="trigger-button">
+		<slot name="trigger" toggleOpen="() => showNotifications = !showNotifications" :has-unread-notifications="unreadNotifications > 0">
+			<BaseButton class="trigger-button" @click.stop="showNotifications = !showNotifications">
 				<span class="unread-indicator" v-if="unreadNotifications > 0"></span>
 				<icon icon="bell"/>
 			</BaseButton>
-		</div>
+		</slot>
 
 		<CustomTransition name="fade">
 			<div class="notifications-list" v-if="showNotifications" ref="popup">
@@ -141,7 +141,11 @@ function to(n, index) {
 
 <style lang="scss" scoped>
 .notifications {
-	width: $navbar-icon-width;
+	display: flex;
+
+	.trigger-button {
+		width: 100%;
+	}
 
 	.unread-indicator {
 		position: absolute;
@@ -156,9 +160,9 @@ function to(n, index) {
 	}
 
 	.notifications-list {
-		position: fixed;
+		position: absolute;
 		right: 1rem;
-		margin-top: 1rem;
+		top: calc(100% + 1rem);
 		max-height: 400px;
 		overflow-y: auto;
 
diff --git a/src/styles/common-imports.scss b/src/styles/common-imports.scss
index 7d1bf0c064..d1365529cc 100644
--- a/src/styles/common-imports.scss
+++ b/src/styles/common-imports.scss
@@ -32,5 +32,4 @@ $button-height: 34px;
 $switch-view-height: 2.69rem;
 
 $navbar-height: 4rem;
-$navbar-width: 300px;
-$navbar-icon-width: 40px;
\ No newline at end of file
+$navbar-width: 300px;
\ No newline at end of file
diff --git a/src/styles/custom-properties/colors.scss b/src/styles/custom-properties/colors.scss
index da58d24827..0a6edf7a0d 100644
--- a/src/styles/custom-properties/colors.scss
+++ b/src/styles/custom-properties/colors.scss
@@ -256,8 +256,8 @@
   --card-border-color: var(--grey-200);
   --logo-text-color: hsl(180, 1%, 15%);
 
-  @media screen {
-    &.dark {
+  &.dark {
+    @media screen {
       // Light mode colours reversed for dark mode
       --grey-900-hsl: 210, 20%, 98%;
       --grey-900: hsl(var(--grey-900-hsl));