# 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

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

Add readonly and disabled to offer and wishlist pages so user only allowed to change in certain state

2. polish user controller's codes
3. add an unfinished profile page

Handled Offer and Wishlist item update and deletion change related to match table and waiting table.

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

# Conflicts:
#	FrontendFolder/switch-room/src/components/AppHeader.vue
#	FrontendFolder/switch-room/src/components/MainPage.vue

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

MatchedWishlistRecordModel added a new result field to make sure both offer and wishlist have its own result fields.

Add modify time to offer and wishlist table, added StateCityLookupModel and...

See merge request !28

Add modify time to offer and wishlist table, added StateCityLookupModel and Repository. added StateCodeEnum in utility package

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.