diff --git a/i18n-2.xlsm b/i18n-2.xlsm index 541682a..36c86b3 100644 Binary files a/i18n-2.xlsm and b/i18n-2.xlsm differ diff --git a/src/App.vue b/src/App.vue index 64de8e0..2262f89 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,13 +3,14 @@ diff --git a/src/Global-properties.d.ts b/src/Global-properties.d.ts index 1973d98..377b77b 100644 --- a/src/Global-properties.d.ts +++ b/src/Global-properties.d.ts @@ -5,6 +5,8 @@ declare module 'vue' { $tg: WebApp; $isDesktop: boolean; $isMobile: boolean; + $isIOS: boolean; + $isAndroid: boolean; } } diff --git a/src/boot/global-components.ts b/src/boot/global-components.ts index bcc5483..cb7c5dc 100644 --- a/src/boot/global-components.ts +++ b/src/boot/global-components.ts @@ -5,7 +5,6 @@ import pnPageTemplate from 'components/pnPageTemplate.vue' import pnAutoAvatar from 'components/pnAutoAvatar.vue' import pnOverlay from 'components/pnOverlay.vue' import pnSmallDialog from 'components/pnSmallDialog.vue' -import pnImageSelector from 'components/pnImageSelector.vue' import pnShadowScroll from 'components/pnShadowScroll.vue' import pnMagicOverlay from 'components/pnMagicOverlay.vue' import pnAccountBlockName from 'components/pnAccountBlockName.vue' @@ -18,7 +17,6 @@ const components = { pnPageTemplate, pnAutoAvatar, pnOverlay, - pnImageSelector, pnSmallDialog, pnShadowScroll, pnMagicOverlay, diff --git a/src/boot/telegram-boot.ts b/src/boot/telegram-boot.ts index 8207c06..cf6cb91 100644 --- a/src/boot/telegram-boot.ts +++ b/src/boot/telegram-boot.ts @@ -25,16 +25,15 @@ export default defineBoot(({ app }) => { 'webk' ].includes(platform) const isTablet = window.innerWidth > 1024 - if (!isDesktopOrWeb && !isTablet) { - if (tg.isVersionAtLeast('8.0')) tg.requestFullscreen() - else tg.expand() - } + if (!isDesktopOrWeb && !isTablet) tg.expand() tg.SettingsButton.show() app.config.globalProperties.$tg = tg app.config.globalProperties.$isDesktop = isDesktopOrWeb || isTablet app.config.globalProperties.$isMobile = !isDesktopOrWeb && !isTablet + app.config.globalProperties.$isIOS = platform === 'ios' + app.config.globalProperties.$isAndroid = platform === 'android' app.provide('tg', tg) }) @@ -46,7 +45,6 @@ export default defineBoot(({ app }) => { script setup import { getCurrentInstance } from 'vue' - -const { proxy } = getCurrentInstance() -and use proxy.$isMobile +const app = getCurrentInstance() +const isMobile = app?.appContext.config.globalProperties.$isMobile */ \ No newline at end of file diff --git a/src/components/companyBlock.vue b/src/components/companyBlock.vue index 25cb1bd..0c4470c 100644 --- a/src/components/companyBlock.vue +++ b/src/components/companyBlock.vue @@ -16,7 +16,6 @@
- - - - - - + + + + +
@@ -62,8 +63,9 @@ + + diff --git a/src/components/meshBackground.vue b/src/components/meshBackground.vue index e5175b3..439cc76 100644 --- a/src/components/meshBackground.vue +++ b/src/components/meshBackground.vue @@ -1,138 +1,106 @@ - diff --git a/src/components/pnActionBar.vue b/src/components/pnActionBar.vue index 6023f55..fb60754 100644 --- a/src/components/pnActionBar.vue +++ b/src/components/pnActionBar.vue @@ -23,7 +23,7 @@ -
+
+ +
diff --git a/src/components/pnBottomSheetDialog.vue b/src/components/pnBottomSheetDialog.vue index 65f7798..f057c67 100644 --- a/src/components/pnBottomSheetDialog.vue +++ b/src/components/pnBottomSheetDialog.vue @@ -4,7 +4,8 @@ transition-show="slide-up" transition-hide="slide-down" position="bottom" - > + :persistent="loading" + > -
+
@@ -36,7 +37,7 @@ :height="bodyHeight" :bottomOffset :topOffset - > + >
@@ -63,7 +64,11 @@ title: string caption?: string maximized?: boolean - }>(), { maximized: true }) + loading?: boolean + }>(), { + maximized: true, + loading: false + }) const slots = useSlots() const cardRef = ref() diff --git a/src/components/pnCutterLongText.vue b/src/components/pnCutterLongText.vue new file mode 100644 index 0000000..a28e914 --- /dev/null +++ b/src/components/pnCutterLongText.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/components/pnImageSelector.vue b/src/components/pnImageSelector.vue index a39e2dc..55d2025 100644 --- a/src/components/pnImageSelector.vue +++ b/src/components/pnImageSelector.vue @@ -1,74 +1,52 @@ + + diff --git a/src/components/pnOnboardBtn.vue b/src/components/pnOnboardBtn.vue index b56e5df..73bac88 100644 --- a/src/components/pnOnboardBtn.vue +++ b/src/components/pnOnboardBtn.vue @@ -22,7 +22,7 @@
-
+
{{ $t(message2) }}
diff --git a/src/components/pnPageCard.vue b/src/components/pnPageCard.vue index 70878a7..a4625ee 100644 --- a/src/components/pnPageCard.vue +++ b/src/components/pnPageCard.vue @@ -5,7 +5,7 @@
@@ -22,13 +22,25 @@ >
+ +
+ + +
@@ -58,7 +70,9 @@ diff --git a/src/components/projectBlock.vue b/src/components/projectBlock.vue index 2a7dae0..495a29e 100644 --- a/src/components/projectBlock.vue +++ b/src/components/projectBlock.vue @@ -78,10 +78,11 @@ diff --git a/src/pages/ProjectsPage.vue b/src/pages/ProjectsPage.vue index cbfb0b4..e56dfda 100644 --- a/src/pages/ProjectsPage.vue +++ b/src/pages/ProjectsPage.vue @@ -93,14 +93,13 @@
@@ -270,9 +269,7 @@ }) onMounted(async () => { - if (!projectsStore.isInit) { - await projectsStore.init() - } + if (!projectsStore.isInit) await projectsStore.init() }) watch(showDialogRestoreArchive, (newD :boolean) => { diff --git a/src/pages/TelegramOnlyPage.vue b/src/pages/TelegramOnlyPage.vue index 96edba0..99bbd6c 100644 --- a/src/pages/TelegramOnlyPage.vue +++ b/src/pages/TelegramOnlyPage.vue @@ -30,7 +30,7 @@ + + diff --git a/src/pages/CompanyYourPage.vue b/src/pages/account/CompanyYourPage.vue similarity index 100% rename from src/pages/CompanyYourPage.vue rename to src/pages/account/CompanyYourPage.vue diff --git a/src/pages/account/SettingsPage.vue b/src/pages/account/SettingsPage.vue index 6ebe9a0..d42d79b 100644 --- a/src/pages/account/SettingsPage.vue +++ b/src/pages/account/SettingsPage.vue @@ -1,9 +1,8 @@