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

106 Commits

Author SHA1 Message Date
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
Joakim Jäderberg
764e7cf49a Merged in fix/include-info-when-missingLangInTRPC (pull request #2890) 
* chore: include more info when we get missing lang in tRPC context


Approved-by: Linus Flood
 2025-10-01 11:43:12 +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
72d62e6868 Merged in feat/LOY-364-promo-activation-flow (pull request #2872) 
Feat/LOY-364 promo activation flow

* feat(LOY-364): add promo activation flow

* chore(LOY-371): add tracking

Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-01 06:39:35 +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
Joakim Jäderberg
e4c5363fe9 Merged in fix/BOOK-399-default-language (pull request #2877) 
fix(BOOK-399): Default language to 'en' when we've ended up in a invalid state

* fix(BOOK-399): Default language to 'en' when we've ended up in a invalid state

* PR fixes: reuse types and include local dev error message


Approved-by: Anton Gunnarsson
Approved-by: Linus Flood
 2025-09-29 14:18:27 +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
Chuma Mcphoy (We Ahead)
5bbd7eb9ab Merged in fix/LOY-359-use-scandic-native-tier-data (pull request #2846) 
fix(LOY-359): Always use scandic native tier data for all level related data

* fix(LOY-359): Always use scandic native tier data for all level related data


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-09-24 13:50:32 +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
Joakim Jäderberg
3a1cf12638 Merged in fix/eurobonus-zod-schema (pull request #2854) 
SW-3505: Fix getEuroBonusProfile schema to match OpenAPI spec

* update getEuroBonusProfile schema to match OpenAPI spec

* update getEuroBonusProfile schema to match OpenAPI spec

* update getEuroBonusProfile schema to match OpenAPI spec


Approved-by: Anton Gunnarsson
 2025-09-23 13:03:44 +00:00
Joakim Jäderberg
c46e71d76e Merged in feature/SW-3505-fetch-eurobonus-points (pull request #2847) 
feat(SW-3505): add endpoint for getting eurobonus profile

* feat(SW-3505): add endpoint for getting eurobonus profile

* make sure we add loginType to session

* no need to run zod parsing twice

* Make SAS environment variables mandatory


Approved-by: Anton Gunnarsson
 2025-09-23 12:13:20 +00:00
Bianca Widstam
34020dad78 Merged in fix/BOOK-136-ancillary-image-without-metadata (pull request #2841) 
fix(BOOK-136): ancillary image validation without metadata

* fix(BOOK-136): ancillary image validation without metadata

* fix(BOOK-136): ancillary image


Approved-by: Erik Tiekstra
 2025-09-22 12:17:12 +00:00
Joakim Jäderberg
8ebc48b138 Merged in feat/SW-3461-setup-auth-with-sas-eurobonus (pull request #2825) 
Feat/SW-3461 setup auth with sas eurobonus

* feat(SW-3461): Setup auth for sas eurobonus

* .

* feat: setup auth towards SAS

* Fix auth via SAS and add logout route

* .

* merge

* auth via SAS

* fix powered by scandic logo

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3461-setup-auth-with-sas-eurobonus

* Include access_token in jwt after successful login

* merge


Approved-by: Anton Gunnarsson
 2025-09-22 09:30:36 +00:00
Linus Flood
db546d7167 Merged in feat/SW-3494-noOfNightsStayed (pull request #2832) 
feat(SW-3494): removed properties that we dont need in the tracking

* feat(SW-3494): removed properties that we dont need in the tracking

* Fixed waiting on user response before tracking

* Refactor and cleanup

* Cleanup


Approved-by: Joakim Jäderberg
 2025-09-22 07:38:05 +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
Erik Tiekstra
948c86479a feat(BOOK-54): Adjusted filter functionality to save filters as query parameters instead of paths 
* feat(BOOK-54): Destination filters now matching on id instead of slug in preparation for filters from Contentstack

Approved-by: Chuma Mcphoy (We Ahead)
 2025-09-18 13:03:01 +00:00
Joakim Jäderberg
ae7a62c88f Merged in feature/SW-3149-send-logs-to-sentry (pull request #2802) 
Feature/SW-3149 send logs to sentry

* Use sentry for logging

* .

* fix(SW-3149) Send logs to Sentry

* remove experimental flag for logs

* add sentry settings for partner-sas

* feat(SW-3108): Added external link option to top primary button on content/collection page

Approved-by: Matilda Landström

* fix(BOOK-152): Removed old header references inside useStickyPosition hook to fix offset issue for the sitewide alert

Approved-by: Matilda Landström

* Merged in fix/LOY-360-team-member-text-for-retired-employees (pull request #2799)

fix(LOY-360): improve text for retired employees

* fix(LOY-360): improve text for retired employees


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström

* Merged in fix/STAY-67-redirect-to-webview-after-gla (pull request #2795)

fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): add callback page for guarantee on webview


Approved-by: Linus Flood

* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox

* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox
* feat(BOOK-144): Make image clickable instead of a button to avoid being able to click outside of the image area

Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)

* Merged in fix/BOOK-127-translate-validation-text (pull request #2800)

fix(BOOK-127): translate terms required message

* fix(BOOK-127): translate terms required message


Approved-by: Erik Tiekstra

* Merged in feat/LOY-354-L7-Progress-Card (pull request #2786)

Feat/LOY-354 L7 Progress Card

* feat(LOY-354): Add Trophy icon

* fix(LOY-354): include new tierPoints value

* feat(LOY-354): L7 Progress Level Card support

* refactor(LOY-354): Refactoring of component structure

* fix(LOY-354): Remove intl prop drilling

* fix(LOY-354): cleanup progress section code


Approved-by: Erik Tiekstra

* Merged in fix/BOOK-132-tracking-breakfast (pull request #2803)

fix(BOOK-132): add breakfastOption tracking

* fix(BOOK-132): add breakfastOption tracking


Approved-by: Joakim Jäderberg

* Merged in fix/enter-details-errors-missing (pull request #2806)

fix: Add missing messages to BookingFlowInput errors

* Add missing messages to BookingFlowInput errors

* Fix errors

* zippy zip

* phoney


Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg

* Merged in feature/copy-static-files-via-build-scripts (pull request #2798)

SW-3467 Copy static files via build scripts

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* remove fonts that will be copied via build scripts

* wip

* update paths to shared files

* update material-symbol script

* merge

* fix missing shared segment for path in fonts.css


Approved-by: Linus Flood

* 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

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry

* merge


Approved-by: Linus Flood
 2025-09-18 07:59:44 +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
Chuma Mcphoy (We Ahead)
0737f4fb78 Merged in feat/LOY-354-L7-Progress-Card (pull request #2786) 
Feat/LOY-354 L7 Progress Card

* feat(LOY-354): Add Trophy icon

* fix(LOY-354): include new tierPoints value

* feat(LOY-354): L7 Progress Level Card support

* refactor(LOY-354): Refactoring of component structure

* fix(LOY-354): Remove intl prop drilling

* fix(LOY-354): cleanup progress section code


Approved-by: Erik Tiekstra
 2025-09-15 11:48:18 +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
Erik Tiekstra
f04fe467da feat(SW-3151): Added original to imageSchema and added transform to a more generic image type 
Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
 2025-09-10 08:29:05 +00:00
Erik Tiekstra
8c21416d5a fix(BOOK-118): Added __typename to embedded reference inside accordions 
Approved-by: Matilda Landström
 2025-09-08 09:35:42 +00:00
Matilda Landström
8f813eb9e7 Merged in feat/SW-3163-remove-openinghours-name (pull request #2735) 
feat(SW-3163): update opening hours schema name/nameEnglish

* feat(SW-3163): remove name

* fix(SW-3163): update schemas


Approved-by: Erik Tiekstra
 2025-09-04 14:18:57 +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
Anton Gunnarsson
f7ef58eafa Merged in feat/sw-2874-move-select-rate (pull request #2750) 
Approved-by: Joakim Jäderberg
 2025-09-03 08:30:05 +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
Anton Gunnarsson
87402a2092 Merged in feat/sw-2873-move-selecthotel-to-booking-flow (pull request #2727) 
feat(SW-2873): Move select-hotel to booking flow

* crude setup of select-hotel in partner-sas

* wip

* Fix linting

* restructure tracking files

* Remove dependency on trpc in tracking hooks

* Move pageview tracking to common

* Fix some lint and import issues

* Add AlternativeHotelsPage

* Add SelectHotelMapPage

* Add AlternativeHotelsMapPage

* remove next dependency in tracking store

* Remove dependency on react in tracking hooks

* move isSameBooking to booking-flow

* Inject searchParamsComparator into tracking store

* Move useTrackHardNavigation to common

* Move useTrackSoftNavigation to common

* Add TrackingSDK to partner-sas

* call serverclient in layout

* Remove unused css

* Update types

* Move HotelPin type

* Fix todos

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Fix component


Approved-by: Joakim Jäderberg
 2025-09-01 08:37:00 +00:00
Erik Tiekstra
19063da08a feat(SW-3040): Sorting hotel listing when all hotels from a city/country are chosen 
Approved-by: Matilda Landström
 2025-09-01 07:52:53 +00:00
Erik Tiekstra
92cb3f3663 fix(SW-3307): Filtered out duplicate facilities from hotel response 
Approved-by: Matilda Landström
 2025-08-29 13:00:25 +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
Joakim Jäderberg
80c3327419 Merged in fix/linting (pull request #2708) 
Fix/linting

* fix import issues and add lint check no-extraneous-dependencies
* fix use type HotelType instead of string

Approved-by: Anton Gunnarsson
 2025-08-27 09:22:37 +00:00
Anton Gunnarsson
c53e6ef187 Merged in chore/move-use-scroll-to-top (pull request #2705) 
chore: Move useScrollToTop to common package

* Move useScrollToTop to common package


Approved-by: Joakim Jäderberg
 2025-08-26 11:48:54 +00:00