From e26ff0819b2e2380dd4c8d93be65ae60dd4106c9 Mon Sep 17 00:00:00 2001 From: MMAzeem3 Date: Mon, 22 Apr 2024 17:01:08 -0400 Subject: [PATCH 1/2] fix mitchell name and add scroll for expen on dashboard --- frontend/app/src/pages/Dashboard/Dashboard.js | 2 +- frontend/app/src/pages/Dashboard/dashboard.css | 4 +++- frontend/app/src/pages/SplashPage/SplashPage.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/app/src/pages/Dashboard/Dashboard.js b/frontend/app/src/pages/Dashboard/Dashboard.js index f69bc8f..c59e2a2 100644 --- a/frontend/app/src/pages/Dashboard/Dashboard.js +++ b/frontend/app/src/pages/Dashboard/Dashboard.js @@ -142,7 +142,7 @@ const Dashboard = () => { : '' } { user && (user.position === 'chair' || user.position === 'professor') ? -
+

Expenditures

diff --git a/frontend/app/src/pages/Dashboard/dashboard.css b/frontend/app/src/pages/Dashboard/dashboard.css index f6b77b2..e1b4c75 100644 --- a/frontend/app/src/pages/Dashboard/dashboard.css +++ b/frontend/app/src/pages/Dashboard/dashboard.css @@ -107,7 +107,9 @@ .dashboardPlot { border: black solid thin; } - +.dashboardExpenCard { + overflow-x: auto; +} /* Display One Column On Small Screen Sizes */ @media (max-width: 1300px) { .dashboardBody { grid-template-columns: repeat(1, 1fr); } diff --git a/frontend/app/src/pages/SplashPage/SplashPage.js b/frontend/app/src/pages/SplashPage/SplashPage.js index a9f16af..05ba7ca 100644 --- a/frontend/app/src/pages/SplashPage/SplashPage.js +++ b/frontend/app/src/pages/SplashPage/SplashPage.js @@ -127,7 +127,7 @@ const SplashPage = () => {
-

Mitchel Jonker

+

Mitchell Jonker

mjonker@email.sc.edu

From 3abbe60e12e39fba51dd5238534abf88b967adf5 Mon Sep 17 00:00:00 2001 From: MMAzeem3 Date: Mon, 22 Apr 2024 18:17:09 -0400 Subject: [PATCH 2/2] add demo to splash page --- frontend/app/src/pages/SplashPage/SplashPage.js | 4 ++-- frontend/app/src/pages/SplashPage/splash-page.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/app/src/pages/SplashPage/SplashPage.js b/frontend/app/src/pages/SplashPage/SplashPage.js index 05ba7ca..84e9e32 100644 --- a/frontend/app/src/pages/SplashPage/SplashPage.js +++ b/frontend/app/src/pages/SplashPage/SplashPage.js @@ -79,8 +79,8 @@ const SplashPage = () => {

Demo

-

See demo to experience the USC Faculty Dashboard in action! diff --git a/frontend/app/src/pages/SplashPage/splash-page.css b/frontend/app/src/pages/SplashPage/splash-page.css index 4a0489a..87af81e 100644 --- a/frontend/app/src/pages/SplashPage/splash-page.css +++ b/frontend/app/src/pages/SplashPage/splash-page.css @@ -175,7 +175,7 @@ .splashPageDemo iframe { display: block; width: 80%; - height: 60vh; + height: 70vh; border: 2px solid black; box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); }