diff --git a/src/main/java/Team5.Smarttowns/Data/Towns.db b/src/main/java/Team5.Smarttowns/Data/Towns.db
deleted file mode 100644
index 2532550d9acf4d8abc21a6e6ed89629908b72a3e..0000000000000000000000000000000000000000
Binary files a/src/main/java/Team5.Smarttowns/Data/Towns.db and /dev/null differ
diff --git a/src/main/java/Team5/SmartTowns/Data/trailsRepository.java b/src/main/java/Team5/SmartTowns/Data/trailsRepository.java
deleted file mode 100644
index 52d8dc39b9bda0a7390f06afca8769a5fd0607a9..0000000000000000000000000000000000000000
--- a/src/main/java/Team5/SmartTowns/Data/trailsRepository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-//Holds trails data repository
-package Team5.SmartTowns.Data;
-
-import java.util.List;
-
-public interface trailsRepository {
- List<trail> getAllTrails();
-}
diff --git a/src/main/java/Team5/SmartTowns/SmartTownsApplication.java b/src/main/java/team5/smartTowns/SmartTownsApplication.java
similarity index 91%
rename from src/main/java/Team5/SmartTowns/SmartTownsApplication.java
rename to src/main/java/team5/smartTowns/SmartTownsApplication.java
index a7b32da0a9d501fcf7a551b0dc46d151c6870756..0e185ece7ae8f4fce38092002638f6efb67f0ec6 100644
--- a/src/main/java/Team5/SmartTowns/SmartTownsApplication.java
+++ b/src/main/java/team5/smartTowns/SmartTownsApplication.java
@@ -1,4 +1,4 @@
-package Team5.SmartTowns;
+package team5.smartTowns;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/Team5/SmartTowns/Data/DatabaseController.java b/src/main/java/team5/smartTowns/data/DatabaseController.java
similarity index 75%
rename from src/main/java/Team5/SmartTowns/Data/DatabaseController.java
rename to src/main/java/team5/smartTowns/data/DatabaseController.java
index 0d38e955dd0a2e38e9585e5560d1cd4b6df83033..11af79383f8936eb5119635acced8258d359fc34 100644
--- a/src/main/java/Team5/SmartTowns/Data/DatabaseController.java
+++ b/src/main/java/team5/smartTowns/data/DatabaseController.java
@@ -1,7 +1,5 @@
-package Team5.SmartTowns.Data;
+package team5.smartTowns.data;
-import Team5.SmartTowns.users.User;
-import Team5.SmartTowns.users.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@@ -13,15 +11,15 @@ public class DatabaseController {
@Autowired
- private locationRepository locationRepository;
+ private LocationRepository locationRepository;
@Autowired
- private trailsRepository trailsRepository;
+ private TrailsRepository trailsRepository;
@GetMapping("/trailList")
public ModelAndView trailList() {
ModelAndView mav1 = new ModelAndView("towns/trailsData");
- List<trail> trail = trailsRepository.getAllTrails();
+ List<Trail> trail = trailsRepository.getAllTrails();
mav1.addObject("trails", trail);
return mav1;
}
diff --git a/src/main/java/Team5/SmartTowns/Data/Location.java b/src/main/java/team5/smartTowns/data/Location.java
similarity index 97%
rename from src/main/java/Team5/SmartTowns/Data/Location.java
rename to src/main/java/team5/smartTowns/data/Location.java
index 01ba2932c6b7d0a6201aa8128161bf7ad8b27526..d968ac31496c116afc9555a420c6b3b684473138 100644
--- a/src/main/java/Team5/SmartTowns/Data/Location.java
+++ b/src/main/java/team5/smartTowns/data/Location.java
@@ -1,5 +1,5 @@
//Holds variable data for the locations table (landmarks)
-package Team5.SmartTowns.Data;
+package team5.smartTowns.data;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/Team5/SmartTowns/Data/locationRepository.java b/src/main/java/team5/smartTowns/data/LocationRepository.java
similarity index 68%
rename from src/main/java/Team5/SmartTowns/Data/locationRepository.java
rename to src/main/java/team5/smartTowns/data/LocationRepository.java
index 822a18cb860654694734c7f591cbb5b216eb8a39..60a81f05b059141bbefd276a66ac38224aec7de8 100644
--- a/src/main/java/Team5/SmartTowns/Data/locationRepository.java
+++ b/src/main/java/team5/smartTowns/data/LocationRepository.java
@@ -1,10 +1,10 @@
//Holds locations data repository (landmarks)
-package Team5.SmartTowns.Data;
+package team5.smartTowns.data;
import java.util.List;
-public interface locationRepository {
+public interface LocationRepository {
List<Location> getAllLocation();
void addLocation(Location loc);
diff --git a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java b/src/main/java/team5/smartTowns/data/LocationRepositoryJDBC.java
similarity index 90%
rename from src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java
rename to src/main/java/team5/smartTowns/data/LocationRepositoryJDBC.java
index a5e79d4442d540f5dba67ee7f2b6217984044ebb..b832c7fe0f916320e9b33c93d1623e42d8c0391c 100644
--- a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java
+++ b/src/main/java/team5/smartTowns/data/LocationRepositoryJDBC.java
@@ -1,5 +1,5 @@
//Implements the locations repository using JDBC
-package Team5.SmartTowns.Data;
+package team5.smartTowns.data;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
@@ -8,11 +8,11 @@ import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
-public class locationRepositoryJDBC implements locationRepository {
+public class LocationRepositoryJDBC implements LocationRepository {
private JdbcTemplate jdbc;
private RowMapper<Location> locationMapper;
- public locationRepositoryJDBC(JdbcTemplate aJdbc) {
+ public LocationRepositoryJDBC(JdbcTemplate aJdbc) {
this.jdbc = aJdbc;
setlocationMapper();
}
diff --git a/src/main/java/Team5/SmartTowns/Data/trail.java b/src/main/java/team5/smartTowns/data/Trail.java
similarity index 77%
rename from src/main/java/Team5/SmartTowns/Data/trail.java
rename to src/main/java/team5/smartTowns/data/Trail.java
index 86e78b96712ecf7a5756edbf20a4bae35839ca70..4bcf497b0965c21c321f0762858457572747b3ba 100644
--- a/src/main/java/Team5/SmartTowns/Data/trail.java
+++ b/src/main/java/team5/smartTowns/data/Trail.java
@@ -1,12 +1,12 @@
//Holds variable data for the trails table
-package Team5.SmartTowns.Data;
+package team5.smartTowns.data;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
-public class trail {
+public class Trail {
private int trailsId;
private String name;
}
diff --git a/src/main/java/team5/smartTowns/data/TrailsRepository.java b/src/main/java/team5/smartTowns/data/TrailsRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..42c77dabe10d816033c4b5bb666b1288dc973b71
--- /dev/null
+++ b/src/main/java/team5/smartTowns/data/TrailsRepository.java
@@ -0,0 +1,8 @@
+//Holds trails data repository
+package team5.smartTowns.data;
+
+import java.util.List;
+
+public interface TrailsRepository {
+ List<Trail> getAllTrails();
+}
diff --git a/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java b/src/main/java/team5/smartTowns/data/TrailsRepositoryJDBC.java
similarity index 66%
rename from src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java
rename to src/main/java/team5/smartTowns/data/TrailsRepositoryJDBC.java
index 58aa84a95b00b8f8b5d7f97d240e04f405d2ac3b..d41b9635824888b7631e99a5eb47cceabca00dfc 100644
--- a/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java
+++ b/src/main/java/team5/smartTowns/data/TrailsRepositoryJDBC.java
@@ -1,5 +1,5 @@
//Implements the trails repository using JDBC
-package Team5.SmartTowns.Data;
+package team5.smartTowns.data;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
@@ -8,20 +8,20 @@ import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
-public class trailsRepositoryJDBC implements trailsRepository{
+public class TrailsRepositoryJDBC implements TrailsRepository {
private JdbcTemplate jdbc;
- private RowMapper<trail> trailMapper;
- public trailsRepositoryJDBC(JdbcTemplate aJdbc){
+ private RowMapper<Trail> trailMapper;
+ public TrailsRepositoryJDBC(JdbcTemplate aJdbc){
this.jdbc = aJdbc;
settrailsMapper();
}
private void settrailsMapper(){
- trailMapper = (rs, i) -> new trail(
+ trailMapper = (rs, i) -> new Trail(
rs.getInt("trailID"),
rs.getString("name")
);
}
- public List<trail> getAllTrails(){
+ public List<Trail> getAllTrails(){
String sql= "SELECT * FROM trails";
return jdbc.query(sql, trailMapper);
}
diff --git a/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java b/src/main/java/team5/smartTowns/landmarks/Landmarks.java
similarity index 93%
rename from src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
rename to src/main/java/team5/smartTowns/landmarks/Landmarks.java
index f9ceacf15728a5f7cdf9b36c2577dbb1aa0c7624..4a57f7f51c996edf8354f973c9509d39a1596035 100644
--- a/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
+++ b/src/main/java/team5/smartTowns/landmarks/Landmarks.java
@@ -1,8 +1,6 @@
-package Team5.SmartTowns.Landmarks;
+package team5.smartTowns.landmarks;
-import Team5.SmartTowns.trails.Trail;
import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java b/src/main/java/team5/smartTowns/landmarks/LandmarksController.java
similarity index 91%
rename from src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java
rename to src/main/java/team5/smartTowns/landmarks/LandmarksController.java
index a94feef88935a8d3ca71f6326bdb8f44cda6dd0e..efca1ea1b33a8f2abe6bf92e28287c6785bbafb1 100644
--- a/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java
+++ b/src/main/java/team5/smartTowns/landmarks/LandmarksController.java
@@ -1,7 +1,7 @@
-package Team5.SmartTowns.Landmarks;
+package team5.smartTowns.landmarks;
-import Team5.SmartTowns.Data.Location;
-import Team5.SmartTowns.Data.locationRepository;
+import team5.smartTowns.data.Location;
+import team5.smartTowns.data.LocationRepository;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -26,7 +26,7 @@ public class LandmarksController {
}
@Autowired
- private locationRepository locationRepository;
+ private LocationRepository locationRepository;
@PostMapping("/landmarkSub")
public ModelAndView landmarkSent(@Valid @ModelAttribute("landmarkData") Landmarks landmarks, BindingResult bindingResult, Model model ) {
diff --git a/src/main/java/Team5/SmartTowns/rewards/Badge.java b/src/main/java/team5/smartTowns/rewards/Badge.java
similarity index 97%
rename from src/main/java/Team5/SmartTowns/rewards/Badge.java
rename to src/main/java/team5/smartTowns/rewards/Badge.java
index 25c231e14e3f0afdd4ecfc2d6e9f352925224097..d1ecc486cda13e68c4f8b977c664a48c4d31276f 100644
--- a/src/main/java/Team5/SmartTowns/rewards/Badge.java
+++ b/src/main/java/team5/smartTowns/rewards/Badge.java
@@ -1,5 +1,5 @@
/*AUTHOR: Gabriel Copat*/
-package Team5.SmartTowns.rewards;
+package team5.smartTowns.rewards;
import lombok.Data;
diff --git a/src/main/java/Team5/SmartTowns/rewards/BadgesRepository.java b/src/main/java/team5/smartTowns/rewards/BadgesRepository.java
similarity index 79%
rename from src/main/java/Team5/SmartTowns/rewards/BadgesRepository.java
rename to src/main/java/team5/smartTowns/rewards/BadgesRepository.java
index 56b1019cbe016a7c687b5ac83973679e8f498eef..f3dcccdefbba85e6a568c41865df00ce98d01faf 100644
--- a/src/main/java/Team5/SmartTowns/rewards/BadgesRepository.java
+++ b/src/main/java/team5/smartTowns/rewards/BadgesRepository.java
@@ -1,5 +1,5 @@
//Holds locations data repository
-package Team5.SmartTowns.rewards;
+package team5.smartTowns.rewards;
import java.util.List;
diff --git a/src/main/java/Team5/SmartTowns/rewards/BadgesRepositoryJDBC.java b/src/main/java/team5/smartTowns/rewards/BadgesRepositoryJDBC.java
similarity index 96%
rename from src/main/java/Team5/SmartTowns/rewards/BadgesRepositoryJDBC.java
rename to src/main/java/team5/smartTowns/rewards/BadgesRepositoryJDBC.java
index 7c22061e894a633bf9c047f69f575daf9366b493..a0f62669c1826465b0f6f9d544734edd78bdaf8a 100644
--- a/src/main/java/Team5/SmartTowns/rewards/BadgesRepositoryJDBC.java
+++ b/src/main/java/team5/smartTowns/rewards/BadgesRepositoryJDBC.java
@@ -1,5 +1,5 @@
//Implements the locations repository using JDBC
-package Team5.SmartTowns.rewards;
+package team5.smartTowns.rewards;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
diff --git a/src/main/java/Team5/SmartTowns/rewards/RewardsController.java b/src/main/java/team5/smartTowns/rewards/RewardsController.java
similarity index 74%
rename from src/main/java/Team5/SmartTowns/rewards/RewardsController.java
rename to src/main/java/team5/smartTowns/rewards/RewardsController.java
index af9d33cba34dd12ac6aa5ca1e54320b8124af9d4..b8e81b56823effa22da3e433144933fe8e469b62 100644
--- a/src/main/java/Team5/SmartTowns/rewards/RewardsController.java
+++ b/src/main/java/team5/smartTowns/rewards/RewardsController.java
@@ -1,4 +1,4 @@
-package Team5.SmartTowns.rewards;
+package team5.smartTowns.rewards;
import org.springframework.stereotype.Controller;
diff --git a/src/main/java/Team5/SmartTowns/rewards/Sticker.java b/src/main/java/team5/smartTowns/rewards/Sticker.java
similarity index 97%
rename from src/main/java/Team5/SmartTowns/rewards/Sticker.java
rename to src/main/java/team5/smartTowns/rewards/Sticker.java
index 4fa498c61e7d5748e7d6dcfc26c7c6442dfd8cc4..fe067dbfeea38c6c6b13174a253d1af5846ffd2c 100644
--- a/src/main/java/Team5/SmartTowns/rewards/Sticker.java
+++ b/src/main/java/team5/smartTowns/rewards/Sticker.java
@@ -1,5 +1,5 @@
/*AUTHOR: Gabriel Copat*/
-package Team5.SmartTowns.rewards;
+package team5.smartTowns.rewards;
import lombok.Data;
diff --git a/src/main/java/Team5/SmartTowns/rewards/StickersRepository.java b/src/main/java/team5/smartTowns/rewards/StickersRepository.java
similarity index 80%
rename from src/main/java/Team5/SmartTowns/rewards/StickersRepository.java
rename to src/main/java/team5/smartTowns/rewards/StickersRepository.java
index 869c2d07353a7aa090fb7fee79b2d44feacd9b12..41e12aefbed04545fc6860db291f30421712f410 100644
--- a/src/main/java/Team5/SmartTowns/rewards/StickersRepository.java
+++ b/src/main/java/team5/smartTowns/rewards/StickersRepository.java
@@ -1,5 +1,5 @@
//Holds locations data repository
-package Team5.SmartTowns.rewards;
+package team5.smartTowns.rewards;
import java.util.List;
diff --git a/src/main/java/Team5/SmartTowns/rewards/StickersRepositoryJDBC.java b/src/main/java/team5/smartTowns/rewards/StickersRepositoryJDBC.java
similarity index 96%
rename from src/main/java/Team5/SmartTowns/rewards/StickersRepositoryJDBC.java
rename to src/main/java/team5/smartTowns/rewards/StickersRepositoryJDBC.java
index 64df71bc3da3eff327377798185111aee3be7867..8789c6db38840cefc1a9029154428ecd2858b9af 100644
--- a/src/main/java/Team5/SmartTowns/rewards/StickersRepositoryJDBC.java
+++ b/src/main/java/team5/smartTowns/rewards/StickersRepositoryJDBC.java
@@ -1,5 +1,5 @@
//Implements the locations repository using JDBC
-package Team5.SmartTowns.rewards;
+package team5.smartTowns.rewards;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
diff --git a/src/main/java/Team5/SmartTowns/Towns/TownController.java b/src/main/java/team5/smartTowns/towns/TownController.java
similarity index 94%
rename from src/main/java/Team5/SmartTowns/Towns/TownController.java
rename to src/main/java/team5/smartTowns/towns/TownController.java
index aa15a341da7fe2ef346f5278ae1a55faaa3136fc..05fb13cab60599464b8981e92b8d84a18c148acd 100644
--- a/src/main/java/Team5/SmartTowns/Towns/TownController.java
+++ b/src/main/java/team5/smartTowns/towns/TownController.java
@@ -1,4 +1,4 @@
-package Team5.SmartTowns.Towns;
+package team5.smartTowns.towns;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/main/java/Team5/SmartTowns/Towns/TownStorage.java b/src/main/java/team5/smartTowns/towns/TownStorage.java
similarity index 97%
rename from src/main/java/Team5/SmartTowns/Towns/TownStorage.java
rename to src/main/java/team5/smartTowns/towns/TownStorage.java
index d2d99ea992086630324fa131ad5bb410acd3c425..37c4b8b963969dcb18e1eef8af1d6a760c0a29f9 100644
--- a/src/main/java/Team5/SmartTowns/Towns/TownStorage.java
+++ b/src/main/java/team5/smartTowns/towns/TownStorage.java
@@ -1,4 +1,4 @@
-package Team5.SmartTowns.Towns;
+package team5.smartTowns.towns;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/Team5/SmartTowns/Towns/Towns.java b/src/main/java/team5/smartTowns/towns/Towns.java
similarity index 97%
rename from src/main/java/Team5/SmartTowns/Towns/Towns.java
rename to src/main/java/team5/smartTowns/towns/Towns.java
index a1b103f7abf6aa4379d877c645185f2c522a25ba..7c17035ab1ee1a8a2911727aa763d4f08dc8bf0e 100644
--- a/src/main/java/Team5/SmartTowns/Towns/Towns.java
+++ b/src/main/java/team5/smartTowns/towns/Towns.java
@@ -1,4 +1,4 @@
-package Team5.SmartTowns.Towns;
+package team5.smartTowns.towns;
import lombok.Data;
diff --git a/src/main/java/Team5/SmartTowns/trails/Trail.java b/src/main/java/team5/smartTowns/trails/Trail.java
similarity index 98%
rename from src/main/java/Team5/SmartTowns/trails/Trail.java
rename to src/main/java/team5/smartTowns/trails/Trail.java
index a7067f83758ce0904851b89a51880dc9782da104..841b8cab1884528cf0aae08f1a38c358ce579073 100644
--- a/src/main/java/Team5/SmartTowns/trails/Trail.java
+++ b/src/main/java/team5/smartTowns/trails/Trail.java
@@ -1,4 +1,4 @@
-package Team5.SmartTowns.trails;
+package team5.smartTowns.trails;
import lombok.Data;
diff --git a/src/main/java/Team5/SmartTowns/trails/TrailsController.java b/src/main/java/team5/smartTowns/trails/TrailsController.java
similarity index 91%
rename from src/main/java/Team5/SmartTowns/trails/TrailsController.java
rename to src/main/java/team5/smartTowns/trails/TrailsController.java
index c91c7abb4f64270f948d4313070adf47b08c07c8..0c3f481b2fff9290616bc951f36f4a84814032f6 100644
--- a/src/main/java/Team5/SmartTowns/trails/TrailsController.java
+++ b/src/main/java/team5/smartTowns/trails/TrailsController.java
@@ -1,7 +1,7 @@
-package Team5.SmartTowns.trails;
+package team5.smartTowns.trails;
-import Team5.SmartTowns.Landmarks.Landmarks;
+import team5.smartTowns.landmarks.Landmarks;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -10,10 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
-import java.util.ArrayList;
import java.util.List;
-import static Team5.SmartTowns.Landmarks.Landmarks.getLandmarksDragonstrail;
+import static team5.smartTowns.landmarks.Landmarks.getLandmarksDragonstrail;
@Controller
public class TrailsController {
diff --git a/src/main/java/Team5/SmartTowns/users/User.java b/src/main/java/team5/smartTowns/users/User.java
similarity index 90%
rename from src/main/java/Team5/SmartTowns/users/User.java
rename to src/main/java/team5/smartTowns/users/User.java
index 84887664fbee090abb68281f28b5f2b0832af9ae..c2637917df72ac942c4e029b160d2922512a1a73 100644
--- a/src/main/java/Team5/SmartTowns/users/User.java
+++ b/src/main/java/team5/smartTowns/users/User.java
@@ -1,7 +1,7 @@
-package Team5.SmartTowns.users;
+package team5.smartTowns.users;
-import Team5.SmartTowns.rewards.Badge;
-import Team5.SmartTowns.rewards.Sticker;
+import team5.smartTowns.rewards.Badge;
+import team5.smartTowns.rewards.Sticker;
import lombok.Data;
import java.io.File;
diff --git a/src/main/java/Team5/SmartTowns/users/UserController.java b/src/main/java/team5/smartTowns/users/UserController.java
similarity index 90%
rename from src/main/java/Team5/SmartTowns/users/UserController.java
rename to src/main/java/team5/smartTowns/users/UserController.java
index d635c8a401d85ef6d930142882d69b5528f38fd7..3477dcfbea6bca8e8212b442d92e3b43653e274b 100644
--- a/src/main/java/Team5/SmartTowns/users/UserController.java
+++ b/src/main/java/team5/smartTowns/users/UserController.java
@@ -1,10 +1,10 @@
-package Team5.SmartTowns.users;
+package team5.smartTowns.users;
-import Team5.SmartTowns.rewards.Badge;
-import Team5.SmartTowns.rewards.BadgesRepository;
-import Team5.SmartTowns.rewards.Sticker;
-import Team5.SmartTowns.rewards.StickersRepository;
+import team5.smartTowns.rewards.Badge;
+import team5.smartTowns.rewards.BadgesRepository;
+import team5.smartTowns.rewards.Sticker;
+import team5.smartTowns.rewards.StickersRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/main/java/Team5/SmartTowns/users/UserRepository.java b/src/main/java/team5/smartTowns/users/UserRepository.java
similarity index 89%
rename from src/main/java/Team5/SmartTowns/users/UserRepository.java
rename to src/main/java/team5/smartTowns/users/UserRepository.java
index 9f4e828f17c231179df1a9fcd6a87cc5c8cf75b6..772e021c773253715f7a039a2de201b2d9538a03 100644
--- a/src/main/java/Team5/SmartTowns/users/UserRepository.java
+++ b/src/main/java/team5/smartTowns/users/UserRepository.java
@@ -1,5 +1,5 @@
//Holds users data repository
-package Team5.SmartTowns.users;
+package team5.smartTowns.users;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java b/src/main/java/team5/smartTowns/users/UserRepositoryJDBC.java
similarity index 97%
rename from src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
rename to src/main/java/team5/smartTowns/users/UserRepositoryJDBC.java
index 9b24461d06d300172d904272edf0cc20c51b99f0..74e6ad0594e9fe6d08b4209799539187f306458e 100644
--- a/src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
+++ b/src/main/java/team5/smartTowns/users/UserRepositoryJDBC.java
@@ -1,11 +1,10 @@
//Implements the users repository using JDBC
-package Team5.SmartTowns.users;
+package team5.smartTowns.users;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.stereotype.Repository;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/Team5/SmartTowns/Webpages/WebpageController.java b/src/main/java/team5/smartTowns/webpages/WebpageController.java
similarity index 66%
rename from src/main/java/Team5/SmartTowns/Webpages/WebpageController.java
rename to src/main/java/team5/smartTowns/webpages/WebpageController.java
index 37a30366e5335d1870c202d1a49b4a5d2bca474d..768b1fbaa6a1eeca5f5263394ab56c6389c806b5 100644
--- a/src/main/java/Team5/SmartTowns/Webpages/WebpageController.java
+++ b/src/main/java/team5/smartTowns/webpages/WebpageController.java
@@ -1,4 +1,4 @@
-package Team5.SmartTowns.Webpages;
+package team5.smartTowns.webpages;
import org.springframework.ui.Model;
@@ -26,20 +26,4 @@ public class WebpageController {
ModelAndView modelAndView = new ModelAndView("Towns/risca");
return modelAndView;
}
-
-// @GetMapping("/home")
-// public ModelAndView getHome(){
-// ModelAndView modelAndView = new ModelAndView("Towns/home/homePage");
-// return modelAndView;
-// }
-
-
- @RequestMapping(value="/test_ajax_frag", method=RequestMethod.POST)
- public String sendHtmlFragment(Model map) {
- //map.addAttribute("foo", "bar");
- return "fragments/temp_frags.html :: trailInfo2";
- }
-
-
-
}
diff --git a/src/main/resources/QRCodeScanner.html b/src/main/resources/QRCodeScanner.html
deleted file mode 100644
index 11da0658b1421e28159c97fc5abae82030ff3630..0000000000000000000000000000000000000000
--- a/src/main/resources/QRCodeScanner.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>QR Camera</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/index.html b/src/main/resources/index.html
deleted file mode 100644
index 489349d1b63d75904028b48ddd4eb36d29f63650..0000000000000000000000000000000000000000
--- a/src/main/resources/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Home Page</title>
-</head>
-<body>
-<h1>Welcome to the home page</h1>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/static/images/LinkedIn.jpg b/src/main/resources/static/images/LinkedIn.jpg
deleted file mode 100644
index 6bf094d20c89883756ec5a105ec2cea1f9eeaf76..0000000000000000000000000000000000000000
Binary files a/src/main/resources/static/images/LinkedIn.jpg and /dev/null differ
diff --git "a/src/main/resources/static/images/Twitter-Log\320\276.png" "b/src/main/resources/static/images/Twitter-Log\320\276.png"
deleted file mode 100644
index c475939bfacb4be3559aab3d58a9a5eadf036afb..0000000000000000000000000000000000000000
Binary files "a/src/main/resources/static/images/Twitter-Log\320\276.png" and /dev/null differ
diff --git a/src/main/resources/static/images/badges.png b/src/main/resources/static/images/badges.png
deleted file mode 100644
index 57e379c719f5fe28ba827d7007be9637cfd9ff73..0000000000000000000000000000000000000000
Binary files a/src/main/resources/static/images/badges.png and /dev/null differ
diff --git a/src/main/resources/static/images/CaerphillyCastle.jpg b/src/main/resources/static/images/banners/CaerphillyCastle.jpg
similarity index 100%
rename from src/main/resources/static/images/CaerphillyCastle.jpg
rename to src/main/resources/static/images/banners/CaerphillyCastle.jpg
diff --git a/src/main/resources/static/images/PenarthBanner.jpg b/src/main/resources/static/images/banners/PenarthBanner.jpg
similarity index 100%
rename from src/main/resources/static/images/PenarthBanner.jpg
rename to src/main/resources/static/images/banners/PenarthBanner.jpg
diff --git a/src/main/resources/static/images/RiscaBanner.jpg b/src/main/resources/static/images/banners/RiscaBanner.jpg
similarity index 100%
rename from src/main/resources/static/images/RiscaBanner.jpg
rename to src/main/resources/static/images/banners/RiscaBanner.jpg
diff --git a/src/main/resources/static/images/Facebook.png b/src/main/resources/static/images/icons/Facebook.png
similarity index 100%
rename from src/main/resources/static/images/Facebook.png
rename to src/main/resources/static/images/icons/Facebook.png
diff --git a/src/main/resources/static/images/Instagram.jpg b/src/main/resources/static/images/icons/Instagram.jpg
similarity index 100%
rename from src/main/resources/static/images/Instagram.jpg
rename to src/main/resources/static/images/icons/Instagram.jpg
diff --git a/src/main/resources/static/images/Linkedin.png b/src/main/resources/static/images/icons/Linkedin.png
similarity index 100%
rename from src/main/resources/static/images/Linkedin.png
rename to src/main/resources/static/images/icons/Linkedin.png
diff --git a/src/main/resources/static/images/Twitter.jpg b/src/main/resources/static/images/icons/Twitter.jpg
similarity index 100%
rename from src/main/resources/static/images/Twitter.jpg
rename to src/main/resources/static/images/icons/Twitter.jpg
diff --git a/src/main/resources/static/images/VZTA.png b/src/main/resources/static/images/icons/VZTA.png
similarity index 100%
rename from src/main/resources/static/images/VZTA.png
rename to src/main/resources/static/images/icons/VZTA.png
diff --git a/src/main/resources/static/images/stats.png b/src/main/resources/static/images/stats.png
deleted file mode 100644
index 39904f1cfc911df01306fb85ab78b015e7d0386c..0000000000000000000000000000000000000000
Binary files a/src/main/resources/static/images/stats.png and /dev/null differ
diff --git a/src/main/resources/static/images/trails.jpg b/src/main/resources/static/images/trails.jpg
deleted file mode 100644
index 20481a4f8a914ae8b272f490e2006dd0afaa5a2b..0000000000000000000000000000000000000000
Binary files a/src/main/resources/static/images/trails.jpg and /dev/null differ
diff --git a/src/main/resources/static/test.html b/src/main/resources/static/test.html
deleted file mode 100644
index 98a5d8ce3c443e9b3c9e183848b038b11f2df7de..0000000000000000000000000000000000000000
--- a/src/main/resources/static/test.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>asdasd</title>
-</head>
-<body>
-sadasdasdasd
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/static/users.html b/src/main/resources/static/users.html
deleted file mode 100644
index 566549bdf8fae810809c1a81066000687cb338f6..0000000000000000000000000000000000000000
--- a/src/main/resources/static/users.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/allTrails/allTrails.html b/src/main/resources/templates/allTrails/allTrails.html
index 746762b68f64b62190bf71e102edf0ff309772d9..d29d1ad91cf459383b4681678742ed0a2cacbcd6 100644
--- a/src/main/resources/templates/allTrails/allTrails.html
+++ b/src/main/resources/templates/allTrails/allTrails.html
@@ -10,7 +10,7 @@
</head>
<body>
-<header th:replace="~{/towns/Templating.html :: header}"></header>
+<header th:replace="~{/fragments/Templating.html :: header}"></header>
<main>
<section id="allTrailsBar" class="centerFlex">
@@ -31,7 +31,7 @@
</section>
</main>
-<footer th:insert="~{/towns/Templating.html :: footer}"></footer>
+<footer th:insert="~{/fragments/Templating.html :: footer}"></footer>
<script type="text/javascript" th:src="@{scripts/allTrails.js}"></script>
diff --git a/src/main/resources/templates/towns/Templating.html b/src/main/resources/templates/fragments/Templating.html
similarity index 74%
rename from src/main/resources/templates/towns/Templating.html
rename to src/main/resources/templates/fragments/Templating.html
index 1313b325bb3027665a9242b8fcd6d9db707af4e7..871e541bd8767e721d139cedfa8dd193b5212987 100644
--- a/src/main/resources/templates/towns/Templating.html
+++ b/src/main/resources/templates/fragments/Templating.html
@@ -2,7 +2,7 @@
<link rel="stylesheet" href="../../static/css/templatingstyle.css">
<header class="headerBar" th:fragment="header">
<div class="Logo">
- <img src="/images/VZTA.png" height="97" width="400" alt="VZTA Logo"/>
+ <img src="/images/icons/VZTA.png" height="97" width="400" alt="VZTA Logo"/>
</div>
<nav class="navBar">
<ul>
@@ -41,10 +41,10 @@
<div class="centerFooter">
<span class="footerText">
<h3>Follow Us</h3>
- <a href="https://www.facebook.com/VZTAsmarttowns/" class="icon"><img src="/images/Facebook.png" height="25" width="25" alt="Facebook Logo" class="icon"/></a>
- <a href="https://www.twitter.com/VZTAsmarttowns/" class="icon"><img src="/images/Twitter.jpg" height="25" width="25" alt="X (formally Twitter) Logo" class="icon"/></a>
- <a href="https://www.instagram.com/vztasmarttowns/" class="icon"><img src="/images/Instagram.jpg" height="25" width="25" alt="Instagram Logo" class="icon"/></a>
- <a href="https://www.linkin.com/company/vztasmarttowns/" class="icon"><img src="/images/Linkedin.png" height="25" width="25" alt="Linkedin Logo" class="icon"/></a><br>
+ <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>
+ <a href="https://www.instagram.com/vztasmarttowns/" class="icon"><img src="/images/icons/Instagram.jpg" height="25" width="25" alt="Instagram Logo" class="icon"/></a>
+ <a href="https://www.linkin.com/company/vztasmarttowns/" class="icon"><img src="/images/icons/Linkedin.png" height="25" width="25" alt="Linkedin Logo" class="icon"/></a><br>
</span>
</div>
<div class="copyright" style="text-align: left">
diff --git a/src/main/resources/templates/fragments/temp_frags.html b/src/main/resources/templates/fragments/temp_frags.html
deleted file mode 100644
index 03efad3ee73e973e0faf7401b7d3b0de2e1578e4..0000000000000000000000000000000000000000
--- a/src/main/resources/templates/fragments/temp_frags.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<header th:fragment="header" class="headerBlock">
- <h1 class="headerTitle">SMART-TOWNS</h1>
- <div class="headerBanner">
- <img src="images/trails.jpg" alt="Trails" class="bannerBack">
-<!-- <div class="bannerText">-->
- <h1 class="bigTitle">Smart Town Trails</h1>
- <h2 class="smallTitle">Information about trails for your town</h2>
-<!-- </div>-->
- </div>
-</header>
-<footer th:fragment="footer">
- <ul class="footerBar">
- <li class="footerButton">Home</li>
- <li class="footerButton">About</li>
- <li class="footerButton">Map</li>
- <li class="footerButton">Facilities</li>
- <li class="footerButton">Search</li>
- </ul>
-</footer>
-
-<article class="trailInfo" th:fragment="trailInfo2">
- <h1 class="titleH1" th:text="${trail.name}">Trail Info</h1>
-</article>
\ No newline at end of file
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
deleted file mode 100644
index 47b1dc1353c7c96bcb3409f54558ff18c4da6cf4..0000000000000000000000000000000000000000
--- a/src/main/resources/templates/home.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
- <title>Website Web</title>
- <link rel="stylesheet" th:href="@{css/style.css}">
- <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-</head>
-
-<body>
- <header th:replace="fragments/temp_frags.html :: header"></header>
- <main>
- <div class="trailList">
- <ul class="ulHeader">
- <li onclick="selectTrail('trail1', this)" class="liHeader" id="trail1" >Trail 1</li>
- <li onclick="selectTrail('trail2', this)" class="liHeader selected" id="trail2" >Trail 2</li>
- <li onclick="selectTrail('trail3', this)" class="liHeader" id="trail3" >Trail 3</li>
- <li onclick="updateOutput()" class="liHeader" id="trail4" >Trail 4</li>
- </ul>
- </div>
-
- <section class="mainBlock">
- <article class="trailStats">
- <h1 class="titleH1">Trail Stats</h1>
- <img src="../static/images/stats.png" alt="Stats" class="stats">
- <div class="textStats">
- <p><b>Explored:</b> 60%</p>
- <p><b>Landmarks Visited:</b> 3/5</p>
- <p><b>Shops Visited:</b> 6/10</p>
- </div>
- </article>
- <article id="trailInfoBox" class="trailInfo"></article>
- <article class="badgesBlock">
- <h1 class="titleH1">Badges</h1>
- <div class="badgesList">
- <img src="../static/images/badges.png" alt="Badge" class="badgeImg">
- <img src="../static/images/badges.png" alt="Badge" class="badgeImg">
- <img src="../static/images/badges.png" alt="Badge" class="badgeImg">
- <img src="../static/images/badges.png" alt="Badge" class="badgeImg">
- <img src="../static/images/badges.png" alt="Badge" class="badgeImg">
- </div>
-
- </article>
- </section>
- </main>
-
- <footer th:replace="fragments/temp_frags.html :: footer"></footer>
- <script src="https://code.jquery.com/jquery-1.9.1.js"></script>
- <script type="text/javascript" th:src="@{scripts/gabScripts.js}"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/Landmarks/LandmarkFormTh.html b/src/main/resources/templates/landmarks/LandmarkFormTh.html
similarity index 94%
rename from src/main/resources/templates/Landmarks/LandmarkFormTh.html
rename to src/main/resources/templates/landmarks/LandmarkFormTh.html
index b77bb90ece04cc582bc5fa5ea369bd8ba45e864b..0f7879d8277ad1012ffefaae75fc49d70b6932ca 100644
--- a/src/main/resources/templates/Landmarks/LandmarkFormTh.html
+++ b/src/main/resources/templates/landmarks/LandmarkFormTh.html
@@ -10,7 +10,7 @@
</head>
<body>
-<header th:insert="~{/towns/Templating.html :: header}"></header>
+<header th:insert="~{/fragments/Templating.html :: header}"></header>
<hr style="height:20px; visibility:hidden;" />
<H2 id="landmarkFormTitle"> Interested in joining our trails? Sign up Here! </H2>
<main>
@@ -60,6 +60,6 @@
</main>
-<footer th:insert="~{/towns/Templating.html :: footer}"></footer>
+<footer th:insert="~{/fragments/Templating.html :: footer}"></footer>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/towns/caerphilly.html b/src/main/resources/templates/towns/caerphilly.html
index 912da813737475d83dfc3af4c0ff4010189ec7f5..11d4aabb9ef479d9e67bc5c19419ec0f9c47d3eb 100644
--- a/src/main/resources/templates/towns/caerphilly.html
+++ b/src/main/resources/templates/towns/caerphilly.html
@@ -171,7 +171,7 @@
<link rel="stylesheet" th:href="@{/css/templatingstyle.css}">
</head>
<body>
-<header th:insert="~{/towns/Templating.html::header}"></header>
+<header th:insert="~{/fragments/Templating.html::header}"></header>
<main>
<div class="container">
<h1 class="townName"> Welcome to the town of Caerphilly.</h1>
@@ -215,7 +215,7 @@
</div>
</main>
-<footer th:insert="~{/towns/Templating.html::footer}"></footer>
+<footer th:insert="~{/fragments/Templating.html::footer}"></footer>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/towns/home/homePage.html b/src/main/resources/templates/towns/home/homePage.html
index 2cdc1e854fba95f89dd2da702bbeb6d5011ed5d8..ec489ae7d334997390462ef1ffbe0d3ceaf5c828 100644
--- a/src/main/resources/templates/towns/home/homePage.html
+++ b/src/main/resources/templates/towns/home/homePage.html
@@ -8,7 +8,7 @@
</head>
<body>
-<header th:insert="~{/towns/Templating.html::header}"></header>
+<header th:insert="~{/fragments/Templating.html::header}"></header>
<main>
<div class="gridContainer1">
<H1 id="homeTitle"> VZTA Smart Towns - Trails</H1>
@@ -56,7 +56,7 @@ rough % outline;
</div>
</main>
-<footer th:insert="~{/towns/Templating.html::footer}"></footer>
+<footer th:insert="~{/fragments/Templating.html::footer}"></footer>
</body>
</html>
diff --git a/src/main/resources/templates/towns/home/homePageOld.html b/src/main/resources/templates/towns/home/homePageOld.html
index bf35e662607a4b2a101aeef83f3a05a65fd50ad2..ce51066c3313d03de40e19be1b1bf951bcc9b6b7 100644
--- a/src/main/resources/templates/towns/home/homePageOld.html
+++ b/src/main/resources/templates/towns/home/homePageOld.html
@@ -9,7 +9,7 @@
</head>
<body>
-<header th:insert="~{/towns/Templating.html::header}"></header>
+<header th:insert="~{/fragments/Templating.html::header}"></header>
<main>
<div class="gridContainer1">
<H1 id="homeTitle"> VZTA Smart Towns - Trails</H1>
@@ -60,7 +60,7 @@
</main>
-<footer th:insert="~{/towns/Templating.html::footer}"></footer>
+<footer th:insert="~{/fragments/Templating.html::footer}"></footer>
</body>
</html>
diff --git a/src/main/resources/templates/towns/templates.server/Templating.html b/src/main/resources/templates/towns/templates.server/Templating.html
deleted file mode 100644
index 14343a76ea3cc2974dbdd50cc7bd3ade124adc17..0000000000000000000000000000000000000000
--- a/src/main/resources/templates/towns/templates.server/Templating.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<header class="headerBar th:fragment="header">
-
- <div class="Logo">
- <img th:src="@{images/VZTA.png}" alt="VZTA Logo">
- </div>
- <nav class="navBar">
- <ul>
- <li>Home</li>
- <li>FAQs</li>
- <li>Contact us</li>
- </ul>
- <label class="work">Who we Work with:</label>
- <select>
- <ul>
- <option value="localauthorities">Local Authorities</option>
- <option value="towns">Towns</option>
- <option value="businesses">Businesses</option>
- <option value="consumers">Consumers</option>
- </ul>
- </select>
- </nav>
- </header>
-
- <div class="footerBar" th:fragment="footer">
- <div class="containerFooter">
- <div class="leftFooter">
- <h3>VZTA</h3>
- Near Me Now LTD
- <br>Britania House
- <br>Caerphilly Business Park
- <br>Caerphilly
- <br>CF83 3GG
- </div>
- <div class="rightFooter">
- <h3>Connect with us</h3>
- <p>Be the first to know about updates by joining out Community page</p>
- (C) VZTA 2022<br>
- Policy Terms and Conditions
- </div>
- <div class="centerFooter">
- <span class="footerText">
- <h3>Follow Us</h3>
- <a th:href=="https://www.facebook.com/VZTAsmarttowns/" class="icon"></a><img th:src="@{images/Facebook.png}" alt="Facebook Logo" class="picture">
- <a th:href=="https://www.twitter.com/VZTAsmarttowns/" class="icon"></a><img th:src="@{images/Twitter-Logo.png}" alt="X (formally Twitter) Logo" class="picture">
- <a th:href=="https://www.instagram.com/vztasmarttowns/" class="icon"></a><img th:src="@{images/Instagram.jpg}" alt="Instagram Logo" class="picture">
- <a th:href=="https://'www.linkin.com/company/vztasmarttowns/" class="icon"></a><img th:src="@{images/LinkedIn.jpg}" alt="Linkedin Logo" class="picture"> <br>
- </span>
- </div>
- <div class="copyright" style="text-align: left">
-
- </div>
- </div>
- </div>
-</div>
-<style>
- /* Header */
- .headerBar {
- border-bottom: 2px rgb(230, 230, 230) solid;
- margin-bottom: 20px;
- display: flex;
- background: blueviolet;
- }
- /* Navbar Links */
- .navBar {
- margin-top: 50px;
- margin-left: auto;
- margin-right:20px;
- text-align: right;
- }
- .work{
- color: rgb(255, 255, 255);
- }
- .navBar ul {
- list-style: none;
- display: flex;
- margin-left: 100px;
- }
- .navBar a {
- border-left: 2px rgb(185, 185, 185) solid;
- padding: 10px 40px;
- text-decoration: none;
- color:rgb(87, 86, 86);
- white-space: nowrap;
- overflow: hidden;
- float: right;
- }
- .navBar a:hover {
- background-color: rgb(209, 209, 209);
- }
- .navBar li{
- margin-left: 10px;
- margin-right: 10px;
- color: rgb(255, 255, 255);
- }
- .navListLast {
- border-right: 2px rgb(185, 185, 185) solid;
- margin-right:40px;
- }
-
- /* Navbar Logo */
- .Logo {
- margin-left:10px;
- padding: 20px;
- width: fit-content;
- }
- .Logo img {
- width: 120px;
- margin-left:15px;
- }
-
- /* Footer */
- footer {
- margin-top:20px;
- display: flex;
- justify-content: center;
- }
- .footerBar{
- border-top: 2px rgb(230, 230, 230) solid;
- text-align: left;
- display: flex;
- background: blueviolet;
- color: rgb(255, 255, 255);
- padding-left: 30px;
- }
- .footerBar ul {
- list-style: none;
- display: flex;
- }
- .copyright{
- text-align: left;
- display: flex;
- }
- .containerFooter{
- display: flex;
- flex-direction: row;
- }
- .leftFooter{
- flex:1;
- color: rgb(255, 255,255);
- }
- .centerFooter{
- flex: 1;
- color: rgb(255, 255,255);
- }
- .rightFooter{
- flex:1;
- color: rgb(255, 255, 255);
- }
-</style>
\ No newline at end of file
diff --git a/src/main/resources/templates/towns/trails/dragonstale/index.html b/src/main/resources/templates/towns/trails/dragonstale/index.html
index 80aa32934673ddca22af19a7f7772a378ce9c774..7cf5948e993116ac247cf9c8aaac3d1ece2e8762 100644
--- a/src/main/resources/templates/towns/trails/dragonstale/index.html
+++ b/src/main/resources/templates/towns/trails/dragonstale/index.html
@@ -8,7 +8,7 @@
<script src="./node_modules/html5-qrcode/html5-qrcode.min.js"></script>
</head>
<body>
- <header th:insert="towns/Templating.html :: header"></header>
+ <header th:insert="fragments/Templating.html :: header"></header>
<!-- As this predefined trail will be accessible from multiple different towns, this thymeleaf element will display the town the user is currently trying to access and display it accordingly. <span th:text="${townName}"> -->
<div class="centre">
@@ -49,7 +49,7 @@
<button type="button" id="begin">Click here!</button>
</div>
- <div th:insert="towns/Templating.html :: footer"></div>
+ <div th:insert="fragments/Templating.html :: footer"></div>
<script>
diff --git a/src/main/resources/templates/rewards/login.html b/src/main/resources/templates/users/login.html
similarity index 100%
rename from src/main/resources/templates/rewards/login.html
rename to src/main/resources/templates/users/login.html
diff --git a/src/main/resources/templates/rewards/userProfile.html b/src/main/resources/templates/users/userProfile.html
similarity index 100%
rename from src/main/resources/templates/rewards/userProfile.html
rename to src/main/resources/templates/users/userProfile.html
diff --git a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java b/src/test/java/team5/smartTowns/SmartTownsApplicationTests.java
similarity index 87%
rename from src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
rename to src/test/java/team5/smartTowns/SmartTownsApplicationTests.java
index d9c15a4bf0557ca94619ec9f61d0d83d2180c7c3..8deb2e9eaaeafcc0063b4396f9afea63d8c3c2d4 100644
--- a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
+++ b/src/test/java/team5/smartTowns/SmartTownsApplicationTests.java
@@ -1,4 +1,4 @@
-package Team5.SmartTowns;
+package team5.smartTowns;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;