-
- Downloads
Merge branch 'main' into 'ci'
# Conflicts: # backend/db/crud.py
Showing
- backend/.env.template 1 addition, 1 deletionbackend/.env.template
- backend/db/crud.py 6 additions, 0 deletionsbackend/db/crud.py
- backend/docker-compose.yml 1 addition, 1 deletionbackend/docker-compose.yml
- backend/main.py 6 additions, 0 deletionsbackend/main.py
- frontend/.env.template 2 additions, 0 deletionsfrontend/.env.template
- frontend/package-lock.json 59 additions, 13 deletionsfrontend/package-lock.json
- frontend/package.json 1 addition, 0 deletionsfrontend/package.json
- frontend/src/components/Timetable.js 1 addition, 1 deletionfrontend/src/components/Timetable.js
- frontend/src/components/WaitingTime.js 26 additions, 0 deletionsfrontend/src/components/WaitingTime.js
- frontend/src/components/index.js 2 additions, 1 deletionfrontend/src/components/index.js
- frontend/src/styles/Timetable.css 7 additions, 0 deletionsfrontend/src/styles/Timetable.css
- frontend/src/styles/WaitingTime.css 19 additions, 0 deletionsfrontend/src/styles/WaitingTime.css
- frontend/src/views/Eiffel.js 13 additions, 1 deletionfrontend/src/views/Eiffel.js
Loading
Please register or sign in to comment