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

98 Commits

Author SHA1 Message Date
Bianca Widstam
c473bbc8b0 Merged in fix/BOOK-323-enter-details-scroll-error (pull request #2986) 
Fix/BOOK-323 enter details scroll error

* fix(BOOK-323): scroll to invalid element on submit on enter details

* fix(BOOK-323): update error message design

* fix(BOOK-323): clean up

* fix(BOOK-323): scroll to fields in room in right order

* fix(BOOK-323): add id to translations

* fix(BOOK-323): remove undefined

* fix(BOOK-323): fix submitting state

* fix(BOOK-323): use ref in multiroom for scrolling to right element, add membershipNo

* fix(BOOK-323): fix invalid border country

* fix(BOOK-323): use error message component

* fix(BOOK-323): fix invalid focused styling on mobile

* fix(BOOK-323): remove redundant dependency in callback


Approved-by: Erik Tiekstra
 2025-10-24 11:30:56 +00:00
Anton Gunnarsson
45d1537bc1 Merged in fix/sw-3562-update-room-sidepeek-copy (pull request #3008) 
fix(SW-3562): Update room sidepeek copy

* Update copy and key


Approved-by: Bianca Widstam
 2025-10-24 08:30:24 +00:00
Anton Gunnarsson
24847bbc1c Merged in fix/sw-3561-swan-eco-icon-broken (pull request #3004) 
fix(SW-3561): Fix broken swan eco icon on partner-sas

* Move swan-eco icons to shared

* Delete unused icons


Approved-by: Linus Flood
 2025-10-23 12:42:46 +00:00
Anton Gunnarsson
a00cf8d327 Merged in fix/sw-3568-sas-terms-and-conditions-link (pull request #3002) 
feat(SW-3568): Use dependency injected link for SF terms on enter details

* Use dependency injected link for sf terms


Approved-by: Linus Flood
 2025-10-23 11:14:51 +00:00
Hrishikesh Vaipurkar
7f2db6f3de Merged in feat/SW-3557-update-ui-colors-after-test- (pull request #2995) 
* feat(SW-3557): Updated colors

Approved-by: Anton Gunnarsson
 2025-10-23 06:54:14 +00:00
Bianca Widstam
76c353058b Merged in fix/BOOK-459-tracking-search (pull request #2984) 
fix(BOOK-459): update searchTerm to city or hotelname

* fix(BOOK-459): update searchTerm to city or hotelname


Approved-by: Erik Tiekstra
 2025-10-22 14:34:59 +00:00
Anton Gunnarsson
03f17acbbe Merged in feat/sw-3547-update-member-rate-alert-text (pull request #2992) 
feat(SW-3547): Update texts for SAS variant member rate alert

* Update texts for SAS variant


Approved-by: Hrishikesh Vaipurkar
 2025-10-22 12:33:13 +00:00
Joakim Jäderberg
aafad9781f Merged in feat/lokalise-rebuild (pull request #2993) 
Feat/lokalise rebuild

* chore(lokalise): update translation ids

* chore(lokalise): easier to switch between projects

* chore(lokalise): update translation ids

* .

* .

* .

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* chore(lokalise): new translations

* merge

* switch to errors for missing id's

* merge

* sync translations


Approved-by: Linus Flood
 2025-10-22 11:00:03 +00:00
Anton Gunnarsson
bdfe2ab213 Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991) 
fix(SW-3514): Show join Scandic Friends card for SAS multiroom

* Show join card for room 2+


Approved-by: Hrishikesh Vaipurkar
 2025-10-22 07:47:53 +00:00
Anton Gunnarsson
c435cdba68 Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988) 
fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages
 2025-10-22 07:04:21 +00:00
Anton Gunnarsson
710309b7eb Merged in feat/sw-3545-update-sas-userinfo-tracking (pull request #2982) 
feat(SW-3545): Update partner-sas userinfo tracking

* Update loginType to eurobonus

* Remove tracking booking code properties when disabled

* Add EB user data to tracking

* Fix type issue


Approved-by: Joakim Jäderberg
 2025-10-17 09:35:37 +00:00
Hrishikesh Vaipurkar
c01f440651 Merged in feat/SW-3542-update-color-variables-to- (pull request #2970) 
feat(SW-3542): Updated the color variables for MVP

Approved-by: Joakim Jäderberg
 2025-10-17 09:22:03 +00:00
Anton Gunnarsson
bf19d3960b Merged in chore/remove-lodash (pull request #2983) 
chore: Remove lodash-es

* lodash-es is not edge safe so replace it with native functions


Approved-by: Joakim Jäderberg
 2025-10-17 07:47:20 +00:00
Matilda Landström
bacdc669a3 Merged in fix/Lokalise-EN-edits-2025-10 (pull request #2962) 
Fix/Lokalise English manual updates

* fix: update English keys


Approved-by: Linus Flood
 2025-10-16 15:04:58 +00:00
Joakim Jäderberg
291310e841 Merged in feature/curity-social-login (pull request #2963) 
feat(SW-3541): Do social login after login to SAS

* feat(auth): wip social login via curity

* Setup social login auth flow

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

* Added support for getting scandic tokens and refresh them

* feat: Enhance social login and session management with auto-refresh and improved error handling

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

* wrap layout in suspense

* revert app/layout.tsx

* fix import

* cleanup

* merge

* merge

* dont pass client_secret in the url to curity

* add state validation when doing social login through /authorize

* remove debug logging


Approved-by: Anton Gunnarsson
 2025-10-16 12:47:12 +00:00
Erik Tiekstra
800df0ade9 feat(BOOK-67): Added functionality to show/hide the chatbot 
Approved-by: Linus Flood
 2025-10-16 10:59:47 +00:00
Anton Gunnarsson
611d81222c Merged in feat/sw-3514-join-card-membership-id (pull request #2967) 
feat(SW-3514): Add variant of join friends card with membership id input

* Move membershipId input in enter details to join card

Add booking flow feature flag to move membershipId into join card and hide login button.
Currently only applies to first room.

* Add sas join card to multiroom


Approved-by: Hrishikesh Vaipurkar
 2025-10-16 08:24:20 +00:00
Bianca Widstam
e2403e11b3 Merged in fix/BOOK-131-noroomsavailability-tracking (pull request #2971) 
fix(BOOK-131): add action and domain

* fix(BOOK-131): add action and domain


Approved-by: Anton Gunnarsson
 2025-10-15 14:21:41 +00:00
Hrishikesh Vaipurkar
78ede453a2 Merged in feat/SW-3526-show-sas-eb-points-rate-in- (pull request #2933) 
feat(SW-3526): Show EB points rate and label in booking flow

* feat(SW-3526): Show EB points rate and label in booking flow

* feat(SW-3526) Optimized points currency code

* feat(SW-3526) Removed extra multiplication for token expiry after rebase

* feat(SW-3526): Updated to exhaustive check and thow if type error

Approved-by: Anton Gunnarsson
 2025-10-15 06:54:44 +00:00
Hrishikesh Vaipurkar
bdc44898d9 Merged in feat/SW-3540-fix-hotel-details-link-to-go- (pull request #2959) 
feat SW-3540 Fixed route for hotel details link in sidepeek
Approved-by: Anton Gunnarsson
 2025-10-14 08:41:15 +00:00
Erik Tiekstra
23f60d43bc fix(BOOK-442): Added isAlternative prop to MobileMapButtonContainer for alternative hotels flow 
Approved-by: Bianca Widstam
 2025-10-14 05:48:52 +00:00
Bianca Widstam
2dae57004c Merged in fix/login-banner (pull request #2940) 
fix: if user logged in then do not show join banner

* fix: if user logged in then do not show join banner


Approved-by: Linus Flood
 2025-10-09 12:14:37 +00:00
Erik Tiekstra
527ab170b5 fix(BOOK-405): Pushing to history when opening sidepeek to avoid navigating back inside the booking flow 
Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-09 11:34:58 +00:00
Bianca Widstam
00ad432910 Merged in fix/BOOK-377-clear-booking-widget-state (pull request #2929) 
fix(BOOK-377): clear date and guest data after confirmed booking

* fix(BOOK-377): clear date and guest data after confirmed booking


Approved-by: Erik Tiekstra
 2025-10-08 13:55:30 +00:00
Joakim Jäderberg
17df3ee71a Merged in feature/SW-3516-pass-eurobonus-number-on-booking (pull request #2902) 
* feat(SW-3516): Include partnerLoyaltyNumber on bookings

- Added user context to BookingFlowProviders for user state management.
- Updated booking input and output schemas to accommodate new user data.
- Refactored booking mutation logic to include user-related information.
- Improved type definitions for better TypeScript support across booking components.


Approved-by: Anton Gunnarsson
 2025-10-08 10:48:42 +00:00
Bianca Widstam
30b214c6ff Merged in feat/BOOK-131-tracking-no-availability (pull request #2886) 
feat(BOOK-131): add no availability tracking

* feat(BOOK-131): add no availability tracking

* feat(BOOK-131): add no availability tracking

* feat(BOOK-131): extract noAvailability function

* feat(BOOK-131): fix every render problem

* feat(BOOK-131): noavailability handle return in function


Approved-by: Erik Tiekstra
Approved-by: Joakim Jäderberg
 2025-10-07 06:59:49 +00:00
Bianca Widstam
f726b4f7e1 Merged in feat/BOOK-377-keep-booking-widget-state (pull request #2894) 
feat(BOOK-377): keep dates and rooms & guest in session storage

* feat(BOOK-377): keep dates and rooms & guest in session storage

* feat(BOOK-377): extract to hook and reuse


Approved-by: Erik Tiekstra
 2025-10-06 09:33:09 +00:00
Joakim Jäderberg
9292c437f4 fix(SW-3442) getLowestRoomPrice - cannot read property of undefined 
* fix: getLowestRoomPrice throws when given unexpected data
* dont track lowestRoomPrice if unavailable


Approved-by: Hrishikesh Vaipurkar
 2025-10-03 13:16:25 +00:00
Joakim Jäderberg
5bf18f0412 Merged in fix/optional-chaining-lint-issue (pull request #2905) 
* remove optional chaining with force unrwap


Approved-by: Bianca Widstam
 2025-10-03 12:50:30 +00:00
Joakim Jäderberg
ea5c82fef0 Merged in feature/SW-3515-join-scandic-friends-placeholder (pull request #2883) 
feat(SW-3515): display placeholder for join scandic friends

* feat(SW-3515): display placeholder for join scandic friends

* add missing variant config


Approved-by: Linus Flood
 2025-10-02 13:55:24 +00:00
Hrishikesh Vaipurkar
f3dc818c06 Merged in fix/SW-3442-tracking-event-lowestroomprice- (pull request #2797) 
fix(SW-3442): Fixed lowest price tracking and other lint issues

* fix(SW-3442): Fixed lowest price tracking and other lint issues


Approved-by: Joakim Jäderberg
 2025-10-02 07:31: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
Joakim Jäderberg
50bac104fc Merged in fix/nullcheck-localStorage (pull request #2875) 
fix(BOOK-397): localStorage could be undefined

* fix(BOOK-397): localStorage could be undefined


Approved-by: Linus Flood
 2025-09-26 12:59:50 +00:00
Linus Flood
12b5055afe Merged in feat/book-375-member-rates (pull request #2863) 
feat(BOOK-375): show no rate card when missing member rates

* feat(BOOK-375): show no rate card when missing member rates
 2025-09-26 10:18:47 +00:00
Linus Flood
2f1512edaa Merged in feat/book-395-queryselector (pull request #2870) 
feat(BOOK-395): fixed error in queryselector

* feat(BOOK-395): fixed error in queryselector


Approved-by: Anton Gunnarsson
 2025-09-26 10:17:28 +00:00
Bianca Widstam
7f3fd0c7a6 Merged in fix/BOOK-130-booking-code-filtering (pull request #2868) 
fix(BOOK-130): update booking code filtering on map view and filter and sort modal

* fix(BOOK-130): update booking code filtering on map view and filter and sort modal

* fix(BOOK-130): change name of filteredIds

* fix(BOOK-130): add initial value reduce


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
 2025-09-26 08:03:25 +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
Bianca Widstam
aa99a5d4f6 Merged in fix/BOOK-130-filter-booking-code-count (pull request #2856) 
fix(BOOK-130): update filter counts when using booking code

* fix(BOOK-130): update filter counts when using booking code

* fix(BOOK-130): change message


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-09-24 08:50:30 +00:00
Anton Gunnarsson
490013be62 Merged in chore/sw-3474-remove-unused-booking-flow-exports (pull request #2858) 
chore: (SW-3474): Remove unused exports from booking-flow

* Remove unused exports from booking-flow


Approved-by: Joakim Jäderberg
 2025-09-24 07:48:24 +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
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
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
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
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
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
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
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
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