From 153b29bc7beb9df7a6fabd5b66974c2dfbbbe07f Mon Sep 17 00:00:00 2001
From: Sergei Birukov <suxscribe@gmail.com>
Date: Sun, 24 Mar 2024 18:42:49 +0300
Subject: [PATCH] Update

Fix border between client blocks
Add updateCharts computed
Remove unnecessary parameter in refresh()
---
 src/tailwind.config.js                | 30 ---------------------------
 webui/src/App.vue                     |  7 +++++--
 webui/src/components/Client.vue       |  5 +----
 webui/src/components/ClientCharts.vue |  6 +++---
 webui/src/store/store.js              | 18 +++++++++-------
 5 files changed, 20 insertions(+), 46 deletions(-)
 delete mode 100644 src/tailwind.config.js

diff --git a/src/tailwind.config.js b/src/tailwind.config.js
deleted file mode 100644
index bc7b40da..00000000
--- a/src/tailwind.config.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-
-'use strict';
-
-module.exports = {
-  darkMode: 'selector',
-  content: ['./www/**/*.{html,js}'],
-  theme: {
-    screens: {
-      xxs: '450px',
-      xs: '576px',
-      sm: '640px',
-      md: '768px',
-      lg: '1024px',
-      xl: '1280px',
-      '2xl': '1536px',
-    },
-  },
-  plugins: [
-    function addDisabledClass({ addUtilities }) {
-      const newUtilities = {
-        '.is-disabled': {
-          opacity: '0.25',
-          cursor: 'default',
-        },
-      };
-      addUtilities(newUtilities);
-    },
-  ],
-};
diff --git a/webui/src/App.vue b/webui/src/App.vue
index 5de9147b..5ac04823 100644
--- a/webui/src/App.vue
+++ b/webui/src/App.vue
@@ -17,7 +17,11 @@
 
           <div v-if="clients && clients.length > 0">
             <!-- Client -->
-            <div v-for="client in clients" :key="client.id">
+            <div
+              v-for="client in clients"
+              :key="client.id"
+              class="relative overflow-hidden border-b last:border-b-0 border-gray-100 dark:border-neutral-600 border-solid"
+            >
               <Client :client="client" />
             </div>
           </div>
@@ -125,7 +129,6 @@ onBeforeMount(() => {
     .getSession()
     .then((session) => {
       authenticated.value = session.authenticated;
-      // authenticated.value = false; //debug
       requiresPassword.value = session.requiresPassword;
       refresh();
       refreshInterval.value = setInterval(refresh, 1000);
diff --git a/webui/src/components/Client.vue b/webui/src/components/Client.vue
index 8526222d..90f73fdd 100644
--- a/webui/src/components/Client.vue
+++ b/webui/src/components/Client.vue
@@ -1,8 +1,5 @@
 <template>
-  <div
-    v-if="client"
-    class="relative overflow-hidden border-b last:border-b-0 border-gray-100 dark:border-neutral-600 border-solid"
-  >
+  <div v-if="client">
     <!-- Chart -->
     <ClientCharts :client="client" />
 
diff --git a/webui/src/components/ClientCharts.vue b/webui/src/components/ClientCharts.vue
index 317a1408..f8e11002 100644
--- a/webui/src/components/ClientCharts.vue
+++ b/webui/src/components/ClientCharts.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- TODO: Individual bars are too wide -->
-    <div v-if="uiChartType && uiShowCharts" class="absolute z-0 bottom-0 left-0 right-0 h-6">
+    <div v-if="updateCharts" class="absolute z-0 bottom-0 left-0 right-0 h-6">
       <VueApexCharts
         width="100%"
         height="100%"
@@ -9,7 +9,7 @@
         :series="[{ name: 'Upload (TX)', data: client?.transferTxHistory }]"
       />
     </div>
-    <div v-if="uiChartType && uiShowCharts" class="absolute z-0 top-0 left-0 right-0 h-6">
+    <div v-if="updateCharts" class="absolute z-0 top-0 left-0 right-0 h-6">
       <VueApexCharts
         width="100%"
         height="100%"
@@ -46,7 +46,7 @@ defineProps({
 });
 
 const store = useStore();
-const { uiShowCharts, uiChartType, uiTheme, prefersDarkScheme } = storeToRefs(store);
+const { uiChartType, uiTheme, prefersDarkScheme, updateCharts } = storeToRefs(store);
 
 const darkOrLight = computed(() => {
   if (uiTheme.value === 'auto') {
diff --git a/webui/src/store/store.js b/webui/src/store/store.js
index c6bfead5..0332713f 100644
--- a/webui/src/store/store.js
+++ b/webui/src/store/store.js
@@ -1,5 +1,5 @@
 import API from '@/services/api';
-import { ref, reactive } from 'vue';
+import { ref, computed } from 'vue';
 import sha256 from 'crypto-js/sha256';
 
 import { defineStore } from 'pinia';
@@ -13,7 +13,7 @@ export const useStore = defineStore('store', () => {
   const requiresPassword = ref(null);
 
   const clients = ref(null);
-  const clientsPersist = reactive({});
+  const clientsPersist = ref({});
   const clientToDelete = ref(null);
   const clientCreateShowModal = ref(null);
   const clientCreateName = ref('');
@@ -28,6 +28,10 @@ export const useStore = defineStore('store', () => {
   const uiShowCharts = ref(localStorage.getItem('uiShowCharts') === '1');
   const uiTrafficStats = ref(false);
 
+  const updateCharts = computed(() => {
+    return uiChartType.value > 0 && uiShowCharts.value;
+  });
+
   function login(e) {
     e.preventDefault();
 
@@ -88,7 +92,7 @@ export const useStore = defineStore('store', () => {
     clientToDelete.value = null;
   }
 
-  async function refresh({ updateCharts = false } = {}) {
+  async function refresh() {
     if (!authenticated.value) return;
 
     try {
@@ -107,11 +111,10 @@ export const useStore = defineStore('store', () => {
         }
 
         // Debug
-        client.transferRx = clientsPersist[client.id].transferRxPrevious + Math.random() * 1000;
-        client.transferTx = clientsPersist[client.id].transferTxPrevious + Math.random() * 1000;
-        updateCharts = true; // DEV TODO: Update. Get from settings
+        // client.transferRx = clientsPersist[client.id].transferRxPrevious + Math.random() * 1000;
+        // client.transferTx = clientsPersist[client.id].transferTxPrevious + Math.random() * 1000;
 
-        if (updateCharts) {
+        if (updateCharts.value) {
           clientsPersist[client.id].transferRxCurrent =
             client.transferRx - clientsPersist[client.id].transferRxPrevious;
           clientsPersist[client.id].transferRxPrevious = client.transferRx;
@@ -185,6 +188,7 @@ export const useStore = defineStore('store', () => {
     uiChartType,
     uiShowCharts,
     uiTrafficStats,
+    updateCharts,
     login,
     logout,
     createClient,