Skip to content

Commit 784d06b

Browse files
committed
#2142 remove page blocks misc page
1 parent c476c04 commit 784d06b

3 files changed

Lines changed: 30 additions & 12 deletions

File tree

src/frontend/src/pages/AdminToolsPage/AdminToolsAttendeeDesignReviewInfo.tsx

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
import React, { useState } from 'react';
2-
import PageBlock from '../../layouts/PageBlock';
3-
import { TextField, FormControl, FormLabel, Select, MenuItem, SelectChangeEvent, TableCell, TableRow } from '@mui/material';
2+
import {
3+
TextField,
4+
FormControl,
5+
FormLabel,
6+
Select,
7+
MenuItem,
8+
SelectChangeEvent,
9+
TableCell,
10+
TableRow,
11+
Grid,
12+
Typography
13+
} from '@mui/material';
414
import AdminToolTable from './AdminToolTable';
515

616
const AdminToolsAttendeeDesignReviewInfo: React.FC = () => {
@@ -37,7 +47,10 @@ const AdminToolsAttendeeDesignReviewInfo: React.FC = () => {
3747
));
3848

3949
return (
40-
<PageBlock title="Attendee Design Review Information">
50+
<Grid>
51+
<Typography variant="h5" gutterBottom>
52+
Design Review Attendee Info
53+
</Typography>
4154
<FormControl fullWidth sx={{ marginBottom: 2 }}>
4255
<FormLabel htmlFor="search-by-name">Search by team member name</FormLabel>
4356
<TextField id="search-by-name" variant="outlined" value={searchQuery} onChange={handleSearchChange} fullWidth />
@@ -68,7 +81,7 @@ const AdminToolsAttendeeDesignReviewInfo: React.FC = () => {
6881
]}
6982
rows={attendeeRows}
7083
/>
71-
</PageBlock>
84+
</Grid>
7285
);
7386
};
7487

src/frontend/src/pages/AdminToolsPage/AdminToolsPage.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import AdminToolsProjectsConfig from './AdminToolsProjectsConfig';
1616
import { useState } from 'react';
1717
import NERTabs from '../../components/Tabs';
1818
import { routes } from '../../utils/routes';
19+
import { Box } from '@mui/system';
1920

2021
const AdminToolsPage: React.FC = () => {
2122
const currentUser = useCurrentUser();
@@ -82,10 +83,12 @@ const AdminToolsPage: React.FC = () => {
8283
) : tabIndex === 2 ? (
8384
<AdminToolsFinanceConfig />
8485
) : (
85-
<>
86-
<AdminToolsSlackUpcomingDeadlines />
86+
<Box>
87+
<Box pb={2}>
88+
<AdminToolsSlackUpcomingDeadlines />
89+
</Box>
8790
<AdminToolsAttendeeDesignReviewInfo />
88-
</>
91+
</Box>
8992
)}
9093
</PageLayout>
9194
);

src/frontend/src/pages/AdminToolsPage/AdminToolsSlackUpcomingDeadlines.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
* See the LICENSE file in the repository root folder for details.
44
*/
55

6-
import PageBlock from '../../layouts/PageBlock';
76
import { NERButton } from '../../components/NERButton';
8-
import { Grid, TextField, Tooltip, Typography } from '@mui/material';
7+
import { Box, Grid, TextField, Tooltip, Typography } from '@mui/material';
98
import { useState } from 'react';
109
import { useSlackUpcomingDeadlines } from '../../hooks/work-packages.hooks';
1110
import { DatePicker } from '@mui/x-date-pickers';
@@ -44,9 +43,12 @@ const AdminToolsSlackUpcomingDeadlines: React.FC = () => {
4443
);
4544

4645
return (
47-
<PageBlock title="Slack Upcoming Deadlines">
46+
<Box>
47+
<Typography variant="h5" gutterBottom>
48+
Slack Upcoming Deadlines
49+
</Typography>
4850
<Grid container spacing={2} alignItems="center">
49-
<Grid item display="flex" xs={12} sm>
51+
<Grid item display="flex" xs={12} sm="auto">
5052
<Tooltip title={tooltipMessage} placement="right" arrow sx={{ fontSize: 24 }}>
5153
<HelpIcon sx={{ mr: 2, height: 50 }} />
5254
</Tooltip>
@@ -67,7 +69,7 @@ const AdminToolsSlackUpcomingDeadlines: React.FC = () => {
6769
</NERButton>
6870
</Grid>
6971
</Grid>
70-
</PageBlock>
72+
</Box>
7173
);
7274
};
7375

0 commit comments

Comments
 (0)