diff --git a/web-app/packages/app/src/App.vue b/web-app/packages/app/src/App.vue index 8a225486..c1743bd0 100644 --- a/web-app/packages/app/src/App.vue +++ b/web-app/packages/app/src/App.vue @@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial 'col-12', 'min-h-full', 'overflow-auto', - drawer && !isOverlay && 'xl:col-offset-2 xl:col-10', + drawer && !isOverlay && 'xl:col-offset-2 xl:col-10' ]" > @@ -50,11 +50,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial > - + -
- -
+
@@ -75,7 +73,8 @@ import { useInstanceStore, useLayoutStore, useNotificationStore, - useUserStore + useUserStore, + AppContainer } from '@mergin/lib' import { mapActions, mapState } from 'pinia' import { defineComponent } from 'vue' @@ -83,7 +82,13 @@ import { useMeta } from 'vue-meta' export default defineComponent({ name: 'app', - components: { UploadProgress, Notifications, DialogWindows, GlobalWarning }, + components: { + UploadProgress, + Notifications, + DialogWindows, + GlobalWarning, + AppContainer + }, computed: { ...mapState(useInstanceStore, ['pingData']), ...mapState(useAppStore, ['serverError']), @@ -161,7 +166,6 @@ export default defineComponent({ diff --git a/web-app/packages/lib/src/common/components/AppSection.vue b/web-app/packages/lib/src/common/components/AppSection.vue new file mode 100644 index 00000000..26b8888b --- /dev/null +++ b/web-app/packages/lib/src/common/components/AppSection.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/web-app/packages/lib/src/common/components/FullStorageWarning.vue b/web-app/packages/lib/src/common/components/FullStorageWarning.vue index 7e4965f5..42b03948 100644 --- a/web-app/packages/lib/src/common/components/FullStorageWarning.vue +++ b/web-app/packages/lib/src/common/components/FullStorageWarning.vue @@ -17,8 +17,7 @@ export default defineComponent({ name: 'FullStorageWarning', components: { FullStorageWarningTemplate }, props: { - usage: Number, - username: String + usage: Number } }) diff --git a/web-app/packages/lib/src/common/components/UsageStatus.vue b/web-app/packages/lib/src/common/components/UsageStatus.vue index 35ad2121..26c49996 100644 --- a/web-app/packages/lib/src/common/components/UsageStatus.vue +++ b/web-app/packages/lib/src/common/components/UsageStatus.vue @@ -9,15 +9,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial - diff --git a/web-app/packages/lib/src/common/components/UsageStatusTemplate.vue b/web-app/packages/lib/src/common/components/UsageStatusTemplate.vue index 7f9a214f..0bed933b 100644 --- a/web-app/packages/lib/src/common/components/UsageStatusTemplate.vue +++ b/web-app/packages/lib/src/common/components/UsageStatusTemplate.vue @@ -6,9 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial diff --git a/web-app/packages/lib/src/modules/dashboard/components/DashboardUsageInfoRow.vue b/web-app/packages/lib/src/modules/dashboard/components/DashboardUsageInfoRow.vue index c3fa8c9b..eb6a8b67 100644 --- a/web-app/packages/lib/src/modules/dashboard/components/DashboardUsageInfoRow.vue +++ b/web-app/packages/lib/src/modules/dashboard/components/DashboardUsageInfoRow.vue @@ -5,26 +5,17 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial --> diff --git a/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue b/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue index efd8c644..4263b69b 100644 --- a/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue +++ b/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue @@ -92,7 +92,8 @@ const onCloseClick = () => {