diff --git a/.gitea/workflows/deploy-client.yml b/.gitea/workflows/deploy-client.yml index 2c40094..d9e4712 100644 --- a/.gitea/workflows/deploy-client.yml +++ b/.gitea/workflows/deploy-client.yml @@ -1,13 +1,13 @@ name: Deploy -on: - push: - # tags: - # - "v[0-9]+.[0-9]+.[0-9]+" +# on: +# push: +# tags: +# - "v[0-9]+.[0-9]+.[0-9]+" - # paths: - # - ".gitea/workflows/deploy-client.yml" - # - "client/**" +# paths: +# - ".gitea/workflows/deploy-client.yml" +# - "client/**" jobs: publish-windows: diff --git a/client/app/middleware/00.updater.global.ts b/client/app/middleware/00.updater.global.ts index de761ab..bfc8c2a 100644 --- a/client/app/middleware/00.updater.global.ts +++ b/client/app/middleware/00.updater.global.ts @@ -1,13 +1,15 @@ export default defineNuxtRouteMiddleware(async (to, from) => { - if (import.meta.dev || import.meta.server) - return + // if (import.meta.dev || import.meta.server) + // return const { isTauri } = useApp() if (!isTauri.value) return - if (from?.name) + console.log('pizda', to, from) + + if (from?.name || !!to.redirectedFrom) return const { checkForUpdates } = useUpdater() @@ -15,6 +17,6 @@ export default defineNuxtRouteMiddleware(async (to, from) => { const update = await checkForUpdates() if (update) { - return navigateTo({ name: 'Updating' }) + return navigateTo({ name: 'Updater' }) } }) diff --git a/client/app/middleware/01.auth.global.ts b/client/app/middleware/01.auth.global.ts index 8bf5e40..eaa8195 100644 --- a/client/app/middleware/01.auth.global.ts +++ b/client/app/middleware/01.auth.global.ts @@ -1,6 +1,7 @@ import chadApi from '#shared/chad-api' export default defineNuxtRouteMiddleware(async (to, from) => { + console.log('ya zdes') const { me, setMe } = useAuth() if (!me.value && !from?.name) { diff --git a/client/app/pages/updater.vue b/client/app/pages/updater.vue index 4bbc9b9..bccbea7 100644 --- a/client/app/pages/updater.vue +++ b/client/app/pages/updater.vue @@ -17,13 +17,15 @@