Merge branch 'main' into 70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my

Merge branch '73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense' into 'main'

Resolve "As a QR-scanning connoisseur , I want to unlock stickers after scanning a QR code to feel a sense of reward."

Closes #73

See merge request !33

Rhys Evans authored 1 year ago and Gabriel Copat committed 1 year ago

Qr codes

Closes #49

See merge request !27

Merge branch 'main' into 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense

# Conflicts:
#	src/main/java/Team5/SmartTowns/data/MockUser.java
#	src/main/java/Team5/SmartTowns/data/QRCodes.java
#	src/main/java/Team5/SmartTowns/trails/TrailsController.java
#	src/main/java/Team5/SmartTowns/users/User.java
#	src/main/java/Team5/SmartTowns/users/UserRepository.java
#	src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
#	src/main/resources/data.sql
#	src/main/resources/schema.sql

Qr codes

Closes #49

See merge request !27

Commented out code for URL query string integration to get a functioning QR code scanner for presentation

Added some more functions for this page

Adjusted Database and CSS to account for this

Merge remote-tracking branch 'origin/73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense' into 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense

# Conflicts:
#	src/main/java/team5/smartTowns/users/UserController.java
#	src/main/resources/data.sql
#	src/main/resources/static/css/userProfile2.css
#	src/main/resources/templates/users/userFrags.html

Adjusted Database and CSS to account for this

Page also starts with pack1 selected by default

Page also starts with pack1 selected by default

# Conflicts:
#	src/main/java/Team5/SmartTowns/trails/TrailsController.java
#	src/main/resources/data.sql

Merge remote-tracking branch 'origin/73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense' into 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense

# Conflicts:
#	src/main/java/team5/smartTowns/rewards/Badge.java
#	src/main/java/team5/smartTowns/rewards/Reward.java
#	src/main/java/team5/smartTowns/rewards/RewardsController.java
#	src/main/java/team5/smartTowns/rewards/Sticker.java
#	src/main/java/team5/smartTowns/rewards/data/BadgesRepository.java
#	src/main/java/team5/smartTowns/rewards/data/BadgesRepositoryJDBC.java
#	src/main/java/team5/smartTowns/rewards/data/StickersRepository.java
#	src/main/java/team5/smartTowns/rewards/data/StickersRepositoryJDBC.java

Updated CSS to match

Removed "String pack" variable from Object Sticker

Updated UserController.java to reflect this change

Restructured rewards package for organization

Restructured rewards package for organization

- Unused Database in wrongly named package in Teams5 deleted (Smarttowns/Data instead of smarttowns/data)
- Deleted unused/empty HTML files: home.html, index.html, QRCodeScanner.html, temp_frags.html, test.html, users.html.

Renamed files to follow java naming conventions:
- Renamed Packages to be lowercase
- Renamed Objects to be uppercase

Organised Images folder
- Icons moved to images/icons (and references updated)
- City Banners moved to images/banners
- Unused & Repeated images deleted

Moved Files:
-HTML fragments for header and footer moved into the fragments folder in templates, to follow the placement of other fragment files.

(ALL REFERENCES TO FILES ADJUSTED IN THE CODE)

Added fields into dragonstale database as a test to further integrate QR code checking against URL path. Also added some basic window.open functionality in the JS file.

Merge branch '46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can' into 'main'

Resolve "As a child, I want an interesting and exciting story based trail with obvious landmarks, so I can follow the trail with ease. (Outline Only)"

Closes #46

See merge request !29

Set up landing page for Dragons Tale, intergrated Thymeleaf and related controllers. Applied simple CSS and JS button to redirect to a new URL. Need to set up a controller to support this redirect.

Merge branch '50-as-a-client-i-want-gamification-of-the-badges-so-that-users-remain-engaged' into 'main'

Resolve "As a client I want gamification of the badges, so that users remain engaged."

Closes #50

See merge request !26