Skip to content
Snippets Groups Projects
Commit 2bbdc4f3 authored by Francesco's avatar Francesco
Browse files

Restyle Reservation Dialog

parent 13d6da11
No related branches found
No related tags found
1 merge request!73Fix choserole style.
Pipeline #13288 passed
...@@ -27,7 +27,7 @@ export const App: FC = () => { ...@@ -27,7 +27,7 @@ export const App: FC = () => {
<Switch> <Switch>
<Route exact path={NonAuthRoutes.home} component={LandingPage} /> <Route exact path={NonAuthRoutes.home} component={LandingPage} />
<Route path={NonAuthRoutes.auth} component={AuthUser} /> <Route path={NonAuthRoutes.auth} component={AuthUser} />
<Route path={AuthRoutes.dashboard} component={All(Dashboard)} /> <Route path={AuthRoutes.dashboard} component={Dashboard} />
<Route path={NonAuthRoutes.unauthorized} component={Unauthorized} /> <Route path={NonAuthRoutes.unauthorized} component={Unauthorized} />
<Route component={NotFound} /> <Route component={NotFound} />
</Switch> </Switch>
......
...@@ -16,12 +16,14 @@ import { ...@@ -16,12 +16,14 @@ import {
MuiPickersUtilsProvider, MuiPickersUtilsProvider,
KeyboardDateTimePicker, KeyboardDateTimePicker,
} from '@material-ui/pickers'; } from '@material-ui/pickers';
import { reservationPageStyle } from '../ReservationPage.style';
type TripStageProps = { type TripStageProps = {
control: Control<ReservationType>; control: Control<ReservationType>;
}; };
export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => { export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => {
const classes = reservationPageStyle();
const [stage, setStage] = useState<string[]>(['']); const [stage, setStage] = useState<string[]>(['']);
const [value, setValue] = useState<string>(''); const [value, setValue] = useState<string>('');
...@@ -34,7 +36,11 @@ export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => { ...@@ -34,7 +36,11 @@ export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => {
<Card> <Card>
{stage.map((field, index) => ( {stage.map((field, index) => (
<CardContent> <CardContent>
<Typography variant="h3" component="h3"> <Typography
variant="h6"
component="h3"
className={classes.paddingBottomKlein}
>
Stage {index} Stage {index}
</Typography> </Typography>
<Controller <Controller
...@@ -56,7 +62,7 @@ export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => { ...@@ -56,7 +62,7 @@ export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => {
<KeyboardDateTimePicker <KeyboardDateTimePicker
margin="normal" margin="normal"
id="date-picker-dialog" id="date-picker-dialog"
label="Date picker dialog" label="Date and Hour"
defaultValue={field} defaultValue={field}
format="dd/MM/yyyy" format="dd/MM/yyyy"
KeyboardButtonProps={{ KeyboardButtonProps={{
......
...@@ -16,6 +16,7 @@ import { setReservation } from 'api/setReservation'; ...@@ -16,6 +16,7 @@ import { setReservation } from 'api/setReservation';
import { SubmitHandler, useForm } from 'react-hook-form'; import { SubmitHandler, useForm } from 'react-hook-form';
import { SeniorSearch } from './Reservation/SeniorSearch/SeniorSearch'; import { SeniorSearch } from './Reservation/SeniorSearch/SeniorSearch';
import { TripStage } from './Reservation/TripStage'; import { TripStage } from './Reservation/TripStage';
import { reservationPageStyle } from './ReservationPage.style';
type ReservationDialogProps = { type ReservationDialogProps = {
handleClose: () => void; handleClose: () => void;
...@@ -25,6 +26,7 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({ ...@@ -25,6 +26,7 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({
handleClose, handleClose,
isOpen, isOpen,
}: ReservationDialogProps) => { }: ReservationDialogProps) => {
const classes = reservationPageStyle();
const { control, handleSubmit } = useForm<ReservationType>({ const { control, handleSubmit } = useForm<ReservationType>({
mode: 'onSubmit', mode: 'onSubmit',
}); });
...@@ -52,7 +54,7 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({ ...@@ -52,7 +54,7 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({
> >
<form onSubmit={handleSubmit(onSubmit)} data-testid="Form"> <form onSubmit={handleSubmit(onSubmit)} data-testid="Form">
<DialogTitle id="form-dialog-title"> <DialogTitle id="form-dialog-title">
<Typography variant="h1" component="h1"> <Typography variant="h4" component="h1">
Book New Reservation Book New Reservation
</Typography> </Typography>
</DialogTitle> </DialogTitle>
...@@ -60,11 +62,19 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({ ...@@ -60,11 +62,19 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({
<DialogContentText> <DialogContentText>
Write here below the details of your next reservation Write here below the details of your next reservation
</DialogContentText> </DialogContentText>
<Typography variant="h2" component="h2"> <Typography
variant="h5"
component="h2"
className={`${classes.paddingBottomKlein} ${classes.paddingTopKlein}`}
>
Search Search
</Typography> </Typography>
<SeniorSearch senior={senior} setSenior={setSenior} /> <SeniorSearch senior={senior} setSenior={setSenior} />
<Typography variant="h2" component="h2"> <Typography
variant="h5"
component="h2"
className={`${classes.paddingBottomKlein} ${classes.paddingTopKlein}`}
>
Trip stage Trip stage
</Typography> </Typography>
<TripStage control={control} /> <TripStage control={control} />
...@@ -73,7 +83,7 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({ ...@@ -73,7 +83,7 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({
<Button onClick={handleClose} color="primary"> <Button onClick={handleClose} color="primary">
Cancel Cancel
</Button> </Button>
<Button type="submit" fullWidth variant="contained" color="primary"> <Button type="submit" variant="contained" color="primary">
Insert Insert
</Button> </Button>
</DialogActions> </DialogActions>
......
import React, { FC } from 'react'; import React, { FC } from 'react';
import { Grid } from '@material-ui/core'; import { Grid, Hidden } from '@material-ui/core';
import { Reservation } from 'components/Dashboard/ReservationPage/Reservation/Reservation'; import { Reservation } from 'components/Dashboard/ReservationPage/Reservation/Reservation';
import { useReservations } from 'hooks/useReservations'; import { useReservations } from 'hooks/useReservations';
......
...@@ -19,9 +19,15 @@ export const reservationPageStyle = makeStyles(() => ({ ...@@ -19,9 +19,15 @@ export const reservationPageStyle = makeStyles(() => ({
paddingBottom: { paddingBottom: {
paddingBottom: '65px', paddingBottom: '65px',
}, },
paddingBottomKlein: {
paddingBottom: '15px',
},
paddingTop: { paddingTop: {
paddingTop: '65px', paddingTop: '65px',
}, },
paddingTopKlein: {
paddingTop: '35px',
},
bodyIcon: { bodyIcon: {
fontSize: '90px', fontSize: '90px',
paddingBottom: '10px', paddingBottom: '10px',
......
...@@ -71,11 +71,17 @@ export const ReservationPage: FC = () => { ...@@ -71,11 +71,17 @@ export const ReservationPage: FC = () => {
</Hidden> </Hidden>
<Grid item container className={classes.paddingTop}> <Grid item container className={classes.paddingTop}>
<Grid item xs={2} /> <Grid item xs={1} lg={2} />
<Grid item xs={8}> <Grid item xs={10} lg={8}>
<Typography variant="h3">Your Next Reservations</Typography> <Typography variant="h3">Your Next Reservations</Typography>
</Grid> </Grid>
<ReservationListViewer /> <Grid item xs={1} lg={2} />
<Grid item xs={1} lg={2} />
<Grid item xs={10} lg={8}>
<ReservationListViewer />
</Grid>
<Grid item xs={1} lg={2} />
</Grid> </Grid>
</Grid> </Grid>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment