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

1366 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Linus Flood
1dd255f0d2 Merged in fix/sync-script-test (pull request #2656) 
Test

* Test
 2025-08-14 09:44:01 +00:00
Bianca Widstam
3fb0219b3e Merged in fix/SW-2485-hotel-directions-name (pull request #2641) 
fix(SW-2485): add name and address to hotel directions

* fix(SW-2485): add name and address to hotel directions

* fix(SW-2485): use name and address instead of coordinates


Approved-by: Matilda Landström
 2025-08-14 07:24:37 +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
Linus Flood
985d47d7b3 Merged in feat/lokalise-sync-140825 (pull request #2652) 
Lokalise sync 14-08-25

* Lokalise sync 14-08-25


Approved-by: Joakim Jäderberg
 2025-08-14 06:27:35 +00:00
Linus Flood
64b5aa04d5 Merged in feat/SA-668-remove-rebook-webview (pull request #2651) 
feat(webviews)-SA-668-remove-rebook-button

* feat(webviews)-SA-668-remove-rebook-button


Approved-by: Joakim Jäderberg
 2025-08-14 06:26:49 +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
Linus Flood
dbc9473cb5 Merged in fix/branch-sync-4 (pull request #2649) 
Fix/branch sync 4

* Test ignore script

* Test
 2025-08-14 05:46:38 +00:00
Anton Gunnarsson
d10fc5ed74 Merged in feat/sw-3247-move-table-to-design-system (pull request #2636) 
feat(SW-3247): Move Table component to design-system

* Move Table component to design-system


Approved-by: Bianca Widstam
 2025-08-13 14:52:56 +00:00
Anton Gunnarsson
cd29e54098 Merged in feat/sw-3244-move-imagecontainer-to-design-system (pull request #2637) 
feat(SW-3244): Move ImageContainer component to design-system

* Move ImageContainer component to design-system

* Fix imports


Approved-by: Bianca Widstam
 2025-08-13 14:37:29 +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
Linus Flood
51f53a717d Merged in fix/build-errrors (pull request #2646) 
Fixed build errors due to moved files

* Fixed build errors due to moved files
 2025-08-13 13:00:23 +00:00
Linus Flood
ba27030d60 Merged in fix/branch-sync-3 (pull request #2645) 
Test

* Test
 2025-08-13 12:48:31 +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
Hrishikesh Vaipurkar
706f2d8dfe Merged in fix/SW-3208-webviews-change-dates-on-my- (pull request #2638) 
fix(SW-3208): Fixed webview for change date in MyStay

* fix(SW-3208): Fixed webview for change date in MyStay


Approved-by: Linus Flood
 2025-08-13 12:37:04 +00:00
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
Matilda Landström
5397437628 Merged in feat/SW-2041-map-zoom-buttons (pull request #2550) 
Feat(SW-661): Hotel page map zoom restrictions

* fix(SW-2041): update tokens

* chore(SW-2041): restrict zooming

* fix(SW-2041): remove ref

* fix(SW-2041): create map zoom hook


Approved-by: Erik Tiekstra
Approved-by: Hrishikesh Vaipurkar
 2025-08-13 07:50:39 +00:00