diff --git a/pages/index.tsx b/pages/index.tsx index 20ec9e3333fca693c86edd96807ade8a129dc11b..17ba58517e3b6e1cd5db11daf7cde444dcda9415 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -19,7 +19,6 @@ import Stack from '@mui/material/Stack' import Link from 'next/link' import ContentArea from '@components/ContentArea' - const Item = styled(Paper)(({ theme }) => ({ backgroundColor: theme.palette.mode === 'dark' ? '#1A2027' : '#fff', ...theme.typography.body2, @@ -36,27 +35,24 @@ export default function Index () { <Box sx={{ flexGrow: 1 }}> <AppBar position="static"> <Toolbar> - <Avatar + <Avatar alt="FDO logo graphic" src="images/logo-fdo-white.png"> - </Avatar> + </Avatar> <Typography variant="h6" noWrap component="div" marginLeft={2} - sx={{ flexGrow: 1, display: { xs: 'none', sm: 'block' } }} - > + sx={{ flexGrow: 1, display: { xs: 'none', sm: 'block' } }}> FDO MANAGER </Typography> - <Stack direction="row" width="80%" justifyContent="flex-end" alignItems="center" - gap="14px" - > + gap="14px"> <FormControl sx={{ minWidth: 64 }}> <Select disableUnderline @@ -65,33 +61,24 @@ export default function Index () { variant="standard" sx={{ color: 'inherit', - '& .MuiSvgIcon-root': { - color: 'inherit' - }, - '& .MuiStack-root > .MuiTypography-root': { - display: { - xs: 'none', - sm: 'block' - } - } - }} - > - {[...(locales ?? [])].sort().map((lang: string) => ( - // @ts-expect-error - <MenuItem - component={Link} - href={{ pathname, query }} - locale={lang} - selected={currentLocale === lang} - key={lang} - defaultValue={lang} - value={lang} - > - <Typography> - {lang === 'en' ? 'English' : 'German'} - </Typography> - </MenuItem> - ))} + '& .MuiSvgIcon-root': { color: 'inherit' }, + '& .MuiStack-root > .MuiTypography-root': { display: { xs: 'none', sm: 'block' } } + }} > + {[...(locales ?? [])].sort().map((lang: string) => ( + // @ts-expect-error + <MenuItem + component={Link} + href={{ pathname, query }} + locale={lang} + selected={currentLocale === lang} + key={lang} + defaultValue={lang} + value={lang} > + <Typography> + {lang === 'en' ? 'English' : 'German'} + </Typography> + </MenuItem> + ))} </Select> </FormControl> </Stack> @@ -100,8 +87,7 @@ export default function Index () { color="inherit" onClick={() => { setMode() - }} - > + }} > {mode === 'dark' ? <LightModeOutlined /> : <DarkModeOutlined />} </IconButton> </Stack> diff --git a/src/components/Content.tsx b/src/components/Content.tsx index 5262fe92b502def67ccfd68539baee4538519167..6d9c1c4a1c3d6ea6f85ef3c54ac1bbdc18600571 100644 --- a/src/components/Content.tsx +++ b/src/components/Content.tsx @@ -1,25 +1,23 @@ -import * as React from 'react'; -import Box from '@mui/material/Box'; -import Typography from '@mui/material/Typography'; +import * as React from 'react' +import Box from '@mui/material/Box' +import Typography from '@mui/material/Typography' -export default function Types() { +export default function Types () { return ( <Box sx={{ width: '100%', maxWidth: 500 }}> - - - + <Typography variant="subtitle1" gutterBottom> Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quos blanditiis tenetur </Typography> - + <Typography variant="body1" gutterBottom> Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quos blanditiis tenetur unde suscipit, quam beatae rerum inventore consectetur, neque doloribus, cupiditate numquam dignissimos laborum fugiat deleniti? Eum quasi quidem quibusdam. </Typography> - + <Typography variant="button" display="block" gutterBottom> button text </Typography> @@ -30,5 +28,5 @@ export default function Types() { overline text </Typography> </Box> - ); -} \ No newline at end of file + ) +} diff --git a/src/components/ContentArea.tsx b/src/components/ContentArea.tsx index 031a51f8ff7dce0069ec25e8ca624c2ffab485da..a12d0c4d96ce5c03a760746e0327ac0bbe1d6ca8 100644 --- a/src/components/ContentArea.tsx +++ b/src/components/ContentArea.tsx @@ -1,23 +1,22 @@ -import * as React from 'react'; -import { styled } from '@mui/material/styles'; -import Grid from '@mui/material/Grid'; -import Paper from '@mui/material/Paper'; -import Box from '@mui/material/Box'; -import QueryPanel from './header/QueryPanel'; -import Content from 'src/components/Content'; -import Typography from '@mui/material/Typography'; -import Divider from '@mui/material/Divider'; - +import * as React from 'react' +import { styled } from '@mui/material/styles' +import Grid from '@mui/material/Grid' +import Paper from '@mui/material/Paper' +import Box from '@mui/material/Box' +import QueryPanel from './header/QueryPanel' +import Content from 'src/components/Content' +import Typography from '@mui/material/Typography' +import Divider from '@mui/material/Divider' const Item = styled(Paper)(({ theme }) => ({ backgroundColor: theme.palette.mode === 'dark' ? '#1A2027' : '#fff', ...theme.typography.body2, padding: theme.spacing(2), textAlign: 'center', - color: theme.palette.text.secondary, -})); + color: theme.palette.text.secondary +})) -export default function RowAndColumnSpacing() { +export default function RowAndColumnSpacing () { return ( <Box alignItems="center"> <Grid container spacing={2} columns={10} justifyContent="center" alignItems="center" marginTop={2}> @@ -38,7 +37,7 @@ export default function RowAndColumnSpacing() { Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quos blanditiis tenetur unde suscipit. </Typography><br/> - <Typography variant="button" display="block" gutterBottom fontSize={19}> + <Typography variant="button" display="block" gutterBottom fontSize={19}> Enter FDO Manager </Typography> </Item> @@ -54,5 +53,5 @@ export default function RowAndColumnSpacing() { </Grid> </Grid> </Box> - ); -} \ No newline at end of file + ) +}