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/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

@@ -5,8 +5,6 @@
     font-size: 10pt;
     background-color: black;
     color: white;
-  display: flex;
-  flex-direction: column;
     width: 100%;
     height: 290px;
     overflow: hidden;

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;