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

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

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

New Login page. Started work on the controllers. Currently one can create account but theres no validation or password checking

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