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

5107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Erik Tiekstra
091c46f85c feat(SW-1558): Added link to static map on hotel pages 
Approved-by: Matilda Landström
 2025-08-26 05:58:01 +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
Bianca Widstam
87f597ae1a Merged in fix/SW-3303-campaign-rate-naming (pull request #2702) 
fix(SW-3303): campaign rate should have ratedefinition title

* fix(SW-3303): campaign rate should have ratedefinition title


Approved-by: Matilda Landström
 2025-08-25 13:23:44 +00:00
Bianca Widstam
42c7fb8510 Merged in fix/SW-3289-sidepeek-cta-hotel (pull request #2697) 
fix(SW-3289): add cta to sidepeek hotel

* fix(SW-3289): add cta to sidepeek hotel

* fix(SW-3289): add cta hotel card


Approved-by: Joakim Jäderberg
Approved-by: Matilda Landström
 2025-08-25 13:05:58 +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
Anton Gunnarsson
4f8c51298f Merged in chore/improve-e2e-tests-in-sas (pull request #2663) 
chore: Increase expect timeout in SAS e2e tests

* Increase expect timeout


Approved-by: Joakim Jäderberg
 2025-08-25 07:51:26 +00:00
Hrishikesh Vaipurkar
d6b7361a26 Merged in fix/SW-2786-ios-only-mobile-browsers- (pull request #2626) 
fix(SW-2786): Added sizes auto to load images of appropriate size instead of largest

* fix(SW-2786): Added sizes auto to load images of appropriate size instead of largest

* fix(SW-2786): Updated to specific size as auto value is not yet supported by major browsers

* fix(SW-2786): Updated to height as min-height doesn't work for child having 100% correctly


Approved-by: Bianca Widstam
 2025-08-22 13:11:32 +00:00
Linus Flood
d16c6b8082 Merged in feat/lokalise-sync-220825 (pull request #2690) 
Lokalise sync

* Lokalise sync


Approved-by: Joakim Jäderberg
 2025-08-22 13:10:47 +00:00
Linus Flood
208a64e54e Merged in fix/sw-3299-alerts (pull request #2692) 
fix(SW-3299): hotel alerts now visible if booking dates starts/ends before the alert period

* fix(SW-3299): hotel alerts now visible if booking dates starts/ends before the alert period


Approved-by: Bianca Widstam
Approved-by: Hrishikesh Vaipurkar
 2025-08-22 13:10:38 +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
Matilda Landström
d3f57b04eb Merged in fix/SW-3229 (pull request #2689) 
fix(SW-3229): change to group on filtering

* fix(SW-3229): change to group on filtering


Approved-by: Erik Tiekstra
 2025-08-22 11:54:04 +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
Linus Flood
e2544f9f89 Merged in feat/sw-3192-no-user (pull request #2680) 
feat(SW-3192): Checks if user exists, otherwise logout and show error

* feat(SW-3192): Checks if user exists, otherwise logout and show error
 2025-08-22 09:47:54 +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
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
Chuma Mcphoy (We Ahead)
6a0675525d Merged in fix/dtmc-debugging (pull request #2683) 
Chore: DTMC Logging

* chore: DTMC debugging

* fix: prune dtmc logging

* fix: Add id's from azure in error logging


Approved-by: Linus Flood
Approved-by: Matilda Landström
 2025-08-21 13:12:56 +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
Linus Flood
456e10c674 Merged in feat/webview-hide-overview-back (pull request #2684) 
feat(webview): flag to show/hide back to overview-button

* feat(webview): flag to show/hide back to overview-button


Approved-by: Joakim Jäderberg
 2025-08-21 12:32:08 +00:00
Hrishikesh Vaipurkar
3f19886171 Merged in fix/SW-3254-error-fromdate_cannot_be_ (pull request #2676) 
Fix/SW-3254 error fromdate cannot be

* fix(SW-3254): Implemented date valdaton on select-hotel page

* fix(SW-3254): Updated the browser URL to show proper booking dates

* fix(SW-3254): Fixed select-rate when invalid dates searched

* fix(SW-3254): Forced no availability for past dates

* fix(SW-3254) Optimised code

* fix(SW-3254): Optimised code


Approved-by: Linus Flood
 2025-08-21 09:48:31 +00:00
Hrishikesh Vaipurkar
d2bbbc0a47 Merged in fix/SW-2366-alerts-the-list-bullet-display (pull request #2679) 
fix(SW-2366): Fixed hotel alerts in booking page as per design

* fix(SW-2366): Fixed hotel alerts in booking page as per design

* fix(SW-2366): Optimise code


Approved-by: Erik Tiekstra
 2025-08-21 09:47:54 +00:00
Hrishikesh Vaipurkar
e0cc237b5f Merged in fix/SW-2367-rate-details-mobile-ui-correctio (pull request #2678) 
fix(SW-2367): Aligned the check icon in rate terms

* fix(SW-2367): Aligned the check icon in rate terms


Approved-by: Erik Tiekstra
 2025-08-20 14:04:58 +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
Chuma Mcphoy (We Ahead)
b644d5591a Merged in fix/account-banner-z-index (pull request #2673) 
fix: remove z-index from linkaccount banner

* fix: remove z-index from linkaccount banner


Approved-by: Matilda Landström
 2025-08-20 07:52:58 +00:00
Bianca Widstam
1f96e9be06 Merged in fix/SW-2844-gap-mobile-header-menu (pull request #2674) 
fix(SW-2844): remove gap between header and side menu on mobile

* fix(SW-2844): remove gap between header and side menu on mobile


Approved-by: Erik Tiekstra
 2025-08-20 07:23:10 +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
Linus Flood
78e3259317 Merged in feat/sw-2967-mystay (pull request #2666) 
feat(mystay):SW-2967 - allow access if booking.guest == logged in user

* feat(mystay):SW-2967 - allow access if booking.guest == logged in user

* Fixed failing tests


Approved-by: Hrishikesh Vaipurkar
 2025-08-18 11:50:57 +00:00
Joakim Jäderberg
f8a4b88170 Merged in fix/skip-flaky-date-test (pull request #2653) 
chore: skip date.test.tsx due to flakyness

* chore: skip date.test.tsx due to flakyness


Approved-by: Erik Tiekstra
Approved-by: Anton Gunnarsson
 2025-08-18 07:46:34 +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
Erik Tiekstra
47e5a55d13 fix(SW-3186): Replaced hash functionality for filters with query parameters 
Approved-by: Linus Flood
Approved-by: Matilda Landström
 2025-08-15 09:00:32 +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
Chuma Mcphoy (We Ahead)
12381f26e7 Merged in fix/LOY-287-Telemetry-DTMC (pull request #2631) 
fix(LOY-287): telemetry logging for DTMC flow

* fix(LOY-287): telemetry logging for DTMC flow


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-08-14 13:05:32 +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
Matilda Landström
876d08a421 Merged in feat/SW-3229-filter-map-pois (pull request #2644) 
feat(SW-3229): filter map card pois

* feat(SW-3229): filter map card pois


Approved-by: Erik Tiekstra
 2025-08-14 12:19:03 +00:00