From df4e07d39c6b326686f6467d86ff11222064dd17 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Fri, 17 Mar 2017 08:37:58 -0600 Subject: [PATCH] Renamed pageData -> config --- client/coral-admin/src/actions/config.js | 7 +++++++ client/coral-admin/src/actions/pageData.js | 7 ------- client/coral-admin/src/containers/LayoutContainer.js | 10 +++++----- .../src/reducers/{pageData.js => config.js} | 6 +++--- client/coral-admin/src/reducers/index.js | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 client/coral-admin/src/actions/config.js delete mode 100644 client/coral-admin/src/actions/pageData.js rename client/coral-admin/src/reducers/{pageData.js => config.js} (56%) diff --git a/client/coral-admin/src/actions/config.js b/client/coral-admin/src/actions/config.js new file mode 100644 index 000000000..dca0f7117 --- /dev/null +++ b/client/coral-admin/src/actions/config.js @@ -0,0 +1,7 @@ +export const CONFIG_UPDATED = 'CONFIG_UPDATED'; + +export const fetchConfig = () => dispatch => { + let json = document.getElementById('data'); + let data = JSON.parse(json.textContent); + dispatch({type: CONFIG_UPDATED, data}); +}; diff --git a/client/coral-admin/src/actions/pageData.js b/client/coral-admin/src/actions/pageData.js deleted file mode 100644 index beaef6e60..000000000 --- a/client/coral-admin/src/actions/pageData.js +++ /dev/null @@ -1,7 +0,0 @@ -export const PAGE_DATA_UPDATED = 'PAGE_DATA_UPDATED'; - -export const fetchPageData = () => dispatch => { - let json = document.getElementById('data'); - let data = JSON.parse(json.textContent); - dispatch({type: PAGE_DATA_UPDATED, data}); -}; diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js index fefcaaf28..81f976f06 100644 --- a/client/coral-admin/src/containers/LayoutContainer.js +++ b/client/coral-admin/src/containers/LayoutContainer.js @@ -2,16 +2,16 @@ 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 {fetchPageData} from '../actions/pageData'; +import {fetchConfig} from '../actions/config'; import {FullLoading} from '../components/FullLoading'; import AdminLogin from '../components/AdminLogin'; class LayoutContainer extends Component { componentWillMount () { - const {checkLogin, fetchPageData} = this.props; + const {checkLogin, fetchConfig} = this.props; checkLogin(); - fetchPageData(); + fetchConfig(); } render () { const { @@ -45,12 +45,12 @@ class LayoutContainer extends Component { const mapStateToProps = state => ({ auth: state.auth.toJS(), - TALK_RECAPTCHA_PUBLIC: state.pageData.get('data').get('TALK_RECAPTCHA_PUBLIC', null) + TALK_RECAPTCHA_PUBLIC: state.config.get('data').get('TALK_RECAPTCHA_PUBLIC', null) }); const mapDispatchToProps = dispatch => ({ checkLogin: () => dispatch(checkLogin()), - fetchPageData: () => dispatch(fetchPageData()), + fetchConfig: () => dispatch(fetchConfig()), handleLogin: (username, password, recaptchaResponse) => dispatch(handleLogin(username, password, recaptchaResponse)), requestPasswordReset: email => dispatch(requestPasswordReset(email)), handleLogout: () => dispatch(logout()) diff --git a/client/coral-admin/src/reducers/pageData.js b/client/coral-admin/src/reducers/config.js similarity index 56% rename from client/coral-admin/src/reducers/pageData.js rename to client/coral-admin/src/reducers/config.js index 322d092bd..a5d11d6eb 100644 --- a/client/coral-admin/src/reducers/pageData.js +++ b/client/coral-admin/src/reducers/config.js @@ -1,14 +1,14 @@ import {Map} from 'immutable'; -import * as actions from '../actions/pageData'; +import * as actions from '../actions/config'; const initialState = Map({ data: Map({}) }); -export default function pageData (state = initialState, action) { +export default function config (state = initialState, action) { switch (action.type) { - case actions.PAGE_DATA_UPDATED: + case actions.CONFIG_UPDATED: return state.set('data', Map(action.data)); default: return state; diff --git a/client/coral-admin/src/reducers/index.js b/client/coral-admin/src/reducers/index.js index 33be4f384..3036d6271 100644 --- a/client/coral-admin/src/reducers/index.js +++ b/client/coral-admin/src/reducers/index.js @@ -4,7 +4,7 @@ import settings from './settings'; import community from './community'; import moderation from './moderation'; import install from './install'; -import pageData from './pageData'; +import config from './config'; export default { auth, @@ -13,5 +13,5 @@ export default { community, moderation, install, - pageData + config };