Merge pull request #266 from chriswmartin/getting-started-improvements
Getting started column improvementsmaster
beatrix
7 years ago
committed by
GitHub
commit
60d415bc5e
@ -0,0 +1,60 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import Column from 'flavours/glitch/features/ui/components/column'; |
||||
import ColumnBackButtonSlim from 'flavours/glitch/components/column_back_button_slim'; |
||||
import { defineMessages, injectIntl } from 'react-intl'; |
||||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
||||
import ColumnLink from 'flavours/glitch/features/ui/components/column_link'; |
||||
import ColumnSubheading from 'flavours/glitch/features/ui/components/column_subheading'; |
||||
import { openModal } from 'flavours/glitch/actions/modal'; |
||||
import { connect } from 'react-redux'; |
||||
|
||||
const messages = defineMessages({ |
||||
heading: { id: 'column.heading', defaultMessage: 'Misc' }, |
||||
subheading: { id: 'column.subheading', defaultMessage: 'Miscellaneous options' }, |
||||
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' }, |
||||
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' }, |
||||
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' }, |
||||
info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' }, |
||||
show_me_around: { id: 'getting_started.onboarding', defaultMessage: 'Show me around' }, |
||||
pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' }, |
||||
info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' }, |
||||
keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' }, |
||||
}); |
||||
|
||||
@connect() |
||||
@injectIntl |
||||
export default class gettingStartedMisc extends ImmutablePureComponent { |
||||
|
||||
static propTypes = { |
||||
intl: PropTypes.object.isRequired, |
||||
dispatch: PropTypes.func.isRequired, |
||||
}; |
||||
|
||||
openOnboardingModal = (e) => { |
||||
e.preventDefault(); |
||||
this.props.dispatch(openModal('ONBOARDING')); |
||||
} |
||||
|
||||
render () { |
||||
const { intl } = this.props; |
||||
|
||||
return ( |
||||
<Column icon='ellipsis-h' heading={intl.formatMessage(messages.heading)}> |
||||
<ColumnBackButtonSlim /> |
||||
|
||||
<div className='scrollable'> |
||||
<ColumnSubheading text={intl.formatMessage(messages.subheading)} /> |
||||
<ColumnLink key='19' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' /> |
||||
<ColumnLink key='20' icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' /> |
||||
<ColumnLink key='21' icon='volume-off' text={intl.formatMessage(messages.mutes)} to='/mutes' /> |
||||
<ColumnLink key='22' icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' /> |
||||
<ColumnLink key='23' icon='question' text={intl.formatMessage(messages.keyboard_shortcuts)} to='/keyboard-shortcuts' /> |
||||
<ColumnLink icon='book' text={intl.formatMessage(messages.info)} href='/about/more' /> |
||||
<ColumnLink icon='hand-o-right' text={intl.formatMessage(messages.show_me_around)} onClick={this.openOnboardingModal} /> |
||||
</div> |
||||
</Column> |
||||
); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,102 @@ |
||||
import React from 'react'; |
||||
import Column from 'flavours/glitch/features/ui/components/column'; |
||||
import ColumnBackButtonSlim from 'flavours/glitch/components/column_back_button_slim'; |
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; |
||||
import PropTypes from 'prop-types'; |
||||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
||||
|
||||
const messages = defineMessages({ |
||||
heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' }, |
||||
}); |
||||
|
||||
@injectIntl |
||||
export default class KeyboardShortcuts extends ImmutablePureComponent { |
||||
|
||||
static propTypes = { |
||||
intl: PropTypes.object.isRequired, |
||||
multiColumn: PropTypes.bool, |
||||
}; |
||||
|
||||
render () { |
||||
const { intl } = this.props; |
||||
|
||||
return ( |
||||
<Column icon='question' heading={intl.formatMessage(messages.heading)}> |
||||
<ColumnBackButtonSlim /> |
||||
<div className='keyboard-shortcuts scrollable optionally-scrollable'> |
||||
<table> |
||||
<thead> |
||||
<tr> |
||||
<th><FormattedMessage id='keyboard_shortcuts.hotkey' defaultMessage='Hotkey' /></th> |
||||
<th><FormattedMessage id='keyboard_shortcuts.description' defaultMessage='Description' /></th> |
||||
</tr> |
||||
</thead> |
||||
<tbody> |
||||
<tr> |
||||
<td><kbd>r</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.reply' defaultMessage='to reply' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>m</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.mention' defaultMessage='to mention author' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>f</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.favourite' defaultMessage='to favourite' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>b</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.boost' defaultMessage='to boost' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>enter</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.enter' defaultMessage='to open status' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>up</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.up' defaultMessage='to move up in the list' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>down</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.down' defaultMessage='to move down in the list' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>1</kbd>-<kbd>9</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.column' defaultMessage='to focus a status in one of the columns' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>n</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.compose' defaultMessage='to focus the compose textarea' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>alt</kbd>+<kbd>n</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a brand new toot' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>backspace</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.back' defaultMessage='to navigate back' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>s</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>esc</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.unfocus' defaultMessage='to un-focus compose textarea/search' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>x</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.expand' defaultMessage='to expand a status with a content warning' /></td> |
||||
</tr> |
||||
<tr> |
||||
<td><kbd>?</kbd></td> |
||||
<td><FormattedMessage id='keyboard_shortcuts.legend' defaultMessage='to display this legend' /></td> |
||||
</tr> |
||||
</tbody> |
||||
</table> |
||||
</div> |
||||
</Column> |
||||
); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue