From 7f281fc5e98c5eb83f926100c7f79ee374c5a784 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Sat, 24 Sep 2022 15:20:40 +0200 Subject: [PATCH] feat: port base store to pinia --- package.json | 1 - pnpm-lock.yaml | 116 ++++++------- src/App.vue | 6 +- src/components/home/MenuButton.vue | 10 +- src/components/home/TheNavigation.vue | 23 +-- src/components/home/contentAuth.vue | 22 ++- src/components/home/contentLinkShare.vue | 11 +- src/components/home/navigation.vue | 14 +- src/components/list/partials/filters.vue | 15 +- .../misc/keyboard-shortcuts/index.vue | 7 +- src/components/misc/ready.vue | 9 +- .../quick-actions/quick-actions.vue | 15 +- src/components/tasks/gantt-component.vue | 6 +- src/components/tasks/partials/heading.vue | 4 +- .../tasks/partials/singleTaskInList.vue | 11 +- src/helpers/saveListView.ts | 2 +- src/main.ts | 4 - src/models/user.ts | 4 +- src/store/helper.ts | 53 ------ src/store/mutation-types.ts | 12 -- src/store/types.ts | 114 ------------- src/stores/attachments.ts | 5 +- src/stores/auth.ts | 32 +++- src/stores/base.ts | 159 ++++++++++-------- src/stores/config.ts | 36 +++- src/stores/helper.ts | 19 +++ src/stores/kanban.ts | 22 ++- src/stores/labels.ts | 9 +- src/stores/lists.ts | 10 +- src/stores/namespaces.ts | 8 +- src/stores/tasks.ts | 24 +-- src/types/shims-vue.d.ts | 30 ---- src/views/Home.vue | 14 +- src/views/filters/FilterEdit.vue | 8 +- src/views/list/ListKanban.vue | 11 +- src/views/list/ListList.vue | 10 +- src/views/list/ListWrapper.vue | 19 +-- src/views/list/settings/archive.vue | 12 +- src/views/list/settings/background.vue | 26 +-- src/views/list/settings/edit.vue | 7 +- src/views/list/settings/share.vue | 7 +- src/views/namespaces/ListNamespaces.vue | 7 +- src/views/sharing/LinkSharingAuth.vue | 8 +- src/views/tasks/ShowTasks.vue | 5 +- src/views/tasks/TaskDetailView.vue | 6 +- src/views/user/Login.vue | 16 +- src/views/user/OpenIdAuth.vue | 7 +- src/views/user/Register.vue | 8 +- src/views/user/settings/General.vue | 7 +- 49 files changed, 450 insertions(+), 541 deletions(-) delete mode 100644 src/store/helper.ts delete mode 100644 src/store/mutation-types.ts delete mode 100644 src/store/types.ts create mode 100644 src/stores/helper.ts delete mode 100644 src/types/shims-vue.d.ts diff --git a/package.json b/package.json index ac118752cd..f0205e1601 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,6 @@ "vue-flatpickr-component": "9.0.6", "vue-i18n": "9.2.2", "vue-router": "4.1.5", - "vuex": "4.0.2", "workbox-precaching": "6.5.4", "zhyswan-vuedraggable": "4.1.3" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0dab4b6b39..f50a5ae8b0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: 5.3 +lockfileVersion: 5.4 specifiers: '@4tw/cypress-drag-drop': 2.2.1 @@ -77,7 +77,6 @@ specifiers: vue-i18n: 9.2.2 vue-router: 4.1.5 vue-tsc: 0.40.13 - vuex: 4.0.2 wait-on: 6.0.1 workbox-cli: 6.5.4 workbox-precaching: 6.5.4 @@ -87,7 +86,7 @@ dependencies: '@fortawesome/fontawesome-svg-core': 6.2.0 '@fortawesome/free-regular-svg-icons': 6.2.0 '@fortawesome/free-solid-svg-icons': 6.2.0 - '@fortawesome/vue-fontawesome': 3.0.1_21e6b971ab1cbc4f6c07645df616013e + '@fortawesome/vue-fontawesome': 3.0.1_ehtls4nlds6e63ahmro7mfqbhy '@github/hotkey': 2.0.1 '@kyvg/vue3-notification': 2.4.1_vue@3.2.40 '@sentry/tracing': 7.14.0 @@ -96,7 +95,7 @@ dependencies: '@types/lodash.clonedeep': 4.5.7 '@types/sortablejs': 1.15.0 '@vueuse/core': 9.3.0_vue@3.2.40 - '@vueuse/router': 9.3.0_vue-router@4.1.5+vue@3.2.40 + '@vueuse/router': 9.3.0_c7eza3xvlyb4mo6qeit5ggeo6u axios: 0.27.2 blurhash: 2.0.2 bulma-css-variables: 0.9.33 @@ -113,7 +112,7 @@ dependencies: lodash.debounce: 4.0.8 marked: 4.1.1 minimist: 1.2.6 - pinia: 2.0.22_typescript@4.8.4+vue@3.2.40 + pinia: 2.0.22_bfjwoga25wxjazzogo7o372nwq register-service-worker: 1.7.2 snake-case: 3.0.4 sortablejs: 1.15.0 @@ -125,7 +124,6 @@ dependencies: vue-flatpickr-component: 9.0.6_vue@3.2.40 vue-i18n: 9.2.2_vue@3.2.40 vue-router: 4.1.5_vue@3.2.40 - vuex: 4.0.2_vue@3.2.40 workbox-precaching: 6.5.4 zhyswan-vuedraggable: 4.1.3_vue@3.2.40 @@ -137,11 +135,11 @@ devDependencies: '@types/dompurify': 2.3.4 '@types/flexsearch': 0.7.3 '@types/node': 16.11.62 - '@typescript-eslint/eslint-plugin': 5.38.1_17e047bdec5ec7c01e9d134b6813cb9c - '@typescript-eslint/parser': 5.38.1_eslint@8.24.0+typescript@4.8.4 + '@typescript-eslint/eslint-plugin': 5.38.1_c7qepppml3d4ahu5cnfwqe6ltq + '@typescript-eslint/parser': 5.38.1_ypn2ylkkyfa5i233caldtndbqa '@vitejs/plugin-legacy': 2.2.0_terser@5.10.0+vite@3.1.4 '@vitejs/plugin-vue': 3.1.0_vite@3.1.4+vue@3.2.40 - '@vue/eslint-config-typescript': 11.0.2_b985cba226e1126d4cc23df4d3ba9cd4 + '@vue/eslint-config-typescript': 11.0.2_xgc4xirg4ejg2tgchx2nhou42q '@vue/test-utils': 2.1.0_vue@3.2.40 '@vue/tsconfig': 0.1.3_@types+node@16.11.62 autoprefixer: 10.4.12_postcss@8.4.17 @@ -161,12 +159,12 @@ devDependencies: sass: 1.55.0 typescript: 4.8.4 vite: 3.1.4_sass@1.55.0+terser@5.10.0 - vite-plugin-pwa: 0.13.1_vite@3.1.4 + vite-plugin-pwa: 0.13.1_bhe5iaipiq3lmbaxwdxgnnn2gq vite-svg-loader: 3.6.0 - vitest: 0.23.4_ddc85b0b7a78b2cfae025c8e16b7f605 + vitest: 0.23.4_3xefwc32pczm7lqclshbnn7wau vue-tsc: 0.40.13_typescript@4.8.4 wait-on: 6.0.1 - workbox-cli: 6.5.4 + workbox-cli: 6.5.4_acorn@8.8.0 packages: @@ -1394,7 +1392,7 @@ packages: peerDependencies: postcss: ^8.2 dependencies: - '@csstools/selector-specificity': 2.0.2_cd239324a5aeb6e3cee0fb61f6a33448 + '@csstools/selector-specificity': 2.0.2_zurzgjffv23ohtxa7nq7nizuja postcss: 8.4.17 postcss-selector-parser: 6.0.10 dev: true @@ -1447,7 +1445,7 @@ packages: peerDependencies: postcss: ^8.2 dependencies: - '@csstools/selector-specificity': 2.0.2_cd239324a5aeb6e3cee0fb61f6a33448 + '@csstools/selector-specificity': 2.0.2_zurzgjffv23ohtxa7nq7nizuja postcss: 8.4.17 postcss-selector-parser: 6.0.10 dev: true @@ -1532,7 +1530,7 @@ packages: postcss: 8.4.17 dev: true - /@csstools/selector-specificity/2.0.2_cd239324a5aeb6e3cee0fb61f6a33448: + /@csstools/selector-specificity/2.0.2_zurzgjffv23ohtxa7nq7nizuja: resolution: {integrity: sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==} engines: {node: ^12 || ^14 || >=16} peerDependencies: @@ -1681,7 +1679,7 @@ packages: '@fortawesome/fontawesome-common-types': 6.2.0 dev: false - /@fortawesome/vue-fontawesome/3.0.1_21e6b971ab1cbc4f6c07645df616013e: + /@fortawesome/vue-fontawesome/3.0.1_ehtls4nlds6e63ahmro7mfqbhy: resolution: {integrity: sha512-CdXZJoCS+aEPec26ZP7hWWU3SaJlQPZSCGdgpQ2qGl2HUmtUUNrI3zC4XWdn1JUmh3t5OuDeRG1qB4eGRNSD4A==} peerDependencies: '@fortawesome/fontawesome-svg-core': ~1 || ~6 @@ -1919,7 +1917,7 @@ packages: strip-ansi: 7.0.1 supports-color: 9.2.1 tmp-promise: 3.0.3 - ts-node: 10.8.1_8274f11304fdf7eb271c33cd723ceaff + ts-node: 10.8.1_qj2pceye7x36wjy4gpgxephk74 typescript: 4.8.4 update-notifier: 5.1.0 uuid: 8.3.2 @@ -2607,7 +2605,7 @@ packages: resolution: {integrity: sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==} dev: false - /@rollup/plugin-babel/5.3.0_@babel+core@7.17.2+rollup@2.79.1: + /@rollup/plugin-babel/5.3.0_pf2mys4p2khuj2gysypj3zzjia: resolution: {integrity: sha512-9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw==} engines: {node: '>= 10.0.0'} peerDependencies: @@ -3106,7 +3104,7 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin/5.38.1_17e047bdec5ec7c01e9d134b6813cb9c: + /@typescript-eslint/eslint-plugin/5.38.1_c7qepppml3d4ahu5cnfwqe6ltq: resolution: {integrity: sha512-ky7EFzPhqz3XlhS7vPOoMDaQnQMn+9o5ICR9CPr/6bw8HrFkzhMSxuA3gRfiJVvs7geYrSeawGJjZoZQKCOglQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3117,10 +3115,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.38.1_eslint@8.24.0+typescript@4.8.4 + '@typescript-eslint/parser': 5.38.1_ypn2ylkkyfa5i233caldtndbqa '@typescript-eslint/scope-manager': 5.38.1 - '@typescript-eslint/type-utils': 5.38.1_eslint@8.24.0+typescript@4.8.4 - '@typescript-eslint/utils': 5.38.1_eslint@8.24.0+typescript@4.8.4 + '@typescript-eslint/type-utils': 5.38.1_ypn2ylkkyfa5i233caldtndbqa + '@typescript-eslint/utils': 5.38.1_ypn2ylkkyfa5i233caldtndbqa debug: 4.3.4 eslint: 8.24.0 ignore: 5.2.0 @@ -3132,7 +3130,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.38.1_eslint@8.24.0+typescript@4.8.4: + /@typescript-eslint/parser/5.38.1_ypn2ylkkyfa5i233caldtndbqa: resolution: {integrity: sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3160,7 +3158,7 @@ packages: '@typescript-eslint/visitor-keys': 5.38.1 dev: true - /@typescript-eslint/type-utils/5.38.1_eslint@8.24.0+typescript@4.8.4: + /@typescript-eslint/type-utils/5.38.1_ypn2ylkkyfa5i233caldtndbqa: resolution: {integrity: sha512-UU3j43TM66gYtzo15ivK2ZFoDFKKP0k03MItzLdq0zV92CeGCXRfXlfQX5ILdd4/DSpHkSjIgLLLh1NtkOJOAw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3171,7 +3169,7 @@ packages: optional: true dependencies: '@typescript-eslint/typescript-estree': 5.38.1_typescript@4.8.4 - '@typescript-eslint/utils': 5.38.1_eslint@8.24.0+typescript@4.8.4 + '@typescript-eslint/utils': 5.38.1_ypn2ylkkyfa5i233caldtndbqa debug: 4.3.4 eslint: 8.24.0 tsutils: 3.21.0_typescript@4.8.4 @@ -3185,7 +3183,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.38.1_f1deb5be19df0fe0ff039530117daddf: + /@typescript-eslint/typescript-estree/5.38.1_6hpllpqz34h6b7ydsuybc7nn34: resolution: {integrity: sha512-99b5e/Enoe8fKMLdSuwrfH/C0EIbpUWmeEKHmQlGZb8msY33qn1KlkFww0z26o5Omx7EVjzVDCWEfrfCDHfE7g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3227,7 +3225,7 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.38.1_eslint@8.24.0+typescript@4.8.4: + /@typescript-eslint/utils/5.38.1_ypn2ylkkyfa5i233caldtndbqa: resolution: {integrity: sha512-oIuUiVxPBsndrN81oP8tXnFa/+EcZ03qLqPDfSZ5xIJVm7A9V0rlkQwwBOAGtrdN70ZKDlKv+l1BeT4eSFxwXA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3305,7 +3303,7 @@ packages: magic-string: 0.26.3 regenerator-runtime: 0.13.9 systemjs: 6.12.6 - terser: 5.10.0 + terser: 5.10.0_acorn@8.8.0 vite: 3.1.4_sass@1.55.0+terser@5.10.0 dev: true @@ -3430,15 +3428,11 @@ packages: '@vue/compiler-dom': 3.2.40 '@vue/shared': 3.2.40 - /@vue/devtools-api/6.0.9: - resolution: {integrity: sha512-O9tAMBMNMAMzgvbSS3OZlTpfgKCGjvjo5LTjWNtQ/M6A/SKWghJfvoMKuQL/vykLb6rjB/AkaQVFg9yDHprN6w==} - dev: false - /@vue/devtools-api/6.2.1: resolution: {integrity: sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ==} dev: false - /@vue/eslint-config-typescript/11.0.2_b985cba226e1126d4cc23df4d3ba9cd4: + /@vue/eslint-config-typescript/11.0.2_xgc4xirg4ejg2tgchx2nhou42q: resolution: {integrity: sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: @@ -3449,8 +3443,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.38.1_17e047bdec5ec7c01e9d134b6813cb9c - '@typescript-eslint/parser': 5.38.1_eslint@8.24.0+typescript@4.8.4 + '@typescript-eslint/eslint-plugin': 5.38.1_c7qepppml3d4ahu5cnfwqe6ltq + '@typescript-eslint/parser': 5.38.1_ypn2ylkkyfa5i233caldtndbqa eslint: 8.24.0 eslint-plugin-vue: 9.5.1_eslint@8.24.0 typescript: 4.8.4 @@ -3557,7 +3551,7 @@ packages: resolution: {integrity: sha512-GnnfjbzIPJIh9ngL9s9oGU1+Hx/h5/KFqTfJykzh/1xjaHkedV9g0MASpdmPZIP+ynNhKAcEfA6g5i8KXwtoMA==} dev: false - /@vueuse/router/9.3.0_vue-router@4.1.5+vue@3.2.40: + /@vueuse/router/9.3.0_c7eza3xvlyb4mo6qeit5ggeo6u: resolution: {integrity: sha512-UFN2MFciprH21oYsAgNHeDJ4Bd86HpRm9gximSN8j6h4fc2aa62fvfhprfHqdTxYAcgcGkMwcc9TO75jOvr8gg==} peerDependencies: vue-router: '>=4.0.0-rc.1' @@ -5578,7 +5572,7 @@ packages: resolution: {integrity: sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==} engines: {node: ^12.20.0 || ^14.14.0 || >=16.0.0} dependencies: - '@typescript-eslint/typescript-estree': 5.38.1_f1deb5be19df0fe0ff039530117daddf + '@typescript-eslint/typescript-estree': 5.38.1_6hpllpqz34h6b7ydsuybc7nn34 ast-module-types: 3.0.0 node-source-walk: 5.0.0 typescript: 4.8.4 @@ -10096,7 +10090,7 @@ packages: engines: {node: '>=6'} dev: true - /pinia/2.0.22_typescript@4.8.4+vue@3.2.40: + /pinia/2.0.22_bfjwoga25wxjazzogo7o372nwq: resolution: {integrity: sha512-u+b8/BC+tmvo3ACbYO2w5NfxHWFOjvvw9DQnyT0dW8aUMCPRQT5QnfZ5R5W2MzZBMTeZRMQI7V/QFbafmM9QHw==} peerDependencies: '@vue/composition-api': ^1.4.0 @@ -10339,7 +10333,7 @@ packages: peerDependencies: postcss: ^8.2 dependencies: - '@csstools/selector-specificity': 2.0.2_cd239324a5aeb6e3cee0fb61f6a33448 + '@csstools/selector-specificity': 2.0.2_zurzgjffv23ohtxa7nq7nizuja postcss: 8.4.17 postcss-selector-parser: 6.0.10 dev: true @@ -11055,7 +11049,7 @@ packages: glob: 7.2.0 dev: true - /rollup-plugin-terser/7.0.2_rollup@2.79.1: + /rollup-plugin-terser/7.0.2_acorn@8.8.0+rollup@2.79.1: resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==} peerDependencies: rollup: ^2.0.0 @@ -11064,7 +11058,9 @@ packages: jest-worker: 26.6.2 rollup: 2.79.1 serialize-javascript: 4.0.0 - terser: 5.10.0 + terser: 5.10.0_acorn@8.8.0 + transitivePeerDependencies: + - acorn dev: true /rollup-plugin-visualizer/5.8.2_rollup@2.79.1: @@ -11946,10 +11942,12 @@ packages: supports-hyperlinks: 2.2.0 dev: true - /terser/5.10.0: + /terser/5.10.0_acorn@8.8.0: resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==} engines: {node: '>=10'} hasBin: true + peerDependencies: + acorn: ^8.5.0 peerDependenciesMeta: acorn: optional: true @@ -12155,7 +12153,7 @@ packages: resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==} dev: true - /ts-node/10.8.1_8274f11304fdf7eb271c33cd723ceaff: + /ts-node/10.8.1_qj2pceye7x36wjy4gpgxephk74: resolution: {integrity: sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==} hasBin: true peerDependencies: @@ -12553,20 +12551,21 @@ packages: extsprintf: 1.3.0 dev: true - /vite-plugin-pwa/0.13.1_vite@3.1.4: + /vite-plugin-pwa/0.13.1_bhe5iaipiq3lmbaxwdxgnnn2gq: resolution: {integrity: sha512-NR3dIa+o2hzlzo4lF4Gu0cYvoMjSw2DdRc6Epw1yjmCqWaGuN86WK9JqZie4arNlE1ZuWT3CLiMdiX5wcmmUmg==} peerDependencies: vite: ^3.1.0 + workbox-build: ^6.5.4 + workbox-window: ^6.5.4 dependencies: debug: 4.3.4 fast-glob: 3.2.11 pretty-bytes: 6.0.0 rollup: 2.79.1 vite: 3.1.4_sass@1.55.0+terser@5.10.0 - workbox-build: 6.5.4 + workbox-build: 6.5.4_acorn@8.8.0 workbox-window: 6.5.4 transitivePeerDependencies: - - '@types/babel__core' - supports-color dev: true @@ -12601,12 +12600,12 @@ packages: resolve: 1.22.1 rollup: 2.78.0 sass: 1.55.0 - terser: 5.10.0 + terser: 5.10.0_acorn@8.8.0 optionalDependencies: fsevents: 2.3.2 dev: true - /vitest/0.23.4_ddc85b0b7a78b2cfae025c8e16b7f605: + /vitest/0.23.4_3xefwc32pczm7lqclshbnn7wau: resolution: {integrity: sha512-iukBNWqQAv8EKDBUNntspLp9SfpaVFbmzmM0sNcnTxASQZMzRw3PsM6DMlsHiI+I6GeO5/sYDg3ecpC+SNFLrQ==} engines: {node: '>=v14.16.0'} hasBin: true @@ -12757,15 +12756,6 @@ packages: '@vue/server-renderer': 3.2.40_vue@3.2.40 '@vue/shared': 3.2.40 - /vuex/4.0.2_vue@3.2.40: - resolution: {integrity: sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==} - peerDependencies: - vue: ^3.0.2 - dependencies: - '@vue/devtools-api': 6.0.9 - vue: 3.2.40 - dev: false - /wait-on/6.0.1: resolution: {integrity: sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==} engines: {node: '>=10.0.0'} @@ -12929,7 +12919,7 @@ packages: workbox-core: 6.5.4 dev: true - /workbox-build/6.5.4: + /workbox-build/6.5.4_acorn@8.8.0: resolution: {integrity: sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==} engines: {node: '>=10.0.0'} dependencies: @@ -12937,7 +12927,7 @@ packages: '@babel/core': 7.17.2 '@babel/preset-env': 7.16.11_@babel+core@7.17.2 '@babel/runtime': 7.17.2 - '@rollup/plugin-babel': 5.3.0_@babel+core@7.17.2+rollup@2.79.1 + '@rollup/plugin-babel': 5.3.0_pf2mys4p2khuj2gysypj3zzjia '@rollup/plugin-node-resolve': 11.2.1_rollup@2.79.1 '@rollup/plugin-replace': 2.4.2_rollup@2.79.1 '@surma/rollup-plugin-off-main-thread': 2.2.3 @@ -12949,7 +12939,7 @@ packages: lodash: 4.17.21 pretty-bytes: 5.6.0 rollup: 2.79.1 - rollup-plugin-terser: 7.0.2_rollup@2.79.1 + rollup-plugin-terser: 7.0.2_acorn@8.8.0+rollup@2.79.1 source-map: 0.8.0-beta.0 stringify-object: 3.3.0 strip-comments: 2.0.1 @@ -12972,6 +12962,7 @@ packages: workbox-window: 6.5.4 transitivePeerDependencies: - '@types/babel__core' + - acorn - supports-color dev: true @@ -12981,7 +12972,7 @@ packages: workbox-core: 6.5.4 dev: true - /workbox-cli/6.5.4: + /workbox-cli/6.5.4_acorn@8.8.0: resolution: {integrity: sha512-+Cc0jYh25MofhCROZqfQkpYSAGvykyrUVekuuPaLFbJ8qxX/zzX8hRRpglfwxDwokAjz8S20oEph4s+MyQc+Yw==} engines: {node: '>=10.0.0'} hasBin: true @@ -12998,9 +12989,10 @@ packages: stringify-object: 3.3.0 upath: 1.2.0 update-notifier: 4.1.3 - workbox-build: 6.5.4 + workbox-build: 6.5.4_acorn@8.8.0 transitivePeerDependencies: - '@types/babel__core' + - acorn - supports-color dev: true diff --git a/src/App.vue b/src/App.vue index 81fcf611cf..abfce27d7e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,7 +18,6 @@ import {computed, watch, type Ref} from 'vue' import {useRouter} from 'vue-router' import {useRouteQuery} from '@vueuse/router' -import {useStore} from '@/store' import {useI18n} from 'vue-i18n' import isTouchDevice from 'is-touch-device' import {success} from '@/message' @@ -34,16 +33,17 @@ import Ready from '@/components/misc/ready.vue' import {setLanguage} from './i18n' import AccountDeleteService from '@/services/accountDelete' +import {useBaseStore} from '@/stores/base' import {useColorScheme} from '@/composables/useColorScheme' import {useBodyClass} from '@/composables/useBodyClass' import {useAuthStore} from './stores/auth' -const store = useStore() +const baseStore = useBaseStore() const authStore = useAuthStore() const router = useRouter() useBodyClass('is-touch', isTouchDevice()) -const keyboardShortcutsActive = computed(() => store.state.keyboardShortcutsActive) +const keyboardShortcutsActive = computed(() => baseStore.keyboardShortcutsActive) const authUser = computed(() => authStore.authUser) const authLinkShare = computed(() => authStore.authLinkShare) diff --git a/src/components/home/MenuButton.vue b/src/components/home/MenuButton.vue index 49a2528635..40077000d6 100644 --- a/src/components/home/MenuButton.vue +++ b/src/components/home/MenuButton.vue @@ -1,8 +1,8 @@