diff --git a/demo/client/components/Routes.js b/demo/client/components/Routes.js
index 13e4565192..5a0f6af3f4 100644
--- a/demo/client/components/Routes.js
+++ b/demo/client/components/Routes.js
@@ -24,7 +24,7 @@ const Routes = props => {
-
+
);
}
diff --git a/demo/client/index.js b/demo/client/index.js
index 0c5c8d86f6..36967e0c35 100644
--- a/demo/client/index.js
+++ b/demo/client/index.js
@@ -25,7 +25,7 @@ const collections = [
const Index = () => {
return (
-
+
);
};
diff --git a/demo/client/store.js b/demo/client/store.js
index 62f5b47055..6c1991f472 100644
--- a/demo/client/store.js
+++ b/demo/client/store.js
@@ -1,9 +1,8 @@
import { createStore, combineReducers } from 'redux';
-import { common, collections } from 'payload/redux';
+import { common } from 'payload/redux';
const reducer = combineReducers({
- common,
- collections
+ common
});
const store = createStore(reducer);
diff --git a/src/components.js b/src/components.js
index 9f2b36b771..0de698b21d 100644
--- a/src/components.js
+++ b/src/components.js
@@ -1,8 +1,5 @@
export { default as App } from './components/App';
-// Redux
-export { default as LoadGlobals } from './components/LoadGlobals';
-
// Controls
export { default as Button } from './components/controls/Button';
@@ -56,9 +53,9 @@ export { default as Label } from './components/type/Label';
// Utilities
export { default as MeasureWindow } from './components/utilities/MeasureWindow';
-export { default as LoadCollections } from './components/utilities/LoadCollections';
export { default as MeasureScroll } from './components/utilities/MeasureScroll';
export { default as SetStepNav } from './components/utilities/SetStepNav';
+export { default as LoadGlobals } from './components/utilities/LoadGlobals';
// Views
export { default as Dashboard } from './components/views/Dashboard';
diff --git a/src/components/App.js b/src/components/App.js
index 02ded89999..a82f38b1c3 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -1,7 +1,7 @@
import React from 'react';
import { BrowserRouter as Router } from 'react-router-dom';
import { Provider } from 'react-redux';
-import { LoadGlobals, MeasureWindow, MeasureScroll, LoadCollections } from 'payload/components';
+import { LoadGlobals, MeasureWindow, MeasureScroll } from 'payload/components';
import '../scss/app.scss';
@@ -12,7 +12,6 @@ const App = props => {
-
{props.children}
diff --git a/src/components/layout/Sidebar/index.js b/src/components/layout/Sidebar/index.js
index c5406f68ff..faaf14fc91 100644
--- a/src/components/layout/Sidebar/index.js
+++ b/src/components/layout/Sidebar/index.js
@@ -6,8 +6,8 @@ import { Arrow, Label } from 'payload/components';
import './index.scss';
-const mapStateToProps = state => ({
- collections: state.collections.all
+const mapState = state => ({
+ collections: state.common.collections
});
const Sidebar = props => {
@@ -21,7 +21,7 @@ const Sidebar = props => {