From 1c0c66045165b4e81a2312c4306bd0e1917da044 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Tue, 10 May 2022 15:54:56 +0200
Subject: [PATCH] console: add a theme provider to not rely on CSS only

---
 console/frontend/src/App.vue                  |  17 +--
 console/frontend/src/components/DarkMode.vue  |  42 --------
 .../src/components/DarkModeSwitcher.vue       |  16 +++
 .../frontend/src/components/NavigationBar.vue |   4 +-
 .../frontend/src/components/ThemeProvider.vue |  40 +++++++
 .../frontend/src/components/WidgetGraph.vue   |  29 +++--
 console/frontend/src/components/WidgetTop.vue |  33 +++---
 console/frontend/src/views/VisualizePage.vue  | 102 ++++++++++--------
 8 files changed, 164 insertions(+), 119 deletions(-)
 delete mode 100644 console/frontend/src/components/DarkMode.vue
 create mode 100644 console/frontend/src/components/DarkModeSwitcher.vue
 create mode 100644 console/frontend/src/components/ThemeProvider.vue

diff --git a/console/frontend/src/App.vue b/console/frontend/src/App.vue
index 0f97ea5d..c469976c 100644
--- a/console/frontend/src/App.vue
+++ b/console/frontend/src/App.vue
@@ -1,11 +1,13 @@
 <template>
-  <AppNotifications />
-  <div class="flex max-h-screen flex-col">
-    <NavigationBar class="flex-none" />
-    <main class="relative flex grow overflow-y-auto">
-      <router-view />
-    </main>
-  </div>
+  <ThemeProvider>
+    <AppNotifications />
+    <div class="flex max-h-screen flex-col">
+      <NavigationBar class="flex-none" />
+      <main class="relative flex grow overflow-y-auto">
+        <router-view />
+      </main>
+    </div>
+  </ThemeProvider>
 </template>
 
 <script setup>
@@ -13,4 +15,5 @@ import "./tailwind.css";
 
 import NavigationBar from "./components/NavigationBar.vue";
 import AppNotifications from "./components/AppNotifications.vue";
+import ThemeProvider from "./components/ThemeProvider.vue";
 </script>
diff --git a/console/frontend/src/components/DarkMode.vue b/console/frontend/src/components/DarkMode.vue
deleted file mode 100644
index ec1cfd4c..00000000
--- a/console/frontend/src/components/DarkMode.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <button
-    type="button"
-    class="rounded-lg p-2.5 text-sm text-gray-500 hover:bg-gray-100 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-700"
-    @click="toggle()"
-  >
-    <MoonIcon v-if="!dark" class="h-5 w-5" />
-    <SunIcon v-if="dark" class="h-5 w-5" />
-  </button>
-</template>
-
-<script setup>
-import { ref, watch } from "vue";
-import { SunIcon, MoonIcon } from "@heroicons/vue/solid";
-
-const dark = ref(false);
-
-if (
-  localStorage.getItem("color-theme") === "dark" ||
-  (!("color-theme" in localStorage) &&
-    window.matchMedia("(prefers-color-scheme: dark)").matches)
-) {
-  dark.value = true;
-}
-
-watch(
-  dark,
-  (dark) => {
-    if (dark) {
-      document.documentElement.classList.add("dark");
-    } else {
-      document.documentElement.classList.remove("dark");
-    }
-  },
-  { immediate: true }
-);
-
-const toggle = () => {
-  dark.value = !dark.value;
-  localStorage.setItem("color-theme", dark.value ? "dark" : "light");
-};
-</script>
diff --git a/console/frontend/src/components/DarkModeSwitcher.vue b/console/frontend/src/components/DarkModeSwitcher.vue
new file mode 100644
index 00000000..62f807b2
--- /dev/null
+++ b/console/frontend/src/components/DarkModeSwitcher.vue
@@ -0,0 +1,16 @@
+<template>
+  <button
+    type="button"
+    class="rounded-lg p-2.5 text-sm text-gray-500 hover:bg-gray-100 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-700"
+    @click="toggle()"
+  >
+    <MoonIcon v-if="!isDark()" class="h-5 w-5" />
+    <SunIcon v-if="isDark()" class="h-5 w-5" />
+  </button>
+</template>
+
+<script setup>
+import { inject } from "vue";
+import { SunIcon, MoonIcon } from "@heroicons/vue/solid";
+const { isDark, toggle } = inject("darkMode");
+</script>
diff --git a/console/frontend/src/components/NavigationBar.vue b/console/frontend/src/components/NavigationBar.vue
index dff72729..1ba6eae2 100644
--- a/console/frontend/src/components/NavigationBar.vue
+++ b/console/frontend/src/components/NavigationBar.vue
@@ -17,7 +17,7 @@
         >
       </router-link>
       <div class="flex md:order-2">
-        <DarkMode />
+        <DarkModeSwitcher />
         <DisclosureButton
           class="ml-3 inline-flex items-center rounded-lg p-2 text-sm text-gray-500 hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600 md:hidden"
         >
