Resolve "As a QR-scanning connoisseur , I want to unlock stickers after scanning a QR code to feel a sense of reward."
Merged
requested to merge 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense into main
- Dec 07, 2023
-
-
Gabriel Copat authored9ec8ccb8 -
Gabriel Copat authored
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
b3a76168 -
Gabriel Copat authored8477f9ae
-
Gabriel Copat authored0703007b
-
- Dec 06, 2023
-
-
Gabriel Copat authored
Added some more functions for this page
2ed47eaf -
Gabriel Copat authoredfdab9bdd
-
Gabriel Copat authored
Adjusted Database and CSS to account for this
bed85635 -
Gabriel Copat authored
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
20abdb4f -
Gabriel Copat authored
Adjusted Database and CSS to account for this
6b6d40b2 -
Gabriel Copat authored
Page also starts with pack1 selected by default
8f421054 -
Gabriel Copat authored
Page also starts with pack1 selected by default
306e2ee3 -
Gabriel Copat authored4692a6aa
-
- Dec 05, 2023
-
-
Gabriel Copat authored900728ad
-
Gabriel Copat authored
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
55c21470 -
Gabriel Copat authored853e5585
-
Gabriel Copat authoredac35fc97
-
Gabriel Copat authored29f464d0
-
Gabriel Copat authored44d86989
-
Gabriel Copat authored
Updated CSS to match
74748d96 -
Gabriel Copat authored
Removed "String pack" variable from Object Sticker
ac7592fa -
Gabriel Copat authored
Updated UserController.java to reflect this change
2531a0af -
Gabriel Copat authored
Restructured rewards package for organization
e8c1365f -
Gabriel Copat authored
Restructured rewards package for organization
729d539c -
Gabriel Copat authored
- 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)
cb6e801c
-