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
Joakim Jäderberg
dc53ab9245
Merged in chore/upgrade-next (pull request #3124 )
...
Upgrade next@15.5.6
* chore: upgrade next@15.5.6
* chore: upgrade turborepo@2.6.1
* fix typings for scandic-web
* fix: set correct type for pages
* cleanup
* fix more route.ts typing issues
* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/upgrade-next
* explicitly import the types
Approved-by: Linus Flood
2025-11-13 07:33:56 +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
Erik Tiekstra
339e7195dc
fix(BOOK-436): Added new section component and deprecated the other
...
Approved-by: Chuma Mcphoy (We Ahead)
2025-10-13 08:31:26 +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
Joakim Jäderberg
8c3f8c74db
Merged in feature/SW-3365-blurry-images (pull request #2746 )
...
Feature/SW-3365 reduce upscaling of images (fix blurry images)
* fix: handle when images are wider than 3:2 but rendered in a 3:2 container
* use dimensions everywhere applicable
* fall back to using <img sizes='auto' /> if possible
* imageLoader: never nest
* remove empty test file
Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-09-02 17:52:31 +00:00
Anton Gunnarsson
65c6bc4c59
Merged in feat/sw-3369-move-loadingspinner (pull request #2742 )
...
feat(SW-3369): Move LoadingSpinner to design-system
* Move LoadingSpinner to design-system
Approved-by: Joakim Jäderberg
2025-09-02 06:46:58 +00:00
Anton Gunnarsson
a2213d0169
Merged in feat/sw-3228-move-image-to-design-system (pull request #2616 )
...
feat(SW-3228): Move Image to design-system
* Move Image to design-system
* Merge branch 'master' into feat/sw-3228-move-image-to-design-system
Approved-by: Linus Flood
2025-08-12 12:58:05 +00:00
Joakim Jäderberg
daf765f3d5
Merged in feature/wrap-logging (pull request #2511 )
...
Feature/wrap logging
* feat: change all logging to go through our own logger function so that we can control log levels
* move packages/trpc to using our own logger
* merge
Approved-by: Linus Flood
2025-07-03 12:37:04 +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
Christian Andolf
3f6127b861
feat(LOY-276): add hero image to account page
2025-06-24 14:54:54 +02:00
Anton Gunnarsson
cbf9e7b7c2
Merged in chore/next15 (pull request #1999 )
...
chore (SW-834): Upgrade to Next 15
* wip: apply codemod and upgrade swc plugin
* wip: design-system to react 19, fix issues from async (search)params
* wip: fix remaining issues from codemod
serverClient is now async because context use headers()
getLang is now async because it uses headers()
* Minor cleanup
* Inline react-material-symbols package
Package is seemingly not maintained any more and doesn't support
React 19. This copies the package source into `design-system`,
makes the necessary changes for 19 and export it for others to use.
* Fix missing awaits
* Disable modal exit animations
Enabling modal exit animations via isExiting prop is causing
modals to be rendered in "hidden" state and never unmount.
Seems to be an issue with react-aria-components,
see https://github.com/adobe/react-spectrum/issues/7563 .
Can probably be fixed by rewriting to a solution similar to
https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html
* Remove unstable cache implementation and use in memory cache locally
* Fix ref type in SelectFilter
* Use cloneElement to add key prop to element
Approved-by: Linus Flood
2025-06-02 11:11:50 +00:00
Michael Zetterberg
440e1f92df
feat(SW-706): make eslint rule 'formatjs/no-literal-string-in-jsx' pass
2025-04-14 11:30:06 +00:00
Christian Andolf
0c1396f2ee
fix: remove useless imports and sort them
...
add missing key in iterator
2025-02-27 09:43:57 +01:00
Linus Flood
0c498d82ca
Merged in feat/trackingsdk-client (pull request #1420 )
...
feat: trackingsdk as client component
* feat: trackingsdk as client component
* Cleanup
* Merge changes from feat/trackingsdk-client
* revert yarn.lock
* Added lcpTime and wait with tracking until we have the values
Approved-by: Joakim Jäderberg
2025-02-27 07:22:58 +00: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
