Brendon/dashy
1
0
Fork 0
mirror of https://github.com/BrenBroZAYT/dashy.git synced 2026-06-15 08:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fixes theme not updated (#774)

Browse Source
This commit is contained in:
Alicia Sykes
2022-06-30 18:22:26 +01:00
parent 7e861b71ae
commit a2442c7349
5 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/store.js
+2 -8
View File
@@ -71,7 +71,7 @@ const store = new Vuex.Store({
return state.remoteConfig.pages || [];
},
theme(state) {
return state.config.appConfig.theme;
return localStorage[localStorageKeys.THEME] || state.config.appConfig.theme;
},
webSearch(state, getters) {
return getters.appConfig.webSearch || {};
@@ -272,6 +272,7 @@ const store = new Vuex.Store({
const newConfig = { ...state.config };
newConfig.appConfig.theme = theme;
state.config = newConfig;
localStorage.setItem(localStorageKeys.THEME, theme);
InfoHandler('Theme updated', InfoKeys.VISUAL);
},
[SET_CUSTOM_COLORS](state, customColors) {
@@ -318,13 +319,6 @@ const store = new Vuex.Store({
commit(SET_REMOTE_CONFIG, yaml.load((await axios.get('/conf.yml')).data));
const deepCopy = (json) => JSON.parse(JSON.stringify(json));
const config = deepCopy(new ConfigAccumulator().config());
if (config.appConfig?.theme) {
// Save theme defined in conf.yml as primary
localStorage.setItem(localStorageKeys.PRIMARY_THEME, config.appConfig.theme);
// This will set theme back to primary in case we were on a themed page
// and the index page is loaded w/o navigation (e.g. modifying browser location)
localStorage.setItem(localStorageKeys.THEME, config.appConfig.theme);
}
commit(SET_CONFIG, config);
},
/* Fetch config for a sub-page (sections and pageInfo only) */