Skip to content
Snippets Groups Projects
Commit 6ab98903 authored by Aymeric Chaumont's avatar Aymeric Chaumont
Browse files

conflicts

parent 8b983c04
No related branches found
No related tags found
1 merge request!23Extract stats
Pipeline #43835 failed
...@@ -4,7 +4,7 @@ import axios from "axios"; ...@@ -4,7 +4,7 @@ import axios from "axios";
import "../styles/WaitingTime.css"; import "../styles/WaitingTime.css";
export default function WaitingTime({ place }) { 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); const [post, setPost] = React.useState(null);
React.useEffect(() => { React.useEffect(() => {
......
import React from "react"; import React from "react";
<<<<<<< HEAD
<<<<<<< HEAD
import Timetable from "../components/Timetable";
import WaitingTime from "../components/WaitingTime";
=======
import { DailyGraph, Timetable, WaitingTime } from "../components" 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() { export default function Eiffel() {
return ( return (
<div> <div>
...@@ -59,4 +24,3 @@ export default function Eiffel() { ...@@ -59,4 +24,3 @@ export default function Eiffel() {
</div> </div>
) )
} }
>>>>>>> fixed back routes for stats and added graph component
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment