Commit Graph

95 Commits

Author SHA1 Message Date
Linus Flood
1116bdafa8 Merged in fix/suspense-key (pull request #1356)
feat: suspense key - use json-stable-stringify for suspense key

* feat: suspense key - use json-stable-stringify for suspense key


Approved-by: Joakim Jäderberg
2025-02-17 09:42:54 +00:00
Hrishikesh Vaipurkar
eabe45b73c Merged in feat/SW-1557-implement-booking-code-select (pull request #1304)
feat: SW-1577 Implemented booking code city search

* feat: SW-1577 Implemented booking code city search

* feat: SW-1557 Strict comparison

* feat: SW-1557 Review comments fix


Approved-by: Michael Zetterberg
Approved-by: Pontus Dreij
2025-02-13 09:24:47 +00:00
Linus Flood
c0f5c0278b Merged in feat/skeletons-and-cache (pull request #1273)
feat: skeleton key bullet proof. 10 min cache on city search response

* feat: skeleton key bullet proof. 10 min cache on city search response

* Refactor server.ts


Approved-by: Michael Zetterberg
2025-02-07 07:02:53 +00:00
Linus Flood
9ad8d39712 Merged in fix/hotelreservation-skeletons (pull request #1270)
fix: skeletons in hotelreservation key includes all search params

* fix: skeletons in hotelreservation key includes all search params


Approved-by: Joakim Jäderberg
2025-02-06 13:30:18 +00:00
Simon Emanuelsson
1deab000bd fix: cache hotel response 2025-01-30 13:51:47 +01:00
Simon Emanuelsson
13a164242f fix: clean up hotel and its typings 2025-01-30 13:50:02 +01:00
Niclas Edenvin
ef22fc4627 This creates the alternative hotels page. It is mostly a copy of the select hotel page, and most of the contents of the pages lives under the same component in /components.
Merged in feat/sw-397-alternative-hotels (pull request #1211)

Feat/sw 397 alternative hotels

* fix(SW-397): create alternative hotels page

* update types

* Adapt to new changes for fetching data

* Make bookingcode optional

* Code review fixes


Approved-by: Simon.Emanuelsson
2025-01-28 12:08:40 +00:00
Pontus Dreij
7343d873c2 Merged in fix/SW-1103-page-loading (pull request #1181)
Fix/SW-1103 page loading

* feat(SW-1103): Move backend req behinde suspense

* fix/SW-1103 fix merge conflicts


Approved-by: Joakim Jäderberg
2025-01-24 10:16:30 +00:00
Christel Westerberg
bcae63e3fc fix: rename children to childrenInRoom 2025-01-14 12:25:17 +01:00
Christel Westerberg
b2935114e3 refactor: url management in hotel reservation flow 2025-01-14 11:09:42 +01:00
Linus Flood
f91d74294e Merge remote-tracking branch 'origin' into feature/tracking 2024-12-16 09:11:28 +01:00
Pontus Dreij
78bf7ef387 fixed issue where city and hotel is undefined or null 2024-12-13 13:57:44 +01:00
Pontus Dreij
20cbb4b0a0 Fix: Merging issues 2024-12-13 12:19:47 +01:00
Pontus Dreij
50fc8a183c Fix: created util to handle searchParams for hotelreservation 2024-12-13 12:19:47 +01:00
Linus Flood
742a2820d1 Merge remote-tracking branch 'origin' into feature/tracking 2024-12-13 09:02:37 +01:00
Pontus Dreij
b0969bcc9f fix(SW-1143) trigger Suspense 2024-12-12 15:13:59 +01:00
Pontus Dreij
197c65d618 fix(SW-1143) Trigger Suspense on more params 2024-12-12 15:12:59 +01:00
Christian Andolf
e08e960209 chore: add consistent type imports 2024-12-12 11:47:44 +01:00
Pontus Dreij
a7b193c96d fix(SW-1143) removed async from fallback 2024-12-10 15:02:14 +01:00
Pontus Dreij
d4e4c4a0d0 fix(SW-1143): Added loading/skeleton to select hotel 2024-12-10 13:40:55 +01:00
Pontus Dreij
f8d10d7b8c fix(SW-1111) fix filter button and filter flimmer in mobile 2024-12-10 09:30:58 +01:00
Pontus Dreij
7f50d34431 fix(SW-1111) Added Loading instead of Suspense 2024-12-09 16:50:02 +01:00
Pontus Dreij
05cd62e339 fix(SW-1111) moved MapContainer 2024-12-09 16:50:02 +01:00
Pontus Dreij
b14a1a7097 feat(SW-1111) Added Suspense on map 2024-12-09 16:50:02 +01:00
Pontus Dreij
69fa5b9b31 fix(SW-1111) Moved map to a page instead of intercepted route 2024-12-09 16:50:02 +01:00
Pontus Dreij
fbfe35aa1b Fix(SW-1111) Added a page to return null to close the map properly 2024-12-09 16:50:02 +01:00
Bianca Widstam
1a4122718e Merged in fix/SW-1117-select-hotel-misalignment (pull request #1047)
fix(SW-1117): fix alignment

Approved-by: Niclas Edenvin
2024-12-09 10:15:28 +00:00
Linus Flood
115d1f0a10 Suspense on <TrackingSDK> 2024-12-06 15:47:34 +01:00
Linus Flood
c3429e2860 Added basic tracking on booking confirmation 2024-12-04 13:22:12 +01:00
Linus Flood
26d44a2c29 Fixed bugs 2024-12-03 08:19:47 +01:00
Linus Flood
4487c25d47 Merge branch 'master' into feature/tracking 2024-12-03 07:48:59 +01:00
Pontus Dreij
f60a77ec26 Removed console log 2024-11-29 14:30:15 +01:00
Pontus Dreij
289d43b326 fix(SW-978): Small fixes 2024-11-29 09:56:25 +01:00
Pontus Dreij
3d78bdd671 fix(SW-978) Checks for null data on hotels 2024-11-29 09:41:24 +01:00
Pontus Dreij
4de3f4717c fix(SW-978): Fallback if no room is selected in URL 2024-11-29 09:38:58 +01:00
Linus Flood
0958c626c6 Age and bed for children 2024-11-29 08:48:39 +01:00
Linus Flood
43b38bf894 Merge master 2024-11-28 13:37:45 +01:00
Linus Flood
3318d31ec8 Fixed map page 2024-11-28 09:09:44 +01:00
Bianca Widstam
8f3d203b70 Merged in fix/SW-1041-design-feedback-select-hotel (pull request #986)
fix(SW-1041): fix UI design feedback

* fix(SW-1041): fix UI design feedback

* fix(SW-1041): small fix

* fix(SW-1041): add filter and sort badge

* fix(SW-1041): update activefilter when entering map view

* fix(SW-1041): create hook with activefilters

* fix(SW-1041): hook only sets filter

* fix(SW-1041): fix padding breadcrumbs

* fix(SW-1041): rename hook

* fix(SW-1041): fix double scroll


Approved-by: Pontus Dreij
Approved-by: Niclas Edenvin
2024-11-28 07:42:52 +00:00
Linus Flood
31540d0d40 Refactor and fixed bug 2024-11-27 19:51:15 +01:00
Pontus Dreij
0ef12d4a29 fix(SW-1014): Fixed issue where google didn't found city. 2024-11-25 15:38:08 +01:00
Linus Flood
6f7a4d263b Merge branch 'master' into feature/tracking 2024-11-25 10:14:12 +01:00
Pontus Dreij
08e71a8dc6 fix(946) Center from town name instead of calculate center 2024-11-21 14:15:51 +01:00
Bianca Widstam
8b66c16e17 Merged in feat/SW-903-breadcrumbs-select-hotel (pull request #924)
Feat/SW-903 breadcrumbs select hotel

* feat(SW-903): break out breadcrumbs component and add on select-hotel page

* feat(903): updated paths

* feat(903): fix padding and remove translations

* feat(903): fix type

* feat(903): refactor padding

* feat(903): refactor padding again

* feat(903): refactor

* feat(903): fix comments

* feat(903): rename content breadcrumbs back


Approved-by: Pontus Dreij
Approved-by: Erik Tiekstra
2024-11-21 07:28:39 +00:00
Linus Flood
0f939d1a19 Merge branch 'master' into feature/tracking 2024-11-21 07:53:58 +01:00
Joakim Jäderberg
90184b8662 Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/syncblocking-parallel-routes 2024-11-20 12:43:41 +01:00
Hrishikesh Vaipurkar
bc344e64cf feat: SW-601 Implement filters and sort in map view 2024-11-19 17:21:11 +01:00
Pontus Dreij
ccf332490f Merged in fix/SW-934-isAllUnavailable (pull request #939)
fix(SW-934): Change logic to isAllUnavailable instad of hotels.length

Approved-by: Bianca Widstam
Approved-by: Niclas Edenvin
2024-11-19 14:58:56 +00:00
Niclas Edenvin
c309619cdc Merged in feat/SW-863-remove-filters (pull request #935)
feat(SW-863): remove filters without a type

* feat(SW-863): remove filters without a type


Approved-by: Pontus Dreij
2024-11-19 14:39:25 +00:00
Pontus Dreij
ab9c8012c9 fix(SW-934): Change logic to isAllUnavailable instad of hotels.length 2024-11-19 15:36:20 +01:00