Merge pull request #49 from team-Ollie/main

[deploy] deploy <- main
team-Ollie · Jul 2, 2024 · 2ce0047 · 2ce0047
2 parents 0351d80 + d84e06a
commit 2ce0047
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/components/NavBar.tsx b/components/NavBar.tsx
@@ -20,7 +20,7 @@ const NavBar = () => {
     <>
       <div className="w-full min-h-[4rem]" />
       <div
-        className="flex flex-basis h-[4rem] w-full fixed inset-x-0 bottom-0 z-10"
+        className="flex flex-basis h-[4rem] w-full fixed inset-x-0 bottom-0 z-9"
         style={{
           borderTop: "0.5px solid rgba(112, 115, 124, 0.16)",
           backgroundColor: "#ffffff",

diff --git a/components/challenge/ChallengeCalendar.tsx b/components/challenge/ChallengeCalendar.tsx
@@ -19,8 +19,8 @@ export default function ChallengeCalendar({
     setClickedDate(clickedDate);
   };
 
-  const disableAllDates = ({ date }) => {
-    return true;
+  const disableDates = ({ date, view }) => {
+    return view === "month";
   };
 
   const customTileContent = ({ date, view }: { date: Date; view: string }) => {
@@ -58,7 +58,7 @@ export default function ChallengeCalendar({
           prev2Label={null}
           minDate={new Date(2024, 4, 1)}
           tileContent={customTileContent}
-          tileDisabled={disableAllDates}
+          tileDisabled={disableDates}
         />
       </StyledCalendarWrapper>
     </div>