Merge pull request #57 from Kisagi07/patch/get-toda-goal-using-client-date-instead-of-server

Use Browser Timezone When Getting Today Total Focus

Author: Kisagi07

app/components/SolCycle.tsx

@@ -242,7 +242,12 @@ const SolCycle = () => {
         setDailyTarget(response.toString());
       }
     });
-    getTodayTotalFocus().then((response) => {
+
+    // Get locale for today total focus
+    const locale = navigator.language;
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;    
+
+    getTodayTotalFocus(timeZone, locale).then((response) => {
       if (response === "FAIL") {
         toast("Failed to get today total focus", "red");
       } else if (response) {

lib/getTodayTotalFocus.ts

@@ -3,11 +3,11 @@
 import redis from "@/app/upstash";
 import getTodayDateString from "@/utils/getTodayDateString";
 
-const getTodayTotalFocus = async () => {
+const getTodayTotalFocus = async (timezone:string, locale:string) => {
   try {
     const response = await redis.get<DayFocus[]>("total-focus");
     if (response) {
-      const todayDate = getTodayDateString();
+      const todayDate = getTodayDateString(timezone, locale);
       const today = response.find((day) => day.date === todayDate);
       if (today) {
         return today.total;

utils/getTodayDateString.ts

@@ -1,9 +1,14 @@
-const getTodayDateString = () => {
+const getTodayDateString = (timeZone:string, locale:string) => {
   const now = new Date();
-  const year = now.getFullYear();
-  const month = now.getMonth();
-  const date = now.getDate();
-  const dateString = `${year}-${month + 1}-${date}`;
-  return dateString;
+  
+  const formatter = new Intl.DateTimeFormat(locale,{timeZone, year: "numeric", month: "2-digit", "day": "2-digit"});
+
+  // Format returns "YYYY-MM-DD" for "en-CA" locale
+  const parts = formatter.formatToParts(now);
+  const year = parts.find(p => p.type === "year")?.value;
+  const month = parts.find(p => p.type === "month")?.value;
+  const day = parts.find(p => p.type === "day")?.value;
+
+  return `${year}-${month}-${day}`;
 };
 export default getTodayDateString;