π A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!
Vue awesomedashboarddockerhomelabhomepagemitnodejsorganizationproductivitypwaself-hostedstartpagevue
:fire: Use VueX store instead of props for router
Alicia Sykes0e5eca1b7bc1
diff --git a/src/components/Settings/ConfigLauncher.vue b/src/components/Settings/ConfigLauncher.vueindex 796c05e0..152119fc 100644--- a/src/components/Settings/ConfigLauncher.vue+++ b/src/components/Settings/ConfigLauncher.vue@@ -71,10 +71,16 @@ export default {IconWorkspaceView,IconMinimalView,},- props: {- sections: Array,- pageInfo: Object,- appConfig: Object,+ computed: {+ sections() {+ return this.$store.getters.sections;+ },+ appConfig() {+ return this.$store.getters.appConfig;+ },+ pageInfo() {+ return this.$store.getters.pageInfo;+ },},methods: {showEditor: function show() {diff --git a/src/components/Settings/SettingsContainer.vue b/src/components/Settings/SettingsContainer.vueindex 57a21b70..2d148a38 100644--- a/src/components/Settings/SettingsContainer.vue+++ b/src/components/Settings/SettingsContainer.vue@@ -11,8 +11,7 @@:confTheme="getInitialTheme()" :userThemes="getUserThemes()" /><LayoutSelector :displayLayout="displayLayout" @layoutUpdated="updateDisplayLayout"/><ItemSizeSelector :iconSize="iconSize" @iconSizeUpdated="updateIconSize" />- <ConfigLauncher :sections="sections" :pageInfo="pageInfo" :appConfig="appConfig"- @modalChanged="modalChanged" />+ <ConfigLauncher @modalChanged="modalChanged" /><AuthButtons v-if="userState != 'noone'" :userType="userState" /></div><div :class="`show-hide-container ${settingsVisible? 'hide-btn' : 'show-btn'}`">diff --git a/src/router.js b/src/router.jsindex e76efe42..a41918e9 100644--- a/src/router.js+++ b/src/router.js@@ -62,37 +62,30 @@ const router = new Router({path: '/',name: `landing-page-${getStartingView()}`,component: getStartingComponent(),- props: config,meta: makeMetaTags('Home Page'),},{ // Default home pagepath: routePaths.home,name: 'home',component: Home,- props: config,meta: makeMetaTags('Home Page'),},{ // Workspace view pagepath: routePaths.workspace,name: 'workspace',component: Workspace,- props: config,meta: makeMetaTags('Workspace'),},{ // Minimal view pagepath: routePaths.minimal,name: 'minimal',component: Minimal,- props: config,meta: makeMetaTags('Start Page'),},{ // The login pagepath: routePaths.login,name: 'login',component: Login,- props: {- appConfig: config.appConfig,- },beforeEnter: (to, from, next) => {// If the user already logged in + guest mode not enabled, then redirect homeif (isAuthenticated() && !isGuestAccessEnabled()) router.push({ path: '/' });@@ -109,7 +102,6 @@ const router = new Router({path: routePaths.download,name: 'download',component: () => import('./views/DownloadConfig.vue'),- props: config,meta: makeMetaTags('Download Config'),},{ // Page not found, any non-defined routes will land herediff --git a/src/views/DownloadConfig.vue b/src/views/DownloadConfig.vueindex 9a695052..ef3bf58c 100644--- a/src/views/DownloadConfig.vue+++ b/src/views/DownloadConfig.vue@@ -7,18 +7,13 @@ import JsonToYaml from '@/utils/JsonToYaml';export default {name: 'DownloadConfig',- props: {- sections: Array,- appConfig: Object,- pageInfo: Object,+ computed: {+ config() {+ return this.$store.state.config;+ },},data() {return {- config: {- appConfig: this.appConfig,- pageInfo: this.pageInfo,- sections: this.sections,- },jsonParser: JsonToYaml,};},diff --git a/src/views/Home.vue b/src/views/Home.vueindex 6c36bb2f..c73c11e4 100644--- a/src/views/Home.vue+++ b/src/views/Home.vue@@ -55,11 +55,6 @@ import Defaults, { localStorageKeys, iconCdns } from '@/utils/defaults';export default {name: 'home',- props: {- sections: Array, // Main site content- appConfig: Object, // Main site configuation (optional)- pageInfo: Object, // Page metadata (optional)- },components: {SettingsContainer,Section,@@ -71,6 +66,15 @@ export default {modalOpen: false, // When true, keybindings are disabled}),computed: {+ sections() {+ return this.$store.getters.sections;+ },+ appConfig() {+ return this.$store.getters.appConfig;+ },+ pageInfo() {+ return this.$store.getters.pageInfo;+ },/* Get class for num columns, if specified by user */colCount() {let { colCount } = this.appConfig;diff --git a/src/views/Login.vue b/src/views/Login.vueindex 27030208..cea52489 100644--- a/src/views/Login.vue+++ b/src/views/Login.vue@@ -91,9 +91,6 @@ export default {Button,Input,},- props: {- appConfig: Object,- },data() {return {username: '',@@ -104,6 +101,9 @@ export default {};},computed: {+ appConfig() {+ return this.$store.getters.appConfig;+ },/* Data for timeout dropdown menu, translated label + value in ms */dropDownMenu() {return [diff --git a/src/views/Minimal.vue b/src/views/Minimal.vueindex cf2b9aa9..95e6b101 100644--- a/src/views/Minimal.vue+++ b/src/views/Minimal.vue@@ -2,8 +2,7 @@<div class="minimal-home" :style="getBackgroundImage() + setColumnCount()"><!-- Buttons for config and home page --><div class="minimal-buttons">- <ConfigLauncher :sections="sections" :pageInfo="pageInfo" :appConfig="appConfig"- @modalChanged="modalChanged" class="config-launcher" />+ <ConfigLauncher @modalChanged="modalChanged" class="config-launcher" /></div><!-- Page title and search bar --><div class="title-and-search">@@ -60,11 +59,6 @@ import ConfigLauncher from '@/components/Settings/ConfigLauncher';export default {name: 'home',- props: {- sections: Array, // Main site content- appConfig: Object, // Main site configuation (optional)- pageInfo: Object,- },components: {MinimalSection,MinimalHeading,@@ -79,6 +73,17 @@ export default {tabbedView: true, // By default use tabs, when searching then show all insteadtheme: GetTheme(),}),+ computed: {+ sections() {+ return this.$store.getters.sections;+ },+ appConfig() {+ return this.$store.getters.appConfig;+ },+ pageInfo() {+ return this.$store.getters.pageInfo;+ },+ },watch: {/* When the theme changes, then call the update method */searchValue() {diff --git a/src/views/Workspace.vue b/src/views/Workspace.vueindex c23eb98f..ea84c042 100644--- a/src/views/Workspace.vue+++ b/src/views/Workspace.vue@@ -16,10 +16,6 @@ import { GetTheme, ApplyLocalTheme, ApplyCustomVariables } from '@/utils/ThemeHeexport default {name: 'Workspace',- props: {- sections: Array,- appConfig: Object,- },data: () => ({url: '',GetTheme,@@ -27,6 +23,12 @@ export default {ApplyCustomVariables,}),computed: {+ sections() {+ return this.$store.getters.sections;+ },+ appConfig() {+ return this.$store.getters.appConfig;+ },isMultiTaskingEnabled() {return this.appConfig.enableMultiTasking || false;},