diff --git a/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java b/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
index a64aaaee77afa82ff21f521686403247cfd4e739..94fec3e5f18cf082f58ca3dbca4223b1c50429b7 100644
--- a/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
+++ b/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
@@ -16,7 +16,6 @@ import java.util.List;
public class Landmarks {
// Intialised object to getID from trail.
- Trail trail = new Trail();
//Predefined Landmark for Dragons Tale.
public static List<Landmarks> landmarksDragonstrail = List.of(
diff --git a/src/main/java/Team5/SmartTowns/Webpages/WebpageController.java b/src/main/java/Team5/SmartTowns/Webpages/WebpageController.java
index 612aa55309408aaf2b59e3e84d768617f71c108d..5338f32f6dcbd262d1b9070169fcbaa211363a44 100644
--- a/src/main/java/Team5/SmartTowns/Webpages/WebpageController.java
+++ b/src/main/java/Team5/SmartTowns/Webpages/WebpageController.java
@@ -29,7 +29,7 @@ public class WebpageController {
@GetMapping("/home")
public ModelAndView getHome(){
- ModelAndView modelAndView = new ModelAndView("home");
+ ModelAndView modelAndView = new ModelAndView("towns/home/homePage");
return modelAndView;
}
diff --git a/src/main/resources/static/css/allTrails.css b/src/main/resources/static/css/allTrails.css
index 1b441111518afb14cea3c1d1debe553ad32d941f..ab706c5ba8ee5925faf8c774e1ec8711ffab4674 100644
--- a/src/main/resources/static/css/allTrails.css
+++ b/src/main/resources/static/css/allTrails.css
@@ -4,37 +4,40 @@
body {
background-color: rgb(41, 41, 41);
margin: 0;
+ display: flex;
+ flex-direction: column;
+ min-height: 100svh;
}
main {
}
+
.centerFlex {
display: flex;
justify-content: center;
}
#allTrailsBar {
- padding:0;
- max-width: 80%;
- height: 11svh;
- margin: 1svh auto;
+ width: 100%;
+ height: auto;
+ /*margin: 1svh auto;*/
+ padding: 0 5svh;
display: flex;
- justify-content: space-between;
- /*border-bottom: solid grey 2px;*/
- /*border-top: solid grey 4px;*/
+ flex-wrap: wrap;
+ justify-content: space-evenly;
}
.trailsImages {
- margin: auto;
- height: 10svh;
- width: 10svh;
+ margin: 1svh auto;
+ height: 12svh;
+ width: auto;
border-radius: 20px;
border: solid grey 2px;
transition: 0.5s ease-out 100ms;
-
+ box-shadow: 0 10px 20px rgba(0, 0, 0, 0.85);
}
+
.trailsImages:hover {
box-shadow: 0 0 20px 10px #bbbb00;
transform: scale(1.2,1.2);
- !important; overflow: visible;
}
.selected {
@@ -49,10 +52,8 @@ main {
}
#trailInfoContainer {
- margin: auto;
- width: 95svw;
- min-height: 40svh;
- min-width: 30svw;
+
+ overflow: scroll;
}
.trailInfoFrag {
@@ -60,62 +61,74 @@ main {
border: #000000 solid 2px;
border-radius: 10px;
box-shadow: 0 5px 20px 0 #000000;
- margin:0;
- padding:0;
+ margin: 2svh auto;
+ padding-bottom: 2svw;
+ width: 70vw;
+ height: auto;
+ min-height: 30svh;
animation: fadeIn 3s;
- overflow: hidden;
- display: flex;
- flex-direction: column;
- min-width: 30svh;
- & h1 {
- color: white;
+ display: grid;
+ grid-template-areas:
+ "header header header"
+ "image text text";
+ grid-template-columns: 30% 30% auto;
+ grid-template-rows: 10% auto;
+ grid-column-gap: 2vw;
+ grid-row-gap: 2svh;
+ & .trailInfoHeader {
grid-area: header;
- margin: 10px 25%;
- font-size: xx-large;
- text-align: center;
- border-bottom: #1e1e1e solid 2px;
- }
-}
+ width: 100%;
+ height: 100%;
+ margin-top: 1svh;
+ padding: 0;
+ & h1 {
+ color: white;
+ padding:0;
+ margin:0 25%;
+ font-size: 2vw;
+ text-align: center;
+ box-shadow: 0 10px 10px -10px black;
+ }
-#trailFragContent {
- margin: 0;
- padding: 0;
- display: flex;
- overflow: hidden;
- min-height: 40svh;
- max-height: 60svh;
+ }
& img {
+ grid-area: image;
border-radius: 10px;
border: black solid 1px;
- margin: 1%;
- flex: 1 1;
-
- min-width: 20%;
- max-width: 40%;
- min-height: 20svh;
- max-height: 90%;
- overflow: hidden;
+ margin-left: 2vw;
+ margin-right: 2vw;
+ width: 100%;
+ height: auto;
+ box-shadow: 0 10px 20px -10px black;
}
& p {
+ grid-area: text;
color: white;
- flex: 1 1;
- padding: 5%;
- width: 60%;
- border-left: solid darkgrey 2px;
- font-size: x-large;
+ margin: 0;
+ padding: 0 2vw;
+ font-size: 1.3vw;
text-align: justify;
text-justify: inter-character;
line-height: 1.5;
+ width: fit-content;
+ height: fit-content;
+ overflow: scroll;
+
}
}
+#trailFragContent {
+ margin: 0;
+ padding: 0;
+ display: flex;
+ min-height: 40svh;
+ flex-wrap: wrap;
+
+}
+
header {
box-shadow: #1e1e1e 0 0 10px 10px;
+ font-size: 1vw;
}
-
-footer {
- position: relative;
- bottom: 0;
-}
\ No newline at end of file
diff --git a/src/main/resources/static/css/dragonstaless.css b/src/main/resources/static/css/dragonstaless.css
index 32670b4a99e9848541977e77c6f119d7e018991b..cb3c0d16219e570ea5cafa0132b24e734dbc6926 100644
--- a/src/main/resources/static/css/dragonstaless.css
+++ b/src/main/resources/static/css/dragonstaless.css
@@ -5,5 +5,9 @@
margin-left: auto;
margin-right: auto;
width: 50%;
- background-color: antiquewhite;
+ background-color: #927BB7;
+}
+
+body{
+ background-color: #927BB7;
}
\ No newline at end of file
diff --git a/src/main/resources/static/css/homePageStyle.css b/src/main/resources/static/css/homePageStyle.css
new file mode 100644
index 0000000000000000000000000000000000000000..6e2a91e341594ae4f89a867da1bc89fb93d4c4f1
--- /dev/null
+++ b/src/main/resources/static/css/homePageStyle.css
@@ -0,0 +1,124 @@
+body{
+ background-color: rgb(41, 41, 41)
+}
+#homeTitle{
+ grid-area: pageTitle;
+ color: whitesmoke;
+}
+.submitLand{
+ grid-area: submitButton;
+}
+.caerphillyBanner , .riscaBanner,.penarthBanner{
+ margin-top: 20px;
+ background-color: darkslategrey;
+ margin-bottom: 20px;
+ border: solid 2px whitesmoke;
+ /*border colour here at .banner and .bannertrail*/
+ border-right: none;
+}
+.caerphillyBannerTrail,.riscaBannerTrail,.penarthBannerTrail{
+ background-color: darkslategrey;
+ margin-top: 20px;
+ margin-bottom: 20px;
+ border: solid 2px whitesmoke;
+ border-left: none;
+ text-align: center;
+}
+
+.penarthBannerTrail{
+ background-image: linear-gradient(to right, darkslategrey , darkgoldenrod 40%);
+}
+
+.caerphillyBannerTrail{
+ margin-top: 20px;
+ margin-bottom: 20px;
+ border: solid 2px whitesmoke;
+ border-left: none;
+ background-image: linear-gradient(to right, darkslategrey , darkgoldenrod 30%);
+}
+
+.caerphillyBanner{
+ grid-area:townBannerC;
+ background-image: url('/images/CaerphillyCastle.jpg');
+ /*// from cadw*/
+ background-size: 850px 200px;
+ background-repeat: no-repeat;
+ background-position: left 35%;
+ color: inherit;
+ text-decoration: none;
+ /*filter: grayscale(30%);*/
+}
+
+/*!*https://www.stayinwales.co.uk/wales_picture.cfm?p=4454*! Risca img*/
+
+.riscaBanner {
+ /* #caerUrl{*/
+ grid-area: townBannerR;
+ background-image: url('/images/RiscaBanner.jpg');
+ background-size: 850px 200px;
+ background-repeat: no-repeat;
+ background-position: left 65%;
+ color: inherit;
+ text-decoration: none;
+}
+
+.penarthBanner {
+ grid-area: townBannerP;
+ background-image: url('/images/PenarthBanner.jpg');
+ background-size: 850px 200px;
+ background-repeat: no-repeat;
+ background-position: left 78%;
+ color: inherit;
+ text-decoration: none;
+}
+.caerphillyBannerTrail{
+ grid-area:townBannerDetsC;
+}
+.riscaBanner{
+ grid-area:townBannerR;
+}
+.riscaBannerTrail{
+ grid-area:townBannerDetsR;
+}
+.penarthBanner{
+ grid-area:townBannerP;
+}
+.penarthBannerTrail{
+ grid-area:townBannerDetsP;
+}
+#aboutUsFlavour{
+ grid-area: textFlavour;
+ margin-top: 25px;
+ margin-bottom: 15px;
+ color: whitesmoke;
+}
+#trailCountCaer,#trailCountRisca,#trailCountPenarth{
+ flex:1;
+
+
+ /*align-items: center;*/
+ /*justify-content: center;*/
+
+}
+#trailProgressCaer,#trailProgressRisca,#trailProgressPenarth{
+ flex:2;
+ align-content: center;
+
+}
+
+
+.gridContainer1{
+ display:grid;
+ grid-template-columns: 10% 10% 60% 5% 5% 10%;
+ grid-template-rows: auto;
+ grid-template-areas:
+ ". pageTitle pageTitle pageTitle pageTitle ."
+ ". . . submitButton submitButton ."
+ ". townBannerC townBannerC townBannerDetsC . ."
+ ". townBannerR townBannerR townBannerDetsR . ."
+ ". townBannerP townBannerP townBannerDetsP . ."
+ " . . textFlavour . . .";
+}
+
+
+
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index c116f6554429b20e76bcc8fbe703a9bddeee9792..3d1973fac582203a1fbfa9cab0937ff213a45c51 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -3,6 +3,13 @@
padding: 0;
margin: 0;
}
+
+#homeHead{
+ color: inherit;
+ text-decoration: none;
+ padding: 0;
+ margin: 0;}
+
.center {
text-align: center;
}
diff --git a/src/main/resources/static/css/templatingstyle.css b/src/main/resources/static/css/templatingstyle.css
index 8661180143d4330efc6f86e02d3668c8c1520f24..1ffc84d486810f03102e4a7534aa5d088c97bab0 100644
--- a/src/main/resources/static/css/templatingstyle.css
+++ b/src/main/resources/static/css/templatingstyle.css
@@ -3,13 +3,11 @@
border-bottom: 2px rgb(230, 230, 230) solid;
margin-bottom: 20px;
display: flex;
- background: blueviolet;
+ background-color: rgb(84, 33, 128);
}
/* Navbar Links */
.navBar {
- margin-top: 50px;
- margin-left: auto;
- margin-right:20px;
+ margin: 2svh 1vw 2svh auto;
text-align: right;
}
.work{
@@ -20,11 +18,17 @@
display: flex;
margin-left: 100px;
}
+
+
.navBar a {
- border-left: 2px rgb(185, 185, 185) solid;
- padding: 10px 40px;
+
+ /*border-left: 2px rgb(185, 185, 185) solid;*/
+ /*padding: 10px 40px;*/
+ padding-left:5px ;padding-right: 5px;
text-decoration: none;
- color:rgb(87, 86, 86);
+ /*color:rgb(87, 86, 86);*/
+/*// original color*/
+ color:white;
white-space: nowrap;
overflow: hidden;
float: right;
@@ -55,15 +59,18 @@
/* Footer */
footer {
- margin-top:20px;
+ margin-top:auto;
display: flex;
justify-content: center;
+ background-color: rgb(84, 33, 128);
+ border-top: 2px rgb(230, 230, 230) solid;
+ font-size: 1vw;
}
.footerBar{
- border-top: 2px rgb(230, 230, 230) solid;
+
text-align: left;
display: flex;
- background: blueviolet;
+
color: rgb(255, 255, 255);
padding-left: 30px;
}
@@ -90,4 +97,13 @@ footer {
.rightFooter{
flex:1;
color: rgb(255, 255, 255);
-}
\ No newline at end of file
+}
+
+/*CHANGES*/
+
+.headerBar, .footerBar{
+ margin:0px;
+ padding: 0px;
+ width: 100%;
+}
+
diff --git a/src/main/resources/static/images/CaerphillyCastle.jpg b/src/main/resources/static/images/CaerphillyCastle.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ef4597465bf41491bc7173f473b94fd65bab6e19
Binary files /dev/null and b/src/main/resources/static/images/CaerphillyCastle.jpg differ
diff --git a/src/main/resources/static/images/PenarthBanner.jpg b/src/main/resources/static/images/PenarthBanner.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..24c2b5226dc53a8782b5775d01d3a8a540c6db14
Binary files /dev/null and b/src/main/resources/static/images/PenarthBanner.jpg differ
diff --git a/src/main/resources/static/images/RiscaBanner.jpg b/src/main/resources/static/images/RiscaBanner.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f3adaebe8598ed32a066c1d664626ddac9ee8b5a
Binary files /dev/null and b/src/main/resources/static/images/RiscaBanner.jpg differ
diff --git a/src/main/resources/static/images/trails/trail2.jpg b/src/main/resources/static/images/trails/trail2.jpg
index 31e14eae5ac6e1132c33b7161dc2bc5e30c90dcf..683d275abb6772456d55082eb4940d0e606bf5f6 100644
Binary files a/src/main/resources/static/images/trails/trail2.jpg and b/src/main/resources/static/images/trails/trail2.jpg differ
diff --git a/src/main/resources/static/images/trails/trail3.jpg b/src/main/resources/static/images/trails/trail3.jpg
index 84763490556a7e758d2d56e8b649e051bd7a770d..f02b15249a3f0e2158023b8a98c8bf67fcc272c8 100644
Binary files a/src/main/resources/static/images/trails/trail3.jpg and b/src/main/resources/static/images/trails/trail3.jpg differ
diff --git a/src/main/resources/static/images/trails/trail4.jpg b/src/main/resources/static/images/trails/trail4.jpg
index c2b43e3a3488a4b4c7105948c4a9903bd15915e0..c8c405e4f332a4f9b495c98ecbac7988b2b27cda 100644
Binary files a/src/main/resources/static/images/trails/trail4.jpg and b/src/main/resources/static/images/trails/trail4.jpg differ
diff --git a/src/main/resources/static/images/trails/trailNotFound.jpg b/src/main/resources/static/images/trails/trailNotFound.jpg
index dc106d5033650fe232b4f01d8914a163c4462c75..9fd46288f31cf61cbce2d58244e69b908cf727c1 100644
Binary files a/src/main/resources/static/images/trails/trailNotFound.jpg and b/src/main/resources/static/images/trails/trailNotFound.jpg differ
diff --git a/src/main/resources/static/scripts/allTrails.js b/src/main/resources/static/scripts/allTrails.js
index 0e5132a7453bee04a1eed08dbcdb5401a68b72f7..e62cd3bbedf582442bf20874e9f877949935db0d 100644
--- a/src/main/resources/static/scripts/allTrails.js
+++ b/src/main/resources/static/scripts/allTrails.js
@@ -1,7 +1,7 @@
function updateOutputTrail(id) {
/* Updates the trail being shown on screen to the one requested by ID */
$.get("/allTrails/" + id).done(function (fragment) {
- $("#trailInfoContainer").html(fragment)
+ $(".trailInfoFrag").replaceWith(fragment);
});
updateSelectedTrail(id);
}
diff --git a/src/main/resources/templates/allTrails/allTrails.html b/src/main/resources/templates/allTrails/allTrails.html
index 669020d15507bfcaeb8ca959df108269222ba8ec..746762b68f64b62190bf71e102edf0ff309772d9 100644
--- a/src/main/resources/templates/allTrails/allTrails.html
+++ b/src/main/resources/templates/allTrails/allTrails.html
@@ -2,6 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>All Trails</title>
<link rel="stylesheet" th:href="@{css/allTrails.css}">
<link rel="stylesheet" th:href="@{css/templatingstyle.css}">
@@ -21,9 +22,12 @@
>
</section>
- <section id="trailInfoContainer">
- <h1 class="centerFlex">Please select your trail</h1>
- <!--Loaded from thymeleaf-->
+ <section id="trailInfoContainer" class="trailInfoFrag">
+ <!--All this section is loaded from thymeleaf, based on what tail is selected
+ in the #allTrailsBar -->
+ <div class="trailInfoHeader">
+ <h1 class="centerFlex">Please select your trail</h1>
+ </div>
</section>
</main>
diff --git a/src/main/resources/templates/fragments/allTrailsFrags.html b/src/main/resources/templates/fragments/allTrailsFrags.html
index fc4da1492b07e6d7f3004a95554aeae13cf58bcb..7f7f41dba9f99ce028118a4b4da502a6039d6f2d 100644
--- a/src/main/resources/templates/fragments/allTrailsFrags.html
+++ b/src/main/resources/templates/fragments/allTrailsFrags.html
@@ -1,11 +1,7 @@
<article th:fragment="trailSection" class="trailInfoFrag">
- <h1 th:text="${trail.getName()}"></h1>
-
- <div id="trailFragContent">
- <img th:src="@{${trail.getImgPath()}}" th:alt="${trail.getName()} ">
- <p th:text="${trail.getDescription()}"></p>
+ <div class="trailInfoHeader">
+ <h1 th:text="${trail.getName()}"></h1>
</div>
-
-
- <!--TODO add more to this fragment and then add styling to it-->
+ <img th:src="@{${trail.getImgPath()}}" th:alt="${trail.getName()} ">
+ <p id="trailDesc" th:text="${trail.getDescription()}"></p>
</article>
diff --git a/src/main/resources/templates/towns/Templating.html b/src/main/resources/templates/towns/Templating.html
index f7a4d184e91b2fb31759692f4d0771bfb781ac82..1313b325bb3027665a9242b8fcd6d9db707af4e7 100644
--- a/src/main/resources/templates/towns/Templating.html
+++ b/src/main/resources/templates/towns/Templating.html
@@ -1,43 +1,25 @@
-<!--<<<<<<< HEAD-->
-<!--<header th:fragment="headerBlock">-->
-<!-- <br>Header Block<br>-->
-<!--</header>-->
-<!--<footer th:fragment="footerBlock">-->
-<!-- <br><b>VZTA</b><br>-->
-<!-- <br>Near Me Now LTD<br>-->
-<!-- <br>Britania House<br>-->
-<!-- <br>Caerphilly Business Park<br>-->
-<!-- <br>Caerphilly<br>-->
-<!-- <br>CF83 3GG<br>-->
-<!-- <br>(C) VZTA 2022<br>-->
-<!-- <br><b>Follow Us</b><br>-->
-<!-- <br>Facebook Twitter Instagram LinkedIn<br>-->
-<!-- <br>Privacy Policy Terms and Conditions<br>-->
-<!--</footer>-->
-<!--=======-->
<link rel="stylesheet" href="../../static/css/templatingstyle.css">
<header class="headerBar" th:fragment="header">
-
-<div class="Logo">
- <img src="../../static/images/VZTA.png" height="97" width="400" 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>
+ <div class="Logo">
+ <img src="/images/VZTA.png" height="97" width="400" alt="VZTA Logo"/>
+ </div>
+ <nav class="navBar">
<ul>
- <option value="localauthorities">Local Authorities</option>
- <option value="towns">Towns</option>
- <option value="businesses">Businesses</option>
- <option value="consumers">Consumers</option>
+ <li><a id="homeHead" href="/home">Home</a></li>
+ <li>FAQs</li>
+ <li>Contact us</li>
</ul>
- </select>
-</nav>
+ <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">
@@ -59,10 +41,10 @@
<div class="centerFooter">
<span class="footerText">
<h3>Follow Us</h3>
- <a href="https://www.facebook.com/VZTAsmarttowns/" class="icon"><img src="../../static/images/Facebook.png" height="25" width="25" alt="Facebook Logo" class="icon"/></a>
- <a href="https://www.twitter.com/VZTAsmarttowns/" class="icon"><img src="../../static/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="../../static/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="../../static/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/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>
</span>
</div>
<div class="copyright" style="text-align: left">
diff --git a/src/main/resources/templates/towns/caerphilly.html b/src/main/resources/templates/towns/caerphilly.html
index d8c697546429b69854bf5e6c8112223d11469d16..912da813737475d83dfc3af4c0ff4010189ec7f5 100644
--- a/src/main/resources/templates/towns/caerphilly.html
+++ b/src/main/resources/templates/towns/caerphilly.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<style>
- *{
+ body{
background-color: #36454F;
color: white;
}
@@ -103,7 +103,7 @@
}
.landmarkTitle{
- grid-area:landmarkTitle
+ grid-area:landmarkTitle;
}
.container{
display:grid;
@@ -168,8 +168,10 @@
<head>
<meta charset="UTF-8">
<title>Caerphilly</title>
+ <link rel="stylesheet" th:href="@{/css/templatingstyle.css}">
</head>
<body>
+<header th:insert="~{/towns/Templating.html::header}"></header>
<main>
<div class="container">
<h1 class="townName"> Welcome to the town of Caerphilly.</h1>
@@ -213,6 +215,7 @@
</div>
</main>
+<footer th:insert="~{/towns/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
new file mode 100644
index 0000000000000000000000000000000000000000..0f80da587b942b6f12ef7bce29913df3fa077838
--- /dev/null
+++ b/src/main/resources/templates/towns/home/homePage.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Title</title>
+ <link rel="stylesheet" th:href="@{/css/homePageStyle.css}">
+ <link rel="stylesheet" th:href="@{/css/templatingstyle.css}">
+
+</head>
+<body>
+
+<header th:insert="~{/towns/Templating.html::header}"></header>
+<main>
+<div class="gridContainer1">
+ <H1 id="homeTitle"> VZTA Smart Towns - Trails</H1>
+ <a class="submitLand" href="/landmarkSubmission"> <button> Submit Landmark!</button></a>
+
+ <a href="/allTrails" class="caerphillyBanner">
+ <H2> Caerphilly</H2></a>
+
+
+ <div class="caerphillyBannerTrail">
+ <div id="trailCountCaer">Trails: 3</div>
+ <div id="trailProgressCaer">70%</div>
+ </div>
+
+ <a href="/allTrails" class="riscaBanner">
+ <H2> Risca</H2> </a>
+
+ <div class="riscaBannerTrail">
+ <div id="trailCountRisca">Trails: 2</div>
+ <div id="trailProgressRisca">0%</div>
+ </div>
+
+
+ <a href="/allTrails" class="penarthBanner">
+ <H2> Penarth</H2> </a>
+ <div class="penarthBannerTrail">
+ <div id="trailCountPenarth">Trails: 5</div>
+ <div id="trailProgressPenarth">60%</div>
+ </div>
+
+ <div id="aboutUsFlavour"> This is placeholder text about VZTA, this application,
+ the trails and towns and resultant awards written in an excitable manner!!</div>
+
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</main>
+<footer th:insert="~{/towns/Templating.html::footer}"></footer>
+
+</body>
+</html>
diff --git a/src/main/resources/templates/towns/caerleon.html b/src/main/resources/templates/towns/penarth.html
similarity index 63%
rename from src/main/resources/templates/towns/caerleon.html
rename to src/main/resources/templates/towns/penarth.html
index ba3d749226587b1fbc60523f980b8ddc4c867c08..ced6542a25376e193857367d615407510e31e9b3 100644
--- a/src/main/resources/templates/towns/caerleon.html
+++ b/src/main/resources/templates/towns/penarth.html
@@ -2,15 +2,15 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>Caerleon</title>
+ <title>Penarth</title>
</head>
<body>
<div>
- <h1> Welcome to the town of Caerleon.</h1>
+ <h1> Welcome to the town of Penarth.</h1>
</div>
<div>
- <h2>Explore trails around Caerleon</h2>
+ <h2>Explore trails around Penarth</h2>
<ul>
<li href="">Welsh History</li>
<li>Super</li>