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

95 Commits

Author SHA1 Message Date
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
Linus Flood
d82bd7d804 Merged in feat/lokalise-sync-151025 (pull request #2966) 
feat(lokalise): sync 15 oct

* feat(lokalise): sync 15 oct
 2025-10-15 07:21:56 +00:00
Hrishikesh Vaipurkar
01e9542ded Merged in fix/change-footer-partnerSas-link-to-public (pull request #2964) 
fix(SW-3520): Updated sas eurobonus link in footer
Approved-by: Anton Gunnarsson
 2025-10-14 09:33:06 +00:00
Hrishikesh Vaipurkar
36f44d1c0c Merged in fix/SW-3529-wl-site-logout-does-not-reload- (pull request #2947) 
Fix/SW-3529 wl site logout does not reload
Approved-by: Anton Gunnarsson
 2025-10-14 09:19:43 +00:00
Linus Flood
7b6c869f4e Merged in feat/lokalise-sync-131025 (pull request #2958) 
feat(lokalise): sync 13 oct

* feat(lokalise): sync 13 oct
 2025-10-13 11:53:17 +00:00
Hrishikesh Vaipurkar
c2096ade2e Merged in fix/SW-3528-hamburger-menu-partially-shown- (pull request #2946) 
feat(SW-3528): Fixed UI for close icon

Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
 2025-10-10 08:59:47 +00:00
Linus Flood
040de50c0e Merged in feat/lokalise-sync-091025 (pull request #2935) 
feat(lokalise): sync lokalise

* feat(lokalise): sync lokalise


Approved-by: Matilda Landström
 2025-10-09 13:11:34 +00:00
Hrishikesh Vaipurkar
3d99c986dc Merged in fix/footer-copyright-msg-label (pull request #2941) 
Fixed footer copyright label copy

Approved-by: Linus Flood
 2025-10-09 13:11:11 +00:00
Anton Gunnarsson
a5759205ec Merged in feat/sw-3525-sas-member-type-in-tracking (pull request #2931) 
feat(SW-3525): Set correct member type in tracking for partner-sas

* Set correct member type in tracking for partner-sas


Approved-by: Joakim Jäderberg
 2025-10-09 12:47:38 +00:00
Hrishikesh Vaipurkar
77ee88c6ea Merged in fix/SW-3528-hamburger-menu-partially-shown- (pull request #2936) 
fix(SW-3528): Fixed hamburger menu icon visibility and animation

Approved-by: Anton Gunnarsson
 2025-10-09 12:40:15 +00:00
Hrishikesh Vaipurkar
566dd54087 Merged in feat/SW-3520-update-footer-ui-and-footer-link (pull request #2910) 
feat(SW-3520): Updated the footer

* feat(SW-3520): Updated links to route to scandic web

* feat(SW-3520): Updated the footer with language switcher

* feat(SW-3520): Updated the Contact-us link and removed double slash


Approved-by: Anton Gunnarsson
 2025-10-09 06:44:58 +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
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
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
Joakim Jäderberg
df8e223d23 Merged in SW-3490-set-metadata-for-routes (pull request #2881) 
SW-3490 set metadata for routes
* feat(SW-3490): Set metadata title for hotelreservation paths

Approved-by: Anton Gunnarsson
 2025-10-01 11:34:52 +00:00
Erik Tiekstra
57315baf97 Merged in fix/scroll-to-top-issue (pull request #2892) 
fix: Update route info inside store before checking if path or lang has changed

* fix: Update route info inside store before checking if path or lang has changed


Approved-by: Linus Flood
 2025-10-01 11:15:59 +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
Anton Gunnarsson
94e5a06681 Merged in fix/sw-2328-start-page-tracking (pull request #2874) 
fix: Add TrackingSDK to partner-sas start page

* Add TrackingSDK to partner-sas start page

* Don't send pageId in partner-sas start page tracking


Approved-by: Joakim Jäderberg
 2025-09-29 08:57:56 +00:00
Joakim Jäderberg
e24c92918e Merged in fix/BOOK-398-polyfill-at (pull request #2876) 
Fix/BOOK-398 polyfill at

* fix(BOOK-398): Add polyfills for .at()

* fix(BOOK-398): Add polyfills for .at()


Approved-by: Linus Flood
 2025-09-29 06:58:31 +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
Anton Gunnarsson
da55e37489 Merged in feat/sw-3489-route-change-component (pull request #2845) 
feat(SW-3489): Add RouteChange component to partner-sas

* Add RouteChange component to partner-sas


Approved-by: Linus Flood
 2025-09-24 06:20:20 +00:00
Anton Gunnarsson
88b0b7764d Merged in fix/remove-extra-slash-in-sas-web-urls (pull request #2855) 
fix: Remove extra slash in urls from sas to scandic

* Remove extra slash in urls from sas to scandic


Approved-by: Joakim Jäderberg
 2025-09-23 13:19:49 +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
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
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
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
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
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
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
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
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
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
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
Hrishikesh Vaipurkar
def079021b Merged in feat/SW-3441-add-hero-floatingbookingwid (pull request #2789) 
feat(SW-3441): Add Hero image to sas landing page

* feat(SW-3441): Add Hero image to sas landing page

* feat(SW-3441): Code Optimise


Approved-by: Joakim Jäderberg
 2025-09-11 12:30:13 +00:00
Anton Gunnarsson
c6aebbd0b2 Merged in feat/sw-3415-set-up-cookiebot-in-partner-sas (pull request #2784) 
feat(SW-3415): Add CookieBotConsent to partner-sas

* Add CookieBotConsent


Approved-by: Joakim Jäderberg
 2025-09-11 12:29:52 +00:00
Joakim Jäderberg
4893eb8b25 Merged in SW-3459-setup-booking-confirmation-page-in-sas (pull request #2794) 
Setup booking-confirmation page in SAS

* Setup booking-confirmation page in SAS
move booking-confirmation tracking to booking-flow

* remove unused param

* Add test cards to documentation

* Fix payment callback page to use correct status


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
 2025-09-11 12:19:26 +00:00
Anton Gunnarsson
3e5263bf72 Merged in feat/sw-2877-move-payment-callback (pull request #2755) 
feat(SW-2877): Move payment callback page

* WIP move

* Add payment callback page to partner-sas


Approved-by: Joakim Jäderberg
 2025-09-11 09:06:11 +00:00
Joakim Jäderberg
c3e78fcadd Merged in feature/SW-3457-enter-details-on-sas (pull request #2792) 
Add enter-details page to SAS

* Add enter-details page to SAS


Approved-by: Anton Gunnarsson
 2025-09-11 09:05:47 +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
Anton Gunnarsson
4550ddec53 Merged in feat/sw-3416-add-sitewidealert-to-partner-sas (pull request #2773) 
feat(SW-3416): Add SiteWideAlert to partner-sas

* Add SiteWideAlert to partner-sas

* Remove log


Approved-by: Joakim Jäderberg
 2025-09-09 10:00:25 +00:00
Anton Gunnarsson
e68b029078 Merged in feat/sw-3414-add-fontpreload-to-partner-sas (pull request #2774) 
feat(SW-3414): Add FontPreload to partner-sas

* Add FontPreload


Approved-by: Joakim Jäderberg
 2025-09-09 08:47:11 +00:00
Anton Gunnarsson
261eeef3e2 Merged in feat/sw-3417-add-toasthandler-to-partner-sas (pull request #2775) 
feat(SW-3417): Add ToastHandler to partner-sas

* Add ToastHandler to partner-sas


Approved-by: Joakim Jäderberg
 2025-09-09 08:27:24 +00:00
Anton Gunnarsson
69268d88fb Merged in feat/sw-3418-add-routerprovider-to-partner-sas (pull request #2777) 
feat(SW-3418): Add RouterProvider to partner-sas

* Add RouterProvider


Approved-by: Joakim Jäderberg
 2025-09-09 08:20:17 +00:00
Matilda Landström
70f3b8f016 Merged in feat/Lokalise-update-080925 (pull request #2771) 
feat: Update from Lokalise 080925

* feat: Update from Lokalise 080925


Approved-by: Anton Gunnarsson
 2025-09-09 06:41:29 +00:00