nrd.li/mastodon
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add animations to onboarding pager changes, improve wording and styling

Browse source
This commit is contained in:
Eugen Rochko 2017-04-15 00:06:54 +02:00
parent 88763d2192
commit e5d5ea9715
2 changed files with 112 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
app/assets/javascripts/components/features/ui/components/onboarding_modal.jsx
View file

@ -3,6 +3,7 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import Permalink from '../../../components/permalink'; import Permalink from '../../../components/permalink';
import { TransitionMotion, spring } from 'react-motion';
const PageOne = ({ acct, domain }) => ( const PageOne = ({ acct, domain }) => (
<div className='onboarding-modal__page onboarding-modal__page-one'> <div className='onboarding-modal__page onboarding-modal__page-one'>
@ -13,60 +14,80 @@ const PageOne = ({ acct, domain }) => (
<div> <div>
<h1><FormattedMessage id='onboarding.page_one.welcome' defaultMessage='Welcome to Mastodon!' /></h1> <h1><FormattedMessage id='onboarding.page_one.welcome' defaultMessage='Welcome to Mastodon!' /></h1>
<p><FormattedMessage id='onboarding.page_one.federation' defaultMessage='Mastodon is a decentralized federation of different server instances linking up and forming one larger social network.' /></p> <p><FormattedMessage id='onboarding.page_one.federation' defaultMessage='Mastodon is a decentralized federation of different server instances linking up and forming one larger social network.' /></p>
<p><FormattedMessage id='onboarding.page_one.handle' defaultMessage='You are on {domain}, so your full handle is {handle}' values={{ domain: domain, handle: <strong>{acct}@{domain}</strong> }}/></p> <p><FormattedMessage id='onboarding.page_one.handle' defaultMessage='You are on {domain}, so your full handle is {handle}' values={{ domain, handle: <strong>{acct}@{domain}</strong> }}/></p>
</div> </div>
</div> </div>
); );
const PageTwo = () => ( const PageTwo = () => (
<div className='onboarding-modal__page onboarding-modal__page-two'> <div className='onboarding-modal__page onboarding-modal__page-two'>
<img className="onboarding-modal__image onboard-compose" src={'/onboarding/onboard-compose.jpg'} /> <img className="onboarding-modal__image onboard-compose" src='/onboarding/onboard-compose.jpg' />
<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> <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> </div>
); );
const PageThree = () => ( const PageThree = () => (
<div className='onboarding-modal__page onboarding-modal__page-three'> <div className='onboarding-modal__page onboarding-modal__page-three'>
<img className="onboarding-modal__image onboard-compose" src={'/onboarding/onboard-search.jpg'} /> <img className="onboarding-modal__image onboard-compose" src='/onboarding/onboard-search.jpg' />
<p><FormattedMessage id='onboarding.page_three.search' defaultMessage='Use the search bar to find users and look at hashtags, such as #MastoArt and #Introductions.' /></p> <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='Click "Edit Profile" to change your avatar, bio, and display name.' /></p> <p><FormattedMessage id='onboarding.page_three.profile' defaultMessage='Click "Edit Profile" to change your avatar, bio, and display name. There, you will also find other preferences.' /></p>
</div> </div>
); );
const PageFour = () => ( const PageFour = () => (
<div className='onboarding-modal__page onboarding-modal__page-four'> <div className='onboarding-modal__page onboarding-modal__page-four'>
<img className="onboarding-modal__image onboard-column" src={'/onboarding/onboard-home.jpg'} /> <div className='figure'>
<p><FormattedMessage id='onboarding.page_four.home' defaultMessage='The Home Timeline shows posts from users you follow.'/></p> <img className="onboarding-modal__image onboard-column" src='/onboarding/onboard-home.jpg' />
<img className="onboarding-modal__image onboard-column" src={"/onboarding/onboard-notifications.jpg"} /> <FormattedMessage id='onboarding.page_four.home' defaultMessage='Home timeline shows posts from yourself, people you follow, and the posts they share'/>
<p><FormattedMessage id='onboarding.page_four.notifications' defaultMessage='The Notifications Column shows when a user boosts, favorites, or replies to your posts; and when you have a new follower.' /></p> </div>
<p><FormattedMessage id='onboarding.page_four.filter' defaultMessage='Each column can be customized using the settings menu in the top right.' /><img className="onboard-sliders" src={"/onboarding/onboard-sliders.png"}></img></p>
<div className='figure'>
<img className="onboarding-modal__image onboard-column" src="/onboarding/onboard-notifications.jpg" />
<FormattedMessage id='onboarding.page_four.notifications' defaultMessage='The notifications column shows when a user shares, favourites, or replies to your posts, and when you have a new follower' />
</div>
<p><FormattedMessage id='onboarding.page_four.filter' defaultMessage='Each column can be customized using the {icon} menu.' values={{ icon: <i className='fa fa-sliders' /> }} /></p>
</div> </div>
); );
const PageFive = () => ( const PageFive = ({ domain }) => (
<div className='onboarding-modal__page onboarding-modal__page-five'> <div className='onboarding-modal__page onboarding-modal__page-five'>
<img className="onboarding-modal__image onboard-column" src={"/onboarding/onboard-getting-started.jpg"} /> <div className='figure'>
<p><FormattedMessage id='onboarding.page_five.getting-started' defaultMessage='The Getting Started Column changes based on your needs.'/></p> <img className="onboarding-modal__image onboard-column" src="/onboarding/onboard-local-timeline.jpg" />
<img className="onboarding-modal__image onboard-column" src={"/onboarding/onboard-local-timeline.jpg"} /> <FormattedMessage id='onboarding.page_five.local-timeline' defaultMessage='Local timeline lists public posts originating from people on {domain}, your local instance' values={{ domain }} />
<p><FormattedMessage id='onboarding.page_five.local-timeline' defaultMessage='The Local Timeline shows public posts from every user on your instance.' /></p> </div>
<img className="onboarding-modal__image onboard-column" src={"/onboarding/onboard-federated-timeline.jpg"} />
<p><FormattedMessage id='onboarding.page_five.federated-timeline' defaultMessage='The Federated Timeline shows public posts from the whole known network of instances.' /></p> <div className='figure'>
<p><FormattedMessage id='onboarding.page_five.public' defaultMessage='These are the Public Timelines, a great way to find people to follow.' /></p> <img className="onboarding-modal__image onboard-column" src="/onboarding/onboard-federated-timeline.jpg" />
<FormattedMessage id='onboarding.page_five.federated-timeline' defaultMessage='Federated timeline lists public posts from everyone who people on {domain} follow, regardless of which instance they are from' values={{ domain }} />
</div>
<p><FormattedMessage id='onboarding.page_five.public' defaultMessage='These are the public timelines, a great way to discover content.' /></p>
</div> </div>
); );
const PageSix = ({ admin }) => ( const PageSix = ({ admin }) => {
<div className='onboarding-modal__page onboarding-modal__page-six'> let 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> }} /> if (admin) {
<br /> adminSection = (
<FormattedMessage id='onboarding.page_six.read_guidelines' defaultMessage='Please read the {guidelines} of your instance.' values={{ guidelines: <a href='/about/more' target='_blank'><FormattedMessage id='onboarding.page_six.guidelines' defaultMessage='community guidelines' /></a> }}/> <p>
</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> }} />
<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> <br />
<p><FormattedMessage id='onboarding.page_six.apps_available' defaultMessage='There are {apps} available for iOS and Android.' 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='mobile apps' /></a> }} /></p> <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><strong><FormattedMessage id='onboarding.page_six.have_fun' defaultMessage='Bon Appetoot!' /></strong></p> </p>
</div> );
); }
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>
);
};
const mapStateToProps = state => ({ const mapStateToProps = state => ({
me: state.getIn(['accounts', state.getIn(['meta', 'me'])]), me: state.getIn(['accounts', state.getIn(['meta', 'me'])]),
@ -120,7 +141,7 @@ const OnboardingModal = React.createClass({
<PageTwo />, <PageTwo />,
<PageThree />, <PageThree />,
<PageFour />, <PageFour />,
<PageFive />, <PageFive domain={domain} />,
<PageSix admin={admin} /> <PageSix admin={admin} />
]; ];
@ -135,11 +156,22 @@ const OnboardingModal = React.createClass({
nextOrDoneBtn = <a href='#' onClick={this.handleNext.bind(null, pages.length)} className='onboarding-modal__nav onboarding-modal__done'><FormattedMessage id='onboarding.next' defaultMessage='Done' /></a>; 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 ( return (
<div className='modal-root__modal onboarding-modal'> <div className='modal-root__modal onboarding-modal'>
<div className='onboarding-modal__pager'> <TransitionMotion styles={styles}>
{pages.map((page, i) => <div key={i} className={i === currentIndex ? 'active' : null}>{page}</div>)} {interpolatedStyles =>
</div> <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 className='onboarding-modal__paginator'>
<div> <div>

55
app/assets/stylesheets/components.scss
View file

@ -2006,6 +2006,7 @@ button.icon-button.active i.fa-retweet {
.modal-root__modal { .modal-root__modal {
pointer-events: auto; pointer-events: auto;
display: flex; display: flex;
z-index: 9999;
} }
.media-modal { .media-modal {
@ -2033,19 +2034,39 @@ button.icon-button.active i.fa-retweet {
width: 80vw; width: 80vw;
max-width: 500px; max-width: 500px;
max-height: 500px; max-height: 500px;
display: flex; position: relative;
& > div { & > div {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 25px; padding: 25px;
display: none; display: none;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
display: flex;
opacity: 0;
user-select: text; user-select: text;
}
}
&.active { @media screen and (max-width: 550px) {
display: flex; .onboarding-modal {
} width: 100%;
height: 100%;
border-radius: 0;
}
.onboarding-modal__pager {
width: 100%;
height: auto;
max-width: none;
max-height: none;
flex: 1 1 auto;
} }
} }
@ -2151,12 +2172,27 @@ button.icon-button.active i.fa-retweet {
margin-right: 10px; margin-right: 10px;
} }
.onboarding-modal__page-two__compose { .onboarding-modal__page-two,
position: relative; .onboarding-modal__page-three,
height: 300px; .onboarding-modal__page-four,
.onboarding-modal__page-five {
p {
text-align: center;
}
& > div { .figure {
position: absolute; background: $color1;
color: $color2;
margin-bottom: 20px;
border-radius: 8px;
padding: 10px;
text-align: center;
font-size: 14px;
.onboarding-modal__image {
border-radius: 4px;
margin-bottom: 10px;
}
} }
} }
@ -2167,6 +2203,7 @@ button.icon-button.active i.fa-retweet {
max-height: auto; max-height: auto;
display: block; display: block;
margin: auto; margin: auto;
margin-bottom: 20px;
} }
.onboard-sliders { .onboard-sliders {