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

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.

Sprint 1 done

See merge request !27

update footer style

See merge request !26

Login page done

See merge request !25

Backend login

See merge request !24

# Conflicts:
#	FrontendFolder/switch-room/src/router/index.ts

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

Story 31 ju yu

See merge request !22

Login page UI  + register Done, going to do backend

See merge request !21

# Conflicts:
#   FrontendFolder/switch-room/src/services/ServerHttpService.ts

# Conflicts:
#	.idea/workspace.xml
#	FrontendFolder/switch-room/package-lock.json

WishlistPage related basic service done.

See merge request !19

Merge branch 'LoginPage' into 'sprint_1_offer_wishlist_page' into "Sprint_1"

See merge request !17

Login page to sprint_1_offer_wishlist_page

See merge request !16

Offer page frontend + backend + DB connection done

See merge request !14