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 0e185ece7ae8f4fce38092002638f6efb67f0ec6..a7b32da0a9d501fcf7a551b0dc46d151c6870756 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 96% rename from src/main/java/team5/smartTowns/data/DatabaseController.java rename to src/main/java/Team5/SmartTowns/data/DatabaseController.java index 11af79383f8936eb5119635acced8258d359fc34..63b7c5f032178f9c5a3c2bec6c82ec13d11754a8 100644 --- a/src/main/java/team5/smartTowns/data/DatabaseController.java +++ b/src/main/java/Team5/SmartTowns/data/DatabaseController.java @@ -1,4 +1,4 @@ -package team5.smartTowns.data; +package Team5.SmartTowns.data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; 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 d968ac31496c116afc9555a420c6b3b684473138..c733d9b9a487ea290b0dfcab6618c0134dd438f5 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 85% rename from src/main/java/team5/smartTowns/data/LocationRepository.java rename to src/main/java/Team5/SmartTowns/data/LocationRepository.java index 60a81f05b059141bbefd276a66ac38224aec7de8..f4b79d1ff90858e3c574c1f724e60be4077182b1 100644 --- a/src/main/java/team5/smartTowns/data/LocationRepository.java +++ b/src/main/java/Team5/SmartTowns/data/LocationRepository.java @@ -1,5 +1,5 @@ //Holds locations data repository (landmarks) -package team5.smartTowns.data; +package Team5.SmartTowns.data; import java.util.List; diff --git a/src/main/java/team5/smartTowns/data/LocationRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java similarity index 97% rename from src/main/java/team5/smartTowns/data/LocationRepositoryJDBC.java rename to src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java index b832c7fe0f916320e9b33c93d1623e42d8c0391c..e9c23c1510241f1b4934dff0434bcaecdf1a0ed1 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; diff --git a/src/main/java/team5/smartTowns/data/Trail.java b/src/main/java/Team5/SmartTowns/data/Trail.java similarity index 86% rename from src/main/java/team5/smartTowns/data/Trail.java rename to src/main/java/Team5/SmartTowns/data/Trail.java index 4bcf497b0965c21c321f0762858457572747b3ba..1a44d9270405a05ce9d8f97b3ddd2a43cc6b9653 100644 --- a/src/main/java/team5/smartTowns/data/Trail.java +++ b/src/main/java/Team5/SmartTowns/data/Trail.java @@ -1,5 +1,5 @@ //Holds variable data for the trails table -package team5.smartTowns.data; +package Team5.SmartTowns.data; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/team5/smartTowns/data/TrailsRepository.java b/src/main/java/Team5/SmartTowns/data/TrailsRepository.java similarity index 80% rename from src/main/java/team5/smartTowns/data/TrailsRepository.java rename to src/main/java/Team5/SmartTowns/data/TrailsRepository.java index 42c77dabe10d816033c4b5bb666b1288dc973b71..d25e6fd62efdfdb4d743c829eeab5ddfeb5119d0 100644 --- a/src/main/java/team5/smartTowns/data/TrailsRepository.java +++ b/src/main/java/Team5/SmartTowns/data/TrailsRepository.java @@ -1,5 +1,5 @@ //Holds trails data repository -package team5.smartTowns.data; +package Team5.SmartTowns.data; import java.util.List; diff --git a/src/main/java/team5/smartTowns/data/TrailsRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java similarity index 96% rename from src/main/java/team5/smartTowns/data/TrailsRepositoryJDBC.java rename to src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java index d41b9635824888b7631e99a5eb47cceabca00dfc..3acf61c405688ac7a40536bafd38f4a0a92bfaec 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; diff --git a/src/main/java/team5/smartTowns/landmarks/Landmarks.java b/src/main/java/Team5/SmartTowns/landmarks/Landmarks.java similarity index 97% rename from src/main/java/team5/smartTowns/landmarks/Landmarks.java rename to src/main/java/Team5/SmartTowns/landmarks/Landmarks.java index 4a57f7f51c996edf8354f973c9509d39a1596035..871aac6ed0c0b561c0d42dee8abb9a5c3a50bda6 100644 --- a/src/main/java/team5/smartTowns/landmarks/Landmarks.java +++ b/src/main/java/Team5/SmartTowns/landmarks/Landmarks.java @@ -1,4 +1,4 @@ -package team5.smartTowns.landmarks; +package Team5.SmartTowns.landmarks; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotEmpty; diff --git a/src/main/java/team5/smartTowns/landmarks/LandmarksController.java b/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java similarity index 93% rename from src/main/java/team5/smartTowns/landmarks/LandmarksController.java rename to src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java index efca1ea1b33a8f2abe6bf92e28287c6785bbafb1..630740b580a1e81c91838b8b97c20c0d90132167 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; diff --git a/src/main/java/team5/smartTowns/rewards/Badge.java b/src/main/java/Team5/SmartTowns/rewards/Badge.java similarity index 94% rename from src/main/java/team5/smartTowns/rewards/Badge.java rename to src/main/java/Team5/SmartTowns/rewards/Badge.java index bf85cb7cf06d49fb437b9a731ae50fa14f2774eb..976238804f5686bfd77e2bd028f7cc79ecf18698 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.Getter; diff --git a/src/main/java/team5/smartTowns/rewards/Pack.java b/src/main/java/Team5/SmartTowns/rewards/Pack.java similarity index 95% rename from src/main/java/team5/smartTowns/rewards/Pack.java rename to src/main/java/Team5/SmartTowns/rewards/Pack.java index 20f12213fb30eb69d1059f278d72f96ff2c79840..ef7fe7409f6e4fdfee3494a0dc932981df2c6907 100644 --- a/src/main/java/team5/smartTowns/rewards/Pack.java +++ b/src/main/java/Team5/SmartTowns/rewards/Pack.java @@ -1,4 +1,4 @@ -package team5.smartTowns.rewards; +package Team5.SmartTowns.rewards; import lombok.Getter; diff --git a/src/main/java/team5/smartTowns/rewards/Reward.java b/src/main/java/Team5/SmartTowns/rewards/Reward.java similarity index 97% rename from src/main/java/team5/smartTowns/rewards/Reward.java rename to src/main/java/Team5/SmartTowns/rewards/Reward.java index dd45b90513391d13ce050ed8b3a56f062155c12c..0a2d9145817a6e6935e5cc7dca283c47c491ee53 100644 --- a/src/main/java/team5/smartTowns/rewards/Reward.java +++ b/src/main/java/Team5/SmartTowns/rewards/Reward.java @@ -1,4 +1,4 @@ -package team5.smartTowns.rewards; +package Team5.SmartTowns.rewards; import lombok.Getter; diff --git a/src/main/java/team5/smartTowns/rewards/RewardsRepository.java b/src/main/java/Team5/SmartTowns/rewards/RewardsRepository.java similarity index 72% rename from src/main/java/team5/smartTowns/rewards/RewardsRepository.java rename to src/main/java/Team5/SmartTowns/rewards/RewardsRepository.java index a11e43725fdeac99830a5ba27e47f8727938ac9c..51bde7f297613873b38b0eec939f58d9c1dc1acd 100644 --- a/src/main/java/team5/smartTowns/rewards/RewardsRepository.java +++ b/src/main/java/Team5/SmartTowns/rewards/RewardsRepository.java @@ -1,8 +1,5 @@ //Holds locations data repository -package team5.smartTowns.rewards; - -import team5.smartTowns.rewards.Badge; -import team5.smartTowns.rewards.Sticker; +package Team5.SmartTowns.rewards; import java.util.List; diff --git a/src/main/java/team5/smartTowns/rewards/RewardsRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/rewards/RewardsRepositoryJDBC.java similarity index 97% rename from src/main/java/team5/smartTowns/rewards/RewardsRepositoryJDBC.java rename to src/main/java/Team5/SmartTowns/rewards/RewardsRepositoryJDBC.java index 8ca624464cd18de018b0c98024f7c4c8f15dcd96..65eaa9843ec3af33e994ea34ed8d219ce712ffaf 100644 --- a/src/main/java/team5/smartTowns/rewards/RewardsRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/rewards/RewardsRepositoryJDBC.java @@ -1,10 +1,9 @@ //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; import org.springframework.stereotype.Repository; -import team5.smartTowns.users.User; import java.util.List; diff --git a/src/main/java/team5/smartTowns/rewards/Sticker.java b/src/main/java/Team5/SmartTowns/rewards/Sticker.java similarity index 96% rename from src/main/java/team5/smartTowns/rewards/Sticker.java rename to src/main/java/Team5/SmartTowns/rewards/Sticker.java index 2634e8acd5e573e742fa6d2d9979ad5091baea52..7e5315c651bea73aa31572856710b21bbc25457b 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.Getter; 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 05fb13cab60599464b8981e92b8d84a18c148acd..9063712be2de660379c504bb064254367dcaa3d8 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 28360145be68d013d62c13cab874314e3a3a10ac..988a20223b33d27fbccab94007a1efb6e3088bbb 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 7c17035ab1ee1a8a2911727aa763d4f08dc8bf0e..ebe6fd4797c205ace803727026e64837a2af93e6 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 841b8cab1884528cf0aae08f1a38c358ce579073..a7067f83758ce0904851b89a51880dc9782da104 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 93% rename from src/main/java/team5/smartTowns/trails/TrailsController.java rename to src/main/java/Team5/SmartTowns/trails/TrailsController.java index 0c3f481b2fff9290616bc951f36f4a84814032f6..84aed1ee52839bac38b26725f72d28bb3bfd14a6 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; @@ -12,7 +12,7 @@ import org.springframework.web.servlet.ModelAndView; 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 77% rename from src/main/java/team5/smartTowns/users/User.java rename to src/main/java/Team5/SmartTowns/users/User.java index ba3f78736a381927de0621c1ee20b93fd22a4384..d87a1fc9e8097806c671b617fede5167a7d6ed09 100644 --- a/src/main/java/team5/smartTowns/users/User.java +++ b/src/main/java/Team5/SmartTowns/users/User.java @@ -1,15 +1,8 @@ -package team5.smartTowns.users; +package Team5.SmartTowns.users; import lombok.Getter; -import lombok.Setter; -import team5.smartTowns.rewards.Badge; -import team5.smartTowns.rewards.Sticker; -import lombok.Data; import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; @Getter public class User { diff --git a/src/main/java/team5/smartTowns/users/UserController.java b/src/main/java/Team5/SmartTowns/users/UserController.java similarity index 94% rename from src/main/java/team5/smartTowns/users/UserController.java rename to src/main/java/Team5/SmartTowns/users/UserController.java index e22aff62537dc8a1aee9481800949d7eadc76c6a..989d13b7161f783dc75bdcb9dbf379808b1584e4 100644 --- a/src/main/java/team5/smartTowns/users/UserController.java +++ b/src/main/java/Team5/SmartTowns/users/UserController.java @@ -1,9 +1,9 @@ -package team5.smartTowns.users; +package Team5.SmartTowns.users; -import team5.smartTowns.rewards.Pack; -import team5.smartTowns.rewards.RewardsRepository; -import team5.smartTowns.rewards.Sticker; +import Team5.SmartTowns.rewards.Pack; +import Team5.SmartTowns.rewards.RewardsRepository; +import Team5.SmartTowns.rewards.Sticker; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.servlet.ModelAndView; import java.util.List; -import java.util.Map; @Controller public class UserController { diff --git a/src/main/java/team5/smartTowns/users/UserRepository.java b/src/main/java/Team5/SmartTowns/users/UserRepository.java similarity index 84% rename from src/main/java/team5/smartTowns/users/UserRepository.java rename to src/main/java/Team5/SmartTowns/users/UserRepository.java index 8b08f257377c04d8f58a703e559d34baa2e9f4a4..f0f01269786128dd9afaa8d3becd5b3ada4944fa 100644 --- a/src/main/java/team5/smartTowns/users/UserRepository.java +++ b/src/main/java/Team5/SmartTowns/users/UserRepository.java @@ -1,8 +1,7 @@ //Holds users data repository -package team5.smartTowns.users; +package Team5.SmartTowns.users; import java.util.List; -import java.util.Map; public interface UserRepository { List<User> getAllUsers(); diff --git a/src/main/java/team5/smartTowns/users/UserRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java similarity index 93% rename from src/main/java/team5/smartTowns/users/UserRepositoryJDBC.java rename to src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java index 37f759f105a34ef32c655c912cf4355de571cfd1..868e738a703d707ad661fc4bbc372af7903881b9 100644 --- a/src/main/java/team5/smartTowns/users/UserRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java @@ -1,14 +1,11 @@ //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 team5.smartTowns.rewards.Sticker; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Repository public class UserRepositoryJDBC implements UserRepository{ diff --git a/src/main/java/team5/smartTowns/webpages/WebpageController.java b/src/main/java/Team5/SmartTowns/webpages/WebpageController.java similarity index 79% rename from src/main/java/team5/smartTowns/webpages/WebpageController.java rename to src/main/java/Team5/SmartTowns/webpages/WebpageController.java index 768b1fbaa6a1eeca5f5263394ab56c6389c806b5..7cb5243f41e420e1640d5419fb39524df543761d 100644 --- a/src/main/java/team5/smartTowns/webpages/WebpageController.java +++ b/src/main/java/Team5/SmartTowns/webpages/WebpageController.java @@ -1,10 +1,7 @@ -package team5.smartTowns.webpages; +package Team5.SmartTowns.webpages; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; import org.springframework.stereotype.Controller; @Controller diff --git a/src/main/resources/templates/users/userFrags.html b/src/main/resources/templates/users/userFrags.html index dbeb8ee3334077ad47fe99b227b8a58205c18060..5b5e8201f805bdcbed9234da8c39d6a4b79e94f7 100644 --- a/src/main/resources/templates/users/userFrags.html +++ b/src/main/resources/templates/users/userFrags.html @@ -1,6 +1,6 @@ -<!-- @thymesVar id="sticker" type="team5.smartTowns.rewards.Sticker" --> -<!-- @thymesVar id="user" type="team5.smartTowns.users.User" --> -<!-- @thymesVar id="selectedPack" type="team5.smartTowns.rewards.Pack" --> +<!-- @thymesVar id="sticker" type="Team5.SmartTowns.rewards.Sticker" --> +<!-- @thymesVar id="user" type="Team5.SmartTowns.users.User" --> +<!-- @thymesVar id="selectedPack" type="Team5.SmartTowns.rewards.Pack" --> <div th:fragment="stickersBox" id="packRewardsWrapper"> <article class="progressionContainer"> <h1 th:text="${selectedPack.getName()}"></h1> 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 8deb2e9eaaeafcc0063b4396f9afea63d8c3c2d4..d9c15a4bf0557ca94619ec9f61d0d83d2180c7c3 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;