- Dec 13, 2023
-
-
Connor Brock authored
-
Connor Brock authored
Merge remote-tracking branch 'origin/main' into 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find # Conflicts: # src/main/java/Team5/SmartTowns/landmarks/Landmarks.java
-
Gabriel Copat authored
Merge branch '68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path' into 'main' Resolve "As a user I would like to see a map containing all landmarks for a trail and a suggested path between them, so that I can easily follow the trail" Closes #68 See merge request !40
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
Merge branch 'main' into 68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path # Conflicts: # build.gradle # src/main/resources/data.sql # src/main/resources/schema.sql # src/test/java/Team5/SmartTowns/DataSourceConfig.java # src/test/resources/application.properties
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
Merge branch '70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my' into 'main' Resolve "As a repeat trail visitor , I want to be able to create an account so I can save and review my progress." Closes #49 and #70 See merge request !37
-
Gabriel Copat authored
-
Rhys Evans authored
-
Gabriel Copat authored
-
Rhys Evans authored
-
Gabriel Copat authored
-
Connor Brock authored
Started integrating dropdown menu using CSS, also commented out code causing errors. Will fix when implementing database retrieval.
-
Connor Brock authored
-
- Dec 12, 2023
-
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
-
Gabriel Copat authored
-
Connor Brock authored
Converted QR code scanner into a fragment for later development, also removed in file script tag in index.html and converted to externally call the neccessary function.
-
Connor Brock authored
Added a dynamic Thymeleaf value that updates depending how many items are in the List to a HTML element.
-
Connor Brock authored
Refactored QRScanner code, added a controller to direct to the QRScanner and created a JS button to send the user to the QR url.
-
Connor Brock authored
-
Connor Brock authored
Moved DragonsTale into its own package to as many methods used by this web section were scattered around various other classes.
-
- Dec 11, 2023
-
-
Gabriel Copat authored
Merge remote-tracking branch 'origin/70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my' into 70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my # Conflicts: # src/main/resources/schema.sql
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Rhys Evans authored
-
Gabriel Copat authored
-
Rhys Evans authored
-
- Dec 10, 2023
-
-
Gabriel Copat authored
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 # Conflicts: # build.gradle # src/main/resources/data.sql # src/main/resources/schema.sql
-
Gabriel Copat authored
Merge branch '52-as-a-user-i-would-like-to-see-a-map-of-the-landmarks-so-that-i-can-figure-out-where-to-go' into 'main' Resolve "As a user I would like to see a map of the landmarks, so that I can figure out where to go" Closes #52 See merge request !30
-
Rhys Evans authored
-
- Dec 09, 2023
-
-
Rhys Evans authored
-