From 1f584293cf103387c5aafb65909823ebca14d590 Mon Sep 17 00:00:00 2001
From: Connor <brockcc1@cardiff.ac.uk>
Date: Mon, 27 Nov 2023 14:47:36 +0000
Subject: [PATCH] Modified HTMl pages to include a landmark list, including the
basic CSS to correct how the information is displayed. Starting to intergrate
controllers for Thymeleaf integration.
---
.../SmartTowns/trailcontrollers/DragonsTale.java | 8 ++++++++
.../trails/dragonstale/dragonstalehome.png | Bin
.../{towns => }/trails/dragonstale/index.html | 11 +++++++++++
.../dragonstale/landmarks}/one/dragonone.png | Bin
.../dragonstale/landmarks}/one/one.html | 0
.../{towns => }/trails/dragonstale/script.js | 0
.../{towns => }/trails/dragonstale/stylesheet.css | 7 +++++++
.../trails/welshhistory/welshhistory.html | 0
8 files changed, 26 insertions(+)
rename src/main/resources/templates/{towns => }/trails/dragonstale/dragonstalehome.png (100%)
rename src/main/resources/templates/{towns => }/trails/dragonstale/index.html (76%)
rename src/main/resources/templates/{towns/trails/dragonstale/trailcheckpoints => trails/dragonstale/landmarks}/one/dragonone.png (100%)
rename src/main/resources/templates/{towns/trails/dragonstale/trailcheckpoints => trails/dragonstale/landmarks}/one/one.html (100%)
rename src/main/resources/templates/{towns => }/trails/dragonstale/script.js (100%)
rename src/main/resources/templates/{towns => }/trails/dragonstale/stylesheet.css (59%)
rename src/main/resources/templates/{towns => }/trails/welshhistory/welshhistory.html (100%)
diff --git a/src/main/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java b/src/main/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java
index ba499c96..5d028129 100644
--- a/src/main/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java
+++ b/src/main/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java
@@ -3,13 +3,21 @@ package Team5.SmartTowns.trailcontrollers;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
@Controller
+
public class DragonsTale {
@GetMapping("/dragonstale")
public ModelAndView getDragonsTale(){
ModelAndView modelAndView = new ModelAndView("src/main/resources/templates/towns/trails/dragonstale/index.html");
return modelAndView;
}
+
+ @RequestMapping("/dragonstale")
+ public ModelAndView thymeleafInteration(){
+
+
+ }
}
diff --git a/src/main/resources/templates/towns/trails/dragonstale/dragonstalehome.png b/src/main/resources/templates/trails/dragonstale/dragonstalehome.png
similarity index 100%
rename from src/main/resources/templates/towns/trails/dragonstale/dragonstalehome.png
rename to src/main/resources/templates/trails/dragonstale/dragonstalehome.png
diff --git a/src/main/resources/templates/towns/trails/dragonstale/index.html b/src/main/resources/templates/trails/dragonstale/index.html
similarity index 76%
rename from src/main/resources/templates/towns/trails/dragonstale/index.html
rename to src/main/resources/templates/trails/dragonstale/index.html
index c9202cfd..c81b3beb 100644
--- a/src/main/resources/templates/towns/trails/dragonstale/index.html
+++ b/src/main/resources/templates/trails/dragonstale/index.html
@@ -20,6 +20,17 @@
</p>
</div>
+ <div class="centre" id="landmarkList">
+ <ul>
+ <li> Landmark 1 </li>
+ <li> Landmark 2 </li>
+ <li> Larkmark 3 </li>
+ <li> Larkmark 4 </li>
+ <li> Larkmark 5 </li>
+ <li> Larkmark 6 </li>
+ </ul>
+ </div>
+
<div class="centre">
<h3>Begin your hunt!</h3>
<button type="button" id="begin">Click here!</button>
diff --git a/src/main/resources/templates/towns/trails/dragonstale/trailcheckpoints/one/dragonone.png b/src/main/resources/templates/trails/dragonstale/landmarks/one/dragonone.png
similarity index 100%
rename from src/main/resources/templates/towns/trails/dragonstale/trailcheckpoints/one/dragonone.png
rename to src/main/resources/templates/trails/dragonstale/landmarks/one/dragonone.png
diff --git a/src/main/resources/templates/towns/trails/dragonstale/trailcheckpoints/one/one.html b/src/main/resources/templates/trails/dragonstale/landmarks/one/one.html
similarity index 100%
rename from src/main/resources/templates/towns/trails/dragonstale/trailcheckpoints/one/one.html
rename to src/main/resources/templates/trails/dragonstale/landmarks/one/one.html
diff --git a/src/main/resources/templates/towns/trails/dragonstale/script.js b/src/main/resources/templates/trails/dragonstale/script.js
similarity index 100%
rename from src/main/resources/templates/towns/trails/dragonstale/script.js
rename to src/main/resources/templates/trails/dragonstale/script.js
diff --git a/src/main/resources/templates/towns/trails/dragonstale/stylesheet.css b/src/main/resources/templates/trails/dragonstale/stylesheet.css
similarity index 59%
rename from src/main/resources/templates/towns/trails/dragonstale/stylesheet.css
rename to src/main/resources/templates/trails/dragonstale/stylesheet.css
index 32670b4a..d94a494f 100644
--- a/src/main/resources/templates/towns/trails/dragonstale/stylesheet.css
+++ b/src/main/resources/templates/trails/dragonstale/stylesheet.css
@@ -6,4 +6,11 @@
margin-right: auto;
width: 50%;
background-color: antiquewhite;
+}
+
+#landmarkList.centre{
+ text-align: left;
+ border-style: solid;
+ border-width: 2px;
+ border-color: #FF7F50;
}
\ No newline at end of file
diff --git a/src/main/resources/templates/towns/trails/welshhistory/welshhistory.html b/src/main/resources/templates/trails/welshhistory/welshhistory.html
similarity index 100%
rename from src/main/resources/templates/towns/trails/welshhistory/welshhistory.html
rename to src/main/resources/templates/trails/welshhistory/welshhistory.html
--
GitLab