Resolve "As a user, I would like a town specific page which shows all trails for that town so that I can easily see my progress" (!34) · Merge requests · Rhys Evans / Team 5

Merged Rhys Evans requested to merge 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can into main 1 year ago

Dec 14, 2023
- removed unwanted system print · 643669a9
  Rhys Evans authored 1 year ago
  
  643669a9
- Merge branch 'main' into... · fdbc6797
  Rhys Evans authored 1 year ago
```
Merge branch 'main' into 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can"

"Merging with main"
```
  fdbc6797
- Final updates to page, added stylesheet adn linking from homepage banners · 3d1c7094
  Rhys Evans authored 1 year ago
  
  3d1c7094
- further styling to dynamic towns page · 80ca37ba
  Rhys Evans authored 1 year ago
  
  80ca37ba
- rough towns trails list complete · 91331444
  Rhys Evans authored 1 year ago
  
  91331444
- Merge branch 'main' into... · 138afcb7
  Rhys Evans authored 1 year ago
```
Merge branch 'main' into 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can

# Conflicts:
#	src/test/java/Team5/SmartTownsOld/placeswithcoordinates/PlacesCoordinatesTest.java
```
  138afcb7
- commiting · 33c726f3
  Rhys Evans authored 1 year ago
  
  33c726f3
- started work on dynamic towns page · 520fd39c
  Rhys Evans authored 1 year ago
  
  520fd39c
- Merge branch 'main' into... · d376e697
  Rhys Evans authored 1 year ago
```
Merge branch 'main' into 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can

# Conflicts:
#	build.gradle
#	src/main/java/Team5/SmartTowns/data/LocationRepository.java
#	src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
#	src/main/java/Team5/SmartTowns/data/TrailsRepository.java
#	src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
```
  d376e697
- commiting to reset · 726b6dbf
  Rhys Evans authored 1 year ago
  
  726b6dbf
- add build.gradle · cc7832b5
  Rhys Evans authored 1 year ago
  
  cc7832b5
- Commiting to merge with main · 7f5ec757
  Rhys Evans authored 1 year ago
  
  7f5ec757
Dec 13, 2023
- Fixed merge conflicts · 52db1c0f
  Rhys Evans authored 1 year ago
  
  52db1c0f
- Commiting to update with main, attmpeted to troubleshoot IntelliJ merge issues with GC,RN · 61db88ee
  Rhys Evans authored 1 year ago
  
  61db88ee
Dec 12, 2023
- Re-implemented data/schema .sql files for more efficient working order i.e. they break less · 6f558f5e
  Rhys Evans authored 1 year ago
  
  6f558f5e
- Commiting while H2 broken before further testing · 10ab2b64
  Rhys Evans authored 1 year ago
  
  10ab2b64
- Junits still a mess, H2 seems most promising · f3ff1178
  Rhys Evans authored 1 year ago
  
  f3ff1178
- Attempting to fix module conflicts, commiting to allow a re-laod · e19fc137
  Rhys Evans authored 1 year ago
  
  e19fc137
Dec 11, 2023
- Further testing of tests. Issues with calling JDBC databse to a test environment · 7da4a777
  Rhys Evans authored 1 year ago
  
  7da4a777
Dec 08, 2023
- Commiting to cehckout main · 518c6b09
  Rhys Evans authored 1 year ago
  
  518c6b09
- commiting before cahngin compiler · 7587d180
  Rhys Evans authored 1 year ago
  
  7587d180
- Further work on debugging :( · 7aff5e43
  Rhys Evans authored 1 year ago
  
  7aff5e43
- Further work on DAO exception dependancy for JUnit · c368545d
  Rhys Evans authored 1 year ago
  
  c368545d
Dec 07, 2023
- adding dao jar, commiting before mistakes happen · e20288a4
  Rhys Evans authored 1 year ago
  
  e20288a4
- Further work attempting to get JUnit test working :( :( :( · 8e3769f5
  Rhys Evans authored 1 year ago
  
  8e3769f5
- Further debugging · 694e717c
  Rhys Evans authored 1 year ago
  
  694e717c
- Further work on getting JUnit test to work · e321e10b
  Rhys Evans authored 1 year ago
  
  e321e10b
- added test, DataAccessException issue · 545d2602
  Rhys Evans authored 1 year ago
  
  545d2602
Dec 06, 2023
- further work · 7dfc96a3
  Rhys Evans authored 1 year ago
  
  7dfc96a3
- Further work. Previous commit - attempting foreign keys · 2fa2e246
  Rhys Evans authored 1 year ago
  
  2fa2e246
- Further work on town mapping · 4d792c5d
  Rhys Evans authored 1 year ago
  
  4d792c5d

Resolve "As a user, I would like a town specific page which shows all trails for that town so that I can easily see my progress"

Merge request reports

Activity