diff --git a/src/components/desktop/SwitchToMobileDialog.vue b/src/components/desktop/SwitchToMobileDialog.vue new file mode 100644 index 00000000..d0a07ef4 --- /dev/null +++ b/src/components/desktop/SwitchToMobileDialog.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/desktop-main.js b/src/desktop-main.js index bbc6e4ed..0a135327 100644 --- a/src/desktop-main.js +++ b/src/desktop-main.js @@ -66,6 +66,7 @@ import AmountInput from '@/components/desktop/AmountInput.vue'; import StepsBar from '@/components/desktop/StepsBar.vue'; import ConfirmDialog from '@/components/desktop/ConfirmDialog.vue'; import SnackBar from '@/components/desktop/SnackBar.vue'; +import SwitchToMobileDialog from '@/components/desktop/SwitchToMobileDialog.vue'; import '@/styles/desktop/template/base/libs/vuetify/_index.scss'; import '@/styles/desktop/template/template/index.scss'; @@ -352,6 +353,7 @@ app.component('AmountInput', AmountInput); app.component('StepsBar', StepsBar); app.component('ConfirmDialog', ConfirmDialog); app.component('SnackBar', SnackBar); +app.component('SwitchToMobileDialog', SwitchToMobileDialog); app.config.globalProperties.$version = getVersion(); app.config.globalProperties.$buildTime = getBuildTime(); diff --git a/src/views/desktop/LoginPage.vue b/src/views/desktop/LoginPage.vue index 21158c72..c4d16b80 100644 --- a/src/views/desktop/LoginPage.vue +++ b/src/views/desktop/LoginPage.vue @@ -89,6 +89,14 @@ /> + +
+ + {{ $t('Use on Mobile Device') }} + +
+
+ @@ -143,6 +151,7 @@ + @@ -177,6 +186,7 @@ export default { verifying: false, show2faInput: false, twoFAVerifyType: 'passcode', + showMobileQrCode: false, icons: { eye: mdiEyeOutline, eyeSlash: mdiEyeOffOutline, diff --git a/src/views/desktop/MainLayout.vue b/src/views/desktop/MainLayout.vue index 2c3d5737..5755fd59 100644 --- a/src/views/desktop/MainLayout.vue +++ b/src/views/desktop/MainLayout.vue @@ -161,26 +161,9 @@ -
+ - - - - {{ $t('global.app.title') }} - - -

{{ $t('You can scan the below QR code on your mobile device.') }}

-
- - qrcode - - - {{$t('Switch to Mobile Version') }} - - {{ $t('Close') }} - -
-
+
@@ -200,8 +183,6 @@ import { useSettingsStore } from '@/stores/setting.js'; import { useUserStore } from '@/stores/user.js'; import { getSystemTheme } from '@/lib/ui.js'; -import { getMobileUrlQrCodePath } from '@/lib/qrcode.js'; -import { getMobileVersionPath } from '@/lib/version.js'; import { mdiMenu, @@ -258,12 +239,6 @@ export default { const { mdAndDown } = useDisplay(); return mdAndDown.value; }, - mobileUrlQrCodePath() { - return getMobileUrlQrCodePath(); - }, - mobileVersionPath() { - return getMobileVersionPath(); - }, currentNickName() { return this.userStore.currentUserNickname || this.$t('User'); }, diff --git a/src/views/desktop/UnlockPage.vue b/src/views/desktop/UnlockPage.vue index 7515d749..bb253fb9 100644 --- a/src/views/desktop/UnlockPage.vue +++ b/src/views/desktop/UnlockPage.vue @@ -35,6 +35,14 @@ v-model="pinCode" @pincode:confirm="unlockByPin" /> + + + + @@ -91,6 +99,7 @@ + @@ -113,7 +122,8 @@ export default { data() { return { pinCode: '', - verifyingByWebAuthn: false + verifyingByWebAuthn: false, + showMobileQrCode: false }; }, computed: { diff --git a/src/views/mobile/LoginPage.vue b/src/views/mobile/LoginPage.vue index 39ac3245..a93a051c 100644 --- a/src/views/mobile/LoginPage.vue +++ b/src/views/mobile/LoginPage.vue @@ -5,7 +5,7 @@ - + - + + + + + + + + {{ $t('Don\'t have an account?') }}  @@ -116,6 +128,7 @@ import { useSettingsStore } from '@/stores/setting.js'; import { useExchangeRatesStore } from '@/stores/exchangeRates.js'; import { isUserRegistrationEnabled } from '@/lib/server_settings.js'; +import { getDesktopVersionPath } from '@/lib/version.js'; import { isModalShowing } from '@/lib/ui.mobile.js'; export default { @@ -140,6 +153,9 @@ export default { version() { return 'v' + this.$version; }, + desktopVersionPath() { + return getDesktopVersionPath(); + }, allLanguages() { return this.$locale.getAllLanguageInfos(); }, diff --git a/src/views/mobile/UnlockPage.vue b/src/views/mobile/UnlockPage.vue index 251d17b6..4488e67d 100644 --- a/src/views/mobile/UnlockPage.vue +++ b/src/views/mobile/UnlockPage.vue @@ -5,7 +5,7 @@ - +