From 4a0dac8b5fe32af47541128ef20d2b7db32a92a7 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Mon, 23 Sep 2024 23:03:48 +1200 Subject: [PATCH 01/27] Made dashboard fit on screen. No need to scroll --- web/src/pages/Dashboard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/pages/Dashboard.tsx b/web/src/pages/Dashboard.tsx index 56f0a47..04d8629 100644 --- a/web/src/pages/Dashboard.tsx +++ b/web/src/pages/Dashboard.tsx @@ -33,7 +33,7 @@ function Dashboard() { }; return ( -
+
{/* width of the left nav bar */} {/* place thing component here and remove bg-primary */}
From 21a5c9bf3d92952ee26e0e347f71b6e7ad3fc8ad Mon Sep 17 00:00:00 2001 From: hgao080 Date: Mon, 23 Sep 2024 23:47:38 +1200 Subject: [PATCH 02/27] Slightly fixed sidebar --- web/src/components/Dashboard/SideBar.tsx | 8 ++++---- web/src/pages/Dashboard.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/src/components/Dashboard/SideBar.tsx b/web/src/components/Dashboard/SideBar.tsx index a2e4141..92b0566 100644 --- a/web/src/components/Dashboard/SideBar.tsx +++ b/web/src/components/Dashboard/SideBar.tsx @@ -15,9 +15,9 @@ const SideBar: React.FC = ({ switchDashboard, switchDiscover, swit const [selectedTab, setSelectedTab] = useState('dashboard'); return ( -
+
- club-logo + club-logo
@@ -28,9 +28,9 @@ const SideBar: React.FC = ({ switchDashboard, switchDiscover, swit
-
); diff --git a/web/src/pages/Dashboard.tsx b/web/src/pages/Dashboard.tsx index 04d8629..5a171b6 100644 --- a/web/src/pages/Dashboard.tsx +++ b/web/src/pages/Dashboard.tsx @@ -36,7 +36,7 @@ function Dashboard() {
{/* width of the left nav bar */} {/* place thing component here and remove bg-primary */} -
+
From b096f4b28bd36b6700d34f85362a10a6f8762b32 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Tue, 24 Sep 2024 00:04:10 +1200 Subject: [PATCH 03/27] Changed heights to better match figma --- web/src/components/Dashboard/DashboardHeader.tsx | 2 +- web/src/components/Dashboard/Leaderboard.tsx | 2 +- .../dashboardDashboard/DashboardDashboard.tsx | 10 +++++----- .../Dashboard/dashboardDashboard/UpcomingEvents.tsx | 2 +- .../Dashboard/dashboardDashboard/WelcomeStats.tsx | 2 +- web/src/pages/Dashboard.tsx | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/web/src/components/Dashboard/DashboardHeader.tsx b/web/src/components/Dashboard/DashboardHeader.tsx index 3d25913..9f51336 100644 --- a/web/src/components/Dashboard/DashboardHeader.tsx +++ b/web/src/components/Dashboard/DashboardHeader.tsx @@ -17,7 +17,7 @@ const DashboardHeader = () => { }; return ( -
+
diff --git a/web/src/components/Dashboard/Leaderboard.tsx b/web/src/components/Dashboard/Leaderboard.tsx index 5f9c003..993b4b5 100644 --- a/web/src/components/Dashboard/Leaderboard.tsx +++ b/web/src/components/Dashboard/Leaderboard.tsx @@ -102,7 +102,7 @@ function Leaderboard() { } return ( -
+

Leaderboard

profile diff --git a/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx b/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx index 164d927..dfba138 100644 --- a/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx +++ b/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx @@ -4,18 +4,18 @@ import UpcomingEvents from "./UpcomingEvents"; function DashboardDashboard() { return ( -
+
{/* width of the gallery */} -
-
+
+
-
+
-
+
{/* adjust sizes and stuff as needed */}
diff --git a/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx b/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx index 879bbc0..b510c91 100644 --- a/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx +++ b/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx @@ -50,7 +50,7 @@ const event_test_six = { const UpcomingEvents = () => { return ( -
+

Upcoming Events diff --git a/web/src/components/Dashboard/dashboardDashboard/WelcomeStats.tsx b/web/src/components/Dashboard/dashboardDashboard/WelcomeStats.tsx index bbe9bb8..780a0e3 100644 --- a/web/src/components/Dashboard/dashboardDashboard/WelcomeStats.tsx +++ b/web/src/components/Dashboard/dashboardDashboard/WelcomeStats.tsx @@ -2,7 +2,7 @@ function WelcomeStats() { const Data = { - User: "John Doe", + User: "John", Hours: 40, }; diff --git a/web/src/pages/Dashboard.tsx b/web/src/pages/Dashboard.tsx index 5a171b6..4c68d09 100644 --- a/web/src/pages/Dashboard.tsx +++ b/web/src/pages/Dashboard.tsx @@ -41,12 +41,12 @@ function Dashboard() {

{/* width of the everything else (other than the left nav bar) or in otherwords the length of the searchbar*/} -
-
+
+
{/* place notifcation stuff in here and remove bg-yellow for henrys thing it'll probably break the styling a bit but it shouldnt be too hard to fix, maybe instead of having a whole nav bar just have the notifcation and pfp component as separate thing or something*/} {tab === 5 &&( <> -

other thig

+

other thig

)} @@ -54,7 +54,7 @@ function Dashboard() {
{/* whole tabs go in here */} -
+
{/* */} {tab === 1 && } {tab === 2 && } From 61d9bb5c0fb0e1cf17785e3fea1f4da0c74275b1 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Tue, 24 Sep 2024 00:06:18 +1200 Subject: [PATCH 04/27] Fixed stretching of image on event details --- web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx b/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx index 3921c81..fd3d33d 100644 --- a/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx +++ b/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx @@ -33,7 +33,7 @@ export default function EventDetails({event, setEventDetails}: EventProps) {
{/* event-container */}
setEventDetails(null)}>
- +
From d8e1ea757e659003056a8c40687800a68be01379 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Tue, 24 Sep 2024 00:19:45 +1200 Subject: [PATCH 05/27] Fixed zoom in and zoom out of discover page --- .../Dashboard/DashboardDiscover/DashboardDiscover.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx b/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx index cb48895..9045661 100644 --- a/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx +++ b/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx @@ -75,10 +75,9 @@ function DashboardDiscover() { return ( -
- -
-
+
+
+
From 7ceac1b3f834721c0ffb89e0d6c1c9effbaca1f3 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Tue, 24 Sep 2024 01:09:14 +1200 Subject: [PATCH 06/27] Fixed zoom on dashboard main page --- web/src/components/Dashboard/Leaderboard.tsx | 2 +- .../dashboardDashboard/DashboardDashboard.tsx | 9 +++++---- .../Dashboard/dashboardDashboard/UpcomingEvent.tsx | 10 +++++----- .../Dashboard/dashboardDashboard/UpcomingEvents.tsx | 10 +++++----- .../Dashboard/dashboardDashboard/WelcomeStats.tsx | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/web/src/components/Dashboard/Leaderboard.tsx b/web/src/components/Dashboard/Leaderboard.tsx index 993b4b5..6ac5f4e 100644 --- a/web/src/components/Dashboard/Leaderboard.tsx +++ b/web/src/components/Dashboard/Leaderboard.tsx @@ -102,7 +102,7 @@ function Leaderboard() { } return ( -
+

Leaderboard

profile diff --git a/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx b/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx index dfba138..0814af0 100644 --- a/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx +++ b/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx @@ -1,16 +1,17 @@ import Leaderboard from "../Leaderboard"; import WelcomeStats from "./WelcomeStats"; import UpcomingEvents from "./UpcomingEvents"; +import UpcomingEvent from "./UpcomingEvent"; function DashboardDashboard() { return ( -
+
{/* width of the gallery */} -
-
+
+
-
+
diff --git a/web/src/components/Dashboard/dashboardDashboard/UpcomingEvent.tsx b/web/src/components/Dashboard/dashboardDashboard/UpcomingEvent.tsx index 8c323ef..1d0ccc3 100644 --- a/web/src/components/Dashboard/dashboardDashboard/UpcomingEvent.tsx +++ b/web/src/components/Dashboard/dashboardDashboard/UpcomingEvent.tsx @@ -9,15 +9,15 @@ type Event = { const UpcomingEvent = ({ event }: { event: Event }) => { return ( -
+
event image -

{event.date}

-

{event.title}

-

{event.location}

+

{event.date}

+

{event.title}

+

{event.location}

); }; diff --git a/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx b/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx index b510c91..050ad1c 100644 --- a/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx +++ b/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx @@ -50,17 +50,17 @@ const event_test_six = { const UpcomingEvents = () => { return ( -
+
-

+

Upcoming Events

-

+

See what's going on!

-
-
+
+
diff --git a/web/src/components/Dashboard/dashboardDashboard/WelcomeStats.tsx b/web/src/components/Dashboard/dashboardDashboard/WelcomeStats.tsx index 780a0e3..a73d07f 100644 --- a/web/src/components/Dashboard/dashboardDashboard/WelcomeStats.tsx +++ b/web/src/components/Dashboard/dashboardDashboard/WelcomeStats.tsx @@ -34,11 +34,11 @@ function WelcomeStats() {
-
+
Heart Hands
From e0606d60825f671ecbce68cf8ca8c39977aa90c0 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Tue, 24 Sep 2024 01:13:38 +1200 Subject: [PATCH 07/27] Made header always in line with leaderboard on main page --- web/src/pages/Dashboard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/pages/Dashboard.tsx b/web/src/pages/Dashboard.tsx index 4c68d09..714b678 100644 --- a/web/src/pages/Dashboard.tsx +++ b/web/src/pages/Dashboard.tsx @@ -42,7 +42,7 @@ function Dashboard() { {/* width of the everything else (other than the left nav bar) or in otherwords the length of the searchbar*/}
-
+
{/* place notifcation stuff in here and remove bg-yellow for henrys thing it'll probably break the styling a bit but it shouldnt be too hard to fix, maybe instead of having a whole nav bar just have the notifcation and pfp component as separate thing or something*/} {tab === 5 &&( <> From 689147f81ff7e208909499ea1732533b5cc76e82 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Fri, 27 Sep 2024 22:37:12 +1200 Subject: [PATCH 08/27] Fixed doubling issue after merge with main --- web/src/pages/Dashboard.tsx | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/web/src/pages/Dashboard.tsx b/web/src/pages/Dashboard.tsx index 3d4acdd..5421378 100644 --- a/web/src/pages/Dashboard.tsx +++ b/web/src/pages/Dashboard.tsx @@ -68,36 +68,6 @@ function Dashboard() { {tab === 5 && }
- - {/* width of the everything else (other than the left nav bar) or in otherwords the length of the searchbar*/} -
-
- {/* place notifcation stuff in here and remove bg-yellow for henrys thing it'll probably break the styling a bit but it shouldnt be too hard to fix, maybe instead of having a whole nav bar just have the notifcation and pfp component as separate thing or something*/} - {tab === 5 && ( - <> -

other thig

- - - )} - -
- - {/* whole tabs go in here */} -
- {/* */} - {tab === 1 && } - {tab === 2 && } - {tab === 3 && ( - <> - - - - - )} - {tab === 4 && } - {tab === 5 && } -
-
); } From 8eaafb9bc3c921c14712b26217b8e2b34785f9a0 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Sat, 28 Sep 2024 23:25:31 +1200 Subject: [PATCH 09/27] Changed sidebar to scale as well --- .../Dashboard/dashboardDashboard/DashboardDashboard.tsx | 2 +- web/src/pages/Dashboard.tsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx b/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx index 0814af0..8f46285 100644 --- a/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx +++ b/web/src/components/Dashboard/dashboardDashboard/DashboardDashboard.tsx @@ -5,7 +5,7 @@ import UpcomingEvent from "./UpcomingEvent"; function DashboardDashboard() { return ( -
+
{/* width of the gallery */}
diff --git a/web/src/pages/Dashboard.tsx b/web/src/pages/Dashboard.tsx index 5421378..fa7e40b 100644 --- a/web/src/pages/Dashboard.tsx +++ b/web/src/pages/Dashboard.tsx @@ -36,13 +36,13 @@ function Dashboard() {
{/* width of the left nav bar */} {/* place thing component here and remove bg-primary */} -
+
{/* width of the everything else (other than the left nav bar) or in otherwords the length of the searchbar*/} -
-
+
+
{/* place notifcation stuff in here and remove bg-yellow for henrys thing it'll probably break the styling a bit but it shouldnt be too hard to fix, maybe instead of having a whole nav bar just have the notifcation and pfp component as separate thing or something*/} {tab === 5 &&( <> @@ -54,7 +54,7 @@ function Dashboard() {
{/* whole tabs go in here */} -
+
{/* */} {tab === 1 && } {tab === 2 && } From ae71b562c9148c61eb741894908618b8a906ea91 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Sat, 28 Sep 2024 23:31:14 +1200 Subject: [PATCH 10/27] Changed events scrolling scaling on discover --- .../Dashboard/DashboardDiscover/DashboardDiscover.tsx | 4 ++-- .../Dashboard/DashboardDiscover/EventsScrollContainer.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx b/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx index 09ef92c..40b6394 100644 --- a/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx +++ b/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx @@ -75,7 +75,7 @@ function DashboardDiscover() { return ( -
+
@@ -95,7 +95,7 @@ function DashboardDiscover() {
-
+
{/* adjust sizes and stuff as needed */}
diff --git a/web/src/components/Dashboard/DashboardDiscover/EventsScrollContainer.tsx b/web/src/components/Dashboard/DashboardDiscover/EventsScrollContainer.tsx index 1815d1d..3a357b6 100644 --- a/web/src/components/Dashboard/DashboardDiscover/EventsScrollContainer.tsx +++ b/web/src/components/Dashboard/DashboardDiscover/EventsScrollContainer.tsx @@ -24,7 +24,7 @@ interface EventsProps { export default function EventsScrollContainer({events, setEventDetails}: EventsProps) { return ( -
+
{events.map((e, index) => ( )) From 25a44a54520394c579ed7aa451d95210cbf7b925 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Sun, 29 Sep 2024 01:01:42 +1200 Subject: [PATCH 11/27] Fixed scaling or tracker and pfp on profile page --- .../Dashboard/DashboardDiscover/EventDetails.tsx | 2 +- .../dashboardProfile/DashboardProfile.tsx | 10 +++++----- .../dashboardProfile/ProfileMyProfileHeading.tsx | 4 ++-- .../dashboardProfile/ProfileMyProfileOverview.tsx | 14 +++++++------- .../ProfileMyProfileProgressBar.tsx | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx b/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx index fd3d33d..b5a0b48 100644 --- a/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx +++ b/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx @@ -30,7 +30,7 @@ export default function EventDetails({event, setEventDetails}: EventProps) { const options: Intl.DateTimeFormatOptions = { weekday: 'long', month: 'long', day: 'numeric', year: 'numeric'}; return ( -
{/* event-container */} +
{/* event-container */}
setEventDetails(null)}>
diff --git a/web/src/components/Dashboard/dashboardProfile/DashboardProfile.tsx b/web/src/components/Dashboard/dashboardProfile/DashboardProfile.tsx index 8c07825..2342cdb 100644 --- a/web/src/components/Dashboard/dashboardProfile/DashboardProfile.tsx +++ b/web/src/components/Dashboard/dashboardProfile/DashboardProfile.tsx @@ -4,20 +4,20 @@ import ProfileMyProfileProgressBar from "./ProfileMyProfileProgressBar"; function DashboardProfile() { return ( -
+
{/* width of the gallery */} -
+
-
+
{/* adjust sizes and stuff as needed */} -
+
-
+
diff --git a/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileHeading.tsx b/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileHeading.tsx index dd4848c..1bc42b2 100644 --- a/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileHeading.tsx +++ b/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileHeading.tsx @@ -1,7 +1,7 @@ const ProfileMyProfileHeading = ({ name }: { name: string }) => { return ( -
+
{/* Blue header section */}
@@ -12,7 +12,7 @@ const ProfileMyProfileHeading = ({ name }: { name: string }) => {
{/* Profile image placeholder */} -
+
diff --git a/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileOverview.tsx b/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileOverview.tsx index aa9740e..10627b2 100644 --- a/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileOverview.tsx +++ b/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileOverview.tsx @@ -30,12 +30,12 @@ const ProfileMyProfileOverview = () => { <> {showModal && ()}
-
+

Profile Overview

{/* Personal Details Section */} -
-

Personal Details

-
+
+

Personal Details

+
{/* Row 1 */}
@@ -80,7 +80,7 @@ const ProfileMyProfileOverview = () => {
{/* Additional Details Section */} -
+

Additional Details

{/* Row 1 */} @@ -100,7 +100,7 @@ const ProfileMyProfileOverview = () => {
{/* Emergency Contact Details Section */} -
+

Emergency Contact Details

{/* Row 1 */} diff --git a/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileProgressBar.tsx b/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileProgressBar.tsx index 20b2321..da42da5 100644 --- a/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileProgressBar.tsx +++ b/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileProgressBar.tsx @@ -11,16 +11,16 @@ const ProfileMyProfileProgressBar: React.FC = const percentage = (completedHours / totalHours) * 100; return ( -
+
{/* Title */} -

+

Volunteering Tracker

{/* Circular Progress Bar */} -
+
Date: Sun, 29 Sep 2024 01:02:40 +1200 Subject: [PATCH 12/27] Changed pfp image to scale down as well --- .../Dashboard/dashboardProfile/ProfileMyProfileHeading.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileHeading.tsx b/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileHeading.tsx index 1bc42b2..5b6b1d7 100644 --- a/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileHeading.tsx +++ b/web/src/components/Dashboard/dashboardProfile/ProfileMyProfileHeading.tsx @@ -13,7 +13,7 @@ const ProfileMyProfileHeading = ({ name }: { name: string }) => { {/* Profile image placeholder */}
-
+
); From c1a7efa871ea7a52745adbc9be12c7d5bb3e68cc Mon Sep 17 00:00:00 2001 From: hgao080 Date: Sun, 29 Sep 2024 01:03:50 +1200 Subject: [PATCH 13/27] Made header scale better --- web/src/pages/Dashboard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/pages/Dashboard.tsx b/web/src/pages/Dashboard.tsx index fa7e40b..26b9fb1 100644 --- a/web/src/pages/Dashboard.tsx +++ b/web/src/pages/Dashboard.tsx @@ -42,7 +42,7 @@ function Dashboard() { {/* width of the everything else (other than the left nav bar) or in otherwords the length of the searchbar*/}
-
+
{/* place notifcation stuff in here and remove bg-yellow for henrys thing it'll probably break the styling a bit but it shouldnt be too hard to fix, maybe instead of having a whole nav bar just have the notifcation and pfp component as separate thing or something*/} {tab === 5 &&( <> From cb9db3e46c8a604a63841444f94d21711e06b211 Mon Sep 17 00:00:00 2001 From: hgao080 Date: Sun, 29 Sep 2024 01:18:16 +1200 Subject: [PATCH 14/27] Fixed scaling of community page --- .../Dashboard/DashboardCommunity/DashboardCommunity.tsx | 6 +++--- .../Dashboard/DashboardDiscover/EventsScrollContainer.tsx | 2 +- web/src/components/Dashboard/Leaderboard.tsx | 2 +- .../Dashboard/dashboardCalendar/DashboardCalendar.tsx | 2 +- .../Dashboard/dashboardDashboard/UpcomingEvents.tsx | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/src/components/Dashboard/DashboardCommunity/DashboardCommunity.tsx b/web/src/components/Dashboard/DashboardCommunity/DashboardCommunity.tsx index 7661d23..5dad829 100644 --- a/web/src/components/Dashboard/DashboardCommunity/DashboardCommunity.tsx +++ b/web/src/components/Dashboard/DashboardCommunity/DashboardCommunity.tsx @@ -3,12 +3,12 @@ import Leaderboard from "../Leaderboard"; function DashboardCommunity() { return ( -
-
+
+
-
+
diff --git a/web/src/components/Dashboard/DashboardDiscover/EventsScrollContainer.tsx b/web/src/components/Dashboard/DashboardDiscover/EventsScrollContainer.tsx index 3a357b6..fe98d9a 100644 --- a/web/src/components/Dashboard/DashboardDiscover/EventsScrollContainer.tsx +++ b/web/src/components/Dashboard/DashboardDiscover/EventsScrollContainer.tsx @@ -24,7 +24,7 @@ interface EventsProps { export default function EventsScrollContainer({events, setEventDetails}: EventsProps) { return ( -
+
{events.map((e, index) => ( )) diff --git a/web/src/components/Dashboard/Leaderboard.tsx b/web/src/components/Dashboard/Leaderboard.tsx index 6ac5f4e..8a45448 100644 --- a/web/src/components/Dashboard/Leaderboard.tsx +++ b/web/src/components/Dashboard/Leaderboard.tsx @@ -102,7 +102,7 @@ function Leaderboard() { } return ( -
+

Leaderboard

profile diff --git a/web/src/components/Dashboard/dashboardCalendar/DashboardCalendar.tsx b/web/src/components/Dashboard/dashboardCalendar/DashboardCalendar.tsx index a1b4ed1..3210ee5 100644 --- a/web/src/components/Dashboard/dashboardCalendar/DashboardCalendar.tsx +++ b/web/src/components/Dashboard/dashboardCalendar/DashboardCalendar.tsx @@ -1,6 +1,6 @@ export default function DashboardCalendar() { return ( -
+
diff --git a/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx b/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx index 050ad1c..985059a 100644 --- a/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx +++ b/web/src/components/Dashboard/dashboardDashboard/UpcomingEvents.tsx @@ -59,7 +59,7 @@ const UpcomingEvents = () => { See what's going on!

-
+
From b351e09008734de43b9026fb3c66192a2132b03c Mon Sep 17 00:00:00 2001 From: hgao080 Date: Sun, 29 Sep 2024 01:37:15 +1200 Subject: [PATCH 15/27] Fixed scaled of event details page on discover --- .../DashboardDiscover/DashboardDiscover.tsx | 41 +++++++++---------- .../DashboardDiscover/EventDetails.tsx | 20 ++++----- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx b/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx index 40b6394..f5648a4 100644 --- a/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx +++ b/web/src/components/Dashboard/DashboardDiscover/DashboardDiscover.tsx @@ -75,35 +75,34 @@ function DashboardDiscover() { return ( -
-
-
- -
-
-
This month's event...
-
{days[startDate.getDay()] + ", " + startDate.getDate() + " " + months[startDate.getMonth()]}
-
{flagshipEvent.event_title}
-
{flagshipEvent.location}
-
-
-
Eduardo is interested
-
-
John, and 4 other friends are going
-
-
setEventDetails(flagshipEvent)}>More Info
+
+
+
+ +
+
+
This month's event...
+
{days[startDate.getDay()] + ", " + startDate.getDate() + " " + months[startDate.getMonth()]}
+
{flagshipEvent.event_title}
+
{flagshipEvent.location}
+
+
+
Eduardo is interested
+
+
John, and 4 other friends are going
+
setEventDetails(flagshipEvent)}>More Info
+
{/* adjust sizes and stuff as needed */}
- {eventDetails && ( - - )} - + {eventDetails && ( + + )}
); diff --git a/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx b/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx index b5a0b48..4ccd732 100644 --- a/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx +++ b/web/src/components/Dashboard/DashboardDiscover/EventDetails.tsx @@ -30,12 +30,12 @@ export default function EventDetails({event, setEventDetails}: EventProps) { const options: Intl.DateTimeFormatOptions = { weekday: 'long', month: 'long', day: 'numeric', year: 'numeric'}; return ( -
{/* event-container */} +
{/* event-container */}
setEventDetails(null)}>
- + -
+

{event.event_title}

@@ -48,31 +48,31 @@ export default function EventDetails({event, setEventDetails}: EventProps) {
-
-
-
+
+
+

Description

{event.description}

-
+

Key Tasks and Responsibilities

{event.tasks}

-
+

Important Notes

{event.notes}

-
+

Contact Details

{"Hosted By: " + event.host}

{event.contact}

-
+