Permalink
Browse files

Move core project files to /app for consistency

  • Loading branch information...
markerikson committed Dec 1, 2016
1 parent 01c62c6 commit 611cb6f8577cf33053d4030c02abd3d991510acc
File renamed without changes.
@@ -4,7 +4,7 @@ import {
Container,
} from "semantic-ui-react";
import TabBarContainer from "./features/tabs/TabBarContainer";
import TabBarContainer from "features/tabs/TabBarContainer";
import UnitInfo from "features/unitInfo/UnitInfo";
import Pilots from "features/pilots/Pilots";
import Mechs from "features/mechs/Mechs";
File renamed without changes.
File renamed without changes.
@@ -3,7 +3,7 @@ import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly';
import thunk from "redux-thunk";
import rootReducer from "../reducers/rootReducer";
import rootReducer from "app/reducers/rootReducer";
export default function configureStore(preloadedState) {
const middlewares = [thunk];
@@ -21,8 +21,8 @@ export default function configureStore(preloadedState) {
if(process.env.NODE_ENV !== "production") {
if(module.hot) {
module.hot.accept("../reducers/rootReducer", () =>{
const newRootReducer = require("../reducers/rootReducer").default;
module.hot.accept("app/reducers/rootReducer", () =>{
const newRootReducer = require("app/reducers/rootReducer").default;
store.replaceReducer(newRootReducer)
});
}
View
@@ -4,7 +4,7 @@ import {Provider} from "react-redux";
import "semantic-ui-css/semantic.css";
import configureStore from "./store/configureStore";
import configureStore from "app/store/configureStore";
const store = configureStore();
// Save a reference to the root element for reuse
@@ -13,7 +13,7 @@ const rootEl = document.getElementById("root");
// Create a reusable render method that we can call more than once
let render = () => {
// Dynamically import our main App component, and render it
const App = require("./App").default;
const App = require("./app/layout/App").default;
ReactDOM.render(
<Provider store={store}>
@@ -49,7 +49,7 @@ if(module.hot) {
// Whenever the App component file or one of its dependencies
// is changed, re-import the updated component and re-render it
module.hot.accept("./App", () => {
module.hot.accept("./app/layout/App", () => {
setTimeout(render);
});
}

0 comments on commit 611cb6f

Please sign in to comment.