@@ -70,7 +70,7 @@ import {
   XIcon,
   PresentationChartLineIcon,
 } from "@heroicons/vue/solid";
-import DarkMode from "./DarkMode.vue";
+import DarkModeSwitcher from "./DarkModeSwitcher.vue";
 
 const route = useRoute();
 const navigation = computed(() => [
diff --git a/console/frontend/src/components/ThemeProvider.vue b/console/frontend/src/components/ThemeProvider.vue
new file mode 100644
index 00000000..f17a3db8
--- /dev/null
+++ b/console/frontend/src/components/ThemeProvider.vue
@@ -0,0 +1,40 @@
+<template>
+  <slot></slot>
+</template>
+
+<script setup>
+import { ref, provide, watch } from "vue";
+
+const isDark = ref(false);
+const toggleDarkMode = () => {
+  isDark.value = !isDark.value;
+  localStorage.setItem("color-theme", isDark.value ? "dark" : "light");
+};
+
+if (
+  localStorage.getItem("color-theme") === "dark" ||
+  (!("color-theme" in localStorage) &&
+    window.matchMedia("(prefers-color-scheme: dark)").matches)
+) {
+  isDark.value = true;
+}
+
+watch(
+  isDark,
+  (isDark) => {
+    if (isDark) {
+      document.documentElement.classList.add("dark");
+    } else {
+      document.documentElement.classList.remove("dark");
+    }
+  },
+  { immediate: true }
+);
+
+provide("darkMode", {
+  isDark() {
+    return isDark.value;
+  },
+  toggle: toggleDarkMode,
+});
+</script>
diff --git a/console/frontend/src/components/WidgetGraph.vue b/console/frontend/src/components/WidgetGraph.vue
index 12236236..3781d40a 100644
--- a/console/frontend/src/components/WidgetGraph.vue
+++ b/console/frontend/src/components/WidgetGraph.vue
@@ -7,12 +7,14 @@
 </template>
 
 <script setup>
-import { ref, watch } from "vue";
+import { ref, watch, inject } from "vue";
 import { use, graphic } from "echarts/core";
 import { CanvasRenderer } from "echarts/renderers";
 import { LineChart } from "echarts/charts";
 import { TooltipComponent, GridComponent } from "echarts/components";
 import VChart from "vue-echarts";
+import { dataColor } from "../utils/palette.js";
+const { isDark } = inject("darkMode");
 
 use([CanvasRenderer, LineChart, TooltipComponent, GridComponent]);
 
@@ -55,21 +57,30 @@ const option = ref({
       type: "line",
       symbol: "none",
       lineStyle: {
-        color: "#5470c6",
         width: 1,
       },
-      areaStyle: {
-        opacity: 1,
-        color: new graphic.LinearGradient(0, 0, 0, 1, [
-          { offset: 0, color: "#5470c6" },
-          { offset: 1, color: "#5572c8" },
-        ]),
-      },
       data: [],
     },
   ],
 });
 
