zio/elk
2
0
Fork 0
Code Releases 2 Packages 1 Activity

refactor: move pwa/build-info -> appConfig (#1508)

Browse source
This commit is contained in:
Daniel Roe 2023-01-29 06:18:27 -08:00 • committed by GitHub
parent 1c9004a731
commit 415d36ce32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
composables/about.ts
View file

@ -35,5 +35,5 @@ export const teams: Team[] = [
].sort(() => Math.random() - 0.5)
export function useBuildInfo() {
return useRuntimeConfig().public.buildInfo as BuildInfo
return useAppConfig().buildInfo as BuildInfo
}

2
composables/setups.ts
View file

@ -43,7 +43,7 @@ export function setupPageHeader() {
return titleTemplate
},
link: process.client && useRuntimeConfig().public.pwaEnabled
link: process.client && useAppConfig().pwaEnabled
? () => [{
key: 'webmanifest',
rel: 'manifest',

4
composables/users.ts
View file

@ -149,7 +149,7 @@ export async function loginTo(masto: ElkMasto, user: Overwrite<UserLogin, { acco
const [me, pushSubscription] = await Promise.all([
fetchAccountInfo(client, user.server),
// if PWA is not enabled, don't get push subscription
useRuntimeConfig().public.pwaEnabled
useAppConfig().pwaEnabled
// we get 404 response instead empty data
? client.v1.webPushSubscriptions.fetch().catch(() => Promise.resolve(undefined))
: Promise.resolve(undefined),
@ -194,7 +194,7 @@ export async function removePushNotificationData(user: UserLogin, fromSWPushMana
// clear push notification policy
delete useLocalStorage<PushNotificationPolicy>(STORAGE_KEY_NOTIFICATION_POLICY, {}).value[acct]
const pwaEnabled = useRuntimeConfig().public.pwaEnabled
const pwaEnabled = useAppConfig().pwaEnabled
const pwa = useNuxtApp().$pwa
const registrationError = pwa?.registrationError === true
const unregister = pwaEnabled && !registrationError && pwa?.registrationError === true && fromSWPushManager