scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,567 Commits 1 Branch 0 Tags
f34e88db7c99739a645f9a34d0ef827fc1ab0bb2
Commit Graph

67 Commits

Author SHA1 Message Date
Chuma Mcphoy (We Ahead)
494bfe10f3 Merged in feat/profile-consent-feature-branch (pull request #2900) 
feat(LOY-268): Feature branch for profiling consent work

* feat: Add feature branch for profile and consent work

* Merged in feat/LOY-268-profile-consent-banner-comp (pull request #2908)

Feat/LOY-358 profile consent banner component

* feat: Add feature branch for profile and consent work

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component


Approved-by: Chuma Mcphoy (We Ahead)

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* Merged in feat/profile-consent-contentstack (pull request #2921)

Feat(LOY-389): Profile consent in Contentstack

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* chore(LOY-348): add profiling consent as CS entry

* chore(LOY-348): add banner as dynamic content

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901)

Feat(LOY-347): Profiling Consent Modal (phase 1)

* feat(LOY-347): Profile Consent Modal base functionality

* feat(LOY-347): Add Icon

* feat(LOY-347): Add Benefit Cards to Profile consent modal

* feat(LOY-347): Add accordion to profile consent modal

* fix(LOY-347): scroll behaviour

* Fix(LOY-347): fade in/out animations of profile consent modal

* fix(LOY-347): White Ellipsis Around Icons

* feat(LOY-347): Implement ability to open modal from banner

* fix(LOY-347): minor fixes

* fix(LOY-347): replace old spa icon

* fix(LOY-347): re-add env vars

* fix(LOY-347): File renaming and cleanup

* chore(LOY-347): Update readme

* fix(LOY-347): use correct space var

* fix(LOY-347): Add TODO comment for adding link to accordion

Approved-by: Matilda Landström

* Merged in fix/LOY-386-profiling-consent-modal-contentstack (pull request #2930)

Fix(LOY-386): profiling consent modal contentstack

* feat(LOY-347): Profile Consent Modal base functionality

* feat(LOY-347): Add Icon

* feat(LOY-347): Add Benefit Cards to Profile consent modal

* feat(LOY-347): Add accordion to profile consent modal

* fix(LOY-347): scroll behaviour

* Fix(LOY-347): fade in/out animations of profile consent modal

* fix(LOY-347): White Ellipsis Around Icons

* feat(LOY-347): Implement ability to open modal from banner

* fix(LOY-347): minor fixes

* fix(LOY-347): replace old spa icon

* fix(LOY-347): re-add env vars

* fix(LOY-347): File renaming and cleanup

* fix(LOY-386): Use contentstack content for profile consent modal

* fix(LOY-386): beneift cards schema transform

* chore(LOY-386): remove usememo

* fix(LOY-386): fix modalcontent check

* fix(LOY-386): remove uneeded vars


Approved-by: Matilda Landström

* Merged in feat/LOY-412-profiling-consent-in-signup (pull request #2976)

Feat(LOY-412): profiling consent in signup

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* Merged in feat/profile-consent-contentstack (pull request #2921)

Feat(LOY-389): Profile consent in Contentstack

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* chore(LOY-348): add profiling consent as CS entry

* chore(LOY-348): add banner as dynamic content

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901)

Feat(LOY-347): Profiling Consent Modal (phase 1)

* feat(LOY-347): Profile Consent Modal base functionality

* feat(LOY-347): Add Icon

* feat(LOY-347): Add Benefit Cards to Profile consent modal

* feat(LOY-347): Add accordion to profile consent modal

* fix(LOY-347): scroll behaviour

* Fix(LOY-347): fade in/out animations of profile consent modal

* fix(LOY-347): White Ellipsis Around Ico…
* Merged in fix/lokalise-ids (pull request #3013)

fix: add ids to translations in Profiling Consent

* fix: add ids to translations


Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)

* Merged in LOY-436-my-pages-profiling-consent (pull request #3011)

LOY-436: Profiling Consent on My Profile, no api

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-418-profiling-consent-ui-text-update (pull request #3080)

Feat/LOY-418: Profiling consent ui and text update

* chore(LOY-418): update /consent buttons

* chore(LOY-418): update legal texts


Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-268-profiling-consent-api (pull request #3088)

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-413-Signup-API-Profiling-Consent (pull request #3105)

Feat/LOY-413 Signup API Profiling Consent

* feat(LOY-413): signup profiling consent

* chore(LOY-413): remove todo

* fix(LOY-413): only pass in profilingConsent if true

* fix(LOY-413): proper spread of profilingConsent in signup input


Approved-by: Christel Westerberg

* Merged in fix/LOY-413-use-v2-for-signup-call (pull request #3112)

fix(LOY-413): use v2 endpoint for profile POST in signup

* fix(LOY-413): use v2 endpoint for profile POST in signup


Approved-by: Erik Tiekstra

* Merged in feat/LOY-268-profiling-consent-improvements (pull request #3094)

Feat/LOY-268: Profiling consent improvements

* Merged in feat/profile-consent-contentstack (pull request #2921)

Feat(LOY-389): Profile consent in Contentstack

* feat(LOY-268): create banner

* feat(LOY-268): Create personalization banner component

* chore(LOY-348): add profiling consent as CS entry

* chore(LOY-348): add banner as dynamic content

Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901)

Feat(LOY-347): Profiling Consent Modal (phase 1)

* feat(LOY-347): Profile Consent Modal base functionality

* feat(LOY-347): Add Icon

* feat(LOY-347): Add Benefit Cards to Profile consent modal

* feat(LOY-347): Add accordion to profile consent modal

* fix(LOY-347): scroll behaviour

* Fix(LOY-347): fade in/out animations of profile consent modal

* fix(LOY-347): White Ellipsis Around Icons

* feat(LOY-347): Implement ability to open modal from banner

* fix(LOY-347): min…
* Merged in fix/update-graphql (pull request #3130)

fix: update graphql

* fix: update graphql


Approved-by: Chuma Mcphoy (We Ahead)

* Merged in feat/LOY-414-prof-consent-tracking (pull request #3127)

Feat/LOY-414 profile consent tracking + credit card ui update

* chore(LOY-414): create track link function

* chore(LOY-414): add cta tracking

* chore(LOY-414): add profileConsent to userInfo datalayer

* chore(LOY-414): update credit card ui

* chore(LOY-414): update tracking specs

* chore(LOY-414): add pageView tracking to modal

Approved-by: Chuma Mcphoy (We Ahead)

* fix: remove old flag

* Merged in fix/LOY-268-prof-consent-button-fix (pull request #3162)

fix(LOY-268): add button as link

* fix(LOY-268): add button as link


Approved-by: Chuma Mcphoy (We Ahead)


Approved-by: Matilda Landström
 2025-11-14 13:28:56 +00:00
Erik Tiekstra
b0f2276b0b fix(BOOK-559): Using same ContactInformation component on hotel pages and booking flow inside the hotel details sidepeek 
Approved-by: Bianca Widstam
 2025-11-13 14:32:17 +00:00
Joakim Jäderberg
bc5a606289 Merged in feature/turbopack (pull request #3117) 
Feature/turbopack

* .

* .

* pin import-in-the-middle

* update marker

* revert back to using *.graphql.ts


Approved-by: Linus Flood
 2025-11-11 09:51:40 +00:00
Linus Flood
5770dcdd9c Merged in revert-gql (pull request #3104) 
Revert gql

* Revert "Merged in fix/system-fragment (pull request #3102)"

This reverts commit 0d479eb337.

* Revert "Merged in chore/replace-graphql-tag/loader (pull request #3096)"

This reverts commit e9bd159e98.
 2025-11-07 13:13:28 +00:00
Joakim Jäderberg
e9bd159e98 Merged in chore/replace-graphql-tag/loader (pull request #3096) 
Use turbopack for dev builds.
Remove graphql-tag/loader, replaced by gql`` tag literals instead.



Approved-by: Linus Flood
 2025-11-07 12:33:17 +00:00
Erik Tiekstra
4c10989e8e Feat/BOOK-424 campaign banner 
Approved-by: Bianca Widstam
 2025-10-29 12:47:40 +00:00
Linus Flood
acdc3dcec1 Merged in fix/book-453-linkconnection (pull request #2972) 
fix(BOOK-453): avoid linkConnection invalid

* fix(BOOK-453): avoid linkConnection invalid

* test

* test

* test

* Merge master
 2025-10-22 12:39:17 +00:00
Erik Tiekstra
c6f76b83cc Merged in fix/BOOK-456-destination-city-validation-error (pull request #2975) 
fix(BOOK-456): Added nullish() to destination pages content and sidepeek content schema to avoid unexpected errors

* fix(BOOK-456): Added nullish() to destination pages content and sidepeek content schema to avoid unexpected errors


Approved-by: Linus Flood
 2025-10-15 14:41:26 +00:00
Matilda Landström
2176a7dd6f Merged in feat/LOY-394-promos-linkable (pull request #2918) 
feat(LOY-394): add promo campaign page link

* feat(LOY-394): make promo campaigns linkable from everewhere


Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-07 13:30:34 +00:00
Erik Tiekstra
36aa5089ea fix(BOOK-138): Fixed several issues after country map functionality was added 
* fix(BOOK-138): Fixed issue when hovering markers and info windows for both city cluster marker as city markers.

Approved-by: Matilda Landström
 2025-10-07 11:37:54 +00:00
Matilda Landström
d88cd3f418 Merged in fix/content-connection-block (pull request #2922) 
fix: add back content block connection

* fix: add back content block connection


Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-07 10:32:39 +00:00
Hrishikesh Vaipurkar
d3368e9b85 Merged in feat/SW-2782-create-sas-branded-header (pull request #2878) 
feat(SW-2782): Updated header as per design, added language switcher and user menu

* feat(SW-2782): Updated header as per design, added language switcher and user menu

* feat(SW-2782): Updated UI as per design

* feat(SW-2782): Optimised code with use of Popover and modal from RAC


Approved-by: Anton Gunnarsson
 2025-10-06 08:46:26 +00:00
Matilda Landström
ea130ffaf8 Merged in feat/LOY-362-content-block (pull request #2897) 
feat(LOY-362): fix content block

* feat(LOY-362): fix content block


Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-02 06:34:46 +00:00
Joakim Jäderberg
8498026189 Merged in chore/refactor-hotel-trpc-routes (pull request #2891) 
Chore/refactor hotel trpc routes

* chore(SW-3519): refactor trpc hotel routers

* chore(SW-3519): refactor trpc hotel routers

* refactor

* merge

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/refactor-hotel-trpc-routes


Approved-by: Linus Flood
 2025-10-01 12:55:45 +00:00
Erik Tiekstra
4f151b143e Merged in fix/metadata-schema (pull request #2893) 
fix: Updated metadata schema to handle transformed hotel data

* fix: Updated metadata schema to handle transformed hotel data


Approved-by: Linus Flood
 2025-10-01 11:33:58 +00:00
Matilda Landström
dd44e39732 Merged in feat/LOY-362-promo-blocks (pull request #2880) 
feat(LOY-362): add blocks

* feat(LOY-362): add blocks

* fix(LOY-362): hide RTE while waiting for CS


Approved-by: Chuma Mcphoy (We Ahead)
 2025-09-29 14:42:16 +00:00
Chuma Mcphoy (We Ahead)
daeb38832b Merged in feat/LOY-365-promo-campaign-eligible-levels (pull request #2864) 
feat(LOY-365): Add support for eligible levels for promo campaign pages

* feat(LOY-365): Add support for eligible levels for promo campaign pages

* fix(LOY-365): update to most recent copy

* fix(LOY-365): cleanup css

* fix(LOY-365): Move ineligible message to the bottom

* fix(LOY-365): remove uneeded type


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-09-29 06:58:15 +00:00
Linus Flood
7bdcfc7681 Merged in feat/book-396-validationerror (pull request #2871) 
feat(BOOK-396): city page validation error

* feat(BOOK-396): city page validation error

* feat(BOOK-396): city page validation error


Approved-by: Erik Tiekstra
Approved-by: Joakim Jäderberg
 2025-09-26 10:51:19 +00:00
Erik Tiekstra
f2a5fc03c2 Merged in fix/BOOK-381-top-primary-button-schema (pull request #2865) 
fix(BOOK-381): Added nullish() to top primary button to avoid schema failures

* fix(BOOK-381): Added nullish() to top primary button to avoid schema failures


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
 2025-09-26 10:15:55 +00:00
Erik Tiekstra
9f02870647 feat(BOOK-57): Adjusted metadata for destination pages with active seo filter 
Approved-by: Chuma Mcphoy (We Ahead)
 2025-09-25 13:26:00 +00:00
Erik Tiekstra
7714761c77 feat(BOOK-56): Added content related to destination filters 
Approved-by: Chuma Mcphoy (We Ahead)
 2025-09-25 08:10:30 +00:00
Chuma Mcphoy (We Ahead)
7ee76992be Merged in feat/LOY-361-Promo-Campaign-Hero (pull request #2857) 
Feat(LOY-363): Promo Campaign Hero

* feat(LOY-361): Add Promo Campaign Hero

* feat(LOY-361): auth cta's wip

* fix(LOY-361): improve hero card css

* fix(LOY-361): correct size for button

* fix(LOY-361): Make Promo Hero Required

* fix(LOY-361): semantic css classes


Approved-by: Matilda Landström
 2025-09-24 14:36:31 +00:00
Matilda Landström
00689607bc Merged in feat/SW-2241-country-map (pull request #2808) 
Feat/SW-2241 country map

Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)
 2025-09-24 12:04:01 +00:00
Erik Tiekstra
af4f544b8a feat(BOOK-55): Listen to SEO filter slugs when navigating to such page 
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
 2025-09-24 10:40:58 +00:00
Erik Tiekstra
7c92a8fc9a feat(BOOK-53): Added component for SEO filters and support filter switching 
Approved-by: Chuma Mcphoy (We Ahead)
 2025-09-19 08:26:41 +00:00
Matilda Landström
0e30a2d218 Merged in feat/LOY-361-add-promo-campaign-page-type (pull request #2826) 
Feat/LOY-361 add promo campaign page type

* feat(LOY-361): add Pomo Campaign page type

* chore(SW-361): remove campaign page flag

* fix(LOY-361): cleanup

* fix(LOY-361): add promo code


Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)
 2025-09-19 07:20:17 +00:00
Linus Flood
886f1b2f11 Merged in feat/LOY-367-soft-validation (pull request #2815) 
feat(LOY-367)-softer validation for dynamic content enum

* feat(LOY-367)-softer validation for dynamic content enum

* Test


Approved-by: Erik Tiekstra
 2025-09-17 08:00:17 +00:00
Linus Flood
eea2a63835 Merged in feat/book-228-campaign (pull request #2818) 
feat(book-228): campaign cache fixes

* feat(book-228): campaign cache fixes


Approved-by: Erik Tiekstra
Approved-by: Joakim Jäderberg
Approved-by: Matilda Landström
 2025-09-17 07:57:51 +00:00
Linus Flood
fd0198f57b Merged in feat/SW-2999-cleanup (pull request #2810) 
feat(SW-2999): cleanup current web

* feat(SW-2999): cleanup current web

* Merge master

* Removed unused fonts


Approved-by: Joakim Jäderberg
 2025-09-16 11:28:57 +00:00
Erik Tiekstra
5654569a11 feat(SW-3108): Added external link option to top primary button on content/collection page 
Approved-by: Matilda Landström
 2025-09-15 06:47:10 +00:00
Erik Tiekstra
ce71fc421c fix: Trimming hotel ids from contentstack to avoid 404 errors when fetching hotel data 
Approved-by: Linus Flood
Approved-by: Matilda Landström
 2025-09-12 09:18:50 +00:00
Linus Flood
bacec22a8a Merged in feat/SW-3443-destinations-list (pull request #2781) 
feat(destinations list): SW-3443 remove hard coded response and fetch from API instead

* feat(destinations list): SW-3443 remove hard coded response and fetch from API instead


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-09-11 09:14:01 +00:00
Joakim Jäderberg
7dee6d5083 Merged in chore/move-enter-details (pull request #2778) 
Chore/move enter details

Approved-by: Anton Gunnarsson
 2025-09-11 07:16:24 +00:00
Erik Tiekstra
15711cb3a4 feat(SW-2541): Adjust for ImageVault custom field return types changes 
Approved-by: Bianca Widstam
Approved-by: Matilda Landström
 2025-09-10 08:57:49 +00:00
Matilda Landström
7bad898d9d Merged in fix/SW-2311-campaign-tracking (pull request #2753) 
fix(SW-2311): update campaign tracking values

* fix(SW-2311): update campaign tracking values


Approved-by: Erik Tiekstra
 2025-09-03 10:58:54 +00:00
Erik Tiekstra
941eb51665 feat(SW-3354): Added possibility to add heading to top campaign on campaign overview page 
Approved-by: Matilda Landström
 2025-09-03 10:52:50 +00:00
Erik Tiekstra
52e900bad8 fix(SW-3383): Less strict string validation for header external links 
Approved-by: Matilda Landström
 2025-09-02 08:39:56 +00:00
Matilda Landström
89d16c71ff Merged in feat/SW-3364-destination-list (pull request #2744) 
feat(SW-3364): update destination list

* feat(SW-3364): update destination list


Approved-by: Erik Tiekstra
 2025-09-02 08:36:41 +00:00
Erik Tiekstra
2e655619d1 feat(SW-3121): Added support for campaign text inside the hero of campaign pages 
* fix: making sure the cacheKey for getHotelsByHotelIds is not sorting the original array

Approved-by: Matilda Landström
 2025-08-28 13:46:48 +00:00
Erik Tiekstra
997f928f2b fix(SW-3028): Using hero heading instead of heading for campaign hero on hotel pages 
Approved-by: Matilda Landström
 2025-08-28 08:12:52 +00:00
Erik Tiekstra
fd48f86c90 feat/SW-3108 external links 
* feat(SW-3108): Added external link options to shortcuts
* feat(SW-3108): Added external link options to header

Approved-by: Matilda Landström
 2025-08-28 07:25:17 +00:00
Erik Tiekstra
1a10afdbad fix(SW-3305): Added preamble to carousel cards block 
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
 2025-08-28 07:22:07 +00:00
Matilda Landström
7e9ecdd6c5 Merged in fix/zod-validation (pull request #2706) 
fix: make strings nullable

* fix: make strings nullable


Approved-by: Erik Tiekstra
 2025-08-26 11:27:07 +00:00
Hrishikesh Vaipurkar
44fce176e9 Merged in chore/SW-3246-move-alert-to-design-system (pull request #2698) 
chore(SW-3246): Moved Alert component into design system

* chore(SW-3246): Moved Alert component into design system

* chore(SW-3246): Optimsed code and imports

* chore(SW-3246): Moved type AlertTypeEnum and other to common package


Approved-by: Anton Gunnarsson
 2025-08-26 11:22:38 +00:00
Erik Tiekstra
caffa1821f feat(SW-3288): Added sort order on campaign pages to sort campaigns on hotel pages 
Approved-by: Matilda Landström
 2025-08-22 09:30:45 +00:00
Erik Tiekstra
c7c55bd7b1 Feat/SW-3287 campaign start end 
Approved-by: Matilda Landström
 2025-08-22 09:18:52 +00:00
Erik Tiekstra
2064732e56 Feat/SW-3028 hotel page campaigns 
* feat(SW-3028): Added query and typings to fetch campaigns by hotelUid
* feat(SW-3028): Added components for campaigns to the hotel page
* feat(SW-3028): Implemented prioritized campaigns list
* chore(SW-3028): Refactor how campaigns are fetched on hotel pages
* feat(SW-3028): Added offers/campaigns to tab navigation

Approved-by: Matilda Landström
 2025-08-21 13:00:34 +00:00
Matilda Landström
eaf6e851ec Merged in fix/SW-1532-make-link-nullable (pull request #2677) 
fix/SW-1532: make link nullable

* fix/SW-1532: make link nullable


Approved-by: Erik Tiekstra
 2025-08-20 13:32:00 +00:00
Matilda Landström
7891ae3ae6 Merged in feat/SW-3232-site-config-alerts (pull request #2671) 
feat(SW-3232): update alert schema

* feat(SW-3232): update alert schema


Approved-by: Erik Tiekstra
 2025-08-20 09:18:00 +00:00
Matilda Landström
57c6f59449 Merged in feat/SW-1532-startpage-cardgrid-optional-link (pull request #2635) 
feat(SW-1532): add optional link to start page card grid

* feat(SW-1532): add optional link to start page card grid


Approved-by: Erik Tiekstra
 2025-08-15 07:25:00 +00:00