-
-
-
-
-
-
- Check for updates
-
- Let Mergin Maps automatically check for new updates to ensure you can
- always use the latest features
-
-
-
-
-
- Anonymous data collection
-
- Mergin Maps collects anonymous usage information to make the service
- better overtime. You can opt-out anytime.
-
- Click here to learn more.
-
-
-
@@ -64,73 +64,28 @@
Advanced
-
- (() => [
+ {
+ key: 'notifications',
+ title: 'Receive notifications',
+ description: profile?.value?.receive_notifications
+ ? 'User has enabled receiving notifications'
+ : 'User has disabled notifications.'
+ },
+ {
+ key: 'adminAccess',
+ title: 'Access to admin panel',
+ description: 'Enabling this option will provide access to the admin panel.'
+ },
+ {
+ key: 'accountActivation',
+ title: 'Account activation',
+ description: user?.value?.active
+ ? "The user's account is currently active. Deactivation will lead to a temporary ban from Mergin Maps usage."
+ : "The user's account is currently inactive. Activating it will allow access to Mergin Maps."
+ },
+ {
+ key: 'deleteAccount',
+ title: 'Delete account',
+ description:
+ 'Deleting this user will remove them and all their data. This action cannot be undone.'
+ }
+])
+
const user = computed(() => adminStore.user)
const profile = computed(() => adminStore.user?.profile)
const routeUsername = computed(() => route?.params?.username)
diff --git a/web-app/packages/admin-lib/src/modules/admin/views/ProjectView.vue b/web-app/packages/admin-lib/src/modules/admin/views/ProjectView.vue
index 37fbc44a..9a60e9d8 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/ProjectView.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/views/ProjectView.vue
@@ -20,13 +20,13 @@
Created
- {{ $filters.date(project?.created) }}
+ {{ $filters.datetime(project?.created) }}
Updated
- {{ $filters.date(project?.updated) }}
+ {{ $filters.datetime(project?.updated) }}
-
+
-
-
-
+
+ Receive notifications
- - User has enabled receiving notifications - User has disabled notifications. - -
-
+
-
-
-
-
-
- Access to admin panel
- - Enabling this option will provide access to the admin panel. - -
-
-
-
+
+
@@ -177,7 +119,9 @@ import {
useDialogStore,
AppSection,
AppContainer,
- ConfirmDialogProps
+ ConfirmDialogProps,
+ AppSettings,
+ AppSettingsItemConfig
} from '@mergin/lib'
import { computed, watch } from 'vue'
import { useRoute } from 'vue-router'
@@ -189,6 +133,34 @@ const route = useRoute()
const adminStore = useAdminStore()
const dialogStore = useDialogStore()
+const settingsItems = computed
-
- Account activation
- - - The user's account is currently active. Deactivation will lead - to a temporary ban from Mergin Maps usage. - - - The user's account is currently inactive. Activating it will - allow access to Mergin Maps. - - + + +
+
+
+
+
-
-
-
+
+
Delete account
- Deleting this user will remove them and all their data. This - action cannot be undone. -
@@ -43,49 +43,14 @@
Advanced
-
- (() => [
+ {
+ key: 'publicProject',
+ title: 'Public project',
+ description:
+ 'The project will be visible to everyone if it is marked as public.'
+ },
+ {
+ key: 'deleteProject',
+ title: 'Delete project',
+ description:
+ 'Deleting this project will remove it and all its data. This action cannot be undone.'
+ }
+])
const project = computed(() => projectStore.project)
const routeProjectName = computed(() => route?.params?.projectName as string)
const routeWorkspaceName = computed(() => route?.params?.namespace as string)
diff --git a/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue b/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue
index d5959366..ff79e782 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue
@@ -6,26 +6,54 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
+ {{ item.title }}
+ {{ item.description
+ }}
+ Click
+ here
+ for more information.
+
+
-
diff --git a/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue b/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue
index fdbc6e1e..ee4880c7 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/views/SettingsViewTemplate.vue
@@ -6,21 +6,56 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
+
+
+
+
+
+
+ Advanced
+
+
+
+
-
diff --git a/web-app/packages/admin-lib/vite.config.ts b/web-app/packages/admin-lib/vite.config.ts
index ae43ac7e..a7089e0d 100644
--- a/web-app/packages/admin-lib/vite.config.ts
+++ b/web-app/packages/admin-lib/vite.config.ts
@@ -35,7 +35,7 @@ export default defineConfig(({ mode }) => ({
alias: {
'@': resolve(__dirname, './src')
},
- dedupe: ['vue', 'pinia', 'vue-router', 'vuetify', 'primevue', '@mergin/lib']
+ dedupe: ['vue', 'pinia', 'vue-router', 'primevue', '@mergin/lib']
},
build: {
sourcemap: mode !== 'production',
diff --git a/web-app/packages/app/package.json b/web-app/packages/app/package.json
index fbc80aa6..080e50f3 100644
--- a/web-app/packages/app/package.json
+++ b/web-app/packages/app/package.json
@@ -15,8 +15,7 @@
"clean": "echo 'Nothing to clean.'",
"link:register": "echo '[@mergin/app] Nothing to register.'",
"link:unregister": "echo '[@mergin/app] Nothing to unregister.'",
- "lint": "eslint . --ext .js,.vue,.ts",
- "i18n:report": "vue-cli-service i18n:report --src './src/admin/**/*.?(js|vue)' --locales './src/admin/locales/**/*.json'"
+ "lint": "eslint . --ext .js,.vue,.ts"
},
"dependencies": {
"@tabler/icons-webfont": "^2.42.0",
@@ -27,7 +26,6 @@
"primeflex": "^3.3.1",
"primevue": "3.43.0",
"vue": "3.3.8",
- "vue-i18n": "^9.7.1",
"vue-meta": "^3.0.0-alpha.10",
"vue-router": "4.2.5"
}
diff --git a/web-app/packages/app/src/app.ts b/web-app/packages/app/src/app.ts
index 9dfd60fb..878c56b5 100644
--- a/web-app/packages/app/src/app.ts
+++ b/web-app/packages/app/src/app.ts
@@ -22,8 +22,6 @@ import App from './App.vue'
import { createRouter } from './router'
import { addRouterToPinia, getPiniaInstance } from './store'
-import i18n from '@/plugins/i18n/i18n'
-
const createMerginApp = () => {
const pinia = getPiniaInstance()
const router = createRouter(pinia)
@@ -37,7 +35,6 @@ const createMerginApp = () => {
.mixin(MerginComponentUuidMixin)
.use(pinia)
.use(router)
- .use(i18n)
.use(createMetaManager())
.use(PrimeVue, { pt: MMTheme })
.use(ToastService)
diff --git a/web-app/packages/app/src/plugins/i18n/i18n.ts b/web-app/packages/app/src/plugins/i18n/i18n.ts
deleted file mode 100644
index 0b119bcd..00000000
--- a/web-app/packages/app/src/plugins/i18n/i18n.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { createI18n } from 'vue-i18n'
-
-export default createI18n({
- legacy: false, // Vuetify does not support the legacy mode of vue-i18n
- locale: import.meta.env.VITE_VUE_APP_I18N_LOCALE || 'en',
- allowComposition: true,
- fallbackLocale: import.meta.env.VITE_VUE_APP_I18N_FALLBACK_LOCALE || 'en'
-})
diff --git a/web-app/packages/app/src/plugins/i18n/locale/en.json b/web-app/packages/app/src/plugins/i18n/locale/en.json
deleted file mode 100644
index 2a8e7309..00000000
--- a/web-app/packages/app/src/plugins/i18n/locale/en.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "avatar": "Vuetify MD",
- "buttons": "Buttons",
- "calendar": "Calendar",
- "charts": "Charts",
- "components": "Components",
- "ct": "CT",
- "dashboard": "Dashboard",
- "dtables": "Data Tables",
- "eforms": "Extended Forms",
- "error": "Error Page",
- "etables": "Extended Tables",
- "example": "Example",
- "forms": "Forms",
- "fullscreen": "Full Screen Map",
- "google": "Google Maps",
- "grid": "Grid System",
- "icons": "Icons",
- "lock": "Lock Screen Page",
- "login": "Login Page",
- "maps": "Maps",
- "multi": "Multi Level Collapse",
- "notifications": "Notifications",
- "pages": "Pages",
- "plan": "Choose Plan",
- "pricing": "Pricing",
- "my-profile": "My Profile",
- "edit-profile": "Edit Profile",
- "register": "Register Page",
- "rforms": "Regular Forms",
- "rtables": "Regular Tables",
- "rtl": "RTL Support",
- "search": "Search",
- "settings": "Settings",
- "tables": "Tables",
- "tabs": "Tabs",
- "tim": "Creative Tim",
- "timeline": "Timeline",
- "typography": "Typography",
- "upgrade": "Upgrade To PRO",
- "user": "User Profile",
- "vforms": "Validation Forms",
- "widgets": "Widgets",
- "wizard": "Wizard"
-}
diff --git a/web-app/packages/app/src/plugins/i18n/locale/en.json.license b/web-app/packages/app/src/plugins/i18n/locale/en.json.license
deleted file mode 100644
index 1420f4b5..00000000
--- a/web-app/packages/app/src/plugins/i18n/locale/en.json.license
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright 2019 Creative Tim (https://www.creative-tim.com)
-
-SPDX-License-Identifier: MIT
diff --git a/web-app/packages/lib-vue2/.env b/web-app/packages/lib-vue2/.env
deleted file mode 100644
index 0d2a175b..00000000
--- a/web-app/packages/lib-vue2/.env
+++ /dev/null
@@ -1 +0,0 @@
-VITE_VUE_APP_JOIN_COMMUNITY_LINK=https://merginmaps.com/community/join
diff --git a/web-app/packages/lib-vue2/.eslintignore b/web-app/packages/lib-vue2/.eslintignore
deleted file mode 100644
index 1c1cbe7a..00000000
--- a/web-app/packages/lib-vue2/.eslintignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-
-dist/
-types/
diff --git a/web-app/packages/lib-vue2/.eslintrc.cjs b/web-app/packages/lib-vue2/.eslintrc.cjs
deleted file mode 100644
index 51dfd9e4..00000000
--- a/web-app/packages/lib-vue2/.eslintrc.cjs
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
- env: {
- node: true
- },
- extends: [
- 'plugin:vue/essential',
- 'eslint:recommended',
- '@vue/typescript/recommended'
- ],
- parser: 'vue-eslint-parser',
- parserOptions: {
- parser: '@typescript-eslint/parser',
- ecmaVersion: 2020,
- sourceType: 'module'
- },
- plugins: ['@typescript-eslint'],
- rules: {
- 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
- 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
- }
-}
diff --git a/web-app/packages/lib-vue2/babel.config.js b/web-app/packages/lib-vue2/babel.config.js
deleted file mode 100644
index 19904989..00000000
--- a/web-app/packages/lib-vue2/babel.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
- presets: []
-}
diff --git a/web-app/packages/lib-vue2/components.d.ts b/web-app/packages/lib-vue2/components.d.ts
deleted file mode 100644
index 168fdd0a..00000000
--- a/web-app/packages/lib-vue2/components.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// Generated by unplugin-vue-components
-// Read more: https://github.com/vuejs/core/pull/3399
-export {}
-
-declare module 'vue' {
- export interface GlobalComponents {
- RouterLink: typeof import('vue-router')['RouterLink']
- RouterView: typeof import('vue-router')['RouterView']
- VAutocomplete: typeof import('vuetify/lib')['VAutocomplete']
- VAvatar: typeof import('vuetify/lib')['VAvatar']
- VBtn: typeof import('vuetify/lib')['VBtn']
- VBtnToggle: typeof import('vuetify/lib')['VBtnToggle']
- VCard: typeof import('vuetify/lib')['VCard']
- VCardActions: typeof import('vuetify/lib')['VCardActions']
- VCardText: typeof import('vuetify/lib')['VCardText']
- VCardTitle: typeof import('vuetify/lib')['VCardTitle']
- VCheckbox: typeof import('vuetify/lib')['VCheckbox']
- VChip: typeof import('vuetify/lib')['VChip']
- VChipGroup: typeof import('vuetify/lib')['VChipGroup']
- VCol: typeof import('vuetify/lib')['VCol']
- VContainer: typeof import('vuetify/lib')['VContainer']
- VDataIterator: typeof import('vuetify/lib')['VDataIterator']
- VDataTable: typeof import('vuetify/lib')['VDataTable']
- VDialog: typeof import('vuetify/lib')['VDialog']
- VDivider: typeof import('vuetify/lib')['VDivider']
- VForm: typeof import('vuetify/lib')['VForm']
- VIcon: typeof import('vuetify/lib')['VIcon']
- VImg: typeof import('vuetify/lib')['VImg']
- VLayout: typeof import('vuetify/lib')['VLayout']
- VList: typeof import('vuetify/lib')['VList']
- VListGroup: typeof import('vuetify/lib')['VListGroup']
- VListItem: typeof import('vuetify/lib')['VListItem']
- VListItemAvatar: typeof import('vuetify/lib')['VListItemAvatar']
- VListItemContent: typeof import('vuetify/lib')['VListItemContent']
- VListItemIcon: typeof import('vuetify/lib')['VListItemIcon']
- VListItemSubtitle: typeof import('vuetify/lib')['VListItemSubtitle']
- VListItemTitle: typeof import('vuetify/lib')['VListItemTitle']
- VMenu: typeof import('vuetify/lib')['VMenu']
- VNavigationDrawer: typeof import('vuetify/lib')['VNavigationDrawer']
- VPagination: typeof import('vuetify/lib')['VPagination']
- VProgressCircular: typeof import('vuetify/lib')['VProgressCircular']
- VResponsive: typeof import('vuetify/lib')['VResponsive']
- VRow: typeof import('vuetify/lib')['VRow']
- VSelect: typeof import('vuetify/lib')['VSelect']
- VSnackbar: typeof import('vuetify/lib')['VSnackbar']
- VSpacer: typeof import('vuetify/lib')['VSpacer']
- VTab: typeof import('vuetify/lib')['VTab']
- VTabs: typeof import('vuetify/lib')['VTabs']
- VTabsSlider: typeof import('vuetify/lib')['VTabsSlider']
- VTextarea: typeof import('vuetify/lib')['VTextarea']
- VTextField: typeof import('vuetify/lib')['VTextField']
- VToolbar: typeof import('vuetify/lib')['VToolbar']
- VToolbarTitle: typeof import('vuetify/lib')['VToolbarTitle']
- VTooltip: typeof import('vuetify/lib')['VTooltip']
- }
-}
diff --git a/web-app/packages/lib-vue2/package.json b/web-app/packages/lib-vue2/package.json
deleted file mode 100644
index e2d574f1..00000000
--- a/web-app/packages/lib-vue2/package.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
- "name": "@mergin/lib-vue2",
- "version": "0.1.0",
- "private": true,
- "type": "module",
- "files": [
- "dist",
- "types"
- ],
- "main": "dist/lib.js",
- "module": "dist/lib.js",
- "types": "types/main.d.ts",
- "exports": {
- ".": {
- "import": "./dist/lib.js",
- "require": "./dist/lib.umd.cjs"
- },
- "./dist/": {
- "import": "./dist/",
- "require": "./dist/"
- }
- },
- "scripts": {
- "dev": "vite",
- "preview": "vite preview",
- "build:watch": "npm-run-all -p build:lib:watch build:types:watch",
- "build:lib": "vue-demi-switch 2.7 && yarn clean:types:temp && vite build --mode development",
- "build:lib:prod": "vue-demi-switch 2.7 && yarn clean:types:temp && vite build",
- "build:lib:watch": "yarn clean:types:temp && vite build --watch --mode development",
- "build:lib:all": "vue-demi-switch 2.7 && yarn build:lib && yarn build:types",
- "build:lib:all:prod": "vue-demi-switch 2.7 && yarn build:lib:prod",
- "build:types": "yarn clean:types && (vue-tsc --declaration --emitDeclarationOnly || true) && tsc-alias",
- "build:types:watch": "yarn build:types && (concurrently \"vue-tsc --watch\" \"tsc-alias -w\")",
- "clean": "yarn clean:lib && yarn clean:types",
- "clean:lib": "rimraf ./dist",
- "clean:types:temp": "rimraf ./**/*.vue.ts",
- "clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp",
- "link:register": "yarn link",
- "link:unregister": "yarn unlink || true",
- "lint": "eslint . --ext .js,.vue,.ts"
- },
- "dependencies": {
- "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
- "axios": "^0.28.1",
- "axios-retry": "^3.2.4",
- "date-fns": "^2.28.0",
- "lodash": "^4.17.21",
- "universal-cookie": "^4.0.4",
- "vue": "^2.7.14",
- "vue-router": "^3.6.5",
- "vue-tabler-icons": "^1.0",
- "vuetify": "^2.6.15"
- },
- "peerDependencies": {
- "pinia": ">=2.x",
- "portal-vue": "2.x",
- "vue": "2.x",
- "vuetify": "2.x"
- },
- "devDependencies": {}
-}
diff --git a/web-app/packages/lib-vue2/src/assets/App_Store.svg b/web-app/packages/lib-vue2/src/assets/App_Store.svg
deleted file mode 100644
index 072b425a..00000000
--- a/web-app/packages/lib-vue2/src/assets/App_Store.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-
diff --git a/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_NEG_color.svg b/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_NEG_color.svg
deleted file mode 100644
index 0e417d73..00000000
--- a/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_NEG_color.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_NEG_color.svg.license b/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_NEG_color.svg.license
deleted file mode 100644
index a56f08b1..00000000
--- a/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_NEG_color.svg.license
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (C) Lutra Consulting Limited
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
diff --git a/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_color.svg b/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_color.svg
deleted file mode 100644
index 81ddf965..00000000
--- a/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_color.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_color.svg.license b/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_color.svg.license
deleted file mode 100644
index a56f08b1..00000000
--- a/web-app/packages/lib-vue2/src/assets/MM_logo_HORIZ_color.svg.license
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (C) Lutra Consulting Limited
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
diff --git a/web-app/packages/lib-vue2/src/assets/huawei.svg b/web-app/packages/lib-vue2/src/assets/huawei.svg
deleted file mode 100644
index 58cb426b..00000000
--- a/web-app/packages/lib-vue2/src/assets/huawei.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconDbSchema.svg b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconDbSchema.svg
deleted file mode 100644
index c10de98a..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconDbSchema.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconDbSchema.svg.license b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconDbSchema.svg.license
deleted file mode 100644
index 8b15d9c8..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconDbSchema.svg.license
+++ /dev/null
@@ -1 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconFolder.svg b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconFolder.svg
deleted file mode 100644
index 5d27bac2..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconFolder.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconFolder.svg.license b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconFolder.svg.license
deleted file mode 100644
index 0a5c5d75..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconFolder.svg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-or-later
-
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconRaster.svg b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconRaster.svg
deleted file mode 100644
index 673f25f7..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconRaster.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconRaster.svg.license b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconRaster.svg.license
deleted file mode 100644
index 0a5c5d75..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconRaster.svg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-or-later
-
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconTableLayer.svg b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconTableLayer.svg
deleted file mode 100644
index 04721728..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconTableLayer.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconTableLayer.svg.license b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconTableLayer.svg.license
deleted file mode 100644
index 0a5c5d75..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconTableLayer.svg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-or-later
-
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconZip.svg b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconZip.svg
deleted file mode 100644
index 4fa1fa5e..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconZip.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconZip.svg.license b/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconZip.svg.license
deleted file mode 100644
index 0a5c5d75..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/mIconZip.svg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-or-later
-
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/providerQgis.svg b/web-app/packages/lib-vue2/src/assets/qgis-icons/providerQgis.svg
deleted file mode 100644
index 315de6be..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/providerQgis.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/web-app/packages/lib-vue2/src/assets/qgis-icons/providerQgis.svg.license b/web-app/packages/lib-vue2/src/assets/qgis-icons/providerQgis.svg.license
deleted file mode 100644
index 8b15d9c8..00000000
--- a/web-app/packages/lib-vue2/src/assets/qgis-icons/providerQgis.svg.license
+++ /dev/null
@@ -1 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/web-app/packages/lib-vue2/src/common/components/ActionButton.vue b/web-app/packages/lib-vue2/src/common/components/ActionButton.vue
deleted file mode 100644
index e5646e1d..00000000
--- a/web-app/packages/lib-vue2/src/common/components/ActionButton.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/CustomPage.vue b/web-app/packages/lib-vue2/src/common/components/CustomPage.vue
deleted file mode 100644
index 57fdafc9..00000000
--- a/web-app/packages/lib-vue2/src/common/components/CustomPage.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
- Your storage is almost full ({{ usage }}%). Soon you will not be
- able to sync your projects.
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/GlobalWarning.vue b/web-app/packages/lib-vue2/src/common/components/GlobalWarning.vue
deleted file mode 100644
index 056a4fc7..00000000
--- a/web-app/packages/lib-vue2/src/common/components/GlobalWarning.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
- 
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/ProgressSpinner.vue b/web-app/packages/lib-vue2/src/common/components/ProgressSpinner.vue
deleted file mode 100644
index f308e37a..00000000
--- a/web-app/packages/lib-vue2/src/common/components/ProgressSpinner.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
- {{ project }}
-
- {{ Math.floor((upload.loaded / upload.total) * 100) }}%
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/UsageStatus.vue b/web-app/packages/lib-vue2/src/common/components/UsageStatus.vue
deleted file mode 100644
index 35ad2121..00000000
--- a/web-app/packages/lib-vue2/src/common/components/UsageStatus.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
- {{ text }}
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/WarningMessageTemplate.vue b/web-app/packages/lib-vue2/src/common/components/WarningMessageTemplate.vue
deleted file mode 100644
index 26cdab17..00000000
--- a/web-app/packages/lib-vue2/src/common/components/WarningMessageTemplate.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/base/BaseItem.vue b/web-app/packages/lib-vue2/src/common/components/base/BaseItem.vue
deleted file mode 100644
index b2c47c66..00000000
--- a/web-app/packages/lib-vue2/src/common/components/base/BaseItem.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/base/index.ts b/web-app/packages/lib-vue2/src/common/components/base/index.ts
deleted file mode 100644
index 2e184c3a..00000000
--- a/web-app/packages/lib-vue2/src/common/components/base/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as BaseItem } from './BaseItem.vue'
diff --git a/web-app/packages/lib-vue2/src/common/components/index.ts b/web-app/packages/lib-vue2/src/common/components/index.ts
deleted file mode 100644
index 168cef14..00000000
--- a/web-app/packages/lib-vue2/src/common/components/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './base'
-
-export { default as ActionButton } from './ActionButton.vue'
-export { default as CustomPage } from './CustomPage.vue'
-export { default as FullStorageWarning } from './FullStorageWarning.vue'
-export { default as FullStorageWarningTemplate } from './FullStorageWarningTemplate.vue'
-export { default as GlobalWarning } from './GlobalWarning.vue'
-export { default as GlobalWarningTemplate } from './GlobalWarningTemplate.vue'
-export { default as MerginLogoLight } from './MerginLogoLight.vue'
-export { default as ProgressSpinner } from './ProgressSpinner.vue'
-export { default as UploadProgress } from './UploadProgress.vue'
-export { default as UsageStatus } from './UsageStatus.vue'
-export { default as UsageStatusTemplate } from './UsageStatusTemplate.vue'
-export { default as WarningMessage } from './WarningMessage.vue'
-export { default as WarningMessageTemplate } from './WarningMessageTemplate.vue'
diff --git a/web-app/packages/lib-vue2/src/common/date_utils.ts b/web-app/packages/lib-vue2/src/common/date_utils.ts
deleted file mode 100644
index 1747de94..00000000
--- a/web-app/packages/lib-vue2/src/common/date_utils.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import diffInDays from 'date-fns/differenceInDays'
-import diffInHours from 'date-fns/differenceInHours'
-import diffInMinutes from 'date-fns/differenceInMinutes'
-import diffInMonths from 'date-fns/differenceInMonths'
-import diffInWeeks from 'date-fns/differenceInWeeks'
-import diffInYears from 'date-fns/differenceInYears'
-import isDate from 'date-fns/isDate'
-import isValid from 'date-fns/isValid'
-
-const DurationKeys = {
- years: ['year', 'years'],
- months: ['month', 'months'],
- weeks: ['week', 'weeks'],
- days: ['day', 'days'],
- hours: ['hour', 'hours'],
- minutes: ['minute', 'minutes']
-}
-
-export function formatDateTime(isoString) {
- return isoString ? new Date(isoString).toUTCString() : ''
-}
-
-export function formatDate(isoString) {
- return isoString ? new Date(isoString).toDateString() : ''
-}
-
-function formatDuration(num, unit) {
- return `${num} ${DurationKeys[unit][num === 1 ? 0 : 1]} ago`
-}
-
-function remainingFormatDuration(num, unit) {
- return `${num} ${DurationKeys[unit][num === 1 ? 0 : 1]}`
-}
-
-function parseDate(date) {
- return isDate(date) ? date : new Date(date)
-}
-
-export function formatTimeDiff(t1, t2 = new Date()) {
- const t1Parsed = parseDate(t1)
- const t2Parsed = parseDate(t2)
- if (!isValid(t1Parsed) || !t1) {
- return '-'
- }
- const days = diffInDays(t2Parsed, t1Parsed)
- if (days > 365) {
- return formatDuration(diffInYears(t2Parsed, t1Parsed), 'years')
- }
- if (days > 31) {
- return formatDuration(diffInMonths(t2Parsed, t1Parsed), 'months')
- }
- if (days > 6) {
- return formatDuration(diffInWeeks(t2Parsed, t1Parsed), 'weeks')
- }
- if (days < 1) {
- const hours = diffInHours(t2Parsed, t1Parsed)
- if (hours < 1) {
- const minutes = diffInMinutes(t2Parsed, t1Parsed)
- if (minutes < 0) {
- return 'N/A'
- }
- return formatDuration(minutes, 'minutes')
- }
- return formatDuration(hours, 'hours')
- }
- return formatDuration(days, 'days')
-}
-
-export function formatRemainingTime(t2, t1 = new Date()) {
- const t1Parsed = parseDate(t1)
- const t2Parsed = parseDate(t2)
- if (!isValid(t1Parsed)) {
- return '-'
- }
- const days = diffInDays(t2Parsed, t1Parsed)
- const hours = diffInHours(t2Parsed, t1Parsed)
- switch (true) {
- case days > 365:
- return remainingFormatDuration(diffInYears(t2Parsed, t1Parsed), 'years')
- case days > 31:
- return remainingFormatDuration(diffInMonths(t2Parsed, t1Parsed), 'months')
- case days > 6:
- return remainingFormatDuration(diffInWeeks(t2Parsed, t1Parsed), 'weeks')
- case days < 1:
- if (days < 0) {
- return 'expired'
- }
- if (hours < 1) {
- const minutes = diffInMinutes(t2Parsed, t1Parsed)
- if (minutes <= 0) {
- return 'expired'
- } else {
- return remainingFormatDuration(minutes, 'minutes')
- }
- }
- return remainingFormatDuration(hours, 'hours')
- default:
- return remainingFormatDuration(days, 'days')
- }
-}
diff --git a/web-app/packages/lib-vue2/src/common/error_utils.ts b/web-app/packages/lib-vue2/src/common/error_utils.ts
deleted file mode 100644
index 70817c28..00000000
--- a/web-app/packages/lib-vue2/src/common/error_utils.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import axios from 'axios'
-
-export function getErrorMessage(e: unknown, fallbackMessage?: string) {
- let text: string
- if (axios.isAxiosError(e)) {
- text = e.response.data?.detail ?? fallbackMessage
- } else if (fallbackMessage) {
- text = fallbackMessage
- } else if (e instanceof Error) {
- text = e.message
- }
- return text
-}
diff --git a/web-app/packages/lib-vue2/src/common/errors.ts b/web-app/packages/lib-vue2/src/common/errors.ts
deleted file mode 100644
index 708d73a3..00000000
--- a/web-app/packages/lib-vue2/src/common/errors.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { AxiosResponse } from 'axios'
-
-export class CustomError extends Error {
- response: AxiosResponse
- constructor(message: string, response) {
- super(message)
- Object.setPrototypeOf(this, CustomError.prototype)
- this.response = response
- }
-}
diff --git a/web-app/packages/lib-vue2/src/common/html_utils.ts b/web-app/packages/lib-vue2/src/common/html_utils.ts
deleted file mode 100644
index 5d3cad0a..00000000
--- a/web-app/packages/lib-vue2/src/common/html_utils.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export function waitCursor(on: boolean) {
- document.body.style.cursor = on ? 'wait' : 'default'
-}
-
-export function downloadJsonList(jsonList, headers, filename, output = 'csv') {
- /** download json as csv, but we need to put it in one level
- :param jsonList: dict **/
- if (!jsonList || !headers) {
- return
- }
- headers = headers.filter((h) => h.value)
- const headerTexts = Object.keys(headers).map(function (key) {
- return headers[key].text
- })
- const headerValues = Object.keys(headers).map(function (key) {
- return headers[key].value
- })
- if (output === 'csv') {
- let content = headerTexts.join(';') + '\n'
- jsonList.forEach(function (row) {
- let currentContent = ''
- headerValues.forEach(function (header) {
- const headerSplit = header.split('.')
- if (headerSplit.length > 1) {
- currentContent +=
- (row[headerSplit[0]][headerSplit[1]] !== null
- ? row[headerSplit[0]][headerSplit[1]]
- : '') + ';'
- } else {
- currentContent += (row[header] !== null ? row[header] : '') + ';'
- }
- })
- content += currentContent + '\n'
- })
- const hiddenElement = document.createElement('a')
- hiddenElement.href = 'data:text/csv;charset=utf-8,' + encodeURI(content)
- hiddenElement.target = '_blank'
- hiddenElement.download = filename + '.csv'
- hiddenElement.click()
- document.removeChild(hiddenElement)
- }
-}
diff --git a/web-app/packages/lib-vue2/src/common/http.ts b/web-app/packages/lib-vue2/src/common/http.ts
deleted file mode 100644
index 29e61cc3..00000000
--- a/web-app/packages/lib-vue2/src/common/http.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import axios, { AxiosInstance, AxiosResponse } from 'axios'
-import axiosRetry, { isNetworkError, isRetryableError } from 'axios-retry'
-import https from 'https'
-
-import { CustomError } from '@/common/errors'
-
-export interface HttpService extends AxiosInstance {
- absUrl?: (url: string) => string
- appendParams?: (url: string, params: Record) => string
-}
-
-const HTTP: HttpService = axios.create({
- baseURL: '',
- withCredentials: true,
- httpsAgent: new https.Agent({
- rejectUnauthorized: false
- }),
- headers: { 'X-Client': 'vue' },
- maxContentLength: 4 * 1024 * 1024 * 1024
-})
-
-HTTP.absUrl = function (url) {
- return HTTP.defaults.baseURL + url
-}
-
-HTTP.appendParams = function (url, params) {
- const u = new URL(url)
- for (const key in params) {
- if (params[key] !== undefined) {
- u.searchParams.append(key, params[key])
- }
- }
- return u.href
-}
-
-axiosRetry(HTTP, {
- retries: 0,
- retryDelay: () => {
- return 60 * 1000
- }
-})
-
-export function initRequestInterceptors(
- isMaintenance: () => boolean,
- ignoredUrl: string[]
-) {
- HTTP.interceptors.request.use(
- (request) => {
- if (
- isMaintenance() &&
- request.method !== 'get' &&
- !ignoredUrl.some((url) => request.url.includes(url))
- ) {
- // mimic regular response object, server will not be called
- const custError = new CustomError('reason', {
- data: {
- detail:
- 'The service is currently in read-only mode for maintenance. Upload and update functions are not available at this time. Please try again later.'
- },
- status: 503
- })
- return Promise.reject(custError)
- }
- return request
- },
- (error) => {
- return Promise.reject(error)
- }
- )
-}
-
-export function initResponseInterceptors(authErrorCallback: () => void) {
- HTTP.interceptors.response.use(
- (response) => response,
- (error) => {
- if (error.response) {
- // detail is returned from flask_wtf library
- if (
- error.response.status === 400 &&
- error.response.data?.detail === 'The CSRF token has expired.'
- ) {
- return HTTP.get('/app/auth/refresh/csrf').then((resp) => {
- HTTP.defaults.headers.common['X-CSRF-Token'] = resp.data.csrf
- const config = error.config
- return restartRequest(config)
- .then((resp) => {
- return resp
- })
- .catch((err) => {
- return Promise.reject(err)
- })
- })
- } else {
- const { status } = error.response
- if (status === 401) {
- authErrorCallback()
- }
- return Promise.reject(error)
- }
- } else {
- return Promise.reject(error)
- }
- }
- )
-}
-
-export function getHttpService() {
- return HTTP
-}
-
-export function initCsrfToken(response: AxiosResponse) {
- const http = getHttpService()
- http.defaults.headers.common['X-CSRF-Token'] =
- response.headers['x-csrf-token']
-}
-
-export function postRetryCond(error) {
- if (!error.config) {
- return false
- }
- return isNetworkError(error) || isRetryableError(error)
-}
-
-export function getDefaultRetryOptions() {
- return {
- 'axios-retry': {
- retries: 5,
- retryCondition: (error) => postRetryCond(error)
- }
- }
-}
-
-function restartRequest(request) {
- request.headers = HTTP.defaults.headers.common
- // create object from origin request body again
- request.data = request.data ? JSON.parse(request.data) : request.data
- return HTTP.request(request)
-}
-
-/**
- * Axios default status codes overwrite for 207
- */
-export function validateStatus(status: number): boolean {
- return (status >= 200 && status < 207) || (status > 207 && status < 300)
-}
diff --git a/web-app/packages/lib-vue2/src/common/index.ts b/web-app/packages/lib-vue2/src/common/index.ts
deleted file mode 100644
index 14554045..00000000
--- a/web-app/packages/lib-vue2/src/common/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './components'
-export * from './errors'
-export * from './mixins'
-export * from './http'
-export * from './types'
-export * from './router_without_navigation_failure'
-export * from './http'
-export * as dateUtils from './date_utils'
-export * as errorUtils from './error_utils'
-export * as htmlUtils from './html_utils'
-export * as merginUtils from './mergin_utils'
-export * as moduleUtils from './module_utils'
-export * as numberUtils from './number_utils'
-export * as pathUtils from './path_utils'
-export * as permissionUtils from './permission_utils'
-export * as textUtils from './text_utils'
-export * as routeUtils from './route_utils'
diff --git a/web-app/packages/lib-vue2/src/common/mergin_utils.ts b/web-app/packages/lib-vue2/src/common/mergin_utils.ts
deleted file mode 100644
index 0c485e06..00000000
--- a/web-app/packages/lib-vue2/src/common/mergin_utils.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import CryptoJS from 'crypto-js/core'
-import 'crypto-js/sha1'
-import difference from 'lodash/difference'
-
-export const CHUNK_SIZE = 10 * 1024 * 1024
-
-function arrayBufferToWordArray(ab) {
- const i8a = new Uint8Array(ab)
- const a = []
- for (let i = 0; i < i8a.length; i += 4) {
- a.push((i8a[i] << 24) | (i8a[i + 1] << 16) | (i8a[i + 2] << 8) | i8a[i + 3])
- }
- return CryptoJS.lib.WordArray.create(a, i8a.length)
-}
-
-export async function getFiles(rootEntry, configData) {
- const files = []
-
- async function traverseFileTree(item, configData, path = null) {
- if (
- item.isFile &&
- configData &&
- !configData.blacklist_files.includes(item.name)
- ) {
- let file
- if (item.constructor === File) {
- file = item
- } else {
- file = await new Promise((resolve) => item.file(resolve))
- }
- const fileInfo = {
- path: (path || '') + file.name, // save full path
- size: file.size,
- mtime: new Date(file.lastModified),
- file,
- chunks: calculateChunks(file.size)
- }
- files.push(fileInfo)
- } else if (item.isDirectory) {
- const dirReader = item.createReader()
- let entries
- do {
- entries = await new Promise((resolve) => dirReader.readEntries(resolve))
- for (const entry of entries) {
- if (configData && configData.blacklist_dirs.includes(item.name)) {
- continue
- }
- await traverseFileTree(
- entry,
- configData,
- path === null ? '' : path + item.name + '/'
- )
- }
- } while (entries.length)
- }
- }
-
- await traverseFileTree(rootEntry, configData)
- return files
-}
-
-export function checksum(file) {
- return new Promise((resolve) => {
- const fileSize = file.size
- const chunkSize = 256 * 1024
- let offset = 0
- const hash = CryptoJS.algo.SHA1.create()
-
- const readEventHandler = (e) => {
- // offset += e.target.result.length
- offset += e.target.result.byteLength
-
- // hash.update(e.target.result)
- hash.update(arrayBufferToWordArray(e.target.result))
- if (offset >= fileSize) {
- const h = hash.finalize()
- resolve(CryptoJS.enc.Hex.stringify(h))
- } else {
- chunkReaderBlock(offset, chunkSize, file)
- }
- }
-
- const chunkReaderBlock = (_offset, length, _file) => {
- const r = new FileReader()
- const blob = _file.slice(_offset, length + _offset)
- r.onload = readEventHandler
- r.readAsArrayBuffer(blob)
- // r.readAsText(blob)
- }
- chunkReaderBlock(offset, chunkSize, file)
- })
-}
-
-export function filesDiff(oldFiles, newFiles) {
- const oFilesPaths = Object.keys(oldFiles).filter((path) => !ignoreFile(path))
- const nFilesPaths = Object.keys(newFiles).filter((path) => !ignoreFile(path))
-
- const updated = Object.keys(oldFiles).filter((path) => {
- const f2 = newFiles[path]
- return f2 && f2.checksum !== oldFiles[path].checksum
- })
- const added = difference(nFilesPaths, oFilesPaths)
- const removed = difference(oFilesPaths, nFilesPaths)
-
- const diff = {
- added,
- removed,
- updated
- }
- const changes = Object.values(diff).reduce(
- (sum, list) => sum + list.length,
- 0
- )
- // return Object.values(diff).reduce((sum, list) => sum + list.length, 0) ? diff : null
- return { ...diff, changes }
-}
-
-function splitFilePath(filePath) {
- const filename = filePath.replace(/^.*\//, '')
- const extension =
- filename.lastIndexOf('.') > 0 ? filename.split('.').pop() : ''
- return { filename, extension }
-}
-
-function ignoreFile(filePath) {
- const ignoreExt = ['-shm', '-wal', '~', 'pyc', 'swap']
- const { extension } = splitFilePath(filePath)
- return new RegExp(`(${ignoreExt.join('|')})$`, 'g').test(extension)
-}
-
-export function isVersionedFile(filePath) {
- const { extension } = splitFilePath(filePath)
- return ['gpkg', 'sqlite'].includes(extension)
-}
-
-export function calculateChunks(fileSize) {
- const chunks = []
- for (let i = 0; i < Math.ceil(fileSize / CHUNK_SIZE); i++) {
- chunks.push(Math.random().toString(36).substring(2))
- }
- return chunks
-}
diff --git a/web-app/packages/lib-vue2/src/common/mixins/FormMixin.ts b/web-app/packages/lib-vue2/src/common/mixins/FormMixin.ts
deleted file mode 100644
index 418ed2e8..00000000
--- a/web-app/packages/lib-vue2/src/common/mixins/FormMixin.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export default {
- data() {
- return {
- errors: {},
- errorMsg: null
- }
- },
- methods: {
- clearErrors() {
- this.errors = {}
- this.errorMsg = null
- },
- handleError(err, generalMsg = 'Error') {
- if (typeof err.response.data === 'object') {
- // two types of error responses
- if (typeof err.response.data.status === 'number') {
- this.errorMsg = err.response.data.detail
- } else {
- this.errors = err.response.data
- }
- } else {
- this.errorMsg = err.response.data || generalMsg
- }
- }
- }
-}
diff --git a/web-app/packages/lib-vue2/src/common/mixins/index.ts b/web-app/packages/lib-vue2/src/common/mixins/index.ts
deleted file mode 100644
index 4b077cc6..00000000
--- a/web-app/packages/lib-vue2/src/common/mixins/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as FormMixin } from './FormMixin'
diff --git a/web-app/packages/lib-vue2/src/common/module_utils.ts b/web-app/packages/lib-vue2/src/common/module_utils.ts
deleted file mode 100644
index 2ecd580f..00000000
--- a/web-app/packages/lib-vue2/src/common/module_utils.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { RouteRecord } from 'vue-router'
-
-import { Module, ModuleService, RouteOverrides } from '@/common/types'
-
-export const initializeAppModule = (
- module: Module,
- services?: ModuleService,
- routeOverrides?: RouteOverrides
-) => {
- module.init(services, routeOverrides)
-}
-
-function elevateToRouteRecord(
- route: Partial
-): route is RouteRecord {
- return true
-}
-
-export function applyRouteOverride(
- route: Partial,
- routeOverrides?: RouteOverrides
-): Partial {
- let overridenRoute = route
- const routeName: string = route.name as unknown as string
- if (overridenRoute.children) {
- overridenRoute.children = route.children.map((child) => {
- const overridenChild = applyRouteOverride(child, routeOverrides)
- let result = child
- // ALWAYS true - this is just hack to cast Partial to RouteRecord to get rid of TS error
- if (elevateToRouteRecord(overridenChild)) {
- result = overridenChild
- }
- return result
- })
- } else if (routeOverrides && routeOverrides[routeName]) {
- overridenRoute = { ...overridenRoute, ...routeOverrides[routeName] }
- }
-
- if (routeOverrides && routeOverrides[routeName]) {
- overridenRoute = { ...overridenRoute, ...routeOverrides[routeName] }
- }
- return overridenRoute
-}
diff --git a/web-app/packages/lib-vue2/src/common/number_utils.ts b/web-app/packages/lib-vue2/src/common/number_utils.ts
deleted file mode 100644
index fe254ad8..00000000
--- a/web-app/packages/lib-vue2/src/common/number_utils.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export type SizeUnit = 'GB' | 'MB' | 'kB' | 'B'
-
-const SizeUnits: Record string> = {
- GB: (value) => (value / 1073741824).toFixed(2),
- MB: (value) => (value / 1048576).toFixed(2),
- kB: (value) => (value / 1024).toFixed(0),
- B: (value) => `${Math.round(value)}`
-}
-
-export function formatFileSize(
- value,
- unit?: SizeUnit,
- digits = 2,
- minUnit: SizeUnit = 'B'
-) {
- if (!value) {
- return `${value} MB`
- }
- if (!unit) {
- if (value >= 1073741824 || minUnit === 'GB') {
- unit = 'GB'
- } else if (value >= 1048576 || minUnit === 'MB') {
- unit = 'MB'
- } else if (value >= 1024 || minUnit === 'kB') {
- unit = 'kB'
- } else {
- unit = 'B'
- }
- }
- let unitsValue = parseFloat(SizeUnits[unit](value))
- unitsValue = unitsValue === 0 ? Math.pow(10, -digits) : unitsValue
- return `${unitsValue.toFixed(digits)} ${unit}`
-}
-
-export function formatToCurrency(value: number, currency: string): string {
- return value.toLocaleString('en-UK', {
- style: 'currency',
- currency,
- currencySign: 'accounting'
- })
-}
diff --git a/web-app/packages/lib-vue2/src/common/path_utils.ts b/web-app/packages/lib-vue2/src/common/path_utils.ts
deleted file mode 100644
index df8404e5..00000000
--- a/web-app/packages/lib-vue2/src/common/path_utils.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import Path from 'path'
-
-export function dirname(path: string) {
- const dir = Path.dirname(path).replace(/\/$/, '')
- return dir === '.' ? '' : dir
-}
diff --git a/web-app/packages/lib-vue2/src/common/permission_utils.ts b/web-app/packages/lib-vue2/src/common/permission_utils.ts
deleted file mode 100644
index 6b02d141..00000000
--- a/web-app/packages/lib-vue2/src/common/permission_utils.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export enum UserRole {
- guest,
- reader,
- writer,
- admin,
- owner
-}
-
-export enum ProjectRole {
- none,
- reader,
- writer,
- owner
-}
-
-export type UserRoleName = 'guest' | 'reader' | 'writer' | 'admin' | 'owner'
-
-export type ProjectRoleName =
- | Extract
- | 'none'
-
-export const USER_ROLE_NAME_BY_ROLE: Record = {
- [UserRole.guest]: 'guest',
- [UserRole.reader]: 'reader',
- [UserRole.writer]: 'writer',
- [UserRole.admin]: 'admin',
- [UserRole.owner]: 'owner'
-}
-
-export const USER_ROLE_LABEL_BY_NAME: Record = {
- guest: 'Guest',
- reader: 'Reader',
- writer: 'Writer',
- admin: 'Admin',
- owner: 'Owner'
-}
-
-export const USER_ROLE_BY_NAME: Record = {
- guest: UserRole.guest,
- reader: UserRole.reader,
- writer: UserRole.writer,
- admin: UserRole.admin,
- owner: UserRole.owner
-}
-
-export const PROJECT_ROLE_NAME_BY_ROLE: Record = {
- [ProjectRole.none]: 'none',
- [ProjectRole.reader]: 'reader',
- [ProjectRole.writer]: 'writer',
- [ProjectRole.owner]: 'owner'
-}
-
-export const PROJECT_ROLE_LABEL_BY_NAME: Record = {
- none: 'None',
- reader: 'Reader',
- writer: 'Writer',
- owner: 'Owner'
-}
-
-export const PROJECT_ROLE_BY_NAME: Record = {
- none: ProjectRole.none,
- reader: ProjectRole.reader,
- writer: ProjectRole.writer,
- owner: ProjectRole.owner
-}
-
-export interface UserRoleValueForSelect {
- label: string
- value: UserRoleName
-}
-
-export enum ProjectPermission {
- read,
- write,
- owner
-}
-
-export type ProjectPermissionName = 'owner' | 'write' | 'read'
-
-export const PROJECT_PERMISSION_NAME_BY_PERMISSION: Record<
- ProjectPermission,
- ProjectPermissionName
-> = {
- [ProjectPermission.read]: 'read',
- [ProjectPermission.write]: 'write',
- [ProjectPermission.owner]: 'owner'
-}
-
-export const PROJECT_PERMISSION_LABEL_BY_NAME: Record<
- ProjectPermissionName,
- string
-> = {
- read: 'Read',
- write: 'Write',
- owner: 'Owner'
-}
-
-export const PROJECT_PERMISSION_BY_NAME: Record<
- ProjectPermissionName,
- ProjectPermission
-> = {
- read: ProjectPermission.read,
- write: ProjectPermission.write,
- owner: ProjectPermission.owner
-}
-
-export interface ProjectPermissionValueForSelect {
- label: string
- value: ProjectPermissionName
-}
-
-export function isAtLeastRole(roleName: UserRoleName, role: UserRole): boolean {
- return USER_ROLE_BY_NAME[roleName] >= role
-}
-
-export function isAtLeastProjectRole(
- roleName: ProjectRoleName,
- role: ProjectRole
-): boolean {
- return PROJECT_ROLE_BY_NAME[roleName] >= role
-}
-
-export function isAtLeastProjectPermission(
- permissionName: ProjectPermissionName,
- permission: ProjectPermission
-): boolean {
- return PROJECT_PERMISSION_BY_NAME[permissionName] >= permission
-}
-
-export function getUserRoleValuesForSelect(
- roles: UserRoleName[]
-): UserRoleValueForSelect[] {
- return roles.map((role) => ({
- value: role,
- label: USER_ROLE_LABEL_BY_NAME[role]
- }))
-}
-
-export function getProjectPermissionValuesForSelect(
- permissions: ProjectPermissionName[]
-): ProjectPermissionValueForSelect[] {
- return permissions.map((permission) => ({
- value: permission,
- label: PROJECT_PERMISSION_LABEL_BY_NAME[permission]
- }))
-}
diff --git a/web-app/packages/lib-vue2/src/common/route_utils.ts b/web-app/packages/lib-vue2/src/common/route_utils.ts
deleted file mode 100644
index 4889853a..00000000
--- a/web-app/packages/lib-vue2/src/common/route_utils.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import isEqual from 'lodash/isEqual'
-import pick from 'lodash/pick'
-import { Route, NavigationGuardNext } from 'vue-router'
-
-import { useUserStore } from '@/modules/user/store'
-
-export type IsAuthenticatedGuardOptions = {
- notAuthenticatedRedirectPath?: string
-}
-
-export function isTheSameRoute(from: Route, to: Route) {
- const properties = ['name', 'path', 'hash', 'params', 'query']
- return isEqual(pick(from, properties), pick(to, properties))
-}
-
-export function getTagsFromQuery(route: Route) {
- const tags = route.query.tags
- return tags ? (typeof tags === 'string' ? tags.split(',') : tags) : []
-}
-
-/** Handles redirect to /login when user is not authenticated. */
-export function isAuthenticatedGuard(
- to: Route,
- from: Route,
- next: NavigationGuardNext,
- userStore,
- options?: IsAuthenticatedGuardOptions
-) {
- if (to.meta.public || userStore.isLoggedIn) {
- if (isTheSameRoute(from, to)) {
- return false
- } else {
- next()
- }
- } else {
- next({
- path: options?.notAuthenticatedRedirectPath ?? 'login',
- // TODO: V3_UPGRADE - check this https://router.vuejs.org/guide/migration/#redirect-records-cannot-use-special-paths
- query: { redirect: to.fullPath }
- })
- }
-}
-
-/** Handles redirect to /login when user is not superUser. */
-export function isSuperUser(
- to: Route,
- from: Route,
- next: NavigationGuardNext,
- userStore
-) {
- if (userStore.isSuperUser) {
- next()
- } else {
- next('/login')
- }
-}
diff --git a/web-app/packages/lib-vue2/src/common/router_without_navigation_failure.ts b/web-app/packages/lib-vue2/src/common/router_without_navigation_failure.ts
deleted file mode 100644
index 24610c32..00000000
--- a/web-app/packages/lib-vue2/src/common/router_without_navigation_failure.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import Router from 'vue-router'
-
-// fixed problem with vue router - catch Detecting Navigation Failures
-
-const originalPush = Router.prototype.push
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-Router.prototype.push = function push(location, onResolve, onReject) {
- if (onResolve || onReject)
- return originalPush.call(this, location, onResolve, onReject)
- return originalPush.call(this, location).catch((err) => {
- if (Router.isNavigationFailure(err)) {
- // resolve err
- return err
- }
- // rethrow error
- return Promise.reject(err)
- })
-}
-
-export { Router }
diff --git a/web-app/packages/lib-vue2/src/common/text_utils.ts b/web-app/packages/lib-vue2/src/common/text_utils.ts
deleted file mode 100644
index ea7bdeda..00000000
--- a/web-app/packages/lib-vue2/src/common/text_utils.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export function formatToTitle(string: string) {
- string = string.replace(/_/g, ' ')
- return string.charAt(0).toUpperCase() + string.slice(1)
-}
-
-export function removeAccents(text: string) {
- return text.normalize('NFD').replace(/[\u0300-\u036f]/g, '')
-}
-
-export function isValidEmail(email: string) {
- const emailPattern =
- /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
- return emailPattern.test(email)
-}
-
-export const EMAIL_LIST_SEPARATORS = /[;, ]/
-export const EMAIL_LIST_DEFAULT_SEPARATOR = ';'
diff --git a/web-app/packages/lib-vue2/src/common/types.ts b/web-app/packages/lib-vue2/src/common/types.ts
deleted file mode 100644
index 2cf1efdb..00000000
--- a/web-app/packages/lib-vue2/src/common/types.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import VueRouter, { RouteRecord } from 'vue-router'
-
-import { HttpService } from '@/common/http'
-
-export type RouteName = string
-export type RouteOverrides = Record<
- RouteName,
- // do not allow to override children
- Partial>
->
-
-export interface ModuleService {
- httpService?: HttpService
- routerService?: VueRouter
- [key: string]: any
-}
-
-export interface BaseModule {
- name: string
- _addRoutes?: (router, routeOverrides?: RouteOverrides) => void
- init: (services: ModuleService, routeOverrides?: RouteOverrides) => void
-}
-
-export interface Module extends BaseModule, ModuleService {}
-
-export interface PaginatedGridOptions {
- sortBy: string[]
- sortDesc: boolean[]
- itemsPerPage: number
- page: number
-}
-
-/* eslint-disable camelcase */
-/**
- * Request parameters for paginated endpoints
- * TODO: remove legacy order_by and descending in components
- */
-export interface PaginatedRequestParams {
- order_by?: string
- order_params?: string
- descending?: boolean
- per_page: number
- page: number
-}
-
-/** Stable current request params for paginating endpoints */
-export type PaginatedRequestParamsApi = Omit<
- PaginatedRequestParams,
- 'order_by' | 'descending'
->
-
-export interface PaginatedResponseDefaults {
- count: number
-}
-/* eslint-enable camelcase */
-
-export interface PaginatedResponse extends PaginatedResponseDefaults {
- items: readonly T[]
-}
-
-export interface ApiRequestSuccessInfo {
- success: boolean
- message?: string
- data?: T
-}
diff --git a/web-app/packages/lib-vue2/src/env.d.ts b/web-app/packages/lib-vue2/src/env.d.ts
deleted file mode 100644
index 89cc8af8..00000000
--- a/web-app/packages/lib-vue2/src/env.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-///
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/dashboard/components/DashboardFullStorageWarningRow.vue b/web-app/packages/lib-vue2/src/modules/dashboard/components/DashboardFullStorageWarningRow.vue
deleted file mode 100644
index 2146dcb2..00000000
--- a/web-app/packages/lib-vue2/src/modules/dashboard/components/DashboardFullStorageWarningRow.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/dashboard/components/DashboardProjectsRow.vue b/web-app/packages/lib-vue2/src/modules/dashboard/components/DashboardProjectsRow.vue
deleted file mode 100644
index 5cdd8f65..00000000
--- a/web-app/packages/lib-vue2/src/modules/dashboard/components/DashboardProjectsRow.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/dashboard/components/DashboardUsageInfoRow.vue b/web-app/packages/lib-vue2/src/modules/dashboard/components/DashboardUsageInfoRow.vue
deleted file mode 100644
index c3fa8c9b..00000000
--- a/web-app/packages/lib-vue2/src/modules/dashboard/components/DashboardUsageInfoRow.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
- New project
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/dashboard/views/index.ts b/web-app/packages/lib-vue2/src/modules/dashboard/views/index.ts
deleted file mode 100644
index 4895a11d..00000000
--- a/web-app/packages/lib-vue2/src/modules/dashboard/views/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as DashboardViewTemplate } from './DashboardViewTemplate.vue'
diff --git a/web-app/packages/lib-vue2/src/modules/dialog/components/ConfirmDialog.vue b/web-app/packages/lib-vue2/src/modules/dialog/components/ConfirmDialog.vue
deleted file mode 100644
index fc0880c4..00000000
--- a/web-app/packages/lib-vue2/src/modules/dialog/components/ConfirmDialog.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
- {{ headline }}
-
-
- {{ cancelText }}
-
-
- {{ confirmText }}
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/dialog/components/DialogWindows.vue b/web-app/packages/lib-vue2/src/modules/dialog/components/DialogWindows.vue
deleted file mode 100644
index 862a6e51..00000000
--- a/web-app/packages/lib-vue2/src/modules/dialog/components/DialogWindows.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/dialog/components/index.ts b/web-app/packages/lib-vue2/src/modules/dialog/components/index.ts
deleted file mode 100644
index 0cb0af89..00000000
--- a/web-app/packages/lib-vue2/src/modules/dialog/components/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as DialogWindows } from './DialogWindows.vue'
-export { default as ConfirmDialog } from './ConfirmDialog.vue'
diff --git a/web-app/packages/lib-vue2/src/modules/dialog/module.ts b/web-app/packages/lib-vue2/src/modules/dialog/module.ts
deleted file mode 100644
index 656a5964..00000000
--- a/web-app/packages/lib-vue2/src/modules/dialog/module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { Module } from '@/common/types'
-
-export const DialogModule: Module = {
- name: 'dialogModule',
- init: (_services) => {
- // none initialization required
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/dialog/store.ts b/web-app/packages/lib-vue2/src/modules/dialog/store.ts
deleted file mode 100644
index 43f61c46..00000000
--- a/web-app/packages/lib-vue2/src/modules/dialog/store.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { defineStore } from 'pinia'
-import { markRaw } from 'vue'
-
-import { DialogParams, DialogPayload } from './types'
-
-export interface DialogState {
- isDialogOpen: boolean
- params: DialogParams
- // VUE3_UPGRADE add import { Component } from 'vue' as type
- component: any
-}
-
-export const useDialogStore = defineStore('dialogModule', {
- state: (): DialogState => ({
- isDialogOpen: false,
- params: null,
- component: null
- }),
-
- getters: {
- dialogProps(state) {
- return state.params ? state.params.dialog : {}
- }
- },
-
- actions: {
- openDialog(payload: DialogPayload) {
- this.isDialogOpen = true
- this.params = { ...payload.params }
- this.component = markRaw(payload.component)
- },
- closeDialog() {
- this.isDialogOpen = false
- this.component = null
- },
- changeParams(payload: { params: DialogParams }) {
- this.params = payload.params
- },
- show(payload: DialogPayload) {
- this.openDialog({
- params: { ...payload.params },
- component: payload.component
- })
- },
- close() {
- this.closeDialog()
- if (this.params?.dialog && !this.params.dialog.keepAlive) {
- setTimeout(() => {
- this.changeParams({ params: null })
- }, 300)
- }
- }
- }
-})
diff --git a/web-app/packages/lib-vue2/src/modules/dialog/types.ts b/web-app/packages/lib-vue2/src/modules/dialog/types.ts
deleted file mode 100644
index 8eea0fa4..00000000
--- a/web-app/packages/lib-vue2/src/modules/dialog/types.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-// import Vue, { Component } from 'vue'
-
-export interface DialogParams {
- dialog: Record
- // TODO: clear unknown based on 'on-listener' in template
- listeners?: unknown | Record void>
- props?: Record
-}
-
-export interface DialogPayload {
- params: DialogParams
- component: any
-}
diff --git a/web-app/packages/lib-vue2/src/modules/form/MerginComponentUuidMixin.ts b/web-app/packages/lib-vue2/src/modules/form/MerginComponentUuidMixin.ts
deleted file mode 100644
index 756dc455..00000000
--- a/web-app/packages/lib-vue2/src/modules/form/MerginComponentUuidMixin.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import uniqueId from 'lodash/uniqueId'
-
-/**
- * Adds globally unique id to each instance of project component.
- */
-export default {
- data() {
- return {
- merginComponentUuid: uniqueId()
- }
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/form/index.ts b/web-app/packages/lib-vue2/src/modules/form/index.ts
deleted file mode 100644
index a90cc24f..00000000
--- a/web-app/packages/lib-vue2/src/modules/form/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './module'
-export * from './store'
-export { default as MerginComponentUuidMixin } from './MerginComponentUuidMixin'
diff --git a/web-app/packages/lib-vue2/src/modules/form/module.ts b/web-app/packages/lib-vue2/src/modules/form/module.ts
deleted file mode 100644
index 844bf07a..00000000
--- a/web-app/packages/lib-vue2/src/modules/form/module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { Module } from '@/common/types'
-
-export const FormModule: Module = {
- name: 'formModule',
- init: (_services) => {
- // none initialization required
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/form/store.ts b/web-app/packages/lib-vue2/src/modules/form/store.ts
deleted file mode 100644
index 428459b6..00000000
--- a/web-app/packages/lib-vue2/src/modules/form/store.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { defineStore } from 'pinia'
-import Vue from 'vue'
-
-import {
- ClearErrorsPayload,
- FormErrors,
- HandleErrorPayload,
- MerginComponentUuid,
- MerginComponentUuidPayload,
- SetFormErrorPayload
-} from '@/modules/form/types'
-import { useNotificationStore } from '@/modules/notification/store'
-
-export interface FormState {
- errors: Record
-}
-
-export const useFormStore = defineStore('formModule', {
- state: (): FormState => ({
- errors: {}
- }),
-
- getters: {
- getErrorByComponentId: (state) => (payload: MerginComponentUuid) => {
- return state.errors[payload]
- }
- },
-
- actions: {
- setFormErrors(payload: SetFormErrorPayload) {
- Vue.set(this.errors, payload.componentId, payload.errors)
- },
- resetFormErrors(payload: MerginComponentUuidPayload) {
- Vue.delete(this.errors, payload.componentId)
- },
- clearErrors(payload: ClearErrorsPayload) {
- const notificationStore = useNotificationStore()
- this.resetFormErrors(payload)
- if (!payload.keepNotification) {
- // reset error message in notification component
- notificationStore.closeNotification()
- }
- },
- async handleError(payload: HandleErrorPayload) {
- let errorMessage
- const notificationStore = useNotificationStore()
- if (typeof payload.error?.response?.data === 'object') {
- // two types of error responses
- // TODO: Get data from HTTP status code, handle formError not standard error with detail
- if (
- typeof payload.error.response.data.status === 'number' ||
- payload.error.response.data.detail
- ) {
- errorMessage = payload.error.response.data.detail
- } else {
- this.setFormErrors({
- componentId: payload.componentId,
- errors: payload.error.response.data
- })
- }
- } else {
- errorMessage =
- payload?.error?.response?.data ??
- payload.generalMessage ??
- payload?.error ??
- 'Error'
- }
- if (errorMessage) {
- // show error message in notification component
- await notificationStore.error({ text: errorMessage })
- }
- }
- }
-})
diff --git a/web-app/packages/lib-vue2/src/modules/form/types.ts b/web-app/packages/lib-vue2/src/modules/form/types.ts
deleted file mode 100644
index ba7fc545..00000000
--- a/web-app/packages/lib-vue2/src/modules/form/types.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { AxiosError } from 'axios'
-
-export type MerginComponentUuid = string
-export type FormInputError = string
-export type FormErrors = Record
-export type FormErrorMessage = string | undefined
-export type FormErrorsData =
- | FormErrorMessage
- | FormErrors
- | { status: number; detail: FormErrorMessage }
-
-export interface MerginComponentUuidPayload {
- componentId: MerginComponentUuid
-}
-export interface SetFormErrorPayload extends MerginComponentUuidPayload {
- errors: FormErrors
-}
-
-export interface ClearErrorsPayload extends MerginComponentUuidPayload {
- keepNotification?: boolean
-}
-
-export interface HandleErrorPayload extends MerginComponentUuidPayload {
- error: AxiosError
- generalMessage: FormErrorMessage
-}
diff --git a/web-app/packages/lib-vue2/src/modules/index.ts b/web-app/packages/lib-vue2/src/modules/index.ts
deleted file mode 100644
index 67c0624e..00000000
--- a/web-app/packages/lib-vue2/src/modules/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './app'
-export * from './form'
-export * from './project'
-export * from './user'
-export * from './notification'
-export * from './dialog'
-export * from './dashboard'
-export * from './layout'
-export * from './instance'
-export * from './types'
diff --git a/web-app/packages/lib-vue2/src/modules/instance/index.ts b/web-app/packages/lib-vue2/src/modules/instance/index.ts
deleted file mode 100644
index d5bed772..00000000
--- a/web-app/packages/lib-vue2/src/modules/instance/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './module'
-export * from './store'
-export * from './instanceApi'
-export * from './types'
diff --git a/web-app/packages/lib-vue2/src/modules/instance/instanceApi.ts b/web-app/packages/lib-vue2/src/modules/instance/instanceApi.ts
deleted file mode 100644
index ac4e811a..00000000
--- a/web-app/packages/lib-vue2/src/modules/instance/instanceApi.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { AxiosResponse } from 'axios'
-
-import { InstanceModule } from '@/modules/instance/module'
-import {
- ConfigResponse,
- InitResponse,
- PingResponse
-} from '@/modules/instance/types'
-
-export const InstanceApi = {
- getInit: (): Promise> => {
- return InstanceModule.httpService.get('/app/init')
- },
- getPing: (): Promise> => {
- return InstanceModule.httpService.get('/ping')
- },
- getConfig: (): Promise> => {
- return InstanceModule.httpService.get('/config')
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/instance/module.ts b/web-app/packages/lib-vue2/src/modules/instance/module.ts
deleted file mode 100644
index 408ed406..00000000
--- a/web-app/packages/lib-vue2/src/modules/instance/module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { Module } from '@/common/types'
-
-export const InstanceModule: Module = {
- name: 'instanceModule',
- httpService: undefined,
- init: (services) => {
- if (services.httpService) {
- InstanceModule.httpService = services.httpService
- } else {
- console.error(`Module ${InstanceModule.name} - missing httpService`)
- }
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/instance/store.ts b/web-app/packages/lib-vue2/src/modules/instance/store.ts
deleted file mode 100644
index bda7b1c0..00000000
--- a/web-app/packages/lib-vue2/src/modules/instance/store.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { defineStore } from 'pinia'
-
-import { InstanceApi } from '@/modules/instance/instanceApi'
-import {
- ConfigResponse,
- InitResponse,
- PingResponse
-} from '@/modules/instance/types'
-import { useNotificationStore } from '@/modules/notification/store'
-import { useUserStore } from '@/modules/user/store'
-
-export interface InstanceState {
- initData: InitResponse
- initialized: boolean
- pingData?: PingResponse
- configData?: ConfigResponse
-}
-
-export const useInstanceStore = defineStore('instanceModule', {
- state: (): InstanceState => ({
- initData: undefined,
- initialized: false,
- pingData: undefined,
- configData: undefined
- }),
-
- actions: {
- setConfigData(payload: ConfigResponse) {
- this.configData = payload
- },
- setInitData(payload: InitResponse) {
- this.initData = payload
- },
- setPingData(payload: PingResponse) {
- this.pingData = payload
- },
- setInitialized() {
- this.initialized = true
- },
- async initApp() {
- const notificationStore = useNotificationStore()
- try {
- const response = await InstanceApi.getInit()
- this.setInitData(response.data)
- const userStore = useUserStore()
- if (response.data?.authenticated) {
- // fetch user profile if user is logged in
- await userStore.fetchUserProfile()
- }
- this.setInitialized()
- return response
- } catch {
- notificationStore.error({ text: 'Failed to init application.' })
- }
- },
-
- async fetchPing() {
- const notificationStore = useNotificationStore()
- try {
- const response = await InstanceApi.getPing()
- this.setPingData(response.data)
- return response
- } catch {
- await notificationStore.error({ text: 'Failed to fetch ping data.' })
- }
- },
-
- async fetchConfig() {
- const notificationStore = useNotificationStore()
- try {
- const response = await InstanceApi.getConfig()
- this.setConfigData(response.data)
- return response
- } catch {
- await notificationStore.error({ text: 'Failed to fetch config data.' })
- }
- }
- }
-})
diff --git a/web-app/packages/lib-vue2/src/modules/instance/types.ts b/web-app/packages/lib-vue2/src/modules/instance/types.ts
deleted file mode 100644
index 898b967a..00000000
--- a/web-app/packages/lib-vue2/src/modules/instance/types.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-/* eslint-disable camelcase */
-export interface InitResponse {
- authenticated: boolean
- superuser?: boolean
-}
-
-export interface PingResponse {
- maintenance: boolean
- status: string
-}
-
-export interface BaseConfigResponse {
- blacklist_dirs: string[]
- blacklist_files: string[]
- docs_url: string
- serverType: string
- version: string
- major?: number
- minor?: number
- fix?: number
-}
-
-export type ConfigResponse = BaseConfigResponse &
- Record
-/* eslint-enable camelcase */
diff --git a/web-app/packages/lib-vue2/src/modules/layout/components/AppHeaderTemplate.vue b/web-app/packages/lib-vue2/src/modules/layout/components/AppHeaderTemplate.vue
deleted file mode 100644
index 6085e68e..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/components/AppHeaderTemplate.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-
-
-
-
-
-
- 
-
-
-
-
-
- fa-angle-double-left
-
- fa-angle-double-right
-
-
-
-
-
-
-
-
-
-
-
-
- Your Profile
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/layout/components/PageView.vue b/web-app/packages/lib-vue2/src/modules/layout/components/PageView.vue
deleted file mode 100644
index f08dd115..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/components/PageView.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/layout/components/SideBarItem.vue b/web-app/packages/lib-vue2/src/modules/layout/components/SideBarItem.vue
deleted file mode 100644
index fbf95ca3..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/components/SideBarItem.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/layout/components/index.ts b/web-app/packages/lib-vue2/src/modules/layout/components/index.ts
deleted file mode 100644
index 2c66aaee..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/components/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as AppHeaderTemplate } from './AppHeaderTemplate.vue'
-export { default as PageView } from './PageView.vue'
-export { default as SideBarItem } from './SideBarItem.vue'
-export { default as SideBarTemplate } from './SideBarTemplate.vue'
diff --git a/web-app/packages/lib-vue2/src/modules/layout/index.ts b/web-app/packages/lib-vue2/src/modules/layout/index.ts
deleted file mode 100644
index 7041efb7..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './components'
-export * from './store'
-export * from './module'
-export * from './views'
diff --git a/web-app/packages/lib-vue2/src/modules/layout/module.ts b/web-app/packages/lib-vue2/src/modules/layout/module.ts
deleted file mode 100644
index f5bd6b7e..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { Module } from '@/common/types'
-
-export const LayoutModule: Module = {
- name: 'layoutModule',
- init: (_services) => {
- // none initialization required
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/layout/store.ts b/web-app/packages/lib-vue2/src/modules/layout/store.ts
deleted file mode 100644
index 9ca81a5f..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/store.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { defineStore } from 'pinia'
-
-export interface LayoutState {
- barColor: string
- barImage: string
- drawer: boolean
-}
-
-export const useLayoutStore = defineStore('layoutModule', {
- state: (): LayoutState => ({
- barColor: 'rgba(176, 177, 181 1), rgba(176, 177, 181 1)', // TODO: global - check if necessary and useful, MV-2022-06-30: I would probably get rid of this if possible
- barImage:
- 'https://demos.creative-tim.com/material-dashboard/assets/img/sidebar-1.jpg', // TODO: global - check if necessary and useful, MV-2022-06-30: I would probably get rid of this if possible
- drawer: null
- }),
-
- actions: {
- setBarImage(payload) {
- this.barImage = payload.barImage
- },
- setDrawer(payload) {
- this.drawer = payload.drawer
- }
- }
-})
diff --git a/web-app/packages/lib-vue2/src/modules/layout/views/NotFoundView.vue b/web-app/packages/lib-vue2/src/modules/layout/views/NotFoundView.vue
deleted file mode 100644
index eec4c93f..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/views/NotFoundView.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Back to Dashboard
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/layout/views/RootView.vue b/web-app/packages/lib-vue2/src/modules/layout/views/RootView.vue
deleted file mode 100644
index 86bdac15..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/views/RootView.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/layout/views/index.ts b/web-app/packages/lib-vue2/src/modules/layout/views/index.ts
deleted file mode 100644
index a7af5199..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/views/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as NotFoundView } from './NotFoundView.vue'
diff --git a/web-app/packages/lib-vue2/src/modules/notification/components/Notifications.vue b/web-app/packages/lib-vue2/src/modules/notification/components/Notifications.vue
deleted file mode 100644
index 1eb328d9..00000000
--- a/web-app/packages/lib-vue2/src/modules/notification/components/Notifications.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
- {{ params.action.text }}
-
-
- Close
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/notification/components/index.ts b/web-app/packages/lib-vue2/src/modules/notification/components/index.ts
deleted file mode 100644
index f44c5373..00000000
--- a/web-app/packages/lib-vue2/src/modules/notification/components/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as Notifications } from './Notifications.vue'
diff --git a/web-app/packages/lib-vue2/src/modules/notification/index.ts b/web-app/packages/lib-vue2/src/modules/notification/index.ts
deleted file mode 100644
index 9bd4cebc..00000000
--- a/web-app/packages/lib-vue2/src/modules/notification/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './components'
-export * from './store'
-export * from './module'
diff --git a/web-app/packages/lib-vue2/src/modules/notification/module.ts b/web-app/packages/lib-vue2/src/modules/notification/module.ts
deleted file mode 100644
index 0122cfb4..00000000
--- a/web-app/packages/lib-vue2/src/modules/notification/module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { Module } from '@/common/types'
-
-export const NotificationModule: Module = {
- name: 'notificationModule',
- init: (_services) => {
- // none initialization required
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/notification/store.ts b/web-app/packages/lib-vue2/src/modules/notification/store.ts
deleted file mode 100644
index 6d9124d8..00000000
--- a/web-app/packages/lib-vue2/src/modules/notification/store.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { defineStore } from 'pinia'
-
-const SNACK_BAR_ERROR_DEFAULT_PARAMS = {
- color: 'red darken-4'
-}
-const SNACK_BAR_WARN_DEFAULT_PARAMS = {
- color: 'orange',
- buttonColor: 'black'
-}
-
-export interface NotificationState {
- isOpen: boolean
- text: string
- params: {
- action?: {
- text: string
- handler: () => void
- }
- timeout?: number
- }
-}
-
-export const useNotificationStore = defineStore('notificationModule', {
- state: (): NotificationState => ({
- isOpen: false,
- text: '',
- params: null
- }),
-
- actions: {
- openNotification(payload) {
- this.isOpen = true
- this.text = payload.text
- this.params = payload.params
- },
- closeNotification() {
- this.isOpen = false
- this.text = ''
- this.params = null
- },
- show(payload) {
- if (this.isOpen) {
- if (this.text === payload.text) {
- // ignore same notifications
- return
- }
- // previous notification is open, close it first
- this.closeNotification()
- // show new notification after some time
- setTimeout(() => {
- this.show({ text: payload.text, params: payload.params })
- }, 300)
- } else {
- this.openNotification({
- text: payload.text,
- params: payload.params?.timeout
- ? { ...payload.params, timeout: payload.params.timeout }
- : { ...payload.params }
- })
- }
- },
- warn(payload) {
- this.show({
- ...payload,
- params: { ...payload.params, ...SNACK_BAR_WARN_DEFAULT_PARAMS }
- })
- },
- error(payload) {
- this.show({
- ...payload,
- params: { ...payload.params, ...SNACK_BAR_ERROR_DEFAULT_PARAMS }
- })
- },
- displayResult(payload) {
- if (payload?.result?.success) {
- this.show({ text: payload?.result?.message })
- } else {
- this.error({
- text: payload?.result?.message,
- params: { timeout: 5000 }
- })
- }
- }
- }
-})
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/AccountAutocomplete.vue b/web-app/packages/lib-vue2/src/modules/project/components/AccountAutocomplete.vue
deleted file mode 100644
index 0ee254fc..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/AccountAutocomplete.vue
+++ /dev/null
@@ -1,265 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/CloneDialog.vue b/web-app/packages/lib-vue2/src/modules/project/components/CloneDialog.vue
deleted file mode 100644
index 4ee593dd..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/CloneDialog.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
- Clone Project
-
-
-
-
- Close
-
- Clone
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/DropArea.vue b/web-app/packages/lib-vue2/src/modules/project/components/DropArea.vue
deleted file mode 100644
index e6fda660..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/DropArea.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-
-
-
-
-
-
- Delete
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/FolderDiff.vue b/web-app/packages/lib-vue2/src/modules/project/components/FolderDiff.vue
deleted file mode 100644
index 0456967e..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/FolderDiff.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
- {{ added }}
- {{ removed }}
- {{ updated }}
- / {{ count }}
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/PermissionInfo.vue b/web-app/packages/lib-vue2/src/modules/project/components/PermissionInfo.vue
deleted file mode 100644
index 919364d9..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/PermissionInfo.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
- info_outline
- Click here to learn more about roles and permissions
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/ProjectAccessRequestTable.vue b/web-app/packages/lib-vue2/src/modules/project/components/ProjectAccessRequestTable.vue
deleted file mode 100644
index e17d9f22..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/ProjectAccessRequestTable.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ header.text }}
-
-
-
- {{ header.tooltip }}
-
-
-
- {{ header.text }}
-
-
-
-
-
-
- {{ header.text }}
-
-
-
- {{ header.tooltip }}
-
-
-
- {{ header.text }}
-
-
-
-
-
-
- {{ value.username }}
-
-
-
- {{
- value.profile.first_name
- }}
-
- {{ value.profile.last_name }}
-
-
-
- {{ value.username }}
-
-
-
-
-
- {{ value | remainingtime }}
-
- {{ value | datetime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/ProjectForm.vue b/web-app/packages/lib-vue2/src/modules/project/components/ProjectForm.vue
deleted file mode 100644
index 59b13ef3..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/ProjectForm.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
- New project
-
-
-
-
-
- Close
-
- Create
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/ProjectPermissionsTemplate.vue b/web-app/packages/lib-vue2/src/modules/project/components/ProjectPermissionsTemplate.vue
deleted file mode 100644
index 07a1294e..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/ProjectPermissionsTemplate.vue
+++ /dev/null
@@ -1,395 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ header.text }}
-
-
-
- {{ header.tooltip }}
-
-
-
- {{ header.text }}
-
-
-
-
-
-
-
- {{ value.username }}
-
-
-
- {{
- value.profile.first_name
- }}
-
- {{ value.profile.last_name }}
-
-
-
- {{ value.username }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/ProjectShareButton.vue b/web-app/packages/lib-vue2/src/modules/project/components/ProjectShareButton.vue
deleted file mode 100644
index 1be79e56..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/ProjectShareButton.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/ProjectShareDialog.vue b/web-app/packages/lib-vue2/src/modules/project/components/ProjectShareDialog.vue
deleted file mode 100644
index da03902f..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/ProjectShareDialog.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
-
-
-
- Share project {{ project.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/ProjectsTable.vue b/web-app/packages/lib-vue2/src/modules/project/components/ProjectsTable.vue
deleted file mode 100644
index 0cc43915..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/ProjectsTable.vue
+++ /dev/null
@@ -1,412 +0,0 @@
-
-
-
-
-
- Data Sync
-
- close
-
-
-
-
-
-
- delete
-
-
-
- add_circle
-
-
-
- edit
-
-
-
-
-
-
- All files are up to date!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/index.ts b/web-app/packages/lib-vue2/src/modules/project/components/index.ts
deleted file mode 100644
index 3f1f2889..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as AccountAutocomplete } from './AccountAutocomplete.vue'
-export { default as CloneDialog } from './CloneDialog.vue'
-export { default as CloneDialogTemplate } from './CloneDialogTemplate.vue'
-export { default as DropArea } from './DropArea.vue'
-export { default as FileChangesetSummaryTable } from './FileChangesetSummaryTable.vue'
-export { default as FileIcon } from './FileIcon.vue'
-export { default as FileMenu } from './FileMenu.vue'
-export { default as FolderDiff } from './FolderDiff.vue'
-export { default as PermissionInfo } from './PermissionInfo.vue'
-export { default as ProjectAccessRequests } from './ProjectAccessRequests.vue'
-export { default as ProjectAccessRequestTable } from './ProjectAccessRequestTable.vue'
-export { default as ProjectForm } from './ProjectForm.vue'
-export { default as ProjectPermissionsTemplate } from './ProjectPermissionsTemplate.vue'
-export { default as ProjectShareDialog } from './ProjectShareDialog.vue'
-export { default as ProjectShareButton } from './ProjectShareButton.vue'
-export { default as ProjectShareButtonTemplate } from './ProjectShareButtonTemplate.vue'
-export { default as ProjectsTable } from './ProjectsTable.vue'
-export { default as ProjectsTableDataLoader } from './ProjectsTableDataLoader.vue'
-export { default as UploadPanel } from './UploadPanel.vue'
-export { default as ProjectAccessRequestTableTemplate } from './ProjectAccessRequestTableTemplate.vue'
diff --git a/web-app/packages/lib-vue2/src/modules/project/index.ts b/web-app/packages/lib-vue2/src/modules/project/index.ts
deleted file mode 100644
index fb355a65..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './components'
-export * from './views'
-export * from './store'
-export * from './projectApi'
-export * from './module'
-export * from './types'
diff --git a/web-app/packages/lib-vue2/src/modules/project/module.ts b/web-app/packages/lib-vue2/src/modules/project/module.ts
deleted file mode 100644
index 392ce707..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import getRoutes from './routes'
-
-import { applyRouteOverride } from '@/common/module_utils'
-import { Module } from '@/common/types'
-
-export const ProjectModule: Module = {
- name: 'projectModule',
- routerService: undefined,
- httpService: undefined,
- _addRoutes: (router, routeOverrides) => {
- // add routes to router
- getRoutes().forEach((route) => {
- router.addRoute(applyRouteOverride(route, routeOverrides))
- })
- },
- init: (services, routeOverrides) => {
- if (services.httpService) {
- ProjectModule.httpService = services.httpService
- } else {
- console.error(`Module ${ProjectModule.name} - missing httpService`)
- }
-
- if (services.routerService) {
- ProjectModule.routerService = services.routerService
- ProjectModule._addRoutes(services.routerService, routeOverrides)
- }
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/project/projectApi.ts b/web-app/packages/lib-vue2/src/modules/project/projectApi.ts
deleted file mode 100644
index 6fe2a359..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/projectApi.ts
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { AxiosResponse, CancelToken } from 'axios'
-
-import { getDefaultRetryOptions, validateStatus } from '@/common/http'
-import { ProjectModule } from '@/modules/project/module'
-import {
- AcceptProjectAccessRequestData,
- CloneProjectParams,
- CreateProjectParams,
- FetchProjectVersionsParams,
- PaginatedProjectsParams,
- PaginatedProjectsResponse,
- PaginatedProjectVersionsResponse,
- ProjectAccessRequestResponse,
- ProjectAccessRequestParams,
- ProjectDetail,
- ProjectTemplate,
- PushProjectChangesParams,
- PushProjectChangesResponse,
- SaveProjectSettings,
- UpdateProjectAccessParams
-} from '@/modules/project/types'
-
-export const ProjectApi = {
- async fetchProject(
- namespace: string,
- projectName: string
- ): Promise> {
- return ProjectModule.httpService(`/v1/project/${namespace}/${projectName}`)
- },
-
- async createProject(
- namespace: string,
- data: CreateProjectParams,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.post(`/v1/project/${namespace}`, data, {
- ...(withRetry ? getDefaultRetryOptions() : {})
- })
- },
-
- async cloneProject(
- namespace: string,
- projectName: string,
- data: CloneProjectParams,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.post(
- `/v1/project/clone/${namespace}/${projectName}`,
- data,
- {
- ...(withRetry ? getDefaultRetryOptions() : {})
- }
- )
- },
-
- async deleteProject(
- id: string,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.post(`/v2/projects/${id}/scheduleDelete`, {
- ...(withRetry ? getDefaultRetryOptions() : {})
- })
- },
-
- async unsubscribeProject(id: string): Promise> {
- return ProjectModule.httpService.post(`/app/project/unsubscribe/${id}`)
- },
-
- async getProjectFileByUrl(url: string): Promise> {
- return ProjectModule.httpService.get(url)
- },
-
- async getPaginatedProject(
- params: PaginatedProjectsParams
- ): Promise> {
- return ProjectModule.httpService('/v1/project/paginated', { params })
- },
-
- saveProjectSettings(
- namespace: string,
- projectName: string,
- data: SaveProjectSettings,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.put(
- `/v1/project/${namespace}/${projectName}`,
- data,
- {
- ...(withRetry ? getDefaultRetryOptions() : {}),
- validateStatus
- }
- )
- },
-
- async fetchProjectVersions(
- namespace: string,
- projectName: string,
- params: FetchProjectVersionsParams
- ): Promise> {
- return ProjectModule.httpService.get(
- `/v1/project/versions/paginated/${namespace}/${projectName}`,
- { params }
- )
- },
-
- /**
- * List of project access requests initiated by current user in session
- */
- async fetchAccessRequests(
- params: ProjectAccessRequestParams
- ): Promise> {
- return ProjectModule.httpService('/app/project/access-requests', { params })
- },
-
- /**
- * Paginated list of incoming project access requests to workspace
- */
- async fetchNamespaceAccessRequests(
- namespace: string,
- params: ProjectAccessRequestParams
- ): Promise> {
- return ProjectModule.httpService(
- `/app/project/access-request/${namespace}`,
- { params }
- )
- },
-
- async acceptProjectAccessRequest(
- itemId: number,
- data: AcceptProjectAccessRequestData,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.post(
- `/app/project/access-request/accept/${itemId}`,
- data,
- {
- ...(withRetry ? getDefaultRetryOptions() : {})
- }
- )
- },
- async cancelProjectAccessRequest(
- itemId: number,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.delete(
- `/app/project/access-request/${itemId}`,
- {
- ...(withRetry ? getDefaultRetryOptions() : {})
- }
- )
- },
- async createProjectAccessRequest(
- namespace: string,
- projectName: string,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.post(
- `/app/project/access-request/${namespace}/${projectName}`,
- {},
- {
- ...(withRetry ? getDefaultRetryOptions() : {})
- }
- )
- },
-
- async updateProjectAccessForUser(
- id: string,
- data: UpdateProjectAccessParams,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.patch(`/app/project/${id}/access`, data, {
- ...(withRetry ? getDefaultRetryOptions() : {})
- })
- },
-
- async pushProjectChanges(
- url: string,
- data: PushProjectChangesParams
- ): Promise> {
- return ProjectModule.httpService.post(`/v1/project/push/${url}`, data)
- },
-
- async pushProjectChunks(
- transaction: string,
- chunk: string,
- token: CancelToken,
- data: any,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.post(
- `/v1/project/push/chunk/${transaction}/${chunk}`,
- data,
- {
- cancelToken: token,
- ...(withRetry ? getDefaultRetryOptions() : {})
- }
- )
- },
-
- async pushFinishTransaction(
- transaction: string,
- token: CancelToken,
- withRetry?: boolean
- ): Promise> {
- return ProjectModule.httpService.post(
- `/v1/project/push/finish/${transaction}`,
- null,
- {
- cancelToken: token,
- ...(withRetry ? getDefaultRetryOptions() : {})
- }
- )
- },
-
- async pushCancelTransaction(
- transaction: string
- ): Promise> {
- return ProjectModule.httpService.post(
- `/v1/project/push/cancel/${transaction}`
- )
- },
-
- constructDownloadProjectUrl(namespace: string, projectName: string) {
- return ProjectModule.httpService.absUrl(
- `/v1/project/download/${namespace}/${projectName}?format=zip`
- )
- },
-
- constructDownloadProjectVersionUrl(
- namespace: string,
- projectName: string,
- versionId: string
- ) {
- return ProjectModule.httpService.absUrl(
- `/v1/project/download/${namespace}/${projectName}?version=${versionId}&format=zip`
- )
- },
-
- constructDownloadProjectFileUrl(
- namespace: string,
- projectName: string,
- file: string
- ) {
- return ProjectModule.httpService.absUrl(
- `/v1/project/raw/${namespace}/${projectName}?file=${file}&random=${Math.random()}`
- )
- },
-
- async getProjectVersion(
- projectId: string,
- versionName: string
- ): Promise> {
- return ProjectModule.httpService.get(
- `/v1/project/version/${projectId}/${versionName}`
- )
- },
-
- async getProjectTemplates(): Promise> {
- return ProjectModule.httpService.get('/app/project/templates')
- },
-
- async downloadFile(url: string): Promise> {
- return ProjectModule.httpService.get(url, { responseType: 'blob' })
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/project/routes.ts b/web-app/packages/lib-vue2/src/modules/project/routes.ts
deleted file mode 100644
index fe1b0f55..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/routes.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { RouteRecord } from 'vue-router'
-
-export default (): RouteRecord[] => []
diff --git a/web-app/packages/lib-vue2/src/modules/project/store.ts b/web-app/packages/lib-vue2/src/modules/project/store.ts
deleted file mode 100644
index 00ba131a..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/store.ts
+++ /dev/null
@@ -1,618 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { AxiosResponse } from 'axios'
-import FileSaver from 'file-saver'
-import keyBy from 'lodash/keyBy'
-import omit from 'lodash/omit'
-import { defineStore, getActivePinia } from 'pinia'
-import Vue from 'vue'
-
-import { getErrorMessage } from '@/common/error_utils'
-import { waitCursor } from '@/common/html_utils'
-import { filesDiff } from '@/common/mergin_utils'
-import { isAtLeastProjectRole, ProjectRole } from '@/common/permission_utils'
-import { useNotificationStore } from '@/modules/notification/store'
-import { ProjectApi } from '@/modules/project/projectApi'
-import {
- AcceptProjectAccessRequestPayload,
- CancelProjectAccessRequestPayload,
- GetNamespaceAccessRequestsPayload,
- ProjectListItem,
- PaginatedProjectsPayload,
- ProjectsPayload,
- ProjectDetail,
- ProjectParams,
- EnhancedProjectDetail,
- FetchProjectVersionsPayload,
- ProjectVersion,
- ProjectVersionsPayload,
- ProjectAccessRequest,
- GetUserAccessRequestsPayload,
- GetProjectAccessRequestsPayload,
- DownloadPayload,
- DeleteProjectPayload
-} from '@/modules/project/types'
-import { useUserStore } from '@/modules/user/store'
-
-interface File {
- chunks: unknown
-}
-
-export interface UploadFilesPayload {
- files: File[]
-}
-
-export interface ProjectState {
- accessRequests: ProjectAccessRequest[]
- accessRequestsCount: number
- project: EnhancedProjectDetail
- projects: ProjectListItem[]
- projectsCount: number
- uploads: any
- currentNamespace: string
- versions: ProjectVersion[]
- versionsCount: number
- versionsLoading: boolean
-}
-
-export const useProjectStore = defineStore('projectModule', {
- state: (): ProjectState => ({
- accessRequests: [],
- accessRequestsCount: 0,
- project: null,
- projectsCount: 0,
- projects: undefined,
- uploads: {},
- currentNamespace: null,
- versions: [],
- versionsCount: 0,
- versionsLoading: false
- }),
-
- getters: {
- isProjectOwner: (state) =>
- isAtLeastProjectRole(state.project?.role, ProjectRole.owner),
- getProjectByName(state) {
- return (payload) => {
- return state.projects?.find((project) => project.name === payload.name)
- }
- }
- },
-
- actions: {
- setAccessRequests(payload) {
- this.accessRequests = payload.accessRequests
- this.accessRequestsCount = payload.count
- },
-
- setProject(payload: { project: ProjectDetail }) {
- let enhancedProject: EnhancedProjectDetail = null
- if (payload.project) {
- enhancedProject = {
- ...omit(payload.project, ['files'])
- }
- if (enhancedProject) {
- enhancedProject.files = keyBy(payload.project.files, 'path')
- enhancedProject.path = [
- enhancedProject.namespace,
- enhancedProject.name
- ].join('/')
- const upload = this.uploads[enhancedProject.path]
- if (upload) {
- upload.diff = filesDiff(enhancedProject.files, upload.files)
- }
- }
- }
- this.project = enhancedProject
- },
- setProjects(payload: ProjectsPayload) {
- this.projects = payload.projects
- this.projectsCount = payload.count
- },
- setProjectVersions(payload: ProjectVersionsPayload) {
- this.versions = payload.versions
- this.versionsCount = payload.count
- },
- projectVersionsLoading(loading: boolean) {
- this.versionsLoading = loading
- },
-
- initUpload(payload) {
- const upload = {
- files: payload.files ?? {},
- diff: null,
- analysingFiles: []
- }
- Vue.set(this.uploads, this.project.path, upload)
- },
-
- analysingFiles(payload) {
- const upload = this.uploads[this.project.path]
- Vue.set(upload, 'analysingFiles', payload.files)
- },
-
- finishFileAnalysis(payload) {
- const upload = this.uploads[this.project.path]
- if (upload.analysingFiles) {
- Vue.set(
- upload,
- 'analysingFiles',
- upload.analysingFiles.filter((p) => p !== payload.path)
- )
- }
- },
-
- uploadFiles(payload: UploadFilesPayload) {
- let files = payload.files
- files = keyBy(files, 'path')
- const chunks = Object.values(files)
- .filter((f) => f.chunks !== undefined)
- .map((f) => f.chunks.length)
- .reduce((sum, item) => sum + item)
- const upload = {
- files,
- diff: filesDiff(this.project.files, files),
- running: false,
- progress: 0,
- loaded: 0,
- total: chunks
- }
- Vue.set(this.uploads, this.project.path, upload)
- },
-
- discardUpload(payload) {
- Vue.delete(this.uploads, payload.projectPath)
- },
-
- startUpload() {
- const upload = this.uploads[this.project.path]
- if (upload) {
- upload.running = true
- upload.progress = 0
- }
- },
-
- chunkUploaded(payload) {
- const upload = this.uploads[payload.project]
- if (upload) {
- upload.loaded++
- if (upload.loaded === upload.total) {
- upload.running = false
- }
- }
- },
-
- cancelUpload() {
- const upload = this.uploads[this.project.path]
- if (upload) {
- upload.running = false
- upload.progress = 0
- }
- },
-
- deleteFiles(payload) {
- let upload = this.uploads[this.project.path]
- if (!upload) {
- upload = {
- files: { ...this.project.files },
- diff: filesDiff({}, {})
- }
- Vue.set(this.uploads, this.project.path, upload)
- }
-
- payload.files.forEach((path) => {
- if (upload.files[path]) {
- Vue.delete(upload.files, path)
- } else {
- // should be folder
- const dirPrefix = path + '/'
- const removed = Object.keys(upload.files).filter((path) =>
- path.startsWith(dirPrefix)
- )
- upload.files = omit(upload.files, removed)
- }
- })
- upload.diff = filesDiff(this.project.files, upload.files)
- },
-
- setCurrentNamespace(payload) {
- this.currentNamespace = payload.currentNamespace
- },
-
- async initProjects(payload: PaginatedProjectsPayload) {
- if (!(this.projects?.length > 0)) {
- await this.getProjects(payload)
- }
- },
-
- async getProjects(payload: PaginatedProjectsPayload) {
- const notificationStore = useNotificationStore()
-
- let response
- try {
- response = await ProjectApi.getPaginatedProject(payload.params)
- this.setProjects({
- projects: response.data?.projects,
- count: response.data?.count
- })
- } catch (_err) {
- await notificationStore.error({
- text: 'Failed to load projects'
- })
- }
- return response
- },
-
- clearProjects() {
- this.setProjects({ projects: [], count: 0 })
- this.setProject({ project: null })
- },
-
- async createProject(payload) {
- waitCursor(true)
- try {
- await ProjectApi.createProject(payload.namespace, payload.data, true)
- this.setProject({ project: null })
- await getActivePinia().router.push({
- name: 'project',
- params: {
- namespace: payload.namespace,
- projectName: payload.data.name
- }
- })
- } finally {
- waitCursor(false)
- }
- },
-
- async deleteProject(payload: DeleteProjectPayload) {
- const notificationStore = useNotificationStore()
- const userStore = useUserStore()
-
- try {
- waitCursor(true)
- await ProjectApi.deleteProject(payload.projectId, true)
- this.setProject({ project: null })
- await userStore.fetchUserProfile()
- waitCursor(false)
- getActivePinia().router.replace({ path: '/' })
- } catch (e) {
- await notificationStore.error({
- text: getErrorMessage(e, 'Failed to remove project')
- })
- waitCursor(false)
- }
- },
- async initUserAccessRequests(payload?: GetUserAccessRequestsPayload) {
- await this.fetchUserAccessRequests({
- params: {
- page: 1,
- per_page: 10,
- order_params: 'expire DESC',
- ...payload?.params
- }
- })
- },
-
- async fetchUserAccessRequests(payload: GetUserAccessRequestsPayload) {
- const notificationStore = useNotificationStore()
-
- try {
- const accessRequestResponse = await ProjectApi.fetchAccessRequests(
- payload.params
- )
- this.setAccessRequests({
- accessRequests: accessRequestResponse.data?.items,
- count: accessRequestResponse.data?.count
- })
- } catch {
- await notificationStore.error({
- text: 'Failed to fetch project access requests'
- })
- }
- },
-
- async initNamespaceAccessRequests(
- payload: GetNamespaceAccessRequestsPayload
- ) {
- await this.fetchNamespaceAccessRequests({
- ...payload,
- params: {
- page: 1,
- per_page: 10,
- order_params: 'expire DESC',
- ...payload.params
- }
- })
- },
-
- async fetchNamespaceAccessRequests(
- payload: GetNamespaceAccessRequestsPayload
- ) {
- const notificationStore = useNotificationStore()
-
- try {
- const accessRequestResponse =
- await ProjectApi.fetchNamespaceAccessRequests(
- payload.namespace,
- payload.params
- )
- this.setAccessRequests({
- accessRequests: accessRequestResponse.data?.items,
- count: accessRequestResponse.data?.count
- })
- } catch {
- await notificationStore.error({
- text: 'Failed to fetch project access requests'
- })
- }
- },
-
- async getProjectAccessRequests(payload: GetProjectAccessRequestsPayload) {
- if (payload.namespace) {
- await this.fetchNamespaceAccessRequests({
- namespace: payload.namespace,
- ...payload
- })
- } else {
- await this.fetchUserAccessRequests(payload)
- }
- },
-
- async cancelProjectAccessRequest(
- payload: CancelProjectAccessRequestPayload
- ) {
- const notificationStore = useNotificationStore()
-
- waitCursor(true)
- try {
- await ProjectApi.cancelProjectAccessRequest(payload.itemId, true)
- } catch (err) {
- await notificationStore.error({
- text: getErrorMessage(err, 'Failed to cancel access request')
- })
- } finally {
- waitCursor(false)
- }
- },
-
- async acceptProjectAccessRequest(
- payload: AcceptProjectAccessRequestPayload
- ) {
- waitCursor(true)
- try {
- await ProjectApi.acceptProjectAccessRequest(
- payload.itemId,
- payload.data,
- true
- )
- } finally {
- waitCursor(false)
- }
- },
-
- async cloneProject(payload) {
- const { namespace, project, data, cbSuccess } = payload
- try {
- waitCursor(true)
- await ProjectApi.cloneProject(namespace, project, data)
- waitCursor(false)
- cbSuccess()
- this.setProject({ project: null })
- await getActivePinia().router.push({
- name: 'project',
- params: {
- namespace: data.namespace,
- projectName: data.project
- }
- })
- } catch (err) {
- waitCursor(false)
- throw err
- }
- },
-
- async fetchProject(payload: ProjectParams) {
- const notificationStore = useNotificationStore()
-
- try {
- const projectResponse = await ProjectApi.fetchProject(
- payload.namespace,
- payload.projectName
- )
- this.setProject({ project: projectResponse.data })
- } catch (e) {
- console.warn('Failed to load project data', e)
- await notificationStore.error({ text: 'Failed to load project data' })
- }
- },
-
- async unsubscribeProject(payload) {
- const notificationStore = useNotificationStore()
-
- try {
- waitCursor(true)
- await ProjectApi.unsubscribeProject(payload.id)
- this.setProject({ project: null })
- waitCursor(false)
- } catch (err) {
- await notificationStore.error({
- text: getErrorMessage(err, 'Failed to unsubscribe from project')
- })
- waitCursor(false)
- }
- },
-
- async fetchProjectDetail(payload) {
- const notificationStore = useNotificationStore()
-
- const { callbackStatus, namespace, projectName, isLoggedUser } = payload
- try {
- const projectResponse = await ProjectApi.fetchProject(
- payload.namespace,
- payload.projectName
- )
- this.setProject({ project: projectResponse.data })
- } catch (e) {
- callbackStatus(e.response.status)
-
- if (e.response.status !== 404 && e.response.status !== 403) {
- notificationStore.error({
- text: 'Failed to load project data'
- })
- } else if (e.response.status === 403 && !isLoggedUser) {
- await getActivePinia().router.push(
- `/login?redirect=/projects/${namespace}/${projectName}`
- )
- } else if (e.response.status === 403) {
- ProjectApi.fetchAccessRequests({
- page: 1,
- per_page: 1,
- project_name: payload.projectName
- })
- .then((resp) => {
- if (resp.data.count) {
- callbackStatus(409)
- }
- })
- .catch(() => {
- notificationStore.error({
- text: 'Failed to load project access requests data'
- })
- })
- }
- }
- },
-
- async fetchProjectVersions(payload: FetchProjectVersionsPayload) {
- const notificationStore = useNotificationStore()
-
- try {
- this.projectVersionsLoading(true)
- const response = await ProjectApi.fetchProjectVersions(
- payload.namespace,
- payload.projectName,
- payload.params
- )
- this.setProjectVersions({
- versions: response.data?.versions,
- count: response.data?.count
- })
- } catch (e) {
- await notificationStore.error({
- text: 'Failed to fetch project versions'
- })
- } finally {
- this.projectVersionsLoading(false)
- }
- },
-
- async saveProjectSettings(payload): Promise> {
- const { namespace, newSettings, projectName } = payload
-
- try {
- waitCursor(true)
- const saveProjectSettingsResponse =
- await ProjectApi.saveProjectSettings(
- namespace,
- projectName,
- newSettings,
- true
- )
- this.setProject({ project: saveProjectSettingsResponse.data })
- waitCursor(false)
- return saveProjectSettingsResponse
- } finally {
- waitCursor(false)
- }
- },
-
- async pushProjectChunks(payload) {
- const pushProjectChunksResponse = await ProjectApi.pushProjectChunks(
- payload.transaction,
- payload.chunk,
- payload.token,
- payload.data,
- true
- )
- this.chunkUploaded({ project: payload.projectPath })
- return pushProjectChunksResponse
- },
-
- async pushFinishTransaction(payload) {
- const notificationStore = useNotificationStore()
- const userStore = useUserStore()
-
- const { projectPath, token, transaction } = payload
- try {
- const pushFinishTransactionResponse =
- await ProjectApi.pushFinishTransaction(transaction, token, true)
- this.discardUpload({ projectPath })
- notificationStore.show({
- text: `Upload finished: ${projectPath}`
- })
- this.setProject({ project: pushFinishTransactionResponse.data })
- await userStore.fetchUserProfile()
- waitCursor(false)
- } catch (err) {
- this.pushCancelTransaction({ err, transaction })
- }
- },
-
- async pushProjectChanges(payload) {
- const notificationStore = useNotificationStore()
-
- const { data, projectPath } = payload
- try {
- return await ProjectApi.pushProjectChanges(projectPath, data)
- } catch (err) {
- await notificationStore.error({ text: getErrorMessage(err, 'Error') })
- return undefined
- }
- },
-
- async pushCancelTransaction(payload) {
- const notificationStore = useNotificationStore()
-
- const { err, transaction } = payload
- this.cancelUpload()
- const msg = err.__CANCEL__
- ? err.message
- : (err.response && err.response.data?.detail) || 'Error'
- notificationStore.error({ text: msg })
- await ProjectApi.pushCancelTransaction(transaction)
- waitCursor(false)
- },
-
- async downloadArchive(payload: DownloadPayload) {
- const notificationStore = useNotificationStore()
-
- try {
- const resp = await ProjectApi.downloadFile(payload.url)
- const fileName =
- resp.headers['content-disposition'].split('filename=')[1]
- FileSaver.saveAs(resp.data, fileName)
- } catch (e) {
- // parse error details from blob
- let resp
- const blob = new Blob([e.response.data], { type: 'text/plain' })
- blob.text().then((text) => {
- resp = JSON.parse(text)
- notificationStore.error({ text: resp.detail })
- })
- }
- },
-
- constructDownloadProjectUrl(payload: {
- namespace: string
- projectName: string
- }) {
- return ProjectApi.constructDownloadProjectUrl(
- payload.namespace,
- payload.projectName
- )
- }
- }
-})
diff --git a/web-app/packages/lib-vue2/src/modules/project/types.ts b/web-app/packages/lib-vue2/src/modules/project/types.ts
deleted file mode 100644
index cdb22a7e..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/types.ts
+++ /dev/null
@@ -1,313 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-/* eslint-disable camelcase */
-import {
- ProjectRoleName,
- ProjectPermissionName
-} from '@/common/permission_utils'
-import {
- PaginatedRequestParamsApi,
- PaginatedResponse,
- PaginatedResponseDefaults
-} from '@/common/types'
-import { UserSearch } from '@/modules/user/types'
-
-export interface ProjectGridState {
- searchFilterByProjectName: string
- searchFilterByNamespace: string
- namespace: string
- searchFilterByDay: number
-}
-
-export interface PaginatedProjectsParams extends PaginatedRequestParamsApi {
- namespace?: string
- only_namespace?: string
- name?: string
- user?: string
- last_updated_in?: number
- flag?: string
- as_admin?: boolean
- public?: boolean
- only_public?: boolean
-}
-
-export interface ProjectItemPermissions {
- delete: boolean
- update: boolean
- upload: boolean
-}
-
-export interface ProjectAccess {
- owners: number[]
- ownersnames: string[]
- public: boolean
- readers: number[]
- readersnames: string[]
- writers: number[]
- writersnames: string[]
-}
-
-export type ProjectTags = 'valid_qgis' | 'mappin_use' | 'input_use'
-
-export interface Project {
- name: string
- created?: string
-}
-
-export interface ProjectListItem extends Project {
- access: ProjectAccess
- creator: number | null
- disk_usage: number
- has_conflict: boolean
- id: string
- name: string
- namespace: string
- permissions: ProjectItemPermissions
- tags: ProjectTags[]
- updated: string
- version: string
-}
-
-export interface FileInfo {
- path: string
- checksum: string
- size: number
- mtime?: string
-}
-
-export interface FileDiff {
- path: string
- checksum: string
- size?: number
-}
-
-export interface UpdateFileInfo extends FileInfo, FileDiff {
- // specified size again with required modifier
- size: number
-}
-
-export interface UploadFileInfo extends FileInfo {
- chunks: string[]
-}
-
-export type FileChangeType = 'added' | 'updated' | 'removed'
-
-export interface FileInfoHistory extends UpdateFileInfo {
- change: FileChangeType
- expiration?: string
-}
-
-export interface HistoryFileInfo {
- path?: string
- checksum?: string
- size?: number
- mtime?: string
- diff?: FileDiff
- history?: FileInfoHistory
-}
-
-export interface ProjectListItemFiles extends FileInfo, HistoryFileInfo {
- // specified size again with required modifier
- path: string
- checksum: string
- size: number
-}
-
-export interface ProjectDetail extends ProjectListItem {
- role: ProjectRoleName
- files?: ProjectListItemFiles[]
-}
-
-export interface PaginatedProjectsResponse extends PaginatedResponseDefaults {
- projects: ProjectListItem[]
-}
-
-export interface PaginatedProjectsPayload {
- params: PaginatedProjectsParams
-}
-
-export interface ProjectsPayload extends PaginatedResponseDefaults {
- projects: ProjectListItem[]
-}
-
-export interface CloneProjectParams {
- project: string
- namespace: string
- merginComponentUuid: string
-}
-
-export interface ProjectParams {
- projectName: string
- namespace: string
-}
-
-export interface ProjectAccessRequest {
- expire: string
- id: number
- namespace: string
- project?: string
- project_name: string
- requested_by: string
- user: UserSearch
-}
-
-export type ProjectAccessRequestResponse =
- PaginatedResponse
-
-export interface ProjectAccessRequestParams extends PaginatedRequestParamsApi {
- project_name?: string
-}
-
-export interface AccessRequestsPayload extends PaginatedResponseDefaults {
- accessRequests: ProjectAccessRequest[]
-}
-
-export interface GetUserAccessRequestsPayload {
- params: ProjectAccessRequestParams
-}
-
-export interface GetNamespaceAccessRequestsPayload {
- namespace: string
- params: ProjectAccessRequestParams
-}
-
-export interface AcceptProjectAccessRequestData {
- permissions: ProjectPermissionName
-}
-
-export interface GetProjectAccessRequestsPayload
- extends GetUserAccessRequestsPayload {
- namespace?: string
-}
-
-export interface AcceptProjectAccessRequestPayload {
- itemId: number
- data: AcceptProjectAccessRequestData
- namespace?: string
-}
-
-export interface CancelProjectAccessRequestPayload {
- itemId: number
- namespace: string
-}
-
-export interface CreateProjectParams {
- name: string
- public?: boolean
- template?: string
-}
-
-export interface AccessUpdate {
- ownersnames: string[]
- writersnames: string[]
- readersnames: string[]
- public: boolean
-}
-
-export interface SaveProjectSettings {
- access: AccessUpdate
-}
-
-export interface FetchProjectVersionsParams {
- page: number
- per_page: number
- descending: boolean
-}
-
-export interface ChangesetError {
- size?: number
- error?: string
-}
-
-export interface ChangesetSuccessSummaryItem {
- table?: string
- insert?: number
- update?: number
- delete?: number
-}
-
-export interface ChangesetSuccess {
- size?: number
- summary?: ChangesetSuccessSummaryItem[]
-}
-
-export interface ProjectVersion {
- name: string
- author: string
- created: string
- changes: {
- added: FileInfo[]
- removed: FileInfo[]
- updated: FileInfo[]
- }
- project_name: string
- namespace: string
- user_agent: string
- changesets: ChangesetSuccess | ChangesetError
-}
-
-export interface PaginatedProjectVersionsResponse
- extends PaginatedResponseDefaults {
- versions: ProjectVersion[]
-}
-
-export interface PushProjectChangesParams {
- version: string
- changes: {
- added: UploadFileInfo[]
- removed: FileInfo[]
- updated: UpdateFileInfo[]
- }
-}
-
-export type PushProjectChangesResponse =
- | ProjectDetail
- | {
- transaction: string
- }
-
-export interface ProjectTemplate {
- id: string
- name: string
- namespace: string
- version: string
-}
-
-export type EnhancedProjectDetail = ProjectDetail & {
- files: Record
- path: string
-}
-
-export interface UpdateProjectAccessParams {
- user_id: number
- role: ProjectRoleName
-}
-
-export interface DownloadPayload {
- url: string
-}
-
-export interface FetchProjectVersionsPayload extends ProjectParams {
- params: FetchProjectVersionsParams
-}
-
-export interface ProjectVersionsPayload extends PaginatedResponseDefaults {
- versions: ProjectVersion[]
-}
-
-export interface ProjectVersionsItem extends ProjectVersion {
- disabled: boolean
-}
-
-export interface TableDataHeader {
- text: string
- value: string
- sortable?: boolean
- width?: number
-}
-
-export interface DeleteProjectPayload {
- projectId: string
-}
diff --git a/web-app/packages/lib-vue2/src/modules/project/views/FileBrowserView.vue b/web-app/packages/lib-vue2/src/modules/project/views/FileBrowserView.vue
deleted file mode 100644
index d42be5aa..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/views/FileBrowserView.vue
+++ /dev/null
@@ -1,471 +0,0 @@
-
-
-
-
-
-
-
-
-
- This is public project
- Hide this project from everyone. - - - This is private project
- Make this project visible to anyone. - -
-
-
- Make private
- Make public
-
-
-
-
-
-
- Delete project
- All data will be lost -
-
-
- Delete
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/views/ProjectVersionsView.vue b/web-app/packages/lib-vue2/src/modules/project/views/ProjectVersionsView.vue
deleted file mode 100644
index f9e37fcd..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/views/ProjectVersionsView.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Files
-
- History
-
- Settings
-
-
-
-
-
-
-
- Request access
-
-
- This is a private project
- You don't have permissions to access this project. - -
-
-
-
- Project not found
- Please check if address is written correctly - -
-
-
- You don't have permission to access this project
- You already requested access - -
-
-
-
- publish Drag & drop here or click and select
- file(s) to upload
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/views/ProjectsListViewTemplate.vue b/web-app/packages/lib-vue2/src/modules/project/views/ProjectsListViewTemplate.vue
deleted file mode 100644
index 5a9ab6c8..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/views/ProjectsListViewTemplate.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
-
-
-
-
- {{ header }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- Namespace not found
- Please check if address is written correctly - -
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/views/VersionDetailView.vue b/web-app/packages/lib-vue2/src/modules/project/views/VersionDetailView.vue
deleted file mode 100644
index af6dffc3..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/views/VersionDetailView.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
-
-
-
- Change password
-
-
-
-
-
-
- info
-
-
-
-
-
-
-
- Close
-
-
- Change
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/user/components/EditProfileForm.vue b/web-app/packages/lib-vue2/src/modules/user/components/EditProfileForm.vue
deleted file mode 100644
index efd4f756..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/components/EditProfileForm.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
- Edit profile
-
-
-
-
-
- Close
-
-
- Save
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/user/components/ProfileAccessRequestsRow.vue b/web-app/packages/lib-vue2/src/modules/user/components/ProfileAccessRequestsRow.vue
deleted file mode 100644
index 02996a23..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/components/ProfileAccessRequestsRow.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/user/components/UserSearchChip.vue b/web-app/packages/lib-vue2/src/modules/user/components/UserSearchChip.vue
deleted file mode 100644
index 76f18752..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/components/UserSearchChip.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
- {{ item.isInvite ? item.email : item.username }}
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/user/components/index.ts b/web-app/packages/lib-vue2/src/modules/user/components/index.ts
deleted file mode 100644
index 559770ae..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/components/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as ChangePasswordForm } from './ChangePasswordForm.vue'
-export { default as EditProfileForm } from './EditProfileForm.vue'
-export { default as ProfileAccessRequestsRow } from './ProfileAccessRequestsRow.vue'
-export { default as UserSearchChip } from './UserSearchChip.vue'
diff --git a/web-app/packages/lib-vue2/src/modules/user/constants.ts b/web-app/packages/lib-vue2/src/modules/user/constants.ts
deleted file mode 100644
index 53100dff..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/constants.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { UserSearchInvite } from './types'
-
-export const EMPTY_INVITE_ITEM: UserSearchInvite = {
- email: null,
- username: null,
- id: null,
- profile: null,
- isInvite: true
-}
diff --git a/web-app/packages/lib-vue2/src/modules/user/index.ts b/web-app/packages/lib-vue2/src/modules/user/index.ts
deleted file mode 100644
index 675147ae..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './components'
-export * from './constants'
-export * from './views'
-export * from './store'
-export * from './userApi'
-export * from './module'
-export * from './types'
diff --git a/web-app/packages/lib-vue2/src/modules/user/module.ts b/web-app/packages/lib-vue2/src/modules/user/module.ts
deleted file mode 100644
index 5c9dd5cb..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import getRoutes from './routes'
-
-import { applyRouteOverride } from '@/common/module_utils'
-import { Module } from '@/common/types'
-
-export const UserModule: Module = {
- name: 'userModule',
- routerService: undefined,
- httpService: undefined,
- _addRoutes: (router, routeOverrides) => {
- // add routes to router
- getRoutes().forEach((route) => {
- router.addRoute(applyRouteOverride(route, routeOverrides))
- })
- },
- init: (services, routeOverrides) => {
- if (services.httpService) {
- UserModule.httpService = services.httpService
- } else {
- console.error(`Module ${UserModule.name} - missing httpService`)
- }
-
- if (services.routerService) {
- UserModule.routerService = services.routerService
- UserModule._addRoutes(services.routerService, routeOverrides)
- }
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/user/routes.ts b/web-app/packages/lib-vue2/src/modules/user/routes.ts
deleted file mode 100644
index fe1b0f55..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/routes.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { RouteRecord } from 'vue-router'
-
-export default (): RouteRecord[] => []
diff --git a/web-app/packages/lib-vue2/src/modules/user/store.ts b/web-app/packages/lib-vue2/src/modules/user/store.ts
deleted file mode 100644
index 2107b6ca..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/store.ts
+++ /dev/null
@@ -1,586 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import isObject from 'lodash/isObject'
-import { defineStore, getActivePinia } from 'pinia'
-import Cookies from 'universal-cookie'
-// import { isNavigationFailure, NavigationFailureType } from 'vue-router'
-import Vue from 'vue'
-
-import { getErrorMessage } from '@/common/error_utils'
-import { waitCursor } from '@/common/html_utils'
-import { isAtLeastRole, UserRole } from '@/common/permission_utils'
-import { useDialogStore } from '@/modules/dialog/store'
-import { useFormStore } from '@/modules/form/store'
-import { useInstanceStore } from '@/modules/instance/store'
-import { useNotificationStore } from '@/modules/notification/store'
-import { useProjectStore } from '@/modules/project/store'
-import {
- ResetPasswordPayload,
- ChangePasswordWithTokenPayload,
- ChangePasswordPayload,
- IsWorkspaceAdminPayload,
- LoginPayload,
- UserDetailResponse,
- WorkspaceIdPayload,
- WorkspaceResponse,
- SetWorkspaceIdPayload,
- UserSearchParams
-} from '@/modules/user/types'
-import { UserApi } from '@/modules/user/userApi'
-
-export interface UserState {
- loggedUser?: UserDetailResponse
- workspaces: WorkspaceResponse[]
- workspaceId: number
-}
-
-const cookies = new Cookies()
-const COOKIES_CURRENT_WORKSPACE = 'currentWorkspace'
-
-export const useUserStore = defineStore('userModule', {
- state: (): UserState => ({
- loggedUser: null,
- workspaces: [],
- workspaceId: undefined
- }),
-
- getters: {
- isLoggedIn: (state) => {
- const instanceStore = useInstanceStore()
- return (
- instanceStore.initData?.authenticated ||
- state.loggedUser?.username != null
- )
- },
- isSuperUser() {
- const instanceStore = useInstanceStore()
- return this.isLoggedIn && instanceStore.initData?.superuser
- },
- isGlobalWorkspaceAdmin() {
- return isAtLeastRole(this.getPreferredWorkspace?.role, UserRole.admin)
- },
- getPreferredWorkspace: (state) => {
- return (
- state.loggedUser?.workspaces &&
- state.loggedUser?.workspaces.find(
- (workspace) => workspace.id === state.loggedUser.preferred_workspace
- )
- )
- },
- getUserFullName: (state) => {
- return state.loggedUser?.name && state.loggedUser?.name !== ''
- ? state.loggedUser.name
- : state.loggedUser?.username
- ? state.loggedUser.username
- : ''
- },
- isWorkspaceAdmin() {
- return (payload?: IsWorkspaceAdminPayload): boolean => {
- const workspace = payload?.id
- ? this.getWorkspaceById({ id: payload.id })
- : this.currentWorkspace
- return isAtLeastRole(workspace?.role, UserRole.admin)
- }
- },
- isWorkspaceOwner() {
- return (payload?: IsWorkspaceAdminPayload): boolean => {
- const workspace = payload?.id
- ? this.getWorkspaceById({ id: payload.id })
- : this.currentWorkspace
- return isAtLeastRole(workspace?.role, UserRole.owner)
- }
- },
- currentWorkspace: (state) => {
- return state.workspaces.find(
- (workspace) => workspace.id === state.workspaceId
- )
- },
- getWorkspaceById(state) {
- return (payload: WorkspaceIdPayload) => {
- return state.workspaces.find((workspace) => workspace.id === payload.id)
- }
- },
- getWorkspaceByName(state) {
- return (payload) => {
- return state.workspaces.find(
- (workspace) => workspace.name === payload.name
- )
- }
- },
- isWorkspaceUser: (state) => {
- return (payload: WorkspaceIdPayload) => {
- return state.workspaces.some((workspace) => workspace.id === payload.id)
- }
- }
- },
-
- actions: {
- updateLoggedUser(payload) {
- this.loggedUser = payload.loggedUser
- },
-
- updateVerifiedEmail(payload) {
- Vue.set(this.loggedUser, 'verified_email', payload.verifiedEmail)
- },
-
- setWorkspaces(payload) {
- this.workspaces = payload.workspaces
- },
-
- setWorkspaceId(payload) {
- this.workspaceId = payload.id
- },
-
- async editUserProfile(payload) {
- const dialogStore = useDialogStore()
- const notificationStore = useNotificationStore()
- const formStore = useFormStore()
-
- waitCursor(true)
- try {
- await UserApi.editUserProfile(payload.editedUser, true)
- dialogStore.close()
- this.updateLoggedUser({
- loggedUser: payload.editedUser
- })
- await this.fetchUserProfile()
- await notificationStore.show({ text: 'Profile has been changed' })
- } catch (error) {
- await formStore.handleError({
- componentId: payload.componentId,
- error,
- generalMessage: 'Failed to change profile'
- })
- } finally {
- waitCursor(false)
- }
- },
-
- async fetchUserProfile() {
- const projectStore = useProjectStore()
- const notificationStore = useNotificationStore()
-
- let resp
- try {
- resp = await UserApi.fetchUserProfile()
- this.updateLoggedUser({ loggedUser: resp.data })
- this.updateVerifiedEmail({
- verifiedEmail: resp.data.verified_email
- })
- if (!projectStore.currentNamespace) {
- // set current namespace only if not set
- const preferredWorkspace = this.getPreferredWorkspace
- if (preferredWorkspace?.name) {
- projectStore.setCurrentNamespace({
- currentNamespace: preferredWorkspace.name
- })
- }
- }
- } catch {
- await notificationStore.error({
- text: "Failed to fetch user's profile"
- })
- }
- return resp?.data
- },
-
- async closeUserProfile() {
- const notificationStore = useNotificationStore()
-
- waitCursor(true)
- try {
- await UserApi.closeUserProfile(true)
- this.updateLoggedUser({
- loggedUser: null
- })
- // taken from logout action, router would return error because user is considered as logged in
- location.href = '/'
- } catch (err) {
- await notificationStore.error({
- text: getErrorMessage(err, 'Unable to close account')
- })
- } finally {
- waitCursor(false)
- }
- },
-
- async redirectAfterLogin(payload) {
- const notificationStore = useNotificationStore()
-
- try {
- getActivePinia()
- .router.push(payload.currentRoute.query.redirect)
- // TODO: V3_UPGRADE - probably not needed anymore in vue-router v4 - check needed
- .catch((e) => {
- // if (!isNavigationFailure(e, NavigationFailureType.redirected)) {
- Promise.reject(e)
- // }
- })
- } catch (e) {
- // TODO: V3_UPGRADE - probably not needed anymore in vue-router v4 - check needed
- // if (isNavigationFailure(e, NavigationFailureType.redirected)) {
- // // expected redirect
- // // https://router.vuejs.org/guide/advanced/navigation-failures.html#detecting-navigation-failures
- // } else {
- await notificationStore.error({
- text: e
- })
- // }
- }
- },
-
- async redirectFromLoginAfterLogin(payload) {
- if (payload.currentRoute.path === '/login') {
- getActivePinia()
- .router.push({ path: '/' })
- .catch((e) => {
- // TODO: V3_UPGRADE - probably not needed anymore in vue-router v4 - check needed
- // if (!isNavigationFailure(e, NavigationFailureType.redirected)) {
- Promise.reject(e)
- // }
- })
- }
- },
-
- async userLogin(payload: LoginPayload) {
- const instanceStore = useInstanceStore()
- const formStore = useFormStore()
-
- try {
- await UserApi.login(payload.data)
- await instanceStore.initApp()
- } catch (error) {
- await formStore.handleError({
- componentId: payload.componentId,
- error,
- generalMessage: 'Failed to login'
- })
- }
- },
-
- async resetPassword(payload: ResetPasswordPayload) {
- const notificationStore = useNotificationStore()
- const formStore = useFormStore()
-
- try {
- await UserApi.resetPassword({ email: payload.email })
- await getActivePinia().router.push({ path: '/login' })
- await notificationStore.show({
- text: 'Email with password reset link was sent to your email address',
- timeout: 3000
- })
- } catch (error) {
- await formStore.handleError({
- componentId: payload.componentId,
- error,
- generalMessage: 'Failed to send confirmation email'
- })
- }
- },
-
- async changePasswordWithToken(payload: ChangePasswordWithTokenPayload) {
- const formStore = useFormStore()
-
- waitCursor(true)
- try {
- await UserApi.changePasswordWithToken(payload.token, payload.data, true)
- // callback - set => this.success = true
- payload.callback(true)
- waitCursor(false)
- } catch (e) {
- waitCursor(false)
- // callback - set => this.success = false
- payload.callback(false)
- await formStore.handleError({
- componentId: payload.componentId,
- error: e,
- generalMessage: 'Failed to change password'
- })
- }
- },
-
- async resendConfirmationEmail(payload) {
- const notificationStore = useNotificationStore()
-
- try {
- await UserApi.resendEmail()
- await notificationStore.show({
- text: `Email was sent to address: ${payload.email}`
- })
- } catch (err) {
- await notificationStore.error({
- text: 'Failed to send confirmation email, please check your address in user profile settings'
- })
- }
- },
-
- async changePassword(payload: ChangePasswordPayload) {
- const notificationStore = useNotificationStore()
- const formStore = useFormStore()
- const dialogStore = useDialogStore()
-
- waitCursor(true)
- try {
- await UserApi.changePassword(payload.data, true)
- dialogStore.close()
- await notificationStore.show({ text: 'Password has been changed' })
- } catch (error) {
- await formStore.handleError({
- componentId: payload.componentId,
- error,
- generalMessage: 'Failed to change password'
- })
- } finally {
- waitCursor(false)
- }
- },
-
- clearUserData() {
- const projectStore = useProjectStore()
-
- projectStore.clearProjects()
- this.updateLoggedUser({ loggedUser: null })
- },
-
- async getWorkspace(payload) {
- const notificationStore = useNotificationStore()
-
- let newWorkspace
- try {
- const workspaceResponse = await UserApi.getWorkspaceById(payload.id)
- newWorkspace = workspaceResponse.data
- this.setWorkspaceId({ id: payload.id })
- await this.updateWorkspacesWithWorkspaceChange({
- workspace: newWorkspace
- })
- } catch (_err) {
- await notificationStore.error({
- text: 'Failed to load workspace'
- })
- }
- return newWorkspace
- },
-
- async getWorkspaces() {
- const notificationStore = useNotificationStore()
-
- let workspacesResponse
- try {
- workspacesResponse = await UserApi.getWorkspaces()
- this.setWorkspaces({ workspaces: workspacesResponse.data })
- } catch (_err) {
- await notificationStore.error({
- text: 'Failed to load workspaces'
- })
- }
- return workspacesResponse
- },
-
- async updateWorkspacesWithWorkspaceChange(payload) {
- // update this.workspaces
- if (this.workspaces) {
- const idx = this.workspaces.findIndex(
- (workspace) => workspace.id === payload.workspace.id
- )
- if (idx !== -1) {
- this.setWorkspaces({
- workspaces: [
- ...this.workspaces.slice(0, idx),
- payload.workspace,
- ...this.workspaces.slice(idx + 1)
- ]
- })
- }
- }
- },
-
- async getPreferredWorkspaceId() {
- let preferredWorkspaceId
- try {
- const userProfileResponse = await this.fetchUserProfile()
- preferredWorkspaceId = userProfileResponse.preferred_workspace
- } catch (err) {
- console.warn('Failed to get preferred workspace id', err)
- }
- return preferredWorkspaceId
- },
-
- async setWorkspace(payload: SetWorkspaceIdPayload) {
- const projectStore = useProjectStore()
-
- if (this.workspaceId === payload.workspaceId) {
- return
- }
- // 'setWorkspaceId' and 'projectModule/setCurrentNamespace' has to be called together synchronously.
- // In case when there is some async call between their calls, the watchers can be updated incorrectly
- this.setWorkspaceId({ id: payload.workspaceId })
- if (this.currentWorkspace) {
- projectStore.setCurrentNamespace({
- currentNamespace: this.currentWorkspace.name
- })
- }
- if (!payload.skipSavingInCookies) {
- return await this.setUserWorkspaceToCookies({
- id: payload.workspaceId
- })
- }
- },
-
- async getAllUserWorkspacesFromCookies() {
- let value: Record
- try {
- const cookieValue = cookies.get(COOKIES_CURRENT_WORKSPACE, {
- doNotParse: true
- })
- if (cookieValue) {
- const parsedValue = JSON.parse(cookieValue)
- if (isObject(parsedValue)) {
- value = parsedValue
- } else {
- console.warn(
- `Stored cookies (${COOKIES_CURRENT_WORKSPACE}) value is not an object, removing it.`
- )
- // stored cookies value has deprecated format
- cookies.remove(COOKIES_CURRENT_WORKSPACE)
- }
- }
- } catch (e) {
- console.warn(
- `Stored cookies (${COOKIES_CURRENT_WORKSPACE}) value is malformed, removing it.`,
- e
- )
- // stored cookies value is malformed, remove it
- cookies.remove(COOKIES_CURRENT_WORKSPACE)
- }
- return value
- },
-
- async getUserWorkspaceFromCookies() {
- let userWorkspaceId: string
- if (this.loggedUser?.username) {
- try {
- const value = await this.getAllUserWorkspacesFromCookies()
- if (value) {
- userWorkspaceId = value[this.loggedUser?.username]
- }
- } catch {
- // ignore
- }
- }
- return userWorkspaceId
- },
-
- async removeUserWorkspaceFromCookies() {
- const projectStore = useProjectStore()
-
- if (this.loggedUser?.username) {
- let value: Record
- try {
- value = await this.getAllUserWorkspacesFromCookies()
- } catch {
- // ignore
- }
-
- if (value) {
- delete value[this.loggedUser?.username]
- const strValue = JSON.stringify(value)
-
- const expires = new Date()
- // cookies expire in one year
- expires.setFullYear(expires.getFullYear() + 1)
- cookies.set(COOKIES_CURRENT_WORKSPACE, strValue, {
- expires
- })
- }
- }
- await projectStore.setCurrentNamespace({
- currentNamespace: ''
- })
- },
-
- async setUserWorkspaceToCookies(payload) {
- if (this.loggedUser?.username) {
- let oldValue: Record
- try {
- oldValue = await this.getAllUserWorkspacesFromCookies()
- } catch {
- // ignore
- }
-
- const value = JSON.stringify({
- ...oldValue,
- [this.loggedUser?.username]: payload.id
- })
- const expires = new Date()
- // cookies expire in one year
- expires.setFullYear(expires.getFullYear() + 1)
- cookies.set(COOKIES_CURRENT_WORKSPACE, value, {
- expires
- })
- }
- },
-
- async setFirstWorkspace() {
- if (this.workspaces.length > 0) {
- await this.setWorkspace({
- workspaceId: this.workspaces[0].id
- })
- }
- },
-
- async checkCurrentWorkspace() {
- try {
- await this.getWorkspaces()
- const currentWorkspaceFromCookie =
- await this.getUserWorkspaceFromCookies()
- if (this.workspaces.length > 0) {
- let foundWorkspace
- let skipSavingInCookies = true
- if (currentWorkspaceFromCookie !== undefined) {
- // try to use workspace stored in cookies
- foundWorkspace = this.getWorkspaceById({
- id: parseInt(currentWorkspaceFromCookie)
- })
- }
- if (!foundWorkspace) {
- // try to use preferred_workspace from user profile response
- const preferredWorkspaceId = await this.getPreferredWorkspaceId()
- if (preferredWorkspaceId) {
- foundWorkspace = this.getWorkspaceById({
- id: preferredWorkspaceId
- })
- if (foundWorkspace?.id) {
- // do not skip saving in cookies when using preferredWorkspace
- skipSavingInCookies = false
- }
- }
- }
- // use id from found workspace, if not found fallback to first workspace from user workspaces
- const currentWorkspaceIdToSet =
- foundWorkspace?.id ?? this.workspaces[0].id
- await this.setWorkspace({
- workspaceId: currentWorkspaceIdToSet,
- // do not save workspaceId to cookies as it could be:
- // * already there, if was loaded from cookies
- // * used the first user workspace as fallback, then it is not a user choice
- skipSavingInCookies
- })
- } else {
- await this.removeUserWorkspaceFromCookies()
- }
- } catch (e) {
- console.warn('Loading of stored user workspace id has failed.', e)
- }
- },
-
- async logout() {
- await UserApi.logout()
- },
-
- async getAuthUserSearch(payload: UserSearchParams) {
- return await UserApi.getAuthUserSearch(payload)
- }
- }
-})
diff --git a/web-app/packages/lib-vue2/src/modules/user/types.ts b/web-app/packages/lib-vue2/src/modules/user/types.ts
deleted file mode 100644
index e43722ee..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/types.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { Route } from 'vue-router'
-
-import { PaginatedRequestParams } from '@/common'
-import { UserRoleName } from '@/common/permission_utils'
-import { MerginComponentUuidPayload } from '@/modules/form/types'
-
-export interface LoginData {
- login: string
- password: string
-}
-
-export interface LoginPayload extends MerginComponentUuidPayload {
- data: LoginData
- currentRoute: Route
-}
-
-export interface ResetPasswordPayload extends MerginComponentUuidPayload {
- email: string
-}
-
-export interface ResetPasswordData {
- email: string
-}
-
-/* eslint-disable camelcase */
-export interface UserProfileResponse {
- disk_usage: number
- first_name: string
- has_project: boolean
- last_name: string
- name: string
- receive_notifications: boolean
- registration_date: string
- storage: number
-}
-
-export interface UserResponse {
- active: boolean
- email: string
- id: number
- is_admin: boolean
- profile: UserProfileResponse
- username: string
- verified_email: boolean
-}
-
-export interface UserWorkspace {
- id: number
- name: string
- role: UserRoleName
-}
-
-export interface UserDetailResponse extends UserProfileResponse {
- id: number
- username: string
- email: string
- verified_email: boolean
- first_name: string
- last_name: string
- name: string
- preferred_workspace: number
- receive_notifications: boolean
- registration_date: string
- workspaces: UserWorkspace[]
-}
-
-export interface WorkspaceResponse extends UserWorkspace {
- description: string
- project_count: number
- disk_usage: number
- storage: number
-}
-
-export interface UserSearchParams {
- id?: string
- names?: string
- like?: string
- namespace: string
-}
-
-export interface UserSearch {
- id: number
- profile: {
- first_name: string
- last_name: string
- }
- username: string
- email: string
- permission?: string
-}
-
-export interface UserSearchInvite extends UserSearch {
- isInvite: boolean
-}
-
-export interface ChangePasswordWithTokenParams {
- password: string
- confirm: string
-}
-
-export interface ChangePasswordWithTokenPayload
- extends MerginComponentUuidPayload {
- data: ChangePasswordWithTokenParams
- token: string
- callback: (value: boolean) => void
-}
-
-export interface EditUserProfileParams {
- receive_notifications: boolean
- first_name: string
- last_name: string
- email: string
-}
-
-export interface ChangePasswordParams {
- old_password: string
- password: string
- confirm: string
-}
-
-export interface ChangePasswordPayload extends MerginComponentUuidPayload {
- data: ChangePasswordParams
-}
-
-export interface PaginatedUsersParams extends PaginatedRequestParams {
- like?: string
-}
-
-export interface WorkspaceIdPayload {
- id: number
-}
-
-export interface IsWorkspaceAdminPayload {
- id: number
-}
-
-export interface SetWorkspaceIdPayload {
- workspaceId: number
- skipSavingInCookies?: boolean
-}
-
-/* eslint-enable camelcase */
diff --git a/web-app/packages/lib-vue2/src/modules/user/userApi.ts b/web-app/packages/lib-vue2/src/modules/user/userApi.ts
deleted file mode 100644
index 1ecab091..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/userApi.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { AxiosResponse } from 'axios'
-
-import { getDefaultRetryOptions } from '@/common/http'
-import { UserModule } from '@/modules/user/module'
-import {
- WorkspaceResponse,
- ChangePasswordWithTokenParams,
- LoginData,
- UserResponse,
- ResetPasswordData,
- UserDetailResponse,
- UserSearch,
- UserSearchParams,
- EditUserProfileParams,
- ChangePasswordParams
-} from '@/modules/user/types'
-
-export const UserApi = {
- getAuthUserSearch: (
- params: UserSearchParams
- ): Promise> => {
- return UserModule.httpService.get('/app/auth/user/search', { params })
- },
-
- editUserProfile: (
- data: EditUserProfileParams,
- withRetry?: boolean
- ): Promise> => {
- return UserModule.httpService.post('/app/auth/user/profile', data, {
- ...(withRetry ? getDefaultRetryOptions() : {})
- })
- },
-
- closeUserProfile: (withRetry?: boolean): Promise> => {
- return UserModule.httpService.delete('/v1/user', {
- ...(withRetry ? getDefaultRetryOptions() : {})
- })
- },
-
- changePasswordWithToken: (
- token: string,
- data: ChangePasswordWithTokenParams,
- withRetry?: boolean
- ): Promise> => {
- return UserModule.httpService.post(
- `/app/auth/reset-password/${token}`,
- data,
- { ...(withRetry ? getDefaultRetryOptions() : {}) }
- )
- },
-
- changePassword: (data: ChangePasswordParams, withRetry?: boolean) => {
- return UserModule.httpService.post('/app/auth/change-password', data, {
- ...(withRetry ? getDefaultRetryOptions() : {})
- })
- },
-
- resetPassword: (data: ResetPasswordData): Promise> => {
- return UserModule.httpService.post('/app/auth/reset-password', data)
- },
-
- // TODO: deprecated?
- confirmEmail: (token: string): Promise> => {
- return UserModule.httpService.post(`/app/auth/confirm-email/${token}`)
- },
-
- resendEmail: (): Promise> => {
- return UserModule.httpService.get('/app/auth/resend-confirm-email')
- },
-
- login: (data: LoginData): Promise> =>
- UserModule.httpService.post('/app/auth/login', data),
-
- logout: (): Promise> =>
- UserModule.httpService.get('/app/auth/logout'),
-
- fetchUserProfile: (): Promise> => {
- return UserModule.httpService.get(`/v1/user/profile`)
- },
-
- async getWorkspaces(): Promise> {
- return UserModule.httpService.get(`/v1/workspaces`)
- },
-
- async getWorkspaceById(
- id: number
- ): Promise> {
- return UserModule.httpService.get(`/v1/workspace/${id}`)
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/user/views/ChangePasswordView.vue b/web-app/packages/lib-vue2/src/modules/user/views/ChangePasswordView.vue
deleted file mode 100644
index c4f0b023..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/views/ChangePasswordView.vue
+++ /dev/null
@@ -1,186 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- info
-
-
-
-
-
-
- Change
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/user/views/LoginViewTemplate.vue b/web-app/packages/lib-vue2/src/modules/user/views/LoginViewTemplate.vue
deleted file mode 100644
index 660fc612..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/views/LoginViewTemplate.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-
-
-
-
-
-
-
-
-
- Reset Password
-
-
-
-
- Sign In
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/user/views/ProfileViewTemplate.vue b/web-app/packages/lib-vue2/src/modules/user/views/ProfileViewTemplate.vue
deleted file mode 100644
index 01f1b7cc..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/views/ProfileViewTemplate.vue
+++ /dev/null
@@ -1,348 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/user/views/VerifyEmailView.vue b/web-app/packages/lib-vue2/src/modules/user/views/VerifyEmailView.vue
deleted file mode 100644
index eb3e566f..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/views/VerifyEmailView.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-Continue
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/user/views/index.ts b/web-app/packages/lib-vue2/src/modules/user/views/index.ts
deleted file mode 100644
index 44df67bf..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/views/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as ChangePasswordView } from './ChangePasswordView.vue'
-export { default as LoginViewTemplate } from './LoginViewTemplate.vue'
-export { default as ProfileViewTemplate } from './ProfileViewTemplate.vue'
-export { default as VerifyEmailView } from './VerifyEmailView.vue'
diff --git a/web-app/packages/lib-vue2/src/sass/dashboard.scss b/web-app/packages/lib-vue2/src/sass/dashboard.scss
deleted file mode 100644
index 24fe71a3..00000000
--- a/web-app/packages/lib-vue2/src/sass/dashboard.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (C) Lutra Consulting Limited
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
- */
-
-.theme--light.v-card.bubble {
- width: 800px;
- background-color: #eaebef;
- padding: 20px 25px 15px 15px;
-}
diff --git a/web-app/packages/lib-vue2/src/sass/overrides.sass b/web-app/packages/lib-vue2/src/sass/overrides.sass
deleted file mode 100644
index b81a50fa..00000000
--- a/web-app/packages/lib-vue2/src/sass/overrides.sass
+++ /dev/null
@@ -1,49 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-// Creative Tim refine style code
-@import ./vuetify-material/sidebar
-@import ./vuetify-material/appbar
-@import ./vuetify-material/buttons
-@import ./vuetify-material/pagination
-@import ./vuetify-material/footer
-@import ./vuetify-material/view
-@import ./vuetify-material/settings
-@import ./vuetify-material/card
-@import ./vuetify-material/table
-@import ./vuetify-material/tab
-@import ./vuetify-material/notification
-@import ./vuetify-material/modal
-@import ./vuetify-material/map
-@import ./vuetify-material/chip
-@import 'variables'
-
-
-//.v-btn.v-size--default,
-//.v-btn.v-size--large
-// &:not(.v-btn--icon):not(.v-btn--fab)
-// padding: 0 30px !important
-
-.theme--light.v-list-item .v-list-item__action-text,
-.theme--light.v-list-item .v-list-item__subtitle
- color: #999
-
-.theme--light.v-text-field > .v-input__control > .v-input__slot:before
- border-color: #d2d2d2
-
-.v-label.v-label,
-.v-alert.v-alert
- font-size: $font-size-root
-
-.theme--light .v-main
- background-color: #eee
diff --git a/web-app/packages/lib-vue2/src/sass/project.scss b/web-app/packages/lib-vue2/src/sass/project.scss
deleted file mode 100644
index 7b804b60..00000000
--- a/web-app/packages/lib-vue2/src/sass/project.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) Lutra Consulting Limited
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
- */
-
-.private-public-btn {
- font-size: 12px;
- padding-left: 20px;
- padding-right: 20px;
- background-color: #f3f5f7;
- color: #2d4470;
- text-transform: none;
- min-width: 116px !important;
- float: right;
- border-color: #e0e0e0;
-
- span {
- font-weight: 700;
- }
-}
-
-.private-public-text {
- font-size: 14px;
- color: black;
-}
-
-.description-text {
- color: #757575;
-}
diff --git a/web-app/packages/lib-vue2/src/sass/variables.scss b/web-app/packages/lib-vue2/src/sass/variables.scss
deleted file mode 100644
index cf4259ea..00000000
--- a/web-app/packages/lib-vue2/src/sass/variables.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) Lutra Consulting Limited
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
- */
-
-$font-size-root: 12px;
-$sheet-border-radius: 4px;
-$list-item-title-font-size: 0.929rem;
-$list-item-dense-title-font-size: 0.929rem;
-$list-item-dense-title-font-weight: initial;
-$fab-icon-sizes: (small: 20);
-$btn-font-sizes: (default: 1rem, large: 1rem);
-$btn-sizes: (default: 41, large: 54);
-$btn-letter-spacing: 0;
-$btn-font-weight: 400;
-$card-text-font-size: 12px;
-
-$headings: (
- //'h1': (
- // 'size': 3.3125rem,
- // 'line-height': 1.15em
- //),
- //'h2': (
- // 'size': 2.25rem,
- // 'line-height': 1.5em
- //),
- //'h3': (
- // 'size': 1.5625rem,
- // 'line-height': 1.4em
- //),
- //'h4': (
- // 'size': 1.125rem,
- // 'line-height': 1.4em
- //),
- //'h5': ( 'size': 1.0625rem ),
- //'h6': ( 'size': .75rem ),
- 'text-subtitle-2': ('size': 1rem),
- 'text-overline': ('letter-spacing': 0)
-);
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_appbar.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_appbar.sass
deleted file mode 100644
index 9d233db5..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_appbar.sass
+++ /dev/null
@@ -1,71 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-#app-bar
- .v-badge__badge
- font-size: 9px
- padding: 5px 6px
-
-// -----------------------
-.v-toolbar__content,
-.v-toolbar__extension
- padding: 0px 15px 0 31px
-
-.v-sheet
- .v-toolbar__content
- .v-btn.v-size--default:not(.v-btn--icon):not(.v-btn--fab),
- .v-btn.v-size--large:not(.v-btn--icon):not(.v-btn--fab)
- margin-bottom: 5px
- padding: 10px 15px !important
-
- .theme--light.v-btn:not(.v-btn--flat):not(.v-btn--text):not(.v-btn--outlined)
- background-color: #fff
-
- .v-icon
- color: #999
-
-.theme--light.v-btn:not(.v-btn--flat):not(.v-btn--text):not(.v-btn--outlined)
- background-color: #fff
- margin-right: 17px
- margin-bottom: 2px
-
-.theme--light.v-btn:not(.v-btn--flat):not(.v-btn--text):not(.v-btn--outlined):hover
- background-color: #fff
-
-.v-toolbar__content
- height: 75px
-
-.v-toolbar__content .v-btn--flat
- .v-icon
- margin-right: 3px
-
-.theme--light.v-label
- color: rgba(0, 0, 0, 0.3)
-
-.v-menu__content .v-list--nav
- padding: .3125rem 0
- border-radius: 4px
-
- .v-list-item
- padding: 10px 20px
- margin: 0 .3125rem
- margin-bottom: 0px !important
- min-height: 40px
- border-radius: 2px
-
- .v-list-item__title
- font-weight: 400
- font-size: 13px
-
-.v-navigation-drawer .v-icon.v-icon
- font-size: 24px
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_buttons.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_buttons.sass
deleted file mode 100644
index aad1efe2..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_buttons.sass
+++ /dev/null
@@ -1,85 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-btn.v-size--default
- font-size: .85rem
-
-.v-icon.v-icon
- font-size: 20px
-
-.v-btn__content .v-icon--left
- margin-right: 4px
-
-.v-sheet button.v-btn.v-size--default:not(.v-btn--icon):not(.v-btn--fab)
- padding: 12px 30px !important
-
-.theme--light.v-btn:not(.v-btn--flat):not(.v-btn--text):not(.v-btn--outlined)
- background-color: #999
-
- &:hover
- background-color: #999000
-
-.v-btn.white
- .v-btn__content
- color: #999
-
-.v-sheet .v-btn.v-size--large:not(.v-btn--icon):not(.v-btn--fab)
- padding: 18px 36px !important
-
-.v-btn--fab.v-size--small
- height: 41px
- width: 41px
-
-.v-btn:not(.v-btn--text):not(.v-btn--outlined):hover:before
- opacity: 0
-
-.v-btn:not(.v-btn--text):not(.v-btn--outlined):focus:before
- opacity: 0
-
-.v-btn.v-size--default:not(.v-btn--icon):not(.v-btn--fab),
-.v-btn.v-size--large:not(.v-btn--icon):not(.v-btn--fab)
- padding: 10px 15px !important
-
-// Button group
-
-.v-item-group
- .v-btn:not(.v-btn--flat):not(.v-btn--text):not(.v-btn--outlined)
- margin-right: 0
-
-.v-btn-toggle
- .v-btn
- opacity: 1
-
-.v-btn-toggle > .v-btn.v-size--default
- height: inherit
-
-.theme--light.v-btn-toggle .v-btn.v-btn
- border-color: #999 !important
-
- &.primary
- border-color: #e91e63 !important
-
- &.secondary
- border-color: #9c27b0 !important
-
- &.success
- border-color: #4caf50 !important
-
- &.warning
- border-color: #fb8c00 !important
-
- &.error
- border-color: #ff5252 !important
-
- &.info
- border-color: #00cae3 !important
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_card.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_card.sass
deleted file mode 100644
index 250477cf..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_card.sass
+++ /dev/null
@@ -1,128 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-card
- border-radius: 6px
- margin-top: 30px
- margin-bottom: 15px
-
- .card-title
- font-size: 18px
-
- .v-card--material__heading
- top: -30px
-
- .text-subtitle-1
- color: hsla(0, 0%, 100%, .8)
-
- .text-h3
- font-size: 18px !important
-
- .text-caption
- font-size: 12px !important
- letter-spacing: 0 !important
-
- .v-card__actions
- padding-top: 15px
-
- .text-h3
- font-size: 18px !important
-
- .v-divider
- border-color: #eee
-
- .ct-label
- font-size: 14px
-
-.v-card--material-chart .v-card--material__heading .ct-label
- font-weight: 300
-
-
-.v-btn--icon.v-size--default .v-icon,
-.v-btn--fab.v-size--default .v-icon
- font-size: 18px
-
-.v-card--material .v-image
- .v-image__image
- border-radius: 6px
-
-.v-card__title
- font-size: 18px
- padding-top: 7px
- padding-bottom: 2px
-
-.theme--light
- .v-card > .v-card__text
- color: #333
-
- .card-title
- color: #3c4858
-
-.theme--dark
- .card-title
- color: #fff
-
-
-.v-timeline-item .v-card
- margin-top: 0
-
-.v-card--wizard
- .v-tabs-bar
- height: 42px
-
- .v-card__actions
- .v-btn
- margin-right: 0 !important
-
- .v-tabs .v-tab--active:hover::before, .theme--light.v-tabs .v-tab--active::before
- opacity: 0
-
- .v-tabs .v-tab:hover::before
- opacity: 0
-
-.v-card--plan
- .text-body-2
- font-weight: 500
- letter-spacing: 0 !important
- margin-top: 10px
- margin-bottom: 8px
-
- .text-h3
- margin-top: 30px
-
- .v-card__text
- color: #999
- margin-bottom: 16px
-
- .v-btn
- margin-right: 0 !important
-
- .v-avatar
- margin-top: 10px
-
-.v-card--testimony
- .v-card__text
- color: #999 !important
-
- .text-h3
- font-size: 18px !important
-
- .text-body-2
- font-weight: 500
- font-size: 12px !important
-
- .v-avatar
- left: calc(50% - 50px)
-
-.ct-square:before
- float: none
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_chip.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_chip.sass
deleted file mode 100644
index f67e0e6c..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_chip.sass
+++ /dev/null
@@ -1,23 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-chip.v-size--small
- height: 20px
-
-.v-chip__content
- font-size: 10px
- font-weight: 500
-
- .v-chip__close
- font-size: 15px
- margin-top: -1px
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_footer.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_footer.sass
deleted file mode 100644
index 836bef26..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_footer.sass
+++ /dev/null
@@ -1,48 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-footer
- padding: 20px 0 20px 4px
- border-top: 1px solid #e7e7e7 !important
- position: relative
-
- a
- padding: 15px 18px 15px 16px
- font-size: 12px !important
-
- .text-body-1
- font-size: 16px !important
- padding-right: 18px
- letter-spacing: 0px !important
-
- a
- color: #9c27b0 !important
- padding: 0
- text-transform: inherit !important
- font-size: 16px !important
- font-weight: 300 !important
-
- .v-icon
- margin-top: -3px
-
- &.v-footer--absolute
- position: absolute !important
-
-.theme--light.v-footer
- background-color: transparent
-
- .text-body-1
- color: #3c4858
-
- .v-icon
- color: #3c4858
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_map.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_map.sass
deleted file mode 100644
index 5f8177ef..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_map.sass
+++ /dev/null
@@ -1,16 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.mapouter
- position: relative !important
- height: 100vh !important
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_modal.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_modal.sass
deleted file mode 100644
index b6917f18..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_modal.sass
+++ /dev/null
@@ -1,41 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-dialog
- .v-card
- margin: 0
-
- .v-card__title
- font-weight: 300
- font-size: 18px
- display: inline-block
- text-align: center
- width: 100%
- padding: 24px 24px 0
-
- .v-icon
- position: absolute
- top: 15px
- right: 20px
- color: #999
- opacity: .5
- font-size: 16px
-
- &:hover
- opacity: 1
-
-.v-dialog > .v-card > .v-card__text
- padding-top: 24px
- font-weight: 300
- line-height: 1.75em
- letter-spacing: 0
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_notification.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_notification.sass
deleted file mode 100644
index c6bce41c..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_notification.sass
+++ /dev/null
@@ -1,27 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-alert
- padding: 20px 15px
-
- .v-alert__wrapper
- .v-alert__icon
- height: 38px
- min-width: 38px
-
- .v-alert__content
- font-weight: 300
-
- span
- font-size: 12px
- font-weight: 500
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_pagination.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_pagination.sass
deleted file mode 100644
index 9cc19b55..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_pagination.sass
+++ /dev/null
@@ -1,18 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-pagination
- .v-pagination__item,
- .v-pagination__navigation
- &:focus
- outline: none
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_settings.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_settings.sass
deleted file mode 100644
index 8b069926..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_settings.sass
+++ /dev/null
@@ -1,53 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-#settings
- z-index: 200
-
-.v-settings
- border-radius: 10px
-
- .v-card
- margin-top: 0
-
- .v-card__text
- strong
- height: 30px
- line-height: 25px
- font-size: 12px
- font-weight: 600
- text-transform: uppercase
- text-align: center
-
- .v-avatar
- border-color: #fff
- border-radius: 50% !important
- cursor: pointer
- display: inline-block
- height: 23px
- margin-right: 12px
- position: relative
- width: 23px
- padding: 8px
-
- .v-settings__item
- border-radius: 10px
-
- .v-image
- border-radius: 7px !important
-
- .v-settings__item:not(.v-settings__item--active)
- border-color: #fff !important
-
- .v-divider.secondary
- border-color: rgb(221, 221, 221) !important
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_sidebar.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_sidebar.sass
deleted file mode 100644
index ebccd046..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_sidebar.sass
+++ /dev/null
@@ -1,83 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-application .v-navigation-drawer .v-navigation-drawer__content .v-list-item .v-list-item__content .v-list-item__title.text-h3
- font-size: 18px !important
- margin-top: 12px
- margin-bottom: 12px
-
-.v-application .v-navigation-drawer .v-navigation-drawer__content .v-list .v-list-group .v-list-group__header .v-list-item__content .v-list-item__title
- font-size: 14px
- font-weight: 300
-
-.v-application--is-ltr .v-list-item__avatar:first-child
- margin-right: 11px
-
-.v-application .v-navigation-drawer .v-navigation-drawer__content .v-list-item__icon.v-list-group__header__append-icon .v-icon
- font-size: 19px
-
-.v-application--is-ltr #core-navigation-drawer div.v-list-item__icon--text,
-.v-application--is-ltr #core-navigation-drawer div.v-list-item__icon:first-child
- margin-left: 5px !important
- margin-right: 18px
- opacity: .8
-
-.v-application--is-ltr .v-list-item__action:last-of-type:not(:only-child),
-.v-application--is-ltr .v-list-item__avatar:last-of-type:not(:only-child),
-.v-application--is-ltr .v-list-item__icon:last-of-type:not(:only-child)
- margin-right: 2px
-
-.v-list--nav.v-list--dense .v-list-item:not(:last-child):not(:only-child),
-.v-list--nav .v-list-item--dense:not(:last-child):not(:only-child),
-.v-list--rounded.v-list--dense .v-list-item:not(:last-child):not(:only-child),
-.v-list--rounded .v-list-item--dense:not(:last-child):not(:only-child)
- margin-bottom: 3px
-
-.v-list-item .v-list-item__title, .v-list-item .v-list-item__subtitle
- line-height: 1.2
- font-weight: 300
- font-size: 14px
-
-.v-list-group__items .v-list-item
- font-size: 13px
- margin-bottom: 5px !important
-
- .v-list-item__title
- font-size: 13px
-
- .v-list-item__icon
- margin-top: 14px
-
-.v-list-group__items .v-list-group--sub-group .v-list-group__header .v-list-item__icon--text
- margin-top: 15px !important
-
-
-.v-list-item__icon
- margin: 12px 0
-
-.theme--dark.v-list-item--active:hover::before, .theme--dark.v-list-item--active::before
- opacity: 0
-
-.v-navigation-drawer
- .v-list-item__content
- transition: all 0.3s linear 0s
-
-.v-list--nav
- padding-left: 15px
- padding-right: 15px
-
-.theme--dark.v-navigation-drawer .v-divider
- background-color: rgba(181, 181, 181, 0.2)
- border-color: rgba(181, 181, 181, 0.1)
- width: calc(100% - 30px)
- margin-left: 15px
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_tab.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_tab.sass
deleted file mode 100644
index 78a68c87..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_tab.sass
+++ /dev/null
@@ -1,25 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-card--wizard
- .v-tabs-bar
- .v-slide-group__wrapper
- overflow: visible
- display: -webkit-inline-box
- contain: inherit
-
- .v-slide-group__content
- z-index: 2
-
- .v-tab:not(:first-child)
- margin-left: 5px
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_table.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_table.sass
deleted file mode 100644
index 07565f04..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_table.sass
+++ /dev/null
@@ -1,35 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-data-table td
- font-weight: 300
- padding: 12px 8px
-
-.v-data-table table thead tr th
- font-weight: 300
- font-size: 17px
- padding: 0px 8px
-
-.v-data-table table tbody tr td .v-btn
- margin-right: 0px !important
-
-.v-data-table .v-data-table-header__sort-badge
- font-size: 10px
-
-.v-data-table.theme--dark
- tr th
- color: #fff !important
-
-.theme--light
- .v-data-table table thead tr th
- color: #333
diff --git a/web-app/packages/lib-vue2/src/sass/vuetify-material/_view.sass b/web-app/packages/lib-vue2/src/sass/vuetify-material/_view.sass
deleted file mode 100644
index 114e8bc1..00000000
--- a/web-app/packages/lib-vue2/src/sass/vuetify-material/_view.sass
+++ /dev/null
@@ -1,37 +0,0 @@
-// =========================================================
-// * Vuetify Material Dashboard - v2.1.0
-// =========================================================
-//
-// * Product Page: https://www.creative-tim.com/product/vuetify-material-dashboard
-// * Copyright 2019 Creative Tim (https://www.creative-tim.com)
-//
-// * Coded by Creative Tim
-//
-// =========================================================
-//
-// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-.v-main__wrap
- .container--fluid
- padding-left: 30px
- padding-right: 30px
-
-.v-application .text-h5
- font-size: 25px !important
- padding-bottom: 0
-
-.v-application .black--text
- color: #333 !important
-
-.v-application .small
- font-weight: 300
- line-height: 2rem
-
- small
- font-weight: 400
-
-@media(max-width: 960px)
- .v-main__wrap
- .container--fluid
- padding-left: 15px
- padding-right: 15px
diff --git a/web-app/packages/lib-vue2/src/shims-svg.d.ts b/web-app/packages/lib-vue2/src/shims-svg.d.ts
deleted file mode 100644
index c8a61faf..00000000
--- a/web-app/packages/lib-vue2/src/shims-svg.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-declare module '*.svg' {
- import Vue, { VueConstructor } from 'vue'
- const content: VueConstructor
- export default content
-}
diff --git a/web-app/packages/lib-vue2/src/shims-tsx.d.ts b/web-app/packages/lib-vue2/src/shims-tsx.d.ts
deleted file mode 100644
index e73203a2..00000000
--- a/web-app/packages/lib-vue2/src/shims-tsx.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import Vue, { VNode } from 'vue'
-
-declare global {
- namespace JSX {
- interface Element extends VNode {}
- interface ElementClass extends Vue {}
- interface IntrinsicElements {
- [elem: string]: any
- }
- }
-}
diff --git a/web-app/packages/lib-vue2/src/shims-vue.d.ts b/web-app/packages/lib-vue2/src/shims-vue.d.ts
deleted file mode 100644
index 42ada501..00000000
--- a/web-app/packages/lib-vue2/src/shims-vue.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import Router from 'vue-router'
-
-declare module '*.vue' {
- import Vue from 'vue'
- export default Vue
-}
-
-declare module 'pinia' {
- export interface Pinia {
- router: Router
- }
-}
diff --git a/web-app/packages/lib-vue2/tsconfig.json b/web-app/packages/lib-vue2/tsconfig.json
deleted file mode 100644
index 5dada810..00000000
--- a/web-app/packages/lib-vue2/tsconfig.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "compilerOptions": {
- "target": "ES5",
- "module": "ESNext",
- // setting strict to false
- "strict": true,
- "noImplicitAny": false,
- "strictNullChecks": false,
- "jsx": "preserve",
- "moduleResolution": "Node",
- "skipLibCheck": true,
- "esModuleInterop": true,
- "allowJs": true,
- "allowSyntheticDefaultImports": true,
- "forceConsistentCasingInFileNames": true,
- "useDefineForClassFields": true,
- "sourceMap": true,
- "baseUrl": "src",
- "types": ["node", "vite/client"],
- "rootDir": "src",
- "paths": {
- "@/*": ["*"]
- },
- "lib": ["ESNext", "DOM", "DOM.Iterable", "ScriptHost"],
-
- "declaration": true,
- "emitDeclarationOnly": true,
- "composite": true,
- "declarationDir": "types",
- // just something for tsc-alias
- "outDir": "types",
-
- "resolveJsonModule": true,
- // Ensure that Babel can safely transpile files in the TypeScript project
- "isolatedModules": true
- },
- "include": [
- "src/assets/**/*",
- "src/**/*.js",
- "src/**/*.jsx",
- "src/**/*.json",
- "src/**/*.ts",
- "src/**/*.d.ts",
- "src/**/*.tsx",
- "src/**/*.vue",
- "tests/**/*.ts",
- "tests/**/*.tsx",
- "components.d.ts"
- ],
- "exclude": ["node_modules"],
- "references": [{ "path": "./tsconfig.node.json" }]
-}
diff --git a/web-app/packages/lib-vue2/tsconfig.node.json b/web-app/packages/lib-vue2/tsconfig.node.json
deleted file mode 100644
index 186c12a1..00000000
--- a/web-app/packages/lib-vue2/tsconfig.node.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "compilerOptions": {
- "composite": true,
- "module": "ESNext",
- "moduleResolution": "Node",
- "allowSyntheticDefaultImports": true,
- "resolveJsonModule": true
- },
- "include": [
- "vite.config.ts",
- "package.json"
- ]
-}
diff --git a/web-app/packages/lib-vue2/vite.config.ts b/web-app/packages/lib-vue2/vite.config.ts
deleted file mode 100644
index 9460c720..00000000
--- a/web-app/packages/lib-vue2/vite.config.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { NodeGlobalsPolyfillPlugin } from '@esbuild-plugins/node-globals-polyfill'
-import vue from '@vitejs/plugin-vue2'
-import { resolve } from 'path'
-import rollupNodePolyFill from 'rollup-plugin-node-polyfills'
-import { VuetifyResolver } from 'unplugin-vue-components/resolvers'
-import Components from 'unplugin-vue-components/vite'
-import { defineConfig } from 'vite'
-import { viteStaticCopy } from 'vite-plugin-static-copy'
-// import vuetify from 'vite-plugin-vuetify'
-
-import packageJson from './package.json'
-
-// https://vitejs.dev/config/
-export default defineConfig(({ mode }) => ({
- plugins: [
- vue(),
- Components({
- resolvers: [VuetifyResolver()]
- }),
- viteStaticCopy({
- // copy sass files to use in other applications
- targets: [{ src: 'src/sass/**.scss', dest: 'sass' }]
- })
- ],
- publicDir: './src/assets',
- css: {
- preprocessorOptions: {
- scss: {
- quietDeps: true
- }
- }
- },
-
- resolve: {
- alias: {
- '@': resolve(__dirname, './src'),
- events: 'rollup-plugin-node-polyfills/polyfills/events',
- https: 'agent-base',
- path: 'rollup-plugin-node-polyfills/polyfills/path'
- },
- dedupe: ['vue', 'pinia', 'vue-router', 'vuetify']
- },
- build: {
- commonjsOptions: {
- // include: [/node_modules/],
- transformMixedEsModules: true
- },
- sourcemap: mode !== 'production',
- lib: {
- // Could also be a dictionary or array of multiple entry points
- entry: resolve(__dirname, 'src/main.ts'),
- name: 'lib',
- // the proper extensions will be added
- fileName: 'lib'
- },
- rollupOptions: {
- // make sure to externalize deps that shouldn't be bundled
- // into your library
- external: [
- 'vue',
- 'pinia',
- ...Object.keys(packageJson.dependencies),
- '@vue/babel-helper-vue-jsx-merge-props'
- ],
- output: {
- exports: 'named',
- // Provide global variables to use in the UMD build
- // for externalized deps
- globals: {
- vue: 'Vue',
- pinia: 'pinia'
- }
- },
- plugins: [
- // Enable rollup polyfills plugin
- // used during production bundling
- rollupNodePolyFill()
- ]
- }
- },
- optimizeDeps: {
- exclude: ['vue', '@mergin', 'vue-demi'],
- esbuildOptions: {
- define: {
- global: 'globalThis'
- },
- plugins: [
- NodeGlobalsPolyfillPlugin({
- process: true,
- buffer: true
- })
- ]
- }
- },
- server: {
- watch: {
- ignored: ['!**/node_modules/@mergin/**']
- }
- }
-}))
diff --git a/web-app/packages/lib/package.json b/web-app/packages/lib/package.json
index 72b48df1..b65fca77 100644
--- a/web-app/packages/lib/package.json
+++ b/web-app/packages/lib/package.json
@@ -43,6 +43,7 @@
"date-fns": "^2.28.0",
"file-saver": "^2.0.5",
"lodash": "^4.17.21",
+ "pinia": "^2.1.7",
"primeflex": "^3.3.1",
"primevue": "3.43.0",
"vue": "3.3.8",
diff --git a/web-app/packages/lib/src/assets/sass/themes/mm-theme-light/_extensions.scss b/web-app/packages/lib/src/assets/sass/themes/mm-theme-light/_extensions.scss
index fe13acfc..be31a2b8 100644
--- a/web-app/packages/lib/src/assets/sass/themes/mm-theme-light/_extensions.scss
+++ b/web-app/packages/lib/src/assets/sass/themes/mm-theme-light/_extensions.scss
@@ -34,6 +34,11 @@ label {
line-height: 2;
}
+.p-float-label label {
+ font-size: inherit;
+ line-height: inherit;
+}
+
/** Primevue overrides */
// Customization of infinite border of tabs using classes instead pt because, we want to have access to variables
diff --git a/web-app/packages/lib/src/common/components/app-settings/AppSettings.vue b/web-app/packages/lib/src/common/components/app-settings/AppSettings.vue
new file mode 100644
index 00000000..091b3d82
--- /dev/null
+++ b/web-app/packages/lib/src/common/components/app-settings/AppSettings.vue
@@ -0,0 +1,28 @@
+
+ (() => {
diff --git a/web-app/yarn.lock b/web-app/yarn.lock
index 1e890214..f0a2a35d 100644
--- a/web-app/yarn.lock
+++ b/web-app/yarn.lock
@@ -167,7 +167,7 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.18.4", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.2":
+"@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.2":
version "7.21.2"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3"
integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==
@@ -415,27 +415,6 @@
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-"@intlify/core-base@9.7.1":
- version "9.7.1"
- resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.7.1.tgz#d31315a8e9cf027678b65a4155287143ab91b8fd"
- integrity sha512-jPJTeECEhqQ7g//8g3Fb79j5SzSSRqlFCWD6pcX94uMLXU+L1m07gVZnnvzoJBnaMyJHiiwxOqZVfvu6rQfLvw==
- dependencies:
- "@intlify/message-compiler" "9.7.1"
- "@intlify/shared" "9.7.1"
-
-"@intlify/message-compiler@9.7.1":
- version "9.7.1"
- resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.7.1.tgz#2cd5f26c6b9f19afffd62e69d192cc4e9e51ba9a"
- integrity sha512-HfIr2Hn/K7b0Zv4kGqkxAxwtipyxAwhI9a3krN5cuhH/G9gkaik7of1PdzjR3Mix43t2onBiKYQyaU7mo7e0aA==
- dependencies:
- "@intlify/shared" "9.7.1"
- source-map-js "^1.0.2"
-
-"@intlify/shared@9.7.1":
- version "9.7.1"
- resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.7.1.tgz#a4902421aacda2d716981eb9528aef0163c7bb0a"
- integrity sha512-CBKnHzlUYGrk5QII9q4nElAQKO5cX1rRx8VmSWXltyOZjbkGHXYQTHULn6KwRi+CypuBCfmPkyPBHMzosypIeg==
-
"@jridgewell/gen-mapping@^0.1.0":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
@@ -716,11 +695,6 @@
"@typescript-eslint/types" "5.61.0"
eslint-visitor-keys "^3.3.0"
-"@vitejs/plugin-vue2@^2.3.1":
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue2/-/plugin-vue2-2.3.1.tgz#53078d3d9d50d9863f1fbb1c1ef7791a5fcd4948"
- integrity sha512-/ksaaz2SRLN11JQhLdEUhDzOn909WEk99q9t9w+N12GjQCljzv7GyvAbD/p20aBUjHkvpGOoQ+FCOkG+mjDF4A==
-
"@vitejs/plugin-vue@^4.6.2":
version "4.6.2"
resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.6.2.tgz#057d2ded94c4e71b94e9814f92dcd9306317aa46"
@@ -748,11 +722,6 @@
"@volar/language-core" "1.11.1"
path-browserify "^1.0.1"
-"@vue/babel-helper-vue-jsx-merge-props@^1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz#8d53a1e21347db8edbe54d339902583176de09f2"
- integrity sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==
-
"@vue/compiler-core@3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.8.tgz#301bb60d0245265a88ed5b30e200fbf223acb313"
@@ -790,15 +759,6 @@
"@vue/compiler-core" "3.4.37"
"@vue/shared" "3.4.37"
-"@vue/compiler-sfc@2.7.14":
- version "2.7.14"
- resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz#3446fd2fbb670d709277fc3ffa88efc5e10284fd"
- integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==
- dependencies:
- "@babel/parser" "^7.18.4"
- postcss "^8.4.14"
- source-map "^0.6.1"
-
"@vue/compiler-sfc@3.3.8":
version "3.3.8"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.8.tgz#40b18e48aa00260950964d1d72157668521be0e1"
@@ -1280,11 +1240,6 @@ cssesc@^3.0.0:
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-csstype@^3.1.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
- integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
-
csstype@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
@@ -2400,11 +2355,6 @@ magic-string@^0.30.5:
dependencies:
"@jridgewell/sourcemap-codec" "^1.4.15"
-material-icons@^0.2.3:
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/material-icons/-/material-icons-0.2.3.tgz#1f84d50effbb700287ba44a21bbce0339252ccaf"
- integrity sha512-1Q5wp4aeGWjE5POMtdLmqJn94QM7vmUCeJhNO5m0oDrtW1jfWlaLK73vF3C7/fuMD7NIVicyK8TSkwd+diFgaQ==
-
memorystream@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
@@ -2740,7 +2690,7 @@ postcss-value-parser@^4.2.0:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-postcss@^8.4.14, postcss@^8.4.21:
+postcss@^8.4.21:
version "8.4.21"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
@@ -3050,11 +3000,6 @@ source-map-js@^1.0.2:
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-source-map@^0.6.1:
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
- integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
sourcemap-codec@^1.4.8:
version "1.4.8"
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
@@ -3386,15 +3331,6 @@ vue-eslint-parser@^9.0.1:
lodash "^4.17.21"
semver "^7.3.6"
-vue-i18n@^9.7.1:
- version "9.7.1"
- resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.7.1.tgz#41393b066f6ff69d9be2ba31a59b043263c77289"
- integrity sha512-A6DzWqJQMdzBj+392+g3zIgGV0FnFC7o/V+txs5yIALANEZzY6ZV8hM2wvZR3nTbQI7dntAmzBHMeoEteJO0kQ==
- dependencies:
- "@intlify/core-base" "9.7.1"
- "@intlify/shared" "9.7.1"
- "@vue/devtools-api" "^6.5.0"
-
vue-meta@^3.0.0-alpha.10:
version "3.0.0-alpha.10"
resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-3.0.0-alpha.10.tgz#8aa7dee8ef43edda2633d52d2d4ca0ae03352222"
@@ -3407,16 +3343,6 @@ vue-router@4.2.5:
dependencies:
"@vue/devtools-api" "^6.5.0"
-vue-router@^3.6.5:
- version "3.6.5"
- resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.6.5.tgz#95847d52b9a7e3f1361cb605c8e6441f202afad8"
- integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==
-
-vue-tabler-icons@^1.0:
- version "1.14.0"
- resolved "https://registry.yarnpkg.com/vue-tabler-icons/-/vue-tabler-icons-1.14.0.tgz#df0027906f225c1501c2d1cfa9d844f8d50bc428"
- integrity sha512-ZFYo5RWXhp9/Ky8CFWUQ65x2oZy0YkwdfB4b2+tT/hPqGdieQfa303UiiFeNMHFYrNSGouDAN1LvpDxaN/4X2g==
-
vue-template-compiler@^2.7.14:
version "2.7.16"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b"
@@ -3445,19 +3371,6 @@ vue@3.3.8:
"@vue/server-renderer" "3.3.8"
"@vue/shared" "3.3.8"
-vue@^2.7.14:
- version "2.7.14"
- resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.14.tgz#3743dcd248fd3a34d421ae456b864a0246bafb17"
- integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
- dependencies:
- "@vue/compiler-sfc" "2.7.14"
- csstype "^3.1.0"
-
-vuetify@^2.6.15:
- version "2.6.15"
- resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.15.tgz#058c976f4e6e834076d80ae0c09bd61baa836d26"
- integrity sha512-2a6sBSHzivXgi9pZMyHuzTgMyInCkj/BrVwTnoCa1Y/Dnfwj7lkWzgKQDScbGVK0q4vJ+YHoBBrLOmnhz1R0YA==
-
webpack-sources@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
-
+
+
@@ -108,7 +73,9 @@ import {
AppSection,
AppContainer,
ConfirmDialogProps,
- useProjectStore
+ useProjectStore,
+ AppSettingsItemConfig,
+ AppSettings
} from '@mergin/lib'
import { computed, watch, defineProps } from 'vue'
import { useRoute } from 'vue-router'
@@ -126,6 +93,20 @@ defineProps<{
namespace: string
}>()
+const settingsItems = computed
-
-
- Public project
- The project will be visible to everyone if it is marked as - public. - - -This is private project
- Make this project visible to anyone. - -
+
+
+
-
-
-
-
-
-
+
+
Delete project
- Deleting this project will remove it and all its data. This - action cannot be undone. -
+
+
+
+
+ Settings
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/FullStorageWarning.vue b/web-app/packages/lib-vue2/src/common/components/FullStorageWarning.vue
deleted file mode 100644
index 7e4965f5..00000000
--- a/web-app/packages/lib-vue2/src/common/components/FullStorageWarning.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/MerginLogoLight.vue b/web-app/packages/lib-vue2/src/common/components/MerginLogoLight.vue
deleted file mode 100644
index d80fd7bf..00000000
--- a/web-app/packages/lib-vue2/src/common/components/MerginLogoLight.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/common/components/WarningMessage.vue b/web-app/packages/lib-vue2/src/common/components/WarningMessage.vue
deleted file mode 100644
index 8f8c17ed..00000000
--- a/web-app/packages/lib-vue2/src/common/components/WarningMessage.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- Project access requests
-Recent active projects
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/dashboard/components/index.ts b/web-app/packages/lib-vue2/src/modules/dashboard/components/index.ts
deleted file mode 100644
index 1b385bfb..00000000
--- a/web-app/packages/lib-vue2/src/modules/dashboard/components/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as DashboardAccessRequestsRow } from './DashboardAccessRequestsRow.vue'
-export { default as DashboardFullStorageWarningRow } from './DashboardFullStorageWarningRow.vue'
-export { default as DashboardProjectsRow } from './DashboardProjectsRow.vue'
diff --git a/web-app/packages/lib-vue2/src/modules/dashboard/index.ts b/web-app/packages/lib-vue2/src/modules/dashboard/index.ts
deleted file mode 100644
index 988b25fa..00000000
--- a/web-app/packages/lib-vue2/src/modules/dashboard/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export * from './components'
-export * from './module'
-export * from './views'
diff --git a/web-app/packages/lib-vue2/src/modules/dashboard/module.ts b/web-app/packages/lib-vue2/src/modules/dashboard/module.ts
deleted file mode 100644
index c7ce50aa..00000000
--- a/web-app/packages/lib-vue2/src/modules/dashboard/module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { Module } from '@/common/types'
-
-export const DashboardModule: Module = {
- name: 'dashboardModule',
- init: (_services) => {
- // nothing to do
- }
-}
diff --git a/web-app/packages/lib-vue2/src/modules/dashboard/views/DashboardViewTemplate.vue b/web-app/packages/lib-vue2/src/modules/dashboard/views/DashboardViewTemplate.vue
deleted file mode 100644
index 6d333358..00000000
--- a/web-app/packages/lib-vue2/src/modules/dashboard/views/DashboardViewTemplate.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-
-
-
- Welcome {{ loggedUser.username }}, are you ready to start?
-- First create new project, add people to it or explore public - project for more inspiration -
-Download Mergin Maps Input app
-- Capture geo-info easily through your mobile/tablet with the - Mergin Maps Input app. Designed to be compatible with all mobile - devices - even those with small screens. -
-
-
- 
-
-
-
-
-
-
- 
-
-
-
-
-
-
- 
-
-
-
-
-
-
- account_circle
-
-
-
-
-
- {{ getUserFullName }}
-
- keyboard_arrow_down
-
-
- {{ currentNamespace || 'no workspace' }}
-
-
- {{ getUserFullName }}
- {{ this.loggedUser.email }}
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/layout/components/SideBarTemplate.vue b/web-app/packages/lib-vue2/src/modules/layout/components/SideBarTemplate.vue
deleted file mode 100644
index f1c41865..00000000
--- a/web-app/packages/lib-vue2/src/modules/layout/components/SideBarTemplate.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Page not found
-This page does not exist, check your url for mistakes, please.
-
- Not the right person? Try typing their email address instead!
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/FileChangesetSummaryTable.vue b/web-app/packages/lib-vue2/src/modules/project/components/FileChangesetSummaryTable.vue
deleted file mode 100644
index 8e44fe67..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/FileChangesetSummaryTable.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ header.icon }}
-
-
- Added
-
-
-
-
-
- {{ header.icon }}
-
-
- Deleted
-
-
-
-
-
- {{ header.icon }}
-
-
- Modified
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/FileIcon.vue b/web-app/packages/lib-vue2/src/modules/project/components/FileIcon.vue
deleted file mode 100644
index 63ce726a..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/FileIcon.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
- ![]()
-
-
-
- {{ mdi }}
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/FileMenu.vue b/web-app/packages/lib-vue2/src/modules/project/components/FileMenu.vue
deleted file mode 100644
index a3bc7dd4..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/FileMenu.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
- {{ value | remainingtime }}
-
- {{ value | datetime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/ProjectAccessRequests.vue b/web-app/packages/lib-vue2/src/modules/project/components/ProjectAccessRequests.vue
deleted file mode 100644
index 161a2c03..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/ProjectAccessRequests.vue
+++ /dev/null
@@ -1,361 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- accept
-
-
-
- Accept request
-
-
-
-
-
- cancel
-
-
-
- Cancel request
-
-
-
-
-
-
-
- accept
-
-
-
- Accept request
-
-
-
-
-
-
-
-
-
- cancel
-
-
-
- Cancel access request
-
-
-
-
-
- delete
-
-
-
- - {{ - readonly - ? `Project ${project.name} will be shared with following people` - : 'Share with' - }} -
-- and {{ addedUsers.length - 5 }} more ... -
-
- {{
- readonly ? 'Back' : 'Cancel'
- }}
-
- {{ invitedEmails.length === 0 || readonly ? 'Share' : 'Next' }}
-
-
-
-
-
-
-
-
-
-
-
- mdi-arrow-up
-
-
- mdi-arrow-down
-
-
-
-
-
-
-
-
-
-
-
- {{ item.namespace }} /
- {{ item.name }}
-
- Public
-
-
- {{ item.description }}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/components/ProjectsTableDataLoader.vue b/web-app/packages/lib-vue2/src/modules/project/components/ProjectsTableDataLoader.vue
deleted file mode 100644
index 35750f61..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/components/ProjectsTableDataLoader.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-
-
-
-
-
-
- share {{ item.access.readers.length }}
-
- collaborators
-
-
-
-
-
- history {{ item.version.substr(1) }}
-
-
-
- versions
-
-
-
- folder {{ item.disk_usage | filesize('MB', 1) }}
-
- project size
-
-
-
- Updated {{ item.updated | timediff }}
-
- {{ item.updated | datetime }}
-
-
-
- warning
-
- Missing QGIS project file
-
-
-
- error
-
- There is conflict file in project
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ value | timediff }}
-
-
-
-
-
- {{ value | datetime }}
-
-
-
-
-
-
- {{ value | filesize }}
-
-
-
-
-
- Well done! The next step is adding some data.
-
-
- There are two options:
-
- 1. Use the Mergin Maps plugin for QGIS to upload data. This is the - easiest and recommended way. See the documentation on - how to install and use the plugin.
-
- 2. Drag and drop files from your computer to the lower part of this - page. This option is convenient if your project files are already - fully prepared and only need uploading. -
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/views/FileDetailView.vue b/web-app/packages/lib-vue2/src/modules/project/views/FileDetailView.vue
deleted file mode 100644
index d46a19bf..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/views/FileDetailView.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-
-
-
- -
- 1. Use the Mergin Maps plugin for QGIS to upload data. This is the - easiest and recommended way. See the documentation on - how to install and use the plugin.
-
- 2. Drag and drop files from your computer to the lower part of this - page. This option is convenient if your project files are already - fully prepared and only need uploading. -
-
-
-
-
-
-
-
-
-
-
-
- Name
- {{ filename }}
-
-
-
-
- Size
-
- {{ file.size | filesize }}
- (new: {{ upload.files[file.path].size | filesize }})
-
-
-
-
-
- Last update
- {{ file.mtime | datetime }} ({{ file.mtime | timediff }})
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/views/FileVersionDetailView.vue b/web-app/packages/lib-vue2/src/modules/project/views/FileVersionDetailView.vue
deleted file mode 100644
index d98a3b93..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/views/FileVersionDetailView.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{
- actions[value].icon
- }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/views/ProjectSettingsViewTemplate.vue b/web-app/packages/lib-vue2/src/modules/project/views/ProjectSettingsViewTemplate.vue
deleted file mode 100644
index e56afbcb..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/views/ProjectSettingsViewTemplate.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
-
- {{ name }}
--
Changes cannot be calculated
- For details please check the - documentation. -- Hide this project from everyone. - - - This is private project
- Make this project visible to anyone. - -
- All data will be lost -
-
-
-
-
-
-
-
- {{ header.icon }}
-
-
- Added
-
-
-
-
-
- {{ header.icon }}
-
-
- Deleted
-
-
-
-
-
- {{ header.icon }}
-
-
- Modified
-
-
-
-
-
-
-
- {{
- item.created | timediff
- }}
-
- {{ item.created | datetime }}
-
-
-
- {{ item.author }}
-
-
-
- {{ item.name }}
-
-
-
-
-
- {{
- item.changes.added.length
- }}
-
-
-
-
- {{
- item.changes.removed.length
- }}
-
-
-
-
- {{
- item.changes.updated.length
- }}
-
-
-
- {{
- item.project_size | filesize
- }}
-
-
-
-
-
- archive
-
-
- Download Project Version {{ item.name }} (ZIP)
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/views/ProjectViewTemplate.vue b/web-app/packages/lib-vue2/src/modules/project/views/ProjectViewTemplate.vue
deleted file mode 100644
index 05d7ff63..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/views/ProjectViewTemplate.vue
+++ /dev/null
@@ -1,478 +0,0 @@
-
-
-
-
-
-
-
- - You don't have permissions to access this project. - -
- Please check if address is written correctly - -
- You already requested access - -
-
-
- {{ header }}
-
- chevron_right {{ namespace }}
-
- -
- Please check if address is written correctly - -
-
-
-
-
- archive
-
-
- Download Project Version {{ version.name }} (ZIP)
-
-
-
-
-
- Version
- {{ version.name }}
-
-
-
-
- Author
- {{ version.author }}
-
-
-
-
- Project Size
- {{ version.project_size | filesize }}
-
-
-
-
-
- Created
- {{ version.created | datetime }}
-
-
-
-
-
- User Agent
- {{ version.user_agent }}
-
-
-
-
-
-
- Files changes:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web-app/packages/lib-vue2/src/modules/project/views/index.ts b/web-app/packages/lib-vue2/src/modules/project/views/index.ts
deleted file mode 100644
index 467ffb5e..00000000
--- a/web-app/packages/lib-vue2/src/modules/project/views/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-export { default as FileBrowserView } from './FileBrowserView.vue'
-export { default as FileDetailView } from './FileDetailView.vue'
-export { default as FileVersionDetailView } from './FileVersionDetailView.vue'
-export { default as ProjectsListViewTemplate } from './ProjectsListViewTemplate.vue'
-export { default as ProjectSettingsViewTemplate } from './ProjectSettingsViewTemplate.vue'
-export { default as ProjectVersionsView } from './ProjectVersionsView.vue'
-export { default as ProjectViewTemplate } from './ProjectViewTemplate.vue'
-export { default as VersionDetailView } from './VersionDetailView.vue'
-export { default as ProjectVersionsViewTemplate } from './ProjectVersionsViewTemplate.vue'
diff --git a/web-app/packages/lib-vue2/src/modules/types.ts b/web-app/packages/lib-vue2/src/modules/types.ts
deleted file mode 100644
index 3050d968..00000000
--- a/web-app/packages/lib-vue2/src/modules/types.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (C) 2022 Lutra Consulting Limited. All rights reserved.
-// Copyright (C) Lutra Consulting Limited
-//
-// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-
-import { DialogState } from '@/modules/dialog'
-import { FormState } from '@/modules/form'
-import { InstanceState } from '@/modules/instance'
-import { LayoutState } from '@/modules/layout'
-import { NotificationState } from '@/modules/notification'
-import { ProjectState } from '@/modules/project'
-import { UserState } from '@/modules/user'
-
-export interface RootState {
- dialogModule: DialogState
- formModule: FormState
- instanceModule: InstanceState
- layoutModule: LayoutState
- notificationModule: NotificationState
- projectModule: ProjectState
- userModule: UserState
-}
diff --git a/web-app/packages/lib-vue2/src/modules/user/components/ChangePasswordForm.vue b/web-app/packages/lib-vue2/src/modules/user/components/ChangePasswordForm.vue
deleted file mode 100644
index 821353c3..00000000
--- a/web-app/packages/lib-vue2/src/modules/user/components/ChangePasswordForm.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-
-
- {{ item.path }}:
- {{
- version.changesets[item.path]
- ? version.changesets[item.path]['size']
- : item.size | filesize
- }}
-
-
-
-
-
- Show advanced
-
-
-
-
- Details not available: {{ version.changesets[item.path].error }}
-
-
- -
-
- Password must be at least 8 characters long. -
-
- Password must contain at least 3 character categories among the
- following:
-
-
-
- Lowercase characters (a-z) -
- Uppercase characters (A-Z) -
- Digits (0-9) -
- Special characters -
-
You requested access to these projects
-Change password
--
-
- Password must be at least 8 characters long. -
-
- Password must contain at least 3 character categories among
- the following:
-
-
-
- Lowercase characters (a-z) -
- Uppercase characters (A-Z) -
- Digits (0-9) -
- Special characters -
-
- Sign in
-
-
- Your password was changed. You can now Sign In
--
- Forgot password?
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Profile
--
-
-
- -
-
- - Username: {{ loggedUser.username }} - -
- - Name: {{ loggedUser.name }} - -
-
- Email: {{ loggedUser.email }}
-
- - - -check -clear - - - Email verification status -
- -
- Receive notifications:
-
check -clear -
- - - Registered: {{ loggedUser.registration_date | date }} - -
-
-
-
-
- lock
- Change password
-
-
-
-
- edit
- Edit profile
-
-
-
-
- send
- Verify email
-
-
-
-
- remove_circle
- Close my account
-
-
- Email confirmation
-Your email address has been verified.
-Invalid token
--
+
+ {{ item.title }}
+ {{ item.description }}
+
+
+
+
+
+
diff --git a/web-app/packages/lib/src/common/components/app-settings/AppSettingsItem.vue b/web-app/packages/lib/src/common/components/app-settings/AppSettingsItem.vue
new file mode 100644
index 00000000..adc7df7a
--- /dev/null
+++ b/web-app/packages/lib/src/common/components/app-settings/AppSettingsItem.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff --git a/web-app/packages/lib-vue2/src/modules/dialog/index.ts b/web-app/packages/lib/src/common/components/app-settings/index.ts
similarity index 54%
rename from web-app/packages/lib-vue2/src/modules/dialog/index.ts
rename to web-app/packages/lib/src/common/components/app-settings/index.ts
index 3e416868..e1b438e4 100644
--- a/web-app/packages/lib-vue2/src/modules/dialog/index.ts
+++ b/web-app/packages/lib/src/common/components/app-settings/index.ts
@@ -2,7 +2,6 @@
//
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-export * from './components'
-export * from './store'
-export * from './module'
+export { default as AppSettings } from './AppSettings.vue'
+export { default as AppSettingsItem } from './AppSettingsItem.vue'
export * from './types'
diff --git a/web-app/packages/lib/src/common/components/app-settings/types.ts b/web-app/packages/lib/src/common/components/app-settings/types.ts
new file mode 100644
index 00000000..eb0bcf18
--- /dev/null
+++ b/web-app/packages/lib/src/common/components/app-settings/types.ts
@@ -0,0 +1,5 @@
+export interface AppSettingsItemConfig {
+ key: string
+ title: string
+ description: string
+}
diff --git a/web-app/packages/lib/src/common/components/index.ts b/web-app/packages/lib/src/common/components/index.ts
index 41361e34..c3fbe448 100644
--- a/web-app/packages/lib/src/common/components/index.ts
+++ b/web-app/packages/lib/src/common/components/index.ts
@@ -17,3 +17,4 @@ export { default as TipMessage } from './TipMessage.vue'
export { default as AppOnboardingPage } from './AppOnboardingPage.vue'
export * from './types'
export * from './data-view'
+export * from './app-settings'
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 c2e8ce32..30c62238 100644
--- a/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue
+++ b/web-app/packages/lib/src/modules/layout/components/SideBarTemplate.vue
@@ -74,7 +74,7 @@ import { ProjectRouteName } from '@/modules/project'
const route = useRoute()
const layoutStore = useLayoutStore()
const props = defineProps<{
- sidebarItems: SideBarItemModel[]
+ sidebarItems?: SideBarItemModel[]
}>()
const initialSidebarItems = computed
+
+
+