Merge branch 'main' into...
Merge branch 'main' into 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can" "Merging with main"
Showing
- src/main/java/Team5/SmartTowns/dragonstale/DragonsTale.java 19 additions, 0 deletionssrc/main/java/Team5/SmartTowns/dragonstale/DragonsTale.java
- src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java 60 additions, 0 deletions...a/Team5/SmartTowns/dragonstale/DragonsTaleController.java
- src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleJDBC.java 30 additions, 0 deletions...in/java/Team5/SmartTowns/dragonstale/DragonsTaleJDBC.java
- src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleRepository.java 4 additions, 0 deletions...a/Team5/SmartTowns/dragonstale/DragonsTaleRepository.java
- src/main/java/Team5/SmartTowns/trails/TrailsController.java 0 additions, 21 deletionssrc/main/java/Team5/SmartTowns/trails/TrailsController.java
- src/main/resources/static/css/dragonstaless.css 31 additions, 1 deletionsrc/main/resources/static/css/dragonstaless.css
- src/main/resources/static/qr-scanner.html 0 additions, 29 deletionssrc/main/resources/static/qr-scanner.html
- src/main/resources/static/scripts/DTscript.js 9 additions, 0 deletionssrc/main/resources/static/scripts/DTscript.js
- src/main/resources/static/scripts/qrCode.js 0 additions, 0 deletionssrc/main/resources/static/scripts/qrCode.js
- src/main/resources/templates/dragonstale/index.html 53 additions, 0 deletionssrc/main/resources/templates/dragonstale/index.html
- src/main/resources/templates/fragments/qr-scanner.html 27 additions, 0 deletionssrc/main/resources/templates/fragments/qr-scanner.html
- src/main/resources/templates/towns/trails/dragonstale/index.html 0 additions, 62 deletions...n/resources/templates/towns/trails/dragonstale/index.html
- src/main/resources/templates/towns/trails/dragonstale/script.js 0 additions, 0 deletions...in/resources/templates/towns/trails/dragonstale/script.js
Loading
Please register or sign in to comment