Erik Tiekstra
3f632e6031
Merged in fix/BOOK-293-button-variants (pull request #3371 )
...
fix(BOOK-293): changed variants and props on IconButton component
* fix(BOOK-293): changed variants and props on IconButton component
* fix(BOOK-293): inherit color for icon
Approved-by: Bianca Widstam
Approved-by: Christel Westerberg
2025-12-19 12:32:52 +00:00
Erik Tiekstra
4ec1e85d84
Feat/BOOK-293 button adjustments
...
* feat(BOOK-293): Adjusted padding of the buttons to match Figma design
* feat(BOOK-293): Updated variants for IconButton
* feat(BOOK-113): Updated focus indicators on buttons and added default focus ring color
* feat(BOOK-293): Replaced buttons inside booking widget
Approved-by: Christel Westerberg
2025-12-15 07:05:31 +00:00
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
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
Joakim Jäderberg
72f4f72a17
Merged in SW-3317-move-toast-to-design-system (pull request #2716 )
...
SW-3317 move toast to design system
* chore: Move toast to design-system and add interaction tests
* Move toast to design-system and add storybook tests
* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3317-move-toast-to-design-system
* merge
* move sonner dependency to @scandic-hotels/design-system
Approved-by: Anton Gunnarsson
2025-08-27 13:03:17 +00:00
Hrishikesh Vaipurkar
71c6f4cab3
Merged in chore/SW-3145-move-button (pull request #2527 )
...
chore: SW-3145 Moved tempdesign button to design-system
* chore: SW-3145 Moved tempdesign button to design-system
Approved-by: Anton Gunnarsson
2025-07-07 07:11:18 +00:00
Anton Gunnarsson
be25be7bb5
Merged in feat/sw-3125-move-client-trpc-setup (pull request #2493 )
...
feat(SW-3125): Move client trpc setup
* Move client trpc to package
* Client setup in partner-sas
* Add todo
Approved-by: Linus Flood
2025-07-01 12:41:28 +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
Matilda Landström
1239f0c662
Merged in feat/SW-1711-SW-2077-icons (pull request #1709 )
...
Fix(SW-1711)/(SW-2077): Export icons individually
* fix(SW-1711): export icons individually
Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-04-07 07:25:25 +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
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
