From 86d7adcaff7e9ce66e7ec7bb6cdbdeb3b1fae3ca Mon Sep 17 00:00:00 2001 From: joyc7 Date: Thu, 7 Dec 2023 04:32:34 -0500 Subject: [PATCH 1/2] Fix styling after see problem in deployment --- front-end/src/components/Events.jsx | 22 +++++++++++++++------- front-end/src/styles/FriendsPage.css | 1 + 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/front-end/src/components/Events.jsx b/front-end/src/components/Events.jsx index 302861a..41ac7a8 100644 --- a/front-end/src/components/Events.jsx +++ b/front-end/src/components/Events.jsx @@ -15,18 +15,27 @@ function Events({ isDarkMode }) { const [searchTerm, setSearchTerm] = useState(""); function reformatDate(dateStr) { - const months = [ - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", ]; - + // Create a new Date object in local time zone const date = new Date(dateStr); - + // Convert it back to UTC date.setMinutes(date.getMinutes() + date.getTimezoneOffset()); - + const monthName = months[date.getUTCMonth()]; const day = date.getUTCDate(); const year = date.getUTCFullYear(); @@ -34,7 +43,6 @@ function Events({ isDarkMode }) { return `${monthName} ${day} ${year}`; } - // Toggle the 'body-dark-mode' class on the body element useEffect(() => { if (isDarkMode) { diff --git a/front-end/src/styles/FriendsPage.css b/front-end/src/styles/FriendsPage.css index 2af229d..d4b9989 100644 --- a/front-end/src/styles/FriendsPage.css +++ b/front-end/src/styles/FriendsPage.css @@ -138,6 +138,7 @@ .dark-mode .add-friends-btn { @apply bg-gray-500 border-gray-600 hover:bg-gray-600 active:bg-gray-700; + width: auto; } .dark-mode .add-friends-btn-div { From 049d5841b071b4d109988609b828d8767fa59ce5 Mon Sep 17 00:00:00 2001 From: joyc7 Date: Thu, 7 Dec 2023 04:37:36 -0500 Subject: [PATCH 2/2] Fix styling --- front-end/src/components/FriendsPage.jsx | 1 + front-end/src/components/Home.jsx | 1 + front-end/src/components/UserInfo.jsx | 1 + 3 files changed, 3 insertions(+) diff --git a/front-end/src/components/FriendsPage.jsx b/front-end/src/components/FriendsPage.jsx index 56cb6a4..7302248 100644 --- a/front-end/src/components/FriendsPage.jsx +++ b/front-end/src/components/FriendsPage.jsx @@ -247,6 +247,7 @@ function FriendsPage({ isDarkMode }) { currentUserFriends={currentUserFriends} /> )} +
diff --git a/front-end/src/components/Home.jsx b/front-end/src/components/Home.jsx index 022745f..10108d1 100644 --- a/front-end/src/components/Home.jsx +++ b/front-end/src/components/Home.jsx @@ -337,6 +337,7 @@ const Home = ({ isDarkMode }) => { +
); diff --git a/front-end/src/components/UserInfo.jsx b/front-end/src/components/UserInfo.jsx index 658c3d6..4e31b02 100644 --- a/front-end/src/components/UserInfo.jsx +++ b/front-end/src/components/UserInfo.jsx @@ -170,6 +170,7 @@ function UserInfo({ isDarkMode, toggleDarkMode }) { +