Merge pull request #323 from oslokommune/develop

small fixes before release v2.7.0
oslokommune · Dec 29, 2021 · 82e7560 · 82e7560
2 parents f13ecbe + c36ae4b
commit 82e7560
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -58,22 +58,17 @@ export default {
 
     hasInStorage() {
       const mode = localStorage.getItem(this.LS_MODE);
-      return mode !== null;
+      return mode !== null && mode !== 'yellow';
     },
 
     setThemeMode(mode) {
-      this.saveThemeMode(mode);
       this.setTheme(mode);
       document.body.setAttribute('data-theme', mode);
     },
 
     getLocalThemeMode() {
       return localStorage.getItem(this.LS_MODE);
     },
-
-    saveThemeMode(mode) {
-      localStorage.setItem(this.LS_MODE, mode);
-    },
   },
 };
 

diff --git a/src/store/index.js b/src/store/index.js
@@ -114,8 +114,9 @@ export const getters = {
 export const actions = {
   ...moduleActions,
 
-  setTheme: async ({ commit }, payload) => {
+  setTheme: async ({ state, commit }, payload) => {
     commit('SET_THEME', payload);
+    localStorage.setItem(state.LS_MODE, payload);
 
     return true;
   },