Sprint 2 done (!34) · Merge requests · fz2907 / SwitchRoom

Merged fz2907 requested to merge sprint_2 into main 2 years ago

Nov 13, 2022
- Merge branch 'footer_style' into 'sprint_2' · 19fcca1e
  fz2907 authored 2 years ago
  
  Solve the footer float problem See merge request !33
  19fcca1e
Nov 10, 2022
- Solve the footer float problem · c2ade827
  zhengbo authored 2 years ago
  
  c2ade827
- add flight api json · 29bb4a7c
  fanz8 authored 2 years ago
  
  29bb4a7c
Nov 07, 2022
- Merge branch 'FlightTicket' into 'sprint_2' · a2849571
  fz2907 authored 2 years ago
  
  add flight ticket part See merge request !32
  a2849571
- add flight ticket part · 94565b22
  fanz8 authored 2 years ago
  
  94565b22
- Offer page delete offer item UI change · 37c5b463
  fz2907 authored 2 years ago
  
  37c5b463
Nov 06, 2022
- Merge remote-tracking branch 'origin/notification_bilibili' into sprint_2 · 52fd9bbe
  fz2907 authored 2 years ago
  
  52fd9bbe
- UI change · 42481452
  fz2907 authored 2 years ago
  
  42481452
- update notifications · ec8cae73
  zhengbo authored 2 years ago
  
  ec8cae73
- Fixed login issue · 09297ec5
  fz2907 authored 2 years ago
  
  09297ec5
- Change matchedWishlistRecordRepository.findBy... to findAllBy... · 61e261ee
  fz2907 authored 2 years ago
  
  61e261ee
- Merge remote-tracking branch 'origin/notification_new' into sprint_2 · fea24896
  fz2907 authored 2 years ago
  
  # Conflicts: # BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/MatchedWishlistRecordRepository.java # FrontendFolder/switch-room/src/App.vue # FrontendFolder/switch-room/src/components/AppHeader.vue # FrontendFolder/switch-room/src/components/WishlistPage.vue # FrontendFolder/switch-room/src/router/index.ts
  fea24896
- Merge remote-tracking branch 'origin/matching_service' into sprint_2 · 1b5e51ea
  fz2907 authored 2 years ago
  
  1b5e51ea
- Merge remote-tracking branch 'origin/login_cookie' into sprint_2 · e16ba736
  fz2907 authored 2 years ago
  
  e16ba736
Nov 05, 2022
- new update · 05c460fd
  zhengbo authored 2 years ago
  
  05c460fd
- Offer and Wishlist page match notification UI is ready. · 428a5933
  fz2907 authored 2 years ago
  
  428a5933
- new update · f80beaee
  zhengbo authored 2 years ago
  
  f80beaee
- new update · 7a1bb2c9
  zhengbo authored 2 years ago
  
  7a1bb2c9
- Offer page and Wishlist page are able to fetch the matched records and display... · 7e022205
  fz2907 authored 2 years ago
  
  Offer page and Wishlist page are able to fetch the matched records and display them as list in the UI. Next I need to show number icon on the wishlist cards
  7e022205
- new update · 834be070
  zhengbo authored 2 years ago
  
  834be070
- add a new meta (hideHeader) to decide whether render header in a component · 15e32899
  Bart Chou authored 2 years ago
  
  15e32899
- finish profile · 948de0b7
  Bart Chou authored 2 years ago
  
  948de0b7
- let's go · 567477ee
  zhengbo authored 2 years ago
  
  567477ee
Nov 04, 2022
- Add create, edit and delete button on the wishlist page and tested. · fb9ee85d
  fz2907 authored 2 years ago
  
  Add readonly and disabled to offer and wishlist pages so user only allowed to change in certain state
  fb9ee85d
- Add create, edit and delete button on the offer page and tested. · d5d81e18
  fz2907 authored 2 years ago
  
  d5d81e18
- Add create, edit and delete button on the offer page. · 64ace3a3
  fz2907 authored 2 years ago
  
  64ace3a3
- Removed userId from OfferPageService.ts and WishlistService.ts. Because cookie is ready · e5ccb2c4
  fz2907 authored 2 years ago
  
  e5ccb2c4
