Commits on Source (63)
-
Rhys Nute authorede634c996
-
Rhys Nute authoredcf741af1
-
Rhys Nute authored8a04aee4
-
Rhys Nute authored5296b67e
-
Rhys Nute authored56c33c55
-
Rhys Nute authored3d96591a
-
Rhys Nute authorede63d275a
-
Rhys Nute authoredf9265540
-
Rhys Evans authored
added initial java files within main.java.Team5.SmartTowns.Towns to follow more dynamic town list in HomePage.html
28a8671b -
Rhys Evans authorede2894055
-
Rhys Nute authoredbacc9723
-
Rhys Nute authoreda1bd0569
-
Rhys Evans authored157545ca
-
Rhys Nute authored264db9d2
-
Gabriel Copat authored6392b610
-
Gabriel Copat authored
Added UserProfile HTML skeleton Added Constructor for User Class
b0250707 -
Rhys Nute authorede9129acb
-
Gabriel Copat authored
User Class and Controller updated to work with page
e7a0ae20 -
Gabriel Copat authored679daf57
-
Gabriel Copat authored
Fized a few bugs with template styling Added default picture for badges
df92660b -
Rhys Nute authored49efe83d
-
Rhys Nute authored1e184fbc
-
Gabriel Copat authored
Finalized the CSS for the UPP Added Default pictur for sticker Added Picture for DragonTrail completion
8ea83b39 -
Rhys Nute authored15f288c0
-
Rhys Nute authored3d3cc9dc
-
Rhys Evans authored
Ready to merge - Database Closes #30 See merge request !16
cd693090 -
Rhys Evans authored
Fixed slight verification issue with form emaila ddress validation and fixed incorrect redirect linik after valid submission
d0df041c -
Rhys Evans authored
Updated table to contain correct table columns with partial Caerphilly location data frome ach avialable trail
b53e998e -
Rhys Evans authoreddbd4a46d
-
Rhys Evans authored
integrated location/landamrk table with landamrk signup form todo: lcoationDEescription constricted by varchar(250), find better way to implement large text
8d75ddba -
Rhys Evans authoredda7b1929
-
Rhys Evans authored
form correctly adds valid submits to locations table, attemnpting to add Java alert to identify correct submission
873e67ac -
Rhys Evans authored
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
5e306287 -
Rhys Evans authoredfc8ff8da
-
Gabriel Copat authored4f60c2f2
-
Gabriel Copat authored41711c35
-
Gabriel Copat authored1442386c
-
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.
6ca9cb39 -
Gabriel Copat authored0bafd3f9
-
Gabriel Copat authored
(Added required database entries and updated HTML/CSS accordingly)
0ea6e994 -
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
bd9eb068 -
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
9d93d25b -
Rhys Evans authored96a515f2
-
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
1f686674 -
Rhys Evans authored3130d192
-
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
1b7263ae -
Rhys Evans authored065d43e4
-
Rhys Evans authored1826d3ce
-
Gabriel Copat authored005eece2
-
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
2a6887f8 -
Gabriel Copat authored0e161cd8
-
Gabriel Copat authoreda60d4488
-
Gabriel Copat authored5cad0626
-
Gabriel Copat authoredc136b7fb
-
Gabriel Copat authoredefc03fa4
-
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
583d6e2e -
Gabriel Copat authored49e39163
-
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
6696b4f3 -
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
72e65142 -
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.
f48ff1dc -
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
f8c5598f
Showing
- build.gradle 4 additions, 2 deletionsbuild.gradle
- identifier.sqlite 0 additions, 0 deletionsidentifier.sqlite
- src/main/java/Team5.Smarttowns/Data/Towns.db 0 additions, 0 deletionssrc/main/java/Team5.Smarttowns/Data/Towns.db
- src/main/java/Team5/SmartTowns/Data/DatabaseController.java 35 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/DatabaseController.java
- src/main/java/Team5/SmartTowns/Data/Location.java 48 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/Location.java
- src/main/java/Team5/SmartTowns/Data/locationRepository.java 12 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/locationRepository.java
- src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java 42 additions, 0 deletions...in/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/Data/trail.java 12 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/trail.java
- src/main/java/Team5/SmartTowns/Data/trailsRepository.java 8 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/trailsRepository.java
- src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java 28 additions, 0 deletions...main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java 8 additions, 4 deletionssrc/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
- src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java 10 additions, 6 deletions.../java/Team5/SmartTowns/Landmarks/LandmarksController.java
- src/main/java/Team5/SmartTowns/Towns/TownController.java 21 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Towns/TownController.java
- src/main/java/Team5/SmartTowns/Towns/TownStorage.java 44 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Towns/TownStorage.java
- src/main/java/Team5/SmartTowns/Towns/Towns.java 62 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Towns/Towns.java
- src/main/java/Team5/SmartTowns/Webpages/WebpageController.java 9 additions, 8 deletions...ain/java/Team5/SmartTowns/Webpages/WebpageController.java
- src/main/java/Team5/SmartTowns/rewards/Badge.java 51 additions, 0 deletionssrc/main/java/Team5/SmartTowns/rewards/Badge.java
- src/main/java/Team5/SmartTowns/rewards/BadgesRepository.java 9 additions, 0 deletionssrc/main/java/Team5/SmartTowns/rewards/BadgesRepository.java
- src/main/java/Team5/SmartTowns/rewards/BadgesRepositoryJDBC.java 33 additions, 0 deletions...n/java/Team5/SmartTowns/rewards/BadgesRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/rewards/RewardsController.java 7 additions, 0 deletions...main/java/Team5/SmartTowns/rewards/RewardsController.java
identifier.sqlite
0 → 100644
src/main/java/Team5.Smarttowns/Data/Towns.db
0 → 100644
File added