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

287 Commits

Author SHA1 Message Date
Erik Tiekstra
5e81ec0eaf fix(BOOK-450): Re added the check for hotel branding feature flag before setting theme 
Approved-by: Bianca Widstam
Approved-by: Matilda Landström
 2025-10-29 14:06:59 +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
Joakim Jäderberg
9c78d6a98a Merged in fix/my-stay-bookingflowconfig-missing (pull request #3020) 
fix: wrap MyStay component in BookingFlowConfig to handle RSC problem where config is not set

* fix: wrap MyStay component in BookingFlowConfig to handle RSC problem where config is not set


Approved-by: Bianca Widstam
 2025-10-27 14:55:00 +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
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
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
Erik Tiekstra
038211bf09 feat(BOOK-450): Added theme to hotel page only, reverting previous theme handing on the body tag 
Approved-by: Linus Flood
 2025-10-16 12:54:03 +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
Erik Tiekstra
4469ab625c fix(BOOK-239): Fixes the preview functionality inside Contentstack 
Approved-by: Matilda Landström
 2025-10-14 09:28:19 +00:00
Erik Tiekstra
339e7195dc fix(BOOK-436): Added new section component and deprecated the other 
Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-13 08:31:26 +00:00
Matilda Landström
7bd75f01e4 Merged in fix/LOY-409-remove-promo-flag (pull request #2955) 
fix(LOY-409): Remove promo campaign flag

* fix(LOY-409): Remove promo campaign flag


Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-13 07:57:03 +00:00
Emma Zettervall
9d62333aca Merged in feat/LOY-377-margin-top (pull request #2912) 
Feat/LOY-377 margin top

* changed Title to Typography, added some css

* feat(LOY-377): Changed variants based on isUserLoggedIn in LoyaltyPageBreadcrubs and removed the previous added padding

* feat(LOY-377): Changed p to h1. Sends the variants to the skeleton aswell


Approved-by: Linus Flood
Approved-by: Matilda Landström
 2025-10-07 08:59:07 +00:00
Joakim Jäderberg
0e0efa48a8 Merged in fix/include-service-token-in-debug-data (pull request #2903) 
fix: include service token in the debug route

* fix: include service token in the debug route


Approved-by: Bianca Widstam
Approved-by: Hrishikesh Vaipurkar
 2025-10-03 13:16:51 +00:00
Joakim Jäderberg
bec3188199 Merged in fix/hotel-reservation-used-faulty-generateMetadata (pull request #2904) 
fix: hotelReservation used faulty generateMetadata

* fix: hotelReservation used faulty generateMetadata


Approved-by: Bianca Widstam
 2025-10-03 07:19:37 +00:00
Erik Tiekstra
7fcd5833bd feat(BOOK-414): Added hotel branding themes to hotelpages 
Approved-by: Matilda Landström
 2025-10-02 12:34:38 +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
332abdfba0 Merged in fix/metadata-details-page (pull request #2895) 
fix(SW-3490): Fix faulty metadata for enter-details

* fix(SW-3490): Fix faulty metadata for enter-details


Approved-by: Linus Flood
 2025-10-01 11:53:05 +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
0bcde9f74f feat(BOOK-58): Added destination filter pages to sitemap 
Approved-by: Linus Flood
 2025-09-30 13:17:14 +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
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
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
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
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
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
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
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
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
Erik Tiekstra
15a352ea99 feat(BOOK-68): Added kindly chatbot 
Approved-by: Linus Flood
 2025-09-11 12:44:47 +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
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
Hrishikesh Vaipurkar
a5790ee454 Merged in chore/SW-2878-extract-booking-confirmation-pag (pull request #2779) 
Chore/SW-2878 extract booking confirmation pag

* chore(SW-2878): Moved booking confirmation page to booking-flow package

* chore(SW-2878): Fixed promo styles as per design

* chore(SW-2878): Kept tiny duplicate function to avoid export from booking-flow package


Approved-by: Anton Gunnarsson
 2025-09-10 07:50:48 +00:00
Bianca Widstam
bba4e24569 Merged in fix/SW-3198-prices-select-rate (pull request #2763) 
fix(SW-3198): fix striketrhough/regular prices, the same in enter details as select rate

* fix(SW-3198): fix striketrhough/regular prices, the same in enter details as select rate

* fix(SW-3198): remove additonalcost if calculating cost per room

* fix(SW-3198): include bookingcode in specialrate

* fix(SW-3198): remove console log

* fix(SW-3198): add or operator

* fix(SW-3198): capture total return value

* fix(SW-3198): rename and move function


Approved-by: Joakim Jäderberg
Approved-by: Hrishikesh Vaipurkar
 2025-09-05 14:02:47 +00:00
Hrishikesh Vaipurkar
260a544c99 Merged in chore/SW-3381-move-loginbutton-to-ds- (pull request #2752) 
chore(SW-3381) Moved LoginButton to design system

* chore(SW-3381) Moved LoginButton to design system


Approved-by: Anton Gunnarsson
 2025-09-03 09:11:28 +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
Joakim Jäderberg
8c3f8c74db Merged in feature/SW-3365-blurry-images (pull request #2746) 
Feature/SW-3365 reduce upscaling of images (fix blurry images)

* fix: handle when images are wider than 3:2 but rendered in a 3:2 container

* use dimensions everywhere applicable

* fall back to using <img sizes='auto' /> if possible

* imageLoader: never nest

* remove empty test file


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
 2025-09-02 17:52:31 +00:00
Hrishikesh Vaipurkar
0a4bf40a15 Merged in chore/SW-3321-move-selectratecontext-to- (pull request #2729) 
chore(SW-3321): Moved Select rate context to booking-flow package

* chore(SW-3321): Moved Select rate context to booking-flow package

* chore(SW-3321): Optimised code


Approved-by: Joakim Jäderberg
 2025-09-02 07:40:01 +00:00
Anton Gunnarsson
65c6bc4c59 Merged in feat/sw-3369-move-loadingspinner (pull request #2742) 
feat(SW-3369): Move LoadingSpinner to design-system

* Move LoadingSpinner to design-system


Approved-by: Joakim Jäderberg
 2025-09-02 06:46:58 +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
Bianca Widstam
c7f00aca4d Merged in fix/SW-2844-fix-gap-mobile-menu (pull request #2732) 
* fix(SW-2844): remove gap mobile safari


Approved-by: Joakim Jäderberg
Approved-by: Hrishikesh Vaipurkar
 2025-09-01 07:28:48 +00:00
Matilda Landström
fbfd62b239 Merged in fix/SW-3328-campaign-page-fix (pull request #2726) 
Fix/SW-3328 campaign page design fix

* fix(SW-3328): align essentials text

* fix(SW-3328): campaign page design fix

* fix(SW-3328): update hero width

* fix(SW-3328): change burgundy code text


Approved-by: Erik Tiekstra
 2025-08-29 13:55:15 +00:00
Joakim Jäderberg
2a9313362f Merged in feature/SW-3327-move-hotel-info-card-to-design-system (pull request #2730) 
Feature/SW-3327 move hotel info card to design system

* wip

* wip

* wip

* wip moving hotelinfocard

* add controls for HotelInfoCard in storybook

* merge


Approved-by: Anton Gunnarsson
 2025-08-29 10:09:48 +00:00
Hrishikesh Vaipurkar
56db65d49a Merged in bug/SW-3319-tracking-remove-duplicate-webview (pull request #2711) 
fix(SW-3319): Removed duplicate webview key in pagename and sitesections

* fix(SW-3319): Removed duplicate webview key in pagename and sitesections


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-08-28 06:49:12 +00:00
Joakim Jäderberg
72f4f72a17 Merged in SW-3317-move-toast-to-design-system (pull request #2716) 
SW-3317 move toast to design system

* chore: Move toast to design-system and add interaction tests

* Move toast to design-system and add storybook tests

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3317-move-toast-to-design-system

* merge

* move sonner dependency to @scandic-hotels/design-system


Approved-by: Anton Gunnarsson
 2025-08-27 13:03:17 +00:00