From c8c4a0b010b6ecdfb6957fe9a18f5f4c41d28ef7 Mon Sep 17 00:00:00 2001 From: Mike Piccolo Date: Sat, 15 Oct 2016 09:09:24 -0700 Subject: [PATCH] Move constants to it own dir (#12) * Move constants to directory * Use index to export constants --- src/actions/device.js | 11 ++++------- src/actions/general.js | 33 +++++++++++---------------------- src/constants/device.js | 3 +++ src/constants/general.js | 11 +++++++++++ src/constants/index.js | 7 +++++++ src/reducers/device.js | 11 ++++++++--- src/reducers/general.js | 18 ++++++++++++++---- 7 files changed, 58 insertions(+), 36 deletions(-) create mode 100644 src/constants/device.js create mode 100644 src/constants/general.js create mode 100644 src/constants/index.js diff --git a/src/actions/device.js b/src/actions/device.js index 873b98a98..bac932cad 100644 --- a/src/actions/device.js +++ b/src/actions/device.js @@ -3,19 +3,16 @@ import {requestData, requestSuccess, requestFailure} from './helpers.js'; import {AsyncStorage} from 'react-native'; - -export const DEVICE_REQUEST = 'DEVICE_REQUEST'; -export const DEVICE_SUCCESS = 'DEVICE_SUCCESS'; -export const DEVICE_FAILURE = 'DEVICE_FAILURE'; +import {DeviceTypes as types} from 'constants'; function fetchDevice() { return async (dispatch) => { try { - dispatch(requestData(DEVICE_REQUEST)); + dispatch(requestData(types.DEVICE_REQUEST)); const json = await AsyncStorage.getItem('basic_info'); - dispatch(requestSuccess(DEVICE_SUCCESS, JSON.parse(json))); + dispatch(requestSuccess(types.DEVICE_SUCCESS, JSON.parse(json))); } catch (err) { - dispatch(requestFailure(DEVICE_FAILURE, {msg: 'failed to load local storage'})); + dispatch(requestFailure(types.DEVICE_FAILURE, {msg: 'failed to load local storage'})); } }; } diff --git a/src/actions/general.js b/src/actions/general.js index db58121b9..decda71e2 100644 --- a/src/actions/general.js +++ b/src/actions/general.js @@ -3,44 +3,33 @@ import Client from 'client/client_instance.js'; import {bindClientFunc} from './helpers.js'; - -export const PING_REQUEST = 'PING_REQUEST'; -export const PING_SUCCESS = 'PING_SUCCESS'; -export const PING_FAILURE = 'PING_FAILURE'; +import {GeneralTypes as types} from 'constants'; export function getPing() { return bindClientFunc( Client.getPing, - PING_REQUEST, - PING_SUCCESS, - PING_FAILURE + types.PING_REQUEST, + types.PING_SUCCESS, + types.PING_FAILURE ); } -export const CLIENT_CONFIG_REQUEST = 'CLIENT_CONFIG_REQUEST'; -export const CLIENT_CONFIG_SUCCESS = 'CLIENT_CONFIG_SUCCESS'; -export const CLIENT_CONFIG_FAILURE = 'CLIENT_CONFIG_FAILURE'; - export function getClientConfig() { return bindClientFunc( Client.getClientConfig, - CLIENT_CONFIG_REQUEST, - CLIENT_CONFIG_SUCCESS, - CLIENT_CONFIG_FAILURE + types.CLIENT_CONFIG_REQUEST, + types.CLIENT_CONFIG_SUCCESS, + types.CLIENT_CONFIG_FAILURE ); } -export const LOG_CLIENT_ERROR_REQUEST = 'LOG_CLIENT_ERROR_REQUEST'; -export const LOG_CLIENT_ERROR_SUCCESS = 'LOG_CLIENT_ERROR_SUCCESS'; -export const LOG_CLIENT_ERROR_FAILURE = 'LOG_CLIENT_ERROR_FAILURE'; - export function logClientError(message, level = 'ERROR') { return bindClientFunc( Client.logClientError, - LOG_CLIENT_ERROR_REQUEST, - LOG_CLIENT_ERROR_SUCCESS, - LOG_CLIENT_ERROR_FAILURE, + types.LOG_CLIENT_ERROR_REQUEST, + types.LOG_CLIENT_ERROR_SUCCESS, + types.LOG_CLIENT_ERROR_FAILURE, message, level ); -} \ No newline at end of file +} diff --git a/src/constants/device.js b/src/constants/device.js new file mode 100644 index 000000000..3743e9e8e --- /dev/null +++ b/src/constants/device.js @@ -0,0 +1,3 @@ +export const DEVICE_REQUEST = 'DEVICE_REQUEST'; +export const DEVICE_SUCCESS = 'DEVICE_SUCCESS'; +export const DEVICE_FAILURE = 'DEVICE_FAILURE'; diff --git a/src/constants/general.js b/src/constants/general.js new file mode 100644 index 000000000..08fb05374 --- /dev/null +++ b/src/constants/general.js @@ -0,0 +1,11 @@ +export const PING_REQUEST = 'PING_REQUEST'; +export const PING_SUCCESS = 'PING_SUCCESS'; +export const PING_FAILURE = 'PING_FAILURE'; + +export const CLIENT_CONFIG_REQUEST = 'CLIENT_CONFIG_REQUEST'; +export const CLIENT_CONFIG_SUCCESS = 'CLIENT_CONFIG_SUCCESS'; +export const CLIENT_CONFIG_FAILURE = 'CLIENT_CONFIG_FAILURE'; + +export const LOG_CLIENT_ERROR_REQUEST = 'LOG_CLIENT_ERROR_REQUEST'; +export const LOG_CLIENT_ERROR_SUCCESS = 'LOG_CLIENT_ERROR_SUCCESS'; +export const LOG_CLIENT_ERROR_FAILURE = 'LOG_CLIENT_ERROR_FAILURE'; diff --git a/src/constants/index.js b/src/constants/index.js new file mode 100644 index 000000000..0de167ed7 --- /dev/null +++ b/src/constants/index.js @@ -0,0 +1,7 @@ +import * as DeviceTypes from './device'; +import * as GeneralTypes from './general'; + +export { + DeviceTypes, + GeneralTypes +}; diff --git a/src/reducers/device.js b/src/reducers/device.js index e0e5d4297..26762ae9f 100644 --- a/src/reducers/device.js +++ b/src/reducers/device.js @@ -2,8 +2,13 @@ // See License.txt for license information. import {handle, initialState} from './helpers.js'; -import * as Types from 'actions/device.js'; +import {DeviceTypes as types} from 'constants'; export default function device(state = initialState(), action) { - return handle(Types.DEVICE_REQUEST, Types.DEVICE_SUCCESS, Types.DEVICE_FAILURE, state, action); -} \ No newline at end of file + return handle( + types.DEVICE_REQUEST, + types.DEVICE_SUCCESS, + types.DEVICE_FAILURE, + state, + action); +} diff --git a/src/reducers/general.js b/src/reducers/general.js index e907fc669..751f9c115 100644 --- a/src/reducers/general.js +++ b/src/reducers/general.js @@ -3,17 +3,27 @@ import {combineReducers} from 'redux'; import {initialState, handle} from './helpers.js'; -import * as Types from 'actions/general.js'; +import {GeneralTypes as types} from 'constants'; export function clientConfig(state = initialState(), action) { - return handle(Types.CLIENT_CONFIG_REQUEST, Types.CLIENT_CONFIG_SUCCESS, Types.CLIENT_CONFIG_FAILURE, state, action); + return handle( + types.CLIENT_CONFIG_REQUEST, + types.CLIENT_CONFIG_SUCCESS, + types.CLIENT_CONFIG_FAILURE, + state, + action); } export function ping(state = initialState(), action) { - return handle(Types.PING_REQUEST, Types.PING_SUCCESS, Types.PING_FAILURE, state, action); + return handle( + types.PING_REQUEST, + types.PING_SUCCESS, + types.PING_FAILURE, + state, + action); } export default combineReducers({ clientConfig, ping -}); \ No newline at end of file +});