From 6c33f13b6d0593299e151087a0fa038a56fed34a Mon Sep 17 00:00:00 2001
From: Alberto Defendi <1369-ahl-berto@users.noreply.gitlab.inf.unibz.it>
Date: Wed, 23 Jun 2021 07:44:47 +0200
Subject: [PATCH] Remove date provider.
---
src/components/Dashboard/Dashboard.tsx | 7 ++-
.../ReservationsListByWeek.tsx | 43 ++++++++-----------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/components/Dashboard/Dashboard.tsx b/src/components/Dashboard/Dashboard.tsx
index 6fa8406..dd3c845 100644
--- a/src/components/Dashboard/Dashboard.tsx
+++ b/src/components/Dashboard/Dashboard.tsx
@@ -2,10 +2,12 @@ import React, { FC } from 'react';
import Container from '@material-ui/core/Container';
import { Route, useRouteMatch } from 'react-router-dom';
import { AuthRoutes } from 'api/routes';
+import { Driver } from 'roles/Driver';
import { HomePage } from './HomePage/HomePage';
import { ProfilePage } from './ProfilePage/ProfilePage';
import { ReservationPage } from './ReservationPage/ReservationPage';
import { VeiclePage } from './VehiclePage/VehiclePage';
+import { DriverShiftPage } from './DriverShift/DriverShiftPage';
export const Dashboard: FC = () => {
const { path } = useRouteMatch();
@@ -17,7 +19,10 @@ export const Dashboard: FC = () => {
path={`${path}${AuthRoutes.reservation}`}
component={ReservationPage}
/>
- <Route path={`${path}${AuthRoutes.vehicle}`} component={VeiclePage} />
+ <Route
+ path={`${path}${AuthRoutes.driver}`}
+ component={Driver(DriverShiftPage)}
+ />
</>
);
};
diff --git a/src/components/Dashboard/ReservationPage/ReservationList/ReservationsListByWeek.tsx b/src/components/Dashboard/ReservationPage/ReservationList/ReservationsListByWeek.tsx
index 46c9e9c..4220679 100644
--- a/src/components/Dashboard/ReservationPage/ReservationList/ReservationsListByWeek.tsx
+++ b/src/components/Dashboard/ReservationPage/ReservationList/ReservationsListByWeek.tsx
@@ -1,13 +1,8 @@
import React, { FC, useState } from 'react';
import { Grid } from '@material-ui/core';
import { Reservation } from 'components/Dashboard/ReservationPage/Reservation/Reservation';
-import DateFnsUtils from '@date-io/date-fns';
-import itLocale from 'date-fns/locale/en-US';
-import {
- KeyboardDatePicker,
- MuiPickersUtilsProvider,
-} from '@material-ui/pickers';
import { useReservationsListByWeek } from 'hooks/useReservationsListByWeek';
+import { KeyboardDatePicker } from '@material-ui/pickers/DatePicker';
/**
* Displays a list of all reservations from api.
@@ -19,24 +14,22 @@ export const ReservationsListByWeek: FC = () => {
const reservations = useReservationsListByWeek(selectedDate);
return (
- <MuiPickersUtilsProvider locale={itLocale} utils={DateFnsUtils}>
- <div data-testid="ReservationListViewer">
- <KeyboardDatePicker
- value={selectedDate}
- variant="static"
- onChange={(date) => handleDateChange(date)}
- format="dd/MM/yyyy"
- />
- <Grid item container>
- {reservations.length !== 0 ? (
- reservations.map((reservation, key) => (
- <Reservation reservation={reservation} />
- ))
- ) : (
- <h1>You do not have reservations.</h1>
- )}
- </Grid>
- </div>{' '}
- </MuiPickersUtilsProvider>
+ <div data-testid="ReservationListViewer">
+ <KeyboardDatePicker
+ value={selectedDate}
+ variant="static"
+ onChange={(date) => handleDateChange(date)}
+ format="dd/MM/yyyy"
+ />
+ <Grid item container>
+ {reservations.length !== 0 ? (
+ reservations.map((reservation, key) => (
+ <Reservation reservation={reservation} />
+ ))
+ ) : (
+ <h1>You do not have reservations.</h1>
+ )}
+ </Grid>
+ </div>
);
};
--
GitLab