From c9c28c97b3633ef4408bb5a7d3d057144ba2cfe2 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 25 Apr 2023 08:25:31 +0200 Subject: [PATCH] Add more tips to onboarding flow in web UI --- .../mastodon/features/onboarding/follows.jsx | 16 +++-- .../mastodon/features/onboarding/share.jsx | 65 ++++++++++++++++++- .../mastodon/locales/defaultMessages.json | 18 ++++- app/javascript/mastodon/locales/en.json | 6 +- .../styles/mastodon/components.scss | 28 ++++++++ 5 files changed, 125 insertions(+), 8 deletions(-) diff --git a/app/javascript/mastodon/features/onboarding/follows.jsx b/app/javascript/mastodon/features/onboarding/follows.jsx index c42daf2ff1bc9..7cccdefb3d507 100644 --- a/app/javascript/mastodon/features/onboarding/follows.jsx +++ b/app/javascript/mastodon/features/onboarding/follows.jsx @@ -46,6 +46,16 @@ class Follows extends React.PureComponent { render () { const { onBack, isLoading, suggestions, account } = this.props; + let loadedContent; + + if (isLoading) { + loadedContent = (new Array(8)).fill().map((_, i) => ); + } else if (suggestions.isEmpty()) { + loadedContent =
; + } else { + loadedContent = suggestions.map(suggestion => ); + } + return ( @@ -59,12 +69,10 @@ class Follows extends React.PureComponent {
- {isLoading ? (new Array(8)).fill().map((_, i) => ) : suggestions.map(suggestion => ( - - ))} + {loadedContent}
-

{text} }} />

+

diff --git a/app/javascript/mastodon/features/onboarding/share.jsx b/app/javascript/mastodon/features/onboarding/share.jsx index 897b2e74d600d..9555a3a43aa64 100644 --- a/app/javascript/mastodon/features/onboarding/share.jsx +++ b/app/javascript/mastodon/features/onboarding/share.jsx @@ -5,14 +5,15 @@ import PropTypes from 'prop-types'; import { me, domain } from 'mastodon/initial_state'; import { connect } from 'react-redux'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; +import { defineMessages, injectIntl, FormattedMessage, FormattedHTMLMessage } from 'react-intl'; import classNames from 'classnames'; import Icon from 'mastodon/components/icon'; import ArrowSmallRight from './components/arrow_small_right'; import { Link } from 'react-router-dom'; +import SwipeableViews from 'react-swipeable-views'; const messages = defineMessages({ - shareableMessage: { id: 'onboarding.share.message', defaultMessage: 'I\'m {username} on Mastodon! Come follow me at {url}' }, + shareableMessage: { id: 'onboarding.share.message', defaultMessage: 'I\'m {username} on #Mastodon! Come follow me at {url}' }, }); const mapStateToProps = state => ({ @@ -80,6 +81,60 @@ class CopyPasteText extends React.PureComponent { } +class TipCarousel extends React.PureComponent { + + static propTypes = { + children: PropTypes.node, + }; + + state = { + index: 0, + }; + + handleSwipe = index => { + this.setState({ index }); + }; + + handleChangeIndex = e => { + this.setState({ index: Number(e.currentTarget.getAttribute('data-index')) }); + }; + + handleKeyDown = e => { + switch(e.key) { + case 'ArrowLeft': + e.preventDefault(); + this.setState(({ index }, { children }) => ({ index: Math.abs(index - 1) % children.length })); + break; + case 'ArrowRight': + e.preventDefault(); + this.setState(({ index }, { children }) => ({ index: (index + 1) % children.length })); + break; + } + }; + + render () { + const { children } = this.props; + const { index } = this.state; + + return ( +
+ + {children} + + +
+ {children.map((_, i) => ( + + ))} +
+
+ ); + } + +} + class Share extends React.PureComponent { static propTypes = { @@ -105,6 +160,12 @@ class Share extends React.PureComponent { + +

+

+

+ +

diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 6d16ecd834c3e..ca38088c64612 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -3186,6 +3186,10 @@ }, { "descriptors": [ + { + "defaultMessage": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.", + "id": "onboarding.follows.empty" + }, { "defaultMessage": "Popular on Mastodon", "id": "onboarding.follows.title" @@ -3265,7 +3269,7 @@ { "descriptors": [ { - "defaultMessage": "I'm {username} on Mastodon! Come follow me at {url}", + "defaultMessage": "I'm {username} on #Mastodon! Come follow me at {url}", "id": "onboarding.share.message" }, { @@ -3284,6 +3288,18 @@ "defaultMessage": "Let people know how they can find you on Mastodon!", "id": "onboarding.share.lead" }, + { + "defaultMessage": "Did you know? You can verify your account by putting a link to your Mastodon profile on your own website and adding the website to your profile. No fees or documents necessary!", + "id": "onboarding.tips.verification" + }, + { + "defaultMessage": "Did you know? If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!", + "id": "onboarding.tips.migration" + }, + { + "defaultMessage": "Did you know? You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!", + "id": "onboarding.tips.2fa" + }, { "defaultMessage": "Possible next steps:", "id": "onboarding.share.next_steps" diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 55b34f3c87182..177155497f99f 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -445,10 +445,11 @@ "onboarding.actions.close": "Don't show this screen again", "onboarding.actions.go_to_explore": "See what's trending", "onboarding.actions.go_to_home": "Go to your home feed", + "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.", "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!", "onboarding.follows.title": "Popular on Mastodon", "onboarding.share.lead": "Let people know how they can find you on Mastodon!", - "onboarding.share.message": "I'm {username} on Mastodon! Come follow me at {url}", + "onboarding.share.message": "I'm {username} on #Mastodon! Come follow me at {url}", "onboarding.share.next_steps": "Possible next steps:", "onboarding.share.title": "Share your profile", "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:", @@ -462,7 +463,10 @@ "onboarding.steps.setup_profile.title": "Customize your profile", "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!", "onboarding.steps.share_profile.title": "Share your profile", + "onboarding.tips.2fa": "Did you know? You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!", "onboarding.tips.accounts_from_other_servers": "Did you know? Since Mastodon is decentralized, some profiles you come across will be hosted on servers other than yours. And yet you can interact with them seamlessly! Their server is in the second half of their username!", + "onboarding.tips.migration": "Did you know? If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!", + "onboarding.tips.verification": "Did you know? You can verify your account by putting a link to your Mastodon profile on your own website and adding the website to your profile. No fees or documents necessary!", "password_confirmation.exceeds_maxlength": "Password confirmation exceeds the maximum password length", "password_confirmation.mismatching": "Password confirmation does not match", "picture_in_picture.restore": "Put it back", diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 248738f6b3a55..e985afea0b106 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -3026,6 +3026,29 @@ $ui-header-height: 55px; .account:last-child { border-bottom: 0; } + + &__empty { + text-align: center; + color: $darker-text-color; + font-weight: 500; + padding: 40px; + } +} + +.tip-carousel { + border: 1px solid transparent; + border-radius: 8px; + padding: 16px; + margin-bottom: 30px; + + &:focus { + outline: 0; + border-color: $highlight-text-color; + } + + .media-modal__pagination { + margin-bottom: 0; + } } .copy-paste-text { @@ -5539,6 +5562,11 @@ a.status-card.compact:hover { &.active { opacity: 1; } + + &:focus { + outline: 0; + background-color: $highlight-text-color; + } } .media-modal__close {