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

115 Commits

Author SHA1 Message Date
Anton Gunnarsson
6b38d57197 Merged in chore/fix-broken-e2e-test (pull request #3031) 
chore: Fix broken e2e tests

* Update date picker selector


Approved-by: Joakim Jäderberg
 2025-10-29 15:24:09 +00:00
Joakim Jäderberg
56b44c16d4 Merged in chore/upgrade-netlify-nextjs-plugin (pull request #3032) 
chore: upgrade @netlify/plugin-nextjs

* chore: upgrade @netlify/plugin-nextjs


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
 2025-10-29 13:36:27 +00:00
Erik Tiekstra
4c10989e8e Feat/BOOK-424 campaign banner 
Approved-by: Bianca Widstam
 2025-10-29 12:47:40 +00:00
Erik Tiekstra
333636c81a Merged in feat/BOOK-61-refactor-hotel-page-css-variables (pull request #3014) 
Feat/BOOK-61 refactor hotel page css variables

* feat(BOOK-61): Breadcrumbs

* feat(BOOK-61): intro section

* feat(BOOK-61): show more button

* feat(BOOK-61): rooms section

* feat(BOOK-61): sidepeeks

* feat(BOOK-61): deprecated old Link component

* feat(BOOK-61): added new TextLink component to the design-system

* feat(BOOK-61): replaced deprecated links with new TextLink component

* feat(BOOK-61): miscellaneous changes


Approved-by: Bianca Widstam
Approved-by: Christel Westerberg
 2025-10-29 09:15:03 +00:00
Bianca Widstam
bfe5c5f8bb Merged in lokalize/sync (pull request #3024) 
lokalise sync

* lokalise sync

* lokalise sync and remove duplicate id


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
 2025-10-28 10:26:47 +00:00
Joakim Jäderberg
a4f1a55e56 Merged in feat/SW-3549-handle-unlinked-account (pull request #3019) 
fix(SW-3549): update social session management functions for clarity and consistency

* refactor(SW-3549): rename session management functions for clarity and consistency

* merge


Approved-by: Hrishikesh Vaipurkar
 2025-10-28 09:51:30 +00:00
Anton Gunnarsson
642f032512 Merged in fix/update-sas-join-card-text (pull request #2998) 
fix: Update SAS join card text and size

* Update SAS join card text and size


Approved-by: Joakim Jäderberg
 2025-10-28 08:17:04 +00:00
Matilda Landström
649c85e6f5 Merged in feat/Lokalise-fetch (pull request #3021) 
Update from Lokalise 27/10-25

* Update from Lokalise 27/10-25


Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-27 16:00:35 +00:00
Hrishikesh Vaipurkar
98e67f5eda Merged in fix/SW-3550-member-rates-should-only- (pull request #3005) 
fix(SW-3550): Treat unlinked User as non-logged user within booking flow

Approved-by: Joakim Jäderberg
 2025-10-27 14:34:19 +00:00
Joakim Jäderberg
3b3e7308cc Merged in feat/SW-3549-pass-scandic-token (pull request #2989) 
Feat/SW-3549 pass scandic token

* WIP pass scandic token

* pass scandic token when booking

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* pass user token when doing availability search

* undo changes

* merge

* 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

* Merged in fix/update-promo-error-modal-text (pull request #2990)

fix: update promo error modal text

* fix: update promo error modal text


Approved-by: Emma Zettervall

* 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

* 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

* Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994)

feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg

* merge

* replace getRedemptionTokenSafely() with context based instead

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* merge

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* add booking scope

remove unused getMembershipNumber()


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
 2025-10-24 13:17:02 +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
Hrishikesh Vaipurkar
d6941042de Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994) 
feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg
 2025-10-22 11:26:09 +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
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
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
Hrishikesh Vaipurkar
69a1b5f213 Merged in fix/SW-3526-show-sas-eb-points-rate- (pull request #2973) 
fix(SW-3526): Redirect user to login if points rate search and not logged in

Approved-by: Anton Gunnarsson
 2025-10-16 09:51:03 +00:00
Joakim Jäderberg
bb3ac1f105 Merged in fix/rename-logout-button (pull request #2978) 
Fix rename button logout -> log out

* rename button logout -> log out

* rename button login -> log in


Approved-by: Linus Flood
 2025-10-16 08:39:49 +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
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