- 1. better login cookie · 0cdef91e
  Bart Chou authored 2 years ago
  
  2. polish user controller's codes 3. add an unfinished profile page
  0cdef91e
- Merge remote-tracking branch 'origin/matching_service' into sprint_2 · 6adbd744
  fz2907 authored 2 years ago
  
  6adbd744
Nov 03, 2022
- Handled Offer and Wishlist item update and deletion change related to match... · fbc8bdac
  fz2907 authored 2 years ago
  
  Handled Offer and Wishlist item update and deletion change related to match table and waiting table.
  fbc8bdac
- Optimised the code with parallel stream. · e0b82323
  fz2907 authored 2 years ago
  
  e0b82323
- Optimised the code with parallel stream. · 50acddbd
  fz2907 authored 2 years ago
  
  50acddbd
- Merge branch 'login_cookie' into 'sprint_2' · d0ac7622
  fz2907 authored 2 years ago
  
  now server can create login cookie and client can store cookie in broser. We use userId as token for login cookie for convinence for now. See merge request !29
  d0ac7622
- add reset password page · 5597dbc5
  Bart Chou authored 2 years ago
  
  5597dbc5
Nov 02, 2022
- minor fix in backend · dd9fd04d
  Bart Chou authored 2 years ago
  
  dd9fd04d
- merge after · dc770bbf
  zhengbo authored 2 years ago
  
  dc770bbf
- Merge remote-tracking branch 'origin/sprint_2' into login_cookie · 78c5b444
  zhengbo authored 2 years ago
  
  # Conflicts: # FrontendFolder/switch-room/src/components/AppHeader.vue # FrontendFolder/switch-room/src/components/MainPage.vue
  78c5b444
- Merge branch 'matching_service' into 'sprint_2' · 0684c0af
  fz2907 authored 2 years ago
  
  Matching system is ready for find new matches, but still need to handle the update and delete on offer and Wishlist records See merge request !30
  0684c0af
- MatchedWishlistRecordModel added a new result field to make sure both offer... · 235633c7
  fz2907 authored 2 years ago
  
  MatchedWishlistRecordModel added a new result field to make sure both offer and wishlist have its own result fields.
  235633c7
Nov 01, 2022
- Matching service done, but did not handle record update and delete case. · e3ff3b58
  fz2907 authored 2 years ago
  
  e3ff3b58
- Matching service done, but did not handle record update and delete case. · 0753ab9b
  fz2907 authored 2 years ago
  
  0753ab9b
- Changed java.sql.date to java.util.date. fetch and push to waiting list service done. · b964ea9c
  fz2907 authored 2 years ago
  
  b964ea9c
Oct 31, 2022
- Setup data classes for the matching job · 9277a9b8
  fz2907 authored 2 years ago
  
  9277a9b8
- Merge branch 'matching_service' into 'sprint_2' · a7fe2c17
  fz2907 authored 2 years ago
  
  Add modify time to offer and wishlist table, added StateCityLookupModel and... See merge request !28
  a7fe2c17
- Changed State field to dropdown list · b37de538
  fz2907 authored 2 years ago
  
  b37de538
- New offer, and wishlist models in back end are done · 50e9887b
  fz2907 authored 2 years ago
  
  50e9887b
- Add modify time to offer and wishlist table, added StateCityLookupModel and... · 1fa14cc3
  fz2907 authored 2 years ago
  
  Add modify time to offer and wishlist table, added StateCityLookupModel and Repository. added StateCodeEnum in utility package
  1fa14cc3
Oct 30, 2022
- minor change in cookie expiredTime: 60 sec -> 3600 sec · d6c4052e
  Bart Chou authored 2 years ago
  
  d6c4052e
- now server can create login cookie and client can store cookie in broser. We... · 13c9d2ed
  Bart Chou authored 2 years ago
  
  now server can create login cookie and client can store cookie in broser. We use userId as token for login cookie for convinence for now.
  13c9d2ed
Oct 22, 2022

1. add vuex · 48d2fa2c

Bart Chou authored 2 years ago

2. server return session token with Usermodel after successfully login -> store login status in vuex
3. add log out button -> clear token in localstorage and login status in vuex
4. now we can define each route whether it needs auth (login status) to continue redirecting

48d2fa2c

Sprint 2 done

Merge request reports

Activity