#3099-Organizing pages

Northeastern-Electric-Racing · Dec 26, 2024 · 2b1f55a · 2b1f55a
1 parent b8ea0ab
commit 2b1f55a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/src/frontend/src/pages/HomePage/AdminHomePage.tsx b/src/frontend/src/pages/HomePage/AdminHomePage.tsx
@@ -11,7 +11,8 @@ import PageLayout, { PAGE_GRID_HEIGHT } from '../../components/PageLayout';
 import { AuthenticatedUser } from 'shared';
 import WorkPackagesSelectionView from './components/WorkPackagesSelectionView';
 import ChangeRequestsToReview from './components/ChangeRequestsToReview';
-import OverdueWorkPackages from './components/OverdueWorkPackages';
+import GeneralAnnouncements from './components/GeneralAnnouncements';
+import UpcomingDesignReviews from './components/UpcomingDesignReviews';
 
 interface AdminHomePageProps {
   user: AuthenticatedUser;
@@ -41,11 +42,14 @@ const AdminHomePage = ({ user }: AdminHomePageProps) => {
           <ChangeRequestsToReview user={user} />
         </Box>
         <Grid container height={'60%'} spacing={2}>
-          <Grid item xs={7} md={7} height="100%">
+          <Grid item xs={4} md={4} height="100%">
+            <GeneralAnnouncements />
+          </Grid>
+          <Grid item xs={4} md={4} height="100%">
             <WorkPackagesSelectionView />
           </Grid>
-          <Grid item xs={5} md={5} height="100%">
-            <OverdueWorkPackages user={user} />
+          <Grid item xs={4} md={4} height="100%">
+            <UpcomingDesignReviews user={user} />
           </Grid>
         </Grid>
       </Box>

diff --git a/src/frontend/src/pages/HomePage/LeadHomePage.tsx b/src/frontend/src/pages/HomePage/LeadHomePage.tsx
@@ -12,6 +12,7 @@ import { AuthenticatedUser } from 'shared';
 import ChangeRequestsToReview from './components/ChangeRequestsToReview';
 import MyTeamsOverdueTasks from './components/MyTeamsOverdueTasks';
 import UpcomingDesignReviews from './components/UpcomingDesignReviews';
+import GeneralAnnouncements from './components/GeneralAnnouncements';
 
 interface LeadHomePageProps {
   user: AuthenticatedUser;
@@ -41,10 +42,13 @@ const LeadHomePage = ({ user }: LeadHomePageProps) => {
           <ChangeRequestsToReview user={user} />
         </Box>
         <Grid container height={'60%'} spacing={2}>
-          <Grid item xs={12} md={6} height={'100%'}>
+          <Grid item xs={4} md={4} height={'100%'}>
+            <GeneralAnnouncements />
+          </Grid>
+          <Grid item xs={4} md={4} height={'100%'}>
             <MyTeamsOverdueTasks user={user} />
           </Grid>
-          <Grid item xs={12} md={6} height={'100%'}>
+          <Grid item xs={4} md={4} height={'100%'}>
             <UpcomingDesignReviews user={user} />
           </Grid>
         </Grid>

diff --git a/src/frontend/src/pages/HomePage/components/DesignReviewCard.tsx b/src/frontend/src/pages/HomePage/components/DesignReviewCard.tsx
@@ -76,7 +76,7 @@ const UpcomingDesignReviewsCard: React.FC<DesignReviewProps> = ({ designReview,
       variant="outlined"
       sx={{
         width: '100%',
-        minHeight: 'fit-content',
+        height: 'fit-content',
         mr: 3,
         background: theme.palette.background.default,
         borderRadius: 2

diff --git a/src/frontend/src/pages/HomePage/components/TeamTaskCard.tsx b/src/frontend/src/pages/HomePage/components/TeamTaskCard.tsx
@@ -29,7 +29,7 @@ const TeamTaskCard: React.FC<TeamTaskCardProps> = ({ task, taskNumber }) => {
       variant="outlined"
       sx={{
         width: '100%',
-        minHeight: 'fit-content',
+        height: 'fit-content',
         mr: 3,
         background: theme.palette.background.default,
         borderRadius: 2

diff --git a/src/frontend/src/pages/HomePage/components/WorkPackageCard.tsx b/src/frontend/src/pages/HomePage/components/WorkPackageCard.tsx
@@ -41,7 +41,7 @@ const WorkPackageCard = ({ wp }: { wp: WorkPackage }) => {
       variant="outlined"
       sx={{
         height: 'fit-content',
-        minWidth: 'fit-content',
+        width: '100%',
         mr: 3,
         background: theme.palette.background.default
       }}