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

52 Commits

Author SHA1 Message Date
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
Linus Flood
6979ac0c3b Merged in revert-pr-1925 (pull request #1927) 
Revert "Feat/sw 2323 find booking (pull request #1925)"

Approved-by: Anton Gunnarsson
 2025-05-02 13:05:42 +00:00
Arvid Norlin
74d37dad93 feat(SW-2116): RefId instead of confirmationNumber 2025-05-02 12:44:07 +02:00
Bianca Widstam
7070770581 Merged in fix/SW-2406-update-modal-ancillaries (pull request #1911) 
fix(SW-2406): update modal for ancillaries

* fix(SW-2406): update modal for ancillaries

* fix(SW-2406): revert translations


Approved-by: Niclas Edenvin
Approved-by: Erik Tiekstra
 2025-04-30 08:20:57 +00:00
Joakim Jäderberg
c1505ce50e Merged in feature/warmup (pull request #1887) 
* unified warmup function

Approved-by: Linus Flood
 2025-04-29 06:18:14 +00:00
Bianca Widstam
bfc25453c7 Merged in fix/SW-1415-my-stay-tracking-hotelId (pull request #1880) 
fix(SW-1415): add hotelId in tracking for my stay

* fix(SW-1415): add hotelId in tracking for my stay

* fix: remove toast if cancel guarantee

* fix(SW-1415): rebase master

* fix(SW-1415): fix comment shorthand hotelId


Approved-by: Christian Andolf
 2025-04-28 13:20:18 +00:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Chuma Mcphoy (We Ahead)
169094fc37 Merged in refactor/SW-2476-use-react-aria-radio-group-for-payment-options (pull request #1849) 
Refactor(SW-2177): Use react aria RadioGroup & Radio for payment options

* fix(SW-SW-2177): enhance accessibility for payment options

* Added keyboard navigation support to payment options.
* Updated CSS to improve focus styles for payment option labels.

* refactor: use RadioGroup & Radio from react aria for payment options

* refactor(SW-2177): replace setValue and watch with useController for payment method handling

* fix(SW-2177): remove comment and use cx for styles on PaymentOption

* fix(SW-2177): Add keyboard focus indicator to payment option


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
 2025-04-24 11:22:36 +00:00
Michael Zetterberg
af65fbf7f4 fix: rename trpc route for get booking 2025-04-15 05:20:24 +00:00
Michael Zetterberg
440e1f92df feat(SW-706): make eslint rule 'formatjs/no-literal-string-in-jsx' pass 2025-04-14 11:30:06 +00:00
Bianca Widstam
77c03905e4 Merged in fix/hide-payment-if-only-points (pull request #1741) 
Feat(SW-1943): add new design for pay ancillaries with points

* fix: hide card and payment info if only quantity with points is selected

* feat(SW-1943): add new design for pay ancillaries with points

* feat(SW-1943): add missing translation

* feat(SW-1943): fix rebase

* feat(SW-1943): remove console log


Approved-by: Linus Flood
Approved-by: Matilda Landström
 2025-04-10 06:18:02 +00:00
Matilda Landström
1239f0c662 Merged in feat/SW-1711-SW-2077-icons (pull request #1709) 
Fix(SW-1711)/(SW-2077): Export icons individually

* fix(SW-1711): export icons individually


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
 2025-04-07 07:25:25 +00:00
Bianca Widstam
9129e2f468 Merged in fix/SW-2072-ancillary-price-details-ui (pull request #1723) 
fix(SW-2072): fix price details on ancillaries

* fix(SW-2072): fix price details on ancillaries


Approved-by: Niclas Edenvin
 2025-04-03 12:18:49 +00:00
Niclas Edenvin
a34951e075 Merged in fix/add-multinight-breakfast (pull request #1705) 
The number of breakfasts and total sums weren’t correctly calculated. This fixes that.

Also changes display logic of when the ancillaries sections are shown

Approved-by: Bianca Widstam
 2025-04-02 16:03:50 +00:00
Linus Flood
e4907d4b47 Merged in fix/destinations-speed-test (pull request #1704) 
Feat(destination pages): Performance improvements

* fix/destinations: try cache full response

* Added more caching

* Removed unsed env car

* wip

* merge master

* wip

* wip

* wip

* Renaming


Approved-by: Michael Zetterberg
 2025-04-02 11:37:22 +00:00
Erik Tiekstra
b6db9757d8 fix(SW-2073): Links for terms & conditions and privacy policy are moved out of the label for ancillaries and gla 
Approved-by: Matilda Landström
 2025-04-02 07:53:41 +00:00
Bianca Widstam
35c1724afb Merged in feat/SW-1997-tracking-gla-my-stay-ancillaries (pull request #1657) 
Feat/SW-1997 tracking gla my stay ancillaries

* feat(SW-1996): tracking gla my stay

* feat(SW-1996): update gla tracking

* feat(SW-1996): fix comment

* feat(SW-1997): add tracking for gla my stay and ancillaries

* feat(SW-1997): rebase master

* feat(SW-1997): fix duplicate import

* feat(SW-1997): add hotelId and category for ancillaries, and add more tracking

* feat(SW-1997): remove commments and fix spelling mistake

* feat(SW-1997): if addAncillary failed, but guarantee is successful, default to card in booking


Approved-by: Niclas Edenvin
 2025-04-01 09:38:36 +00:00
Bianca Widstam
e6c9e25222 Merged in fix/my-stay-ancillaries (pull request #1663) 
fix: small design fix, fix bug that redirects to planet, add translations

* fix: small design fix, fix bug that redirects to planet, add translations

* fix: if user does not have enough points, default quantitywithcard to 1

* fix: fix pr comment


Approved-by: Linus Flood
Approved-by: Matilda Landström
 2025-04-01 09:05:42 +00:00
Niclas Edenvin
dff67ea568 Merged in feat/sw-1839-show-added-breakfast (pull request #1673) 
Feat/sw-1839 show added breakfast

* Fix wrong space character

* Change to correct CSS variable

* Show added breakfast ancillary in the "My add-ons" section

* Show breakfast info in room card

* Show breakfast in price details table

* Format price


Approved-by: Pontus Dreij
 2025-03-31 13:43:39 +00:00
Simon Emanuelsson
ebaea78fb3 feat(SW-1717): rewrite select-rate to show all variants of rate-cards 2025-03-28 17:07:54 +00:00
Niclas Edenvin
8eec465afa Merged in feat/sw-1681-add-breakfast (pull request #1635) 
Feat/sw-1681 add breakfast
This implements the add breakfast flow

Approved-by: Pontus Dreij
 2025-03-27 12:40:54 +00:00
Matilda Landström
5de2a993a7 Merged in feat/SW-1711-switch-icons (pull request #1558) 
Switches out all the old icons to new ones, and moves them to the design system. The new icons are of three different types: Materialise Symbol, Nucleo, and Customized. Also adds further mapping between facilities/amenities and icons.

Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
 2025-03-27 09:42:52 +00:00
Niclas Edenvin
fef3a785d0 Merged in feat/sw-1688-list-breakfast (pull request #1615) 
Feat/sw-1688 list breakfast

Approved-by: Pontus Dreij
 2025-03-25 09:56:05 +00:00
Bianca Widstam
272c492b76 Merged in feat/SW-1943-ancillaries-with-points (pull request #1598) 
feat(SW-1943): fix design to pay with points

* feat(SW-1943): fix design to pay with points


Approved-by: Niclas Edenvin
 2025-03-21 13:44:14 +00:00
Bianca Widstam
3c1eee88b1 Merged in feat/SW-1370/Guarantee-my-stay-ancillaries (pull request #1545) 
Feat/SW-1370/Guarantee my stay ancillaries

* feat(SW-1370): guarantee for ancillaries

* feat(SW-1370): remove console log

* feat(SW-1370): add translations

* feat(SW-1370): small fix

* feat(SW-1370): fix must be guaranteed

* feat(SW-1370): fix logic and comments pr

* feat(SW-1370): fix comments pr

* feat(SW-1370): fix comments pr

* feat(SW-1370): add translation

* feat(SW-1370): add translation and fix pr comment

* feat(SW-1370): fix pr comment

* feat(SW-1370): fix encoding path refId issue

* feat(SW-1370): refactor AddAncillaryStore usage and introduce context provider

* feat(SW-1370): refactor

* feat(SW-1370): refactor ancillaries

* feat(SW-1370): fix merge


Approved-by: Simon.Emanuelsson
 2025-03-21 07:29:04 +00:00
Bianca Widstam
abd401c4f4 Merged in feat/SW-1368-1369-Guarantee-late-arrival (pull request #1512) 
Feat/SW-1368 1369 Guarantee late arrival

* feat(SW-1368-SW-1369): guarantee late arrival for confirmation page and my stay

* feat(SW-1368-SW-1369): guarantee late arrival updated design

* feat(SW-1368-SW-1369): add translations

* feat(SW-1368-SW-1369): add translations

* feat(SW-1368-SW-1369): fix merge with master

* feat(SW-1368-SW-1369): add translations

* feat(SW-1368-SW-1369): add redirect with refId

* feat(SW-1368-SW-1369): if booking completed redirect to confirmation page

* feat(SW-1368-SW-1369): fix comments pr

* feat(SW-1368-SW-1369): fix comments pr

* feat(SW-1368-SW-1369): fix rebase master

* feat(SW-1368-SW-1369): fix duplicate flex rate check

* feat(SW-1368-SW-1369): if any room is flex, card must be used

* feat(SW-1368-SW-1369): move callback route

* feat(SW-1368-SW-1369): top align checkbox

* feat(SW-1368-SW-1369): top align checkbox


Approved-by: Tobias Johansson
Approved-by: Niclas Edenvin
 2025-03-14 10:43:14 +00:00