From c926ed7ac168e4a01c8828cda8d29911920f3434 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 30 Jan 2025 21:56:07 +0200 Subject: [PATCH] pleroma-fe boots once again --- package.json | 1 + src/App.js | 4 +- src/App.vue | 2 +- src/boot/after_store.js | 2 +- src/components/conversation/conversation.js | 6 +- .../extra_notifications.js | 7 +- src/components/font_control/font_control.js | 5 +- src/components/nav_panel/nav_panel.js | 2 +- src/components/navigation/navigation_pins.js | 7 +- .../settings_modal/settings_modal.js | 28 +- .../settings_modal/settings_modal.vue | 2 +- .../settings_modal_admin_content.js | 7 +- .../settings_modal_user_content.js | 4 +- .../settings_modal/tabs/appearance_tab.js | 12 +- .../tabs/style_tab/style_tab.js | 6 +- .../tabs/theme_tab/theme_tab.js | 2 +- src/components/user_avatar/user_avatar.js | 3 +- src/main.js | 11 +- src/modules/config.js | 169 +- src/modules/default_config_state.js | 164 + src/modules/notifications.js | 4 +- src/modules/statuses.js | 1 - .../notification_utils/notification_utils.js | 3 +- src/services/style_setter/style_setter.js | 5 +- src/stores/interface.js | 530 ++- yarn.lock | 3021 ++++++----------- 26 files changed, 1763 insertions(+), 2245 deletions(-) create mode 100644 src/modules/default_config_state.js diff --git a/package.json b/package.json index 4f70f4fc1..85f1d3873 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "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 87bf8319f..ca218cfff 100644 --- a/src/App.js +++ b/src/App.js @@ -62,7 +62,7 @@ export default { document.getElementById('modal').classList = ['-' + this.layoutType] }, mounted () { - if (this.$store.state.interface.themeApplied) { + if (useInterfaceStore().themeApplied) { this.removeSplash() } }, @@ -71,7 +71,7 @@ export default { }, computed: { themeApplied () { - return this.$store.state.interface.themeApplied + return useInterfaceStore().themeApplied }, layoutModalClass () { return '-' + this.layoutType diff --git a/src/App.vue b/src/App.vue index 762e18515..34cc6b804 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@