ami/tl-vikunja
1
0
Fork 0
Code

feat: move update from navigation to app

Browse Source
This commit is contained in:
Dominik Pschenitschni 2023-01-23 22:23:18 +01:00
parent dcd5c3fd6a
commit 3db5ea45d7
No known key found for this signature in database
GPG Key ID: B257AC0149F43A77
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/App.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<ready> <ready>
<Update/>
<template v-if="authUser"> <template v-if="authUser">
<TheNavigation/> <TheNavigation/>
<content-auth/> <content-auth/>
@ -19,23 +20,25 @@ import {computed, watch} from 'vue'
import {useRoute, useRouter} from 'vue-router' import {useRoute, useRouter} from 'vue-router'
import {useI18n} from 'vue-i18n' import {useI18n} from 'vue-i18n'
import isTouchDevice from 'is-touch-device' import isTouchDevice from 'is-touch-device'
import {success} from '@/message'
import Notification from '@/components/misc/notification.vue' 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 TheNavigation from '@/components/home/TheNavigation.vue'
import ContentAuth from './components/home/contentAuth.vue' import ContentAuth from '@/components/home/contentAuth.vue'
import ContentLinkShare from './components/home/contentLinkShare.vue' import ContentLinkShare from '@/components/home/contentLinkShare.vue'
import NoAuthWrapper from '@/components/misc/no-auth-wrapper.vue' import NoAuthWrapper from '@/components/misc/no-auth-wrapper.vue'
import Ready from '@/components/misc/ready.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 AccountDeleteService from '@/services/accountDelete'
import {success} from '@/message'
import {useAuthStore} from '@/stores/auth'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useColorScheme} from '@/composables/useColorScheme' import {useColorScheme} from '@/composables/useColorScheme'
import {useBodyClass} from '@/composables/useBodyClass' import {useBodyClass} from '@/composables/useBodyClass'
import {useAuthStore} from './stores/auth'
const baseStore = useBaseStore() const baseStore = useBaseStore()
const authStore = useAuthStore() const authStore = useAuthStore()

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

@ -25,7 +25,6 @@
</div> </div>
<div class="navbar-end"> <div class="navbar-end">
<update/>
<BaseButton <BaseButton
@click="openQuickActions" @click="openQuickActions"
class="trigger-button pr-0" class="trigger-button pr-0"
@ -95,7 +94,6 @@ import {ref, computed, onMounted, nextTick} from 'vue'
import {RIGHTS as Rights} from '@/constants/rights' import {RIGHTS as Rights} from '@/constants/rights'
import Update from '@/components/home/update.vue'
import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue' import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue'
import Dropdown from '@/components/misc/dropdown.vue' import Dropdown from '@/components/misc/dropdown.vue'
import DropdownItem from '@/components/misc/dropdown-item.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}) document.addEventListener('swUpdated', showRefreshUI, {once: true})
if (navigator && navigator.serviceWorker) { navigator?.serviceWorker?.addEventListener(
navigator.serviceWorker.addEventListener( 'controllerchange', () => {
'controllerchange', () => { if (refreshing.value) return
if (refreshing.value) return refreshing.value = true
refreshing.value = true window.location.reload()
window.location.reload() },
}, )
)
}
function showRefreshUI(e: Event) { function showRefreshUI(e: Event) {
console.log('recieved refresh event', e) console.log('recieved refresh event', e)
@ -33,6 +31,7 @@ function showRefreshUI(e: Event) {
} }
function refreshApp() { function refreshApp() {
updateAvailable.value = false
if (!registration.value || !registration.value.waiting) { if (!registration.value || !registration.value.waiting) {
return return
} }
@ -75,7 +74,7 @@ function refreshApp() {
} }
} }
.dark .update-notification { :global(.dark) .update-notification {
color: var(--grey-200); color: var(--grey-200);
} }
</style> </style>