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 332 additions and 0 deletions
src/main/resources/static/images/badges.png 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/badges.png

639 KiB

src/main/resources/static/images/stats.png 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/stats.png

34.6 KiB

src/main/resources/static/images/trails.jpg 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/trails.jpg

4.31 MiB

src/main/resources/static/images/trails/dragonone.png 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/trails/dragonone.png

196 KiB

src/main/resources/static/images/trails/dragonstalehome.png 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/trails/dragonstalehome.png

7.84 KiB

src/main/resources/static/images/trails/trail1.jpg 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/trails/trail1.jpg

53.3 KiB

src/main/resources/static/images/trails/trail2.jpg 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/trails/trail2.jpg

318 KiB

src/main/resources/static/images/trails/trail3.jpg 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/trails/trail3.jpg

378 KiB

src/main/resources/static/images/trails/trail4.jpg 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/trails/trail4.jpg

304 KiB

src/main/resources/static/images/trails/trailNotFound.jpg 0 → 100644
View file @ 290d61c0
src/main/resources/static/images/trails/trailNotFound.jpg

59.4 KiB

src/main/resources/static/scripts/allTrails.js 0 → 100644
View file @ 290d61c0
function updateOutputTrail(id) {
/* Updates the trail being shown on screen to the one requested by ID */
$.get("/allTrails/" + id).done(function (fragment) {
$(".trailInfoFrag").replaceWith(fragment);
});
updateSelectedTrail(id);
}
function updateSelectedTrail(id) {
/* Updates the trail bar, so that it highlights the selected trail */
let list = document.getElementsByClassName('trailsImages')
for (let i = 0; i < list.length; i++) {
if (list[i].classList.contains('selected')) {
list[i].classList.remove('selected')
break
}
}
document.getElementById("img" + id).classList.add("selected")
}
\ No newline at end of file
src/main/resources/static/scripts/gabScripts.js 0 → 100644
View file @ 290d61c0
function selectTrail(string, element) {
console.log('Clicked')
let listEl = document.getElementsByClassName('liHeader')
for (let i = 0; i < listEl.length; i++) {
listEl[i].classList.remove('selected')
}
document.getElementById(string).classList.add("selected")
}
function updateOutput() {
$.post("test_ajax_frag").done(function (fragment) {
console.log(fragment);
$("#trailInfoBox").replaceWith(fragment);
});
}
\ No newline at end of file
src/main/resources/templates/Landmarks/LandmarkFormTh.html 0 → 100644
View file @ 290d61c0
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Landmark Sign Up</title>
<link rel="stylesheet" th:href="@{css/landmarkFormStyle.css}">
<link rel="stylesheet" th:href="@{css/templatingstyle.css}">
</head>
<body>
<header th:insert="~{/towns/Templating.html :: header}"></header>
<hr style="height:20px; visibility:hidden;" />
<H2 id="landmarkFormTitle"> Interested in joining our trails? Sign up Here! </H2>
<main>
<!-- Form used to submit potential landmarks for trails-->
<form action="/landmarkSub" id="landmarkSubmission" name="landmarkSubmission" method="post" th:object="${landmarkData}" onsubmit="return landmarkFormValidation()">
<br>
<label>Business Name:
<input type="text" th:field="*{landmarkName}" placeholder="Business name here...">
</label><br>
<div th:errors="*{landmarkName}" th:if="${#fields.hasErrors('landmarkName')}">ErrorLandmarkName</div>
<br><label>Contact Address:
<input type="text" th:field="*{landmarkEmail}" placeholder="E-mail here...">
</label><br>
<div th:errors="*{landmarkEmail}" th:if="${#fields.hasErrors('landmarkEmail')}">ErrorEmail</div>
<br><label>Please Describe Your Business:<br>
<textarea th:field="*{landmarkDescription}" rows="18" cols="70" placeholder="Max 200 words please..."></textarea>
</label><br><br>
<label>Your Location:
<select th:field="*{landmarkLocation}">
<option value="" disabled selected>Select Location</option>
<option value="Caerphilly">Caerphilly</option>
<option value="Risca">Risca</option>
<option value="Penarth">Penarth</option>
</select>
</label><br><br>
<label>Trail:
<select th:field="*{trailID}">
<option value=0 disabled selected>Select Trail</option>
<option value=0101>(Caerphilly) Castle Trail</option>
<option value=0102>(Caerphilly) Pub Trail</option>
<option value=0103>(Caerphilly) Heritage Trail</option>
<option value=0201>(Risca) Heritage and Culture Trail</option>
<option value=0301>(Penarth) Esplanade Trail</option>
</select>
</label><br><br>
<input type="submit">
<hr style="height:0px; visibility:hidden;" />
</form>
<hr style="height:40px; visibility:hidden;" />
</main>
<script>
// verification function of the above form
function landmarkFormValidation(){
var pass=true;
var trail = document.forms["landmarkSubmission"]["trailID"].value
var location = document.forms["landmarkSubmission"]["landmarkLocation"].value
var description = document.forms["landmarkSubmission"]["landmarkDescription"].value;
var descriptionWrdCount=description.split(" ").length
if (descriptionWrdCount>200){
alert('Please keep your description to a maximum of 200 words.');
pass = false;
}
if (trail==0){ // values of 0 and "" used to ensure default drop down option isn't submittable
alert('Invalid trail selected. \nPlease select the trail you wish to join.');
pass = false;
}
if (location==""){
alert('Invalid location selected. \nPlease select the location you wish to join.');
pass = false; // ensure correct trail is selected in accordance to the town it takes place in
} if ( (location=="Caerphilly" & (parseInt(trail/100)!==1)) ||
(location=="Risca" & (parseInt(trail/100)!==2)) ||
(location=="Penarth" & (parseInt(trail/100)!==3)) ){
alert('Trail unavailable in your current location. \nPlease choose an available trail');
pass = false;
}
return pass;
}
</script>
<footer th:insert="~{/towns/Templating.html :: footer}"></footer>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/allTrails/allTrails.html 0 → 100644
View file @ 290d61c0
<!DOCTYPE html>
<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}">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
</head>
<body>
<header th:replace="~{/towns/Templating.html :: header}"></header>
<main>
<section id="allTrailsBar" class="centerFlex">
<img class="trailsImages"
th:each="trail : ${trails}"
th:src="@{${trail.getImgPath()}}"
th:onclick="'updateOutputTrail('+ ${trail.getId()} +');'"
th:id="'img' + ${trail.getId()}" th:alt="${trail.getName()}"
>
</section>
<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>
<footer th:insert="~{/towns/Templating.html :: footer}"></footer>
<script type="text/javascript" th:src="@{scripts/allTrails.js}"></script>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/fragments/allTrailsFrags.html 0 → 100644
View file @ 290d61c0
<article th:fragment="trailSection" class="trailInfoFrag">
<div class="trailInfoHeader">
<h1 th:text="${trail.getName()}"></h1>
</div>
<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 0 → 100644
View file @ 290d61c0
<!-- 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
src/main/resources/templates/fragments/landmarkInfoFrag.html 0 → 100644
View file @ 290d61c0
<!-- TODO Develop each individual landmark for DragonsTrail -->
<!-- Each trail should have a preestablished set of landmarks -->
<div th:fragment="landmarkInfoFrag" class="centre" id="landmarkList">
<ul>
<li th:replace=""> 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>
\ No newline at end of file
src/main/resources/templates/fragments/temp_frags.html 0 → 100644
View file @ 290d61c0
<header th:fragment="header" class="headerBlock">
<h1 class="headerTitle">SMART-TOWNS</h1>
<div class="headerBanner">
<img src="images/trails.jpg" alt="Trails" class="bannerBack">
<!-- <div class="bannerText">-->
<h1 class="bigTitle">Smart Town Trails</h1>
<h2 class="smallTitle">Information about trails for your town</h2>
<!-- </div>-->
</div>
</header>
<footer th:fragment="footer">
<ul class="footerBar">
<li class="footerButton">Home</li>
<li class="footerButton">About</li>
<li class="footerButton">Map</li>
<li class="footerButton">Facilities</li>
<li class="footerButton">Search</li>
</ul>
</footer>
<article class="trailInfo" th:fragment="trailInfo2">
<h1 class="titleH1" th:text="${trail.name}">Trail Info</h1>
</article>
\ No newline at end of file
src/main/resources/templates/home.html 0 → 100644
View file @ 290d61c0
<!DOCTYPE html>
<html>
<head>
<title>Website Web</title>
<link rel="stylesheet" th:href="@{css/style.css}">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
</head>
<body>
<header th:replace="fragments/temp_frags.html :: header"></header>
<main>
<div class="trailList">
<ul class="ulHeader">
<li onclick="selectTrail('trail1', this)" class="liHeader" id="trail1" >Trail 1</li>
<li onclick="selectTrail('trail2', this)" class="liHeader selected" id="trail2" >Trail 2</li>
<li onclick="selectTrail('trail3', this)" class="liHeader" id="trail3" >Trail 3</li>
<li onclick="updateOutput()" class="liHeader" id="trail4" >Trail 4</li>
</ul>
</div>
<section class="mainBlock">
<article class="trailStats">
<h1 class="titleH1">Trail Stats</h1>
<img src="../static/images/stats.png" alt="Stats" class="stats">
<div class="textStats">
<p><b>Explored:</b> 60%</p>
<p><b>Landmarks Visited:</b> 3/5</p>
<p><b>Shops Visited:</b> 6/10</p>
</div>
</article>
<article id="trailInfoBox" class="trailInfo"></article>
<article class="badgesBlock">
<h1 class="titleH1">Badges</h1>
<div class="badgesList">
<img src="../static/images/badges.png" alt="Badge" class="badgeImg">
<img src="../static/images/badges.png" alt="Badge" class="badgeImg">
<img src="../static/images/badges.png" alt="Badge" class="badgeImg">
<img src="../static/images/badges.png" alt="Badge" class="badgeImg">
<img src="../static/images/badges.png" alt="Badge" class="badgeImg">
</div>
</article>
</section>
</main>
<footer th:replace="fragments/temp_frags.html :: footer"></footer>
<script src="https://code.jquery.com/jquery-1.9.1.js"></script>
<script type="text/javascript" th:src="@{scripts/gabScripts.js}"></script>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/towns/Templating.html 0 → 100644
View file @ 290d61c0
<link rel="stylesheet" href="../../static/css/templatingstyle.css">
<header class="headerBar" th:fragment="header">
<div class="Logo">
<img src="/images/VZTA.png" height="97" width="400" alt="VZTA Logo"/>
</div>
<nav class="navBar">
<ul>
<li><a id="homeHead" href="/home">Home</a></li>
<li>FAQs</li>
<li>Contact us</li>
</ul>
<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">
<div class="containerFooter">
<div class="leftFooter">
<h3>VZTA</h3>
Near Me Now LTD
<br>Britania House
<br>Caerphilly Business Park
<br>Caerphilly
<br>CF83 3GG
</div>
<div class="rightFooter">
<h3>Connect with us</h3>
<p>Be the first to know about updates by joining out Community page</p>
(C) VZTA 2022<br>
Policy Terms and Conditions
</div>
<div class="centerFooter">
<span class="footerText">
<h3>Follow Us</h3>
<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">
</div>
</div>
</div>
</div>
<!--&gt;>>>>>> main-->