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

1766 Commits

Author SHA1 Message Date
Matilda Haneling
42c060966d Merged in fix/book-439-add-suffix-to-seo-metatitle (pull request #3078) 
fix(BOOK-439): added suffix to SEO filter pages meta title

* fix(BOOK-439): added suffix to SEO filter pages meta title


Approved-by: Erik Tiekstra
 2025-11-05 11:37:14 +00:00
Erik Tiekstra
0e11a772f1 feat(BOOK-450): Adjust Scandic logo in header when on a themed hotel page 
Approved-by: Chuma Mcphoy (We Ahead)
 2025-11-05 10:29:24 +00:00
Joakim Jäderberg
392db172c4 Merged in chore/remove-svgr/webpack (pull request #3071) 
remove unused @svgr/webpack

* remove unused @svgr/webpack

* merge


Approved-by: Linus Flood
 2025-11-05 09:31:09 +00:00
Chuma Mcphoy (We Ahead)
94f6af563d Merged in feat/LOY-421-Next-Stay (pull request #3026) 
Feat(LOY-421): Next Stay

* feat(LOY-421): Next stay WIP

* fix(LOY-421): clean upp css and jsx

* chore(LOY-421): css cleanup

* fix(LOY-421): fix test

* only show button if isWebAppOrigin is true

* chore(LOY-421): update section header component

* chore(LOY-421): remove redundant test case


Approved-by: Matilda Landström
 2025-11-05 09:09:57 +00:00
Erik Tiekstra
3a38e99a71 Feat/BOOK-63 hotel subpages branding 
* feat(BOOK-63): Replaced css variables and components to apply hotel branding on subpages
* feat(BOOK-63): Replaced css variables and components to apply hotel branding on hotel page map view

Approved-by: Christel Westerberg
Approved-by: Matilda Landström
 2025-11-05 08:30:55 +00:00
Erik Tiekstra
fa10abbe78 fix(BOOK-496): Slowed down the MarqueeText component animation 
Approved-by: Matilda Landström
 2025-11-04 10:29:20 +00:00
Joakim Jäderberg
59143b4023 Merged in chore/remove-cypress (pull request #3066) 
chore: remove unused dependencies

* chore: remove cypress

* remove unused deps

* update yarn.lock after removing unused deps


Approved-by: Anton Gunnarsson
 2025-11-04 10:20:06 +00:00
Matilda Landström
0131b5f731 Merged in chore/cleanup-my-pages-overview (pull request #3049) 
chore(LOY-447): remove flag and unused code on my pages overview

* chore: remove flag and unused code


Approved-by: Chuma Mcphoy (We Ahead)
 2025-11-04 09:15:43 +00:00
Matilda Landström
4970dfa2ed Merged in fix/LOY-439-boosted-by-sas-bug (pull request #3047) 
fix(LOY-439): fix "boosted by sas" issue

* fix(LOY-439): fix "boosted by sas" issue


Approved-by: Chuma Mcphoy (We Ahead)
 2025-11-04 09:09:30 +00:00
Erik Tiekstra
4491d1de8e feat(BOOK-62): Added new InfoCard component and using that on hotel pages 
Approved-by: Bianca Widstam
 2025-11-04 07:39:33 +00:00
Christel Westerberg
a2e0f7244a fix: Hide opt-out option for ancillary email 2025-11-03 16:05:54 +01:00
Joakim Jäderberg
b8d887f82d Merged in chore/move-destinations-api-endpoint (pull request #3058) 
chore: move /api/destinations/[country]/[?city] -> /api/web/destinations/[country]/[?city]

* chore: move /api/destinations/[country]/[?city] -> /api/web/destinations/[country]/[?city]
 2025-11-03 13:33:45 +00:00
Anton Gunnarsson
83822fbc76 Merged in fix/sw-3581-incorrect-price-colors (pull request #3057) 
feat(SW-3581): Set price colors to scandic red

* Set price colors to scandic red

* Remove comment


Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg
 2025-11-03 13:14:57 +00:00
Hrishikesh Vaipurkar
1c7f72e95d Merged in fix/SW-3578-user-is-forced-to-login- (pull request #3044) 
fix(SW-3578): Fixed session issue when sas session expires

* fix(SW-3578): Fixed session issue when sas session expires

* base socialLogin auto-features on validSession and being linked

* remove unused object

* remove 'import server-only' for isValidSession() since it's only using passed data

* remove isValidClientSession()


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
 2025-11-03 12:50:25 +00:00
Joakim Jäderberg
15a2da333d Merged in feature/SW-3572-hotel-data-endpoint (pull request #3051) 
SW-3572 API route for listing hotels per city or country

* wip hotel data endpoint

* Correct route params type

* wip

* skip static paths call

* timeout when getting destinations take too long

* call noStore when we get a timeout

* add cache-control headers

* .

* .

* .

* wip

* wip

* wip

* wip

* add route for getting hotels per country

* include city when listing by country

* fix distance SI unit

* fix sorting

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3572-hotel-data-endpoint

* packages/tracking passWithNoTests

* revalidate must be static value

* remove oxc reference

* cleanup

* cleanup hotel api route

* feat(SW-3572): cleanup error handling


Approved-by: Anton Gunnarsson
 2025-11-03 12:10:22 +00:00
Christel Westerberg
e8626d56af Merged in fix/STAY-82 (pull request #3055) 
fix(SA-82): add correct input name

* fix(SA-82): add correct input name


Approved-by: Erik Tiekstra
 2025-11-03 09:35:22 +00:00
Anton Gunnarsson
1eb70766b4 Merged in feat/sw-3580-redemption-feature-flag (pull request #3045) 
feat(SW-3580): Add feature toggle enableRedemption to BookingFlowConfig

* Add feature toggle enableRedemption to BookingFlowConfig

* Update error message


Approved-by: Joakim Jäderberg
 2025-11-03 07:57:39 +00:00
Matilda Landström
3590a88031 Merged in fix/LOY-382-password-validation-audit (pull request #3034) 
Fix/LOY-382: Refactoring + accessibility of PasswordInput

* fix(LOY-382): fix password accessibility issues

* chore(LOY-382): refactor & add accessibility

* refactor(LOY-382)


Approved-by: Erik Tiekstra
 2025-10-31 10:19:32 +00:00
Chuma Mcphoy (We Ahead)
7abe190bed Merged in chore/LOY-445-remove-dtmc-flag (pull request #3043) 
chore(LOY-445): remove ENABLE_DTMC flag & add documentation

* chore(LOY-445): remove ENABLE_DTMC flag & add documentation


Approved-by: Matilda Landström
 2025-10-31 08:39:13 +00:00
Bianca Widstam
e2aeada23e Merged in fix/BOOK-486-hotjar (pull request #3046) 
fix(BOOK-486): suppress hotjar firstname lastname and initials

* fix(BOOK-486): suppress hotjar firstname lastname and initials


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
 2025-10-31 07:26:11 +00:00
Erik Tiekstra
6a342aaa9e chore: generated design system css variables from updated json file 
Approved-by: Matilda Landström
 2025-10-30 12:27:16 +00:00
Hrishikesh Vaipurkar
fd770ba6bb Merged in feat/SW-3577-ui-feedback-from-sas-call (pull request #3035) 
feat(SW-3577): Updated UI after feedback

Approved-by: Anton Gunnarsson
 2025-10-30 09:59:05 +00:00
Chuma Mcphoy (We Ahead)
6392325407 Merged in fix/422-fix-expiration-date-font (pull request #3039) 
fix(LOY-442): correct font for expirationDate in expiring points table

* fix(LOY-422): correct font for expirationDate in expiring points table


Approved-by: Matilda Landström
 2025-10-30 09:22:49 +00:00
Joakim Jäderberg
47210491c3 Merged in sync-lokalise-2025-10-30 (pull request #3038) 
* sync lokalise

* sync defaultMessage


Approved-by: Anton Gunnarsson
 2025-10-30 08:47:44 +00:00
Joakim Jäderberg
bf6ed7778e Merged in feat/syncDefaultMessage (pull request #3022) 
Sync defaultMessage from lokalise

* Enhance translation sync functionality and tests

- Added logging for found component files during sync.
- Introduced tests for handling complex components with replacements.
- Updated regex in syncIntlFormatMessage to support optional second arguments.
- Removed unused test files.

* feat(syncDefaultMessage): add script for syncing default message with lokalise

* feat(syncDefaultMessage): add script for syncing default message with lokalise


Approved-by: Matilda Landström
 2025-10-30 08:38:50 +00:00
Anton Gunnarsson
6b38d57197 Merged in chore/fix-broken-e2e-test (pull request #3031) 
chore: Fix broken e2e tests

* Update date picker selector


Approved-by: Joakim Jäderberg
 2025-10-29 15:24:09 +00:00
Erik Tiekstra
5e81ec0eaf fix(BOOK-450): Re added the check for hotel branding feature flag before setting theme 
Approved-by: Bianca Widstam
Approved-by: Matilda Landström
 2025-10-29 14:06:59 +00:00
Joakim Jäderberg
56b44c16d4 Merged in chore/upgrade-netlify-nextjs-plugin (pull request #3032) 
chore: upgrade @netlify/plugin-nextjs

* chore: upgrade @netlify/plugin-nextjs


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
 2025-10-29 13:36:27 +00:00
Erik Tiekstra
4c10989e8e Feat/BOOK-424 campaign banner 
Approved-by: Bianca Widstam
 2025-10-29 12:47:40 +00:00
Christel Westerberg
377c8886ad Merged in fix/STAY-73-opt-in-email (pull request #3028) 
Fix/STAY-73 opt in email

* fix: let user opt-in for modification email when adding ancillaries

* fix: add toast when successfully removing an ancillary


Approved-by: Erik Tiekstra
Approved-by: Elin Svedin
 2025-10-29 12:45:18 +00:00
Erik Tiekstra
333636c81a Merged in feat/BOOK-61-refactor-hotel-page-css-variables (pull request #3014) 
Feat/BOOK-61 refactor hotel page css variables

* feat(BOOK-61): Breadcrumbs

* feat(BOOK-61): intro section

* feat(BOOK-61): show more button

* feat(BOOK-61): rooms section

* feat(BOOK-61): sidepeeks

* feat(BOOK-61): deprecated old Link component

* feat(BOOK-61): added new TextLink component to the design-system

* feat(BOOK-61): replaced deprecated links with new TextLink component

* feat(BOOK-61): miscellaneous changes


Approved-by: Bianca Widstam
Approved-by: Christel Westerberg
 2025-10-29 09:15:03 +00:00
Bianca Widstam
bfe5c5f8bb Merged in lokalize/sync (pull request #3024) 
lokalise sync

* lokalise sync

* lokalise sync and remove duplicate id


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
 2025-10-28 10:26:47 +00:00
Joakim Jäderberg
a4f1a55e56 Merged in feat/SW-3549-handle-unlinked-account (pull request #3019) 
fix(SW-3549): update social session management functions for clarity and consistency

* refactor(SW-3549): rename session management functions for clarity and consistency

* merge


Approved-by: Hrishikesh Vaipurkar
 2025-10-28 09:51:30 +00:00
Anton Gunnarsson
642f032512 Merged in fix/update-sas-join-card-text (pull request #2998) 
fix: Update SAS join card text and size

* Update SAS join card text and size


Approved-by: Joakim Jäderberg
 2025-10-28 08:17:04 +00:00
Matilda Landström
649c85e6f5 Merged in feat/Lokalise-fetch (pull request #3021) 
Update from Lokalise 27/10-25

* Update from Lokalise 27/10-25


Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-27 16:00:35 +00:00
Joakim Jäderberg
9c78d6a98a Merged in fix/my-stay-bookingflowconfig-missing (pull request #3020) 
fix: wrap MyStay component in BookingFlowConfig to handle RSC problem where config is not set

* fix: wrap MyStay component in BookingFlowConfig to handle RSC problem where config is not set


Approved-by: Bianca Widstam
 2025-10-27 14:55:00 +00:00
Hrishikesh Vaipurkar
98e67f5eda Merged in fix/SW-3550-member-rates-should-only- (pull request #3005) 
fix(SW-3550): Treat unlinked User as non-logged user within booking flow

Approved-by: Joakim Jäderberg
 2025-10-27 14:34:19 +00:00
Chuma Mcphoy (We Ahead)
d259a26b6e Merged in fix/LOY-358-change-sas-boosted-text (pull request #3018) 
fix(LOY-358): change sas boost text

* fix(LOY-358): change sas boost text


Approved-by: Emma Zettervall
 2025-10-27 14:24:58 +00:00
Joakim Jäderberg
3b3e7308cc Merged in feat/SW-3549-pass-scandic-token (pull request #2989) 
Feat/SW-3549 pass scandic token

* WIP pass scandic token

* pass scandic token when booking

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* pass user token when doing availability search

* undo changes

* merge

* Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988)

fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages

* Merged in fix/update-promo-error-modal-text (pull request #2990)

fix: update promo error modal text

* fix: update promo error modal text


Approved-by: Emma Zettervall

* Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991)

fix(SW-3514): Show join Scandic Friends card for SAS multiroom

* Show join card for room 2+


Approved-by: Hrishikesh Vaipurkar

* Merged in feat/lokalise-rebuild (pull request #2993)

Feat/lokalise rebuild

* chore(lokalise): update translation ids

* chore(lokalise): easier to switch between projects

* chore(lokalise): update translation ids

* .

* .

* .

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* chore(lokalise): new translations

* merge

* switch to errors for missing id's

* merge

* sync translations


Approved-by: Linus Flood

* Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994)

feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg

* merge

* replace getRedemptionTokenSafely() with context based instead

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* merge

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* add booking scope

remove unused getMembershipNumber()


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
 2025-10-24 13:17:02 +00:00
Bianca Widstam
c473bbc8b0 Merged in fix/BOOK-323-enter-details-scroll-error (pull request #2986) 
Fix/BOOK-323 enter details scroll error

* fix(BOOK-323): scroll to invalid element on submit on enter details

* fix(BOOK-323): update error message design

* fix(BOOK-323): clean up

* fix(BOOK-323): scroll to fields in room in right order

* fix(BOOK-323): add id to translations

* fix(BOOK-323): remove undefined

* fix(BOOK-323): fix submitting state

* fix(BOOK-323): use ref in multiroom for scrolling to right element, add membershipNo

* fix(BOOK-323): fix invalid border country

* fix(BOOK-323): use error message component

* fix(BOOK-323): fix invalid focused styling on mobile

* fix(BOOK-323): remove redundant dependency in callback


Approved-by: Erik Tiekstra
 2025-10-24 11:30:56 +00:00
Erik Tiekstra
11f76a509a fix(BOOK-466): We needed to separate the z-index from window.kindlyChat to also cater for other languages 
Approved-by: Linus Flood
 2025-10-23 13:37:08 +00:00
Erik Tiekstra
8714bc79fd feat(BOOK-116): Added better alt text to static map on hotel pages 
Approved-by: Bianca Widstam
 2025-10-23 13:06:45 +00:00
Anton Gunnarsson
24847bbc1c Merged in fix/sw-3561-swan-eco-icon-broken (pull request #3004) 
fix(SW-3561): Fix broken swan eco icon on partner-sas

* Move swan-eco icons to shared

* Delete unused icons


Approved-by: Linus Flood
 2025-10-23 12:42:46 +00:00
Anton Gunnarsson
a00cf8d327 Merged in fix/sw-3568-sas-terms-and-conditions-link (pull request #3002) 
feat(SW-3568): Use dependency injected link for SF terms on enter details

* Use dependency injected link for sf terms


Approved-by: Linus Flood
 2025-10-23 11:14:51 +00:00
Erik Tiekstra
89f1fb0023 fix(BOOK-466): Setting chatbot z-index variable to -1 if the chatbot should be hidden to avoid issues when multiple tabs are open 
Approved-by: Linus Flood
 2025-10-23 09:37:47 +00:00
Hrishikesh Vaipurkar
7f2db6f3de Merged in feat/SW-3557-update-ui-colors-after-test- (pull request #2995) 
* feat(SW-3557): Updated colors

Approved-by: Anton Gunnarsson
 2025-10-23 06:54:14 +00:00
Hrishikesh Vaipurkar
d6941042de Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994) 
feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg
 2025-10-22 11:26:09 +00:00
Joakim Jäderberg
aafad9781f Merged in feat/lokalise-rebuild (pull request #2993) 
Feat/lokalise rebuild

* chore(lokalise): update translation ids

* chore(lokalise): easier to switch between projects

* chore(lokalise): update translation ids

* .

* .

* .

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* chore(lokalise): new translations

* merge

* switch to errors for missing id's

* merge

* sync translations


Approved-by: Linus Flood
 2025-10-22 11:00:03 +00:00
Matilda Landström
7164070d59 Merged in fix/update-promo-error-modal-text (pull request #2990) 
fix: update promo error modal text

* fix: update promo error modal text


Approved-by: Emma Zettervall
 2025-10-22 07:05:05 +00:00
Anton Gunnarsson
c435cdba68 Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988) 
fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages
 2025-10-22 07:04:21 +00:00