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

208 Commits

Author SHA1 Message Date
Linus Flood
ddaa2a0e20 Merged in fix/branch-sync-2 (pull request #2643) 
Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master

* Merge branch 'master' into fix/branch-sync-2

* Revert branch sync

* Ignore ignore script

* Merge branch 'master' into fix/branch-sync-2
 2025-08-13 12:31:28 +00:00
Linus Flood
2bf1d8e22b Merged in fix/branch-sync-2 (pull request #2642) 
Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master

* Merge branch 'master' into fix/branch-sync-2

* Revert branch sync
 2025-08-13 12:19:56 +00:00
Anton Gunnarsson
08159d326a Merged in feat/sw-3239-move-imagegallery-to-design-system (pull request #2633) 
feat(SW-3239): Move imagegallery to design system

* Inline types

* Move ImageGallery to design-system


Approved-by: Matilda Landström
 2025-08-13 12:16:59 +00:00
Linus Flood
83256695db Merged in fix/branch-sync-2 (pull request #2640) 
Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master
 2025-08-13 11:59:28 +00:00
Linus Flood
cf4a9bfa84 Merged in fix/branch-sync-2 (pull request #2639) 
feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script
 2025-08-13 11:42:54 +00:00
Anton Gunnarsson
29292fd157 Merged in feat/sw-3231-move-lightbox-to-design-system (pull request #2619) 
feat(SW-3231): Move Lightbox to design-system

* Move Lightbox to design-system

* Fix self-referencing imports

* Fix broken import


Approved-by: Matilda Landström
 2025-08-13 11:02:59 +00:00
Anton Gunnarsson
e92c0465cc Merged in feat/sw-3242-move-opening-hours-to-design-system (pull request #2629) 
feat(SW-32429: Move OpeningHours to design-system

* Move OpeningHours to design-system


Approved-by: Joakim Jäderberg
 2025-08-13 07:05:23 +00:00
Anton Gunnarsson
124f743df7 Merged in fix/sw-3227-add-language-param-to-point-exchange-endpoint (pull request #2627) 
fix: Add language param to point exchange endpoint

* Add language param to point exchange endpoint


Approved-by: Bianca Widstam
 2025-08-12 14:08:01 +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
Linus Flood
9362d09730 Merged in fix/branch-sync (pull request #2625) 
fix(branch sync): check if cached commit ref exists before ignoring builds

* fix(branch sync): check if cached commit ref exists before ignoring builds


Approved-by: Joakim Jäderberg
 2025-08-12 11:56:17 +00:00
Joakim Jäderberg
855f795d50 Merged in feature/transpile-design-system (pull request #2621) 
Feature/transpile design system

* remove example, we should use storybook instead

* remove example, we should use storybook instead

* css-modules cannot have :root, moved affected css-variables to globals.css

* .

* scandic-web no longer depends on design-system#build

* * Update readme
* Remove test code


Approved-by: Anton Gunnarsson
 2025-08-12 09:07:33 +00:00
Hrishikesh Vaipurkar
54e57843d5 Merged in feat/SW-3224-move-bookingcode-filter-to-booking-flow (pull request #2608) 
feat(SW-3224): Move bookingcode filter to the booking-flow package

* feat(SW-3224): Moved bookingcode filter to the booking-flow package


Approved-by: Anton Gunnarsson
 2025-08-11 12:10:59 +00:00
Matilda Landström
37c311d826 Merged in feat/SW-2528-restaurant-icons-sidepeek (pull request #2610) 
feat(SW-2528): add restaurant type icon to sidepeek

* feat(SW-2528): add restaurant type icon to sidepeek


Approved-by: Anton Gunnarsson
 2025-08-11 11:45:20 +00:00
Anton Gunnarsson
00b124d15a Merged in feat/sw-3226-move-buttonlink-to-design-system (pull request #2613) 
feat(SW-3226): Move ButtonLink to design-system

* Move ButtonLink to design-system

* Fix Button import


Approved-by: Linus Flood
 2025-08-11 10:53:00 +00:00
Bianca Widstam
b5a8ef6588 Merged in fix/SW-3187-dot-fi-date (pull request #2606) 
fix(SW-3187): add dot to fi date

* fix(SW-3187): add dot to fi date


Approved-by: Anton Gunnarsson
 2025-08-08 05:37:51 +00:00
Anton Gunnarsson
8824af240b Merged in feat/sw-3219-move-accordion-to-design-system (pull request #2601) 
feat(SW-3219): Move accordion to design-system

* Inline types

* Move Accordion to design-system


Approved-by: Bianca Widstam
 2025-08-07 14:30:36 +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
Hrishikesh Vaipurkar
271d5ec32c Merged in fix/SW-3199-prod-users-are-displayed-with- (pull request #2592) 
fix(SW-3199): Fixed redemption search for alternative hotels

* fix(SW-3199): Fixed redemption search for alternative hotels

* fix(SW-3199): User points validation included


Approved-by: Anton Gunnarsson
 2025-08-07 07:29:32 +00:00
Bianca Widstam
4b3d59f75b Merged in fix/SW-2345-ui-map-close-icon-filter (pull request #2599) 
fix(SW-2345): ui fixes for map etc

* fix(SW-2345): ui fixes for map etc


Approved-by: Anton Gunnarsson
 2025-08-06 11:26:12 +00:00
Anton Gunnarsson
7fb082f712 Merged in feat/sw-3218-move-sidepeek-to-design-system (pull request #2598) 
feat(SW-3218): Move SidePeek to design-system

* Remove SidePeekProvider dependency on Next

* Remove dependency on i18n in sidepeek

* Inline types

* Move SidePeek to design-system

* Fix align-items value


Approved-by: Bianca Widstam
 2025-08-06 08:35:34 +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
Anton Gunnarsson
03c9244fdf Merged in feat/sw-2873-move-backtotopbutton-to-design-system (pull request #2593) 
feat(SW-2873): Move BackToTopButton to design-system

* Remove dependency on i18n in BackToTopButton

* Move BackToTopButton to design-system


Approved-by: Hrishikesh Vaipurkar
 2025-08-05 08:41:31 +00:00
Anton Gunnarsson
6b43022c7d Merged in feat/sw-2873-move-tripadvisorchip-to-booking-flow (pull request #2591) 
feat(SW-2873): Move TripAdvisorChip to booking-flow

* Move TripAdvisorChip to booking-flow


Approved-by: Hrishikesh Vaipurkar
 2025-08-05 08:39:48 +00:00
Anton Gunnarsson
b52a3f5847 Merged in feat/sw-3145-move-iconbyiconname-to-design-system (pull request #2589) 
Move icon components to design-system

* Move icon components to design-system


Approved-by: Hrishikesh Vaipurkar
 2025-08-04 11:32:00 +00:00
Matilda Landström
b7f2afb5e4 Merged in feat/SW-882-usp-card-icons (pull request #2586) 
feat(SW-882): add icons to USP card

* feat(SW-882): add icons to USP card


Approved-by: Anton Gunnarsson
 2025-08-01 14:48:25 +00:00
Anton Gunnarsson
7a3ee76206 Merged in feat/sw-3145-move-iconchip-to-design-system (pull request #2588) 
feat(SW-3145): Move IconChip to design-system

* Move IconChip to design-system


Approved-by: Hrishikesh Vaipurkar
 2025-08-01 14:21:05 +00:00
Hrishikesh Vaipurkar
33c274bce1 Merged in fix/SW-2926-hotel-special-alerts- (pull request #2580) 
fix(SW-2926): Display alerts in booking flow if date range matches search dates and in hotel page if current date is in date range

* fix(SW-2926): Display alerts in booking flow if date range matches search dates and in hotel page if current date is in date range

* fix(SW-2926) Updated hotel alerts with respect to booking dates

* fix(SW-2926): Optimized code


Approved-by: Matilda Landström
 2025-08-01 08:26:32 +00:00
Matilda Landström
e323ca9914 Merged in feat/SW-2511-hotel-page-map (pull request #2582) 
feat(SW-2511): hotel page map and marker improvements

* feat(SW-2511): update hotel page map

* fix(SW-2511): fix issue with identical id's for POIs


Approved-by: Anton Gunnarsson
 2025-07-31 09:06:48 +00:00
Hrishikesh Vaipurkar
03c327b449 Merged in fix/SW-2193-enter-details-incorrect-bed- (pull request #2573) 
fix(SW-2193): Updated bed type icon in sidepeek room details

* fix(SW-2193): Updated bed type icon in sidepeek room details


Approved-by: Matilda Landström
 2025-07-29 07:29:34 +00:00
Matilda Landström
9679212864 Merged in feat/SW-1956-add-English-caption-fallback (pull request #2574) 
Feat/SW-1956 add English caption fallback

* feat(SW-1956): add English fallback to gallery caption

* feat(SW-1956): add English fallback to gallery caption


Approved-by: Anton Gunnarsson
 2025-07-29 06:12:57 +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
Joakim Jäderberg
ef6235cf43 Merged in fix/stylus-failing-builds (pull request #2568) 
Remove stylus deps and replace with extension

* fix: remove stylus deps and replace with extension

* chore: update yarn.lock
 2025-07-23 09:16:49 +00:00
Matilda Landström
9328dbcf01 Merged in fix/SW-1561-title-color (pull request #2554) 
Fix/SW-1561: Hotel page UI small fixes

* fix(SW-1561): change text color to default black

* fix(SW-1561): fix typo


Approved-by: Chuma Mcphoy (We Ahead)
 2025-07-11 12:46:59 +00:00
Chuma Mcphoy (We Ahead)
960787f82c Merged in feat/LOY-285-SAS-marketing-banner-my-pages (pull request #2544) 
feat(LOY-285): SAS Link Account Banner for My Pages (Part 1)

* feat(LOY-285): SAS Link Account Banner for My Pages

* fix(LOY-285): )use new space variable

* fix(LOY-285): add alt to images


Approved-by: Matilda Landström
 2025-07-11 08:37:25 +00:00
Matilda Landström
2fee29f3f9 Merged in fix/SW-1561-hotelpage-ui (pull request #2542) 
Fix(SW-1561): Hotelpage design and token update

* fix(SW-1561): fix sidepeek subtitle

* fix(SW-1561): update mapCard to new tokens and update styling

* fix(SW-1561): correct Typography lowcase titles


Approved-by: Anton Gunnarsson
 2025-07-10 14:13:47 +00:00
Matilda Landström
04a495b536 Merged in fix/SW-2753-icon-header (pull request #2546) 
fix(SW-2753): update icon in top navigation

* fix(SW-2753): update icon in top navigation


Approved-by: Anton Gunnarsson
 2025-07-10 12:53:26 +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
Matilda Landström
3a7249484a Merged in fix/SW-2753-header-icon (pull request #2541) 
fix(SW-2753): change chevron in top navigation header

* fix(SW-2753): change chevron in top navigation header


Approved-by: Anton Gunnarsson
 2025-07-09 11:23:36 +00:00
Matilda Landström
19b58be654 Merged in feat/SW-1468 (pull request #2529) 
feat(SW-1468): add restaurant name mapping

* feat(SW-1468): add restaurant name mapping


Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
 2025-07-08 12:20:18 +00:00
Linus Flood
b35ceafc00 Merged in feat/SW-2903-tokens (pull request #2508) 
feat(SW-2358): Use personal token if logged in

* feat(SW-2903): Use personal token if logged in

* Avoid encoding values in cookie

* Fix tests


Approved-by: Anton Gunnarsson
 2025-07-08 11:24:31 +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
Matilda Landström
a68072d2f6 Merged in feat/SW-2311-campaign-tracking (pull request #2530) 
feat(SW-2311): add campaign page tracking

* feat(SW-2311): add campaign page tracking


Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
 2025-07-07 11:46:26 +00:00
Hrishikesh Vaipurkar
d8f9376cd7 Merged in chore/SW-3145-move-button (pull request #2531) 
chore: SW-3145 Moved Button component from TempDS to Design System package

* chore: SW-3145 Moved Button compoenent from TempDS to Design System package


Approved-by: Anton Gunnarsson
 2025-07-07 11:13:44 +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
Erik Tiekstra
903f419729 fix(SW-3081): Removed color option from hotel logos to avoid wrong colors 
Approved-by: Matilda Landström
 2025-07-04 11:40:09 +00:00