Commit Graph

370 Commits

Author SHA1 Message Date
Linus Flood
3d3c44fd7d Merged in fix/lang-switcher (pull request #1383)
fix: langswitcher - remove check if lang exists since it's handled already

* fix: langswitcher - remove check if lang exists since it's handled already
2025-02-20 10:24:43 +00:00
Joakim Jäderberg
873183ec2f * move setLang() to a root layout
* fix: findLang only returns acceptable languages
* fix: fallback to use header x-lang if we haven't setLang yet
* fix: languageSchema, allow uppercase

Approved-by: Linus Flood
2025-02-19 09:06:37 +00:00
Linus Flood
7c0f9084b6 Merged in feat/refactor-header-footer-sitewidealert (pull request #1374)
Refactor: removed parallel routes for header, footer and sidewidealert. Langswitcher and sidewidealert now client components

* feat - removed parallel routes and made sidepeek and sitewidealerts as client components

* Langswitcher as client component

* Fixed lang switcher for current header

* Passing lang when fetching siteconfig

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Refactor

* Removed dead code

* Show only languages that has translation

* Refetch sitewidealert every 60 seconds

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Removed sidepeek parallel route from my-stay

* Added missing env.var to env.test

* Removed console.log


Approved-by: Joakim Jäderberg
2025-02-19 08:59:24 +00:00
Erik Tiekstra
2781a41110 Merged in feat/SW-1443-card-gallery-destination-overview (pull request #1362)
feat(SW-1443): added cardGallery block to destination overview page instead of carousel functionality

* feat(SW-1443): added cardGallery block to destination overview page instead of carousel functionality


Approved-by: Fredrik Thorsson
2025-02-18 14:42:36 +00:00
Christian Andolf
a192d32f7e feat(LOY-135): change redeem description to be RTE 2025-02-17 15:05:32 +01:00
Joakim Jäderberg
2791f07f67 Merged in fix/mypages-clientside-menu (pull request #1344)
Fix/mypages clientside menu

* feat: move mypages menu to client side

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu

* wip

* wip

* wip

* refactor: reorganize MyPages navigation logic and improve type definitions

* refactor: enhance MyPagesMobileDropdown with loading states and skeletons

* refactor: clean up header component and improve myPagesNavigation query structure

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu


Approved-by: Linus Flood
2025-02-17 07:47:33 +00:00
Chuma Mcphoy (We Ahead)
b2add701e5 Merged in fix/LOY-143-hide-see-all-link (pull request #1341)
fix(LOY-143): properly hide see all link for carosel cards

* fix(LOY-143): Improve link handling in CarouselCards schema


Approved-by: Christian Andolf
2025-02-14 12:19:46 +00:00
Christian Andolf
409ba5bf4c Merged in feat/LOY-134-add-informative-reward-modal (pull request #1307)
feat(LOY-134): display informative rewards and modal

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-13 10:13:35 +00:00
Joakim Jäderberg
6f51130e48 Merged in feature/hardcoded-mypages-links (pull request #1325)
Feature/hardcoded mypages links

* feat: wip use hardcoded links

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/hardcoded-mypages-links

* feat: use hardcoded links for my pages to support dynamic links

* cleanup

* code fixes

* refactor: restructure MyPagesMobileDropdown component for improved readability

* use util timeout function


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-02-13 09:28:30 +00:00
Christian Andolf
509c83868d feat(LOY-134): display informative rewards and modal 2025-02-13 10:16:02 +01:00
Erik Tiekstra
1532898c23 Merged in feat/SW-1457-city-dynamic-map (pull request #1320)
feat(SW-1457): Added map and fetching hotels by cityIdentifier

* feat(SW-1457): Added map and fetching hotels by cityIdentifier


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-12 13:02:19 +00:00
Erik Tiekstra
bcfa84324f Merged in feat/SW-1456-country-dynamic-map (pull request #1310)
feat(SW-1456): Added map and fetching hotels by country

* feat(SW-1456): Added map and fetching hotels by country


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-12 09:15:33 +00:00
Matilda Landström
f43ee4a0e6 Merged in feat/SW-1430-cta-button (pull request #1290)
Feat(SW-1430): Add header button on static pages

Approved-by: Erik Tiekstra
2025-02-11 14:10:13 +00:00
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
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
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
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
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
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
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
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
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
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
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
Erik Tiekstra
bf76c6277f Merged in feat/support-for-all-page-links (pull request #1212)
Feat/support for all page links

* feat: added all page link connections to queries

* feat: updated output files


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-01-27 11:21:37 +00:00
Christian Andolf
3579ada786 Merged in feat/SW-1388-startpage-header (pull request #1203)
feat(SW-1388): add hero image and heading to startpage

* feat(SW-1388): add hero image and heading to startpage

* fix(SW-1388): spacing variables for padding

* fix(SW-1388): use inset value instead


Approved-by: Erik Tiekstra
2025-01-24 13:04:19 +00:00
Erik Tiekstra
a88a033e30 Merged in feat/SW-1450-destination-page-cs-components (pull request #1204)
feat(SW-1450): added components in destination pages from cs

* feat(SW-1450): added components in destination pages from cs

* feat(SW-1450): added correct refs and removed classNames


Approved-by: Fredrik Thorsson
2025-01-24 12:06:43 +00:00
Christian Andolf
127bb6a0a7 Merged in feat/SW-1381-new-startpage-page (pull request #1197)
feat(SW-1381): add initial start page

* feat(SW-1381): add initial start page

* fix: remove unused startpage template

remove translation key for middleware error page

* fix(SW-1381): add tracking SDK and feature flag to hide start page


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-01-23 10:18:21 +00:00