fix rebase issues

src/components/Dashboard/Dashboard.tsx

@@ -16,11 +16,11 @@ export default function Dashboard() {
     const scheme = schemes[schemeIndex];
 
     // change background color based on time of day
-    const time = useEffect(() => {
+    useEffect(() => {
         const timer = setInterval(
             () => {
-                let d = new Date();
+                const d = new Date();
-                let hour = d.getHours();
+                const hour = d.getHours();
                 if (hour >= 7 && hour < 16) {
                     setSchemeIndex(0);
                 } else if (hour >= 16 && hour < 23) {

src/components/Datetime/style.module.css

@@ -19,11 +19,11 @@ img {
 }
 
 .divider {
-  animation: blink 3s step-end infinite;
+    animation: blink 3s step-end infinite;
 }
 
 @keyframes blink {
     50% {
-    opacity: 0;
+        opacity: 0;
-  }
+    }
 }

src/components/Flatastic/Flatastic.tsx

@@ -35,11 +35,11 @@ export default function Flatastic() {
             className = "irregular";
         } else {
             className = chore.timeLeftNext <= 0 ? "due" : "notDue";
-            timeLeftInDays = <span className={style.timeLeft}>
+            timeLeftInDays = (
-                {Math.abs(
+                <span className={style.timeLeft}>
-                    Math.floor(chore.timeLeftNext / (60 * 60 * 24)),
+                    {Math.abs(Math.floor(chore.timeLeftNext / (60 * 60 * 24)))}d
-                )}d
+                </span>
-            </span>;
+            );
         }
 
         return (

src/components/Footer/Footer.tsx

@@ -1,7 +1,3 @@
-import { useEffect, useState } from "react";
-import Marquee from "react-fast-marquee";
-
-import pasta from "./pasta.ts";
 import style from "./style.module.css";
 
 export default function Footer() {

src/components/Terminal/Terminal.tsx

@@ -1,8 +1,7 @@
-import { useHomeAssistantStore } from "@/store/homeAssistant";
 import { useEffect, useState } from "react";
-
+import { useHomeAssistantStore } from "@/store/homeAssistant";
-import style from "./style.module.css";
 import pasta from "./pasta.ts";
+import style from "./style.module.css";
 
 export default function Terminal() {
     const [index, setIndex] = useState(0);
@@ -44,7 +43,7 @@ export default function Terminal() {
             <div className={style.fetch}>
                 <span>
                     <pre>
-                        {"      "}-///:.{"      "}
+                        {"      -///:.      "}
                         <span className={style.username}>tent</span>@
                         <span className={style.hostname}>home</span>
                     </pre>

src/components/Terminal/style.module.css

@@ -1,49 +1,47 @@
 .container {
-  display: flex;
+    display: flex;
-  flex-direction: column;
+    flex-direction: column;
-  font-family: monospace;
+    font-family: monospace;
-  font-size: 10pt;
+    font-size: 10pt;
-  background-color: black;
+    background-color: black;
-  color: white;
+    color: white;
-  display: flex;
+    width: 100%;
-  flex-direction: column;
+    height: 290px;
-  width: 100%;
+    overflow: hidden;
-  height: 290px;
-  overflow: hidden;
 }
 
 .fetch {
-  display: flex;
+    display: flex;
-  flex-direction: column;
+    flex-direction: column;
-  padding-bottom: 10px;
+    padding-bottom: 10px;
 }
 
 .prompt {
-  color: lightgreen;
+    color: lightgreen;
 }
 
 .username {
-  color: violet;
+    color: violet;
 }
 
 .hostname {
-  color: skyblue;
+    color: skyblue;
 }
 
 .temp {
-  color: pink;
+    color: pink;
-  font-weight: bold;
+    font-weight: bold;
 }
 
 .humidity {
-  color: skyblue;
+    color: skyblue;
-  font-weight: bold;
+    font-weight: bold;
 }
 
 .plants {
-  color: lightgreen;
+    color: lightgreen;
 }
 
 pre {
-  margin: 0;
+    margin: 0;
 }

src/index.css

@@ -1,5 +1,7 @@
 :root {
-    font-family: Noto Sans Condensed, sans-serif;
+    font-family:
+        Noto Sans Condensed,
+        sans-serif;
     line-height: 1.5;
     font-weight: 400;