Further work on town mapping

4d792c5d · Rhys Evans · f8c5598f · 4d792c5d · 4d792c5d · 4d792c5d
Commit 4d792c5d authored 1 year ago by Rhys Evans
--- a/src/main/java/Team5/SmartTowns/Data/Town.java
+++ b/src/main/java/Team5/SmartTowns/Data/Town.java
+package Team5.SmartTowns.Data;public class Town {
+}
--- a/src/main/java/Team5/SmartTowns/Data/TownRepository.java
+++ b/src/main/java/Team5/SmartTowns/Data/TownRepository.java
+package Team5.SmartTowns.Data;public class TownRepository {
+}
--- a/src/main/java/Team5/SmartTowns/Data/TownRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/Data/TownRepositoryJDBC.java
+package Team5.SmartTowns.Data;public class TownRepositoryJDBC {
+}
--- a/src/main/java/Team5/SmartTowns/Towns/TownController.java
+++ b/src/main/java/Team5/SmartTowns/Towns/TownController.java
 package Team5.SmartTowns.Towns;

+import Team5.SmartTowns.Landmarks.Landmarks;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
@@ -18,4 +19,13 @@ public class TownController {
        return modelAndView;

    }
+
+//    @GetMapping("/home/town")
+//    public ModelAndView getATownTrailsList(){
+//        ModelAndView modelAndView = new ModelAndView("userTrails/userTrailsTemplate");
+//        modelAndView.addObject("townStuff", a);
+//        return modelAndView;
+//    }
+//
+
 }
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -5,6 +5,10 @@ insert into users (userID, email, name, dragonProgress) value ('2', 'nigel@gmail
 delete from trails;
 insert into trails ( Name) value ( 'Caerphilly Coffee Trail');
 insert into trails ( Name) value ( 'Penarth Dragon Trail');
+delete from towns;
+insert into towns ( townName,townTrailNumber) value ( 'Caerphilly',03);
+insert into towns ( townName,townTrailNumber) value ( 'Risca',01);
+insert into towns ( townName,townTrailNumber) value ( 'Penarth',01);

 delete from locations;
 insert into locations ( locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ( 'St Cenydd','','Location description here','Caerphilly',0101);

--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -5,6 +5,15 @@ create table if not exists trails
    name varchar(128)
 )   engine=InnoDB;

+
+drop table if exists towns;
+create table if not exists towns
+(
+    townID bigint auto_increment primary key,
+    townName varchar(255),
+    trailNumber tinyint
+
+) engine=InnoDB;
 drop table if exists locations;

 create table if not exists locations
@@ -13,8 +22,9 @@ create table if not exists locations
    locationName varchar(128),
    locationEmail varchar(128),
    locationDescription longtext,
-    locationPlace varchar(255),
-    locationTrailID varchar(128)
+    locationPlace bigint,
+    locationTrailID varchar(128),
+    foreign key (locationPlace) references towns(townID)
 )   engine=InnoDB;

 drop table if exists users;
@@ -57,4 +67,5 @@ create table if not exists stickerProgress
    userID bigint,
    stickerID bigint,
    hasSticker boolean /*Has sticker or not*/
-) engine=InnoDB;
\ No newline at end of file
+) engine=InnoDB;
+
--- a/src/main/resources/templates/userTrails/userTrailsTemplate.html
+++ b/src/main/resources/templates/userTrails/userTrailsTemplate.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Trails</title>
+</head>
+<body>
+
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file