Skip to content

Commit

Permalink
Add the context menu reducer and component to the app
Browse files Browse the repository at this point in the history
  • Loading branch information
markerikson committed Jul 21, 2017
1 parent 4fc3f4d commit f38f38b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/app/layout/App.js
Expand Up @@ -11,6 +11,7 @@ import Mechs from "features/mechs/Mechs";
import UnitOrganization from "features/unitOrganization/UnitOrganization";
import Tools from "features/tools/Tools";
import ModalManager from "features/modals/ModalManager";
import ContextMenuManager from "features/contextMenus/ContextMenuManager";

import './App.css';

Expand All @@ -27,6 +28,7 @@ class App extends Component {
return (
<div className="App">
<ModalManager/>
<ContextMenuManager />
<div className="App-header">
<Header inverted as="h1">Project Mini-Mek</Header>
</div>
Expand Down
6 changes: 4 additions & 2 deletions src/app/reducers/rootReducer.js
Expand Up @@ -8,7 +8,8 @@ import tabReducer from "features/tabs/tabReducer";
import unitInfoReducer from "features/unitInfo/unitInfoReducer";
import pilotsReducer from "features/pilots/pilotsReducer";
import mechsReducer from "features/mechs/mechsReducer";
import modalsReducer from "features/modals/modalReducer.js";
import modalsReducer from "features/modals/modalReducer";
import contextMenuReducer from "features/contextMenus/contextMenuReducer";

import entityCrudReducer from "features/entities/entityReducer";
import editingFeatureReducer from "features/editing/editingReducer";
Expand All @@ -22,6 +23,7 @@ const combinedReducer = combineReducers({
mechs : mechsReducer,
tabs : tabReducer,
modals : modalsReducer,
contextMenu : contextMenuReducer
});


Expand All @@ -31,4 +33,4 @@ const rootReducer = reduceReducers(
editingFeatureReducer,
);

export default rootReducer;
export default rootReducer;

0 comments on commit f38f38b

Please sign in to comment.