Fancy new redux folder

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) {

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'

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'
 

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) {

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 () {

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 () {

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 () {

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 --');

app/reducers/index.js

@@ -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
-});

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);
     })
   }

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';

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';

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
+});