Commit Graph

1947 Commits

Author SHA1 Message Date
Pontus Dreij
69139c5230 Merged in feat(SW-1279)-mystay-multirum-cancelling (pull request #1443)
Feat(SW-1279) mystay multirum cancelling

* feat(SW-1279) Cancelation text if non-user on room 2-4

* feat(SW-1279) cancel mystay multiroom

* feat(SW-1279): Added cancellation for multiroom on mystay


Approved-by: Niclas Edenvin
2025-02-28 07:17:25 +00:00
Erik Tiekstra
bee6c6d83a Merged in feat/SW-1451-country-page-sorting (pull request #1426)
Feat/SW-1451 country page filtering and sorting

* feat(SW-1451): implemented sorting and filtering on country pages

* feat(SW-1451): Renamed hotel-data to destination-data because of its multi-purpose use

* feat(SW-1451): Now filtering after change of url instead of inside the store after submit


Approved-by: Fredrik Thorsson
2025-02-28 06:30:16 +00:00
Niclas Edenvin
747201b0f7 Merged in feat/SW-1282-list-added-ancillaries (pull request #1416)
Feat/SW-1282 list added ancillaries

* feat(sw-1282): add icon to accordionItem

* feat(sw-1282): list added ancillaries

* Change translation key to already existing

* Remove duplicate key

* Move new files to the new folder structure


Approved-by: Pontus Dreij
2025-02-27 22:01:11 +00:00
Linus Flood
427cc10edc Merged in fix/gla-remove-unused-prop (pull request #1427)
fix: guarantee for late arrival prop removed

* fix: guarantee for late arrival prop removed

* Merge master

* Revert typecheck fix


Approved-by: Michael Zetterberg
2025-02-27 16:18:42 +00:00
Fredrik Thorsson
03954dde90 Merged in fix/menu-links-icon-color (pull request #1442)
fix: correct color for icon

* fix: correct color for icon


Approved-by: Matilda Landström
2025-02-27 15:10:30 +00:00
Erik Tiekstra
f9f55ca0bf Merged in fix/SW-1441-sidepeek-z-index (pull request #1437)
fix(SW-1441): fixed issue with z-index on sidepeeks inside teaserCards

* fix(SW-1441): fixed issue with z-index on sidepeeks inside teaserCards


Approved-by: Fredrik Thorsson
2025-02-27 14:56:10 +00:00
Fredrik Thorsson
bda22f39ad Merged in feat/SW-1740-final-design-subpages (pull request #1435)
feat/SW-1740 final design subpages

* feat(SW-1740): update design for subpages

* feat(SW-1740): add padding

* feat(SW-1740): use not pseudo class


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
2025-02-27 14:40:21 +00:00
Chuma Mcphoy (We Ahead)
8061ab63a8 Merged in feat/LOY-158-signup-with-existing-email-error-handling (pull request #1441)
Feat/LOY-158 signup with existing email error handling

* feat(LOY-158): Add handling for email conflict during signup

- Implement specific error handling for email conflict in signup form
- Add localized error message for existing email accounts across language dictionaries
- Introduce new error type `conflictError` in trpc error handling

* fix(LOY-158): revert translation changes

* fix(LOY-158): Correct Finnish translation for cancellation message


Approved-by: Christian Andolf
2025-02-27 14:30:03 +00:00
Erik Tiekstra
af7c5853db Merged in fix/SW-1742-navigation-on-mobile (pull request #1436)
fix(SW-1742): fixed issue where mobile menu is not closed when clicking on a link

* fix(SW-1742): fixed issue where mobile menu is not closed when clicking on a link


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-27 14:20:47 +00:00
Hrishikesh Vaipurkar
6e9123aca9 feat: SW-1588 Fixed rebase issues 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
7fe217826d feat: SW-1588 Optimized review comments 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
2a51107500 feat: SW-1588 Optimized rate title 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
7541c74038 feat: SW-1588 Update as per review comments 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
bf5ce25089 feat: SW-1588 Fixed same key error 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
cd96aa2c94 feat: SW-1588 Fixed undefined handling 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
8b53ed3301 feat: SW-1588 Optimized code & comments 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
b0f6fa7e45 feat: SW-1588 Fix after rebase 2025-02-27 13:10:04 +00:00
Hrishikesh Vaipurkar
71eac4e8ba feat: SW-1588 Optimized as per review comments 2025-02-27 13:10:04 +00:00
Hrishikesh Vaipurkar
fef31237c8 feat: SW-1588 Updated rate selection 2025-02-27 13:10:04 +00:00
Hrishikesh Vaipurkar
a7443e5750 feat: SW-1588 No booking code search results UX 2025-02-27 13:10:04 +00:00
Hrishikesh Vaipurkar
8966e56820 feat: SW-1588 Implemented booking code select-rate 2025-02-27 13:10:04 +00:00
Tobias Johansson
832b6c27e0 Merged in fix/SW-1715-price-details-with-many-rooms (pull request #1421)
Fix/SW-1715 price details with many rooms

* fix: added useMemo to stop combineRoomAvailabilities from rerunning

* fix: add max height and scroll to modal content

* fix: return new array in combineRoomAvailabilities instead of pushing


Approved-by: Christian Andolf
2025-02-27 12:55:07 +00:00
Joakim Jäderberg
92b81ab8e7 Merged in fix/ci-build (pull request #1434)
Fix/ci build

* fix: use explicit ci:build command since pre-scripts don't work in yarn

* fix: don't remove .next-folder on dev

* revert change to netlify.toml


Approved-by: Anton Gunnarsson
2025-02-27 11:55:51 +00:00
Matilda Landström
e131add264 Merged in fix/translations-feedback (pull request #1430)
fix: correct translation

* fix: correct translation


Approved-by: Christian Andolf
Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-27 10:51:34 +00:00
Linus Flood
f59090936e Merged in fix/teasercard-image-fill (pull request #1425)
feat:teasercard - image fill fix

* feat:teasercard - image fill fix


Approved-by: Erik Tiekstra
2025-02-27 10:12:29 +00:00
Linus Flood
58b2957b81 Merged in fix/SW-1513-enter-details-scroll-issue (pull request #1433)
feat:enterdetails - fixed scroll achoring issue #sw-1513

* feat:enterdetails - fixed scroll achoring issue #sw-1513


Approved-by: Niclas Edenvin
2025-02-27 09:49:18 +00:00
Joakim Jäderberg
f885760608 Merged in fix/lint-staged (pull request #1432)
fix: lint staged

* fix: lint staged


Approved-by: Christian Andolf
Approved-by: Anton Gunnarsson
2025-02-27 09:42:26 +00:00
Christian Andolf
5d7815bd28 Merged in feat/SW-1273-find-my-booking-page (pull request #1414)
feat(SW-1273): find my booking page with rudimentary validation and redirect

Approved-by: Michael Zetterberg
Approved-by: Chuma Mcphoy (We Ahead)
2025-02-27 09:17:15 +00:00
Arvid Norlin
2813dc6f84 Merged in fix/linkedReservation-typings (pull request #1431)
fix: linkedReservation typings

* fix: correct rinkedReservation typings


Approved-by: Christian Andolf
Approved-by: Simon.Emanuelsson
2025-02-27 09:10:13 +00:00
Tobias Johansson
b3cd907584 Merged in fix/SW-1645-price-details-popup-missing-data (pull request #1413)
fix(SW-1645): added room features to price detail popup

* fix(SW-1645): added room features to price detail popup


Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-02-27 09:06:59 +00:00
Tobias Johansson
895dce2f72 Merged in fix/SW-1686-show-correct-room-number (pull request #1417)
fix(SW-1686): display total rooms and available rooms when filtering

* fix(SW-1686): display total rooms and available rooms when filtering


Approved-by: Arvid Norlin
Approved-by: Simon.Emanuelsson
2025-02-27 09:06:22 +00:00
Christian Andolf
7a8b926f0a fix(SW-1273): update customer service info with link instead of phone number 2025-02-27 09:57:18 +01:00
Christian Andolf
8f17622f21 fix(SW-1273): move find my booking page to the correct folder after monorepo migration 2025-02-27 09:57:18 +01:00
Christian Andolf
7d3c0c96e3 refactor(SW-1273): move find my booking routes in order to import them directly into next config 2025-02-27 09:57:18 +01:00
Christian Andolf
51f71383d4 fix(SW-1273): usage of Link component
move getLang further down the render to reduce CPU cycles

swap to min-width on button to compensate larger strings

remove useless async declaration
2025-02-27 09:57:18 +01:00
Christian Andolf
85cd815968 feat(SW-1273): find my booking page with rudimentary validation and redirect 2025-02-27 09:57:17 +01:00
Christian Andolf
0c1396f2ee fix: remove useless imports and sort them
add missing key in iterator
2025-02-27 09:43:57 +01:00
Joakim Jäderberg
082a162257 Merged in fix/pinned-yarn-version (pull request #1428)
fix: different packageManager versions in different package.json's caused issues when installing

* fix: different packageManager versions in different package.json's caused issues when installing

* fix: build error


Approved-by: Anton Gunnarsson
2025-02-27 08:41:34 +00:00
Pontus Dreij
31a536b1f7 Merged in feat(SW-1722)-mystay-multiroom-view (pull request #1396)
Feat(SW-1722) mystay multiroom view

* feat(SW-1722) View all rooms on my stay

* feat(sW-1722) Show linked reservation

* feat(SW-1722) merged monorepo

* feat(SW-1722) yarn install

* feat(SW-1722) removed unused data

* feat(SW-1722) Streaming data from the server to the client


Approved-by: Niclas Edenvin
2025-02-27 07:24:56 +00:00
Linus Flood
0c498d82ca Merged in feat/trackingsdk-client (pull request #1420)
feat: trackingsdk as client component

* feat: trackingsdk as client component

* Cleanup

* Merge changes from feat/trackingsdk-client

* revert yarn.lock

* Added lcpTime and wait with tracking until we have the values


Approved-by: Joakim Jäderberg
2025-02-27 07:22:58 +00:00
Matilda Landström
d995dcf0aa Merged in fix/destination-overview-page (pull request #1423)
fix: typo

* fix: typo


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-27 06:31:02 +00:00
Arvid Norlin
eb74ea6939 Merged in fix/missing-confirmation-page-room-titles (pull request #1424)
fix: add missing room titles

* fix: add missing room titles


Approved-by: Tobias Johansson
2025-02-26 15:25:53 +00:00
Michael Zetterberg
43c25aea95 fix: improve handling of booking widget params from search params
now we are defensive in parsing the location
if parsing fails the not found is now displayed
2025-02-26 13:55:30 +01:00
Anton Gunnarsson
15fa01cbb2 Merged in fix/unpin-zod-version (pull request #1419)
Unpin zod version

Approved-by: Linus Flood
2025-02-26 12:46:26 +00:00
Arvid Norlin
d5e5b9a526 Merged in feat/SW-1652-confirmation-page-multiroom (pull request #1404)
feat(SW-1652): Fetching additional rooms on confirmation page

* feat(SW-1652): Fetching additional rooms on confirmation page


Approved-by: Tobias Johansson
2025-02-26 12:42:54 +00:00
Linus Flood
a15936688b Merged in feat/breadcrumb-cache (pull request #1418)
feat:breadcrumbs - cache them

* feat:breadcrumbs - cache them


Approved-by: Anton Gunnarsson
2025-02-26 11:42:14 +00:00
Anton Gunnarsson
80100e7631 Merged in monorepo-step-1 (pull request #1080)
Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood
2025-02-26 10:36:17 +00:00