Revert "fix: use settings store to retrieve useColorFallback setting (#…

…533)" This reverts commit 23df3fb.
ActivityWatch · Mar 26, 2024 · 6bffa65 · 6bffa65 · github-actions · Mar 26, 2024
1 parent 23df3fb
commit 6bffa65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/route.js b/src/route.js
@@ -1,8 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 
-import { useSettingsStore } from '~/stores/settings';
-
 const Home = () => import('./views/Home.vue');
 
 // Activity views for desktop
@@ -32,8 +30,7 @@ const router = new VueRouter({
     {
       path: '/',
       redirect: _to => {
-        const settings = useSettingsStore();
-        return settings.landingpage || '/home';
+        return localStorage.landingpage || '/home';
       },
     },
     { path: '/home', component: Home },

diff --git a/src/util/color.ts b/src/util/color.ts
@@ -3,7 +3,6 @@ import { Category, matchString, loadClasses } from './classes';
 import Color from 'color';
 import * as d3 from 'd3';
 import { IEvent, IBucket } from './interfaces';
-import { useSettingsStore } from '~/stores/settings';
 
 // See here for examples:
 //   https://bl.ocks.org/pstuffa/3393ff2711a53975040077b7453781a9
@@ -100,8 +99,10 @@ export function getCategoryColorFromString(str: string): string {
 
 function fallbackColor(str: string): string {
   // Get fallback color
-  const settings = useSettingsStore();
-  if (settings.useColorFallback) {
+  // TODO: Fetch setting from somewhere better, where defaults are respected
+  const useColorFallback =
+    localStorage !== undefined ? localStorage.useColorFallback === 'true' : true;
+  if (useColorFallback) {
     return getColorFromString(str);
   } else {
     return COLOR_UNCAT;