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

1505 Commits

Author SHA1 Message Date
Anton Gunnarsson
08804e8675 Merged in chore/cleanup-scandic-web (pull request #2831) 
chore: Cleanup scandic-web

* Remove unused files

* Remove unused and add missing packages

* Remove unused exports


Approved-by: Linus Flood
 2025-09-18 15:33:00 +00:00
Chuma Mcphoy (We Ahead)
cc99f26727 Merged in fix/LOY-358-SAS-expiry-date (pull request #2813) 
fix(LOY-358): Proper SAS tier expiration date check

* fix(LOY-358): Proper SAS tier expiration date check


Approved-by: Erik Tiekstra
 2025-09-18 13:39:37 +00:00
Erik Tiekstra
948c86479a feat(BOOK-54): Adjusted filter functionality to save filters as query parameters instead of paths 
* feat(BOOK-54): Destination filters now matching on id instead of slug in preparation for filters from Contentstack

Approved-by: Chuma Mcphoy (We Ahead)
 2025-09-18 13:03:01 +00:00
Matilda Landström
32a817fa72 Merged in fix/BOOK-233-book-a-table-label (pull request #2827) 
fix(BOOK-233): flip back logic for label

* fix(BOOK-233): flip back logic for label


Approved-by: Bianca Widstam
 2025-09-18 12:44:06 +00:00
Joakim Jäderberg
ae7a62c88f Merged in feature/SW-3149-send-logs-to-sentry (pull request #2802) 
Feature/SW-3149 send logs to sentry

* Use sentry for logging

* .

* fix(SW-3149) Send logs to Sentry

* remove experimental flag for logs

* add sentry settings for partner-sas

* feat(SW-3108): Added external link option to top primary button on content/collection page

Approved-by: Matilda Landström

* fix(BOOK-152): Removed old header references inside useStickyPosition hook to fix offset issue for the sitewide alert

Approved-by: Matilda Landström

* Merged in fix/LOY-360-team-member-text-for-retired-employees (pull request #2799)

fix(LOY-360): improve text for retired employees

* fix(LOY-360): improve text for retired employees


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström

* Merged in fix/STAY-67-redirect-to-webview-after-gla (pull request #2795)

fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): add callback page for guarantee on webview


Approved-by: Linus Flood

* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox

* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox
* feat(BOOK-144): Make image clickable instead of a button to avoid being able to click outside of the image area

Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)

* Merged in fix/BOOK-127-translate-validation-text (pull request #2800)

fix(BOOK-127): translate terms required message

* fix(BOOK-127): translate terms required message


Approved-by: Erik Tiekstra

* Merged in feat/LOY-354-L7-Progress-Card (pull request #2786)

Feat/LOY-354 L7 Progress Card

* feat(LOY-354): Add Trophy icon

* fix(LOY-354): include new tierPoints value

* feat(LOY-354): L7 Progress Level Card support

* refactor(LOY-354): Refactoring of component structure

* fix(LOY-354): Remove intl prop drilling

* fix(LOY-354): cleanup progress section code


Approved-by: Erik Tiekstra

* Merged in fix/BOOK-132-tracking-breakfast (pull request #2803)

fix(BOOK-132): add breakfastOption tracking

* fix(BOOK-132): add breakfastOption tracking


Approved-by: Joakim Jäderberg

* Merged in fix/enter-details-errors-missing (pull request #2806)

fix: Add missing messages to BookingFlowInput errors

* Add missing messages to BookingFlowInput errors

* Fix errors

* zippy zip

* phoney


Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg

* Merged in feature/copy-static-files-via-build-scripts (pull request #2798)

SW-3467 Copy static files via build scripts

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* remove fonts that will be copied via build scripts

* wip

* update paths to shared files

* update material-symbol script

* merge

* fix missing shared segment for path in fonts.css


Approved-by: Linus Flood

* Merged in feat/SW-2999-cleanup (pull request #2810)

feat(SW-2999): cleanup current web

* feat(SW-2999): cleanup current web

* Merge master

* Removed unused fonts


Approved-by: Joakim Jäderberg

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry

* merge


Approved-by: Linus Flood
 2025-09-18 07:59:44 +00:00
Hrishikesh Vaipurkar
c09dc29fee Merged in feat/SW-3250-account-linking-modal-you- (pull request #2819) 
feat(SW-3250): Updated UI for already linked account error

* feat(SW-3250): Updated UI for already linked account error


Approved-by: Anton Gunnarsson
 2025-09-18 07:39:08 +00:00
Anton Gunnarsson
65e4623b52 Merged in chore/fix-partner-sas-todos (pull request #2823) 
chore: Fix partner-sas todos

* Add onError to TrpcProvider

* Add AdobeSDKScript

* Add GTMScript

* Add adobeDataLayer script

* Add ReactQueryDevtools

* Move components to correct folder


Approved-by: Joakim Jäderberg
 2025-09-18 07:28:14 +00:00
Anton Gunnarsson
b0f3e4afbd Merged in chore/cleanup-booking-flow (pull request #2824) 
chore: Cleanup booking-flow after migration

* Remove unused types

* Clean up exports, types, unused files etc in booking-flow


Approved-by: Joakim Jäderberg
 2025-09-18 07:28:05 +00:00
Joakim Jäderberg
9620bfe76d Merged in SW-3476-use-separate-curity-client-for-service-tokens-for-partner-sas (pull request #2809) 
feat(SW-3476): add support for using different curity clients when creating service tokens

* fix(SW-3476): add support for using different curity clients when creating service tokens

* remove log statement


Approved-by: Hrishikesh Vaipurkar
 2025-09-18 07:04:45 +00:00
Joakim Jäderberg
8661e5c348 Merged in chore/icon-readme-update (pull request #2817) 
Update icon generation script and remove unused font file

* Update icon generation script and remove unused font file


Approved-by: Matilda Landström
 2025-09-17 12:58:23 +00:00
Matilda Landström
d6addd2398 Merged in fix/update-health-card-script (pull request #2821) 
fix: update scripted text on health facility card

* fix: update scripted text on health facility card


Approved-by: Erik Tiekstra
 2025-09-17 08:57:49 +00:00
Anton Gunnarsson
5a86cbaafe Merged in chore/update-eslint-configs (pull request #2812) 
chore: Extend eslint configs from @typescript-eslint/recommended

* Change to typescript recommended in scandic-web

* Remove comment

* Change to recommended ts config in partner-sas

* Change to recommended ts lint config in booking-flow


Approved-by: Linus Flood
 2025-09-17 07:55:11 +00:00
Matilda Landström
e6d5c45ca7 Merged in fix/Lokalise-update (pull request #2807) 
Fix/Lokalise update

* chore: update English keys

* fix: update from Lokalise


Approved-by: Linus Flood
 2025-09-16 11:46:31 +00:00
Linus Flood
fd0198f57b Merged in feat/SW-2999-cleanup (pull request #2810) 
feat(SW-2999): cleanup current web

* feat(SW-2999): cleanup current web

* Merge master

* Removed unused fonts


Approved-by: Joakim Jäderberg
 2025-09-16 11:28:57 +00:00
Joakim Jäderberg
48324ef935 Merged in feature/copy-static-files-via-build-scripts (pull request #2798) 
SW-3467 Copy static files via build scripts

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* remove fonts that will be copied via build scripts

* wip

* update paths to shared files

* update material-symbol script

* merge

* fix missing shared segment for path in fonts.css


Approved-by: Linus Flood
 2025-09-16 10:59:33 +00:00
Bianca Widstam
03cc146eac Merged in fix/BOOK-132-tracking-breakfast (pull request #2803) 
fix(BOOK-132): add breakfastOption tracking

* fix(BOOK-132): add breakfastOption tracking


Approved-by: Joakim Jäderberg
 2025-09-15 13:45:32 +00:00
Chuma Mcphoy (We Ahead)
0737f4fb78 Merged in feat/LOY-354-L7-Progress-Card (pull request #2786) 
Feat/LOY-354 L7 Progress Card

* feat(LOY-354): Add Trophy icon

* fix(LOY-354): include new tierPoints value

* feat(LOY-354): L7 Progress Level Card support

* refactor(LOY-354): Refactoring of component structure

* fix(LOY-354): Remove intl prop drilling

* fix(LOY-354): cleanup progress section code


Approved-by: Erik Tiekstra
 2025-09-15 11:48:18 +00:00
Erik Tiekstra
b437f8b806 feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox 
* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox
* feat(BOOK-144): Make image clickable instead of a button to avoid being able to click outside of the image area

Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
 2025-09-15 09:02:48 +00:00
Bianca Widstam
800948bb94 Merged in fix/STAY-67-redirect-to-webview-after-gla (pull request #2795) 
fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): redirect to webview after guarantee on my stay

* fix(STAY-67): add callback page for guarantee on webview


Approved-by: Linus Flood
 2025-09-15 07:18:58 +00:00
Chuma Mcphoy (We Ahead)
98816b27ce Merged in fix/LOY-360-team-member-text-for-retired-employees (pull request #2799) 
fix(LOY-360): improve text for retired employees

* fix(LOY-360): improve text for retired employees


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-09-15 07:18:01 +00:00
Erik Tiekstra
15a352ea99 feat(BOOK-68): Added kindly chatbot 
Approved-by: Linus Flood
 2025-09-11 12:44:47 +00:00
Hrishikesh Vaipurkar
def079021b Merged in feat/SW-3441-add-hero-floatingbookingwid (pull request #2789) 
feat(SW-3441): Add Hero image to sas landing page

* feat(SW-3441): Add Hero image to sas landing page

* feat(SW-3441): Code Optimise


Approved-by: Joakim Jäderberg
 2025-09-11 12:30:13 +00:00
Anton Gunnarsson
c6aebbd0b2 Merged in feat/sw-3415-set-up-cookiebot-in-partner-sas (pull request #2784) 
feat(SW-3415): Add CookieBotConsent to partner-sas

* Add CookieBotConsent


Approved-by: Joakim Jäderberg
 2025-09-11 12:29:52 +00:00
Joakim Jäderberg
4893eb8b25 Merged in SW-3459-setup-booking-confirmation-page-in-sas (pull request #2794) 
Setup booking-confirmation page in SAS

* Setup booking-confirmation page in SAS
move booking-confirmation tracking to booking-flow

* remove unused param

* Add test cards to documentation

* Fix payment callback page to use correct status


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
 2025-09-11 12:19:26 +00:00
Linus Flood
6b01dd9a8f Merged in feat/webview-user-issue (pull request #2793) 
Feat/webview user issue

* Added logging

* Test

* Cleanup


Approved-by: Joakim Jäderberg
 2025-09-11 09:22:13 +00:00
Linus Flood
bacec22a8a Merged in feat/SW-3443-destinations-list (pull request #2781) 
feat(destinations list): SW-3443 remove hard coded response and fetch from API instead

* feat(destinations list): SW-3443 remove hard coded response and fetch from API instead


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-09-11 09:14:01 +00:00
Anton Gunnarsson
3e5263bf72 Merged in feat/sw-2877-move-payment-callback (pull request #2755) 
feat(SW-2877): Move payment callback page

* WIP move

* Add payment callback page to partner-sas


Approved-by: Joakim Jäderberg
 2025-09-11 09:06:11 +00:00
Joakim Jäderberg
c3e78fcadd Merged in feature/SW-3457-enter-details-on-sas (pull request #2792) 
Add enter-details page to SAS

* Add enter-details page to SAS


Approved-by: Anton Gunnarsson
 2025-09-11 09:05:47 +00:00
Erik Tiekstra
136610a51a fix(BOOK-151): Added correct background color to all hotels section on destination overview page 
Approved-by: Matilda Landström
 2025-09-11 08:41:17 +00:00
Joakim Jäderberg
7dee6d5083 Merged in chore/move-enter-details (pull request #2778) 
Chore/move enter details

Approved-by: Anton Gunnarsson
 2025-09-11 07:16:24 +00:00
Erik Tiekstra
15711cb3a4 feat(SW-2541): Adjust for ImageVault custom field return types changes 
Approved-by: Bianca Widstam
Approved-by: Matilda Landström
 2025-09-10 08:57:49 +00:00
Erik Tiekstra
f04fe467da feat(SW-3151): Added original to imageSchema and added transform to a more generic image type 
Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
 2025-09-10 08:29:05 +00:00
Hrishikesh Vaipurkar
a5790ee454 Merged in chore/SW-2878-extract-booking-confirmation-pag (pull request #2779) 
Chore/SW-2878 extract booking confirmation pag

* chore(SW-2878): Moved booking confirmation page to booking-flow package

* chore(SW-2878): Fixed promo styles as per design

* chore(SW-2878): Kept tiny duplicate function to avoid export from booking-flow package


Approved-by: Anton Gunnarsson
 2025-09-10 07:50:48 +00:00
Chuma Mcphoy (We Ahead)
c6da0fb8cb Merged in feat/LOY-316-Level-Progress-Card (pull request #2739) 
Feat/LOY-316 Level Progress Card

* feat(LOY-315): Add MembershipOverviewCard

* refactor(LOY-315): abstract sasbooststatus

* feat(LOY-316): build out LevelProgressCard skeleton & variant styling

* feat(LOY-316): Add HighesMembershipCard

* feat(LOY-316): ProgressBarCard base

* refactor(LOY-315): highest level card misc fixes

* feat(LOY-316): Add progress component to design system

* fix(LOY-316): type check

* refactor(LOY-316): calculate currentEarnings correctly

* fix(LOY-316): sas icon showing when not boosted

* fix(LOY-316): css module

* refactor(LOY-316): Restructure components

* feat(LOY-316): Add marker pin 📍

* fix(LOY-316): strict equality checks

* fix(LOY-316): code review fixes

* chore(LOY-316): conditionally hide old section under flag

* feat(LOY-316): Add level progress card to my points page

* chore(LOY-316): marker label container height


Approved-by: Matilda Landström
 2025-09-10 06:53:22 +00:00
Hrishikesh Vaipurkar
e95d316f52 Merged in fix/SW-3381-move-loginbutton-to-design-syste (pull request #2780) 
fix(SW-3381): Fixed login redirect URL

* fix(SW-3381): Fixed login redirect URL


Approved-by: Anton Gunnarsson
 2025-09-10 06:51:10 +00:00
Anton Gunnarsson
4550ddec53 Merged in feat/sw-3416-add-sitewidealert-to-partner-sas (pull request #2773) 
feat(SW-3416): Add SiteWideAlert to partner-sas

* Add SiteWideAlert to partner-sas

* Remove log


Approved-by: Joakim Jäderberg
 2025-09-09 10:00:25 +00:00
Anton Gunnarsson
e68b029078 Merged in feat/sw-3414-add-fontpreload-to-partner-sas (pull request #2774) 
feat(SW-3414): Add FontPreload to partner-sas

* Add FontPreload


Approved-by: Joakim Jäderberg
 2025-09-09 08:47:11 +00:00
Anton Gunnarsson
261eeef3e2 Merged in feat/sw-3417-add-toasthandler-to-partner-sas (pull request #2775) 
feat(SW-3417): Add ToastHandler to partner-sas

* Add ToastHandler to partner-sas


Approved-by: Joakim Jäderberg
 2025-09-09 08:27:24 +00:00
Anton Gunnarsson
69268d88fb Merged in feat/sw-3418-add-routerprovider-to-partner-sas (pull request #2777) 
feat(SW-3418): Add RouterProvider to partner-sas

* Add RouterProvider


Approved-by: Joakim Jäderberg
 2025-09-09 08:20:17 +00:00
Matilda Landström
70f3b8f016 Merged in feat/Lokalise-update-080925 (pull request #2771) 
feat: Update from Lokalise 080925

* feat: Update from Lokalise 080925


Approved-by: Anton Gunnarsson
 2025-09-09 06:41:29 +00:00
Anton Gunnarsson
c0ee968368 Merged in chore/partner-sas-header-footer-styling (pull request #2765) 
chore: partner-sas header and footer improvements

* improve header styling

* Add footer


Approved-by: Bianca Widstam
 2025-09-08 09:23:20 +00:00
Matilda Landström
8d30232aee Merged in fix/SW-3276-divider (pull request #2766) 
fix(SW-3276): update header css

* fix(SW-3276): add !important to divider height


Approved-by: Erik Tiekstra
 2025-09-08 06:36:54 +00:00
Bianca Widstam
bba4e24569 Merged in fix/SW-3198-prices-select-rate (pull request #2763) 
fix(SW-3198): fix striketrhough/regular prices, the same in enter details as select rate

* fix(SW-3198): fix striketrhough/regular prices, the same in enter details as select rate

* fix(SW-3198): remove additonalcost if calculating cost per room

* fix(SW-3198): include bookingcode in specialrate

* fix(SW-3198): remove console log

* fix(SW-3198): add or operator

* fix(SW-3198): capture total return value

* fix(SW-3198): rename and move function


Approved-by: Joakim Jäderberg
Approved-by: Hrishikesh Vaipurkar
 2025-09-05 14:02:47 +00:00
Joakim Jäderberg
a87cef91d4 Merged in fix/turn-off-application-insights (pull request #2764) 
Fix/turn off application insights

* remove applicationInsights

* remove applicationInsights


Approved-by: Linus Flood
 2025-09-05 11:49:00 +00:00
Matilda Landström
8f813eb9e7 Merged in feat/SW-3163-remove-openinghours-name (pull request #2735) 
feat(SW-3163): update opening hours schema name/nameEnglish

* feat(SW-3163): remove name

* fix(SW-3163): update schemas


Approved-by: Erik Tiekstra
 2025-09-04 14:18:57 +00:00
Hrishikesh Vaipurkar
55e25d6c75 Merged in chore/SW-3397-move-confirmation-component-with (pull request #2759) 
chore(SW-3397) Moved Confirmation component with Header to booking-flow package

* chore(SW-3397) Moved Confirmation component with Header to booking-flow package

* chore(SW-3397): Optimised code


Approved-by: Anton Gunnarsson
 2025-09-04 13:07:11 +00:00
Joakim Jäderberg
6fa301f8e7 Merged in SW-3396-move-my-saved-cards-to-design-system (pull request #2762) 
SW-3396 move my saved cards to design system

* Move PaymentOption, PaymentOptionsGroup, PaymentIcons and MySavedCards (renamed SelectPaymentMethod) to design-system

* Remove unused svg payment icons

* cleanu

* cleanup

* trackUpdatePaymentMethod: remove hotelId argument that was never passed


Approved-by: Anton Gunnarsson
 2025-09-04 13:01:36 +00:00
Hrishikesh Vaipurkar
8e00769c64 Merged in chore/SW-3395-move-bookingconfirmationprovider (pull request #2757) 
chore(SW-3395): Moved BookingConfirmationProvider to booking-flow package

* chore(SW-3395): Moved BookingConfirmationProvider to booking-flow package


Approved-by: Anton Gunnarsson
 2025-09-04 08:14:50 +00:00
Anton Gunnarsson
7e585b2d9a Merged in chore/more-partner-sas-boilerplate (pull request #2756) 
chore: Misc for partner-sas

* Add global-error to partner-sas

* Add redirect to lang in partner-sas

* Actually use language from param

* Increase test timeouts and use parsed lang to fix tests

* Remove need to import serverClient to setup trpc


Approved-by: Hrishikesh Vaipurkar
 2025-09-04 07:45:14 +00:00
Anton Gunnarsson
36b6685ad5 Merged in feat/partner-sas-netlify-branch-sync (pull request #2758) 
feat: Add netlify-plugin-sync to partner-sas

* Add netlify-plugin-sync to partner-sas


Approved-by: Joakim Jäderberg
 2025-09-03 13:50:45 +00:00