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

77 Commits

Author SHA1 Message Date
Bianca Widstam
7db225a3ee Merged in fix/BOOK-529-my-stay-guarantee (pull request #3282) 
fix(BOOK-529): add card icon to payment cards, show scrollbar, add missing text

* fix(BOOK-529): add card icon to payment cards, show scrollbar, add missing text

* fix(BOOK-529): refactor savdecard

* fix(BOOK-529): fix lokaliseid

* fix(BOOK-529): paymentmethods


Approved-by: Joakim Jäderberg
 2025-12-03 13:04:02 +00:00
Christel Westerberg
69f194f7bf Merged in fix/handle-single-ancillaries (pull request #3231) 
Fix(STAY-128): Handle single ancillaries

* fix: refactor ancillaries flow

* fix: add logic to determine if an ancillary requires quantity

* fix: breakout ancillary description to its own component

* fix: cleanup

* fix: cleanup


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
 2025-11-28 15:02:45 +00:00
Bianca Widstam
46fa42750f Merged in feat/BOOK-529-update-GLA-design-mystay (pull request #3230) 
Feat/BOOK-529 update GLA design mystay

* feat(BOOK-529): update gla design on my stay

* feat(BOOK-529): open gla modal if error

* feat(BOOK-529): add inline accordion to storybook

* feat(529): move errormessage below message

* feat(529): update infomodal

* feat(BOOK-529): update infomodal

* feat(BOOK-529): hide guarantee info for adding ancillaries if prepaid

* feat(BOOK-529): update width on info dialog

* feat(BOOK-529): fix alignment

* feat(BOOK-529): check if member price

* feat(BOOK-529): refactor msg

* feat(BOOK-529): refactor terms and conditions to own component

* feat(BOOK-529): clean up confirmation step


Approved-by: Christel Westerberg
 2025-11-28 14:27:25 +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
Christel Westerberg
c3b71a05d9 Merged in fix/STAY-2-GLA-cancelled (pull request #3109) 
Fix/STAY-2 GLA cancelled

* fix: show toast on cancelling GLA flow

* fix: show the ancillary GLA errors as inline alerts


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
 2025-11-12 08:29:05 +00:00
Linus Flood
7fb95f436b Merged in feat/book-522-align (pull request #3101) 
feat(BOOK-522): align items in topmenu, header and booking widget

* feat(BOOK-522): align items in topmenu, header and booking widget

* Delete old css variable and use new

* Fixed underline on icons


Approved-by: Erik Tiekstra
 2025-11-07 11:06:56 +00:00
Matilda Haneling
2d237b8d14 Merged in fix/book-115-hidden-focus-indicators (pull request #2925) 
Fix/book 115 hidden focus indicators

* added focus ring to "how it works" text and close button in modal

* fix(BOOK-115): added focus ring to Hotel Sidepeek close button

* fix(BOOK-115): enabled selecting ancillaries with keyboard nav

* fix(BOOK-115): added focus indicator to "View and print receipt" in Manage Stay

* fix(BOOK-105 & BOOK-115): combined the two radio groups in payment selection to one, fixes focus indicator issue

* fix(BOOK-115): added focus indicator to shortcut links

* fix(BOOK-115): updated ancillaries keyboard selection

* fix(BOOK-115): removed tabIndex from Link component

* fix(BOOK-115): fixed single payment radio button not focusable

* fix(BOOK-115): updated  to onKeyDown

* added id to "credit card"

* removed toUpperCase() on lables

* removed brackets

* moved the focus indicator to the DS Button component

* removed !important from ButtonLink css

* changed <label> to <fieldset> and <legend> and added aria-label to PaymentOptionGroup

* removed css class from sidepeek that was previously removed

* reverted changes and synced Guarantee radiogroup with Payment radiogroup to use same semantics

* removed duplicate label

* removed old sub heading


Approved-by: Erik Tiekstra
 2025-11-07 07:58:14 +00:00
Christel Westerberg
57300e588e Merged in fix/STAY-97 (pull request #3092) 
fix: Change copy of Total price in price summary ancillaries

* fix: Change copy of Total price in price summary ancillaries


Approved-by: Erik Tiekstra
 2025-11-06 15:13:59 +00:00
Christel Westerberg
a2e0f7244a fix: Hide opt-out option for ancillary email 2025-11-03 16:05:54 +01:00
Christel Westerberg
e8626d56af Merged in fix/STAY-82 (pull request #3055) 
fix(SA-82): add correct input name

* fix(SA-82): add correct input name


Approved-by: Erik Tiekstra
 2025-11-03 09:35:22 +00:00
Erik Tiekstra
6a342aaa9e chore: generated design system css variables from updated json file 
Approved-by: Matilda Landström
 2025-10-30 12:27:16 +00:00
Christel Westerberg
377c8886ad Merged in fix/STAY-73-opt-in-email (pull request #3028) 
Fix/STAY-73 opt in email

* fix: let user opt-in for modification email when adding ancillaries

* fix: add toast when successfully removing an ancillary


Approved-by: Erik Tiekstra
Approved-by: Elin Svedin
 2025-10-29 12:45:18 +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
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
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
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
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
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
Joakim Jäderberg
6fa301f8e7 Merged in SW-3396-move-my-saved-cards-to-design-system (pull request #2762) 
SW-3396 move my saved cards to design system

* Move PaymentOption, PaymentOptionsGroup, PaymentIcons and MySavedCards (renamed SelectPaymentMethod) to design-system

* Remove unused svg payment icons

* cleanu

* cleanup

* trackUpdatePaymentMethod: remove hotelId argument that was never passed


Approved-by: Anton Gunnarsson
 2025-09-04 13:01:36 +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
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
Hrishikesh Vaipurkar
44fce176e9 Merged in chore/SW-3246-move-alert-to-design-system (pull request #2698) 
chore(SW-3246): Moved Alert component into design system

* chore(SW-3246): Moved Alert component into design system

* chore(SW-3246): Optimsed code and imports

* chore(SW-3246): Moved type AlertTypeEnum and other to common package


Approved-by: Anton Gunnarsson
 2025-08-26 11:22:38 +00:00
Matilda Landström
7891ae3ae6 Merged in feat/SW-3232-site-config-alerts (pull request #2671) 
feat(SW-3232): update alert schema

* feat(SW-3232): update alert schema


Approved-by: Erik Tiekstra
 2025-08-20 09:18:00 +00:00
Anton Gunnarsson
04aebb372c Merged in feat/sw-3238-move-modal-to-design-system (pull request #2628) 
feat(SW-3238): Move modal to design system

* Move Modal to design-system

* Remove temp modal from booking-flow


Approved-by: Joakim Jäderberg
 2025-08-14 07:14:51 +00:00
Anton Gunnarsson
800dc5c3c1 Merged in feat/sw-3225-move-parking-information-to-booking-flow (pull request #2614) 
feat(SW-3225): Move ParkingInformation to design-system

* Inline ParkingInformation types to remove trpc dependency

* Move ParkingInformation to design-system

* Move numberFormatting to common package

* Add deps to external

* Fix imports and i18n script

* Add common as dependency

* Merge branch 'master' into feat/sw-3225-move-parking-information-to-booking-flow


Approved-by: Linus Flood
 2025-08-12 12:36:31 +00:00
Anton Gunnarsson
8518d018f8 Merged in feat/sw-3230-move-link-to-design-system (pull request #2618) 
feat(SW-3230): Move Link to design-system

* Move Link to design-system

* Remove comments


Approved-by: Linus Flood
 2025-08-12 12:35:20 +00:00
Anton Gunnarsson
1bd8fe6821 Merged in feat/sw-2879-booking-widget-to-booking-flow-package (pull request #2532) 
feat(SW-2879): Move BookingWidget to booking-flow package

* Fix lockfile

* Fix styling

* a tiny little booking widget test

* Tiny fixes

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Remove unused scripts

* lint:fix

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Tiny lint fixes

* update test

* Update Input in booking-flow

* Clean up comments etc

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Setup tracking context for booking-flow

* Add missing use client

* Fix temp tracking function

* Pass booking to booking-widget

* Remove comment

* Add use client to booking widget tracking provider

* Add use client to tracking functions

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Move debug page

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package


Approved-by: Bianca Widstam
 2025-08-05 09:20:20 +00:00
Hrishikesh Vaipurkar
2f72a0437b Merged in chore/SW-3145-move-country (pull request #2545) 
chore: SW-3145 Moved country into design system

* chore: SW-3145 Moved country into design system


Approved-by: Anton Gunnarsson
 2025-07-10 12:20:49 +00:00
Anton Gunnarsson
e5f8394f50 Merged in chore/move-checkbox-component (pull request #2501) 
chore(SW-3145): Move checkbox component to design-system

* Inline type

* Remove error handling from Checkbox internals

* Move Form/Checkbox

* Fix self referencing imports


Approved-by: Joakim Jäderberg
 2025-07-03 08:37:01 +00:00
Anton Gunnarsson
75a377b59e Merged in chore/sw-3145-move-body (pull request #2505) 
chore(SW-3145): Move Body component to design-system

* Move Body component to design-system


Approved-by: Joakim Jäderberg
 2025-07-03 08:04:36 +00:00
Anton Gunnarsson
be25be7bb5 Merged in feat/sw-3125-move-client-trpc-setup (pull request #2493) 
feat(SW-3125): Move client trpc setup

* Move client trpc to package

* Client setup in partner-sas

* Add todo


Approved-by: Linus Flood
 2025-07-01 12:41:28 +00:00
Anton Gunnarsson
002d093af4 Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389) 
feat(SW-2863): Move contentstack router to trpc package

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-26 07:53:01 +00:00
Christian Andolf
6ca79d6bab chore: replace old primary background token with new one 2025-06-17 15:37:26 +02:00
Christian Andolf
9551a629fa refactor: move divider to design system 
remove not used variants and duplicate colors
 2025-06-13 11:27:50 +02:00
Michael Zetterberg
17f1a59e97 fix: sync English labels 2025-06-03 12:02:49 +02:00
Christian Andolf
b3b3704c86 feat: update links default color to match design documents 2025-06-02 15:34:40 +02:00
Anton Gunnarsson
f46bc8f920 Update @hookform/resolvers 
In v5 the zod resolver will automatically infer the type for `useForm`.
It's not recommended to manually specify types.
See https://github.com/react-hook-form/resolvers/releases/tag/v5.0.0
 2025-05-22 14:00:39 +02:00
Bianca Widstam
c4229c2dd2 Merged in fix/SW-2853-tracking-breakfast-ancillaries (pull request #2188) 
fix(SW-2853): tracking for breakfast ancillaries

* fix(SW-2853): tracking for breakfast ancillaries

* fix(SW-2853): viewAncillary event fix for breakfast

* fix(SW-2853): pr comment spread room facilities


Approved-by: Tobias Johansson
 2025-05-22 10:05:54 +00:00
Linus Flood
ad5ec80645 Merged in feat/sw-2855-urls (pull request #2177) 
feat: sw-2855 urls

* feat: sw-2855 urls


Approved-by: Joakim Jäderberg
 2025-05-21 09:11:02 +00:00
Michael Zetterberg
f3936f41d8 Merged in fix/label-sync (pull request #2163) 
fix: english label sync

* fix: english label sync

* fix: sync from Lokalise


Approved-by: Linus Flood
 2025-05-21 04:11:22 +00:00
Hrishikesh Vaipurkar
fa7d94093e Merged in feat/SW-2612-mystay-breakfast-buffet-u (pull request #2059) 
Feat: SW-2612 Updated breakfast ancillary UI and Optimised code

* Feat: SW-2612 Updated breakfast ancillary UI and Optimised code

* feat: SW-2612 Updated UI as per figma

* feat: SW-2612 Optimised code

* feat: SW-2612 Optimised code


Approved-by: Tobias Johansson
 2025-05-16 08:32:54 +00:00
Bianca Widstam
32618ad318 Merged in fix/add-breakfast-wrong-quantity (pull request #2086) 
fix: check if breakfast and refill modal with correct confirmation if cancelled/error payment

* fix: check if breakfast and refill modal with correct confirmation if cancelled/error payment

* fix: only include packages with quantity


Approved-by: Linus Flood
Approved-by: Matilda Landström
 2025-05-14 08:12:45 +00:00
Simon Emanuelsson
b7c78a53b5 feat: add support for bought children breakfast package 2025-05-13 10:01:26 +00:00
Bianca Widstam
45f61bd81e Merged in fix/SW-2716-wrong-package-for-breakfast (pull request #2063) 
fix: add correct package for callback

* fix: add correct package for callback


Approved-by: Niclas Edenvin
Approved-by: Linus Flood
 2025-05-13 06:51:31 +00:00
Hrishikesh Vaipurkar
f4c31449c3 Merged in feat/SW-2612-mystay-breakfast-buffet-u (pull request #2034) 
feat: SW-2612 Display value of breakfast multiplied with adults and children

* feat: SW-2612 Display value of breakfast multiplied with adults and children


Approved-by: Niclas Edenvin
 2025-05-12 07:05:31 +00:00
Bianca Widstam
868c4aefec Merged in fix/SW-2608-add-per-night-child-breakfast (pull request #1993) 
fix(SW-2608): add per night for children breakfast

* fix(SW-2608): add per night for children breakfast

* fix(SW-2608): capitalized according to figma


Approved-by: Michael Zetterberg
 2025-05-07 13:58:06 +00:00
Bianca Widstam
1438007d89 fix(SW-2608): add night on breakfast modal 2025-05-06 04:01:38 +00:00
Michael Zetterberg
b910b6a313 feat(SW-2116): Use refId instead of confirmationNumber 2025-05-05 12:26:37 +00:00
Christian Andolf
d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00