Commit Graph

755 Commits

Author SHA1 Message Date
Joakim Jäderberg
3d11cfb50a Merged in feature/sas-mypages (pull request #1302)
Feature/sas mypages

* feat: Add SAS partner page under my pages
* fix: feature toggle SAS Partner page in my pages
* add translations for SAS account page
* use 'flex-start' instead of 'start'
* fix: flatten css
* fix: don't use <SectionContainer /> on linkedAccounts page
2025-02-11 12:55:00 +00:00
Christian Andolf
98e3afe9db Merged in fix/LOY-119-hide-redeemed-rewards (pull request #1292)
fix(LOY-119): hiding redeemed rewards

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-11 12:09:44 +00:00
Fredrik Thorsson
e0996b3464 Merged in feat/SW-1064-restaurant-and-bar-subpage (pull request #1299)
feat/SW-1064 restaurant and bar subpage

* feat(SW-1064): add appendToPath to buttonlink

* feat(SW-1064): add sidebar template

* feat(SW-1064): render pages from nameInUrl

* feat(SW-1064): add content to restaurant sidebar

* feat(SW-1064): change icon size

* feat(SW-1064): move opening hours component

* feat(SW-1064): update switch statement

* feat(SW-1064): fix typo

* feat(SW-1064): rebase

* feat(SW-1064): remove accidentally added file

* feat(SW-1064): undefined check for restaurant subpage


Approved-by: Erik Tiekstra
2025-02-11 12:05:49 +00:00
Erik Tiekstra
ff820d1f31 Merged in feat/SW-1454-listing-skeletons (pull request #1301)
Feat/SW-1454 listing skeletons

* feat(SW-1453): added skeleton for city listning

* feat(SW-1454): added skeleton for hotel listning


Approved-by: Fredrik Thorsson
2025-02-11 12:05:44 +00:00
Christian Andolf
4459d5762c fix(LOY-119): hiding redeemed rewards
some smaller cleanup on coupon property to avoid optional checks
2025-02-11 13:02:29 +01:00
Chuma Mcphoy (We Ahead)
3c4d08a894 Merged in feat/1525-info-card-themes (pull request #1300)
feat(SW-1525): Add theme support for InfoCard component

* feat(1525): Add theme support for InfoCard component

* refactor(1525): Update InfoCard theme typing


Approved-by: Christian Andolf
2025-02-11 10:40:23 +00:00
Anton Gunnarsson
6eb01750e8 Merged in fix/move-sas-comparison-to-dynamic-content (pull request #1279)
Move SASTierComparison block to DynamicContent

Approved-by: Erik Tiekstra
2025-02-11 09:36:41 +00:00
Matilda Landström
ad7402f2e2 Merged in feat/SW-1573-subpage-url (pull request #1297)
Feat(SW-1573): Use pageInUrl for hotel subpages

* feat(SW-1573): use pageInUrl for hotel subpages


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-11 08:27:09 +00:00
Erik Tiekstra
f021c60c2a Merged in feat/SW-1443-carousel-destination-overview-page (pull request #1289)
feat(SW-1443): added carousel block on hotel overview page

* feat(SW-1443): added carousel block on hotel overview page


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-02-11 06:56:38 +00:00
Erik Tiekstra
eb0b88f8ea Merged in feat/SW-1584-destination-content-blocks (pull request #1278)
Feat/SW-1584 destination content blocks

* feat(SW-1584): Added accordion and content blocks to destination city pages

* feat(SW-1584): Added accordion and content blocks to destination country pages


Approved-by: Matilda Landström
2025-02-10 09:28:32 +00:00
Erik Tiekstra
413c197ca0 Merged in feat/SW-1495-hide-alerts-on-hotel-pages (pull request #1268)
feat(SW-1495): removed alerts on hotel pages when displayInBookingFlow is true

* feat(SW-1495): removed alerts on hotel pages when displayInBookingFlow is true


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-10 07:40:38 +00:00
Erik Tiekstra
ce445e3f0b Merged in feat/SW-327-pdf-support (pull request #1276)
feat(SW-327): added support to link to pdf files from CS

* feat(SW-327): added support to link to pdf files from CS


Approved-by: Matilda Landström
2025-02-10 07:26:56 +00:00
Christian Andolf
69d57b73a2 feat(SW-1543): move auth check within component to be suspended 2025-02-07 15:43:51 +01:00
Christian Andolf
ced8dd5d99 fix: startpage blocks now default to an array 2025-02-07 15:43:51 +01:00
Christian Andolf
c622a65a8a feat(SW-1543): join scandic friends block is now hidden for logged in users 2025-02-07 15:43:51 +01:00
Anton Gunnarsson
18288cb849 Merged in feat/sas-otp-error-handling (pull request #1272)
Feat/sas otp error handling

* Improve error handling for SAS OTP
* Remove failing and deprecated test

Approved-by: Joakim Jäderberg
2025-02-07 14:18:00 +00:00
Pontus Dreij
fbe05eb456 Merged in feat/SW-717-multiroom-select-hotel-api (pull request #1225)
Feat/SW-717 multiroom select hotel api
2025-02-07 13:15:07 +00:00
Simon.Emanuelsson
c204532acc Merged in feat/SW-1261 (pull request #1263)
feat: only show member price when logged in

* feat: only show member price when logged in


Approved-by: Michael Zetterberg
2025-02-07 08:51:50 +00:00
Pontus Dreij
e00cea4646 feat(SW-717) use of AvailabilityEnum instead of strings 2025-02-07 08:38:47 +01: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
Christian Andolf
9fafb33d26 Merged in feat/SW-1391-join-scandic-friends-startpage (pull request #1260)
feat(SW-1391): add join scandic friends block

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-06 15:05:06 +00:00
Chuma Mcphoy (We Ahead)
7c8d6cbc2e Merged in feat/SW-1384-filter-functionality (pull request #1262)
feat(SW-1384): Implement filtering for CarouselCards component

* feat(SW-1384): Implement filtering for CarouselCards component

* fix(SW-1384): Simplify CarouselCards filters scrolling styles

* refactor(SW-1384): Simplify CarouselCards filtering logic


Approved-by: Christian Andolf
2025-02-06 14:32:55 +00:00
Christian Andolf
4d63cc57c5 feat(SW-1391): add join scandic friends block 2025-02-06 14:33:37 +01:00
Linus Flood
87820a6f2d Merged in feat/sw-1575-profileId-tracking (pull request #1264)
feat: #sw-1575 using profileId instead of membershipnumber for tracking i userInfo object

* feat: #sw-1575 using profileId instead of membershipnumber for tracking i userInfo object


Approved-by: Erik Tiekstra
2025-02-06 10:02:26 +00:00
Erik Tiekstra
8ecaac4b52 Merged in fix/hotel-faq (pull request #1265)
fix: setting faq section as nullable from CS as CS returns null after import

* fix: setting faq section as nullable from CS as CS returns null after import


Approved-by: Fredrik Thorsson
2025-02-06 09:19:59 +00:00
Joakim Jäderberg
46ebbbba8f Merged in feature/sas-login (pull request #1256)
First steps towards the SAS partnership

* otp flow now pretends to do the linking

* Update LinkAccountForm header

* Update redirect times

* Clean up comments

* Set maxAge on sas cookies

* make all SAS routes protected

* Merge remote-tracking branch 'refs/remotes/origin/feature/sas-login' into feature/sas-login

* Require auth for sas link flow

* Fix resend otp

* Add error support to OneTimePasswordForm

* Add Sentry to SAS error boundary

* Move SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME

* Add missing translations

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/sas-login

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* Add TooManyCodesError component

* Refactor GenericError to support new errors

* Add FailedAttemptsError

* remove removed component <VWOScript/>

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* remove local cookie-bot reference

* Fix sas campaign logo scaling

* feature toggle the SAS stuff

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* fix: use env vars for SAS endpoints


Approved-by: Linus Flood
2025-02-05 14:43:14 +00:00
Erik Tiekstra
e3b1bfc414 Merged in feat/SW-1454-hotel-listing-city-page (pull request #1250)
feat(SW-1454): added hotel listing

* feat(SW-1454): added hotel listing


Approved-by: Fredrik Thorsson
2025-02-05 13:10:28 +00:00
Chuma Mcphoy (We Ahead)
f3e6318d49 Merged in feat/SW-1383-content-card-start-page (pull request #1252)
feat(SW-1383): Implement ContentCard for the Start Page

* feat(SW-1383): Implement ContentCard

- Add ContentCard component
- Use within CarouselCards component

* fix(SW-1383): adjust carousel and content card styling

* refactor(SW-1383): optimize ContentCard component styling and props

* feat(SW-1383): move ContentCard image check out of component

* feat(SW-1383): Add optional link prop to ContentCard component

* refactor(SW-1383): Make ContentCard component linkable


Approved-by: Christian Andolf
Approved-by: Erik Tiekstra
2025-02-05 11:29:53 +00:00
Fredrik Thorsson
a389fba8ce Merged in feat/SW-1067-special-needs-accessibility-page (pull request #1253)
feat/SW-1067 special needs accessibility page

* feat(SW-1067): update types

* feat(SW-1067): add sidebar

* feat(SW-1067): add additional content component

* feat(SW-1067): add special needs list

* feat(SW-1067): update type

* feat(SW-1067): update import

* feat(SW-1067): remove component

* feat(SW-1067): re add component

* feat(SW-1067): update folder structure


Approved-by: Erik Tiekstra
2025-02-05 10:27:26 +00:00
Erik Tiekstra
68f4a5b86d Merged in feat/SW-1199-subpage-breadcrumbs (pull request #1254)
feat(SW-1199): Added breadcrumbs to subpages

* feat(SW-1199): Added breadcrumbs to subpages


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-05 09:53:07 +00:00
Fredrik Thorsson
b85a3a57ec Merged in feat/SW-1444-destination-page-add-destination-list-component (pull request #1240)
feat/SW-1444 destination page add destination list component

* feat(SW-1444): add list component

* feat(SW-1444): add subtitle to accordion

* feat(SW-1444): refactor component structure

* feat(SW-1444): add desktop breakpoint

* feat(SW-1444): fix typo

* feat(SW-1444): add props

* feat(SW-1444): add query

* feat(SW-1444): updated query

* feat(SW-1444): display data

* feat(SW-1444): fix merge hickup

* feat(SW-1444): change var name

* feat(SW-1444): remove unsued translations

* feat(SW-1444): use country as title

* feat(SW-1444): sort hotels in query

* feat(SW-1444): make responsive

* feat(SW-1444): fetch country url

* feat(SW-1444): update logging

* feat(SW-1444): remove spread


Approved-by: Erik Tiekstra
2025-02-04 14:17:12 +00:00
Erik Tiekstra
c4eafa419b Merged in feat/SW-1062-parking-page (pull request #1242)
Feat/SW-1062 parking page

* feat(SW-1062): Added parking sub page


Approved-by: Christian Andolf
Approved-by: Fredrik Thorsson
2025-02-04 11:11:51 +00:00
Chuma Mcphoy (We Ahead)
2e311be924 Merged in feat/SW-1384-filterable-carousel-cards (pull request #1235)
feat(SW-1384): add CarouselCards block to start page

* feat(SW-1384): add filterable carousel cards block to start page

* fix(SW-1384): remove unnecessary link prop from SectionHeader

* fix(SW-1384): remove uneeded undefined

* fix(SW-1384): better type safety

* feat(SW-1384): Add see all link to filterable carousel cards section header

* refactor(SW-1384): Replace FilterableCarouselCards with CarouselCards block

* fix(SW-1384): Remove CardsEnumType type definition

* fix(SW-1384):Implement code review feedback to CarouselCards

* refactor(SW-1384): Convert CarouselCardFilterEnum to const enum with type


Approved-by: Christian Andolf
2025-02-04 10:59:17 +00:00
Matilda Landström
8b475e0ca8 Merged in feat/SW-159-remove-accessibilityElevatorPitchText (pull request #1245)
fix(SW-1553): remove accessibilityElevatorPitchText

* fix(SW-159): remove accessibilityElevatorPitchText


Approved-by: Bianca Widstam
Approved-by: Christian Andolf
Approved-by: Fredrik Thorsson
2025-02-04 10:51:55 +00:00
Linus Flood
1ed1e0a816 Merged in fix/hoteldata-zod-issue (pull request #1246)
fix: zod error on extraPageSchema

* fix: zod error on extraPageSchema


Approved-by: Joakim Jäderberg
2025-02-04 07:47:32 +00:00
Chuma Mcphoy (We Ahead)
09011a2484 Merged in fix/extended-page-link-schema (pull request #1241)
fix: handle optional web property in extended page link schema

* fix: handle optional web property in page link transformation


Approved-by: Christian Andolf
2025-02-03 13:02:13 +00:00
Anton Gunnarsson
fc866c0e4d Merged in feat/sw-1493-revised-comparison-block (pull request #1236)
feat(SW-1493): Revised SAS comparison block

* Base of new TierDetails for SAS tier comparison

* Add backgrounds and content to TierDetails

* Implement new cms schema for SasTierComparison

* Override gap in jsontohtml styling to 0

* Add animations to comparison details

* Redesign again

* Update content model to new design

* Add border to bottom item in tier match list

* Wrap interpolate-size in @supports to be safe

* Merge branch 'master' into feat/sw-1493-revised-comparison-block


Approved-by: Joakim Jäderberg
2025-02-03 08:42:16 +00:00
Chuma Mcphoy (We Ahead)
f9d1736195 Merged in fix/remove-infocardblock-from-content-page (pull request #1238)
fix: remove InfoCardBlock references from Content Page CardsGrid fragment

* fix: remove InfoCardBlock references from CardsGrid fragment


Approved-by: Erik Tiekstra
2025-02-03 07:20:37 +00:00
Erik Tiekstra
b9a3e697be Merged in feat/SW-1521-image-gallery-lightbox (pull request #1226)
Feat/SW-1521 image gallery lightbox

* feat(SW-1453): added city listing component

* feat(SW-1521): added more generic types to ImageGallery and Lightbox components

* feat(SW-1521): added lightbox functionality for top images

* feat(SW-1521): added support for setting activeIndex on open inside Lightbox


Approved-by: Fredrik Thorsson
Approved-by: Chuma Mcphoy (We Ahead)
2025-01-30 13:30:58 +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
Christian Andolf
2f22186d18 fix(SW-1386): transform full width campaign data 2025-01-29 11:39:11 +01:00
Christian Andolf
75ee9933ab fix(SW-1386): add destination page links to graphql schema 2025-01-29 11:39:11 +01:00
Christian Andolf
b0c24d8945 feat(SW-1386): add full width campaign to start page 2025-01-29 11:39:09 +01:00
Chuma Mcphoy (We Ahead)
b57174647f Merged in SW-1382-start-page-offers-section (pull request #1221)
SW-1382 start page offers section

* feat(SW-1382): Add InfoCard component to CardsGrid and StartPage

* feat(SW-1382): Add dynamic image positioning for InfoCard in CardsGrid

* refactor(SW-1382): Update InfoCard data transformation and prop naming

* fix(SW-1382): Add flex display to InfoCard image container


Approved-by: Christian Andolf
Approved-by: Erik Tiekstra
2025-01-29 10:21:33 +00:00
Erik Tiekstra
ca42876eb8 Merged in feat/SW-1453-city-listing-on-country-page (pull request #1222)
feat(SW-1453): added city listing component

* feat(SW-1453): added city listing component


Approved-by: Christian Andolf
Approved-by: Fredrik Thorsson
2025-01-29 10:09:51 +00:00
Tobias Johansson
a7468cd958 Merged in feat/SW-1379-multiroom-summary (pull request #1198)
Feat/SW-1379 multiroom summary

* fix: added early return in hotel query and added missing type annotations

* feat(SW-1379): update summary to support multiple rooms and add tests

* fix: added check for room number when using isMember for member prices

* fix: remove mocked array

* fix: minor bug fixes in rate details popup

* fix: translation key


Approved-by: Pontus Dreij
Approved-by: Arvid Norlin
2025-01-29 09:25:43 +00:00
Matilda Landström
0dee660609 Merged in feat/SW-1207-parking-teaser (pull request #1217)
Feat(SW-1207): Add parking elevator pitch to hotel sidepeek

* feat(SW-1207): Add parking elevator pitch to hotel sidepeek

* fix(SW-1207): remove optional from parking elevator pitch


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-01-28 13:23:47 +00: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
Erik Tiekstra
5b0b82da80 Merged in feat/SW-1450-destination-pages (pull request #1215)
feat(SW-1450): removed country reference from destination city pages

* feat(SW-1450): removed country reference from destination city pages


Approved-by: Fredrik Thorsson
2025-01-27 13:38:02 +00:00