scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,889 Commits 2 Branches 0 Tags
1dffeb6be7bea09f797a31275ce656c19c59ec56
Commit Graph

175 Commits

Author SHA1 Message Date
Erik Tiekstra
b3c4761ae5 Merged in chore/BOOK-773-replace-old-typography-variables (pull request #3515) 
Chore/BOOK-773 replace old typography variables

* chore(BOOK-773): Replaced body typography

* chore(BOOK-773): Replaced caption typography

* chore(BOOK-773): Replaced footnote typography

* chore(BOOK-773): Replaced subtitle typography


Approved-by: Bianca Widstam
 2026-02-03 15:07:18 +00:00
Erik Tiekstra
8a143a2916 chore: Moved Breadcrumbs to design system and added stories 
Approved-by: Bianca Widstam
 2026-01-21 07:19:19 +00:00
Anton Gunnarsson
8a969f3908 Merged in fix/book-682-select-hotel-filter-jank (pull request #3362) 
fix(BOOK-682): Select Hotel jank

* Remove ChildrenWrapper


Approved-by: Linus Flood
 2025-12-17 09:14:06 +00:00
Anton Gunnarsson
e5149846e5 Merged in chore/upgrade-to-next16 (pull request #3305) 
chore(SW-3665): Upgrade to Next 16

* Upgrade partner-sas

* Upgrade scandic-web to next 16

* Update peerDep versions

* Fix revalidateTag

* Remove comment

* Merge branch 'master' into chore/upgrade-to-next16

* Update netlify adapter

* Build with webpack instead of turbopack

* Revert from proxy to middleware

* Merge branch 'master' into chore/upgrade-to-next16

* Revert proxy type

* Fix react types versions

* 16.0.9

* Bump to 16.0.10


Approved-by: Linus Flood
 2025-12-12 09:17:15 +00:00
Erik Tiekstra
f06e466827 Feat/BOOK-240 hero video 
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Christel Westerberg
 2025-12-11 08:35:27 +00:00
Linus Flood
3bd23bf56e Merged in feat/book-595-gla-tracking-fix (pull request #3294) 
feat(BOOK-595): fixed correct tracking values and enter details pageview tracking

* feat(BOOK-595): fixed correct tracking values and enter details pageview tracking

* Fixed on SAS as well


Approved-by: Joakim Jäderberg
 2025-12-05 08:01:48 +00:00
Linus Flood
a2c517db2c Merged in fix/hotel-branding-env (pull request #3239) 
Fix/hotel branding env

* feat(env): removed hotel branding env variable

* .


Approved-by: Erik Tiekstra
Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
 2025-11-27 13:08:42 +00:00
Christel Westerberg
2ae3fcb609 Merged in fix/STAY-17-find-my-booking-errors (pull request #3181) 
fix: improve error messages in find my booking flow

* fix: improve error messages in find my booking flow


Approved-by: Linus Flood
Approved-by: Erik Tiekstra
 2025-11-24 14:46:39 +00:00
Linus Flood
fd6909add5 Merged in feat/book-595-gla-tracking (pull request #3187) 
feat(BOOK-595): add pageview tracking to gla-callback and get-booking pages

* feat(BOOK-595): add pageview tracking to gla-callback and get-booking pages


Approved-by: Bianca Widstam
 2025-11-20 13:50:40 +00:00
Linus Flood
93c481fea8 Merged in feat/loy-403-seamless (pull request #3164) 
feat(LOY-403): removed seamless login/logout

* feat(LOY-403): removed seamless login/logout


Approved-by: Joakim Jäderberg
 2025-11-17 09:58:15 +00:00
Joakim Jäderberg
f6b06556f6 Merged in chore/typegen-nextjs-routes (pull request #3147) 
Make check-types dependent on next typegen

* add typegen as a prestep


Approved-by: Anton Gunnarsson
 2025-11-13 09:28:07 +00:00
Joakim Jäderberg
dc53ab9245 Merged in chore/upgrade-next (pull request #3124) 
Upgrade next@15.5.6

* chore: upgrade next@15.5.6

* chore: upgrade turborepo@2.6.1

* fix typings for scandic-web

* fix: set correct type for pages

* cleanup

* fix more route.ts typing issues

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/upgrade-next

* explicitly import the types


Approved-by: Linus Flood
 2025-11-13 07:33:56 +00:00
Erik Tiekstra
88644597df chore: Replaced deprecated Spacing variables with current values 
Approved-by: Matilda Landström
 2025-11-12 12:56:22 +00:00
Linus Flood
ecb25cf6cd Merged in feat/sw-3604-webviews (pull request #3123) 
feat(SW-3604): wrap mystay with bookingflowconfig

* feat(SW-3604): wrap mystay with bookingflowconfig


Approved-by: Joakim Jäderberg
 2025-11-11 09:37:54 +00:00
Hrishikesh Vaipurkar
28ae796b8c Merged in feat/BOOK-434-users-should-redirect-to- (pull request #3087) 
* feat(BOOK-434): Redirect user to city/country page if wrong filter url
* feat(BOOK-434): Handled map view

Approved-by: Erik Tiekstra
 2025-11-07 10:30:00 +00:00
Erik Tiekstra
0e11a772f1 feat(BOOK-450): Adjust Scandic logo in header when on a themed hotel page 
Approved-by: Chuma Mcphoy (We Ahead)
 2025-11-05 10:29:24 +00:00
Erik Tiekstra
3a38e99a71 Feat/BOOK-63 hotel subpages branding 
* feat(BOOK-63): Replaced css variables and components to apply hotel branding on subpages
* feat(BOOK-63): Replaced css variables and components to apply hotel branding on hotel page map view

Approved-by: Christel Westerberg
Approved-by: Matilda Landström
 2025-11-05 08:30:55 +00:00
Erik Tiekstra
4491d1de8e feat(BOOK-62): Added new InfoCard component and using that on hotel pages 
Approved-by: Bianca Widstam
 2025-11-04 07:39:33 +00:00
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
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
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
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
4469ab625c fix(BOOK-239): Fixes the preview functionality inside Contentstack 
Approved-by: Matilda Landström
 2025-10-14 09:28:19 +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
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
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
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
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
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
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
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
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
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
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
Erik Tiekstra
4c3ddea5c0 fix(SW-2143): Fixed layout issues on destination pages, also fixed background colors 
Approved-by: Matilda Landström
 2025-08-26 11:38:15 +00:00
Bianca Widstam
d9b858c823 Merged in feat/SW-3289-replace-sidepeek-hotel-reservation (pull request #2686) 
feat(SW-3289): replace sidepeek

* fix(SW-3289): replace sidepeek

* fix(SW-3289): add wrapping prop and change prop name to buttonVariant

* fix(SW-3289): replace body with typography

* fix(SW-3289): fix intl message


Approved-by: Joakim Jäderberg
 2025-08-22 11:43:39 +00:00