Onboarding modal (#1883)
* Basic onboarding modal that's shown to users once * Lay out pages 2 through 5, add images, style modals (#1509) * Lay out pages 2 through 5 Added images and laid out pages 2 through 5 in the jsx file. SCSS will come, still working on just seeing if this works at all. * Fix jsx errors, add images to modal pages, style modal pages * Add animations to onboarding pager changes, improve wording and styling * Finishing touches on the onboarding * Add missing propTypes * Update wordingmaster
parent
0cbcc5e297
commit
6d70a80263
After Width: | Height: | Size: 24 KiB |
@ -0,0 +1,14 @@ |
|||||||
|
import { openModal } from './modal'; |
||||||
|
import { changeSetting, saveSettings } from './settings'; |
||||||
|
|
||||||
|
export function showOnboardingOnce() { |
||||||
|
return (dispatch, getState) => { |
||||||
|
const alreadySeen = getState().getIn(['settings', 'onboarded']); |
||||||
|
|
||||||
|
if (!alreadySeen) { |
||||||
|
dispatch(openModal('ONBOARDING')); |
||||||
|
dispatch(changeSetting(['onboarded'], true)); |
||||||
|
dispatch(saveSettings()); |
||||||
|
} |
||||||
|
}; |
||||||
|
}; |
@ -0,0 +1,251 @@ |
|||||||
|
import { connect } from 'react-redux'; |
||||||
|
import PureRenderMixin from 'react-addons-pure-render-mixin'; |
||||||
|
import ImmutablePropTypes from 'react-immutable-proptypes'; |
||||||
|
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; |
||||||
|
import Permalink from '../../../components/permalink'; |
||||||
|
import { TransitionMotion, spring } from 'react-motion'; |
||||||
|
import ComposeForm from '../../compose/components/compose_form'; |
||||||
|
import Search from '../../compose/components/search'; |
||||||
|
import NavigationBar from '../../compose/components/navigation_bar'; |
||||||
|
import ColumnHeader from './column_header'; |
||||||
|
import Immutable from 'immutable'; |
||||||
|
|
||||||
|
const messages = defineMessages({ |
||||||
|
home_title: { id: 'column.home', defaultMessage: 'Home' }, |
||||||
|
notifications_title: { id: 'column.notifications', defaultMessage: 'Notifications' }, |
||||||
|
local_title: { id: 'column.community', defaultMessage: 'Local timeline' }, |
||||||
|
federated_title: { id: 'column.public', defaultMessage: 'Federated timeline' } |
||||||
|
}); |
||||||
|
|
||||||
|
const PageOne = ({ acct, domain }) => ( |
||||||
|
<div className='onboarding-modal__page onboarding-modal__page-one'> |
||||||
|
<div style={{ flex: '0 0 auto' }}> |
||||||
|
<div className='onboarding-modal__page-one__elephant-friend' /> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div> |
||||||
|
<h1><FormattedMessage id='onboarding.page_one.welcome' defaultMessage='Welcome to Mastodon!' /></h1> |
||||||
|
<p><FormattedMessage id='onboarding.page_one.federation' defaultMessage='Mastodon is a social network that belongs to everyone.' /></p> |
||||||
|
<p><FormattedMessage id='onboarding.page_one.handle' defaultMessage='You are on {domain}, one of many independent Mastodon instances. Your full handle is {handle}' values={{ domain, handle: <strong>{acct}@{domain}</strong> }}/></p> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
); |
||||||
|
|
||||||
|
PageOne.propTypes = { |
||||||
|
acct: React.PropTypes.string.isRequired, |
||||||
|
domain: React.PropTypes.string.isRequired |
||||||
|
}; |
||||||
|
|
||||||
|
const PageTwo = () => ( |
||||||
|
<div className='onboarding-modal__page onboarding-modal__page-two'> |
||||||
|
<div className='figure non-interactive'> |
||||||
|
<ComposeForm |
||||||
|
text='Awoo! #introductions' |
||||||
|
suggestions={Immutable.List()} |
||||||
|
mentionedDomains={[]} |
||||||
|
onChange={() => {}} |
||||||
|
onSubmit={() => {}} |
||||||
|
onPaste={() => {}} |
||||||
|
onPickEmoji={() => {}} |
||||||
|
onChangeSpoilerText={() => {}} |
||||||
|
onClearSuggestions={() => {}} |
||||||
|
onFetchSuggestions={() => {}} |
||||||
|
onSuggestionSelected={() => {}} |
||||||
|
/> |
||||||
|
</div> |
||||||
|
|
||||||
|
<p><FormattedMessage id='onboarding.page_two.compose' defaultMessage='Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.' /></p> |
||||||
|
</div> |
||||||
|
); |
||||||
|
|
||||||
|
const PageThree = ({ me, domain }) => ( |
||||||
|
<div className='onboarding-modal__page onboarding-modal__page-three'> |
||||||
|
<div className='figure non-interactive'> |
||||||
|
<Search |
||||||
|
value='' |
||||||
|
onChange={() => {}} |
||||||
|
onSubmit={() => {}} |
||||||
|
onClear={() => {}} |
||||||
|
onShow={() => {}} |
||||||
|
/> |
||||||
|
|
||||||
|
<div className='pseudo-drawer'> |
||||||
|
<NavigationBar account={me} /> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
|
<p><FormattedMessage id='onboarding.page_three.search' defaultMessage='Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.' values={{ illustration: <Permalink to='/timelines/tag/illustration' href='/tags/illustration'>#illustration</Permalink>, introductions: <Permalink to='/timelines/tag/introductions' href='/tags/introductions'>#introductions</Permalink> }}/></p> |
||||||
|
<p><FormattedMessage id='onboarding.page_three.profile' defaultMessage='Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.' /></p> |
||||||
|
</div> |
||||||
|
); |
||||||
|
|
||||||
|
PageThree.propTypes = { |
||||||
|
me: ImmutablePropTypes.map.isRequired, |
||||||
|
domain: React.PropTypes.string.isRequired |
||||||
|
}; |
||||||
|
|
||||||
|
const PageFour = ({ domain, intl }) => ( |
||||||
|
<div className='onboarding-modal__page onboarding-modal__page-four'> |
||||||
|
<div className='onboarding-modal__page-four__columns'> |
||||||
|
<div className='row'> |
||||||
|
<div> |
||||||
|
<div className='figure non-interactive'><ColumnHeader icon='home' type={intl.formatMessage(messages.home_title)} /></div> |
||||||
|
<p><FormattedMessage id='onboarding.page_four.home' defaultMessage='Home timeline shows posts from people you follow'/></p> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div> |
||||||
|
<div className='figure non-interactive'><ColumnHeader icon='bell' type={intl.formatMessage(messages.notifications_title)} /></div> |
||||||
|
<p><FormattedMessage id='onboarding.page_four.notifications' defaultMessage='Notifications show when someone interacts with you' /></p> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div className='row'> |
||||||
|
<div> |
||||||
|
<div className='figure non-interactive' style={{ marginBottom: 0 }}><ColumnHeader icon='globe' type={intl.formatMessage(messages.federated_title)} /></div> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div> |
||||||
|
<div className='figure non-interactive' style={{ marginBottom: 0 }}><ColumnHeader icon='users' type={intl.formatMessage(messages.local_title)} /></div> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
|
<p><FormattedMessage id='onboarding.page_five.public_timelines' defaultMessage='Federated timeline lists public posts from everyone who people on {domain} follow. Local timeline is the same, but limited to people on {domain}.' values={{ domain }} /></p> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
); |
||||||
|
|
||||||
|
PageFour.propTypes = { |
||||||
|
domain: React.PropTypes.string.isRequired, |
||||||
|
intl: React.PropTypes.object.isRequired |
||||||
|
}; |
||||||
|
|
||||||
|
const PageSix = ({ admin }) => { |
||||||
|
let adminSection = ''; |
||||||
|
|
||||||
|
if (admin) { |
||||||
|
adminSection = ( |
||||||
|
<p> |
||||||
|
<FormattedMessage id='onboarding.page_six.admin' defaultMessage="Your instance's admin is {admin}." values={{ admin: <Permalink href={admin.get('url')} to={`/accounts/${admin.get('id')}`}>@{admin.get('acct')}</Permalink> }} /> |
||||||
|
<br /> |
||||||
|
<FormattedMessage id='onboarding.page_six.read_guidelines' defaultMessage='Please, do not forget to read the {guidelines}!' values={{ guidelines: <a href='/about/more' target='_blank'><FormattedMessage id='onboarding.page_six.guidelines' defaultMessage='community guidelines' /></a> }}/> |
||||||
|
</p> |
||||||
|
); |
||||||
|
} |
||||||
|
|
||||||
|
return ( |
||||||
|
<div className='onboarding-modal__page onboarding-modal__page-six'> |
||||||
|
<h1><FormattedMessage id='onboarding.page_six.almost_done' defaultMessage='Almost done...' /></h1> |
||||||
|
{adminSection} |
||||||
|
<p><FormattedMessage id='onboarding.page_six.github' defaultMessage='Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.' values={{ github: <a href='https://github.com/tootsuite/mastodon' target='_blank' rel='noopener'>GitHub</a> }} /></p> |
||||||
|
<p><FormattedMessage id='onboarding.page_six.apps_available' defaultMessage='There are {apps} available for iOS, Android and other platforms. And now... Bon Appetoot!' values={{ apps: <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md' target='_blank' rel='noopener'><FormattedMessage id='onboarding.page_six.various_app' defaultMessage='various mobile apps' /></a> }} /></p> |
||||||
|
</div> |
||||||
|
); |
||||||
|
}; |
||||||
|
|
||||||
|
PageSix.propTypes = { |
||||||
|
admin: ImmutablePropTypes.map |
||||||
|
}; |
||||||
|
|
||||||
|
const mapStateToProps = state => ({ |
||||||
|
me: state.getIn(['accounts', state.getIn(['meta', 'me'])]), |
||||||
|
admin: state.getIn(['accounts', state.getIn(['meta', 'admin'])]), |
||||||
|
domain: state.getIn(['meta', 'domain']) |
||||||
|
}); |
||||||
|
|
||||||
|
const OnboardingModal = React.createClass({ |
||||||
|
|
||||||
|
propTypes: { |
||||||
|
onClose: React.PropTypes.func.isRequired, |
||||||
|
intl: React.PropTypes.object.isRequired, |
||||||
|
me: ImmutablePropTypes.map.isRequired, |
||||||
|
domain: React.PropTypes.string.isRequired, |
||||||
|
admin: ImmutablePropTypes.map |
||||||
|
}, |
||||||
|
|
||||||
|
getInitialState () { |
||||||
|
return { |
||||||
|
currentIndex: 0 |
||||||
|
}; |
||||||
|
}, |
||||||
|
|
||||||
|
mixins: [PureRenderMixin], |
||||||
|
|
||||||
|
handleSkip (e) { |
||||||
|
e.preventDefault(); |
||||||
|
this.props.onClose(); |
||||||
|
}, |
||||||
|
|
||||||
|
handleDot (i, e) { |
||||||
|
e.preventDefault(); |
||||||
|
this.setState({ currentIndex: i }); |
||||||
|
}, |
||||||
|
|
||||||
|
handleNext (maxNum, e) { |
||||||
|
e.preventDefault(); |
||||||
|
|
||||||
|
if (this.state.currentIndex < maxNum - 1) { |
||||||
|
this.setState({ currentIndex: this.state.currentIndex + 1 }); |
||||||
|
} else { |
||||||
|
this.props.onClose(); |
||||||
|
} |
||||||
|
}, |
||||||
|
|
||||||
|
render () { |
||||||
|
const { me, admin, domain, intl } = this.props; |
||||||
|
|
||||||
|
const pages = [ |
||||||
|
<PageOne acct={me.get('acct')} domain={domain} />, |
||||||
|
<PageTwo />, |
||||||
|
<PageThree me={me} domain={domain} />, |
||||||
|
<PageFour domain={domain} intl={intl} />, |
||||||
|
<PageSix admin={admin} /> |
||||||
|
]; |
||||||
|
|
||||||
|
const { currentIndex } = this.state; |
||||||
|
const hasMore = currentIndex < pages.length - 1; |
||||||
|
|
||||||
|
let nextOrDoneBtn; |
||||||
|
|
||||||
|
if(hasMore) { |
||||||
|
nextOrDoneBtn = <a href='#' onClick={this.handleNext.bind(null, pages.length)} className='onboarding-modal__nav onboarding-modal__next'><FormattedMessage id='onboarding.next' defaultMessage='Next' /></a>; |
||||||
|
} else { |
||||||
|
nextOrDoneBtn = <a href='#' onClick={this.handleNext.bind(null, pages.length)} className='onboarding-modal__nav onboarding-modal__done'><FormattedMessage id='onboarding.next' defaultMessage='Done' /></a>; |
||||||
|
} |
||||||
|
|
||||||
|
const styles = pages.map((page, i) => ({ |
||||||
|
key: i, |
||||||
|
style: { opacity: spring(i === currentIndex ? 1 : 0) } |
||||||
|
})); |
||||||
|
|
||||||
|
return ( |
||||||
|
<div className='modal-root__modal onboarding-modal'> |
||||||
|
<TransitionMotion styles={styles}> |
||||||
|
{interpolatedStyles => |
||||||
|
<div className='onboarding-modal__pager'> |
||||||
|
{pages.map((page, i) => |
||||||
|
<div key={i} style={{ opacity: interpolatedStyles[i].style.opacity, pointerEvents: i === currentIndex ? 'auto' : 'none' }}>{page}</div> |
||||||
|
)} |
||||||
|
</div> |
||||||
|
} |
||||||
|
</TransitionMotion> |
||||||
|
|
||||||
|
<div className='onboarding-modal__paginator'> |
||||||
|
<div> |
||||||
|
<a href='#' className='onboarding-modal__skip' onClick={this.handleSkip}><FormattedMessage id='onboarding.skip' defaultMessage='Skip' /></a> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div className='onboarding-modal__dots'> |
||||||
|
{pages.map((_, i) => <div key={i} onClick={this.handleDot.bind(null, i)} className={`onboarding-modal__dot ${i === currentIndex ? 'active' : ''}`} />)} |
||||||
|
</div> |
||||||
|
|
||||||
|
<div> |
||||||
|
{nextOrDoneBtn} |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
); |
||||||
|
} |
||||||
|
|
||||||
|
}); |
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(OnboardingModal)); |
Loading…
Reference in new issue