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

5248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joakim Jäderberg
8cd6f1d3a5 Merged in fix/revalidate-debug-logs (pull request #2840) 
chore: change to using debug logs for revalidate call

* chore: change to using debug logs for revalidate call


Approved-by: Anton Gunnarsson
 2025-09-23 12:06:20 +00:00
Matilda Landström
e8968a9eaf Merged in fix/Lokalise (pull request #2851) 
fix label typo

* fix label typo


Approved-by: Bianca Widstam
 2025-09-23 11:25:53 +00:00
Bianca Widstam
56764f8720 Merged in sync/Localize (pull request #2850) 
sync to localize

* sync to localize


Approved-by: Anton Gunnarsson
 2025-09-23 09:37:15 +00:00
Bianca Widstam
914b095e16 Merged in fix/BOOK-210-update-hotel-card-local-charges (pull request #2835) 
fix(BOOK-210): add local charges for Finland and update design for hotel card

* fix(BOOK-210): add local charges for Finland and update design for hotel card

* feat(BOOK-210): change variant to conditional classname

* fix(BOOK-210): update link with icon

* fix(BOOK-210): update buttonlink tripadvisor

* fix(BOOK-210): switch wrapper logic

* fix(BOOK-210): update variants tripadvisor


Approved-by: Erik Tiekstra
 2025-09-23 08:54:07 +00:00
Hrishikesh Vaipurkar
16e6c1596c Merged in feat/SW-3477-hide-voucher-booking-code-sas- (pull request #2836) 
feat(SW-3477) Updated booking widget for SAS white label

Approved-by: Anton Gunnarsson
 2025-09-23 08:44:55 +00:00
Erik Tiekstra
046d342b6f feat(BOOK-68): Adjusted visibility on page load 
Approved-by: Linus Flood
 2025-09-23 07:56:00 +00:00
Linus Flood
7c4a0ec466 Merged in fix/webview-auth-fix-3 (pull request #2848) 
Fix/webview auth fix 3

* feat(webview auth): set maxAge on cookie

* Changed samesite to lax


Approved-by: Anton Gunnarsson
 2025-09-23 07:21:24 +00:00
Anton Gunnarsson
c21d0dbc74 Merged in fix/sw-3495-booking-flow-links-to-web (pull request #2837) 
fix: (SW-3495): Update booking-flow links in partner-sas

* Update links to scandic web in booking-flow

* Fix routeToScandicWeb util function


Approved-by: Hrishikesh Vaipurkar
 2025-09-22 13:30:38 +00:00
Anton Gunnarsson
630e89c845 Merged in feat/sw-3473-remove-tracking-context (pull request #2843) 
feat(SW-3473): Rework booking-flow tracking provider

* Remove tracking context and import instead

* Remove unused file


Approved-by: Joakim Jäderberg
 2025-09-22 13:08:10 +00:00
Joakim Jäderberg
a7b19e8b14 Merged in fix/trust-host-partner-sas (pull request #2844) 
add trust host setting for partner-sas auth

* add trust host setting for partner-sas auth


Approved-by: Anton Gunnarsson
 2025-09-22 12:33:14 +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
Erik Tiekstra
a5db1f0f62 fix(BOOK-140): fixed issue with multi-line bullet lists 
Approved-by: Bianca Widstam
Approved-by: Matilda Landström
 2025-09-22 10:47:55 +00:00
Chuma Mcphoy (We Ahead)
6a9d598b97 Merged in feat/LOY-336-Points-to-Spend-Card (pull request #2830) 
feat(LOY-336): Add PointsToSpendCard

* feat(LOY-366): Add PointsToSpendCard

* feat(LOY-336): Add Expiring Points Table Sidepeek

* fix(LOY-336): Hide old section

* fix(LOY-336): description mobile styling

* chore(LOY-336): css cleanup


Approved-by: Matilda Landström
 2025-09-22 10:16:40 +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
Chuma Mcphoy (We Ahead)
9b8ed972ec Merged in fix/LOY-369-Redeem-tier-rewards (pull request #2822) 
fix(LOY-369): Able to redeem tier rewards

* fix(LOY-369): able to redeem on site tier rewards

* fix(LOY-369): single mutation call

* fix(LOY-369): apply coupon check for all tier rewards


Approved-by: Linus Flood
Approved-by: Matilda Landström
 2025-09-22 08:27:30 +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
Linus Flood
9770281863 Merged in fix/webview-auth-fix-2 (pull request #2834) 
feat/webview: delete cookie instead of setting header in webview auth middleware

* feat/webview: delete cookie instead of setting header in webview auth middleware
 2025-09-19 13:05:20 +00:00
Linus Flood
9c7904c9e0 Merged in fix/webview-auth-fix (pull request #2833) 
Fix/webview auth fix

* Test

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/webview-auth-fix

* Setting cookie instead of headers


Approved-by: Anton Gunnarsson
 2025-09-19 12:55:53 +00:00
Anton Gunnarsson
7adb9ded46 Merged in feat/sw-3472-booking-flow-parameterization (pull request #2811) 
feat(SW-3272): Add BookingFlowConfig

* Add BookingFlowConfig

* Rename "provider" to BookingFlowConfig

* Change bookingCode to boolean

* Fix error


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
 2025-09-19 11:56:50 +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
Bianca Widstam
c791fef2c6 Merged in fix/BOOK-121-join-membership-modify-correct-price (pull request #2829) 
fix(BOOK-121): clear join only if membership number is valid and calculate correct member price

* fix(BOOK-121): clear join only if membership number is valid and calculate correct member price


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-09-19 06:20:48 +00:00
Anton Gunnarsson
08804e8675 Merged in chore/cleanup-scandic-web (pull request #2831) 
chore: Cleanup scandic-web

* Remove unused files

* Remove unused and add missing packages

* Remove unused exports


Approved-by: Linus Flood
 2025-09-18 15:33:00 +00:00
Chuma Mcphoy (We Ahead)
cc99f26727 Merged in fix/LOY-358-SAS-expiry-date (pull request #2813) 
fix(LOY-358): Proper SAS tier expiration date check

* fix(LOY-358): Proper SAS tier expiration date check


Approved-by: Erik Tiekstra
 2025-09-18 13:39:37 +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
Matilda Landström
32a817fa72 Merged in fix/BOOK-233-book-a-table-label (pull request #2827) 
fix(BOOK-233): flip back logic for label

* fix(BOOK-233): flip back logic for label


Approved-by: Bianca Widstam
 2025-09-18 12:44:06 +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
Hrishikesh Vaipurkar
c09dc29fee Merged in feat/SW-3250-account-linking-modal-you- (pull request #2819) 
feat(SW-3250): Updated UI for already linked account error

* feat(SW-3250): Updated UI for already linked account error


Approved-by: Anton Gunnarsson
 2025-09-18 07:39:08 +00:00
Anton Gunnarsson
65e4623b52 Merged in chore/fix-partner-sas-todos (pull request #2823) 
chore: Fix partner-sas todos

* Add onError to TrpcProvider

* Add AdobeSDKScript

* Add GTMScript

* Add adobeDataLayer script

* Add ReactQueryDevtools

* Move components to correct folder


Approved-by: Joakim Jäderberg
 2025-09-18 07:28:14 +00:00
Anton Gunnarsson
b0f3e4afbd Merged in chore/cleanup-booking-flow (pull request #2824) 
chore: Cleanup booking-flow after migration

* Remove unused types

* Clean up exports, types, unused files etc in booking-flow


Approved-by: Joakim Jäderberg
 2025-09-18 07:28:05 +00:00
Joakim Jäderberg
9620bfe76d Merged in SW-3476-use-separate-curity-client-for-service-tokens-for-partner-sas (pull request #2809) 
feat(SW-3476): add support for using different curity clients when creating service tokens

* fix(SW-3476): add support for using different curity clients when creating service tokens

* remove log statement


Approved-by: Hrishikesh Vaipurkar
 2025-09-18 07:04:45 +00:00
Joakim Jäderberg
8661e5c348 Merged in chore/icon-readme-update (pull request #2817) 
Update icon generation script and remove unused font file

* Update icon generation script and remove unused font file


Approved-by: Matilda Landström
 2025-09-17 12:58:23 +00:00
Matilda Landström
d6addd2398 Merged in fix/update-health-card-script (pull request #2821) 
fix: update scripted text on health facility card

* fix: update scripted text on health facility card


Approved-by: Erik Tiekstra
 2025-09-17 08:57:49 +00:00
Bianca Widstam
1e566e59f7 Merged in fix/SW-3484-campaign-remove-breakfast-message-chip (pull request #2820) 
fix(SW-3484): remove breakfast message in the booking code chip for campaign

* fix(SW-3484): remove breakfast message in the booking code chip for campaign


Approved-by: Matilda Landström
 2025-09-17 08:11:10 +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
Bianca Widstam
a144f84566 Merged in fix/SW-3481-map-view-pin-highlighted (pull request #2814) 
fix(SW-3481): highlight pin and min width to 900 to avoid duplicate hotelcards

* fix(SW-3481): highlight pin and min width to 900 to avoid duplicate hotelcards


Approved-by: Matilda Landström
 2025-09-17 07:59:16 +00:00
Bianca Widstam
34389837ae Merged in fix/SW-3483-labels-month-missing-date-picker (pull request #2816) 
fix(SW-3483): add color to label in date picker

* fix(SW-3483): add color to label in date picker


Approved-by: Matilda Landström
 2025-09-17 07:58:48 +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
Anton Gunnarsson
5a86cbaafe Merged in chore/update-eslint-configs (pull request #2812) 
chore: Extend eslint configs from @typescript-eslint/recommended

* Change to typescript recommended in scandic-web

* Remove comment

* Change to recommended ts config in partner-sas

* Change to recommended ts lint config in booking-flow


Approved-by: Linus Flood
 2025-09-17 07:55:11 +00:00
Matilda Landström
e6d5c45ca7 Merged in fix/Lokalise-update (pull request #2807) 
Fix/Lokalise update

* chore: update English keys

* fix: update from Lokalise


Approved-by: Linus Flood
 2025-09-16 11:46:31 +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
Joakim Jäderberg
48324ef935 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
 2025-09-16 10:59:33 +00:00
Anton Gunnarsson
33ce30a1c8 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
 2025-09-15 14:20:11 +00:00
Bianca Widstam
03cc146eac 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
 2025-09-15 13:45:32 +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
Bianca Widstam
295e98a560 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
 2025-09-15 10:43:57 +00:00
Erik Tiekstra
b437f8b806 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)
 2025-09-15 09:02:48 +00:00
Bianca Widstam
800948bb94 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
 2025-09-15 07:18:58 +00:00
Chuma Mcphoy (We Ahead)
98816b27ce 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
 2025-09-15 07:18:01 +00:00