diff --git a/package.json b/package.json index 42ac35a6..7043e871 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "license": "MIT", "devDependencies": { "@kadira/storybook": "^1.36.0", - "autoprefixer": "^6.3.3", "babel-core": "^6.5.1", "babel-loader": "^6.2.2", "babel-plugin-lodash": "^3.2.0", @@ -55,13 +54,10 @@ "expect": "^1.20.2", "exports-loader": "^0.6.3", "file-loader": "^0.8.5", - "immutable": "^3.7.6", "imports-loader": "^0.6.5", "jest-cli": "^15.1.1", - "js-yaml": "^3.5.3", "lint-staged": "^3.0.2", "node-sass": "^3.10.0", - "normalizr": "^2.0.0", "npm-check": "^5.2.3", "postcss-cssnext": "^2.7.0", "postcss-import": "^8.1.2", @@ -69,12 +65,6 @@ "pre-commit": "^1.1.3", "react-hot-loader": "^3.0.0-beta.2", "react-lazy-load": "^3.0.3", - "react-pure-render": "^1.0.2", - "react-redux": "^4.4.0", - "react-router": "^2.5.1", - "react-router-redux": "^4.0.5", - "redux": "^3.3.1", - "redux-thunk": "^1.0.3", "sass-loader": "^4.0.2", "style-loader": "^0.13.0", "stylefmt": "^4.3.1", @@ -91,17 +81,21 @@ "whatwg-fetch": "^1.0.0" }, "dependencies": { + "autoprefixer": "^6.3.3", "bricks.js": "^1.7.0", "dateformat": "^1.0.12", "fuzzy": "^0.1.1", + "immutable": "^3.7.6", "immutability-helper": "^2.0.0", "js-base64": "^2.1.9", + "js-yaml": "^3.5.3", "json-loader": "^0.5.4", "localforage": "^1.4.2", "lodash": "^4.13.1", "markup-it": "git+https://github.com/cassiozen/markup-it.git", "material-design-icons": "^3.0.1", "moment": "^2.11.2", + "normalizr": "^2.0.0", "normalize.css": "^4.2.0", "pluralize": "^3.0.0", "prismjs": "^1.5.1", @@ -115,6 +109,12 @@ "react-simple-dnd": "^0.1.2", "react-toolbox": "^1.2.1", "react-waypoint": "^3.1.3", + "react-pure-render": "^1.0.2", + "react-redux": "^4.4.0", + "react-router": "^2.5.1", + "react-router-redux": "^4.0.5", + "redux": "^3.3.1", + "redux-thunk": "^1.0.3", "selection-position": "^1.0.0", "semaphore": "^1.0.5", "slate": "^0.13.6" diff --git a/src/containers/CollectionPage.js b/src/containers/CollectionPage.js index 3c161adf..07ab62e8 100644 --- a/src/containers/CollectionPage.js +++ b/src/containers/CollectionPage.js @@ -14,6 +14,7 @@ class DashboardPage extends React.Component { collection: ImmutablePropTypes.map.isRequired, collections: ImmutablePropTypes.orderedMap.isRequired, dispatch: PropTypes.func.isRequired, + page: PropTypes.number, entries: ImmutablePropTypes.list, }; @@ -41,15 +42,20 @@ class DashboardPage extends React.Component { if (collections == null) { return