diff --git a/frontend/src/components/WaitingTime.js b/frontend/src/components/WaitingTime.js index b28657f3239f052fa73ed2407484c8181133c6e0..5df482293acb4912d2e376a8ae73ef1fe669886b 100644 --- a/frontend/src/components/WaitingTime.js +++ b/frontend/src/components/WaitingTime.js @@ -4,7 +4,7 @@ import axios from "axios"; import "../styles/WaitingTime.css"; export default function WaitingTime({ place }) { - const baseURL = process.env.REACT_APP_BASE_URL_BACK + "/" + place + "/waiting_time"; + const url = process.env.REACT_APP_BASE_URL_BACK + "/" + place + "/waiting_time"; const [post, setPost] = React.useState(null); React.useEffect(() => { diff --git a/frontend/src/views/Eiffel.js b/frontend/src/views/Eiffel.js index a38ff02ac75290146dbb6d06b2037b05e7705961..9576b259f4eb382b2ce406d1fbda7675da0dafb9 100644 --- a/frontend/src/views/Eiffel.js +++ b/frontend/src/views/Eiffel.js @@ -1,42 +1,7 @@ import React from "react"; -<<<<<<< HEAD -<<<<<<< HEAD -import Timetable from "../components/Timetable"; -import WaitingTime from "../components/WaitingTime"; -======= import { DailyGraph, Timetable, WaitingTime } from "../components" ->>>>>>> bf558ae2c3015d5a6116d598f029b01b29bf8bd0 -export default function Eiffel() { - return ( - <div> - <h2>RU Eiffel</h2> - <WaitingTime place="eiffel" /> - <Timetable - schedule={{ - LundiMidi: "11h30 - 14h", - LundiSoir: "18h30 - 21h", - MardiMidi: "11h30 - 14h", - MardiSoir: "18h30 - 21h", - MercrediMidi: "11h30 - 14h", - MercrediSoir: "18h30 - 21h", - JeudiMidi: "11h30 - 14h", - JeudiSoir: "18h30 - 21h", - VendrediMidi: "11h30 - 14h", - VendrediSoir: "18h30 - 21h", - }} - /> - </div> - ); -} -======= -import { DailyGraph, Timetable, WaitingTime } from "../components" - -<<<<<<< HEAD - -======= ->>>>>>> bf558ae2c3015d5a6116d598f029b01b29bf8bd0 export default function Eiffel() { return ( <div> @@ -59,4 +24,3 @@ export default function Eiffel() { </div> ) } ->>>>>>> fixed back routes for stats and added graph component