From 0c7752ca36cb7a7b1613b78f532d28fb7dd16a25 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Fri, 5 Apr 2024 09:23:13 -0600
Subject: [PATCH] More color changes to fit design

---
 web/src/pages/Logs.tsx       | 53 ++++++++++--------------------------
 web/tailwind.config.js       |  8 +++---
 web/themes/theme-default.css | 20 +++++++++++---
 3 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/web/src/pages/Logs.tsx b/web/src/pages/Logs.tsx
index 48eaaa5d2..948fa8884 100644
--- a/web/src/pages/Logs.tsx
+++ b/web/src/pages/Logs.tsx
@@ -3,8 +3,6 @@ import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
 import { LogData, LogLine, LogSeverity } from "@/types/log";
 import copy from "copy-to-clipboard";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { IoIosAlert } from "react-icons/io";
-import { GoAlertFill } from "react-icons/go";
 import { LuCopy } from "react-icons/lu";
 import axios from "axios";
 
@@ -334,9 +332,9 @@ function Logs() {
 
       <div
         ref={contentRef}
-        className="w-full h-min my-2 font-mono text-sm sm:py-2 whitespace-pre-wrap overflow-auto no-scrollbar bg-secondary border rounded-md"
+        className="w-full h-min my-2 font-mono text-sm sm:py-2 whitespace-pre-wrap overflow-auto no-scrollbar bg-primary border border-secondary rounded-md"
       >
-        <div className="grid grid-cols-5 sm:grid-cols-8 md:grid-cols-12 *:p-2 *:text-sm *:text-secondary-foreground bg-secondary">
+        <div className="grid grid-cols-5 sm:grid-cols-8 md:grid-cols-12 *:p-2 *:text-sm *:text-secondary-foreground">
           <div className="p-1 flex items-center capitalize">Type</div>
           <div className="col-span-2 sm:col-span-1 flex items-center">
             Timestamp
@@ -361,7 +359,6 @@ function Logs() {
                     idx == logRange.start + 10 ? startLogRef : undefined
                   }
                   className={initialScroll ? "" : "invisible"}
-                  offset={idx}
                   line={logLines[idx - logRange.start]}
                 />
               );
@@ -379,70 +376,50 @@ type LogLineDataProps = {
   startRef?: (node: HTMLDivElement | null) => void;
   className: string;
   line: LogLine;
-  offset: number;
 };
