diff --git a/backend/db/crud.py b/backend/db/crud.py index 2242dbc77720d09c037bdea1d0d39368597be96d..26771a1f5bc83a5c1329d7e58b6110a3e68ed35d 100644 --- a/backend/db/crud.py +++ b/backend/db/crud.py @@ -14,7 +14,7 @@ from db import models, schemas def get_waiting_time(place: str, db: Session): """ Get the last estimated waiting time for the given place """ current_date = datetime.now(tz=pytz.timezone("Europe/Paris")) - weekday, current_time = current_date.weekday(), date.time() + weekday, current_time = current_date.weekday(), current_date.time() first_timeslot = get_timeslot(place, weekday, True, db) if first_timeslot and current_time < first_timeslot[0]: return first_timeslot[0].hour, first_timeslot[0].minute diff --git a/frontend/src/index.js b/frontend/src/index.js index fb6d33928eb6f739beb1cf45a7cb327d5a5c29c3..67409df70b96bceba0b5faf86827da9550bd40e5 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -25,13 +25,18 @@ export default function App() { console.log(e); setLoading(false); }); - setRestaurantsList([ - { name: "RU Eiffel", status: true, waiting_time: 17, timetable: "11h30-14h / 18h30-21h" }, - { name: "RU Bréguet", status: true, waiting_time: 25, timetable: "11h30-14h" }, - { name: "Lieu de vie", status: false, waiting_time: null, timetable: "11h30-14h / 18h30-21h" }, - { name: "Caféteria Eiffel", status: false, waiting_time: null, timetable: "18h30-21h" }, - { name: "Caféteria Bréguet", status: true, waiting_time: null, timetable: "18h30-21h" }, - ]); + setRestaurantsList([ + { name: "RU Eiffel", status: true, waiting_time: 17, timetable: "11h30-14h / 18h30-21h" }, + { name: "RU Bréguet", status: true, waiting_time: 25, timetable: "11h30-14h" }, + { + name: "Lieu de vie", + status: false, + waiting_time: null, + timetable: "11h30-14h / 18h30-21h", + }, + { name: "Caféteria Eiffel", status: false, waiting_time: null, timetable: "18h30-21h" }, + { name: "Caféteria Bréguet", status: true, waiting_time: null, timetable: "18h30-21h" }, + ]); }, []); useEffect(() => { diff --git a/frontend/src/views/Details.js b/frontend/src/views/Details.js index 40a986be615055d25bdd7380f56629ef15454903..fe564b8827e7c68c69c4733330a3766d30989454 100644 --- a/frontend/src/views/Details.js +++ b/frontend/src/views/Details.js @@ -1,7 +1,5 @@ import React from "react"; export default function Details() { - return( - <div>details page</div> - ) -} \ No newline at end of file + return <div>details page</div>; +}