Merge branch 'feat/raspi' into dev
# Conflicts: # sth-backend/src/main/java/hdm/mi/sthbackend/controller/TournamentController.java # sth-frontend/package-lock.json # sth-frontend/src/utils/router.jsx
Showing
- sth-backend/pom.xml 4 additions, 0 deletionssth-backend/pom.xml
- sth-backend/src/main/java/hdm/mi/sthbackend/config/WebSocketConfig.java 26 additions, 0 deletions...c/main/java/hdm/mi/sthbackend/config/WebSocketConfig.java
- sth-backend/src/main/java/hdm/mi/sthbackend/controller/RaspiController.java 33 additions, 0 deletions...in/java/hdm/mi/sthbackend/controller/RaspiController.java
- sth-backend/src/main/java/hdm/mi/sthbackend/controller/TournamentController.java 3 additions, 0 deletions...va/hdm/mi/sthbackend/controller/TournamentController.java
- sth-backend/src/main/java/hdm/mi/sthbackend/model/BeerPongGame.java 22 additions, 0 deletions...d/src/main/java/hdm/mi/sthbackend/model/BeerPongGame.java
- sth-backend/src/main/java/hdm/mi/sthbackend/service/RaspiService.java 29 additions, 0 deletions...src/main/java/hdm/mi/sthbackend/service/RaspiService.java
- sth-backend/src/main/java/hdm/mi/sthbackend/types/CupState.java 10 additions, 0 deletions...ckend/src/main/java/hdm/mi/sthbackend/types/CupState.java
- sth-frontend/package-lock.json 523 additions, 8 deletionssth-frontend/package-lock.json
- sth-frontend/package.json 2 additions, 0 deletionssth-frontend/package.json
- sth-frontend/src/features/beerpong/components/Cup.jsx 7 additions, 0 deletionssth-frontend/src/features/beerpong/components/Cup.jsx
- sth-frontend/src/features/beerpong/components/CupFormation.jsx 181 additions, 0 deletions...rontend/src/features/beerpong/components/CupFormation.jsx
- sth-frontend/src/features/beerpong/components/CupFormationOld.jsx 50 additions, 0 deletions...tend/src/features/beerpong/components/CupFormationOld.jsx
- sth-frontend/src/features/beerpong/components/Game.jsx 7 additions, 0 deletionssth-frontend/src/features/beerpong/components/Game.jsx
- sth-frontend/src/utils/router.jsx 5 additions, 2 deletionssth-frontend/src/utils/router.jsx
Loading
Please register or sign in to comment