Commit Graph

5056 Commits

Author SHA1 Message Date
Linus Flood ff8a1b836c Fix merge issues 2024-11-20 13:44:34 +01:00
Linus Flood ec53457fd1 Merge branch 'master' into feat/sw-929-release-preps 2024-11-20 13:28:02 +01:00
Linus Flood 5624348b69 Merge branch 'feat/sw-929-release-preps' of bitbucket.org:scandic-swap/web into feat/sw-929-release-preps 2024-11-20 13:24:06 +01:00
Joakim Jäderberg 3d2f9e4a7e fix: rename misnamed component 2024-11-20 13:09:37 +01:00
Linus Flood ea325796e3 feat: sw-929 show booking widget on hotelreservation path and separate env for sitewide alerts 2024-11-20 12:00:01 +00: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
Linus Flood 9f982dcea6 feat: sw-929 show booking widget on hotelreservation path and separate env for sitewide alerts 2024-11-20 12:40:23 +01:00
Joakim Jäderberg 847ee5521e fix: use suspense over loading.tsx 2024-11-20 12:14:56 +01:00
Joakim Jäderberg d32a595e2e feat: contain logic for selecting price at the top level instead of on individual room card 2024-11-20 11:25:11 +01:00
Joakim Jäderberg dfdbdb7621 feat: break apart loading of room availability and hotel card
feat: add skeletons
2024-11-20 10:17:55 +01:00
Joakim Jäderberg b533167044 fix: optimize reward query by fetching loyalty levels concurrently 2024-11-20 08:44:23 +01:00
Joakim Jäderberg 84f2bc4c07 fix: enable force-cache for CurrentFooter and booking widget toggle query 2024-11-20 08:43:55 +01:00
Hrishikesh Vaipurkar 1330c8b537 feat: SW-601 Optimized code 2024-11-19 17:32:43 +01:00
Hrishikesh Vaipurkar cb98f5a907 feat: SW-601 Optimized css 2024-11-19 17:21:11 +01:00
Hrishikesh Vaipurkar ebd60d9789 feat: SW-601 Removed autoclose of map view in desktop 2024-11-19 17:21:11 +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
Chuma McPhoy a68e37c26f fix(SW-898): remove redundant schema and add transform in signupInput 2024-11-19 15:45:00 +01:00
Chuma McPhoy 5c571c3c0c feat(SW-898): add pending ui text to signup button 2024-11-19 15:45:00 +01:00
Chuma McPhoy cfaa92260a chore(SW-898): pr comments 2024-11-19 15:45:00 +01:00
Chuma McPhoy bc5a01fdf4 fix(SW-898): formatting 2024-11-19 15:45:00 +01:00
Chuma McPhoy 6958db3ca5 refactor(SW-898): replace signup server action with TRPC 2024-11-19 15:45:00 +01: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 53e5558ef0 Merged in fix/room-card (pull request #938)
Fix: hide occupancy and roomSize if undefined, and show placeholder image

Approved-by: Niclas Edenvin
2024-11-19 14:38:10 +00:00
Pontus Dreij ab9c8012c9 fix(SW-934): Change logic to isAllUnavailable instad of hotels.length 2024-11-19 15:36:20 +01:00
Bianca Widstam ea3aff5dcd Merged in fix/translation-hotelpage-header (pull request #934)
Fix/SW-932-translation hotelpage header

* fix: add translation for hotel page header

* fix: add hotel translation

* fix: add translation where to when loading

* fix: update hotel(s) count if filtered

* fix(SW-932): update hotel(s) count


Approved-by: Pontus Dreij
Approved-by: Niclas Edenvin
2024-11-19 14:34:45 +00:00
Pontus Dreij 14b1610d4c fix: removed unused code 2024-11-19 15:17:39 +01:00
Pontus Dreij f1bec6619f fix: remove log 2024-11-19 15:11:55 +01:00
Pontus Dreij ef2860dd8e fix: hide occupancy and roomSize if undefined 2024-11-19 15:11:13 +01:00
Christel Westerberg d43c29e394 fix: disable button on not isComplete 2024-11-19 14:10:57 +01:00
Christel Westerberg c2ef7f7074 fix: padding issues 2024-11-19 14:09:50 +01:00
Christel Westerberg 602e7ea2ce fix: handle undefined pricing 2024-11-19 14:09:50 +01:00
Pontus Dreij 7806aa69de Merged in fix/SW-565-rooms-guests-widget-ui (pull request #928)
Fix/SW-565 rooms guests widget ui

Approved-by: Bianca Widstam
2024-11-19 12:51:44 +00:00
Joakim Jäderberg c4caccae5a WIP 2024-11-19 13:40:51 +01:00
Bianca Widstam b7ffc8588d Merged in fix/small-UI-change-select-hotel (pull request #931)
fix: small ui fix hotel card

* fix: small ui fix hotel card


Approved-by: Pontus Dreij
2024-11-19 12:23:06 +00:00
Pontus Dreij e43998e7d0 Merged in feat/SW-913-disable-booking-widget-from-alert (pull request #930)
feat(SW-913): Hide bookingwidget from cms

Approved-by: Christel Westerberg
2024-11-19 12:16:59 +00:00
Pontus Dreij 11cff0ab11 feat(SW-913): Hide bookingwidget from cms 2024-11-19 13:03:42 +01:00
Simon.Emanuelsson d3794055e9 Merged in fix/init-enter-details-flow (pull request #929)
fix: make sure all searchparams are used in redirect

Approved-by: Linus Flood
2024-11-19 11:27:39 +00:00
Simon Emanuelsson 744af22b08 fix: make sure all searchparams are used in redirect 2024-11-19 11:19:44 +00:00
Joakim Jäderberg 75c5c97841 chore: upgrade nextjs@14.2.18 2024-11-19 12:03:49 +01:00
Erik Tiekstra 1b3999a050 fix(SW-769): removed categoryname enum from pointOfInterestSchema and use z.string() instead 2024-11-19 10:58:39 +01:00
Joakim Jäderberg e1a2532b3f fix: use suspense over loading.tsx 2024-11-19 10:57:52 +01:00
Joakim Jäderberg 0c6371d805 wip 2024-11-19 10:52:35 +01:00
Pontus Dreij ebbdecf8d8 fix(SW-565) fix select hight to see its scrollable 2024-11-19 10:34:21 +01:00
Pontus Dreij 94f97dffa9 fix(SW-565): Fixed that tooltip doesn't block anything. 2024-11-19 09:50:08 +01:00
Joakim Jäderberg d0c4a376ce Merge remote-tracking branch 'refs/remotes/origin/fix/loading-rooms-separately' into fix/loading-rooms-separately 2024-11-19 09:44:55 +01:00
Pontus Dreij 3992529535 Merged in fix/SW-917-map-link (pull request #926)
fix(SW-917): fix correct link to  map

Approved-by: Niclas Edenvin
2024-11-19 08:22:43 +00:00
Pontus Dreij 60f1d268a9 Merged in feat/SW-904-add-back-to-top-button (pull request #923)
Feat/SW-904 add back to top button on hotel list page

* feat(SW-904): Added back to top button

* fix: removed alert on hotel listing page

* Remove console.log


Approved-by: Niclas Edenvin
2024-11-19 08:22:03 +00:00
Pontus Dreij cc15dc2dc2 fix(SW-917): fix correct link to map 2024-11-19 09:17:58 +01:00
Joakim Jäderberg 3c8db6ae8b merge 2024-11-19 08:58:40 +01:00