* Prepare to load onboarding as a full page * Update the first-time introduction * Improve responsive design * Replace speech bubble with logo * Increase text size and reword first paragraphmaster
@@ -1,14 +1,8 @@ | |||
import { openModal } from './modal'; | |||
import { changeSetting, saveSettings } from './settings'; | |||
export function showOnboardingOnce() { | |||
return (dispatch, getState) => { | |||
const alreadySeen = getState().getIn(['settings', 'onboarded']); | |||
export const INTRODUCTION_VERSION = 20181216044202; | |||
if (!alreadySeen) { | |||
dispatch(openModal('ONBOARDING')); | |||
dispatch(changeSetting(['onboarded'], true)); | |||
dispatch(saveSettings()); | |||
} | |||
}; | |||
export const closeOnboarding = () => dispatch => { | |||
dispatch(changeSetting(['introductionVersion'], INTRODUCTION_VERSION)); | |||
dispatch(saveSettings()); | |||
}; |
@@ -1,11 +1,12 @@ | |||
import React from 'react'; | |||
import { Provider } from 'react-redux'; | |||
import { Provider, connect } from 'react-redux'; | |||
import PropTypes from 'prop-types'; | |||
import configureStore from '../store/configureStore'; | |||
import { showOnboardingOnce } from '../actions/onboarding'; | |||
import { INTRODUCTION_VERSION } from '../actions/onboarding'; | |||
import { BrowserRouter, Route } from 'react-router-dom'; | |||
import { ScrollContext } from 'react-router-scroll-4'; | |||
import UI from '../features/ui'; | |||
import Introduction from '../features/introduction'; | |||
import { fetchCustomEmojis } from '../actions/custom_emojis'; | |||
import { hydrateStore } from '../actions/store'; | |||
import { connectUserStream } from '../actions/streaming'; | |||
@@ -18,11 +19,39 @@ addLocaleData(localeData); | |||
export const store = configureStore(); | |||
const hydrateAction = hydrateStore(initialState); | |||
store.dispatch(hydrateAction); | |||
// load custom emojis | |||
store.dispatch(hydrateAction); | |||
store.dispatch(fetchCustomEmojis()); | |||
const mapStateToProps = state => ({ | |||
showIntroduction: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION, | |||
}); | |||
@connect(mapStateToProps) | |||
class MastodonMount extends React.PureComponent { | |||
static propTypes = { | |||
showIntroduction: PropTypes.bool, | |||
}; | |||
render () { | |||
const { showIntroduction } = this.props; | |||
if (showIntroduction) { | |||
return <Introduction />; | |||
} | |||
return ( | |||
<BrowserRouter basename='/web'> | |||
<ScrollContext> | |||
<Route path='/' component={UI} /> | |||
</ScrollContext> | |||
</BrowserRouter> | |||
); | |||
} | |||
} | |||
export default class Mastodon extends React.PureComponent { | |||
static propTypes = { | |||
@@ -31,14 +60,6 @@ export default class Mastodon extends React.PureComponent { | |||
componentDidMount() { | |||
this.disconnect = store.dispatch(connectUserStream()); | |||
// Desktop notifications | |||
// Ask after 1 minute | |||
if (typeof window.Notification !== 'undefined' && Notification.permission === 'default') { | |||
window.setTimeout(() => Notification.requestPermission(), 60 * 1000); | |||
} | |||
store.dispatch(showOnboardingOnce()); | |||
} | |||
componentWillUnmount () { | |||
@@ -54,11 +75,7 @@ export default class Mastodon extends React.PureComponent { | |||
return ( | |||
<IntlProvider locale={locale} messages={messages}> | |||
<Provider store={store}> | |||
<BrowserRouter basename='/web'> | |||
<ScrollContext> | |||
<Route path='/' component={UI} /> | |||
</ScrollContext> | |||
</BrowserRouter> | |||
<MastodonMount /> | |||
</Provider> | |||
</IntlProvider> | |||
); | |||
@@ -0,0 +1,196 @@ | |||
import React from 'react'; | |||
import PropTypes from 'prop-types'; | |||
import ReactSwipeableViews from 'react-swipeable-views'; | |||
import classNames from 'classnames'; | |||
import { connect } from 'react-redux'; | |||
import { FormattedMessage } from 'react-intl'; | |||
import { closeOnboarding } from '../../actions/onboarding'; | |||
import screenHello from '../../../images/screen_hello.svg'; | |||
import screenFederation from '../../../images/screen_federation.svg'; | |||
import screenInteractions from '../../../images/screen_interactions.svg'; | |||
import logoTransparent from '../../../images/logo_transparent.svg'; | |||
const FrameWelcome = ({ domain, onNext }) => ( | |||
<div className='introduction__frame'> | |||
<div className='introduction__illustration' style={{ background: `url(${logoTransparent}) no-repeat center center / auto 80%` }}> | |||
<img src={screenHello} alt='' /> | |||
</div> | |||
<div className='introduction__text introduction__text--centered'> | |||
<h3><FormattedMessage id='introduction.welcome.headline' defaultMessage='First steps' /></h3> | |||
<p><FormattedMessage id='introduction.welcome.text' defaultMessage="Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name." values={{ domain: <code>{domain}</code> }} /></p> | |||
</div> | |||
<div className='introduction__action'> | |||
<button className='button' onClick={onNext}><FormattedMessage id='introduction.welcome.action' defaultMessage="Let's go!" /></button> | |||
</div> | |||
</div> | |||
); | |||
FrameWelcome.propTypes = { | |||
domain: PropTypes.string.isRequired, | |||
onNext: PropTypes.func.isRequired, | |||
}; | |||
const FrameFederation = ({ onNext }) => ( | |||
<div className='introduction__frame'> | |||
<div className='introduction__illustration'> | |||
<img src={screenFederation} alt='' /> | |||
</div> | |||
<div className='introduction__text introduction__text--columnized'> | |||
<div> | |||
<h3><FormattedMessage id='introduction.federation.home.headline' defaultMessage='Home' /></h3> | |||
<p><FormattedMessage id='introduction.federation.home.text' defaultMessage='Posts from people you follow will appear in your home feed. You can follow anyone on any server!' /></p> | |||
</div> | |||
<div> | |||
<h3><FormattedMessage id='introduction.federation.local.headline' defaultMessage='Local' /></h3> | |||
<p><FormattedMessage id='introduction.federation.local.text' defaultMessage='Public posts from people on the same server as you will appear in the local timeline.' /></p> | |||
</div> | |||
<div> | |||
<h3><FormattedMessage id='introduction.federation.federated.headline' defaultMessage='Federated' /></h3> | |||
<p><FormattedMessage id='introduction.federation.federated.text' defaultMessage='Public posts from other servers of the fediverse will appear in the federated timeline.' /></p> | |||
</div> | |||
</div> | |||
<div className='introduction__action'> | |||
<button className='button' onClick={onNext}><FormattedMessage id='introduction.federation.action' defaultMessage='Next' /></button> | |||
</div> | |||
</div> | |||
); | |||
FrameFederation.propTypes = { | |||
onNext: PropTypes.func.isRequired, | |||
}; | |||
const FrameInteractions = ({ onNext }) => ( | |||
<div className='introduction__frame'> | |||
<div className='introduction__illustration'> | |||
<img src={screenInteractions} alt='' /> | |||
</div> | |||
<div className='introduction__text introduction__text--columnized'> | |||
<div> | |||
<h3><FormattedMessage id='introduction.interactions.reply.headline' defaultMessage='Reply' /></h3> | |||
<p><FormattedMessage id='introduction.interactions.reply.text' defaultMessage="You can reply to other people's and your own toots, which will chain them together in a conversation." /></p> | |||
</div> | |||
<div> | |||
<h3><FormattedMessage id='introduction.interactions.reblog.headline' defaultMessage='Boost' /></h3> | |||
<p><FormattedMessage id='introduction.interactions.reblog.text' defaultMessage="You can share other people's toots with your followers by boosting them." /></p> | |||
</div> | |||
<div> | |||
<h3><FormattedMessage id='introduction.interactions.favourite.headline' defaultMessage='Favourite' /></h3> | |||
<p><FormattedMessage id='introduction.interactions.favourite.text' defaultMessage='You can save a toot for later, and let the author know that you liked it, by favouriting it.' /></p> | |||
</div> | |||
</div> | |||
<div className='introduction__action'> | |||
<button className='button' onClick={onNext}><FormattedMessage id='introduction.interactions.action' defaultMessage='Finish tutorial!' /></button> | |||
</div> | |||
</div> | |||
); | |||
FrameInteractions.propTypes = { | |||
onNext: PropTypes.func.isRequired, | |||
}; | |||
@connect(state => ({ domain: state.getIn(['meta', 'domain']) })) | |||
export default class Introduction extends React.PureComponent { | |||
static propTypes = { | |||
domain: PropTypes.string.isRequired, | |||
dispatch: PropTypes.func.isRequired, | |||
}; | |||
state = { | |||
currentIndex: 0, | |||
}; | |||
componentWillMount () { | |||
this.pages = [ | |||
<FrameWelcome domain={this.props.domain} onNext={this.handleNext} />, | |||
<FrameFederation onNext={this.handleNext} />, | |||
<FrameInteractions onNext={this.handleFinish} />, | |||
]; | |||
} | |||
componentDidMount() { | |||
window.addEventListener('keyup', this.handleKeyUp); | |||
} | |||
componentWillUnmount() { | |||
window.addEventListener('keyup', this.handleKeyUp); | |||
} | |||
handleDot = (e) => { | |||
const i = Number(e.currentTarget.getAttribute('data-index')); | |||
e.preventDefault(); | |||
this.setState({ currentIndex: i }); | |||
} | |||
handlePrev = () => { | |||
this.setState(({ currentIndex }) => ({ | |||
currentIndex: Math.max(0, currentIndex - 1), | |||
})); | |||
} | |||
handleNext = () => { | |||
const { pages } = this; | |||
this.setState(({ currentIndex }) => ({ | |||
currentIndex: Math.min(currentIndex + 1, pages.length - 1), | |||
})); | |||
} | |||
handleSwipe = (index) => { | |||
this.setState({ currentIndex: index }); | |||
} | |||
handleFinish = () => { | |||
this.props.dispatch(closeOnboarding()); | |||
} | |||
handleKeyUp = ({ key }) => { | |||
switch (key) { | |||
case 'ArrowLeft': | |||
this.handlePrev(); | |||
break; | |||
case 'ArrowRight': | |||
this.handleNext(); | |||
break; | |||
} | |||
} | |||
render () { | |||
const { currentIndex } = this.state; | |||
const { pages } = this; | |||
return ( | |||
<div className='introduction'> | |||
<ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} className='introduction__pager'> | |||
{pages.map((page, i) => ( | |||
<div key={i} className={classNames('introduction__frame-wrapper', { 'active': i === currentIndex })}>{page}</div> | |||
))} | |||
</ReactSwipeableViews> | |||
<div className='introduction__dots'> | |||
{pages.map((_, i) => ( | |||
<div | |||
key={`dot-${i}`} | |||
role='button' | |||
tabIndex='0' | |||
data-index={i} | |||
onClick={this.handleDot} | |||
className={classNames('introduction__dot', { active: i === currentIndex })} | |||
/> | |||
))} | |||
</div> | |||
</div> | |||
); | |||
} | |||
} |
@@ -11,7 +11,6 @@ import BoostModal from './boost_modal'; | |||
import ConfirmationModal from './confirmation_modal'; | |||
import FocalPointModal from './focal_point_modal'; | |||
import { | |||
OnboardingModal, | |||
MuteModal, | |||
ReportModal, | |||
EmbedModal, | |||
@@ -21,7 +20,6 @@ import { | |||
const MODAL_COMPONENTS = { | |||
'MEDIA': () => Promise.resolve({ default: MediaModal }), | |||
'ONBOARDING': OnboardingModal, | |||
'VIDEO': () => Promise.resolve({ default: VideoModal }), | |||
'BOOST': () => Promise.resolve({ default: BoostModal }), | |||
'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }), | |||
@@ -1,324 +0,0 @@ | |||
import React from 'react'; | |||
import { connect } from 'react-redux'; | |||
import PropTypes from 'prop-types'; | |||
import ImmutablePropTypes from 'react-immutable-proptypes'; | |||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; | |||
import ReactSwipeableViews from 'react-swipeable-views'; | |||
import classNames from 'classnames'; | |||
import Permalink from '../../../components/permalink'; | |||
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 { List as ImmutableList } from 'immutable'; | |||
import { me } from '../../../initial_state'; | |||
const noop = () => { }; | |||
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 className='onboarding-modal__page-one__lead'> | |||
<h1><FormattedMessage id='onboarding.page_one.welcome' defaultMessage='Welcome to Mastodon!' /></h1> | |||
<p><FormattedMessage id='onboarding.page_one.federation' defaultMessage='Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.' /></p> | |||
</div> | |||
<div className='onboarding-modal__page-one__extra'> | |||
<div className='display-case'> | |||
<div className='display-case__label'> | |||
<FormattedMessage id='onboarding.page_one.full_handle' defaultMessage='Your full handle' /> | |||
</div> | |||
<div className='display-case__case'> | |||
@{acct}@{domain} | |||
</div> | |||
</div> | |||
<p><FormattedMessage id='onboarding.page_one.handle_hint' defaultMessage='This is what you would tell your friends to search for.' /></p> | |||
</div> | |||
</div> | |||
); | |||
PageOne.propTypes = { | |||
acct: PropTypes.string.isRequired, | |||
domain: PropTypes.string.isRequired, | |||
}; | |||
const PageTwo = ({ myAccount }) => ( | |||
<div className='onboarding-modal__page onboarding-modal__page-two'> | |||
<div className='figure non-interactive'> | |||
<div className='pseudo-drawer'> | |||
<NavigationBar account={myAccount} /> | |||
<ComposeForm | |||
text='Awoo! #introductions' | |||
suggestions={ImmutableList()} | |||
mentionedDomains={[]} | |||
spoiler={false} | |||
onChange={noop} | |||
onSubmit={noop} | |||
onPaste={noop} | |||
onPickEmoji={noop} | |||
onChangeSpoilerText={noop} | |||
onClearSuggestions={noop} | |||
onFetchSuggestions={noop} | |||
onSuggestionSelected={noop} | |||
showSearch | |||
/> | |||
</div> | |||
</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> | |||
); | |||
PageTwo.propTypes = { | |||
myAccount: ImmutablePropTypes.map.isRequired, | |||
}; | |||
const PageThree = ({ myAccount }) => ( | |||
<div className='onboarding-modal__page onboarding-modal__page-three'> | |||
<div className='figure non-interactive'> | |||
<Search | |||
value='' | |||
onChange={noop} | |||
onSubmit={noop} | |||
onClear={noop} | |||
onShow={noop} | |||
/> | |||
<div className='pseudo-drawer'> | |||
<NavigationBar account={myAccount} /> | |||
</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 = { | |||
myAccount: ImmutablePropTypes.map.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='The 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='The notifications column shows when someone interacts with you.' /></p> | |||
</div> | |||
</div> | |||
<div className='row'> | |||
<div> | |||
<div className='figure non-interactive' style={{ marginBottom: 0 }}><ColumnHeader icon='users' type={intl.formatMessage(messages.local_title)} /></div> | |||
</div> | |||
<div> | |||
<div className='figure non-interactive' style={{ marginBottom: 0 }}><ColumnHeader icon='globe' type={intl.formatMessage(messages.federated_title)} /></div> | |||
</div> | |||
</div> | |||
<p><FormattedMessage id='onboarding.page_five.public_timelines' defaultMessage='The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.' values={{ domain }} /></p> | |||
</div> | |||
</div> | |||
); | |||
PageFour.propTypes = { | |||
domain: PropTypes.string.isRequired, | |||
intl: PropTypes.object.isRequired, | |||
}; | |||
const PageSix = ({ admin, domain }) => { | |||
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 read {domain}'s {guidelines}!" values={{ domain, 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.' values={{ apps: <a href='https://joinmastodon.org/apps' target='_blank' rel='noopener'><FormattedMessage id='onboarding.page_six.various_app' defaultMessage='mobile apps' /></a> }} /></p> | |||
<p><em><FormattedMessage id='onboarding.page_six.appetoot' defaultMessage='Bon Appetoot!' /></em></p> | |||
</div> | |||
); | |||
}; | |||
PageSix.propTypes = { | |||
admin: ImmutablePropTypes.map, | |||
domain: PropTypes.string.isRequired, | |||
}; | |||
const mapStateToProps = state => ({ | |||
myAccount: state.getIn(['accounts', me]), | |||
admin: state.getIn(['accounts', state.getIn(['meta', 'admin'])]), | |||
domain: state.getIn(['meta', 'domain']), | |||
}); | |||
export default @connect(mapStateToProps) | |||
@injectIntl | |||
class OnboardingModal extends React.PureComponent { | |||
static propTypes = { | |||
onClose: PropTypes.func.isRequired, | |||
intl: PropTypes.object.isRequired, | |||
myAccount: ImmutablePropTypes.map.isRequired, | |||
domain: PropTypes.string.isRequired, | |||
admin: ImmutablePropTypes.map, | |||
}; | |||
state = { | |||
currentIndex: 0, | |||
}; | |||
componentWillMount() { | |||
const { myAccount, admin, domain, intl } = this.props; | |||
this.pages = [ | |||
<PageOne acct={myAccount.get('acct')} domain={domain} />, | |||
<PageTwo myAccount={myAccount} />, | |||
<PageThree myAccount={myAccount} />, | |||
<PageFour domain={domain} intl={intl} />, | |||
<PageSix admin={admin} domain={domain} />, | |||
]; | |||
}; | |||
componentDidMount() { | |||
window.addEventListener('keyup', this.handleKeyUp); | |||
} | |||
componentWillUnmount() { | |||
window.addEventListener('keyup', this.handleKeyUp); | |||
} | |||
handleSkip = (e) => { | |||
e.preventDefault(); | |||
this.props.onClose(); | |||
} | |||
handleDot = (e) => { | |||
const i = Number(e.currentTarget.getAttribute('data-index')); | |||
e.preventDefault(); | |||
this.setState({ currentIndex: i }); | |||
} | |||
handlePrev = () => { | |||
this.setState(({ currentIndex }) => ({ | |||
currentIndex: Math.max(0, currentIndex - 1), | |||
})); | |||
} | |||
handleNext = () => { | |||
const { pages } = this; | |||
this.setState(({ currentIndex }) => ({ | |||
currentIndex: Math.min(currentIndex + 1, pages.length - 1), | |||
})); | |||
} | |||
handleSwipe = (index) => { | |||
this.setState({ currentIndex: index }); | |||
} | |||
handleKeyUp = ({ key }) => { | |||
switch (key) { | |||
case 'ArrowLeft': | |||
this.handlePrev(); | |||
break; | |||
case 'ArrowRight': | |||
this.handleNext(); | |||
break; | |||
} | |||
} | |||
handleClose = () => { | |||
this.props.onClose(); | |||
} | |||
render () { | |||
const { pages } = this; | |||
const { currentIndex } = this.state; | |||
const hasMore = currentIndex < pages.length - 1; | |||
const nextOrDoneBtn = hasMore ? ( | |||
<button onClick={this.handleNext} className='onboarding-modal__nav onboarding-modal__next shake-bottom'> | |||
<FormattedMessage id='onboarding.next' defaultMessage='Next' /> <i className='fa fa-fw fa-chevron-right' /> | |||
</button> | |||
) : ( | |||
<button onClick={this.handleClose} className='onboarding-modal__nav onboarding-modal__done shake-bottom'> | |||
<FormattedMessage id='onboarding.done' defaultMessage='Done' /> <i className='fa fa-fw fa-check' /> | |||
</button> | |||
); | |||
return ( | |||
<div className='modal-root__modal onboarding-modal'> | |||
<ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} className='onboarding-modal__pager'> | |||
{pages.map((page, i) => { | |||
const className = classNames('onboarding-modal__page__wrapper', `onboarding-modal__page__wrapper-${i}`, { | |||
'onboarding-modal__page__wrapper--active': i === currentIndex, | |||
}); | |||
return ( | |||
<div key={i} className={className}>{page}</div> | |||
); | |||
})} | |||
</ReactSwipeableViews> | |||
<div className='onboarding-modal__paginator'> | |||
<div> | |||
<button | |||
onClick={this.handleSkip} | |||
className='onboarding-modal__nav onboarding-modal__skip' | |||
> | |||
<FormattedMessage id='onboarding.skip' defaultMessage='Skip' /> | |||
</button> | |||
</div> | |||
<div className='onboarding-modal__dots'> | |||
{pages.map((_, i) => { | |||
const className = classNames('onboarding-modal__dot', { | |||
active: i === currentIndex, | |||
}); | |||
return ( | |||
<div | |||
key={`dot-${i}`} | |||
role='button' | |||
tabIndex='0' | |||
data-index={i} | |||
onClick={this.handleDot} | |||
className={className} | |||
/> | |||
); | |||
})} | |||
</div> | |||
<div> | |||
{nextOrDoneBtn} | |||
</div> | |||
</div> | |||
</div> | |||
); | |||
} | |||
} |
@@ -294,6 +294,7 @@ class UI extends React.PureComponent { | |||
componentWillMount () { | |||
window.addEventListener('beforeunload', this.handleBeforeUnload, false); | |||
document.addEventListener('dragenter', this.handleDragEnter, false); | |||
document.addEventListener('dragover', this.handleDragOver, false); | |||
document.addEventListener('drop', this.handleDrop, false); | |||
@@ -304,8 +305,13 @@ class UI extends React.PureComponent { | |||
navigator.serviceWorker.addEventListener('message', this.handleServiceWorkerPostMessage); | |||
} | |||
if (typeof window.Notification !== 'undefined' && Notification.permission === 'default') { | |||
window.setTimeout(() => Notification.requestPermission(), 120 * 1000); | |||
} | |||
this.props.dispatch(expandHomeTimeline()); | |||
this.props.dispatch(expandNotifications()); | |||
setTimeout(() => this.props.dispatch(fetchFilters()), 500); | |||
} | |||
@@ -102,10 +102,6 @@ export function Mutes () { | |||
return import(/* webpackChunkName: "features/mutes" */'../../mutes'); | |||
} | |||
export function OnboardingModal () { | |||
return import(/* webpackChunkName: "modals/onboarding_modal" */'../components/onboarding_modal'); | |||
} | |||
export function MuteModal () { | |||
return import(/* webpackChunkName: "modals/mute_modal" */'../components/mute_modal'); | |||
} | |||
@@ -16,6 +16,7 @@ | |||
@import 'mastodon/stream_entries'; | |||
@import 'mastodon/boost'; | |||
@import 'mastodon/components'; | |||
@import 'mastodon/introduction'; | |||
@import 'mastodon/modal'; | |||
@import 'mastodon/emoji_picker'; | |||
@import 'mastodon/about'; | |||
@@ -3835,25 +3835,6 @@ a.status-card.compact:hover { | |||
flex-direction: column; | |||
} | |||
.onboarding-modal__pager { | |||
height: 80vh; | |||
width: 80vw; | |||
max-width: 520px; | |||
max-height: 470px; | |||
.react-swipeable-view-container > div { | |||
width: 100%; | |||
height: 100%; | |||
box-sizing: border-box; | |||
display: none; | |||
flex-direction: column; | |||
align-items: center; | |||
justify-content: center; | |||
display: flex; | |||
user-select: text; | |||
} | |||
} | |||
.error-modal__body { | |||
height: 80vh; | |||
width: 80vw; | |||
@@ -3887,22 +3868,6 @@ a.status-card.compact:hover { | |||
text-align: center; | |||
} | |||
@media screen and (max-width: 550px) { | |||
.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; | |||
} | |||
} | |||
.onboarding-modal__paginator, | |||
.error-modal__footer { | |||
flex: 0 0 auto; | |||
@@ -3951,124 +3916,6 @@ a.status-card.compact:hover { | |||
justify-content: center; | |||
} | |||
.onboarding-modal__dots { | |||
flex: 1 1 auto; | |||
display: flex; | |||
align-items: center; | |||
justify-content: center; | |||
} | |||
.onboarding-modal__dot { | |||
width: 14px; | |||
height: 14px; | |||
border-radius: 14px; | |||
background: darken($ui-secondary-color, 16%); | |||
margin: 0 3px; | |||
cursor: pointer; | |||
&:hover { | |||
background: darken($ui-secondary-color, 18%); | |||
} | |||
&.active { | |||
cursor: default; | |||
background: darken($ui-secondary-color, 24%); | |||
} | |||
} | |||
.onboarding-modal__page__wrapper { | |||
pointer-events: none; | |||
padding: 25px; | |||
padding-bottom: 0; | |||
&.onboarding-modal__page__wrapper--active { | |||
pointer-events: auto; | |||
} | |||
} | |||
.onboarding-modal__page { | |||
cursor: default; | |||
line-height: 21px; | |||
h1 { | |||
font-size: 18px; | |||
font-weight: 500; | |||
color: $inverted-text-color; | |||
margin-bottom: 20px; | |||
} | |||
a { | |||
color: $highlight-text-color; | |||
&:hover, | |||
&:focus, | |||
&:active { | |||
color: lighten($highlight-text-color, 4%); | |||
} | |||
} | |||
.navigation-bar a { | |||
color: inherit; | |||
} | |||
p { | |||
font-size: 16px; | |||
color: $lighter-text-color; | |||
margin-top: 10px; | |||
margin-bottom: 10px; | |||
&:last-child { | |||
margin-bottom: 0; | |||
} | |||
strong { | |||
font-weight: 500; | |||
background: $ui-base-color; | |||
color: $secondary-text-color; | |||
border-radius: 4px; | |||
font-size: 14px; | |||
padding: 3px 6px; | |||
@each $lang in $cjk-langs { | |||
&:lang(#{$lang}) { | |||
font-weight: 700; | |||
} | |||
} | |||
} | |||
} | |||
} | |||
.onboarding-modal__page__wrapper-0 { | |||
background: url('../images/elephant_ui_greeting.svg') no-repeat left bottom / auto 250px; | |||
height: 100%; | |||
padding: 0; | |||
} | |||
.onboarding-modal__page-one { | |||
&__lead { | |||
padding: 65px; | |||
padding-top: 45px; | |||
padding-bottom: 0; | |||
margin-bottom: 10px; | |||
h1 { | |||
font-size: 26px; | |||
line-height: 36px; | |||
margin-bottom: 8px; | |||
} | |||
p { | |||
margin-bottom: 0; | |||
} | |||
} | |||
&__extra { | |||
padding-right: 65px; | |||
padding-left: 185px; | |||
text-align: center; | |||
} | |||
} | |||
.display-case { | |||
text-align: center; | |||
font-size: 15px; | |||
@@ -4091,92 +3938,6 @@ a.status-card.compact:hover { | |||
} | |||
} | |||
.onboarding-modal__page-two, | |||
.onboarding-modal__page-three, | |||
.onboarding-modal__page-four, | |||
.onboarding-modal__page-five { | |||
p { | |||
text-align: left; | |||
} | |||
.figure { | |||
background: darken($ui-base-color, 8%); | |||
color: $secondary-text-color; | |||
margin-bottom: 20px; | |||
border-radius: 4px; | |||
padding: 10px; | |||
text-align: center; | |||
font-size: 14px; | |||
box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.3); | |||
.onboarding-modal__image { | |||
border-radius: 4px; | |||
margin-bottom: 10px; | |||
} | |||
&.non-interactive { | |||
pointer-events: none; | |||
text-align: left; | |||
} | |||
} | |||
} | |||
.onboarding-modal__page-four__columns { | |||
.row { | |||
display: flex; | |||
margin-bottom: 20px; | |||
& > div { | |||
flex: 1 1 0; | |||
margin: 0 10px; | |||
&:first-child { | |||
margin-left: 0; | |||
} | |||
&:last-child { | |||
margin-right: 0; | |||
} | |||
p { | |||
text-align: center; | |||
} | |||
} | |||
&:last-child { | |||
margin-bottom: 0; | |||
} | |||
} | |||
.column-header { | |||
color: $primary-text-color; | |||
} | |||
} | |||
@media screen and (max-width: 320px) and (max-height: 600px) { | |||
.onboarding-modal__page p { | |||
font-size: 14px; | |||
line-height: 20px; | |||
} | |||
.onboarding-modal__page-two .figure, | |||
.onboarding-modal__page-three .figure, | |||
.onboarding-modal__page-four .figure, | |||
.onboarding-modal__page-five .figure { | |||
font-size: 12px; | |||
margin-bottom: 10px; | |||
} | |||
.onboarding-modal__page-four__columns .row { | |||
margin-bottom: 10px; | |||
} | |||
.onboarding-modal__page-four__columns .column-header { | |||
padding: 5px; | |||
font-size: 12px; | |||
} | |||
} | |||
.onboard-sliders { | |||
display: inline-block; | |||
max-width: 30px; | |||
@@ -0,0 +1,153 @@ | |||
.introduction { | |||
display: flex; | |||
flex-direction: column; | |||
justify-content: center; | |||
align-items: center; | |||
@media screen and (max-width: 920px) { | |||
background: darken($ui-base-color, 8%); | |||
display: block !important; | |||
} | |||
&__pager { | |||
background: darken($ui-base-color, 8%); | |||
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); | |||
overflow: hidden; | |||
} | |||
&__pager, | |||
&__frame { | |||
border-radius: 10px; | |||
width: 50vw; | |||
min-width: 920px; | |||
@media screen and (max-width: 920px) { | |||
min-width: 0; | |||
width: 100%; | |||
border-radius: 0; | |||
box-shadow: none; | |||
} | |||
} | |||
&__frame-wrapper { | |||
opacity: 0; | |||
transition: opacity 500ms linear; | |||
&.active { | |||
opacity: 1; | |||
transition: opacity 50ms linear; | |||
} | |||
} | |||
&__frame { | |||
overflow: hidden; | |||
} | |||
&__illustration { | |||
height: 50vh; | |||
@media screen and (max-width: 630px) { | |||
height: auto; | |||
} | |||
img { | |||
object-fit: cover; | |||
display: block; | |||
margin: 0; | |||
width: 100%; | |||
height: 100%; | |||
} | |||
} | |||
&__text { | |||
border-top: 2px solid $ui-highlight-color; | |||
&--columnized { | |||
display: flex; | |||
& > div { | |||
flex: 1 1 33.33%; | |||
text-align: center; | |||
padding: 25px; | |||
padding-bottom: 30px; | |||
} | |||
@media screen and (max-width: 630px) { | |||
display: block; | |||
padding: 15px 0; | |||
padding-bottom: 20px; | |||
& > div { | |||
padding: 10px 25px; | |||
} | |||
} | |||
} | |||
h3 { | |||
font-size: 24px; | |||
line-height: 1.5; | |||
font-weight: 700; | |||
margin-bottom: 10px; | |||
} | |||
p { | |||
font-size: 16px; | |||
line-height: 24px; | |||
font-weight: 400; | |||
color: $darker-text-color; | |||
code { | |||
display: inline-block; | |||
background: darken($ui-base-color, 8%); | |||
font-size: 15px; | |||
border: 1px solid lighten($ui-base-color, 8%); | |||
border-radius: 2px; | |||
padding: 1px 3px; | |||
} | |||
} | |||
&--centered { | |||
padding: 25px; | |||
padding-bottom: 30px; | |||
text-align: center; | |||
} | |||
} | |||
&__dots { | |||
display: flex; | |||
align-items: center; | |||
justify-content: center; | |||
padding: 25px; | |||
@media screen and (max-width: 630px) { | |||
display: none; | |||
} | |||
} | |||
&__dot { | |||
width: 14px; | |||
height: 14px; | |||
border-radius: 14px; | |||
border: 1px solid $ui-highlight-color; | |||
background: transparent; | |||
margin: 0 3px; | |||
cursor: pointer; | |||
&:hover { | |||
background: lighten($ui-base-color, 8%); | |||
} | |||
&.active { | |||
cursor: default; | |||
background: $ui-highlight-color; | |||
} | |||
} | |||
&__action { | |||
padding: 25px; | |||
padding-top: 0; | |||
display: flex; | |||
align-items: center; | |||
justify-content: center; | |||
} | |||
} |