Merge branch 'main' into...
Merge branch 'main' into 82-as-a-site-admininstrator-i-want-to-be-able-to-review-submited-trail-checkpoints-by-bussiness "Commiting to merge with main"
No related tags found
Showing
- src/main/java/Team5/SmartTowns/data/Location.java 27 additions, 2 deletionssrc/main/java/Team5/SmartTowns/data/Location.java
- src/main/java/Team5/SmartTowns/data/LocationRepository.java 2 additions, 2 deletionssrc/main/java/Team5/SmartTowns/data/LocationRepository.java
- src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java 49 additions, 23 deletions...in/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/data/Trail.java 18 additions, 3 deletionssrc/main/java/Team5/SmartTowns/data/Trail.java
- src/main/java/Team5/SmartTowns/data/TrailsRepository.java 1 addition, 0 deletionssrc/main/java/Team5/SmartTowns/data/TrailsRepository.java
- src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java 13 additions, 3 deletions...main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/landmarks/Landmarks.java 1 addition, 1 deletionsrc/main/java/Team5/SmartTowns/landmarks/Landmarks.java
- src/main/java/Team5/SmartTowns/placeswithcoordinates/LocationsCoordinates.java 6 additions, 6 deletions...martTowns/placeswithcoordinates/LocationsCoordinates.java
- src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java 66 additions, 27 deletions...m5/SmartTowns/placeswithcoordinates/PlacesController.java
- src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepository.java 1 addition, 1 deletion...ns/placeswithcoordinates/PlacesCoordinatesRepository.java
- src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java 7 additions, 4 deletions...laceswithcoordinates/PlacesCoordinatesRepositoryJDBC.java
- src/main/resources/data.sql 67 additions, 15 deletionssrc/main/resources/data.sql
- src/main/resources/schema.sql 13 additions, 8 deletionssrc/main/resources/schema.sql
- src/main/resources/static/css/locationPageFragsStyle.css 3 additions, 0 deletionssrc/main/resources/static/css/locationPageFragsStyle.css
- src/main/resources/static/css/trailsPageFragsStyle.css 36 additions, 0 deletionssrc/main/resources/static/css/trailsPageFragsStyle.css
- src/main/resources/static/scripts/mapAPI.js 153 additions, 153 deletionssrc/main/resources/static/scripts/mapAPI.js
- src/main/resources/templates/fragments/locationPageFrags.html 2 additions, 1 deletion...main/resources/templates/fragments/locationPageFrags.html
- src/main/resources/templates/fragments/trailsPageFrags.html 114 additions, 0 deletionssrc/main/resources/templates/fragments/trailsPageFrags.html
- src/main/resources/templates/landmarks/LandmarkFormTh.html 1 addition, 1 deletionsrc/main/resources/templates/landmarks/LandmarkFormTh.html
- src/main/resources/templates/landmarks/trailsPage.html 98 additions, 0 deletionssrc/main/resources/templates/landmarks/trailsPage.html
Loading
Please register or sign in to comment