Commit Graph

3607 Commits

Author SHA1 Message Date
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
7711f78ab3 Merged in fix/lint-and-build-error-2025-02-27 (pull request #1429)
fix: remove useless imports and sort them

Approved-by: Linus Flood
Approved-by: Anton Gunnarsson
2025-02-27 08:50:37 +00: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
Fredrik Thorsson
667cab6fb6 Merged in feat/SW-1292-scandic-go-breakfast-information (pull request #1407)
feat/SW-1292-scandic-go-breakfast-information

* feat(SW-1292): display breakfast information for scandic go


Approved-by: Erik Tiekstra
2025-02-26 08:10:33 +00:00
Bianca Widstam
541b91e34c Merged in feat/SW-1281-ancillaries-add-flow (pull request #1399)
Feat/SW-1281 ancillaries add flow

* feat(SW-1546): update design

* feat(SW-1546): show points only if logged in

* feat(SW-1546): always show points

* feat(SW-1281): ancillary add flow initial

* feat(SW-1546): add api call

* feat(SW-1281): refactor naming and break out components

* feat(SW-1281): handle back button

* feat(SW-1281): make mobile cards clickable

* feat(SW-1281): refactor spread ancillaries

* feat(SW-1281): add deliverytimes

* feat(SW-1281): rebase master

* feat(SW-1281): add design for logged in or not

* feat(SW-1281): add design

* feat(SW-1281): add mobile design

* feat(SW-1281): fix carousel

* feat(SW-1281): show deliverytime only if ancillary has not been added

* feat(SW-1281): add design

* feat(SW-1281): add translations

* feat(SW-1281): add translations

* feat(SW-1281): add translations

* feat(SW-1281): base dates on check in date only

* feat(SW-1281): fix show correct toast when no valid data

* feat(SW-1281): hande logic if deliverytime is not required

* feat(SW-1281): fix max width for mobile

* feat(SW-1281): refactor after pr comment


Approved-by: Niclas Edenvin
Approved-by: Linus Flood
2025-02-26 07:20:45 +00:00
Chuma Mcphoy (We Ahead)
341f0c54ed Merged in fix/SW-1733-start-page-enhancements-and-fixes (pull request #1415)
Fix/SW-1733 start page enhancements and fixes

* fix: simplify carousel navigation and grid layout styling and fix padding issue

* refactor(SW-1733): replace Preamble with Body component in JoinScandicFriends

* refactor(SW-1733): update FullWidthCampaign button width styling

* feat(SW-1733): Add gradient overlay to FullWidthCampaign component

* refactor(SW-1733): Simplify FullWidthCampaign button props

* refactor(SW-1733): Remove redundant button wrapper divs in FullWidthCampaign

* refactor(SW-1733): Adjust FullWidthCampaign button wrapper min-width responsively


Approved-by: Christian Andolf
2025-02-25 16:41:02 +00:00
Michael Zetterberg
6908cee0c5 fix: search params passed to Link overrides current search params
This changes the behavior of Link prop `keepSearchParams`. Previously it got
implicitly merged. Now, any search params in the given `href` prop to Link will
override any current search params available on the current page.

Handle the merging use case (if there is any) in the components that passes the
href to render Link.
2025-02-25 16:07:27 +01:00
Erik Tiekstra
bc50dcf286 Merged in fix/SW-1754-overview-page-rate-limit (pull request #1412)
fix(SW-1754): Fix rate limit issue on Destination Overview Page

* fix(SW-1754): Fix rate limit issue on Destination Overview Page


Approved-by: Matilda Landström
2025-02-25 14:40:31 +00:00
Erik Tiekstra
3867baadd6 Merged in feat/SW-1452-city-page-filter-2 (pull request #1392)
feat(SW-1452): Added filtering and sorting to destination city pages

* feat(SW-1452): Added filtering and sorting to destination city pages

* feat(SW-1452): Added temporary component for country pages to avoid Context issues


Approved-by: Matilda Landström
2025-02-25 13:02:38 +00:00
Linus Flood
8a564274c5 Merged in fix/bookingwidget-skeleton (pull request #1409)
fix: bookingwidget skeleton - hide if not enabled

* fix: bookingwidget skeleton - hide if not enabled


Approved-by: Michael Zetterberg
2025-02-25 12:46:18 +00:00
Tobias Johansson
27d587965a Merged in fix/SW-1604-member-price-popup (pull request #1400)
fix: dont show member price modal if user is logged in

* fix: dont show member price modal if user is logged in


Approved-by: Michael Zetterberg
2025-02-25 12:23:05 +00:00
Linus Flood
75a4219f31 Merged in fix/children-availability-fix-2 (pull request #1406)
fix: availability - correct children string

* fix: availability - correct children string


Approved-by: Hrishikesh Vaipurkar
2025-02-25 11:17:32 +00:00
Michael Zetterberg
48f20e0f6b feat(SW-1389): remove placeholder for booking widget on Start page template 2025-02-25 10:37:32 +00:00
Michael Zetterberg
82ba219e2b feat(SW-1389): refactor page settings 2025-02-25 10:37:32 +00:00
Simon.Emanuelsson
504fe7cb99 Merged in feat/SW-1599 (pull request #1385)
Feat/SW-1599

Approved-by: Tobias Johansson
2025-02-25 10:36:13 +00:00
Fredrik Thorsson
f4234334be Merged in feat/SW-1630-implement-mobile-tablet-design (pull request #1395)
Feat/SW-1630 implement mobile tablet design

* feat(SW-1630): add mobile and tablet design

* feat(SW-1630): adjust zoom buttons

* feat(SW-1630): css changes

* feat(SW-1630): modify breakpoints


Approved-by: Erik Tiekstra
2025-02-25 10:10:20 +00:00
Simon Emanuelsson
4c23700d52 feat: adjust select rate ui to latest design 2025-02-25 10:45:45 +01:00
Simon.Emanuelsson
2c72957dc6 Merged in feat/SW-966 (pull request #1361)
feat: show both prices for multiroom room 2-4 on all users

Approved-by: Michael Zetterberg
2025-02-25 09:44:21 +00:00
Simon Emanuelsson
b536c51889 feat: show both prices for multiroom room 2-4 on all users 2025-02-25 09:58:11 +01:00
Tobias Johansson
3b63223778 Merged in fix/SW-546-dob-cut-off (pull request #1403)
fix: overflow problem with dob inputs in enter details

* fix: overflow problem with dob inputs in enter details


Approved-by: Simon.Emanuelsson
2025-02-25 08:41:00 +00:00
Linus Flood
e2749f5593 Merged in feat/refactor-select-rate (pull request #1402)
Select-rate: refactor - converted RoomsContainer into a client component

* feat/select-rate - refactor and fixed duplicate key warning

* Rooms as client component

* Fixed lang in input

* It works

* Cleanup

* Cleanup

* PR fixes


Approved-by: Joakim Jäderberg
2025-02-25 08:40:36 +00:00
Arvid Norlin
cf3268bda3 Merged in feat/SW-910-membershipnumber-non-happy-path (pull request #1358)
fix(SW-910): handle MembershipFailedError

* fix(SW-910): handle MembershipFailedError


Approved-by: Tobias Johansson
2025-02-24 15:55:31 +00:00
Linus Flood
c0cfa342cc Merged in hotfix/remove-membership-cards (pull request #1398)
hotfix: removed membership cards component

* hotfix: removed membership cards component


Approved-by: Bianca Widstam
2025-02-24 13:17:52 +00:00
Matilda Landström
59950678f3 Merged in feat/SW-1234-hotel-subpages (pull request #1387)
Feat(SW-1234): Prettify hotel subpages

Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-24 12:44:00 +00:00
Pontus Dreij
76cd1945c4 Merged in feat(SW-1677)-my-stay-update-contact-user (pull request #1386)
Feat(SW-1677) my stay update contact user

* feat(SW-1677): Hide membersettings that doesnt match the booking

* feat(SW-1677) Edit my stay contact details as user


Approved-by: Linus Flood
2025-02-24 11:31:19 +00:00
Matilda Landström
49aaca9d28 Merged in fix/remove-translated-slugs (pull request #1390)
Fix(SW-1467): Remove translation of hotel page sidepeek slugs

* fix(SW-1467): remove translation of sidepeek slugs

* fix: update enums


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-24 09:09:07 +00:00
Matilda Landström
dda236aa82 Merged in feat/SW-1469-facility-cards (pull request #1393)
Feat(SW-1469): Add check if we should create facility cards

* fix(SW-1469): only create facility cards if supposed to


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-24 08:19:26 +00:00
Christian Andolf
ec00a598d2 Merged in fix/LOY-137-fetch-surprises-client (pull request #1363)
fix(LOY-137): now fetches surprises client side in intervals

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-21 14:59:56 +00:00
Christian Andolf
0ba71f205d fix(LOY-137): now fetches surprises client side in intervals 2025-02-21 15:37:59 +01:00
Linus Flood
a55737617c Merged in fix/pageloadtime-tracking (pull request #1391)
Revert pageloadtime tracking

* Revert pageloadtime tracking


Approved-by: Joakim Jäderberg
2025-02-21 14:34:17 +00:00
Anton Gunnarsson
204bbbbcd4 Merged in fix/sas-link-flow-links (pull request #1389)
Set correct links in SAS link flow

Approved-by: Joakim Jäderberg
2025-02-21 12:26:38 +00:00
Linus Flood
15dbeb9d46 Merged in feat/mypages-parallel-routes (pull request #1388)
feat: my profile - removed all parallel routes

* Removed all parallel routes on my-profile

* Fixed suspense

* Moved components into myprofile folder

* Turn off browser cache on myprofile

* Clear router cache when editing profile

* Clear route cache when adding new credit card

* PR fixes


Approved-by: Joakim Jäderberg
2025-02-21 11:24:46 +00:00
Niclas Edenvin
9cd648fd65 Merged in feat/sw-1513-anchoring-on-enter-details (pull request #1379)
feat(SW-1513): scroll to new section on enter details page

* feat(SW-1513): scroll to new section on enter details page


Approved-by: Simon.Emanuelsson
2025-02-21 09:13:29 +00:00
Pontus Dreij
a0286603db Merged in feat(SW-1275)-cancel-booking-my-stay (pull request #1376)
Feat(SW-1275) cancel booking my stay

* feat(SW-1276) UI implementation Desktop part 1 for MyStay

* feat(SW-1276) UI implementation Desktop part 2 for MyStay

* feat(SW-1276) UI implementation Mobile part 1 for MyStay

* refactor: move files from MyStay/MyStay to MyStay

* feat(SW-1276) Sidepeek implementation

* feat(SW-1276): Refactoring

* feat(SW-1276) UI implementation Mobile part 2 for MyStay

* feat(SW-1276): translations

* feat(SW-1276) fixed skeleton

* feat(SW-1276): Added missing translations

* feat(SW-1276) fixed translations

* feat(SW-1275) cancel modal

* feat(SW-1275): Mutate cancel booking

* feat(SW-1275) added translations

* feat(SW-1275) match current cancellationReason

* feat(SW-1275) Added modal for manage stay

* feat(SW-1275) Added missing icon

* feat(SW-1275) New Dont cancel button

* feat(SW-1275) Added preperation for Cancellation number

* feat(SW-1275): added --modal-box-shadow

* feat(SW-1718) Add to calendar

* feat(SW-1718) general add to calendar


Approved-by: Niclas Edenvin
2025-02-21 09:06:15 +00:00
Matilda Landström
8ed521de3f Merged in fix/SW-1693-subpage-check (pull request #1373)
Fix(SW-1693): Don't render hotel subpages if not supposed to

* fix(SW-1693): don't render hotel subpage if not supposed to


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-21 08:20:30 +00:00
Anton Gunnarsson
340f6d1714 Merged in feat/SW-1488-unlink-sas-account (pull request #1349)
Implement unlink SAS flow

Approved-by: Joakim Jäderberg
2025-02-20 15:09:06 +00:00
Chuma Mcphoy (We Ahead)
fc720b1dbc Merged in fix/carousel-tablet-scroll-behaviour (pull request #1382)
feat(SW-1699): Update Carousel component alignment to start

* feat(SW-1699): Update Carousel component alignment to start


Approved-by: Christian Andolf
2025-02-20 15:04:13 +00:00
Chuma Mcphoy (We Ahead)
6e12756ab5 Merged in fix/SW-1697-BAP-text (pull request #1384)
feat(SW-1697): more tilted scripted text for FullWidthCampaign component

* feat(SW-1697): more tilted scripted text for FullWidthCampaign component

* feat(SW-1697): add text transform to FullWidthCampaign title


Approved-by: Christian Andolf
2025-02-20 14:57:05 +00:00