Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Team 5 - Smart Towns
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rhys Evans
Team 5 - Smart Towns
Merge requests
!43
Resolve "As a child, I want a very flashy and modern looking webpage that will draw me in and keep me entertained while following the dragons tale trail."
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Resolve "As a child, I want a very flashy and modern looking webpage that will draw me in and keep me entertained while following the dragons tale trail."
81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me
into
main
Overview
0
Commits
11
Pipelines
0
Changes
4
Merged
Resolve "As a child, I want a very flashy and modern looking webpage that will draw me in and keep me entertained while following the dragons tale trail."
Connor Brock
requested to merge
81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me
into
main
Dec 14, 2023
Overview
0
Commits
11
Pipelines
0
Changes
4
Closes
#81 (closed)
0
0
Merge request reports
Compare
main
version 6
0061869c
Dec 14, 2023
version 5
29a7eae1
Dec 14, 2023
version 4
6b7f9181
Dec 14, 2023
version 3
48bfe1df
Dec 14, 2023
version 2
52fabc03
Dec 14, 2023
version 1
4c758fdb
Dec 14, 2023
main (base)
and
version 1
latest version
aa9d0003
11 commits,
Dec 14, 2023
version 6
0061869c
10 commits,
Dec 14, 2023
version 5
29a7eae1
9 commits,
Dec 14, 2023
version 4
6b7f9181
8 commits,
Dec 14, 2023
version 3
48bfe1df
6 commits,
Dec 14, 2023
version 2
52fabc03
5 commits,
Dec 14, 2023
version 1
4c758fdb
4 commits,
Dec 14, 2023
4 files
+
23
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java
+
6
−
0
View file @ 4c758fdb
Edit in single-file editor
Open in Web IDE
Show full file
@@ -29,6 +29,12 @@ public class DragonsTaleController {
return
modelAndView
;
}
@GetMapping
(
"/allDTLandmarks"
)
public
ModelAndView
getAllLandmarksDT
(){
modelAndView
=
new
ModelAndView
(
"/dragonstale/alllandmarks"
);
return
modelAndView
;
}
@GetMapping
(
"/QRScan"
)
//In here, we could use trailID as a string variable and use it to track what trail the user clicked from.
public
ModelAndView
getQRScanner
(){
modelAndView
=
new
ModelAndView
(
"fragments/qr-scanner"
);
Loading