From dab55f7cb4be60e1bdd787b9a24a19dd19aa9b7f Mon Sep 17 00:00:00 2001 From: WelldoneM Date: Thu, 7 Nov 2024 16:48:37 -0600 Subject: [PATCH 1/2] making the dates to all be the color black and adding back button to streak page --- src/components/common/Header.jsx | 5 ++--- src/styles/StreakPage.css | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/common/Header.jsx b/src/components/common/Header.jsx index 8a13539..01bb8b6 100644 --- a/src/components/common/Header.jsx +++ b/src/components/common/Header.jsx @@ -22,9 +22,8 @@ const Header = () => { // State for Dialog visibility const [openConfirmDialog, setOpenConfirmDialog] = useState(false) - // Show back button only on pages other than Home and Streak - const showBackButton = - location.pathname !== '/' && location.pathname !== '/streak' + // Show back button only on pages other than Home + const showBackButton = location.pathname !== '/' // Streak count (There may not have a user logged in) const streakCount = user?.streak?.count || 0 diff --git a/src/styles/StreakPage.css b/src/styles/StreakPage.css index c98d851..7f6a438 100644 --- a/src/styles/StreakPage.css +++ b/src/styles/StreakPage.css @@ -1,3 +1,8 @@ +/* Ensure all calendar dates have the color black */ +.react-calendar__month-view__days__day--weekend { + color: black !important; /* Override weekend color */ + } + /* Custom weekday headers */ .react-calendar__month-view__weekdays__weekday { text-transform: capitalize; From b31635d848e53f459d7c68c8ba6f7ae03d306950 Mon Sep 17 00:00:00 2001 From: ZL Asica <40444637+ZL-Asica@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:57:22 -0600 Subject: [PATCH 2/2] revert(Header): Remove return for steak page --- src/components/common/Header.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/common/Header.jsx b/src/components/common/Header.jsx index 01bb8b6..8a13539 100644 --- a/src/components/common/Header.jsx +++ b/src/components/common/Header.jsx @@ -22,8 +22,9 @@ const Header = () => { // State for Dialog visibility const [openConfirmDialog, setOpenConfirmDialog] = useState(false) - // Show back button only on pages other than Home - const showBackButton = location.pathname !== '/' + // Show back button only on pages other than Home and Streak + const showBackButton = + location.pathname !== '/' && location.pathname !== '/streak' // Streak count (There may not have a user logged in) const streakCount = user?.streak?.count || 0