From 0a89712965927e27d449117cb9ed7ddbc9d359ac Mon Sep 17 00:00:00 2001
From: Joshua Coles <josh@coles.to>
Date: Sun, 31 Dec 2023 14:47:54 +0000
Subject: [PATCH] Remove IDEA config, add types for things

---
 .gitignore                                   |  3 ++
 .idea/.gitignore                             |  5 ---
 .idea/inspectionProfiles/Project_Default.xml |  6 ----
 .idea/modules.xml                            |  8 -----
 .idea/tremor-dashboard.iml                   | 12 -------
 .idea/vcs.xml                                |  6 ----
 src/app/a.client.tsx                         | 37 ++++++++++++++------
 src/app/calendarOverviewCard.tsx             |  2 +-
 src/app/page.tsx                             |  4 ++-
 9 files changed, 34 insertions(+), 49 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/tremor-dashboard.iml
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index fd3dbb5..0109a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+# IDEA
+/.idea
+
 # dependencies
 /node_modules
 /.pnp
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index b58b603..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 03d9549..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 85b1200..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/tremor-dashboard.iml" filepath="$PROJECT_DIR$/.idea/tremor-dashboard.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/tremor-dashboard.iml b/.idea/tremor-dashboard.iml
deleted file mode 100644
index 24643cc..0000000
--- a/.idea/tremor-dashboard.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/app/a.client.tsx b/src/app/a.client.tsx
index 79b5159..713879b 100644
--- a/src/app/a.client.tsx
+++ b/src/app/a.client.tsx
@@ -15,7 +15,13 @@ export function SubjectOverviewCard({
 }) {
     const {
         data: _project
-    } = useSWR<any>(`/api/project?select=raw_json&toggl_id=eq.${projectId}`, fetcher);
+    } = useSWR<{
+        raw_json: {
+            name: string,
+            color: string,
+        }
+    }[]>(`/api/project?select=raw_json&toggl_id=eq.${projectId}`, fetcher);
+
     const [project, setProject] = useState({
         name: '',
         color: '',
@@ -43,7 +49,7 @@ export function SubjectOverviewCard({
     }, [data]);
 
     return (
-        <Card style={{ borderColor: project?.color }} decoration={'left'}>
+        <Card style={{borderColor: project?.color}} decoration={'left'}>
             <Title>{title ?? project?.name}</Title>
             <Text>Total</Text>
             <Metric>{(a / (60 * 60)).toFixed(2)} hours</Metric>
@@ -55,26 +61,37 @@ export function SubjectComparisonCard({projectIds}: {
     projectIds: number[]
 }) {
     const {
-        data,
+        data: rawData,
         error,
         isLoading,
-    } = useSWR<any[]>(`/api/time_entry?select=raw_json,project:project_id(name,raw_json)&project_id=in.(${projectIds.join(',')})`, fetcher, {});
+    } = useSWR<{
+        raw_json: {
+            seconds: number,
+        },
+        project: {
+            name: string,
+            raw_json: any
+        }
+    }[]>(`/api/time_entry?select=raw_json,project:project_id(name,raw_json)&project_id=in.(${projectIds.join(',')})`, fetcher, {});
 
-    const [a, setA] = useState<{ name: string, value: number }[]>([]);
+    const [breakdownData, setBreakdownData] = useState<{
+        name: string,
+        value: number
+    }[]>([]);
     const [colours, setColours] = useState<string[]>([]);
 
     useEffect(() => {
-        const a = R.toPairs(R.groupBy((entry) => entry.project.name, data ?? []))
+        const breakdownData = R.toPairs(R.groupBy((entry) => entry.project.name, rawData ?? []))
             .map(([name, entries]) => ({
                 name,
                 value: (entries ?? []).map((entry) => entry.raw_json.seconds).reduce((a, b) => a + b, 0),
                 colour: entries?.[0].project.raw_json.color
             }))
 
-        setA(a);
+        setBreakdownData(breakdownData);
 
-        setColours(a.map((entry) => entry.colour));
-    }, [data]);
+        setColours(breakdownData.map((entry) => entry.colour));
+    }, [rawData]);
 
     const valueFormatter = (number: number) => `${(number / (60 * 60)).toFixed(2)} hours`;
 
@@ -83,7 +100,7 @@ export function SubjectComparisonCard({projectIds}: {
             <Title>Relative Breakdown</Title>
             <DonutChart
                 className="mt-6"
-                data={a ?? []}
+                data={breakdownData ?? []}
                 category="value"
                 index="name"
                 valueFormatter={valueFormatter}
diff --git a/src/app/calendarOverviewCard.tsx b/src/app/calendarOverviewCard.tsx
index fa55d2b..1265998 100644
--- a/src/app/calendarOverviewCard.tsx
+++ b/src/app/calendarOverviewCard.tsx
@@ -12,7 +12,7 @@ import { Tooltip } from 'react-tooltip';
 
 const initialDate = dFns.parseISO('2023-12-15T00:00:00.000Z')
 const endDate = dFns.parseISO('2024-01-25T00:00:00.000Z')
-const projectIds = [
+export const projectIds = [
     195482340,
     195519024,
     195518593,
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 6735139..d0a4c60 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,5 +1,5 @@
 import {SubjectComparisonCard, SubjectOverviewCard} from "@/app/a.client";
-import {CalendarOverviewCard} from "@/app/calendarOverviewCard";
+import {CalendarOverviewCard, projectIds} from "@/app/calendarOverviewCard";
 
 export default function Home() {
     return (
@@ -26,6 +26,8 @@ export default function Home() {
                 />
 
                 <CalendarOverviewCard/>
+
+                <SubjectComparisonCard projectIds={projectIds}/>
             </div>
         </main>