From a1c0aeb8e7762893a2d421c0d8f83432df52386a Mon Sep 17 00:00:00 2001 From: rathi Date: Sun, 17 Nov 2024 20:51:10 -0500 Subject: [PATCH] fixed calendar --- .gitignore | 7 ++++ habits.db | Bin 20480 -> 20480 bytes src/components/Calendar.tsx | 66 ++++++++++++++++++++++++++++-------- 3 files changed, 59 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index a547bf3..a13576f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,10 @@ dist-ssr *.njsproj *.sln *.sw? + +# Database files +*.db +*.db-journal +*.sqlite +*.sqlite3 +*.sqlite-journal diff --git a/habits.db b/habits.db index 8c6f5f84bba8b24efe052c3c25c84057304f9fad..0e4c2f4bcffee12b0e1ad84452f8f6d6ec3fbe2f 100644 GIT binary patch delta 258 zcmZozz}T>Wae_3X)kGO*Myrhp3;FpO7#NuN-!kxj=YPw8hyTuIL4`B?lkdn23UjbC zGl-X@7MB>ZvoSM>f>@gr{_}IN^YUM2kl{0#%x+-Bp28Qx=fY>QSy12$uLGYfGovEA zk%5tkuA!l>p)sEf3g3iJnwe3N4M|=Kg>SUE#BKs3vkafaWOfH5c5gl_J_$a}&4L0q gc%21U7!?_jjFv?cFp&WZAQ>)=CSbHV+HWZ%0KU&OG5`Po delta 221 zcmZozz}T>Wae_3X@kAMCM&peM3;Fr^pE5A=-(ldt1A&_b70&Qaz9TOvoW{VwAS9ZY zQVe2niY6APq-|38&(Fci%YT_cg0EyUyMYm_3!e+0%Vt3VHa-JB8D>UBRwDx=6J0|? zT|;C3%M1!gd?WtL3<5}e!_6gj6BwB#_+lorI~cKQ@@evEZWa`H&1)pU!l=lIWRML1 YMFu4#0V8StiwuHD0*0HT{gyHU0LaTS1ONa4 diff --git a/src/components/Calendar.tsx b/src/components/Calendar.tsx index 60487b8..85e9b48 100644 --- a/src/components/Calendar.tsx +++ b/src/components/Calendar.tsx @@ -20,30 +20,32 @@ export function Calendar({ const daysOfWeek = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; return ( -
-
+
+

{currentMonth.toLocaleString('default', { month: 'long', year: 'numeric' })}

-
+
{daysOfWeek.map(day => ( -
{day}
+
+ {day} +
))} {Array.from({ length: getDaysInMonth(currentMonth.getFullYear(), currentMonth.getMonth()) }).map((_, index) => { const date = new Date( @@ -52,19 +54,55 @@ export function Calendar({ index + 1 ).toISOString().split('T')[0]; const completedHabits = getCompletedHabitsForDate(date); + const incompleteHabits = habits.filter(habit => !habit.completedDates.includes(date)); return (
- {index + 1} - {completedHabits.length > 0 && ( -
-
-
-
- {completedHabits.map(habit => habit.name).join(', ')} + {index + 1} + {habits.length > 0 && ( +
+
+
0 + ? 'bg-green-500 shadow-sm shadow-green-200' + : 'bg-gray-300 dark:bg-gray-600' + } rounded-full transition-colors duration-200`} + /> +
+
+ {completedHabits.length > 0 && ( +
+ + ✓ Completed + +
    + {completedHabits.map(habit => ( +
  • + {habit.name} +
  • + ))} +
+
+ )} + {incompleteHabits.length > 0 && ( +
+ + ○ Pending + +
    + {incompleteHabits.map(habit => ( +
  • + {habit.name} +
  • + ))} +
+
+ )} +