feat: fix fetch entries

HereEast · Nov 17, 2024 · f4e198c · f4e198c
1 parent 6933b89
commit f4e198c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/client/src/components/layouts/Timeline.tsx b/client/src/components/layouts/Timeline.tsx
@@ -6,15 +6,20 @@ import { useAppContext, useUserYear } from "~/hooks";
 export function Timeline() {
   const { today } = useAppContext();
 
-  const { data } = useUserYear(today.year);
+  const { data, isLoading } = useUserYear(today.year);
 
   return (
-    <div className="flex flex-col items-center gap-6">
-      <Rating />
+    <>
+      {isLoading && <div>Loading...</div>}
+      {!isLoading && data?.year && (
+        <div className="flex flex-col items-center gap-6">
+          <Rating />
 
-      {data?.months.map((month) => (
-        <MonthCard key={month.month} year={data.year} monthData={month} />
-      ))}
-    </div>
+          {data?.months.map((month) => (
+            <MonthCard key={month.month} year={data.year} monthData={month} />
+          ))}
+        </div>
+      )}
+    </>
   );
 }
diff --git a/client/src/hooks/queries.ts b/client/src/hooks/queries.ts
@@ -4,7 +4,6 @@ import { getEntries } from "~/api/entries";
 import { getUserTasks } from "~/api/tasks";
 import { getUserYear } from "~/api/users";
 
-
 // Year
 export function useUserYear(year: number) {
   const { data, isLoading, isError } = useQuery({
@@ -37,7 +36,7 @@ export function useEntries(props: UseEntriesProps) {
   const { taskId, year, month, day } = props;
 
   const { data, isLoading, isError } = useQuery({
-    queryKey: ["entires"],
+    queryKey: ["entires", month, day, taskId],
     queryFn: () => getEntries({ taskId, year, month, day }),
   });