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

Resolve "As a developer I want all landmarks to be stored together"

Closes #32

See merge request !23

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

Renamed location.class to Location.class for better disinguishment. Followed feedback provided by RN and removed unnecessary locationID variable within Location class

(Added required database entries and updated HTML/CSS accordingly)

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.

cleared code, made addLocations element name easier to distinguish, fixed bug with landamrk form not defaulting to select location/trail disabled selection dropdown option by default

 form correctly adds valid submits to locations table, attemnpting to add Java alert to identify correct submission

integrated location/landamrk table with landamrk signup form todo: lcoationDEescription constricted by varchar(250), find better way to implement large text

 Updated table to contain correct table columns with partial Caerphilly location data frome ach avialable trail

Fixed slight verification issue with form emaila ddress validation and fixed incorrect redirect linik after valid submission

Ready to merge - Database

Closes #30

See merge request !16

Finalized the CSS for the UPP
Added Default pictur for sticker
Added Picture for DragonTrail completion

Fized a few bugs with template styling

Added default picture for badges

User Class and Controller updated to work with page

Added UserProfile HTML skeleton
Added Constructor for User Class

This reverts commit 1055f71d

This reverts commit a4d27051

This reverts commit a4d27051

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."

Closes #46

See merge request !18