Basic onboarding modal that's shown to users once
This commit is contained in:
parent
1a5ab538de
commit
6433e039ad
14
app/assets/javascripts/components/actions/onboarding.jsx
Normal file
14
app/assets/javascripts/components/actions/onboarding.jsx
Normal file
|
@ -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());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
|
@ -8,6 +8,7 @@ import {
|
||||||
connectTimeline,
|
connectTimeline,
|
||||||
disconnectTimeline
|
disconnectTimeline
|
||||||
} from '../actions/timelines';
|
} from '../actions/timelines';
|
||||||
|
import { showOnboardingOnce } from '../actions/onboarding';
|
||||||
import { updateNotifications, refreshNotifications } from '../actions/notifications';
|
import { updateNotifications, refreshNotifications } from '../actions/notifications';
|
||||||
import createBrowserHistory from 'history/lib/createBrowserHistory';
|
import createBrowserHistory from 'history/lib/createBrowserHistory';
|
||||||
import {
|
import {
|
||||||
|
@ -106,6 +107,8 @@ const Mastodon = React.createClass({
|
||||||
if (typeof window.Notification !== 'undefined' && Notification.permission === 'default') {
|
if (typeof window.Notification !== 'undefined' && Notification.permission === 'default') {
|
||||||
Notification.requestPermission();
|
Notification.requestPermission();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
store.dispatch(showOnboardingOnce());
|
||||||
},
|
},
|
||||||
|
|
||||||
componentWillUnmount () {
|
componentWillUnmount () {
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
||||||
import MediaModal from './media_modal';
|
import MediaModal from './media_modal';
|
||||||
|
import OnboardingModal from './onboarding_modal';
|
||||||
import { TransitionMotion, spring } from 'react-motion';
|
import { TransitionMotion, spring } from 'react-motion';
|
||||||
|
|
||||||
const MODAL_COMPONENTS = {
|
const MODAL_COMPONENTS = {
|
||||||
'MEDIA': MediaModal
|
'MEDIA': MediaModal,
|
||||||
|
'ONBOARDING': OnboardingModal
|
||||||
};
|
};
|
||||||
|
|
||||||
const ModalRoot = React.createClass({
|
const ModalRoot = React.createClass({
|
||||||
|
|
|
@ -0,0 +1,116 @@
|
||||||
|
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';
|
||||||
|
|
||||||
|
const PageOne = ({ acct, domain }) => (
|
||||||
|
<div className='onboarding-modal__page onboarding-modal__page-one'>
|
||||||
|
<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 {instances} linking up and forming one larger social network.' values={{ instances: <a href='https://instances.mastodon.xyz' target='_blank' rel='noopener'><FormattedMessage id='onboarding.page_one.different_instances' defaultMessage='different server instances' /></a> }} /></p>
|
||||||
|
<p><FormattedMessage id='onboarding.page_one.handle' defaultMessage='You are on {domain}, your full handle is {handle}' values={{ domain: <strong>{domain}</strong>, handle: <strong>@{acct}@{domain}</strong> }}/></p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
const PageTwo = ({ admin }) => (
|
||||||
|
<div className='onboarding-modal__page onboarding-modal__page-two'>
|
||||||
|
<p>
|
||||||
|
<FormattedMessage id='onboarding.page_two.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_two.read_guidelines' defaultMessage='Please read the {guidelines} of your instance.' values={{ guidelines: <a href='/about/more' target='_blank'><FormattedMessage id='onboarding.page_two.guidelines' defaultMessage='community guidelines' /></a> }}/>
|
||||||
|
</p>
|
||||||
|
<p><FormattedMessage id='onboarding.page_two.read_guidelines' 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_two.apps_available' defaultMessage='There are {apps} available for iOS and Android.' values={{ apps: <a href='https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/Apps.md' target='_blank' rel='noopener'><FormattedMessage id='onboarding.page_two.various_app' defaultMessage='mobile apps' /></a> }} /></p>
|
||||||
|
<p><strong><FormattedMessage id='onboarding.page_two.have_fun' defaultMessage='Have fun!' /></strong></p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
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 } = this.props;
|
||||||
|
|
||||||
|
const pages = [
|
||||||
|
<PageOne acct={me.get('acct')} domain={domain} />,
|
||||||
|
<PageTwo 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>;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className='modal-root__modal onboarding-modal'>
|
||||||
|
<div className='onboarding-modal__pager'>
|
||||||
|
{pages.map((page, i) => <div key={i} className={i === currentIndex ? 'active' : null}>{page}</div>)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<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));
|
|
@ -3,6 +3,8 @@ import { STORE_HYDRATE } from '../actions/store';
|
||||||
import Immutable from 'immutable';
|
import Immutable from 'immutable';
|
||||||
|
|
||||||
const initialState = Immutable.Map({
|
const initialState = Immutable.Map({
|
||||||
|
onboarded: false,
|
||||||
|
|
||||||
home: Immutable.Map({
|
home: Immutable.Map({
|
||||||
shows: Immutable.Map({
|
shows: Immutable.Map({
|
||||||
reblog: true,
|
reblog: true,
|
||||||
|
|
|
@ -1893,3 +1893,118 @@ button.active i.fa-retweet {
|
||||||
max-height: 80vh;
|
max-height: 80vh;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.onboarding-modal {
|
||||||
|
background: $color2;
|
||||||
|
color: $color1;
|
||||||
|
border-radius: 8px;
|
||||||
|
overflow: hidden;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.onboarding-modal__pager {
|
||||||
|
height: 80vh;
|
||||||
|
width: 80vw;
|
||||||
|
max-width: 500px;
|
||||||
|
max-height: 500px;
|
||||||
|
display: flex;
|
||||||
|
|
||||||
|
& > div {
|
||||||
|
padding: 25px;
|
||||||
|
display: none;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
user-select: text;
|
||||||
|
|
||||||
|
&.active {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.onboarding-modal__paginator {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
background: darken($color2, 8%);
|
||||||
|
display: flex;
|
||||||
|
padding: 25px;
|
||||||
|
|
||||||
|
& > div {
|
||||||
|
min-width: 33px;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: darken($color2, 34%);
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
|
||||||
|
&:hover, &:focus, &:active {
|
||||||
|
color: darken($color2, 38%);
|
||||||
|
}
|
||||||
|
|
||||||
|
&.onboarding-modal__done, &.onboarding-modal__next {
|
||||||
|
color: $color4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.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($color2, 16%);
|
||||||
|
margin: 0 3px;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: darken($color2, 18%);
|
||||||
|
}
|
||||||
|
|
||||||
|
&.active {
|
||||||
|
cursor: default;
|
||||||
|
background: darken($color2, 24%);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.onboarding-modal__page {
|
||||||
|
text-align: center;
|
||||||
|
cursor: default;
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: $color1;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: $color4;
|
||||||
|
|
||||||
|
&:hover, &:focus, &:active {
|
||||||
|
color: lighten($color4, 4%);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
font-size: 16px;
|
||||||
|
color: lighten($color1, 8%);
|
||||||
|
margin-bottom: 10px;
|
||||||
|
|
||||||
|
&:last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
strong {
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ class HomeController < ApplicationController
|
||||||
@body_classes = 'app-body'
|
@body_classes = 'app-body'
|
||||||
@token = find_or_create_access_token.token
|
@token = find_or_create_access_token.token
|
||||||
@web_settings = Web::Setting.find_by(user: current_user)&.data || {}
|
@web_settings = Web::Setting.find_by(user: current_user)&.data || {}
|
||||||
|
@admin = Account.find_local(Setting.site_contact_username)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -4,7 +4,9 @@ node(:meta) do
|
||||||
{
|
{
|
||||||
access_token: @token,
|
access_token: @token,
|
||||||
locale: I18n.locale,
|
locale: I18n.locale,
|
||||||
|
domain: Rails.configuration.x.local_domain,
|
||||||
me: current_account.id,
|
me: current_account.id,
|
||||||
|
admin: @admin.try(:id),
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -16,9 +18,10 @@ node(:compose) do
|
||||||
end
|
end
|
||||||
|
|
||||||
node(:accounts) do
|
node(:accounts) do
|
||||||
{
|
store = {}
|
||||||
current_account.id => partial('api/v1/accounts/show', object: current_account),
|
store[current_account.id] = partial('api/v1/accounts/show', object: current_account)
|
||||||
}
|
store[@admin.id] = partial('api/v1/accounts/show', object: @admin) unless @admin.nil?
|
||||||
|
store
|
||||||
end
|
end
|
||||||
|
|
||||||
node(:settings) { @web_settings }
|
node(:settings) { @web_settings }
|
||||||
|
|
Reference in a new issue