mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-18 00:34:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

redirect to different pages based on user's device

Browse Source
This commit is contained in:
MaysWind
2025-10-21 21:34:53 +08:00
parent 83bd8f23f4
commit 1f101fea3e
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/web.ts
+8
View File
@@ -8,3 +8,11 @@ export function getBasePath(): string {
return path.substring(0, lastSlashIndex); return path.substring(0, lastSlashIndex);
} }
export function navigateToHomePage(type: 'desktop' | 'mobile'): void {
if (__EZBOOKKEEPING_IS_PRODUCTION__) {
window.location.replace(`${type}#/`);
} else {
window.location.replace(`${type}.html#/`);
}
}
src/views/desktop/OAuth2CallbackPage.vue
+20 -9
View File
@@ -24,7 +24,7 @@
<v-card variant="flat" class="w-100 mt-0 px-4 pt-12" max-width="500"> <v-card variant="flat" class="w-100 mt-0 px-4 pt-12" max-width="500">
<v-card-text> <v-card-text>
<h4 class="text-h4 mb-2">{{ oauth2LoginDisplayName }}</h4> <h4 class="text-h4 mb-2">{{ oauth2LoginDisplayName }}</h4>
<p class="mb-0" v-if="!error && platform && token && !userName">{{ tt('Logging in...') }}</p> <p class="mb-0" v-if="!error && platform && provider && token && !userName">{{ tt('Logging in...') }}</p>
<p class="mb-0" v-else-if="!error && userName">{{ tt('format.misc.oauth2bindTip', { providerName: oauth2ProviderDisplayName, userName: userName }) }}</p> <p class="mb-0" v-else-if="!error && userName">{{ tt('format.misc.oauth2bindTip', { providerName: oauth2ProviderDisplayName, userName: userName }) }}</p>
<p class="mb-0" v-else-if="error">{{ tt(error) }}</p> <p class="mb-0" v-else-if="error">{{ tt(error) }}</p>
<p class="mb-0" v-else>{{ tt('An error occurred') }}</p> <p class="mb-0" v-else>{{ tt('An error occurred') }}</p>
@@ -42,12 +42,12 @@
:label="tt('Password')" :label="tt('Password')"
:placeholder="tt('Your password')" :placeholder="tt('Your password')"
v-model="password" v-model="password"
@keyup.enter="verify" @keyup.enter="verifyAndLogin"
/> />
</v-col> </v-col>
<v-col cols="12"> <v-col cols="12">
<v-btn block type="submit" :disabled="!password || logining" @click="verify"> <v-btn block type="submit" :disabled="!password || logining" @click="verifyAndLogin">
{{ tt('Continue') }} {{ tt('Continue') }}
<v-progress-circular indeterminate size="22" class="ms-2" v-if="logining"></v-progress-circular> <v-progress-circular indeterminate size="22" class="ms-2" v-if="logining"></v-progress-circular>
</v-btn> </v-btn>
@@ -109,6 +109,7 @@ import { ThemeType } from '@/core/theme.ts';
import { APPLICATION_LOGO_PATH } from '@/consts/asset.ts'; import { APPLICATION_LOGO_PATH } from '@/consts/asset.ts';
import { KnownErrorCode } from '@/consts/api.ts'; import { KnownErrorCode } from '@/consts/api.ts';
import { navigateToHomePage } from '@/lib/web.ts';
import { import {
isUserVerifyEmailEnabled, isUserVerifyEmailEnabled,
getOAuth2Provider, getOAuth2Provider,
@@ -157,7 +158,17 @@ const inputProblemMessage = computed<string | null>(() => {
} }
}); });
function verify(): void { function navigateToHome(): void {
if (props.platform === 'desktop') {
navigateToHomePage('desktop');
} else if (props.platform === 'mobile') {
navigateToHomePage('mobile');
} else {
router.replace('/');
}
}
function verifyAndLogin(): void {
const problemMessage = inputProblemMessage.value; const problemMessage = inputProblemMessage.value;
if (problemMessage) { if (problemMessage) {
@@ -174,7 +185,7 @@ function verify(): void {
}).then(authResponse => { }).then(authResponse => {
logining.value = false; logining.value = false;
doAfterLogin(authResponse); doAfterLogin(authResponse);
router.replace('/'); navigateToHome();
}).catch(error => { }).catch(error => {
logining.value = false; logining.value = false;
@@ -189,16 +200,16 @@ function verify(): void {
}); });
} }
if (!props.error && props.platform && props.token && !props.userName) { if (!props.error && props.platform && props.provider && props.token && !props.userName) {
logining.value = true; logining.value = true;
rootStore.authorizeOAuth2({ rootStore.authorizeOAuth2({
provider: props.provider || '', provider: props.provider,
token: props.token || '' token: props.token
}).then(authResponse => { }).then(authResponse => {
logining.value = false; logining.value = false;
doAfterLogin(authResponse); doAfterLogin(authResponse);
router.replace('/'); navigateToHome();
}).catch(error => { }).catch(error => {
logining.value = false; logining.value = false;