vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

feat: move update from navigation to app #2997

Merged
dpschen merged 3 commits from dpschen/frontend:feature/move-update-to-app into main 2023-02-03 16:34:49 +00:00
Conversation 8 Commits 3 Files Changed 7 +18 -18
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3db5ea45d7 - Show all commits

15
src/App.vue
View File

@ -1,5 +1,6 @@
<template>
<ready>
<Update/>
dpschen commented 2023-01-26 12:54:21 +00:00
Outdated
Review
Copy Link

If we move <Update> below <Notification> can we then remove the z-index?.

We might want to move <KeyboardShortcuts> above <Notification> at the same time. I'm unsure but couldn't the current order make the Shortcuts appear above the Notifications?

If we move `<Update>` below `<Notification>` can we then remove the z-index?. We might want to move `<KeyboardShortcuts>` above `<Notification>` at the same time. I'm unsure but couldn't the current order make the Shortcuts appear above the Notifications?
konrad commented 2023-01-29 14:21:16 +00:00
Outdated
Review
Copy Link

That seems to work on the login page but does not in the rest of Vikunja. Let's leave it with the z-index.

I'm unsure but couldn't the current order make the Shortcuts appear above the Notifications?

Not sure, I checked it and it seems to work fine like it is now.

That seems to work on the login page but does not in the rest of Vikunja. Let's leave it with the z-index. > I'm unsure but couldn't the current order make the Shortcuts appear above the Notifications? Not sure, I checked it and it seems to work fine like it is now.
<template v-if="authUser">
<TheNavigation/>
<content-auth/>
@ -19,23 +20,25 @@ import {computed, watch} from 'vue'
import {useRoute, useRouter} from 'vue-router'
import {useI18n} from 'vue-i18n'
import isTouchDevice from 'is-touch-device'
import {success} from '@/message'
import Notification from '@/components/misc/notification.vue'
import KeyboardShortcuts from './components/misc/keyboard-shortcuts/index.vue'
import KeyboardShortcuts from '@/components/misc/keyboard-shortcuts/index.vue'
import TheNavigation from '@/components/home/TheNavigation.vue'
import ContentAuth from './components/home/contentAuth.vue'
import ContentLinkShare from './components/home/contentLinkShare.vue'
import ContentAuth from '@/components/home/contentAuth.vue'
import ContentLinkShare from '@/components/home/contentLinkShare.vue'
import NoAuthWrapper from '@/components/misc/no-auth-wrapper.vue'
import Ready from '@/components/misc/ready.vue'
import Update from '@/components/home/Update.vue'
import {setLanguage} from './i18n'
import {setLanguage} from '@/i18n'
import AccountDeleteService from '@/services/accountDelete'
import {success} from '@/message'
import {useAuthStore} from '@/stores/auth'
import {useBaseStore} from '@/stores/base'
import {useColorScheme} from '@/composables/useColorScheme'
import {useBodyClass} from '@/composables/useBodyClass'
import {useAuthStore} from './stores/auth'
const baseStore = useBaseStore()
const authStore = useAuthStore()

2
src/components/home/TheNavigation.vue
View File

@ -25,7 +25,6 @@
</div>
<div class="navbar-end">
<update/>
<BaseButton
@click="openQuickActions"
class="trigger-button pr-0"
@ -95,7 +94,6 @@ import {ref, computed, onMounted, nextTick} from 'vue'
import {RIGHTS as Rights} from '@/constants/rights'
import Update from '@/components/home/update.vue'
import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue'
import Dropdown from '@/components/misc/dropdown.vue'
import DropdownItem from '@/components/misc/dropdown-item.vue'

19
src/components/home/update.vue → src/components/home/Update.vue
View File

@ -16,15 +16,13 @@ const refreshing = ref(false)
document.addEventListener('swUpdated', showRefreshUI, {once: true})
if (navigator && navigator.serviceWorker) {
navigator.serviceWorker.addEventListener(
'controllerchange', () => {
if (refreshing.value) return
refreshing.value = true
window.location.reload()
},
)
}
navigator?.serviceWorker?.addEventListener(
'controllerchange', () => {
if (refreshing.value) return
refreshing.value = true
window.location.reload()
},
)
function showRefreshUI(e: Event) {
console.log('recieved refresh event', e)
@ -33,6 +31,7 @@ function showRefreshUI(e: Event) {
}
function refreshApp() {
updateAvailable.value = false
if (!registration.value || !registration.value.waiting) {
return
}
@ -75,7 +74,7 @@ function refreshApp() {
}
}
.dark .update-notification {
:global(.dark) .update-notification {
color: var(--grey-200);
}
</style>