From 89f06637235c7d5bdb1125dad2ac43ccf5bd3a5d Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Tue, 25 Apr 2017 12:38:00 -0600 Subject: [PATCH 1/2] shortcuts list should be accessible from the cog --- client/coral-admin/src/components/ModerationKeysModal.js | 2 ++ client/coral-admin/src/components/ui/Header.js | 6 ++++-- client/coral-admin/src/components/ui/Layout.js | 9 +++++++-- client/coral-admin/src/containers/LayoutContainer.js | 8 ++++++-- client/coral-admin/src/translations.json | 4 ++++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/client/coral-admin/src/components/ModerationKeysModal.js b/client/coral-admin/src/components/ModerationKeysModal.js index 3d43c621d..55bee3082 100644 --- a/client/coral-admin/src/components/ModerationKeysModal.js +++ b/client/coral-admin/src/components/ModerationKeysModal.js @@ -28,6 +28,8 @@ const shortcuts = [ export default class ModerationKeysModal extends React.Component { static propTypes = { + open: PropTypes.bool.isRequired, + onClose: PropTypes.func.isRequired, hideShortcutsNote: PropTypes.func.isRequired, shortcutsNoteVisible: PropTypes.string.isRequired } diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js index f09a9f9f7..55d52114f 100644 --- a/client/coral-admin/src/components/ui/Header.js +++ b/client/coral-admin/src/components/ui/Header.js @@ -6,7 +6,7 @@ import I18n from 'coral-framework/modules/i18n/i18n'; import translations from '../../translations.json'; import {Logo} from './Logo'; -const CoralHeader = ({handleLogout, restricted = false}) => ( +const CoralHeader = ({handleLogout, showShortcuts, restricted = false}) => (
{ @@ -55,7 +55,8 @@ const CoralHeader = ({handleLogout, restricted = false}) => (
- Sign Out + showShortcuts(true)}>{lang.t('configure.shortcuts')} + {lang.t('configure.sign-out')}
@@ -72,6 +73,7 @@ const CoralHeader = ({handleLogout, restricted = false}) => ( ); CoralHeader.propTypes = { + showShortcuts: PropTypes.func, handleLogout: PropTypes.func.isRequired, restricted: PropTypes.bool // hide elemnts from a user that's logged out }; diff --git a/client/coral-admin/src/components/ui/Layout.js b/client/coral-admin/src/components/ui/Layout.js index c8b5bf57a..6bf9661b7 100644 --- a/client/coral-admin/src/components/ui/Layout.js +++ b/client/coral-admin/src/components/ui/Layout.js @@ -4,9 +4,13 @@ import Header from './Header'; import Drawer from './Drawer'; import styles from './Layout.css'; -const Layout = ({children, handleLogout = () => {}, restricted = false, ...props}) => ( +const Layout = ({children, handleLogout = () => {}, toggleShortcutModal, restricted = false, ...props}) => ( -
+
{children} @@ -16,6 +20,7 @@ const Layout = ({children, handleLogout = () => {}, restricted = false, ...props Layout.propTypes = { handleLogout: PropTypes.func, + toggleShortcutModal: PropTypes.func, restricted: PropTypes.bool // hide elements from a user that's logged out }; diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js index 30e32a828..42e2baade 100644 --- a/client/coral-admin/src/containers/LayoutContainer.js +++ b/client/coral-admin/src/containers/LayoutContainer.js @@ -2,6 +2,7 @@ import React, {Component} from 'react'; import {connect} from 'react-redux'; import Layout from '../components/ui/Layout'; import {checkLogin, handleLogin, logout, requestPasswordReset} from '../actions/auth'; +import {toggleModal as toggleShortcutModal} from '../actions/moderation'; import {fetchConfig} from '../actions/config'; import {FullLoading} from '../components/FullLoading'; import AdminLogin from '../components/AdminLogin'; @@ -23,7 +24,7 @@ class LayoutContainer extends Component { passwordRequestSuccess } = this.props.auth; - const {handleLogout, TALK_RECAPTCHA_PUBLIC} = this.props; + const {handleLogout, toggleShortcutModal, TALK_RECAPTCHA_PUBLIC} = this.props; if (loadingUser) { return ; } if (!isAdmin) { return ; } - if (isAdmin && loggedIn) { return ; } + if (isAdmin && loggedIn) { + return ; + } return ; } } @@ -49,6 +52,7 @@ const mapDispatchToProps = dispatch => ({ fetchConfig: () => dispatch(fetchConfig()), handleLogin: (username, password, recaptchaResponse) => dispatch(handleLogin(username, password, recaptchaResponse)), requestPasswordReset: email => dispatch(requestPasswordReset(email)), + toggleShortcutModal: toggle => dispatch(toggleShortcutModal(toggle)), handleLogout: () => dispatch(logout()) }); diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json index 9e167232e..b6ac46b01 100644 --- a/client/coral-admin/src/translations.json +++ b/client/coral-admin/src/translations.json @@ -79,6 +79,8 @@ "copy": "Copy to Clipboard" }, "configure": { + "sign-out": "Sign Out", + "shortcuts": "Shortcuts", "closed-stream-settings": "Closed Stream Message", "open-stream-configuration": "This comment stream is currently open. By closing this comment stream, no new comments may be submitted and all previous comments will still be displayed.", "close-stream-configuration": "This comment stream is currently closed. By opening this comment stream, new comments may be submitted and displayed", @@ -257,6 +259,8 @@ "username_flags": "marcas para este nombre de usuario" }, "configure": { + "sign-out": "Desconectar", + "shortcuts": "Atajos", "closed-stream-settings": "Mensaje a enviar cuando los comentarios están cerrados en el artículo", "open-stream-configuration": "Este hilo de comentarios esta abierto. Al cerrarlo, ningún nuevo comentario será publicado y todos los comentarios anteriores serán mostrados.", "close-stream-configuration": "Este hilo de comentario está en este momento cerrado. Al abrirlo, nuevos comentarios serán publicaods y mostrados.", From a94e6a0adaa7746cc5ca5dba6ea063dfde5def92 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Tue, 25 Apr 2017 12:40:28 -0600 Subject: [PATCH 2/2] have default...just in case --- client/coral-admin/src/components/ui/Header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js index 55d52114f..6418efb10 100644 --- a/client/coral-admin/src/components/ui/Header.js +++ b/client/coral-admin/src/components/ui/Header.js @@ -6,7 +6,7 @@ import I18n from 'coral-framework/modules/i18n/i18n'; import translations from '../../translations.json'; import {Logo} from './Logo'; -const CoralHeader = ({handleLogout, showShortcuts, restricted = false}) => ( +const CoralHeader = ({handleLogout, showShortcuts = () => {}, restricted = false}) => (
{