- Dec 06, 2023
-
-
Gabriel Copat authored
Page also starts with pack1 selected by default
-
Gabriel Copat authored
-
- Dec 05, 2023
-
-
Gabriel Copat authored
-
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
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
Updated CSS to match
-
Gabriel Copat authored
Removed "String pack" variable from Object Sticker
-
Gabriel Copat authored
Updated UserController.java to reflect this change
-
Gabriel Copat authored
Restructured rewards package for organization
-
Gabriel Copat authored
Restructured rewards package for organization
-
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)
-
- Dec 04, 2023
-
-
Rhys Evans authored
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
-
Connor Brock authored
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.
-
Connor Brock authored
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
-
Gabriel Copat authored
Merge branch 'main' into 50-as-a-client-i-want-gamification-of-the-badges-so-that-users-remain-engaged # Conflicts: # src/main/resources/data.sql
-
Gabriel Copat authored
-
Connor Brock authored
Resolve "As a user, I would like a place to see all my earned badges, so that I can track my progress." Closes #51 See merge request !25
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
Merge branch 'main' into 50-as-a-client-i-want-gamification-of-the-badges-so-that-users-remain-engaged # Conflicts: # src/main/resources/data.sql
-
Gabriel Copat authored
-
Rhys Evans authored
-
- Dec 03, 2023
-
-
Rhys Evans authored
-
Rhys Evans authored
Merge branch 'main' into 48-as-a-user-i-want-to-see-a-list-of-all-available-towns-with-trails-so-i-can-plan-where-to-go Merging to allow up do date branch version in order to push this banch to main
-
Rhys Evans authored
-
Rhys Evans authored
Updated styling layout and banner-image positions, modified progress color scheme to jsut show a simple green if over 60% compelete and red if 60 or under
-
Rhys Evans authored
-
Rhys Evans authored
Added 4 basic locations associated with the Penarth and Risca trails listed in the landamrk submission form. Moved said forms javascript to a seperate file
-
Rhys Evans authored
Renamed location.class to Location.class for better disinguishment. Followed feedback provided by RN and removed unnecessary locationID variable within Location class
-
- Dec 02, 2023
-
-
Gabriel Copat authored
(Added required database entries and updated HTML/CSS accordingly)
-
Gabriel Copat authored
-
Gabriel Copat authored
Added User Database Loaded both into the UserController, displaying at the UserPage. Added new database entries in data.sql Deleted old user object, not in use.
-