+watch(
+  isDark,
+  (isDark) => {
+    const theme = isDark ? "dark" : "light";
+    option.value.darkMode = isDark;
+    option.value.series[0].areaStyle = {
+      opacity: 0.9,
+      color: new graphic.LinearGradient(0, 0, 0, 1, [
+        { offset: 0, color: dataColor(0, false, theme) },
+        { offset: 1, color: dataColor(0, true, theme) },
+      ]),
+    };
+    option.value.series[0].lineStyle.color = dataColor(0, false, theme);
+  },
+  { immediate: true }
+);
+
 watch(
   () => props.refresh,
   async () => {
diff --git a/console/frontend/src/components/WidgetTop.vue b/console/frontend/src/components/WidgetTop.vue
index 0aef930d..f79e2171 100644
--- a/console/frontend/src/components/WidgetTop.vue
+++ b/console/frontend/src/components/WidgetTop.vue
@@ -8,12 +8,14 @@
 </template>
 
 <script setup>
-import { ref, watch } from "vue";
+import { ref, watch, inject } from "vue";
 import { use } from "echarts/core";
 import { CanvasRenderer } from "echarts/renderers";
 import { PieChart } from "echarts/charts";
 import { TooltipComponent, LegendComponent } from "echarts/components";
 import VChart from "vue-echarts";
+import { dataColor, dataColorGrey } from "../utils/palette.js";
+const { isDark } = inject("darkMode");
 
 use([CanvasRenderer, PieChart, TooltipComponent, LegendComponent]);
 
@@ -45,7 +47,6 @@ const option = ref({
     itemGap: 5,
     itemWidth: 14,
     itemHeight: 14,
-    backgroundColor: "rgba(255, 255, 255, 0.4)",
     textStyle: { fontSize: 10 },
     formatter(name) {
       return name.split(": ")[0];
@@ -57,21 +58,29 @@ const option = ref({
       label: { show: false },
       center: ["50%", "40%"],
       radius: "60%",
-      itemStyle: {
-        color({ name, dataIndex }) {
-          if (name === "Others") {
-            return "#aaa";
-          }
-          return ["#5470c6", "#91cc75", "#fac858", "#ee6666", "#73c0de"][
-            dataIndex % 5
-          ];
-        },
-      },
       data: [],
     },
   ],
 });
 
+watch(
+  isDark,
+  (isDark) => {
+    const theme = isDark ? "dark" : "light";
+    option.value.darkMode = isDark;
+    option.value.series.itemStyle = {
+      color({ name, dataIndex }) {
+        if (name === "Others") {
+          return dataColorGrey(0, false, theme);
+        }
+        return dataColor(dataIndex, false, theme);
+      },
+    };
+    option.value.legend.textStyle.color = isDark ? "#eee" : "#111";
+  },
+  { immediate: true }
+);
+
 watch(
   () => props.refresh,
   async () => {
diff --git a/console/frontend/src/views/VisualizePage.vue b/console/frontend/src/views/VisualizePage.vue
index c12e6f03..b2256b36 100644
--- a/console/frontend/src/views/VisualizePage.vue
+++ b/console/frontend/src/views/VisualizePage.vue
@@ -65,7 +65,7 @@
 </template>
 
 <script setup>
-import { ref, watch } from "vue";
+import { ref, watch, inject } from "vue";
 import { notify } from "notiwind";
 import { Date as SugarDate } from "sugar-date";
 import { use, graphic } from "echarts/core";
@@ -75,6 +75,7 @@ import { TooltipComponent, GridComponent } from "echarts/components";
 import VChart from "vue-echarts";
 import { ResizeRow } from "vue-resizer";
 import { dataColor, dataColorGrey } from "../utils/palette.js";
+const { isDark } = inject("darkMode");
 
 use([CanvasRenderer, LineChart, TooltipComponent, GridComponent]);
 
@@ -139,6 +140,7 @@ const request = ref({
     ],
   },
 });
+const fetchedData = ref({});
 
 watch(
   request,
@@ -161,56 +163,62 @@ watch(
       return;
     }
     const data = await response.json();
+    fetchedData.value = data;
+  },
+  { immediate: true }
+);
 
-    // Graphic
-    graph.value.xAxis.data = data.t.slice(1, -1);
-    graph.value.series = data.rows.map((rows, idx) => {
+watch([fetchedData, isDark], ([data, isDark]) => {
+  const theme = isDark ? "dark" : "light";
+
+  // Graphic
+  graph.value.darkMode = isDark;
+  graph.value.xAxis.data = data.t.slice(1, -1);
+  graph.value.series = data.rows.map((rows, idx) => {
+    const color = rows.some((name) => name === "Other")
+      ? dataColorGrey
+      : dataColor;
+    return {
+      type: "line",
+      name: rows.join(" — "),
+      symbol: "none",
+      itemStyle: {
+        color: color(idx, false, theme),
+      },
+      lineStyle: {
+        color: color(idx, false, theme),
+        width: 1,
+      },
+      areaStyle: {
+        opacity: 0.95,
+        color: new graphic.LinearGradient(0, 0, 0, 1, [
+          { offset: 0, color: color(idx, false, theme) },
+          { offset: 1, color: color(idx, true, theme) },
+        ]),
+      },
+      emphasis: {
+        focus: "series",
+      },
+      stack: "all",
+      data: data.t.map((t, idx2) => [t, data.points[idx][idx2]]).slice(1, -1),
+    };
+  });
+
+  // Table
+  table.value = {
+    columns: request.value.dimensions,
+    rows: data.rows.map((rows, idx) => {
       const color = rows.some((name) => name === "Other")
         ? dataColorGrey
         : dataColor;
       return {
-        type: "line",
-        name: rows.join(" — "),
-        symbol: "none",
-        itemStyle: {
-          color: color(idx),
-        },
-        lineStyle: {
-          color: color(idx),
-          width: 1,
-        },
-        areaStyle: {
-          opacity: 0.95,
-          color: new graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: color(idx) },
-            { offset: 1, color: color(idx, true) },
-          ]),
-        },
-        emphasis: {
-          focus: "series",
-        },
-        stack: "all",
-        data: data.t.map((t, idx2) => [t, data.points[idx][idx2]]).slice(1, -1),
+        dimensions: rows,
+        style: `background-color: ${color(idx, false, theme)}`,
+        min: data.min[idx],
+        max: data.max[idx],
+        average: data.average[idx],
       };
-    });
-
-    // Table
-    table.value = {
-      columns: request.value.dimensions,
-      rows: data.rows.map((rows, idx) => {
-        const color = rows.some((name) => name === "Other")
-          ? dataColorGrey
-          : dataColor;
-        return {
-          dimensions: rows,
-          style: `background-color: ${color(idx)}`,
-          min: data.min[idx],
-          max: data.max[idx],
-          average: data.average[idx],
-        };
-      }),
-    };
-  },
-  { immediate: true }
-);
+    }),
+  };
+});
 </script>