Chuma Mcphoy (We Ahead)
494bfe10f3
Merged in feat/profile-consent-feature-branch (pull request #2900 )
...
feat(LOY-268): Feature branch for profiling consent work
* feat: Add feature branch for profile and consent work
* Merged in feat/LOY-268-profile-consent-banner-comp (pull request #2908 )
Feat/LOY-358 profile consent banner component
* feat: Add feature branch for profile and consent work
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
Approved-by: Chuma Mcphoy (We Ahead)
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* Merged in feat/profile-consent-contentstack (pull request #2921 )
Feat(LOY-389): Profile consent in Contentstack
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* chore(LOY-348): add profiling consent as CS entry
* chore(LOY-348): add banner as dynamic content
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901 )
Feat(LOY-347): Profiling Consent Modal (phase 1)
* feat(LOY-347): Profile Consent Modal base functionality
* feat(LOY-347): Add Icon
* feat(LOY-347): Add Benefit Cards to Profile consent modal
* feat(LOY-347): Add accordion to profile consent modal
* fix(LOY-347): scroll behaviour
* Fix(LOY-347): fade in/out animations of profile consent modal
* fix(LOY-347): White Ellipsis Around Icons
* feat(LOY-347): Implement ability to open modal from banner
* fix(LOY-347): minor fixes
* fix(LOY-347): replace old spa icon
* fix(LOY-347): re-add env vars
* fix(LOY-347): File renaming and cleanup
* chore(LOY-347): Update readme
* fix(LOY-347): use correct space var
* fix(LOY-347): Add TODO comment for adding link to accordion
Approved-by: Matilda Landström
* Merged in fix/LOY-386-profiling-consent-modal-contentstack (pull request #2930 )
Fix(LOY-386): profiling consent modal contentstack
* feat(LOY-347): Profile Consent Modal base functionality
* feat(LOY-347): Add Icon
* feat(LOY-347): Add Benefit Cards to Profile consent modal
* feat(LOY-347): Add accordion to profile consent modal
* fix(LOY-347): scroll behaviour
* Fix(LOY-347): fade in/out animations of profile consent modal
* fix(LOY-347): White Ellipsis Around Icons
* feat(LOY-347): Implement ability to open modal from banner
* fix(LOY-347): minor fixes
* fix(LOY-347): replace old spa icon
* fix(LOY-347): re-add env vars
* fix(LOY-347): File renaming and cleanup
* fix(LOY-386): Use contentstack content for profile consent modal
* fix(LOY-386): beneift cards schema transform
* chore(LOY-386): remove usememo
* fix(LOY-386): fix modalcontent check
* fix(LOY-386): remove uneeded vars
Approved-by: Matilda Landström
* Merged in feat/LOY-412-profiling-consent-in-signup (pull request #2976 )
Feat(LOY-412): profiling consent in signup
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* Merged in feat/profile-consent-contentstack (pull request #2921 )
Feat(LOY-389): Profile consent in Contentstack
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* chore(LOY-348): add profiling consent as CS entry
* chore(LOY-348): add banner as dynamic content
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901 )
Feat(LOY-347): Profiling Consent Modal (phase 1)
* feat(LOY-347): Profile Consent Modal base functionality
* feat(LOY-347): Add Icon
* feat(LOY-347): Add Benefit Cards to Profile consent modal
* feat(LOY-347): Add accordion to profile consent modal
* fix(LOY-347): scroll behaviour
* Fix(LOY-347): fade in/out animations of profile consent modal
* fix(LOY-347): White Ellipsis Around Ico…
* Merged in fix/lokalise-ids (pull request #3013 )
fix: add ids to translations in Profiling Consent
* fix: add ids to translations
Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in LOY-436-my-pages-profiling-consent (pull request #3011 )
LOY-436: Profiling Consent on My Profile, no api
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-418-profiling-consent-ui-text-update (pull request #3080 )
Feat/LOY-418: Profiling consent ui and text update
* chore(LOY-418): update /consent buttons
* chore(LOY-418): update legal texts
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-268-profiling-consent-api (pull request #3088 )
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-413-Signup-API-Profiling-Consent (pull request #3105 )
Feat/LOY-413 Signup API Profiling Consent
* feat(LOY-413): signup profiling consent
* chore(LOY-413): remove todo
* fix(LOY-413): only pass in profilingConsent if true
* fix(LOY-413): proper spread of profilingConsent in signup input
Approved-by: Christel Westerberg
* Merged in fix/LOY-413-use-v2-for-signup-call (pull request #3112 )
fix(LOY-413): use v2 endpoint for profile POST in signup
* fix(LOY-413): use v2 endpoint for profile POST in signup
Approved-by: Erik Tiekstra
* Merged in feat/LOY-268-profiling-consent-improvements (pull request #3094 )
Feat/LOY-268: Profiling consent improvements
* Merged in feat/profile-consent-contentstack (pull request #2921 )
Feat(LOY-389): Profile consent in Contentstack
* feat(LOY-268): create banner
* feat(LOY-268): Create personalization banner component
* chore(LOY-348): add profiling consent as CS entry
* chore(LOY-348): add banner as dynamic content
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-347-Profile-consent-modal-phase-1 (pull request #2901 )
Feat(LOY-347): Profiling Consent Modal (phase 1)
* feat(LOY-347): Profile Consent Modal base functionality
* feat(LOY-347): Add Icon
* feat(LOY-347): Add Benefit Cards to Profile consent modal
* feat(LOY-347): Add accordion to profile consent modal
* fix(LOY-347): scroll behaviour
* Fix(LOY-347): fade in/out animations of profile consent modal
* fix(LOY-347): White Ellipsis Around Icons
* feat(LOY-347): Implement ability to open modal from banner
* fix(LOY-347): min…
* Merged in fix/update-graphql (pull request #3130 )
fix: update graphql
* fix: update graphql
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in feat/LOY-414-prof-consent-tracking (pull request #3127 )
Feat/LOY-414 profile consent tracking + credit card ui update
* chore(LOY-414): create track link function
* chore(LOY-414): add cta tracking
* chore(LOY-414): add profileConsent to userInfo datalayer
* chore(LOY-414): update credit card ui
* chore(LOY-414): update tracking specs
* chore(LOY-414): add pageView tracking to modal
Approved-by: Chuma Mcphoy (We Ahead)
* fix: remove old flag
* Merged in fix/LOY-268-prof-consent-button-fix (pull request #3162 )
fix(LOY-268): add button as link
* fix(LOY-268): add button as link
Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Matilda Landström
2025-11-14 13:28:56 +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
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
Hrishikesh Vaipurkar
260a544c99
Merged in chore/SW-3381-move-loginbutton-to-ds- (pull request #2752 )
...
chore(SW-3381) Moved LoginButton to design system
* chore(SW-3381) Moved LoginButton to design system
Approved-by: Anton Gunnarsson
2025-09-03 09:11:28 +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
Anton Gunnarsson
1bd8fe6821
Merged in feat/sw-2879-booking-widget-to-booking-flow-package (pull request #2532 )
...
feat(SW-2879): Move BookingWidget to booking-flow package
* Fix lockfile
* Fix styling
* a tiny little booking widget test
* Tiny fixes
* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package
* Remove unused scripts
* lint:fix
* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package
* Tiny lint fixes
* update test
* Update Input in booking-flow
* Clean up comments etc
* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package
* Setup tracking context for booking-flow
* Add missing use client
* Fix temp tracking function
* Pass booking to booking-widget
* Remove comment
* Add use client to booking widget tracking provider
* Add use client to tracking functions
* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package
* Move debug page
* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package
* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package
* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package
Approved-by: Bianca Widstam
2025-08-05 09:20:20 +00:00
Anton Gunnarsson
01ca2b4897
Merged in feat/sw-2867-move-user-router-to-trpc-package (pull request #2428 )
...
Move user router to trpc package
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Move booking router to trpc package
* Move partners router to trpc package
* Move autocomplete router to trpc package
* Move booking router to trpc package
* Remove translations from My Pages navigation trpc procedure
* Move navigation router to trpc package
* Move user router to trpc package
* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package
* Merge branch 'feat/sw-2862-move-booking-router-to-trpc-package' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'feat/sw-2865-move-navigation-router-to-trpc-package' into feat/sw-2867-move-user-router-to-trpc-package
* Merge branch 'master' into feat/sw-2867-move-user-router-to-trpc-package
Approved-by: Linus Flood
2025-06-27 07:07:49 +00:00
Anton Gunnarsson
00bcdaaa28
Merged in feat/sw-2865-move-navigation-router-to-trpc-package (pull request #2427 )
...
feat(SW-2862): Move navigation router to trpc package
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Move booking router to trpc package
* Move partners router to trpc package
* Move autocomplete router to trpc package
* Move booking router to trpc package
* Remove translations from My Pages navigation trpc procedure
* Move navigation router to trpc package
* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package
* Merge branch 'feat/sw-2862-move-booking-router-to-trpc-package' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package
* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package
Approved-by: Linus Flood
2025-06-27 06:54:49 +00:00
Anton Gunnarsson
bbcabfa0ba
Merged in feat/sw-2864-move-hotels-router-to-trpc-package (pull request #2410 )
...
feat (SW-2864): Move booking router to trpc package
* Add env to trpc package
* Add eslint to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* WIP first step
* update internal imports in trpc
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Move booking router to trpc package
* Merge branch 'master' into feat/sw-2864-move-hotels-router-to-trpc-package
Approved-by: Linus Flood
2025-06-26 09:02:59 +00:00
Anton Gunnarsson
002d093af4
Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389 )
...
feat(SW-2863): Move contentstack router to trpc package
* Add exports to packages and lint rule to prevent relative imports
* Add env to trpc package
* Add eslint to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* WIP first step
* update internal imports in trpc
* Fix most errors in scandic-web
Just 100 left...
* Move Props type out of trpc
* Fix CategorizedFilters types
* Move more schemas in hotel router
* Fix deps
* fix getNonContentstackUrls
* Fix import error
* Fix entry error handling
* Fix generateMetadata metrics
* Fix alertType enum
* Fix duplicated types
* lint:fix
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
* Fix broken imports
* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package
Approved-by: Linus Flood
2025-06-26 07:53:01 +00:00
Linus Flood
7a56d21a3e
Merged in feat/SW-3050-webviews (pull request #2429 )
...
Feat/SW-3050 webviews
Approved-by: Anton Gunnarsson
2025-06-25 07:44:33 +00:00
Anton Gunnarsson
846fd904a6
Merged in feat/sw-2859-set-up-shared-trpc-package (pull request #2319 )
...
feat(SW-2859): Create trpc package
* Add isEdge, safeTry and dataCache to new common package
* Add eslint and move prettier config
* Clean up tests
* Create trpc package and move initialization
* Move errors and a few procedures
* Move telemetry to common package
* Move tokenManager to common package
* Add Sentry to procedures
* Clean up procedures
* Fix self-referencing imports
* Add exports to packages and lint rule to prevent relative imports
* Add env to trpc package
* Add eslint to trpc package
* Apply lint rules
* Use direct imports from trpc package
* Add lint-staged config to trpc
* Move lang enum to common
* Restructure trpc package folder structure
* Fix lang imports
Approved-by: Linus Flood
2025-06-18 12:14:20 +00:00
Chuma Mcphoy (We Ahead)
2101b79db1
Merged in feat/LOY-230-Microsoft-Entra-ID-Auth (pull request #2113 )
...
Feat(LOY-230): DTMC Routes with Entra ID Auth & Error Page Handling
* feat(LOY-230): Link Scandic Friends and Azure accounts
* fix(LOY-230): remove employee id param setting
* fix(LOY-230): return token in jwt callback for auth.dtmc.ts
Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-06-18 10:22:04 +00:00
Linus Flood
c5e2fc7805
Merged in fix/webview-mystay-rewrites (pull request #2329 )
...
fix(webviews) - rewrites for my-stay webviews
* fix(webviews) - rewrites for my-stay webviews
Approved-by: Anton Gunnarsson
2025-06-10 13:11:42 +00:00
Chuma Mcphoy (We Ahead)
9ac5e43f0f
Merged in feat/link-employment-route (pull request #2012 )
...
feat(LOY-229): New Link Employment page
* feat(LOY-229): Ship Link Employment page
* fix(LOY-229): review fixes
* fix(LOY-229): update Button component props for better styling consistency
* fix(LOY-229): update ButtonLink href to use linkEmployment route
Approved-by: Christian Andolf
2025-05-09 07:51:27 +00:00
Chuma Mcphoy (We Ahead)
27aef3982e
Merged in fix/LOY-222-find-my-booking-urls-for-prod (pull request #1817 )
...
Fix(LOY-222): Find my booking url handling
* fix(LOY-222): adapt findMyBooking url based on HIDE_FOR_NEXT_RELEASE
* feat(LOY-222): add current web paths for findMyBooking in multiple languages
* refactor(LOY-222): better env and new url constructions
* refactor(LOY-222): decouple env var handling from getCurrentWebUrl
* fix(LOY-222): update findMyBooking URL construction to use baseUrl
* fix(LOY-222): simplify findMyBooking URL handling for new web urls
* fix(LOY-222): Update Finnish path for hotel reservation lookup
* refactor(LOY-222): rename PUBLIC_URL to NEXT_PUBLIC_PUBLIC_URL for consistency
Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-04-22 07:03:23 +00:00
Linus Flood
cfa8c166a3
Merged in feat/sw-2403-mystay-webview (pull request #1828 )
...
Feat/sw-2403 - Adding webview for MyStay
* feat/webview - added for my stay
* wip
* Passing headers so we can get the lang
* Cleanup
* Refactored and some performance improvements
Approved-by: Christian Andolf
2025-04-17 08:48:52 +00:00
Matilda Landström
5de2a993a7
Merged in feat/SW-1711-switch-icons (pull request #1558 )
...
Switches out all the old icons to new ones, and moves them to the design system. The new icons are of three different types: Materialise Symbol, Nucleo, and Customized. Also adds further mapping between facilities/amenities and icons.
Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-03-27 09:42:52 +00:00
Niclas Edenvin
efa7336ebd
Merged in feat/sw-1602-preliminary-receipt (pull request #1595 )
...
feat/sw-1602 preliminary receipt
* feat(sw-1602): create page for preliminary receipt
* Add link to my stay page
Approved-by: Pontus Dreij
2025-03-24 07:55:15 +00:00
Pontus Dreij
8f9e268802
Merged in feat(SW-1944)-update-url-to-mystay (pull request #1566 )
...
feat(SW-1944) Update to correct URL to my stay (for my pages/my stays and confirmation page)
* feat(SW-1944) Update to correct URL to my stay (for my pages/my stays and confirmation page)
* feat(SW-1944) updated to RefId
* feat(SW-1944) updated myStay path
* feat(SW-1944) updated refId check
Approved-by: Christian Andolf
2025-03-20 09:55:24 +00:00
Michael Zetterberg
33239f1f91
feat(SW-1730): add button to room sidepeek on hotelpage to select rate page for the hotel
2025-03-14 13:57:26 +00:00
Bianca Widstam
abd401c4f4
Merged in feat/SW-1368-1369-Guarantee-late-arrival (pull request #1512 )
...
Feat/SW-1368 1369 Guarantee late arrival
* feat(SW-1368-SW-1369): guarantee late arrival for confirmation page and my stay
* feat(SW-1368-SW-1369): guarantee late arrival updated design
* feat(SW-1368-SW-1369): add translations
* feat(SW-1368-SW-1369): add translations
* feat(SW-1368-SW-1369): fix merge with master
* feat(SW-1368-SW-1369): add translations
* feat(SW-1368-SW-1369): add redirect with refId
* feat(SW-1368-SW-1369): if booking completed redirect to confirmation page
* feat(SW-1368-SW-1369): fix comments pr
* feat(SW-1368-SW-1369): fix comments pr
* feat(SW-1368-SW-1369): fix rebase master
* feat(SW-1368-SW-1369): fix duplicate flex rate check
* feat(SW-1368-SW-1369): if any room is flex, card must be used
* feat(SW-1368-SW-1369): move callback route
* feat(SW-1368-SW-1369): top align checkbox
* feat(SW-1368-SW-1369): top align checkbox
Approved-by: Tobias Johansson
Approved-by: Niclas Edenvin
2025-03-14 10:43:14 +00:00
Anton Gunnarsson
dabfe0424b
Merged in fix/update-my-pages-sas-url (pull request #1533 )
...
Update My Pages SAS url
* Update My Pages SAS url
Approved-by: Linus Flood
2025-03-14 08:31:19 +00:00
Christian Andolf
7d3c0c96e3
refactor(SW-1273): move find my booking routes in order to import them directly into next config
2025-02-27 09:57:18 +01:00
Anton Gunnarsson
80100e7631
Merged in monorepo-step-1 (pull request #1080 )
...
Migrate to a monorepo setup - step 1
* Move web to subfolder /apps/scandic-web
* Yarn + transitive deps
- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)
* Pin framer-motion to temporarily fix typing issue
https://github.com/adobe/react-spectrum/issues/7494
* Pin zod to avoid typ error
There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.
* Pin react-intl version
Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.
* Pin typescript version
Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.
* Setup workspaces
* Add design-system as a monorepo package
* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN
* Fix husky for monorepo setup
* Update netlify.toml
* Add lint script to root package.json
* Add stub readme
* Fix react-intl formatMessage types
* Test netlify.toml in root
* Remove root toml
* Update netlify.toml publish path
* Remove package-lock.json
* Update build for branch/preview builds
Approved-by: Linus Flood
2025-02-26 10:36:17 +00:00
