Skip to content
Snippets Groups Projects
Commit d6661ffc authored by Gabriel Copat's avatar Gabriel Copat
Browse files

Page is working, user story completed

parent b6c64232
No related branches found
No related tags found
1 merge request!11Resolve "As a user, I want to see all trails across a town and seamlessly move between them."
Hide whitespace changes
Inline Side-by-side
src/main/java/Team5/SmartTowns/trails/Trail.java
+ 1
− 1
View file @ d6661ffc
...@@ -12,7 +12,7 @@ public class Trail { ...@@ -12,7 +12,7 @@ public class Trail {
new Trail(2,"Trail2", "This is trail two"), new Trail(2,"Trail2", "This is trail two"),
new Trail(3,"Trail3", "This is trail three"), new Trail(3,"Trail3", "This is trail three"),
new Trail(4,"Trail4", "This is trail four"), new Trail(4,"Trail4", "This is trail four"),
new Trail(5,"Trail5", "This is trail five, it has no image") new Trail(5,"Trail5", "EDITING THIS")
); );
int id; int id;
String name; String name;
......
src/main/resources/static/css/allTrails.css
+ 15
− 11
View file @ d6661ffc
...@@ -50,8 +50,8 @@ main { ...@@ -50,8 +50,8 @@ main {
#trailInfoContainer { #trailInfoContainer {
margin: auto; margin: auto;
width: 95vw; width: 95svw;
min-height: 80vh; min-height: 40svh;
min-width: 30svw; min-width: 30svw;
} }
...@@ -60,15 +60,12 @@ main { ...@@ -60,15 +60,12 @@ main {
border: #000000 solid 2px; border: #000000 solid 2px;
border-radius: 10px; border-radius: 10px;
box-shadow: 0 5px 20px 0 #000000; box-shadow: 0 5px 20px 0 #000000;
margin:0; margin:0;
padding:0; padding:0;
animation: fadeIn 3s; animation: fadeIn 3s;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
/*min-height: 80svh;*/
min-width: 30svh; min-width: 30svh;
& h1 { & h1 {
...@@ -84,17 +81,20 @@ main { ...@@ -84,17 +81,20 @@ main {
#trailFragContent { #trailFragContent {
margin: 0; margin: 0;
padding: 0; padding: 0;
display: flex; display: flex;
overflow: hidden; overflow: hidden;
min-height: 40svh;
max-height: 60svh;
& img { & img {
border-radius: 10px; border-radius: 10px;
border: black solid 1px; border: black solid 1px;
margin: 1%; margin: 1%;
flex: 1 1; flex: 1 1;
width: 30%; min-width: 20%;
min-height: 30svh; max-width: 40%;
min-height: 20svh;
max-height: 40svh;
} }
& p { & p {
color: white; color: white;
...@@ -103,10 +103,14 @@ main { ...@@ -103,10 +103,14 @@ main {
padding-left: 10px; padding-left: 10px;
width: 60%; width: 60%;
border-left: solid darkgrey 2px; border-left: solid darkgrey 2px;
} }
} }
header {
box-shadow: #1e1e1e 0 0 10px 10px;
}
footer {
position: relative;
bottom: 0;
}
\ No newline at end of file
src/main/resources/templates/allTrails/allTrails.html
+ 5
− 5
View file @ d6661ffc
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>All Trails</title> <title>All Trails</title>
<link rel="stylesheet" th:href="@{css/allTrails.css}"> <link rel="stylesheet" th:href="@{css/allTrails.css}">
<link rel="stylesheet" th:href="@{css/banners.css}"> <link rel="stylesheet" th:href="@{css/templatingstyle.css}">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script> <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
</head> </head>
<body> <body>
<header th:replace="towns/templates.server/Templating.html :: headerBlock"></header> <header th:replace="~{/towns/Templating.html :: header}"></header>
<main> <main>
<section id="allTrailsBar" class="centerFlex"> <section id="allTrailsBar" class="centerFlex">
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
</section> </section>
<section id="trailInfoContainer"> <section id="trailInfoContainer">
<h1 class="centerFlex">Please select your trail</h1>
<!--Loaded from thymeleaf-->
</section> </section>
</main> </main>
<footer th:insert="~{/towns/Templating.html :: footer}"></footer>
<footer th:replace="towns/templates.server/Templating.html:: footerBlock"></footer>
<script type="text/javascript" th:src="@{scripts/allTrails.js}"></script> <script type="text/javascript" th:src="@{scripts/allTrails.js}"></script>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment