Merge branch 'main' into...
Merge branch 'main' into 44-as-a-user-i-want-to-be-able-to-have-the-homepage-being-very-intuitive-and-easy-to-navigate
No related branches found
No related tags found
Showing
- build.gradle 2 additions, 1 deletionbuild.gradle
- src/main/java/Team5/SmartTowns/trails/Trail.java 39 additions, 0 deletionssrc/main/java/Team5/SmartTowns/trails/Trail.java
- src/main/java/Team5/SmartTowns/trails/TrailsController.java 38 additions, 0 deletionssrc/main/java/Team5/SmartTowns/trails/TrailsController.java
- src/main/resources/static/css/allTrails.css 121 additions, 0 deletionssrc/main/resources/static/css/allTrails.css
- src/main/resources/static/images/trails/trail1.jpg 0 additions, 0 deletionssrc/main/resources/static/images/trails/trail1.jpg
- src/main/resources/static/images/trails/trail2.jpg 0 additions, 0 deletionssrc/main/resources/static/images/trails/trail2.jpg
- src/main/resources/static/images/trails/trail3.jpg 0 additions, 0 deletionssrc/main/resources/static/images/trails/trail3.jpg
- src/main/resources/static/images/trails/trail4.jpg 0 additions, 0 deletionssrc/main/resources/static/images/trails/trail4.jpg
- src/main/resources/static/images/trails/trailNotFound.jpg 0 additions, 0 deletionssrc/main/resources/static/images/trails/trailNotFound.jpg
- src/main/resources/static/scripts/allTrails.js 18 additions, 0 deletionssrc/main/resources/static/scripts/allTrails.js
- src/main/resources/templates/allTrails/allTrails.html 36 additions, 0 deletionssrc/main/resources/templates/allTrails/allTrails.html
- src/main/resources/templates/fragments/allTrailsFrags.html 11 additions, 0 deletionssrc/main/resources/templates/fragments/allTrailsFrags.html
- src/main/resources/templates/fragments/temp_frags.html 2 additions, 15 deletionssrc/main/resources/templates/fragments/temp_frags.html
src/main/resources/static/css/allTrails.css
0 → 100644
53.3 KiB
68.1 KiB
415 KiB
102 KiB
73.8 KiB