#3369 proper merge

Author: chpy04

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/PartReview/PartReviewComponents/PartPreviewCard.tsx

@@ -21,7 +21,7 @@ export function PartPreviewCard({ partPreview, projectName, redirectUrl }: PartP
     <Link component={RouterLink} to={redirectUrl} sx={{ textDecoration: 'none', color: 'inherit' }}>
       <Card
         sx={{
-          maxWidth: 400,
+          maxWidth: '30vw',
           border: '0.5px solid rgb(193, 193, 193)',
           borderRadius: '8px',
           bgcolor: grey[800],
@@ -40,25 +40,20 @@ export function PartPreviewCard({ partPreview, projectName, redirectUrl }: PartP
           {previewImageId && previewUrl ? (
             <Box
               sx={{
-                height: 200,
+                height: '15vw',
                 display: 'flex',
                 alignItems: 'center',
                 justifyContent: 'center',
                 border: '0.5px solid rgb(193, 193, 193)',
                 bgcolor: grey[600]
               }}
             >
-              <Box
-                component="img"
-                sx={{ display: 'block', maxWidth: '200px', mb: 1 }}
-                alt={`${commonName} Preview`}
-                src={previewUrl}
-              />
+              <Box component="img" sx={{ display: 'block', mb: 1 }} alt={`${commonName} Preview`} src={previewUrl} />
             </Box>
           ) : (
             <Box
               sx={{
-                height: 200,
+                height: '15vw',
                 display: 'flex',
                 alignItems: 'center',
                 justifyContent: 'center',

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/PartReview/PartsReviewPage.tsx

@@ -305,23 +305,6 @@ const PartsReviewPage = ({ project }: { project: Project }) => {
         <Grid item xs={12}>
           {/* The guide should be toggled off by default for admins, heads, and leads and toggled on for all other roles */}
           {showSubmissionGuide && <SubmissionGuide />}
-          <Typography variant="h4" sx={{ mb: 2 }}>
-            {`${filteredParts?.length === parts.length ? 'All ' : ''} Parts for ${project.name}`}
-          </Typography>
-          <Grid item md={4} sm={6} xs={12}>
-            {/* sort parts by most recently created */}
-            {filteredParts
-              ?.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
-              .map((part, _index) => (
-                <PartPreviewCard
-                  partPreview={part}
-                  projectName={project.abbreviation ?? project.name}
-                  redirectUrl={`/projects/${wbsPipe(project.wbsNum)}/part/${part.index}`}
-                />
-              ))}
-          </Grid>
-          {/* temporary test component to show that parts are being displayed */}
-
           <Grid container spacing={2}>
             {(partsForMeToReview ?? []).length > 0 && (
               <PartsToReview
@@ -348,6 +331,23 @@ const PartsReviewPage = ({ project }: { project: Project }) => {
               />
             )}
           </Grid>
+          <Typography variant="h4" sx={{ mb: 2 }}>
+            {`${filteredParts?.length === parts.length ? 'All ' : ''} Parts for ${project.name}`}
+          </Typography>
+          <Grid container spacing={2}>
+            {/* sort parts by most recently created */}
+            {filteredParts
+              ?.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
+              .map((part, _index) => (
+                <Grid item md={4} sm={6} xs={12}>
+                  <PartPreviewCard
+                    partPreview={part}
+                    projectName={project.abbreviation ?? project.name}
+                    redirectUrl={`/projects/${wbsPipe(project.wbsNum)}/part/${part.index}`}
+                  />
+                </Grid>
+              ))}
+          </Grid>
         </Grid>
       </Grid>
     </Box>

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/PartReview/PartsToReview.tsx

@@ -2,7 +2,7 @@ import { Project, PartPreview } from 'shared';
 import { Box } from '@mui/system';
 import { Grid, Typography } from '@mui/material';
 import { wbsPipe } from 'shared';
-import PartDisplay from '../../../PartPage/components/PartDisplay';
+import PartDisplay from '../../../PartPage/PartPageComponents/PartDisplay';
 
 interface PartsToReviewProps {
   project: Project;