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

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.

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

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

Merge branch '48-as-a-user-i-want-to-see-a-list-of-all-available-towns-with-trails-so-i-can-plan-where-to-go' into 'main'

Resolve "As a user I want to see a list of all available towns with trails so I can plan where to go"

Closes #48

See merge request !20

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

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

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

Closes #32

See merge request !23

 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

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