diff --git a/packages/client/android/capacitor.settings.gradle b/packages/client/android/capacitor.settings.gradle index f48010eff3..43e7367f7c 100644 --- a/packages/client/android/capacitor.settings.gradle +++ b/packages/client/android/capacitor.settings.gradle @@ -1,21 +1,21 @@ // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN include ':capacitor-android' -project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@4.7.3_@capacitor+core@4.7.3/node_modules/@capacitor/android/capacitor') +project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/android/capacitor') include ':capacitor-app' -project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@4.1.1_@capacitor+core@4.7.3/node_modules/@capacitor/app/android') +project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/app/android') include ':capacitor-camera' -project(':capacitor-camera').projectDir = new File('../../../node_modules/.pnpm/@capacitor+camera@4.1.4_@capacitor+core@4.7.3/node_modules/@capacitor/camera/android') +project(':capacitor-camera').projectDir = new File('../../../node_modules/.pnpm/@capacitor+camera@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/camera/android') include ':capacitor-device' -project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@4.1.0_@capacitor+core@4.7.3/node_modules/@capacitor/device/android') +project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/device/android') include ':capacitor-preferences' -project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@4.0.2_@capacitor+core@4.7.3/node_modules/@capacitor/preferences/android') +project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/preferences/android') include ':capacitor-push-notifications' -project(':capacitor-push-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+push-notifications@4.1.2_@capacitor+core@4.7.3/node_modules/@capacitor/push-notifications/android') +project(':capacitor-push-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+push-notifications@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/push-notifications/android') include ':capacitor-status-bar' -project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@capacitor+status-bar@4.1.1_@capacitor+core@4.7.3/node_modules/@capacitor/status-bar/android') +project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@capacitor+status-bar@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/status-bar/android') diff --git a/packages/client/ios/App/Podfile b/packages/client/ios/App/Podfile index e6a47de3c7..6fe1395f36 100644 --- a/packages/client/ios/App/Podfile +++ b/packages/client/ios/App/Podfile @@ -9,14 +9,14 @@ use_frameworks! install! 'cocoapods', :disable_input_output_paths => true def capacitor_pods - pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.7.3_@capacitor+core@4.7.3/node_modules/@capacitor/ios' - pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.7.3_@capacitor+core@4.7.3/node_modules/@capacitor/ios' - pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@4.1.1_@capacitor+core@4.7.3/node_modules/@capacitor/app' - pod 'CapacitorCamera', :path => '../../../../node_modules/.pnpm/@capacitor+camera@4.1.4_@capacitor+core@4.7.3/node_modules/@capacitor/camera' - pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@4.1.0_@capacitor+core@4.7.3/node_modules/@capacitor/device' - pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@4.0.2_@capacitor+core@4.7.3/node_modules/@capacitor/preferences' - pod 'CapacitorPushNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+push-notifications@4.1.2_@capacitor+core@4.7.3/node_modules/@capacitor/push-notifications' - pod 'CapacitorStatusBar', :path => '../../../../node_modules/.pnpm/@capacitor+status-bar@4.1.1_@capacitor+core@4.7.3/node_modules/@capacitor/status-bar' + pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/ios' + pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/ios' + pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/app' + pod 'CapacitorCamera', :path => '../../../../node_modules/.pnpm/@capacitor+camera@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/camera' + pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/device' + pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/preferences' + pod 'CapacitorPushNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+push-notifications@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/push-notifications' + pod 'CapacitorStatusBar', :path => '../../../../node_modules/.pnpm/@capacitor+status-bar@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/status-bar' pod 'CordovaPluginsStatic', :path => '../capacitor-cordova-ios-plugins' end diff --git a/packages/client/src/components/MkSignin.vue b/packages/client/src/components/MkSignin.vue index 2ac3abc06e..37c6abdff4 100644 --- a/packages/client/src/components/MkSignin.vue +++ b/packages/client/src/components/MkSignin.vue @@ -410,34 +410,22 @@ function queryKey() { "g-recaptcha-response": reCaptchaResponse, }); }) - .then((res) => { - emit("login", res); + .then(res => { + // #v-ifdef VITE_CAPACITOR + emit("login", { ...res, instance: instanceUrl }); + return onLogin({ ...res, instance: instanceUrl }); + // #v-else + emit('login', res); return onLogin(res); - }) - .catch((err) => { + // #v-endif + }).catch(err => { if (err === null) return; os.alert({ - type: "error", + type: 'error', text: i18n.ts.signinFailed, }); signing = false; }); - }).then(res => { - // #v-ifdef VITE_CAPACITOR - emit("login", { ...res, instance: instanceUrl }); - return onLogin({ ...res, instance: instanceUrl }); - // #v-else - emit('login', res); - return onLogin(res); - // #v-endif - }).catch(err => { - if (err === null) return; - os.alert({ - type: 'error', - text: i18n.ts.signinFailed, - }); - signing = false; - }); } function onSubmit() { diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue index 5e5f15705e..6f53bda354 100644 --- a/packages/client/src/pages/welcome.entrance.a.vue +++ b/packages/client/src/pages/welcome.entrance.a.vue @@ -93,6 +93,7 @@ +