Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
ViaResto-website
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Aymeric Chaumont
ViaResto-website
Commits
6ab98903
Commit
6ab98903
authored
Jul 7, 2022
by
Aymeric Chaumont
Browse files
Options
Downloads
Patches
Plain Diff
conflicts
parent
8b983c04
No related branches found
No related tags found
1 merge request
!23
Extract stats
Pipeline
#43835
failed
Jul 7, 2022
Stage: build
Stage: test
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/src/components/WaitingTime.js
+1
-1
1 addition, 1 deletion
frontend/src/components/WaitingTime.js
frontend/src/views/Eiffel.js
+0
-36
0 additions, 36 deletions
frontend/src/views/Eiffel.js
with
1 addition
and
37 deletions
frontend/src/components/WaitingTime.js
+
1
−
1
View file @
6ab98903
...
@@ -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
(()
=>
{
...
...
This diff is collapsed.
Click to expand it.
frontend/src/views/Eiffel.js
+
0
−
36
View file @
6ab98903
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment