Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 15
  • 18-as-a-user-i-want-consistent-headers-and-footers-on-each-webpage-so-that-i-can-navigate-the
  • 19-as-a-user-i-want-to-be-able-to-see-a-list-of-specific-landmarks-so-i-can-decide-where-to-go-next
  • 2-as-a-user-i-want-the-style-to-be-reminescent-of-netflix-disney-so-that-it-is-pleasing-the-eye
  • 26-as-a-client-i-want-users-to-be-able-to-store-registration-login-information-so-they-can-resume
  • 27-as-a-user-i-want-to-see-all-trails-across-a-town-and-seamlessly-move-between-them
  • 28-as-a-user-i-want-to-be-able-to-see-landmarks-related-to-the-trail-i-am-looking-at-so-that-i-can
  • 31-as-a-user-i-want-to-be-able-submit-a-form-about-a-specific-landmark-to-add-to-the-trail
  • 32-as-a-developer-i-want-all-landmarks-to-be-stored-together
  • 34-as-a-developer-i-want-to-link-all-data-tables-together-to-streamline-trail-related-data-sets
  • 44-as-a-user-i-want-to-be-able-to-have-the-homepage-being-very-intuitive-and-easy-to-navigate
  • 46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can
  • 46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can-2
  • 47-as-a-user-i-want-the-website-to-be-mobile-friedly-so-that-i-can-use-it-on-the-go
  • 48-as-a-user-i-want-to-see-a-list-of-all-available-towns-with-trails-so-i-can-plan-where-to-go
  • 49-as-a-trail-chaser-i-want-to-scan-a-qr-code-and-checkpoint-the-landmarks-i-ve-visited-on-seperate
  • 50-as-a-client-i-want-gamification-of-the-badges-so-that-users-remain-engaged
  • 50-as-a-user-i-want-to-be-able-to-log-in
  • 52-as-a-user-i-would-like-to-see-a-map-of-the-landmarks-so-that-i-can-figure-out-where-to-go
  • 68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path
  • 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can
  • 70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my
  • 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense
  • 74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details
  • 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop
  • 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find
  • 81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me
  • 82-as-a-site-admininstrator-i-want-to-be-able-to-review-submited-trail-checkpoints-by-bussiness
  • CaerphillyHeadAndFoot
  • CaerphillyHeadandFoot
  • CaerphillyLandmarks
  • DTFrontEnd
  • Gabes-testing-branch
  • InitialWebPageControllers
  • QRCodes
  • businesses
  • cleanup
  • consumers
  • database
  • databaseList
  • foreignkeys
  • gamification
  • headandfoot
  • headerandfooter
  • locationApporvalFormValidationUpdate
  • main
  • pleaseSQLWork
  • towns
  • wireframes
49 results

Target

Select target project
  • d1634883/client-project
  • d1656298/client-project
2 results
Select Git revision
  • 15
  • 18-as-a-user-i-want-consistent-headers-and-footers-on-each-webpage-so-that-i-can-navigate-the
  • 19-as-a-user-i-want-to-be-able-to-see-a-list-of-specific-landmarks-so-i-can-decide-where-to-go-next
  • 2-as-a-user-i-want-the-style-to-be-reminescent-of-netflix-disney-so-that-it-is-pleasing-the-eye
  • 26-as-a-client-i-want-users-to-be-able-to-store-registration-login-information-so-they-can-resume
  • 27-as-a-user-i-want-to-see-all-trails-across-a-town-and-seamlessly-move-between-them
  • 28-as-a-user-i-want-to-be-able-to-see-landmarks-related-to-the-trail-i-am-looking-at-so-that-i-can
  • 31-as-a-user-i-want-to-be-able-submit-a-form-about-a-specific-landmark-to-add-to-the-trail
  • 32-as-a-developer-i-want-all-landmarks-to-be-stored-together
  • 34-as-a-developer-i-want-to-link-all-data-tables-together-to-streamline-trail-related-data-sets
  • 44-as-a-user-i-want-to-be-able-to-have-the-homepage-being-very-intuitive-and-easy-to-navigate
  • 46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can
  • 46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can-2
  • 47-as-a-user-i-want-the-website-to-be-mobile-friedly-so-that-i-can-use-it-on-the-go
  • 48-as-a-user-i-want-to-see-a-list-of-all-available-towns-with-trails-so-i-can-plan-where-to-go
  • 49-as-a-trail-chaser-i-want-to-scan-a-qr-code-and-checkpoint-the-landmarks-i-ve-visited-on-seperate
  • 50-as-a-client-i-want-gamification-of-the-badges-so-that-users-remain-engaged
  • 50-as-a-user-i-want-to-be-able-to-log-in
  • 52-as-a-user-i-would-like-to-see-a-map-of-the-landmarks-so-that-i-can-figure-out-where-to-go
  • 68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path
  • 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can
  • 70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my
  • 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense
  • 74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details
  • 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop
  • 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find
  • 81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me
  • 82-as-a-site-admininstrator-i-want-to-be-able-to-review-submited-trail-checkpoints-by-bussiness
  • CaerphillyHeadAndFoot
  • CaerphillyHeadandFoot
  • CaerphillyLandmarks
  • DTFrontEnd
  • Gabes-testing-branch
  • InitialWebPageControllers
  • QRCodes
  • businesses
  • cleanup
  • consumers
  • database
  • databaseList
  • foreignkeys
  • gamification
  • headandfoot
  • headerandfooter
  • locationApporvalFormValidationUpdate
  • main
  • pleaseSQLWork
  • towns
  • wireframes
49 results
Show changes
Show whitespace changes
Inline Side-by-side
Showing
with 347 additions and 19 deletions
src/main/resources/templates/towns/caerphilly.html
View file @ 290d61c0
<!DOCTYPE html>
<html lang="en">
<style>
body{
background-color: #36454F;
color: white;
}
.explore{
color: deeppink;
}
a:link{
color: red;
}
.explore:visited{
color:purple;
}
.explore:hover{
color:plum;
}
.fnd{
color: dodgerblue;
}
.shopping{
color: orangered;
}
.activities{
color: rebeccapurple;
}
.services{
color: darkseagreen;
}
.checklistFlexbox{
flex-direction: row;
display: inline-flex;
/*justify-content: space-between;*/
flex-wrap: wrap;
text-align: left;
border: 2px solid white;
grid-area: checklistFlexbox;
}
.landmarkList{
padding-right: 15px;
/*border: 2px solid black;*/
}
.landmarkProgress{
text-align: center;
font-size: larger; /*vw changes with browser size*/
color: yellow;
}
/*block types denote whether a user has unlocked the respective landmark*/
#block1{
width:15px;height:15px;background: red;border-radius:50%;padding: 0; margin: 0px;height: 18px; width:18px;
}
#block2{
width:15px;height:15px;background: red;border-radius:50%;padding: 0; margin: 0px;height: 18px;width:18px;
}
#block3{
width:15px;height:15px;background: green;border-radius:50%;padding: 0; margin: 0px;height: 18px;width:18px;
}
#block4{
width:15px;height:15px;background: red;border-radius:50%;padding: 0; margin: 0px;height: 18px;width:18px;
}
#block5{
width:15px;height:15px;background: green;border-radius:50%;padding: 0; margin: 0px;height: 18px;width:18px;
}
.landmarkList, .checkList{
list-style-type: none;
}
.townName{
grid-area: title1;
}
.trailHeader{
grid-area: title2;
}
[BadgeStickerProgress]{
grid-area: BadgeStickerProgress;
}
.landmarkTitle{
grid-area:landmarkTitle;
}
.container{
display:grid;
grid-template-columns: 50% 50%;
grid-template-rows: auto;
grid-template-areas:
"title1 title1"
"title2 title2"
"BadgeStickerProgress ."
"landmarkTitle ."
"checklistFlexbox .";
}
.checkmark .uncollected{ /*taken from https://www.w3schools.com/css/css_tooltip.asp*/
visibility: hidden;
width: 120px;
background-color: red;
color: whitesmoke;
text-align: center;
padding: 5px 0;
border-radius: 6px;
/*top: -5px;*/
/*left: 105%;*/
top: 5px;
left: 105%
}
.checkmark:hover .uncollected{
visibility: visible;
}
.checkmark .collected{ /*taken from https://www.w3schools.com/css/css_tooltip.asp*/
visibility: hidden;
width: 120px;
background-color: green;
color: whitesmoke;
text-align: center;
padding: 5px 0;
border-radius: 6px;
top: 0px;
left: 105%;
/*background-color: whitesmoke;*/
/*color: green;*/
}
.checkmark:hover .collected{
visibility: visible;
}
</style>
<head>
<meta charset="UTF-8">
<title>Caerphilly</title>
<link rel="stylesheet" th:href="@{/css/templatingstyle.css}">
</head>
<body>
<h1> Welcome to the town of Caerphilly.</h1>
<header th:insert="~{/towns/Templating.html::header}"></header>
<main>
<div class="container">
<h1 class="townName"> Welcome to the town of Caerphilly.</h1>
<h2 class="trailHeader"> Welcome to the trail of trail-ness!</h2>
<section name="BadgeStickerProgress"> Sticker Pictures and stuff go here</section>
<h2 class="landmarkTitle">Caerphilly Landmark Progress:</h2>
<div class="checklistFlexbox">
<div><h2 style="padding-left: 3px">Badge Progress:</h2>
<div class="landmarkProgress"> <b class="landmarkProgress">2/5</b> </div>
<br>
<div class="landmarkProgress">
<b class="landmarkProgress" >3 to Go!!</b></div></p>
</div>
<li class="checkList">
<ul class="checkmark"><div id="block1"> </div> <span class="uncollected">Uncollected</span></ul>
<ul class="checkmark"><div id="block2"> </div><span class="uncollected">Uncollected</span></ul>
<ul class="checkmark"><div id="block3"> </div><span class="collected">Collected</span></ul>
<ul class="checkmark"><div id="block4"> </div><span class="uncollected">Uncollected</span></ul>
<ul class="checkmark"><div id="block5"> </div><span class="collected">Collected</span></ul>
</li>
<li name="landmarkList"class="landmarkList">
<ul><span class="shopping">Landmark 1 </span>
<span ><a href="../test.html" class="explore">- Explore!</a></span></ul>
<hr style="height:0px; visibility:hidden;" />
<ul><span class="services">Landmark 2 </span>
<span class="explore">- Explore!</span></ul> <hr style="height:0px; visibility:hidden;" />
<ul><span class="activities">Landmark 3 </span>
<span class="explore">- Explore!</span></ul> <hr style="height:0px; visibility:hidden;" />
<ul><span class="shopping">Landmark 4 </span>
<span class="explore">- Explore!</span></ul> <hr style="height:0px; visibility:hidden;" />
<ul><span class="fnd">Landmark 5 </span>
<span class="explore">- Explore!</span></ul>
</li>
</div>
</div>
</main>
<footer th:insert="~{/towns/Templating.html::footer}"></footer>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/towns/home/homePage.html 0 → 100644
View file @ 290d61c0
<!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>
src/main/resources/templates/towns/penarth.html 0 → 100644
View file @ 290d61c0
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Penarth</title>
</head>
<body>
<div>
<h1> Welcome to the town of Penarth.</h1>
</div>
<div>
<h2>Explore trails around Penarth</h2>
<ul>
<li href="">Welsh History</li>
<li>Super</li>
</ul>
</div>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/towns/templates.server/Templating.html deleted 100644 → 0
View file @ fee01649
<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>
\ No newline at end of file
src/main/resources/templates/towns/trails/dragonstale/index.html 0 → 100644
View file @ 290d61c0
<!DOCTYPE html>
<html lang="en">
<html xmlns:th="http://www.thymeleaf.org">
<meta charset="UTF-8">
<title>A Dragon's Tale</title>
<link rel="stylesheet" th:href="@{/css/dragonstaless.css}">
<link rel="stylesheet" th:href="@{/css/templatingstyle.css}">
</head>
<body>
<header th:insert="towns/Templating.html :: header"></header>
<div class="centre">
<h1> Welcome, to a dragon's tale! </h1>
<img th:src="@{/images/trails/dragonstalehome.png}" alt="Image of a dragon" id="homeimg">
<h2> Discover the mystery of the dragon, track its location and follow it throughout the town of (thymeleaf element) to discover a prize! </h2>
</div>
<div class="centre">
<p>
Adventurers... embark through mystical historical landmarks to ultimately discover the lair of the dragon.
Legend has it that within this ominous lair, mighty dragons, guardians of ancient wisdom and treasures untold lay....
</p>
</div>
<div class="centre">
<ul th:each="item : ${landmarksList}">
<p th:text="${item.landmarkName}"></p>
<p th:text="${item.landmarkDescription}"></p>
</ul>
</div>
<div class="centre">
<h3>Begin your hunt!</h3>
<button type="button" id="begin">Click here!</button>
</div>
<div th:insert="towns/Templating.html :: footer"></div>
<script>
document.getElementById("begin").addEventListener("click", function (){
window.location.href = ("/dragonstale/landmarkone");
})
</script>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/towns/caerleon.html → src/main/resources/templates/towns/trails/welshhistory/welshhistory.html
View file @ 290d61c0
......@@ -2,10 +2,9 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Caerleon</title>
<title>The Roman Empire</title>
</head>
<body>
<h1> Welcome to the town of Caerleon.</h1>
</body>
</html>
\ No newline at end of file