From d31414cf19b3deaaf8e5f0f18a236c47692576a7 Mon Sep 17 00:00:00 2001
From: Gabriel Copat <copatg@cardiff.ac.uk>
Date: Thu, 14 Dec 2023 11:50:34 +0000
Subject: [PATCH] HTML fixes w/ Rhys Nute & Rhys Evans
---
.../java/Team5/SmartTowns/data/Location.java | 1 -
.../SmartTowns/data/LocationRepository.java | 2 +-
.../data/LocationRepositoryJDBC.java | 9 -
.../PlacesController.java | 20 +-
.../PlacesCoordinatesRepositoryJDBC.java | 367 +-----------------
src/main/resources/application.properties | 2 +-
src/main/resources/data.sql | 16 +-
src/main/resources/schema.sql | 9 +-
.../static/css/locationApprovalFormStyle.css | 10 +-
.../resources/static/css/mobile-style.css | 26 ++
.../templates/fragments/banners.html | 14 +-
.../templates/fragments/trailsPageFrags.html | 2 +-
.../landmarks/locationApprovalFormTh.html | 6 +-
.../templates/towns/home/mobile-homepage.html | 2 +
14 files changed, 61 insertions(+), 425 deletions(-)
diff --git a/src/main/java/Team5/SmartTowns/data/Location.java b/src/main/java/Team5/SmartTowns/data/Location.java
index 60b4a772..e013b0f8 100644
--- a/src/main/java/Team5/SmartTowns/data/Location.java
+++ b/src/main/java/Team5/SmartTowns/data/Location.java
@@ -60,7 +60,6 @@ public class Location {
public boolean isLocationApproved() {
return locationApproved;
-
}
diff --git a/src/main/java/Team5/SmartTowns/data/LocationRepository.java b/src/main/java/Team5/SmartTowns/data/LocationRepository.java
index 87a282b8..da6f1183 100644
--- a/src/main/java/Team5/SmartTowns/data/LocationRepository.java
+++ b/src/main/java/Team5/SmartTowns/data/LocationRepository.java
@@ -12,7 +12,7 @@ public interface LocationRepository {
List<Location> getAllApprovedLocations();
- int nametoLocationID(String name);
+ int nametoLocationID(String name);
// List<Location> getApprovedLocations2(List<Location> list);
diff --git a/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
index 98d829b7..8ab41dc4 100644
--- a/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
@@ -41,16 +41,7 @@ public class LocationRepositoryJDBC implements LocationRepository {
String sql= "SELECT * FROM locations";
return jdbc.query(sql, locationMapper);
}
- public LocationRepositoryJDBC() {
- JdbcTemplate ajdbc = new JdbcTemplate();
- this.jdbc =ajdbc;
- setlocationMapper();
- }
- public LocationRepositoryJDBC(JdbcTemplate jdbc, RowMapper<Location> locationMapper) {
- this.jdbc = jdbc;
- this.locationMapper = locationMapper;
- }
@Override
public List<Location> getAllApprovedLocations(){
diff --git a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
index b9f08193..94200d14 100644
--- a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
+++ b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
@@ -5,8 +5,6 @@ import Team5.SmartTowns.data.LocationRepository;
import Team5.SmartTowns.data.Trail;
import Team5.SmartTowns.data.TrailsRepository;
import Team5.SmartTowns.rewards.RewardsRepository;
-import Team5.SmartTowns.users.UserRepository;
-import jakarta.validation.constraints.Max;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -18,15 +16,12 @@ import org.springframework.web.servlet.ModelAndView;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
@Controller
public class PlacesController {
@Autowired
private PlacesCoordinatesRepository placeRepo;
- @Autowired
- private LocationRepository locationRepo;
@Autowired
private TrailsRepository trailsRepo;
@@ -34,12 +29,15 @@ public class PlacesController {
@Autowired
private RewardsRepository rewardsRepository;
+ @Autowired
+ private LocationRepository locationRepository;
+
@GetMapping("/checkpoints")
public ModelAndView getLocationPages(){
ModelAndView modelAndView = new ModelAndView("landmarks/locationPage.html");
List<LocationsCoordinates> locCoords = placeRepo.getAllLocationCoords();
- List<Location> approvedLocations = locationRepo.getAllApprovedLocations();
+ List<Location> approvedLocations = locationRepository.getAllApprovedLocations();
modelAndView.addObject("location", approvedLocations);
modelAndView.addObject("locationCoords", locCoords);
@@ -58,7 +56,7 @@ public class PlacesController {
@GetMapping("/checkpoints/{location}")
public ModelAndView getResultBySearchKeyLocation(@PathVariable String location) {
List<LocationsCoordinates> locCoords = placeRepo.getAllLocationCoords();
- List<Location> approvedLocations = locationRepo.getAllApprovedLocations();
+ List<Location> approvedLocations = locationRepository.getAllApprovedLocations();
int locationID = 999;
for (int i=0;i<approvedLocations.size();i++){
@@ -84,7 +82,7 @@ public class PlacesController {
public ModelAndView getTrailsPage(){
ModelAndView modelAndView = new ModelAndView("landmarks/trailsPage.html");
List<LocationsCoordinates> locCoords = placeRepo.getAllLocationCoords();
- List<Location> approvedLocations = locationRepo.getAllApprovedLocations();
+ List<Location> approvedLocations = locationRepository.getAllApprovedLocations();
List<Trail> trailslocations = trailsRepo.getAllTrails();
List<Location> locationCoordsWorkaround = new ArrayList<Location>();
@@ -103,8 +101,9 @@ public class PlacesController {
@GetMapping("/trails/{trail}")
public ModelAndView getResultBySearchKeyTrails(@PathVariable String trail) {
List<LocationsCoordinates> locCoords = placeRepo.getAllLocationCoords();
- List<Location> approvedLocations = locationRepo.getAllApprovedLocations();
+ List<Location> approvedLocations = locationRepository.getAllApprovedLocations();
List<Trail> trailslocations = trailsRepo.getAllTrails();
+
int trailID = 999;// otherwise cases errors e.g. null used. 999 unlikely to be used so safe until then
for (int i=0;i<trailslocations.size();i++){
@@ -113,9 +112,6 @@ public class PlacesController {
break;}
}
ModelAndView modelAndView= new ModelAndView("fragments/trailsPageFrags :: trailsSection");
- System.out.println(locCoords.get(0).getLocationID());
- System.out.println(approvedLocations.get(0).getLocationID());
-// locations[indexValue.index].getLocationTrailID()==trail.getTrailsId()}
final int trailIDFINAL = trailID;
diff --git a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java
index a7a7dc86..4258c7e5 100644
--- a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java
@@ -18,6 +18,7 @@ public class PlacesCoordinatesRepositoryJDBC implements PlacesCoordinatesReposit
private JdbcTemplate jdbc;
private RowMapper<LocationsCoordinates> locationCoordMapper;
private RowMapper<TownWithTrails> townCoordMapper;
+
public PlacesCoordinatesRepositoryJDBC(JdbcTemplate aJdbc) {
this.jdbc = aJdbc;
setLocationCoordsMapper();
@@ -217,369 +218,3 @@ public class PlacesCoordinatesRepositoryJDBC implements PlacesCoordinatesReposit
-
-
- /// if location id == unapproved location id,-> make sure coords within boundaries, -> approve and append lcoations table and add to coords table.
-
-// List<String> unapprovedLocationTowns = new ArrayList<String>();
-// for (int i=1;unapprovedLocations.size()>i;i++ ){
-// if (Objects.equals(unapprovedLocations.get(i).getLocationPlace(), town)){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// }
-//
-////
-// // unapproved list
-// // if matches name, approve
-// // add long/lat coords
-// //use to update table
-// }
-//}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index fc40c9e4..52e81d21 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mariadb://localhost:3306/
+spring.datasource.url=jdbc:mariadb://localhost:3306/towns
spring.datasource.username=root
spring.datasource.password=comsc
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index 7d1cef56..ca3b5657 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -54,10 +54,6 @@ INSERT INTO stickers (packID, stickerID, name, description, rarity) VALUE (3, 1,
INSERT INTO stickers (packID, stickerID, name, description, rarity) VALUE (3, 2, 'Welsh Outline', 'Welsh Heritage', '1');
INSERT INTO stickers (packID, stickerID, name, description, rarity) VALUE (3, 3, 'Welsh Spoon', 'Welsh Heritage', '1');
-# delete from stickerprogress;
-# insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '1', true);
-# insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '3', true);
-# insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '2', true);
delete from locationCoordinates;
insert into locationCoordinates(locationID, locationCoordsLat, locationCoordsLong) value (2, 51.57623, -3.21910 );
@@ -73,23 +69,13 @@ insert into locationCoordinates(locationID, locationCoordsLat, locationCoordsLon
insert into locationCoordinates(locationID, locationCoordsLat, locationCoordsLong) value (20, 51.43547, -3.16789 );
-
-
-
-# insert into stickerprogress (userID, packID, stickerID) value (1, 1, 1);
-# insert into stickerprogress (userID, packID, stickerID) value (1, 1, 2);
-# insert into stickerprogress (userID, packID, stickerID) value (1, 1, 3);
-# insert into stickerprogress (userID, packID, stickerID) value (1, 1, 5);
-# insert into stickerprogress (userID, packID, stickerID) value (1, 2, 1);
-# insert into stickerprogress (userID, packID, stickerID) value (1, 2, 3);
-
delete from localauthority;
insert into localauthority ( localAuthorityName, address1, address2, city, county, postcode, website) value ( 'Caerphilly County Borough Council', 'Tredomen Park','', 'Ystrad Mynach, Hengoed', '', 'CF82 7PG', 'https://www.caerphilly.gov.uk/main.aspx?lang=en-GB');
insert into localauthority ( localAuthorityName, address1, address2, city, county, postcode, website) value ( 'Risca Town Council', 'Unit B, 75 Tredegar Street', '', 'Risca', '', 'NP11 6BW', 'https://www.riscatowncouncil.org.uk/');
insert into localauthority ( localAuthorityName, address1, address2, city, county, postcode, website) value ( 'Penarth Town Council West House', 'Stanwell Road', '', 'Penarth', '', 'CF64 2YG', 'https://www.penarthtowncouncil.gov.uk/your-council/');
-#
+
delete from townsWithTrails;
insert into townsWithTrails (townName, townCentreCoordsLat, townCentreCoordsLong, townUppermostCoordsLat, townLowermostCoordsLat, townLeftmostCoordsLong, townRightmostCoordsLong) value ('Caerphilly', '51.57903','-3.22075 ','51.60418','51.55093','-3.25222','-3.17696');
insert into townsWithTrails (townName, townCentreCoordsLat, townCentreCoordsLong, townUppermostCoordsLat, townLowermostCoordsLat, townLeftmostCoordsLong, townRightmostCoordsLong) value ('Risca','51.61195','-3.09648','51.63039','51.59175','-3.12129','-3.06438');
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 2078cbc3..12452d45 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -28,8 +28,7 @@ create table if not exists trails
city varchar(128)
) engine=InnoDB;
-drop table if exists locationCoordinates;
-drop table if exists locations;
+
create table if not exists locations
(
locationID bigint auto_increment primary key,
@@ -103,7 +102,7 @@ create table if not exists locationCoordinates
)engine=InnoDB;
-drop table if exists townsWithTrails;
+
create table if not exists townsWithTrails
(
townID bigint auto_increment primary key,
@@ -117,7 +116,7 @@ create table if not exists townsWithTrails
)engine=InnoDB;
-drop table if exists localAuthority;
+
create table if not exists localAuthority
(
localAuthorityID bigint auto_increment primary key,
@@ -130,7 +129,7 @@ create table if not exists localAuthority
website varchar(250)
) engine=InnoDB;
-drop table if exists businesses;
+
create table if not exists businesses
(
businessID bigint auto_increment primary key,
diff --git a/src/main/resources/static/css/locationApprovalFormStyle.css b/src/main/resources/static/css/locationApprovalFormStyle.css
index 99a2f871..3ff324e5 100644
--- a/src/main/resources/static/css/locationApprovalFormStyle.css
+++ b/src/main/resources/static/css/locationApprovalFormStyle.css
@@ -1,7 +1,7 @@
-body{
- background: rgb(41, 41, 41);
- color: wheat;
-}
+/*body{*/
+/* background: rgb(41, 41, 41);*/
+/* color: wheat;*/
+/*}*/
main {
background-color: rgb(206, 153, 253);
color: black;
@@ -9,7 +9,7 @@ main {
align-content: center;
text-align: center;
border-radius: 25px;
- max-width: 620px;
+ max-width: 80vw;
margin: 0 auto
}
diff --git a/src/main/resources/static/css/mobile-style.css b/src/main/resources/static/css/mobile-style.css
index 6be7d20c..fe240351 100644
--- a/src/main/resources/static/css/mobile-style.css
+++ b/src/main/resources/static/css/mobile-style.css
@@ -157,6 +157,31 @@ and (max-device-width: 640px) {
flex-direction: column;
align-items: center;
justify-content: flex-end;
+
+ & ul {
+ list-style: none;
+ text-decoration: none;
+
+
+ & li {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 15px;
+ margin-block: 3px;
+ background-color: #1f1f1f;
+ border-radius: 20px;
+ text-decoration: none;
+ text-align: center;
+
+ & a {
+ text-decoration: none;
+ font-weight: 600;
+ color: white;
+ font-size: 1.2em;
+ }
+ }
+ }
}
.rightFooter {
@@ -170,6 +195,7 @@ and (max-device-width: 640px) {
aspect-ratio: 1;
}
}
+
}
diff --git a/src/main/resources/templates/fragments/banners.html b/src/main/resources/templates/fragments/banners.html
index a04b03d5..b4955803 100644
--- a/src/main/resources/templates/fragments/banners.html
+++ b/src/main/resources/templates/fragments/banners.html
@@ -20,12 +20,6 @@
<input hidden type="submit" value="Sign Out"/>
</form>
</li>
- <li class="nav-li li-first">
- <a href="/local-authorities" class="nav-links">Local Authorities</a>
- </li>
- <li class="nav-li li-first">
- <a href="/businesses" class="nav-links">Local Businesses</a>
- </li>
</ul>
</nav>
</header>
@@ -42,6 +36,14 @@
</div>
<div class="footer-div centerFooter">
<div class="footerText">
+ <ul>
+ <li class="nav-li li-first">
+ <a href="/local-authorities" class="nav-links">Local Authorities</a>
+ </li>
+ <li class="nav-li li-first">
+ <a href="/businesses" class="nav-links">Local Businesses</a>
+ </li>
+ </ul>
<h3>Follow Us</h3>
<a href="https://www.facebook.com/VZTAsmarttowns/" class="icon"><img src="/images/icons/Facebook.png" height="25" width="25" alt="Facebook Logo" class="icon"/></a>
<a href="https://www.twitter.com/VZTAsmarttowns/" class="icon"><img src="/images/icons/Twitter.jpg" height="25" width="25" alt="X (formally Twitter) Logo" class="icon"/></a>
diff --git a/src/main/resources/templates/fragments/trailsPageFrags.html b/src/main/resources/templates/fragments/trailsPageFrags.html
index 9a62be17..d66c519a 100644
--- a/src/main/resources/templates/fragments/trailsPageFrags.html
+++ b/src/main/resources/templates/fragments/trailsPageFrags.html
@@ -93,7 +93,7 @@
</div>
</div>
<H3>Checkpoints:</H3>
-<!-- With the trial name, we go through locations list to get -->
+ With the trial name, we go through locations list to get
<div th:each="location:${locations}" >
<div>
<li id="checkpointList">
diff --git a/src/main/resources/templates/landmarks/locationApprovalFormTh.html b/src/main/resources/templates/landmarks/locationApprovalFormTh.html
index eb8c45db..7315b62f 100644
--- a/src/main/resources/templates/landmarks/locationApprovalFormTh.html
+++ b/src/main/resources/templates/landmarks/locationApprovalFormTh.html
@@ -4,14 +4,14 @@
<meta charset="UTF-8">
<title>Title</title>
- <link rel="stylesheet" th:href="@{css/templatingstyle.css}">
+ <link rel="stylesheet" th:href="@{css/mobile-style.css}">
<link rel="stylesheet" th:href="@{css/locationApprovalFormStyle.css}">
<script src="/scripts/locationApprovalForm.js"></script>
</head>
<body>
-<header th:insert="~{/fragments/Templating.html :: header}"></header>
+<header th:insert="~{/fragments/banners.html :: header}"></header>
<hr style="height:20px; visibility:hidden;" />
<main>
<H1 id="formHeader">Locations To Be Approved:</H1>
@@ -67,6 +67,6 @@
<hr style="height:20px; visibility:hidden;" />
</main>
-<footer th:insert="~{/fragments/Templating.html :: footer}"></footer>
+<footer th:insert="~{/fragments/banners.html :: footer}"></footer>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/towns/home/mobile-homepage.html b/src/main/resources/templates/towns/home/mobile-homepage.html
index 43da82f7..480cf574 100644
--- a/src/main/resources/templates/towns/home/mobile-homepage.html
+++ b/src/main/resources/templates/towns/home/mobile-homepage.html
@@ -13,7 +13,9 @@
<div class="title-container">
<h1 class="title">Welcome to VZTA Smart Towns!</h1>
<a class="submitLand" href="/landmarkSubmission"> <button> Submit Landmark!</button></a>
+ <a th:if="${#authentication.getName().equals('Admin')}" class="reviewLand" href="/checkpointApproval"> <button> Review Landmark!</button></a>
<p class="small-text">Choose your town and start tracking your trails!</p>
+
</div>
<article class="towns-wrapper">
--
GitLab