Commiting requried modifications to merge with main per git merge erro message

src/main/resources/data.sql

+delete from users;
+insert into users (userID, Name) value ('1', 'Hannah');
+insert into users (userID, Name) value ('2', 'Nigel');
+
+delete from trails;
+insert into trails (trailID, Name) value ('1', 'Caerphilly Coffee Trail');
+insert into trails (trailID, Name) value ('2', 'Penarth Dragon Trail');
+
+delete from locations;
+insert into locations (locationID, Name) value ('1', 'Caerphilly');
+insert into locations (locationID, Name) value ('2', 'Penarth');
\ No newline at end of file

src/main/resources/schema.sql

+drop table if exists trails;
+create table if not exists trails
+(
+    trailID bigint auto_increment primary key,
+    name varchar(128)
+)   engine=InnoDB;
+drop table if exists locations;
+create table if not exists locations
+(
+    locationID bigint auto_increment primary key,
+    name varchar(128)
+)   engine=InnoDB;
+drop table if exists users;
+create table if not exists users
+(
+    userID bigint auto_increment primary key,
+    name varchar(128)
+) engine=InnoDB;
\ No newline at end of file

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

src/main/resources/templates/towns/trails/dragonstale/stylesheet.css → src/main/resources/static/css/dragonstaless.css

@@ -5,5 +5,13 @@
     margin-left: auto;
     margin-right: auto;
     width: 50%;
-    background-color: antiquewhite;
+    background-color: #927BB7;
+}
+
+#homeimg.centre{
+    box-shadow: 100px -100px purple;
+}
+
+body{
+    background-color: #927BB7;
 }
\ No newline at end of file

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{
@@ -61,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;
 }

src/main/resources/static/scripts/allTrails.js

 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);
 }

src/main/resources/static/users.html

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file

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>

src/main/resources/templates/fragments/allTrailsFrags.html

 <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>

src/main/resources/templates/fragments/landmarkFrag.html

+<!-- TODO Develop each individual landmark for DragonsTrail -->
+<!-- Each trail should have a preestablished set of landmarks -->
+
+<div th:fragment="landmarkList" class="centre" id="landmarkList">
+    <ul>
+        <li th:each="item : ${landmarksList}" th:text="${item}"></li>
+    </ul>
+</div>
\ No newline at end of file