From 4d792c5d0670dfd03924b4cfb567599e79bf8e4e Mon Sep 17 00:00:00 2001
From: Rhys Evans <EvansRM17@cardiff.ac.uk>
Date: Wed, 6 Dec 2023 20:33:41 +0000
Subject: [PATCH] Further work on town mapping
---
src/main/java/Team5/SmartTowns/Data/Town.java | 2 ++
.../Team5/SmartTowns/Data/TownRepository.java | 2 ++
.../SmartTowns/Data/TownRepositoryJDBC.java | 2 ++
.../Team5/SmartTowns/Towns/TownController.java | 10 ++++++++++
src/main/resources/data.sql | 4 ++++
src/main/resources/schema.sql | 17 ++++++++++++++---
.../userTrails/userTrailsTemplate.html | 15 +++++++++++++++
7 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 src/main/java/Team5/SmartTowns/Data/Town.java
create mode 100644 src/main/java/Team5/SmartTowns/Data/TownRepository.java
create mode 100644 src/main/java/Team5/SmartTowns/Data/TownRepositoryJDBC.java
create mode 100644 src/main/resources/templates/userTrails/userTrailsTemplate.html
diff --git a/src/main/java/Team5/SmartTowns/Data/Town.java b/src/main/java/Team5/SmartTowns/Data/Town.java
new file mode 100644
index 00000000..aa0b7cd6
--- /dev/null
+++ b/src/main/java/Team5/SmartTowns/Data/Town.java
@@ -0,0 +1,2 @@
+package Team5.SmartTowns.Data;public class Town {
+}
diff --git a/src/main/java/Team5/SmartTowns/Data/TownRepository.java b/src/main/java/Team5/SmartTowns/Data/TownRepository.java
new file mode 100644
index 00000000..dd5cb04a
--- /dev/null
+++ b/src/main/java/Team5/SmartTowns/Data/TownRepository.java
@@ -0,0 +1,2 @@
+package Team5.SmartTowns.Data;public class TownRepository {
+}
diff --git a/src/main/java/Team5/SmartTowns/Data/TownRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/TownRepositoryJDBC.java
new file mode 100644
index 00000000..f40cb51f
--- /dev/null
+++ b/src/main/java/Team5/SmartTowns/Data/TownRepositoryJDBC.java
@@ -0,0 +1,2 @@
+package Team5.SmartTowns.Data;public class TownRepositoryJDBC {
+}
diff --git a/src/main/java/Team5/SmartTowns/Towns/TownController.java b/src/main/java/Team5/SmartTowns/Towns/TownController.java
index aa15a341..dfdb9ae9 100644
--- a/src/main/java/Team5/SmartTowns/Towns/TownController.java
+++ b/src/main/java/Team5/SmartTowns/Towns/TownController.java
@@ -1,5 +1,6 @@
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;
+// }
+//
+
}
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index e40208ba..155d9c76 100644
--- 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);
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 92b8d4e0..3264a781 100644
--- 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;
+
diff --git a/src/main/resources/templates/userTrails/userTrailsTemplate.html b/src/main/resources/templates/userTrails/userTrailsTemplate.html
new file mode 100644
index 00000000..fb52c908
--- /dev/null
+++ b/src/main/resources/templates/userTrails/userTrailsTemplate.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Trails</title>
+</head>
+<body>
+
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file
--
GitLab