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

263 Commits

Author SHA1 Message Date
Erik Tiekstra
92cb3f3663 fix(SW-3307): Filtered out duplicate facilities from hotel response 
Approved-by: Matilda Landström
 2025-08-29 13:00:25 +00:00
Joakim Jäderberg
a0fa238b27 Merged in fix/left-align-ameneties (pull request #2734) 
* left align sho all ameneties
 2025-08-29 11:48:40 +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
2e655619d1 feat(SW-3121): Added support for campaign text inside the hero of campaign pages 
* fix: making sure the cacheKey for getHotelsByHotelIds is not sorting the original array

Approved-by: Matilda Landström
 2025-08-28 13:46:48 +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
Erik Tiekstra
997f928f2b fix(SW-3028): Using hero heading instead of heading for campaign hero on hotel pages 
Approved-by: Matilda Landström
 2025-08-28 08:12:52 +00:00
Erik Tiekstra
fd48f86c90 feat/SW-3108 external links 
* feat(SW-3108): Added external link options to shortcuts
* feat(SW-3108): Added external link options to header

Approved-by: Matilda Landström
 2025-08-28 07:25:17 +00:00
Erik Tiekstra
1a10afdbad fix(SW-3305): Added preamble to carousel cards block 
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
 2025-08-28 07:22:07 +00:00
Matilda Landström
cfaee8f123 Merged in feat/SW-3276-hotel-page-phone-number (pull request #2703) 
feat(SW-3276): update hotel page intro section

* feat(SW-3276): update hotel page intro section

* fix(SW-3276): update Link component


Approved-by: Erik Tiekstra
 2025-08-28 06:30:32 +00:00
Joakim Jäderberg
4ed1cd1843 Merged in fix/storybook-static-folder (pull request #2718) 
Storybook Avatar: Use images from public folder

* make sure we import files from the correct folder


Approved-by: Chuma Mcphoy (We Ahead)
 2025-08-27 14:09:10 +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
Bianca Widstam
34135879a8 Merged in fix/SW-3289-open-side-peek-from-side-mobile (pull request #2717) 
fix(SW-3289): sidepeek opens from side on mobile

* fix(SW-3289): sidepeek opens from side on mobile


Approved-by: Anton Gunnarsson
 2025-08-27 12:38:29 +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
Joakim Jäderberg
45a8fd8c43 Merged in fix/linting-booking-flow (pull request #2709) 
Fix/linting booking flow

* fix import issues and add lint check no-extraneous-dependencies
* fix use type HotelType instead of string
* add no-extraneous-dependencies lint check to booking-flow

Approved-by: Anton Gunnarsson
 2025-08-27 12:02:37 +00:00
Joakim Jäderberg
80c3327419 Merged in fix/linting (pull request #2708) 
Fix/linting

* fix import issues and add lint check no-extraneous-dependencies
* fix use type HotelType instead of string

Approved-by: Anton Gunnarsson
 2025-08-27 09:22:37 +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
Bianca Widstam
5f8d77e54a Merged in fix/SW-1655-tripadvisor-icon-map (pull request #2695) 
fix(SW-1655): update design tripadvisor on hotel map card

* fix(SW-1655): update design tripadvisor on hotel map card

* fix(SW-1655): update radius

* fix(SW-1655): use tripadvisor chip, create different variants

* fix(SW-1655): update variants, storybook, and global css


Approved-by: Joakim Jäderberg
 2025-08-26 13:08:28 +00:00
Anton Gunnarsson
c53e6ef187 Merged in chore/move-use-scroll-to-top (pull request #2705) 
chore: Move useScrollToTop to common package

* Move useScrollToTop to common package


Approved-by: Joakim Jäderberg
 2025-08-26 11:48:54 +00:00
Matilda Landström
7e9ecdd6c5 Merged in fix/zod-validation (pull request #2706) 
fix: make strings nullable

* fix: make strings nullable


Approved-by: Erik Tiekstra
 2025-08-26 11:27:07 +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
4c9605ef3f Merged in fix/SW-2528 (pull request #2688) 
fix(SW-2528): get correct restaurant type

* fix(SW-2528): get correct type


Approved-by: Erik Tiekstra
 2025-08-26 06:38:40 +00:00
Erik Tiekstra
8180271b0f fix(SW-3203): Added property id to pointOfInterestSchema to handle identical names 
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
 2025-08-26 05:58:25 +00:00
Chuma Mcphoy (We Ahead)
7561e996c6 Merged in feat/LOY-311-New-Avatar-Component (pull request #2694) 
Feat(LOY-311) Create avatar design system component

* feat(LOY-311): Creat & use New Avatar Design System Component

* refactor(LOY-311): replace avatar used in app header with design system component

* fix(LOY-311): use correct space vars


Approved-by: Erik Tiekstra
 2025-08-25 14:41:50 +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
Hrishikesh Vaipurkar
2fcd277206 Merged in fix/SW-2913-start-page-desktop-browsers-book (pull request #2691) 
fix(SW-2913): Fixed flicker issue on floating booking widget

* fix(SW-2913): Fixed flicker issue on floating booking widget

* Fix(SW-2913): Flicker issue on iPad resolution


Approved-by: Bianca Widstam
 2025-08-22 12:10: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
Erik Tiekstra
caffa1821f feat(SW-3288): Added sort order on campaign pages to sort campaigns on hotel pages 
Approved-by: Matilda Landström
 2025-08-22 09:30:45 +00:00
Erik Tiekstra
c7c55bd7b1 Feat/SW-3287 campaign start end 
Approved-by: Matilda Landström
 2025-08-22 09:18:52 +00:00
Erik Tiekstra
2064732e56 Feat/SW-3028 hotel page campaigns 
* feat(SW-3028): Added query and typings to fetch campaigns by hotelUid
* feat(SW-3028): Added components for campaigns to the hotel page
* feat(SW-3028): Implemented prioritized campaigns list
* chore(SW-3028): Refactor how campaigns are fetched on hotel pages
* feat(SW-3028): Added offers/campaigns to tab navigation

Approved-by: Matilda Landström
 2025-08-21 13:00:34 +00:00
Matilda Landström
eaf6e851ec Merged in fix/SW-1532-make-link-nullable (pull request #2677) 
fix/SW-1532: make link nullable

* fix/SW-1532: make link nullable


Approved-by: Erik Tiekstra
 2025-08-20 13:32:00 +00:00
Matilda Landström
fe376c63f7 Merged in feat/SW-2847-table (pull request #2665) 
fix(SW-2847): move ScrollWrapper to design system and Table component

* fix(SW-2847): move ScrollWrapper to design system and Table component


Approved-by: Erik Tiekstra
 2025-08-20 09:41:54 +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
Chuma Mcphoy (We Ahead)
720a1c2734 Merged in feat/LOY-264-My-Pages-Overview-Shortcuts (pull request #2672) 
Feat(LOY-264): My Pages Overview Shortcuts

* feat(LOY-264): Add My Pages Shortcuts Overview Dynamic Content Component

* fix(LOY-264): more semantic naming + remove comments

* fix(LOY-264): new space variables

* fix(LOY-264): remove unused prop


Approved-by: Matilda Landström
 2025-08-20 09:06:25 +00:00
Matilda Landström
789818eefd Merged in feat/SW-3127-meeting-room-sort-order (pull request #2634) 
feat(SW-3127): use new sort order attribute

* feat(SW-3127): use new sort order attribute


Approved-by: Erik Tiekstra
 2025-08-20 08:46:16 +00:00
Hrishikesh Vaipurkar
c6ed6d767e Merged in fix/SW-1617-aa-tracking-ratecodetype- (pull request #2669) 
fix(SW-1617): Added rateCodeType in tracking for confirmation page

* fix(SW-1617): Added rateCodeType in tracking for confirmation page

* fix(SW-1617) Removed unnecessary comment


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
 2025-08-20 08:42:05 +00:00
Bianca Widstam
dc9e38e02a Merged in fix/SW-2672-sidepeek-facility-text-break (pull request #2668) 
fix(SW-2672): break facility text in sidepeek

* fix(SW-2672): break facility text in sidepeek


Approved-by: Matilda Landström
 2025-08-20 08:37:46 +00:00
Bianca Widstam
aa7a7a8c2f Merged in fix/SW-2790-room-picker-buttons (pull request #2667) 
fix(SW-2790): update ui room picker buttons

* fix(SW-2790): update ui room picker buttons

* fix(SW-2790


Approved-by: Matilda Landström
 2025-08-20 06:38:18 +00:00
Anton Gunnarsson
deaba8b5c4 Merged in feat/sw-3241-move-readme-to-booking-flow (pull request #2660) 
feat(SW-3241): Move ReadMe to booking-flow and rename to OpenSidePeekButton

* Move ReadMe to booking-flow

* Rename ReadMore to OpenSidePeekButton

* Fix self-referencing import


Approved-by: Joakim Jäderberg
 2025-08-19 07:20:44 +00:00
Anton Gunnarsson
67a7a0d571 Merged in feat/sw-3271-move-chip-to-design-system (pull request #2659) 
feat(SW-3271): Move Chip to design-system

* Move Chip to design-system


Approved-by: Joakim Jäderberg
 2025-08-19 07:04:01 +00:00
Linus Flood
20d34198e3 Merged in feat/sw-3191-images (pull request #2670) 
feat(images): SW-3191 slightly increase image width to improve quality

* feat(images): SW-3191 slightly increase image width to improve quality


Approved-by: Joakim Jäderberg
 2025-08-19 06:54:25 +00:00
Joakim Jäderberg
1bd6ce81b8 Merged in feature/SW-3245-move-jsontohtml (pull request #2661) 
Feature/SW-3245 move jsontohtml

* wip

* Move JsonToHtml -> design-system

* Fix semantic issues within Stories

* replace imports of 'storybook/react-vite' with 'storybook/nextjs-vite'

* merge


Approved-by: Anton Gunnarsson
 2025-08-18 07:46:21 +00:00
Joakim Jäderberg
af391a568a Merged in fix/design-system-format-after-generate (pull request #2662) 
design-system: format files after they have been generated

* design-system: format files after they have been generated


Approved-by: Anton Gunnarsson
 2025-08-15 11:37:35 +00:00
Matilda Landström
57c6f59449 Merged in feat/SW-1532-startpage-cardgrid-optional-link (pull request #2635) 
feat(SW-1532): add optional link to start page card grid

* feat(SW-1532): add optional link to start page card grid


Approved-by: Erik Tiekstra
 2025-08-15 07:25:00 +00:00
Linus Flood
007025313b Merged in feat/sw-3269-info-logs (pull request #2657) 
feat/#sw-3269 fix: info logs

* feat/#sw-3269 fix: info logs


Approved-by: Joakim Jäderberg
 2025-08-15 07:10:21 +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
f04e476a6e Merged in feat/sw-3240-move-staticmap-to-design-system (pull request #2654) 
feat(SW-3240): Move StaticMap to design-system

* Move StaticMap to design-system


Approved-by: Joakim Jäderberg
 2025-08-14 12:22:19 +00:00
Erik Tiekstra
a362d236fb fix(SW-3084): Handle unpublished entries inside content pages 
Approved-by: Matilda Landström
 2025-08-14 07:24:35 +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
Erik Tiekstra
dc483fe599 feat(SW-3061): Added block for all campaigns 
Approved-by: Matilda Landström
 2025-08-14 07:07:54 +00:00
Joakim Jäderberg
f531c7a49f Merged in feature/storybook-tests (pull request #2623) 
Feature/storybook tests

* feature: add interaction tests for storybook and upgrade storybook@9

* add a11y testing for storybook

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/storybook-tests

* Test and build only required packages

* .

* .

* .

* .

* .

* .

* .

* disable playwright tests in netlify ci

* .

* debug out process.env

* don't run playwright on CI

* remove unused netlify-plugin-playwright-cache

* .

* .

* .

* .

* .

* .

* remove turbo dependancy to design-system#test

* merge

* merge


Approved-by: Anton Gunnarsson
 2025-08-14 06:25:08 +00:00