Skip to content

Commit

Permalink
fix: implement many visual changes from review
Browse files Browse the repository at this point in the history
  • Loading branch information
supapesh committed Apr 11, 2022
1 parent 7e6b5f4 commit 43772c6
Showing 1 changed file with 31 additions and 9 deletions.
40 changes: 31 additions & 9 deletions frontend/src/pages/Dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ import {

const useStyles = createStyles((theme) => ({
dashboardWrapper: {
margin: 0,
margin: '1rem',
height: '100%',
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
color: 'white',
},
metroBoxWrapper: {
paddingTop: '1rem',
margin: 0,
height: '100%',
display: 'flex',
Expand All @@ -33,6 +34,8 @@ const useStyles = createStyles((theme) => ({
},
metroBoxes: {
border: '2px solid ' + theme.colors.ntnui_yellow[9],
width: '170px',
borderRadius: theme.radius.sm,
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
Expand All @@ -41,10 +44,27 @@ const useStyles = createStyles((theme) => ({
cursor: 'pointer',
'&:active': {
transform: 'scale(0.98)',
color: '#F8F082',
boxShadow: '0 0 2px #F8F082',
},
'&:hover': {
color: '#F8F082',
boxShadow: '0 0 10px #F8F082',
transition: 'ease-in-out 0.1s',
},
},
date: {
color: 'royalblue',
color: theme.colors.ntnui_blue[9],
fontWeight: '600',
textAlign: 'center',
fontSize: '1.3rem',
},
text: {
textAlign: 'center',
fontWeight: 'lighter',
},
header: {
fontWeight: '600',
},
}))

Expand Down Expand Up @@ -91,34 +111,36 @@ function Dashboard() {

return (
<Box className={classes.dashboardWrapper}>
<h1>Hei, Bolle Bollesen!</h1>
<h1 className={classes.text}>
Hei, <span className={classes.header}>Bolle Bollesen!</span>
</h1>
{periodOpen ? (
<p>
Opptaksperioden er satt fra{' '}
<p className={classes.text}>
<CalendarEvent size={24} strokeWidth={1.5} /> Opptaksperioden er satt fra{' '}
<span className={classes.date}>{startDate}</span> til{' '}
<span className={classes.date}>{endDate}</span>{' '}
</p>
) : (
<p>Det er for tiden ingen satt opptaksperiode</p>
<p className={classes.text}>Det er for tiden ingen satt opptaksperiode</p>
)}
<div className={classes.metroBoxWrapper}>
<Box
className={classes.metroBoxes}
onClick={() => navigate('/applications')}
>
<FileText size={150} strokeWidth={0.7} /> Søknader
<FileText size={150} strokeWidth={0.9} /> Søknader
</Box>
<Box
className={classes.metroBoxes}
onClick={() => navigate('/admission-status')}
>
<Users size={150} strokeWidth={0.7} /> Opptaksstatus
<Users size={150} strokeWidth={0.9} /> Opptaksstatus
</Box>
<Box
className={classes.metroBoxes}
onClick={() => navigate('/admission-period')}
>
<CalendarEvent size={150} strokeWidth={0.7} /> Opptaksperiode
<CalendarEvent size={150} strokeWidth={0.9} /> Opptaksperiode
</Box>
</div>
</Box>
Expand Down

0 comments on commit 43772c6

Please sign in to comment.