From 60e46d686d7552acab62af414661981da7ff92df Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Fri, 22 Apr 2016 23:16:23 -0700 Subject: [PATCH] Fancy new redux folder --- .../{modals => }/EnvironmentEditModal.js | 12 ++++++------ app/components/Sidebar.js | 6 +++--- app/containers/App.js | 14 +++++++------- .../modals => containers}/Prompts.js | 12 ++++++------ .../RequestActionsDropdown.js | 6 +++--- .../RequestGroupActionsDropdown.js | 6 +++--- .../WorkspaceDropdown.js | 8 ++++---- app/index.js | 11 ++++++----- app/reducers/index.js | 19 ------------------- .../configureStore.js => redux/create.js} | 6 +++--- app/{ => redux}/modules/global.js | 0 app/{ => redux}/modules/modals.js | 0 app/{ => redux}/modules/requestGroups.js | 4 ++-- app/{ => redux}/modules/requests.js | 8 ++++---- app/{ => redux}/modules/responses.js | 0 app/{ => redux}/modules/tabs.js | 0 app/{ => redux}/modules/workspaces.js | 0 app/redux/reducer.js | 19 +++++++++++++++++++ 18 files changed, 66 insertions(+), 65 deletions(-) rename app/components/{modals => }/EnvironmentEditModal.js (88%) rename app/{components/modals => containers}/Prompts.js (88%) rename app/{components/dropdowns => containers}/RequestActionsDropdown.js (91%) rename app/{components/dropdowns => containers}/RequestGroupActionsDropdown.js (91%) rename app/{components/dropdowns => containers}/WorkspaceDropdown.js (93%) delete mode 100644 app/reducers/index.js rename app/{stores/configureStore.js => redux/create.js} (79%) rename app/{ => redux}/modules/global.js (100%) rename app/{ => redux}/modules/modals.js (100%) rename app/{ => redux}/modules/requestGroups.js (96%) rename app/{ => redux}/modules/requests.js (91%) rename app/{ => redux}/modules/responses.js (100%) rename app/{ => redux}/modules/tabs.js (100%) rename app/{ => redux}/modules/workspaces.js (100%) create mode 100644 app/redux/reducer.js diff --git a/app/components/modals/EnvironmentEditModal.js b/app/components/EnvironmentEditModal.js similarity index 88% rename from app/components/modals/EnvironmentEditModal.js rename to app/components/EnvironmentEditModal.js index 0b90a2be4b..503f5e590a 100644 --- a/app/components/modals/EnvironmentEditModal.js +++ b/app/components/EnvironmentEditModal.js @@ -1,11 +1,11 @@ import React, {Component, PropTypes} from 'react' -import Modal from '../base/Modal' -import ModalBody from '../base/ModalBody' -import ModalHeader from '../base/ModalHeader' -import ModalFooter from '../base/ModalFooter' -import KeyValueEditor from '../base/KeyValueEditor' -import {MODAL_ENVIRONMENT_EDITOR} from '../../lib/constants' +import Modal from './base/Modal' +import ModalBody from './base/ModalBody' +import ModalHeader from './base/ModalHeader' +import ModalFooter from './base/ModalFooter' +import KeyValueEditor from './base/KeyValueEditor' +import {MODAL_ENVIRONMENT_EDITOR} from '../lib/constants' class EnvironmentEditModal extends Component { constructor (props) { diff --git a/app/components/Sidebar.js b/app/components/Sidebar.js index 9816a014f5..61e3ebc406 100644 --- a/app/components/Sidebar.js +++ b/app/components/Sidebar.js @@ -1,8 +1,8 @@ import React, {Component, PropTypes} from 'react' import classnames from 'classnames' -import WorkspaceDropdown from './dropdowns/WorkspaceDropdown' -import RequestActionsDropdown from './dropdowns/RequestActionsDropdown' -import RequestGroupActionsDropdown from './dropdowns/RequestGroupActionsDropdown' +import WorkspaceDropdown from './../containers/WorkspaceDropdown' +import RequestActionsDropdown from './../containers/RequestActionsDropdown' +import RequestGroupActionsDropdown from './../containers/RequestGroupActionsDropdown' import DebouncingInput from './base/DebouncingInput' import MethodTag from './MethodTag' import * as db from '../database' diff --git a/app/containers/App.js b/app/containers/App.js index fd26d013f9..ec14081ab8 100644 --- a/app/containers/App.js +++ b/app/containers/App.js @@ -4,7 +4,7 @@ import {bindActionCreators} from 'redux' import {Tab, Tabs, TabList, TabPanel} from 'react-tabs' import Editor from '../components/base/Editor' -import Prompts from '../components/modals/Prompts' +import Prompts from './Prompts' import KeyValueEditor from '../components/base/KeyValueEditor' import RequestBodyEditor from '../components/RequestBodyEditor' import RequestAuthEditor from '../components/RequestAuthEditor' @@ -13,13 +13,13 @@ import StatusTag from '../components/StatusTag' import SizeTag from '../components/SizeTag' import TimeTag from '../components/TimeTag' import Sidebar from '../components/Sidebar' -import EnvironmentEditModal from '../components/modals/EnvironmentEditModal' +import EnvironmentEditModal from '../components/EnvironmentEditModal' -import * as GlobalActions from '../modules/global' -import * as RequestGroupActions from '../modules/requestGroups' -import * as RequestActions from '../modules/requests' -import * as ModalActions from '../modules/modals' -import * as TabActions from '../modules/tabs' +import * as GlobalActions from '../redux/modules/global' +import * as RequestGroupActions from '../redux/modules/requestGroups' +import * as RequestActions from '../redux/modules/requests' +import * as ModalActions from '../redux/modules/modals' +import * as TabActions from '../redux/modules/tabs' import * as db from '../database' diff --git a/app/components/modals/Prompts.js b/app/containers/Prompts.js similarity index 88% rename from app/components/modals/Prompts.js rename to app/containers/Prompts.js index a008f4c4b4..c5dabbd459 100644 --- a/app/components/modals/Prompts.js +++ b/app/containers/Prompts.js @@ -2,13 +2,13 @@ import React, {Component, PropTypes} from 'react' import {connect} from 'react-redux' import {bindActionCreators} from 'redux' -import * as ModalActions from '../../modules/modals' -import * as RequestGroupActions from '../../modules/requestGroups' -import * as RequestActions from '../../modules/requests' -import PromptModal from '../base/PromptModal' +import * as ModalActions from '../redux/modules/modals' +import * as RequestGroupActions from '../redux/modules/requestGroups' +import * as RequestActions from '../redux/modules/requests' +import PromptModal from '../components/base/PromptModal' -import * as db from '../../database' -import {MODAL_REQUEST_RENAME, MODAL_REQUEST_GROUP_RENAME} from '../../lib/constants'; +import * as db from '../database' +import {MODAL_REQUEST_RENAME, MODAL_REQUEST_GROUP_RENAME} from '../lib/constants'; class Prompts extends Component { constructor (props) { diff --git a/app/components/dropdowns/RequestActionsDropdown.js b/app/containers/RequestActionsDropdown.js similarity index 91% rename from app/components/dropdowns/RequestActionsDropdown.js rename to app/containers/RequestActionsDropdown.js index 8911a137c3..6b9a48b5d6 100644 --- a/app/components/dropdowns/RequestActionsDropdown.js +++ b/app/containers/RequestActionsDropdown.js @@ -1,9 +1,9 @@ import React, {Component, PropTypes} from 'react' import {bindActionCreators} from 'redux' import {connect} from 'react-redux' -import Dropdown from '../base/Dropdown' -import * as RequestActions from '../../modules/requests' -import * as db from '../../database/index'; +import Dropdown from '../components/base/Dropdown' +import * as RequestActions from '../redux/modules/requests' +import * as db from '../database'; class RequestActionsDropdown extends Component { render () { diff --git a/app/components/dropdowns/RequestGroupActionsDropdown.js b/app/containers/RequestGroupActionsDropdown.js similarity index 91% rename from app/components/dropdowns/RequestGroupActionsDropdown.js rename to app/containers/RequestGroupActionsDropdown.js index 91ea7ce3c2..1ae002b371 100644 --- a/app/components/dropdowns/RequestGroupActionsDropdown.js +++ b/app/containers/RequestGroupActionsDropdown.js @@ -1,9 +1,9 @@ import React, {Component, PropTypes} from 'react' import {bindActionCreators} from 'redux' import {connect} from 'react-redux' -import Dropdown from '../base/Dropdown' -import * as RequestGroupActions from '../../modules/requestGroups' -import * as db from '../../database' +import Dropdown from '../components/base/Dropdown' +import * as RequestGroupActions from '../redux/modules/requestGroups' +import * as db from '../database' class RequestGroupActionsDropdown extends Component { render () { diff --git a/app/components/dropdowns/WorkspaceDropdown.js b/app/containers/WorkspaceDropdown.js similarity index 93% rename from app/components/dropdowns/WorkspaceDropdown.js rename to app/containers/WorkspaceDropdown.js index 2f51f6d4ca..013ec15c7e 100644 --- a/app/components/dropdowns/WorkspaceDropdown.js +++ b/app/containers/WorkspaceDropdown.js @@ -2,10 +2,10 @@ import fs from 'fs' import React, {Component, PropTypes} from 'react' import {bindActionCreators} from 'redux' import {connect} from 'react-redux' -import Dropdown from '../base/Dropdown' -import * as RequestGroupActions from '../../modules/requestGroups' -import * as db from '../../database' -import importData from '../../lib/import' +import Dropdown from '../components/base/Dropdown' +import * as RequestGroupActions from '../redux/modules/requestGroups' +import * as db from '../database' +import importData from '../lib/import' class WorkspaceDropdown extends Component { _importDialog () { diff --git a/app/index.js b/app/index.js index 9f1c556ba9..4420815f96 100644 --- a/app/index.js +++ b/app/index.js @@ -2,12 +2,13 @@ import React from 'react' import {render} from 'react-dom' import {Provider} from 'react-redux' import {bindActionCreators} from 'redux' -import configureStore from './stores/configureStore' + +import createStore from './redux/create' import App from './containers/App' -import * as RequestGroupActions from './modules/requestGroups' -import * as RequestActions from './modules/requests' -import * as ResponseActions from './modules/responses' +import * as RequestGroupActions from './redux/modules/requestGroups' +import * as RequestActions from './redux/modules/requests' +import * as ResponseActions from './redux/modules/responses' import * as db from './database' // Global CSS @@ -15,7 +16,7 @@ import './css/index.scss' import './css/lib/chrome/platform_app.css' import './css/lib/fontawesome/css/font-awesome.css' -const store = configureStore(); +const store = createStore(); // Dispatch the initial load of data console.log('-- Init Insomnia --'); diff --git a/app/reducers/index.js b/app/reducers/index.js deleted file mode 100644 index cdc25152dc..0000000000 --- a/app/reducers/index.js +++ /dev/null @@ -1,19 +0,0 @@ -import {combineReducers} from 'redux' - -import workspacesReducer from '../modules/workspaces' -import requestsReducer from '../modules/requests' -import tabsReducer from '../modules/tabs' -import globalReducer from '../modules/global' -import modalsReducer from '../modules/modals' -import requestGroupsReducer from '../modules/requestGroups' -import responsesReducer from '../modules/responses' - -export default combineReducers({ - workspaces: workspacesReducer, - requestGroups: requestGroupsReducer, - requests: requestsReducer, - responses: responsesReducer, - modals: modalsReducer, - global: globalReducer, - tabs: tabsReducer -}); diff --git a/app/stores/configureStore.js b/app/redux/create.js similarity index 79% rename from app/stores/configureStore.js rename to app/redux/create.js index de807cefbe..f2c74bc146 100644 --- a/app/stores/configureStore.js +++ b/app/redux/create.js @@ -1,7 +1,7 @@ import {createStore, applyMiddleware} from 'redux' import thunkMiddleware from 'redux-thunk' import createLogger from 'redux-logger' -import rootReducer from '../reducers' +import rootReducer from './reducer' const loggerMiddleware = createLogger({ collapsed: true @@ -19,8 +19,8 @@ export default function configureStore (initialState) { if (module.hot) { // Enable Webpack hot module replacement for reducers - module.hot.accept('../reducers', () => { - const nextReducer = require('../reducers').default; + module.hot.accept('./reducer', () => { + const nextReducer = require('./reducer').default; store.replaceReducer(nextReducer); }) } diff --git a/app/modules/global.js b/app/redux/modules/global.js similarity index 100% rename from app/modules/global.js rename to app/redux/modules/global.js diff --git a/app/modules/modals.js b/app/redux/modules/modals.js similarity index 100% rename from app/modules/modals.js rename to app/redux/modules/modals.js diff --git a/app/modules/requestGroups.js b/app/redux/modules/requestGroups.js similarity index 96% rename from app/modules/requestGroups.js rename to app/redux/modules/requestGroups.js index 1956982e44..e78920778e 100644 --- a/app/modules/requestGroups.js +++ b/app/redux/modules/requestGroups.js @@ -1,7 +1,7 @@ import {combineReducers} from 'redux' -import {show} from '../modules/modals' -import {MODAL_ENVIRONMENT_EDITOR, MODAL_REQUEST_GROUP_RENAME} from '../lib/constants'; +import {show} from './modals' +import {MODAL_ENVIRONMENT_EDITOR, MODAL_REQUEST_GROUP_RENAME} from '../../lib/constants'; export const REQUEST_GROUP_UPDATE = 'requestgroups/update'; export const REQUEST_GROUP_DELETE = 'requestgroups/delete'; diff --git a/app/modules/requests.js b/app/redux/modules/requests.js similarity index 91% rename from app/modules/requests.js rename to app/redux/modules/requests.js index 9676a59a7e..a7b18f2a1e 100644 --- a/app/modules/requests.js +++ b/app/redux/modules/requests.js @@ -1,9 +1,9 @@ import {combineReducers} from 'redux' -import makeRequest from '../lib/request' -import {loadStart, loadStop} from '../modules/global' -import {show} from '../modules/modals' -import {MODAL_REQUEST_RENAME} from '../lib/constants' +import makeRequest from '../../lib/request' +import {loadStart, loadStop} from './global' +import {show} from './modals' +import {MODAL_REQUEST_RENAME} from '../../lib/constants' export const REQUEST_UPDATE = 'requests/update'; export const REQUEST_DELETE = 'requests/delete'; diff --git a/app/modules/responses.js b/app/redux/modules/responses.js similarity index 100% rename from app/modules/responses.js rename to app/redux/modules/responses.js diff --git a/app/modules/tabs.js b/app/redux/modules/tabs.js similarity index 100% rename from app/modules/tabs.js rename to app/redux/modules/tabs.js diff --git a/app/modules/workspaces.js b/app/redux/modules/workspaces.js similarity index 100% rename from app/modules/workspaces.js rename to app/redux/modules/workspaces.js diff --git a/app/redux/reducer.js b/app/redux/reducer.js new file mode 100644 index 0000000000..99e495648c --- /dev/null +++ b/app/redux/reducer.js @@ -0,0 +1,19 @@ +import {combineReducers} from 'redux' + +import workspacesReducer from './modules/workspaces' +import requestsReducer from './modules/requests' +import tabsReducer from './modules/tabs' +import globalReducer from './modules/global' +import modalsReducer from './modules/modals' +import requestGroupsReducer from './modules/requestGroups' +import responsesReducer from './modules/responses' + +export default combineReducers({ + workspaces: workspacesReducer, + requestGroups: requestGroupsReducer, + requests: requestsReducer, + responses: responsesReducer, + modals: modalsReducer, + global: globalReducer, + tabs: tabsReducer +});