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

204 Commits

Author SHA1 Message Date
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
Hrishikesh Vaipurkar
1804f7b7cd Merged in chore/SW-3356-move-textarea-from-tempds-to-ds (pull request #2745) 
chore(SW-3356): Moved TextArea to design system

* chore(SW-3356): Moved TextArea to design system


Approved-by: Joakim Jäderberg
 2025-09-02 07:39:20 +00:00
Anton Gunnarsson
ecd567f54f Merged in feat/sw3370-move-phone-utils (pull request #2743) 
feat(SW-3370): Move phone utils to common

* Move phone utils to common

* Update lock file


Approved-by: Joakim Jäderberg
 2025-09-02 06:53:58 +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
0e00e8eaf1 Merged in fix/SW-3021-vouchers (pull request #2719) 
fix(SW-3021): add pluralization support for vouchers

* fix(SW-3021): add pluralization support for vouchers


Approved-by: Anton Gunnarsson
 2025-08-28 08:27:03 +00:00
Anton Gunnarsson
e4a66499e5 Merged in feat/sw-3322-move-base-tracking-to-common (pull request #2713) 
feat(SW-3322): Move base tracking to common package

* Move base tracking to common package

* Update lock file


Approved-by: Joakim Jäderberg
 2025-08-27 12:29:46 +00:00
Hrishikesh Vaipurkar
67bdf5bbcf Merged in chore/SW-3298-move-sidepeekselfcontrolled- (pull request #2710) 
chore(SW-3298): Moved SidePeekSelfControlled to design system

* chore(SW-3298): Moved SidePeekSelfControlled to design system


Approved-by: Anton Gunnarsson
 2025-08-26 14:29:54 +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
Joakim Jäderberg
c54c1ec540 Merged in SW-3270-move-interactive-map-to-design-system-or-booking-flow (pull request #2681) 
SW-3270 move interactive map to design system or booking flow

* wip

* wip

* merge

* wip

* add support for locales in design-system

* add story for HotelCard

* setup alias

* .

* remove tracking from design-system for hotelcard

* pass isUserLoggedIn

* export design-system-new-deprecated.css from design-system

* Add HotelMarkerByType to Storybook

* Add interactive map to Storybook

* fix reactintl in vitest

* rename env variables

* .

* fix background colors

* add storybook stories for <Link />

* merge

* fix tracking for when clicking 'See rooms' in InteractiveMap

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3270-move-interactive-map-to-design-system-or-booking-flow

* remove deprecated comment


Approved-by: Anton Gunnarsson
 2025-08-25 11:26:16 +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
Hrishikesh Vaipurkar
ce3b7a6a49 Merged in fix/SW-2846-bedtype-measurements- (pull request #2682) 
fix(SW-2846): Updated Bed Option to hide size when custom occupancy type

* fix(SW-2846): Updated Bed Option to hide size when custom occupancy type


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-08-22 07:45:01 +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
322268595d Merged in feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow (pull request #2600) 
feat(SW-2873): Move HotelReservationSidePeek to booking-flow

* Move sidepeek store to booking-flow

* Begin move of HotelReservationSidePeek to booking-flow

* Copy Link

* Update AccessibilityAccordionItem

* Split AccessibilityAccordionItem into two components

* Fix tracking for Accordion

* Duplicate ButtonLink to booking-flow TEMP

* AdditionalAmeneties

* wip

* Move sidepeek accordion items

* Remove temp ButtonLink

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Fix accordion tracking

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Update exports

* Fix self-referencing import

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Add 'use client' to tracking function

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Fix TEMP folder

* Refactor sidepeek tracking

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow


Approved-by: Joakim Jäderberg
 2025-08-14 12:25:40 +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
Joakim Jäderberg
e3067331c6 Merged in fix/remove-old-select-rate (pull request #2647) 
Fix/remove old select rate

* remove old select-rate

* Fix imports

* renamed SelectRate2 -> SelectRate
 2025-08-13 13:43:48 +00:00
Joakim Jäderberg
68cd061c6d Merged in feature/select-rate-vertical-data-flow (pull request #2535) 
Feature/select rate vertical data flow

* add fix from SW-2666

* use translations for room packages

* move types to it's own file

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow

* merge

* feature/select-rate: double rate for campaing rates

* revert NODE_ENV check in Cookiebot script

* revert testing values

* fix(SW-3171): fix all filter selected in price details

* fix(SW-3166): multiroom anchoring when changing filter

* fix(SW-3172): check hotelType, show correct breakfast message

* Merge branch 'feature/select-rate-vertical-data-flow' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow

* fix: show special needs icons for subsequent roomTypes SW-3167

* fix: Display strike through text when logged in SW-3168

* fix: Reinstate the scrollToView behaviour when selecting a rate SW-3169

* merge

* .

* PR fixes

* fix: don't return notFound()

* .

* always include defaults for room packages

* merge

* merge

* merge

* Remove floating h1 for new select-rate


Approved-by: Anton Gunnarsson
 2025-08-13 12:45:40 +00:00
Anton Gunnarsson
a2213d0169 Merged in feat/sw-3228-move-image-to-design-system (pull request #2616) 
feat(SW-3228): Move Image to design-system

* Move Image to design-system

* Merge branch 'master' into feat/sw-3228-move-image-to-design-system


Approved-by: Linus Flood
 2025-08-12 12:58:05 +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
Bianca Widstam
b704aa7936 Merged in fix/SW-3194-cross-validation-enter-details (pull request #2604) 
fix(SW-3194): crossvalidation for multiroom enter details

* fix(SW-3194): crossvalidation for multiroom enter details

* fix(SW-3194): use getValues


Approved-by: Hrishikesh Vaipurkar
 2025-08-08 11:50:14 +00:00
Hrishikesh Vaipurkar
6dd95d4a4a Merged in fix/SW-2367-mobile-ui-correction- (pull request #2603) 
Fix/SW-2367 mobile ui correction

* fix(SW-2367): UI updates

* fix(SW-2367): Optimised code


Approved-by: Bianca Widstam
 2025-08-07 13:00:11 +00:00
Bianca Widstam
9f4e2b3c45 Merged in fix/SW-2425-filter-label-lokalise (pull request #2602) 
fix(SW-2425): filter description should be translated with lokalise

* fix(SW-2425): filter description should be translated with lokalise


Approved-by: Anton Gunnarsson
 2025-08-06 14:09:32 +00:00
Bianca Widstam
75ffd5d10b Merged in fix/SW-2188-disabled-state (pull request #2597) 
fix(SW-2188): readonly for input fields

* fix(SW-2188): readonly for input fields


Approved-by: Anton Gunnarsson
 2025-08-06 07:14:28 +00:00
Bianca Widstam
5f2e215508 Merged in fix/SW-2188-disable-fields-logged-in-user-enter-details (pull request #2595) 
fix(SW-2188): disable enter details fields when logged in

* fix(SW-2188): disable enter details fields when logged in


Approved-by: Anton Gunnarsson
 2025-08-05 11:54:41 +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
5ff4234552 Merged in chore/SW-3145-move-date-to-design-system (pull request #2556) 
feat: SW-3145 Moved date component to design system

* chore: SW-3145 Moved date component to design system


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
 2025-07-28 09:05:25 +00:00
Hrishikesh Vaipurkar
42ab6e58b3 Merged in chore/SW-3145-move-phone (pull request #2549) 
chore/SW-3145 Moved Phone to design system

* chore/SW-3145 Moved Phone to design system

* chore: SW-3145 Moved phone and removed intl direct dependency


Approved-by: Anton Gunnarsson
 2025-07-28 08:28:07 +00:00
Hrishikesh Vaipurkar
f5e7519104 Merged in feat/SW-3074-enter-details-add-subject- (pull request #2558) 
feat: 3074 Added text Subject to availability

* feat: 3074 Added text Subject to availability


Approved-by: Erik Tiekstra
 2025-07-16 09:32:52 +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
Hrishikesh Vaipurkar
8ae251635d Merged in chore/SW-3145-move-radio-card (pull request #2533) 
chore: SW-3145 Moved RadioCard to design system

* chore: SW-3145 Moved RadioCard to design system

* chore: SW-3145 Optimized code

* chore: SW-3145 Optimized code


Approved-by: Anton Gunnarsson
 2025-07-08 08:25:00 +00:00
Hrishikesh Vaipurkar
71c6f4cab3 Merged in chore/SW-3145-move-button (pull request #2527) 
chore: SW-3145 Moved tempdesign button to design-system

* chore: SW-3145 Moved tempdesign button to design-system


Approved-by: Anton Gunnarsson
 2025-07-07 07:11:18 +00:00
Anton Gunnarsson
923206ee4c Merged in chore/sw-3145-move-subtitle (pull request #2516) 
chore(SW-3145): Move Title and Subtitle to design-system

* Move Title and Subtitle to design-system

* Fix export


Approved-by: Linus Flood
 2025-07-04 06:22:28 +00:00
Joakim Jäderberg
daf765f3d5 Merged in feature/wrap-logging (pull request #2511) 
Feature/wrap logging

* feat: change all logging to go through our own logger function so that we can control log levels

* move packages/trpc to using our own logger

* merge


Approved-by: Linus Flood
 2025-07-03 12:37:04 +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
0ffb40e94b Merged in chore/sw-3145-move-footnote (pull request #2506) 
chore(SW-3145): Move Footnote to design-system

* Move Footnote to design-system


Approved-by: Joakim Jäderberg
 2025-07-03 08:14:18 +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
a7ac79e429 Merged in chore/sw-3145-move-caption (pull request #2503) 
chore(SW-3145): Move Caption to design-system

* Move Caption to design-system

* Mark Caption as deprecated


Approved-by: Linus Flood
Approved-by: Joakim Jäderberg
 2025-07-03 07:48:24 +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
Tobias Johansson
d272cd03ce Merged in fix/SW-3115-form-tracking-changes (pull request #2470) 
fix(SW-3115): add form complete tracking and removed input error tracking

* fix(SW-3115): add form complete tracking and removed input error tracking


Approved-by: Bianca Widstam
 2025-07-01 06:44:08 +00:00
Simon Emanuelsson
361fd75133 fix: lowerCase firstname and lastname when matching between rooms 2025-06-30 13:16:59 +00:00
Anton Gunnarsson
4e1cb01b84 Merged in chore/cleanup-after-trpc-migration (pull request #2457) 
Chore/cleanup after trpc migration

* Clean up TODOs

* Rename REDEMPTION constant to SEARCH_TYPE_REDEMPTION

* Update dependencies

Remove unused deps from scandic-web
Add missing deps to trpc package

* Update self-referencing imports

* Remove unused variables from scandic-web env

* Fix missing graphql-tag package

* Actually fix

* Remove unused env var


Approved-by: Christian Andolf
Approved-by: Linus Flood
 2025-06-30 12:08:19 +00:00
Simon Emanuelsson
59f4a27cb1 feat: translate Voucher everywhere during booking flow 2025-06-30 10:57:00 +00:00
Anton Gunnarsson
01ca2b4897 Merged in feat/sw-2867-move-user-router-to-trpc-package (pull request #2428) 
Move user router to trpc package

* 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

* Move booking router to trpc package

* Move partners router to trpc package

* Move autocomplete router to trpc package

* Move booking router to trpc package

* Remove translations from My Pages navigation trpc procedure

* Move navigation router to trpc package

* Move user router to trpc package

* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package

* Merge branch 'feat/sw-2862-move-booking-router-to-trpc-package' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'feat/sw-2865-move-navigation-router-to-trpc-package' into feat/sw-2867-move-user-router-to-trpc-package

* Merge branch 'master' into feat/sw-2867-move-user-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-27 07:07:49 +00:00
Anton Gunnarsson
e572d9e7e9 Merged in feat/sw-2862-move-booking-router-to-trpc-package (pull request #2421) 
feat(SW-2861): Move booking router to trpc package

* 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

* Move booking router to trpc package

* Move partners router to trpc package

* Move autocomplete router to trpc package

* Move booking router to trpc package

* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-26 13:21:16 +00:00
Anton Gunnarsson
bbcabfa0ba Merged in feat/sw-2864-move-hotels-router-to-trpc-package (pull request #2410) 
feat (SW-2864): Move booking router to trpc package

* 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

* Move booking router to trpc package

* Merge branch 'master' into feat/sw-2864-move-hotels-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-26 09:02:59 +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
Bianca Widstam
ebc90a825d Merged in fix/SW-3020-tracking-card-type (pull request #2431) 
fix(SW-3020)-tracking-card-type

* fix(SW-3020): add card type for guarantee success

* fix(SW-3020): fix pr comment


Approved-by: Tobias Johansson
 2025-06-25 14:08:55 +00:00
Tobias Johansson
15adca9eb1 Merged in fix/SW-2707-no-availability-message (pull request #2420) 
fix(SW-2707): Added new error code and set alert again when errorCode is changed

* fix(SW-2707): Added new error code and set alert again when errorCode is changed


Approved-by: Michael Zetterberg
 2025-06-25 11:13:47 +00:00
Tobias Johansson
8272327993 Merged in fix/SW-2801-correct-date-formats (pull request #2400) 
fix(SW-2801): Added lang specific date formats

* fix(SW-2801): Added lang specific date formats

* fix: wrong type import


Approved-by: Michael Zetterberg
 2025-06-25 11:12:28 +00:00