-function LogLineData({ startRef, className, line, offset }: LogLineDataProps) {
+function LogLineData({ startRef, className, line }: LogLineDataProps) {
   // long log message
 
   const contentRef = useRef<HTMLDivElement | null>(null);
-  const [expanded, setExpanded] = useState(false);
-
-  const contentOverflows = useMemo(() => {
-    if (!contentRef.current) {
-      return false;
-    }
-
-    return contentRef.current.scrollWidth > contentRef.current.clientWidth;
-    // update on ref change
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [contentRef.current]);
 
   // severity coloring
 
   const severityClassName = useMemo(() => {
     switch (line.severity) {
       case "info":
-        return "text-secondary-foreground rounded-md";
+        return "text-primary-foreground/40 bg-muted";
       case "warning":
-        return "text-yellow-400 rounded-md";
+        return "text-warning-foreground bg-warning";
       case "error":
-        return "text-danger rounded-md";
+        return "text-destructive-foreground bg-destructive";
     }
   }, [line]);
 
   return (
     <div
       ref={startRef}
-      className={`py-2 grid grid-cols-5 sm:grid-cols-8 md:grid-cols-12 gap-2 ${offset % 2 == 0 ? "bg-secondary" : "bg-secondary/80"} border-t ${className} *:text-sm`}
+      className={`py-2 grid grid-cols-5 sm:grid-cols-8 md:grid-cols-12 gap-2 border-secondary border-t ${className} *:text-sm`}
     >
-      <div
-        className={`h-full p-1 flex items-center gap-2 capitalize ${severityClassName}`}
-      >
-        {line.severity == "error" ? (
-          <GoAlertFill className="size-5" />
-        ) : (
-          <IoIosAlert className="size-5" />
-        )}
-        {line.severity}
+      <div className="h-full p-1 flex items-center gap-2">
+        <div
+          className={`py-[1px] px-1 capitalize text-xs rounded-md ${severityClassName}`}
+        >
+          {line.severity}
+        </div>
       </div>
       <div className="h-full col-span-2 sm:col-span-1 flex items-center">
         {line.dateStamp}
       </div>
-      <div className="h-full col-span-2 flex items-center overflow-hidden text-ellipsis">
+      <div className="s-full col-span-2 overflow-hidden whitespace-nowrap text-ellipsis">
         {line.section}
       </div>
       <div className="w-full col-span-5 sm:col-span-4 md:col-span-8 flex justify-between items-center">
         <div
           ref={contentRef}
-          className={`w-[94%] flex items-center" ${expanded ? "" : "overflow-hidden whitespace-nowrap text-ellipsis"}`}
+          className="w-[94%] flex items-center overflow-hidden whitespace-nowrap text-ellipsis"
         >
           {line.content}
         </div>
-        {contentOverflows && (
-          <Button className="mr-4" onClick={() => setExpanded(!expanded)}>
-            ...
-          </Button>
-        )}
       </div>
     </div>
   );
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index 916e625d4..ba4e69536 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -43,10 +43,6 @@ module.exports = {
         ring: "hsl(var(--ring))",
         danger: "#ef4444",
         success: "#22c55e",
-        // detection colors
-        motion: "#991b1b",
-        object: "#06b6d4",
-        audio: "#ea580c",
         background: "hsl(var(--background))",
         foreground: "hsl(var(--foreground))",
         selected: "hsl(var(--selected))",
@@ -63,6 +59,10 @@ module.exports = {
           DEFAULT: "hsl(var(--destructive))",
           foreground: "hsl(var(--destructive-foreground))",
         },
+        warning: {
+          DEFAULT: "hsl(var(--warning))",
+          foreground: "hsl(var(--warning-foreground))",
+        },
         muted: {
           DEFAULT: "hsl(var(--muted))",
           foreground: "hsl(var(--muted-foreground))",
diff --git a/web/themes/theme-default.css b/web/themes/theme-default.css
index f0d793284..57c30fbee 100644
--- a/web/themes/theme-default.css
+++ b/web/themes/theme-default.css
@@ -48,8 +48,14 @@
     --destructive: hsl(0 84.2% 60.2%);
     --destructive: 0 84.2% 60.2%;
 
-    --destructive-foreground: hsl(210 40% 98%);
-    --destructive-foreground: 210 40% 98%;
+    --destructive-foreground: hsl(0 100% 83%);
+    --destructive-foreground: 0 100% 83%;
+
+    --warning: hsl(17 87% 18%);
+    --warning: 17 87% 18%;
+
+    --warning-foreground: hsl(32 100% 74%);
+    --warning-foreground: 32 100% 74%;
 
     --border: hsl(214.3 31.8% 91.4%);
     --border: 214.3 31.8% 91.4%;
@@ -133,8 +139,14 @@
     --destructive: hsl(0 62.8% 30.6%);
     --destructive: 0 62.8% 30.6%;
 
-    --destructive-foreground: hsl(210 40% 98%);
-    --destructive-foreground: 210 40% 98%;
+    --destructive-foreground: hsl(0 100% 83%);
+    --destructive-foreground: 0 100% 83%;
+
+    --warning: hsl(17 87% 18%);
+    --warning: 17 87% 18%;
+
+    --warning-foreground: hsl(32 100% 74%);
+    --warning-foreground: 32 100% 74%;
 
     --border: hsl(0, 0%, 32%);
     --border: 0 0% 32%;