diff --git a/package.json b/package.json index 85f1d3873..4f70f4fc1 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "pako": "^2.1.0", "parse-link-header": "2.0.0", "phoenix": "1.7.18", - "pinia": "^2.0.33", "punycode.js": "2.3.1", "qrcode": "1.5.4", "querystring-es3": "0.2.1", diff --git a/src/App.js b/src/App.js index ca218cfff..3142d0629 100644 --- a/src/App.js +++ b/src/App.js @@ -17,8 +17,6 @@ import GlobalNoticeList from './components/global_notice_list/global_notice_list import { windowWidth, windowHeight } from './services/window_utils/window_utils' import { mapGetters } from 'vuex' import { defineAsyncComponent } from 'vue' -import { useShoutStore } from './stores/shout' -import { useInterfaceStore } from './stores/interface' export default { name: 'app', @@ -62,7 +60,7 @@ export default { document.getElementById('modal').classList = ['-' + this.layoutType] }, mounted () { - if (useInterfaceStore().themeApplied) { + if (this.$store.state.interface.themeApplied) { this.removeSplash() } }, @@ -71,7 +69,7 @@ export default { }, computed: { themeApplied () { - return useInterfaceStore().themeApplied + return this.$store.state.interface.themeApplied }, layoutModalClass () { return '-' + this.layoutType @@ -108,7 +106,7 @@ export default { } } }, - shout () { return useShoutStore().joined }, + shout () { return this.$store.state.shout.joined }, suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled }, showInstanceSpecificPanel () { return this.$store.state.instance.showInstanceSpecificPanel && @@ -134,7 +132,7 @@ export default { hideShoutbox () { return this.$store.getters.mergedConfig.hideShoutbox }, - layoutType () { return useInterfaceStore().layoutType }, + layoutType () { return this.$store.state.interface.layoutType }, privateMode () { return this.$store.state.instance.private }, reverseLayout () { const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig @@ -150,8 +148,8 @@ export default { }, methods: { updateMobileState () { - useInterfaceStore().setLayoutWidth(windowWidth()) - useInterfaceStore().setLayoutHeight(windowHeight()) + this.$store.dispatch('setLayoutWidth', windowWidth()) + this.$store.dispatch('setLayoutHeight', windowHeight()) }, removeSplash () { document.querySelector('#status').textContent = this.$t('splash.fun_' + Math.ceil(Math.random() * 4)) diff --git a/src/App.vue b/src/App.vue index 34cc6b804..762e18515 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@