From ac2c2b55e95fe92b7e44189562f414b2279c9976 Mon Sep 17 00:00:00 2001
From: Aurelsicoko <aurelsicoko@gmail.com>
Date: Sat, 25 Nov 2017 14:08:06 +0100
Subject: [PATCH 1/7] Fix setup and apply design changes

---
 packages/strapi-admin/.gitignore                              | 2 +-
 .../admin/src/components/LeftMenuLink/styles.scss             | 2 +-
 .../admin/src/components/LeftMenuLinkContainer/index.js       | 2 +-
 .../admin/src/components/LeftMenuLinkContainer/styles.scss    | 2 +-
 .../strapi-admin/admin/src/containers/HomePage/styles.scss    | 2 +-
 packages/strapi-admin/package.json                            | 4 ++--
 .../strapi-helper-plugin/lib/internals/webpack/manifest.json  | 2 +-
 .../lib/src/components/Button/styles.scss                     | 1 -
 packages/strapi-helper-plugin/package.json                    | 2 +-
 packages/strapi-plugin-content-manager/package.json           | 4 ++--
 packages/strapi-plugin-content-type-builder/package.json      | 4 ++--
 packages/strapi-plugin-settings-manager/package.json          | 4 ++--
 12 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/strapi-admin/.gitignore b/packages/strapi-admin/.gitignore
index 76c6eb04d9..473efe9e78 100644
--- a/packages/strapi-admin/.gitignore
+++ b/packages/strapi-admin/.gitignore
@@ -1,7 +1,7 @@
 # Don't check auto-generated stuff into git
 coverage
-build
 node_modules
+build
 stats.json
 package-lock.json
 
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss b/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss
index a36a868148..116df18b8e 100755
--- a/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss
+++ b/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss
@@ -17,6 +17,7 @@
   color: $left-menu-link-color;
   text-decoration: none;
   display: block;
+  -webkit-font-smoothing: antialiased;
 
   &:hover {
     color: $white;
@@ -43,7 +44,6 @@
 .linkIcon {
   position: relative;
   margin-right: 1.2rem;
-  vertical-align: middle;
   font-size: 1.2rem;
   width: 1.4rem;
   height: 1.2rem;
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js
index a65286ecb0..e18cfbc4a4 100755
--- a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js
+++ b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js
@@ -65,7 +65,7 @@ function LeftMenuLinkContainer({ plugins }) {
         <p className={styles.title}><FormattedMessage {...messages.general} /></p>
         <ul className={styles.list}>
           <LeftMenuLink
-            icon="cubes"
+            icon="puzzle-piece"
             label={messages.listPlugins.id}
             destination="/list-plugins"
           />
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/styles.scss b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/styles.scss
index f70e05e803..ef971b438f 100755
--- a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/styles.scss
+++ b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/styles.scss
@@ -13,7 +13,7 @@
   color: $left-menu-title-color;
   text-transform: uppercase;
   font-size: 1.1rem;
-  letter-spacing: .2rem;
+  letter-spacing: .1rem;
   font-weight: 600;
 }
 
diff --git a/packages/strapi-admin/admin/src/containers/HomePage/styles.scss b/packages/strapi-admin/admin/src/containers/HomePage/styles.scss
index 82f51e1520..f48df17633 100644
--- a/packages/strapi-admin/admin/src/containers/HomePage/styles.scss
+++ b/packages/strapi-admin/admin/src/containers/HomePage/styles.scss
@@ -60,7 +60,7 @@
   &:active {
    box-shadow: inset 1px 1px 3px rgba(0,0,0,.15);
  }
- padding-top: 4px;
+
  padding-left: 1.6rem;
  padding-right: 1.6rem;
  &:before {
diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index 67213a57d8..a3a3be55e5 100755
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -34,12 +34,12 @@
     "eslint": "^4.11.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-config-airbnb-base": "^11.3.2",
-    "eslint-config-prettier": "^2.7.0",
+    "eslint-config-prettier": "^2.8.0",
     "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-plugin-babel": "^4.1.2",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-react": "^7.5.1",
     "eslint-plugin-redux-saga": "^0.4.0",
     "extract-text-webpack-plugin": "^1.0.1",
     "html-loader": "^0.4.3",
diff --git a/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json b/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json
index 1c510162ca..d714389105 100644
--- a/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json
+++ b/packages/strapi-helper-plugin/lib/internals/webpack/manifest.json
@@ -1 +1 @@
-{"name":"vendor_lib","content":{"../strapi-helper-plugin/node_modules/react/index.js":{"id":0,"meta":{}},"../strapi-helper-plugin/node_modules/prop-types/index.js":{"id":1,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/emptyFunction.js":{"id":2,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/invariant.js":{"id":3,"meta":{}},"../strapi-helper-plugin/node_modules/react-dom/index.js":{"id":4,"meta":{}},"../strapi-helper-plugin/node_modules/object-assign/index.js":{"id":5,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/emptyObject.js":{"id":6,"meta":{}},"../strapi-helper-plugin/node_modules/intl-messageformat/src/main.js":{"id":7,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/utils.js":{"id":8,"meta":{"harmonyModule":true},"exports":["hop","extend"]},"./node_modules/webpack/buildin/global.js":{"id":9,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/Transition.js":{"id":10,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/utils/PropTypes.js":{"id":11,"meta":{}},"../strapi-helper-plugin/node_modules/react/cjs/react.production.min.js":{"id":13,"meta":{}},"../strapi-helper-plugin/node_modules/react-dom/cjs/react-dom.production.min.js":{"id":14,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/ExecutionEnvironment.js":{"id":15,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/EventListener.js":{"id":16,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/shallowEqual.js":{"id":17,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/containsNode.js":{"id":18,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/isTextNode.js":{"id":19,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/isNode.js":{"id":20,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/focusNode.js":{"id":21,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/getActiveElement.js":{"id":22,"meta":{}},"../strapi-helper-plugin/node_modules/react-intl/lib/index.es.js":{"id":23,"meta":{"harmonyModule":true},"exports":["addLocaleData","intlShape","injectIntl","defineMessages","IntlProvider","FormattedDate","FormattedTime","FormattedRelative","FormattedNumber","FormattedPlural","FormattedMessage","FormattedHTMLMessage"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/core.js":{"id":25,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/es5.js":{"id":26,"meta":{"harmonyModule":true},"exports":["defineProperty","objCreate"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/compiler.js":{"id":27,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat-parser/src/parser.js":{"id":28,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/en.js":{"id":29,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/main.js":{"id":30,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/core.js":{"id":31,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/diff.js":{"id":32,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/es5.js":{"id":33,"meta":{"harmonyModule":true},"exports":["defineProperty","objCreate","arrIndexOf","isArray","dateNow"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/en.js":{"id":34,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/prop-types/factoryWithThrowingShims.js":{"id":35,"meta":{}},"../strapi-helper-plugin/node_modules/prop-types/lib/ReactPropTypesSecret.js":{"id":36,"meta":{}},"../strapi-helper-plugin/node_modules/invariant/browser.js":{"id":37,"meta":{}},"../strapi-helper-plugin/node_modules/intl-format-cache/src/memoizer.js":{"id":38,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-format-cache/src/es5.js":{"id":39,"meta":{"harmonyModule":true},"exports":["bind","defineProperty","objCreate"]},"../strapi-helper-plugin/node_modules/reactstrap/dist/reactstrap.es.js":{"id":40,"meta":{"harmonyModule":true},"exports":["Alert","Container","Row","Col","Navbar","NavbarBrand","NavbarToggler","Nav","NavItem","NavDropdown","NavLink","Breadcrumb","BreadcrumbItem","Button","ButtonDropdown","ButtonGroup","ButtonToolbar","Dropdown","DropdownItem","DropdownMenu","DropdownToggle","Fade","Badge","Card","CardLink","CardGroup","CardDeck","CardColumns","CardBody","CardBlock","CardFooter","CardHeader","CardImg","CardImgOverlay","Carousel","UncontrolledCarousel","CarouselControl","CarouselItem","CarouselIndicators","CarouselCaption","CardSubtitle","CardText","CardTitle","Popover","PopoverContent","PopoverBody","PopoverTitle","PopoverHeader","Progress","Modal","ModalHeader","ModalBody","ModalFooter","PopperContent","PopperTargetHelper","Tooltip","Table","ListGroup","Form","FormFeedback","FormGroup","FormText","Input","InputGroup","InputGroupAddon","InputGroupButton","Label","Media","Pagination","PaginationItem","PaginationLink","TabContent","TabPane","Jumbotron","Collapse","ListGroupItem","ListGroupItemText","ListGroupItemHeading","UncontrolledAlert","UncontrolledButtonDropdown","UncontrolledDropdown","UncontrolledNavDropdown","UncontrolledTooltip"]},"../strapi-helper-plugin/node_modules/classnames/index.js":{"id":41,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.isfunction/index.js":{"id":42,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.isobject/index.js":{"id":43,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/react-popper.js":{"id":44,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Manager.js":{"id":45,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Target.js":{"id":46,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Popper.js":{"id":47,"meta":{}},"../strapi-helper-plugin/node_modules/popper.js/dist/umd/popper.js":{"id":48,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Arrow.js":{"id":49,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.tonumber/index.js":{"id":50,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/index.js":{"id":51,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/CSSTransition.js":{"id":52,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/addClass.js":{"id":53,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/hasClass.js":{"id":54,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/removeClass.js":{"id":55,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/TransitionGroup.js":{"id":56,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/utils/ChildMapping.js":{"id":57,"meta":{}},"../strapi-helper-plugin/node_modules/immutable/dist/immutable.js":{"id":58,"meta":{}},"../strapi-helper-plugin/node_modules/lodash/lodash.js":{"id":59,"meta":{}},"./node_modules/webpack/buildin/module.js":{"id":60,"meta":{}}}}
\ No newline at end of file
+{"name":"vendor_lib","content":{"../strapi-helper-plugin/node_modules/react/index.js":{"id":0,"meta":{}},"../strapi-helper-plugin/node_modules/prop-types/index.js":{"id":1,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/emptyFunction.js":{"id":2,"meta":{}},"../strapi-helper-plugin/node_modules/react-dom/index.js":{"id":3,"meta":{}},"../strapi-helper-plugin/node_modules/object-assign/index.js":{"id":4,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/emptyObject.js":{"id":5,"meta":{}},"../strapi-helper-plugin/node_modules/intl-messageformat/src/main.js":{"id":6,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/utils.js":{"id":7,"meta":{"harmonyModule":true},"exports":["hop","extend"]},"./node_modules/webpack/buildin/global.js":{"id":8,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/Transition.js":{"id":9,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/utils/PropTypes.js":{"id":10,"meta":{}},"../strapi-helper-plugin/node_modules/react/cjs/react.production.min.js":{"id":12,"meta":{}},"../strapi-helper-plugin/node_modules/react-dom/cjs/react-dom.production.min.js":{"id":13,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/ExecutionEnvironment.js":{"id":14,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/EventListener.js":{"id":15,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/getActiveElement.js":{"id":16,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/shallowEqual.js":{"id":17,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/containsNode.js":{"id":18,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/isTextNode.js":{"id":19,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/isNode.js":{"id":20,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/focusNode.js":{"id":21,"meta":{}},"../strapi-helper-plugin/node_modules/react-intl/lib/index.es.js":{"id":22,"meta":{"harmonyModule":true},"exports":["addLocaleData","intlShape","injectIntl","defineMessages","IntlProvider","FormattedDate","FormattedTime","FormattedRelative","FormattedNumber","FormattedPlural","FormattedMessage","FormattedHTMLMessage"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/core.js":{"id":24,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/es5.js":{"id":25,"meta":{"harmonyModule":true},"exports":["defineProperty","objCreate"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/compiler.js":{"id":26,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat-parser/src/parser.js":{"id":27,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-messageformat/src/en.js":{"id":28,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/main.js":{"id":29,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/core.js":{"id":30,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/diff.js":{"id":31,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/es5.js":{"id":32,"meta":{"harmonyModule":true},"exports":["defineProperty","objCreate","arrIndexOf","isArray","dateNow"]},"../strapi-helper-plugin/node_modules/intl-relativeformat/src/en.js":{"id":33,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/prop-types/factoryWithThrowingShims.js":{"id":34,"meta":{}},"../strapi-helper-plugin/node_modules/fbjs/lib/invariant.js":{"id":35,"meta":{}},"../strapi-helper-plugin/node_modules/prop-types/lib/ReactPropTypesSecret.js":{"id":36,"meta":{}},"../strapi-helper-plugin/node_modules/invariant/browser.js":{"id":37,"meta":{}},"../strapi-helper-plugin/node_modules/intl-format-cache/src/memoizer.js":{"id":38,"meta":{"harmonyModule":true},"exports":["default"]},"../strapi-helper-plugin/node_modules/intl-format-cache/src/es5.js":{"id":39,"meta":{"harmonyModule":true},"exports":["bind","defineProperty","objCreate"]},"../strapi-helper-plugin/node_modules/reactstrap/dist/reactstrap.es.js":{"id":40,"meta":{"harmonyModule":true},"exports":["Alert","Container","Row","Col","Navbar","NavbarBrand","NavbarToggler","Nav","NavItem","NavDropdown","NavLink","Breadcrumb","BreadcrumbItem","Button","ButtonDropdown","ButtonGroup","ButtonToolbar","Dropdown","DropdownItem","DropdownMenu","DropdownToggle","Fade","Badge","Card","CardLink","CardGroup","CardDeck","CardColumns","CardBody","CardBlock","CardFooter","CardHeader","CardImg","CardImgOverlay","Carousel","UncontrolledCarousel","CarouselControl","CarouselItem","CarouselIndicators","CarouselCaption","CardSubtitle","CardText","CardTitle","Popover","PopoverContent","PopoverBody","PopoverTitle","PopoverHeader","Progress","Modal","ModalHeader","ModalBody","ModalFooter","PopperContent","PopperTargetHelper","Tooltip","Table","ListGroup","Form","FormFeedback","FormGroup","FormText","Input","InputGroup","InputGroupAddon","InputGroupButton","Label","Media","Pagination","PaginationItem","PaginationLink","TabContent","TabPane","Jumbotron","Collapse","ListGroupItem","ListGroupItemText","ListGroupItemHeading","UncontrolledAlert","UncontrolledButtonDropdown","UncontrolledDropdown","UncontrolledNavDropdown","UncontrolledTooltip"]},"../strapi-helper-plugin/node_modules/classnames/index.js":{"id":41,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.isfunction/index.js":{"id":42,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.isobject/index.js":{"id":43,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/react-popper.js":{"id":44,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Manager.js":{"id":45,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Target.js":{"id":46,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Popper.js":{"id":47,"meta":{}},"../strapi-helper-plugin/node_modules/popper.js/dist/umd/popper.js":{"id":48,"meta":{}},"../strapi-helper-plugin/node_modules/react-popper/lib/Arrow.js":{"id":49,"meta":{}},"../strapi-helper-plugin/node_modules/lodash.tonumber/index.js":{"id":50,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/index.js":{"id":51,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/CSSTransition.js":{"id":52,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/addClass.js":{"id":53,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/hasClass.js":{"id":54,"meta":{}},"../strapi-helper-plugin/node_modules/dom-helpers/class/removeClass.js":{"id":55,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/TransitionGroup.js":{"id":56,"meta":{}},"../strapi-helper-plugin/node_modules/react-transition-group/utils/ChildMapping.js":{"id":57,"meta":{}},"../strapi-helper-plugin/node_modules/immutable/dist/immutable.js":{"id":58,"meta":{}},"../strapi-helper-plugin/node_modules/lodash/lodash.js":{"id":59,"meta":{}},"./node_modules/webpack/buildin/module.js":{"id":60,"meta":{}}}}
\ No newline at end of file
diff --git a/packages/strapi-helper-plugin/lib/src/components/Button/styles.scss b/packages/strapi-helper-plugin/lib/src/components/Button/styles.scss
index 4e3bc6daad..64cc96ecea 100755
--- a/packages/strapi-helper-plugin/lib/src/components/Button/styles.scss
+++ b/packages/strapi-helper-plugin/lib/src/components/Button/styles.scss
@@ -74,7 +74,6 @@
   &:active {
    box-shadow: inset 1px 1px 3px rgba(0,0,0,.15);
  }
- padding-top: 4px;
  padding-left: 1.6rem;
  padding-right: 1.6rem;
  &:before {
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index 86f39af7da..0356374c77 100755
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -83,7 +83,7 @@
     "node-sass": "^4.5.3",
     "null-loader": "^0.1.1",
     "plop": "^1.8.0",
-    "postcss-cssnext": "^3.0.2",
+    "postcss-cssnext": "^2.11.0",
     "postcss-focus": "^2.0.0",
     "postcss-loader": "^2.0.6",
     "postcss-reporter": "^5.0.0",
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 37f0dfd6f8..bf22bc44cd 100755
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -54,12 +54,12 @@
     "eslint": "^4.11.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-config-airbnb-base": "^11.3.2",
-    "eslint-config-prettier": "^2.7.0",
+    "eslint-config-prettier": "^2.8.0",
     "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-plugin-babel": "^4.1.2",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-react": "^7.5.1",
     "eslint-plugin-redux-saga": "^0.4.0",
     "plop": "^1.9.0",
     "prettier": "^1.8.2",
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index 0947b4c889..6f9c27ed55 100755
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -41,12 +41,12 @@
     "eslint": "^4.11.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-config-airbnb-base": "^11.3.2",
-    "eslint-config-prettier": "^2.7.0",
+    "eslint-config-prettier": "^2.8.0",
     "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-plugin-babel": "^4.1.2",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-react": "^7.5.1",
     "eslint-plugin-redux-saga": "^0.4.0",
     "plop": "^1.9.0",
     "prettier": "^1.8.2",
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index 493667f231..750cd3f071 100755
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -38,12 +38,12 @@
     "eslint": "^4.11.0",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-config-airbnb-base": "^11.3.2",
-    "eslint-config-prettier": "^2.7.0",
+    "eslint-config-prettier": "^2.8.0",
     "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-plugin-babel": "^4.1.2",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-react": "^7.5.1",
     "eslint-plugin-redux-saga": "^0.4.0",
     "plop": "^1.9.0",
     "prettier": "^1.8.2",

From 015405df0d97e3feb735ce47a18508a8a7dea3a6 Mon Sep 17 00:00:00 2001
From: Jim LAURIE <j.laurie6993@gmail.com>
Date: Thu, 7 Dec 2017 16:31:44 +0100
Subject: [PATCH 2/7] Delete plugins.json file admin

---
 .../admin/src/config/plugins.json             | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 packages/strapi-admin/admin/src/config/plugins.json

diff --git a/packages/strapi-admin/admin/src/config/plugins.json b/packages/strapi-admin/admin/src/config/plugins.json
deleted file mode 100644
index a96e269b84..0000000000
--- a/packages/strapi-admin/admin/src/config/plugins.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "id": "content-manager",
-    "source": {
-      "development": "http://localhost:1337/admin/content-manager/main.js",
-      "production": "http://localhost:1337/admin/content-manager/main.js",
-      "test": "http://localhost:1337/admin/content-manager/main.js"
-    }
-  },
-  {
-    "id": "content-type-builder",
-    "source": {
-      "development": "http://localhost:1337/admin/content-type-builder/main.js",
-      "production": "http://localhost:1337/admin/content-type-builder/main.js",
-      "test": "http://localhost:1337/admin/content-type-builder/main.js"
-    }
-  },
-  {
-    "id": "email",
-    "source": {
-      "development": "http://localhost:1337/admin/email/main.js",
-      "production": "http://localhost:1337/admin/email/main.js",
-      "test": "http://localhost:1337/admin/email/main.js"
-    }
-  },
-  {
-    "id": "settings-manager",
-    "source": {
-      "development": "http://localhost:1337/admin/settings-manager/main.js",
-      "production": "http://localhost:1337/admin/settings-manager/main.js",
-      "test": "http://localhost:1337/admin/settings-manager/main.js"
-    }
-  },
-  {
-    "id": "users-permissions",
-    "source": {
-      "development": "http://localhost:1337/admin/users-permissions/main.js",
-      "production": "http://localhost:1337/admin/users-permissions/main.js",
-      "test": "http://localhost:1337/admin/users-permissions/main.js"
-    }
-  }
-]
\ No newline at end of file

From 4d15c74a21ab0aa0eb51e92148bbffb482d398cd Mon Sep 17 00:00:00 2001
From: cyril lopez <cyril.lpz@gmail.com>
Date: Thu, 7 Dec 2017 16:53:30 +0100
Subject: [PATCH 3/7] Fix feedback PR

---
 .../admin/src/requirements.js                 |  2 +-
 .../admin/src/components/BoundRoute/index.js  | 21 +------
 .../src/components/BoundRoute/styles.scss     | 16 +++++
 .../admin/src/containers/AuthPage/saga.js     | 59 ++++++++++---------
 .../config/queries/bookshelf.js               |  8 +--
 5 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/packages/strapi-plugin-settings-manager/admin/src/requirements.js b/packages/strapi-plugin-settings-manager/admin/src/requirements.js
index ad0abf27ef..0206a853fb 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/requirements.js
+++ b/packages/strapi-plugin-settings-manager/admin/src/requirements.js
@@ -10,7 +10,7 @@ const shouldRenderCompo = (plugin) => new Promise((resolve, reject) => {
         blockerComponentIcon: 'fa-refresh',
         blockerComponentContent: 'renderIde',
       };
-      
+
       if (response.environment !== 'development') {
         plugin.preventComponentRendering = true;
         plugin.blockerComponentProps = {
diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/index.js
index 54cbea0e3c..8c447cd7cb 100644
--- a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/index.js
+++ b/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/index.js
@@ -5,28 +5,13 @@
 */
 
 import React from 'react';
-import { get, includes, map, tail } from 'lodash';
+import { get, includes, map, tail, toLower } from 'lodash';
 import { FormattedMessage } from 'react-intl';
 import PropTypes from 'prop-types';
+import cn from 'classnames';
 import styles from './styles.scss';
 
 function BoundRoute({ route }) {
-  let color;
-
-  switch (get(route, 'method')) {
-    case 'GET':
-      color = '#008DFE';
-      break;
-    case 'POST':
-      color = '#69BA05';
-      break;
-    case 'PUT':
-      color = '#F68E0E';
-      break;
-    default:
-      color = '#F64D0A';
-
-  }
   const title = get(route, 'handler');
   const formattedRoute = get(route, 'path') ? tail(get(route, 'path').split('/')) : [];
   const [ controller = '', action = '' ] = title ? title.split('.') : [];
@@ -40,7 +25,7 @@ function BoundRoute({ route }) {
         <span>.{action} </span>
       </div>
       <div className={styles.boundRoute}>
-        <div className={styles.verb} style={{ backgroundColor: color }}>
+        <div className={cn(styles.verb, styles[toLower(get(route, 'method'))])}>
           {get(route, 'method')}
         </div>
         <div className={styles.path}>
diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/styles.scss b/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/styles.scss
index 187ee08fbb..a2f4c992d9 100644
--- a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/styles.scss
+++ b/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/styles.scss
@@ -41,3 +41,19 @@
     font-weight: 600;
   }
 }
+
+.get {
+  background-color: #008DFE;
+}
+
+.post {
+  background-color: #69BA05;
+}
+
+.put {
+  background-color: #F68E0E;
+}
+
+.delete {
+  background-color: #F64D0A;
+}
diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/saga.js b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/saga.js
index 8aa5e7b7aa..5f6ef64c68 100644
--- a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/saga.js
+++ b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/saga.js
@@ -1,4 +1,4 @@
-import { get, includes, set } from 'lodash';
+import { get, includes, isArray, set } from 'lodash';
 import { call, fork, takeLatest, put, select } from 'redux-saga/effects';
 import auth from 'utils/auth';
 import request from 'utils/request';
@@ -42,40 +42,45 @@ export function* submitForm() {
   } catch(error) {
     const formType = yield select(makeSelectFormType());
 
-    const errors = error.response.payload.message.reduce((acc, key) => {
-      const err = key.messages.reduce((acc, key) => {
-        acc.id = `users-permissions.${key.id}`;
+    if (isArray(error.response.payload.message)) {
+
+      const errors = error.response.payload.message.reduce((acc, key) => {
+        const err = key.messages.reduce((acc, key) => {
+          acc.id = `users-permissions.${key.id}`;
+
+          return acc;
+        }, { id: '' });
+
+        acc.push(err);
 
         return acc;
-      }, { id: '' });
+      }, []);
 
-      acc.push(err);
+      let formErrors;
 
-      return acc;
-    }, []);
+      switch (formType) {
+        case 'forgot-password':
+          formErrors = [{ name: 'email', errors }];
+          break;
+        case 'login':
+          formErrors = [{ name: 'identifier', errors }];
+          break;
+        case 'reset-password':
+          formErrors = [{ name: 'password', errors: [{ id: 'users-permissions.Auth.form.error.password.matching' }] }];
+          break;
+        case 'register': {
+          const target = includes(get(errors, ['0', 'id']), 'username') ? 'username' : 'email';
+          formErrors = [{ name: target, errors }];
+          break;
+        }
+        default:
 
-    let formErrors;
-
-    switch (formType) {
-      case 'forgot-password':
-        formErrors = [{ name: 'email', errors }];
-        break;
-      case 'login':
-        formErrors = [{ name: 'identifier', errors }];
-        break;
-      case 'reset-password':
-        formErrors = [{ name: 'password', errors: [{ id: 'users-permissions.Auth.form.error.password.matching' }] }];
-        break;
-      case 'register': {
-        const target = includes(get(errors, ['0', 'id']), 'username') ? 'username' : 'email';
-        formErrors = [{ name: target, errors }];
-        break;
       }
-      default:
 
+      yield put(submitError(formErrors));
+    } else {
+      strapi.notification.error('notification.error');
     }
-
-    yield put(submitError(formErrors));
   }
 }
 
diff --git a/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js b/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js
index 2febbd45bd..a46ceeaf3f 100644
--- a/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js
+++ b/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js
@@ -26,13 +26,13 @@ module.exports = {
   },
 
   findOne: async function (params) {
-    if (_.get(params, 'where._id')) {
-      params.where.id = params.where._id;
-      delete params.where._id;
+    if (_.get(params, '_id')) {
+      params.id = params._id;
+      delete params._id;
     }
 
     const record = await this
-      .forge(params.where)
+      .forge(params)
       .fetch({
         withRelated: this.associations.map(x => x.alias)
       });

From 5b4f91dcff5ec8a3a387d63916d6c2a9fdb9d33b Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Thu, 7 Dec 2017 18:16:15 +0100
Subject: [PATCH 4/7] Fix some PR feedback

---
 packages/strapi-admin/.gitignore                     |  1 -
 packages/strapi-admin/package.json                   |  2 +-
 packages/strapi-plugin-content-manager/package.json  |  2 +-
 .../strapi-plugin-content-type-builder/package.json  |  2 +-
 packages/strapi-plugin-settings-manager/package.json |  2 +-
 .../config/policies/isAuthenticated.js               |  2 +-
 .../config/policies/permissions.js                   |  4 ++--
 .../config/queries/bookshelf.js                      |  2 +-
 .../controllers/Auth.js                              |  3 +--
 .../controllers/User.js                              | 12 +++---------
 .../services/UsersPermissions.js                     |  2 +-
 11 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/packages/strapi-admin/.gitignore b/packages/strapi-admin/.gitignore
index 473efe9e78..afe256bf30 100644
--- a/packages/strapi-admin/.gitignore
+++ b/packages/strapi-admin/.gitignore
@@ -1,7 +1,6 @@
 # Don't check auto-generated stuff into git
 coverage
 node_modules
-build
 stats.json
 package-lock.json
 
diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index d76423a312..e562771ec7 100755
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -44,4 +44,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 9003baf2f1..1f082c006e 100755
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -48,4 +48,4 @@
     "react-select": "^1.0.0-rc.5",
     "strapi-helper-plugin": "3.0.0-alpha.6.7"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index 4a051c9568..9e3bf9d828 100755
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -48,4 +48,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index 8bb67c9d14..fdc60b56aa 100755
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -45,4 +45,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-plugin-users-permissions/config/policies/isAuthenticated.js b/packages/strapi-plugin-users-permissions/config/policies/isAuthenticated.js
index bb2a4db355..dd43630807 100644
--- a/packages/strapi-plugin-users-permissions/config/policies/isAuthenticated.js
+++ b/packages/strapi-plugin-users-permissions/config/policies/isAuthenticated.js
@@ -1,6 +1,6 @@
 module.exports = async (ctx, next) => {
   if (!ctx.state.user) {
-    throw new Error('Authentication is required.');
+    throw new Error('Authentication required.');
   }
 
   await next();
diff --git a/packages/strapi-plugin-users-permissions/config/policies/permissions.js b/packages/strapi-plugin-users-permissions/config/policies/permissions.js
index 4e3ec82fb8..1cba5cddc6 100644
--- a/packages/strapi-plugin-users-permissions/config/policies/permissions.js
+++ b/packages/strapi-plugin-users-permissions/config/policies/permissions.js
@@ -17,7 +17,7 @@ module.exports = async (ctx, next) => {
     }
   }
 
-  const permission = _.get(_.clone(strapi.plugins['users-permissions'].config), [role.toString(), 'permissions', route.plugin || 'application', 'controllers', route.controller, route.action]);
+  const permission = _.get(strapi.plugins['users-permissions'].config, [role.toString(), 'permissions', route.plugin || 'application', 'controllers', route.controller, route.action]);
 
   if (!permission) {
     return await next();
@@ -25,7 +25,7 @@ module.exports = async (ctx, next) => {
 
   if (permission.enabled && permission.policy) {
     try {
-      await require(`./${permission.policy}.js`)(ctx, next);
+      await strapi.plugins['users-permissions'].config.policies[permission.policy](ctx, next);
     } catch (err) {
       ctx.unauthorized(err);
     }
diff --git a/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js b/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js
index a46ceeaf3f..707ce94d47 100644
--- a/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js
+++ b/packages/strapi-plugin-users-permissions/config/queries/bookshelf.js
@@ -99,7 +99,7 @@ module.exports = {
   },
 
   countByRoles: async function () {
-    const result = await strapi.connections[this.connection].raw('SELECT COUNT("id") AS total, "role" FROM "user" GROUP BY "role";');
+    const result = await strapi.connections[this.connection].raw(`SELECT COUNT("id") AS total, "role" FROM "${strapi.plugins['users-permissions'].models.user.collectionName}" GROUP BY "role";`);
     return result.rows.reduce((acc, current) => {
       acc.push({
         _id: parseFloat(current.role),
diff --git a/packages/strapi-plugin-users-permissions/controllers/Auth.js b/packages/strapi-plugin-users-permissions/controllers/Auth.js
index cc9253c79a..5ab1d66e73 100644
--- a/packages/strapi-plugin-users-permissions/controllers/Auth.js
+++ b/packages/strapi-plugin-users-permissions/controllers/Auth.js
@@ -98,8 +98,7 @@ module.exports = {
   },
 
   forgotPassword: async (ctx) => {
-    const email = ctx.request.body.email;
-    const url = ctx.request.body.url;
+    const { email, url } = ctx.request.body;
 
     // Find the user user thanks to his email.
     const user = await strapi.query('user', 'users-permissions').findOne({ email });
diff --git a/packages/strapi-plugin-users-permissions/controllers/User.js b/packages/strapi-plugin-users-permissions/controllers/User.js
index 29cedc56d1..05d9f8a2fc 100644
--- a/packages/strapi-plugin-users-permissions/controllers/User.js
+++ b/packages/strapi-plugin-users-permissions/controllers/User.js
@@ -17,14 +17,8 @@ module.exports = {
    */
 
   find: async (ctx) => {
-    let data = await strapi.plugins['users-permissions'].services.user.fetchAll(ctx.query);
-
-    if (data) {
-      data = _.reduce(data, (acc, user) => {
-        acc.push(_.omit(user.toJSON(), ['password', 'resetPasswordToken']));
-        return acc;
-      }, []);
-    }
+    const data = await strapi.plugins['users-permissions'].services.user.fetchAll(ctx.query)
+      .map(user => _.omit(user.toJSON ? user.toJSON() : user, ['password', 'resetPasswordToken']));
 
     // Send 200 `ok`
     ctx.send(data);
@@ -41,7 +35,7 @@ module.exports = {
     let data = await strapi.plugins['users-permissions'].services.user.fetch(ctx.params);
 
     if (data) {
-      data = _.omit(data.toJSON(), ['password', 'resetPasswordToken']);
+      data = _.omit(data.toJSON ? data.toJSON() : data, ['password', 'resetPasswordToken']);
     }
 
     // Send 200 `ok`
diff --git a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
index 9c61acecf9..701d9470f2 100644
--- a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
+++ b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
@@ -232,7 +232,7 @@ module.exports = {
   },
 
   updateUserRole: async (user, role) => {
-    await strapi.query('user', 'users-permissions').update({
+    strapi.query('user', 'users-permissions').update({
       _id: user._id || user.id,
       role: role.toString()
     });

From b01abf91f16682bd260d582add901cd540050478 Mon Sep 17 00:00:00 2001
From: cyril lopez <cyril.lpz@gmail.com>
Date: Thu, 7 Dec 2017 18:16:18 +0100
Subject: [PATCH 5/7] Add apiRoutes and fix feedback PR

---
 .../admin/src/containers/EditPage/index.js    |  2 +-
 .../controllers/UsersPermissions.js           |  1 -
 .../services/UsersPermissions.js              | 81 +++++++++----------
 3 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/index.js b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/index.js
index aef3b48b3a..621594bc30 100644
--- a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/index.js
+++ b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/index.js
@@ -124,7 +124,7 @@ export class EditPage extends React.Component { // eslint-disable-line react/pre
         disabled: isEqual(this.props.editPage.modifiedData, this.props.editPage.initialData),
       },
     ];
-  
+
     return (
       <div>
         <BackHeader onClick={() => this.props.history.goBack()} />
diff --git a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
index eae76dd1e4..fb9018d53e 100644
--- a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
+++ b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
@@ -100,7 +100,6 @@ module.exports = {
 
       ctx.send({ routes });
     } catch(err) {
-      console.log(err);
       ctx.badRequest(null, [{ messages: [{ id: 'Not found' }] }]);
     }
   },
diff --git a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
index 9c61acecf9..32e9995f8f 100644
--- a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
+++ b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
@@ -4,7 +4,7 @@ const fs = require('fs')
 const path = require('path');
 const stringify = JSON.stringify;
 const _ = require('lodash');
-// const Service = strapi.plugins['users-permissions'].services;
+
 /**
  * UsersPermissions.js service
  *
@@ -14,7 +14,7 @@ const _ = require('lodash');
 module.exports = {
   createRole: (role) => {
     const Service = strapi.plugins['users-permissions'].services.userspermissions;
-    const appRoles = require(Service.getRoleConfigPath());
+    const appRoles = strapi.plugins['users-permissions'].config.roles;
     const highestId = _.last(Object.keys(appRoles).reduce((acc, key) => {
       acc.push(_.toNumber(key));
 
@@ -34,7 +34,7 @@ module.exports = {
 
   deleteRole: async (roleId) => {
     const Service = strapi.plugins['users-permissions'].services.userspermissions;
-    const appRoles = require(Service.getRoleConfigPath());
+    const appRoles = strapi.plugins['users-permissions'].config.roles
 
     Service.writePermissions(_.omit(appRoles, [roleId]));
 
@@ -85,7 +85,7 @@ module.exports = {
 
   getRole: async (roleId) => {
     const Service = strapi.plugins['users-permissions'].services.userspermissions;
-    const appRoles = require(Service.getRoleConfigPath());
+    const appRoles = strapi.plugins['users-permissions'].config.roles
     appRoles[roleId].users = await strapi.query('user', 'users-permissions').find(strapi.utils.models.convertParams('user', { role: roleId }));
 
     return appRoles[roleId];
@@ -93,7 +93,7 @@ module.exports = {
 
   getRoles: async () => {
     const Service = strapi.plugins['users-permissions'].services.userspermissions;
-    const roles = require(Service.getRoleConfigPath());
+    const roles = strapi.plugins['users-permissions'].config.roles
     const usersCount = await strapi.query('user', 'users-permissions').countByRoles();
     const formattedRoles = Object.keys(roles).reduce((acc, key) => {
       const role = _.pick(roles[key], ['name', 'description']);
@@ -109,11 +109,17 @@ module.exports = {
   },
 
   getRoutes: async () => {
-    return Object.keys(strapi.plugins).reduce((acc, current) => {
+    const apiRoutes = Object.keys(strapi.api).reduce((acc, current) => {
+      return acc.concat(strapi.api[current].config.routes);
+    }, []);
+
+    const pluginsRoutes = Object.keys(strapi.plugins).reduce((acc, current) => {
       acc[current] = strapi.plugins[current].config.routes;
 
       return acc;
-    }, {});
+    }, []);
+
+    return _.merge({ application: apiRoutes}, pluginsRoutes);
   },
 
   getRoleConfigPath: () => (
@@ -144,17 +150,15 @@ module.exports = {
               if (!_.get(dataToCompare, [pluginName, 'controllers', controllerName, actionName])) {
                 _.unset(data, [roleId, 'permissions', pluginName, 'controllers', controllerName, actionName]);
               }
-            } else {
-              if (!_.get(data, [roleId, 'permissions', pluginName, 'controllers', controllerName, actionName])) {
-                const isCallback = actionName === 'callback' && controllerName === 'auth' && pluginName === 'users-permissions' && roleId === '1';
-                const isRegister = actionName === 'register' && controllerName === 'auth' && pluginName === 'users-permissions' && roleId === '1';
-                const isPassword = actionName === 'forgotPassword' && controllerName === 'auth' && pluginName === 'users-permissions' && roleId === '1';
-                const isNewPassword = actionName === 'changePassword-password' && controllerName === 'auth' && pluginName === 'users-permissions' && roleId === '1';
-                const isInit = actionName === 'init' && controllerName === 'userspermissions';
-                const enabled = isCallback || isRegister || roleId === '0' || isInit || isPassword || isNewPassword;
+            } else if (!_.get(data, [roleId, 'permissions', pluginName, 'controllers', controllerName, actionName])) {
+              const isCallback = actionName === 'callback' && controllerName === 'auth' && pluginName === 'users-permissions' && roleId === '1';
+              const isRegister = actionName === 'register' && controllerName === 'auth' && pluginName === 'users-permissions' && roleId === '1';
+              const isPassword = actionName === 'forgotPassword' && controllerName === 'auth' && pluginName === 'users-permissions' && roleId === '1';
+              const isNewPassword = actionName === 'changePassword-password' && controllerName === 'auth' && pluginName === 'users-permissions' && roleId === '1';
+              const isInit = actionName === 'init' && controllerName === 'userspermissions';
+              const enabled = isCallback || isRegister || roleId === '0' || isInit || isPassword || isNewPassword;
 
-                _.set(data, [roleId, 'permissions', pluginName, 'controllers', controllerName, actionName], { enabled, policy: '' })
-              }
+              _.set(data, [roleId, 'permissions', pluginName, 'controllers', controllerName, actionName], { enabled, policy: '' })
             }
           });
         });
@@ -167,34 +171,27 @@ module.exports = {
   updatePermissions: async (cb) => {
     const Service = strapi.plugins['users-permissions'].services.userspermissions;
     const appActions = Service.getActions();
-    const roleConfigPath = Service.getRoleConfigPath();
     const writePermissions = Service.writePermissions;
-    let currentRoles;
-
-    try {
-      currentRoles = require(roleConfigPath);
-    } catch(err) {
-      currentRoles = {
-        '0': {
-          description: '',
-          name: 'Administrator',
-          permissions: {
-            application: {
-              controllers: {},
-            },
+    const currentRoles = strapi.plugins['users-permissions'].config.roles || {
+      '0': {
+        description: '',
+        name: 'Administrator',
+        permissions: {
+          application: {
+            controllers: {},
           },
         },
-        '1': {
-          description: '',
-          name: 'Guest',
-          permissions: {
-            application: {
-              controllers: {},
-            },
+      },
+      '1': {
+        description: '',
+        name: 'Guest',
+        permissions: {
+          application: {
+            controllers: {},
           },
         },
-      };
-    }
+      },
+    };
 
     const remove = await Service.updateData(_.cloneDeep(currentRoles));
     const added = await Service.updateData(_.cloneDeep(remove), 'set');
@@ -210,7 +207,7 @@ module.exports = {
 
   updateRole: async (roleId, body) => {
     const Service = strapi.plugins['users-permissions'].services.userspermissions;
-    const appRoles = require(Service.getRoleConfigPath());
+    const appRoles = strapi.plugins['users-permissions'].config.roles
     const updatedRole = _.pick(body, ['name', 'description', 'permissions']);
     _.set(appRoles, [roleId], updatedRole);
 
@@ -242,7 +239,7 @@ module.exports = {
     const roleConfigPath = strapi.plugins['users-permissions'].services.userspermissions.getRoleConfigPath();
 
     try {
-      fs.writeFileSync(roleConfigPath, stringify(data, null, 2), 'utf8');
+      fs.writeFileSync(roleConfigPath, stringify({ roles: data }, null, 2), 'utf8');
     } catch(err) {
       strapi.log.error(err);
     }

From 8d6cace46946c78b57fd5fa9d131c25e8a2e0ead Mon Sep 17 00:00:00 2001
From: cyril lopez <cyril.lpz@gmail.com>
Date: Thu, 7 Dec 2017 18:31:19 +0100
Subject: [PATCH 6/7] Refacto InputSearch

---
 .../admin/src/components/InputSearch/index.js               | 6 +-----
 .../controllers/UsersPermissions.js                         | 1 +
 .../services/UsersPermissions.js                            | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/index.js
index 28823a032f..6ecd3170ef 100644
--- a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/index.js
+++ b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/index.js
@@ -41,11 +41,7 @@ class InputSearch extends React.Component { // eslint-disable-line react/prefer-
   handleChange = ({ target }) => {
     const filteredUsers = isEmpty(target.value) ?
       this.state.users
-      : this.state.users.filter((user) => {
-        if (includes(toLower(user.name), toLower(target.value))) {
-          return user;
-        }
-      });
+      : this.state.users.filter((user) => includes(toLower(user.name), toLower(target.value)));
 
     if (isEmpty(filteredUsers) && !isEmpty(target.value)) {
       this.props.getUser(target.value);
diff --git a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
index fb9018d53e..b07d0cf54a 100644
--- a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
+++ b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
@@ -90,6 +90,7 @@ module.exports = {
 
       ctx.send({ roles });
     } catch(err) {
+      console.log(err);
       ctx.badRequest(null, [{ messages: [{ id: 'Not found' }] }]);
     }
   },
diff --git a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
index 32e9995f8f..b5ce8d8224 100644
--- a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
+++ b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
@@ -93,7 +93,7 @@ module.exports = {
 
   getRoles: async () => {
     const Service = strapi.plugins['users-permissions'].services.userspermissions;
-    const roles = strapi.plugins['users-permissions'].config.roles
+    const roles = strapi.plugins['users-permissions'].config.roles;
     const usersCount = await strapi.query('user', 'users-permissions').countByRoles();
     const formattedRoles = Object.keys(roles).reduce((acc, key) => {
       const role = _.pick(roles[key], ['name', 'description']);

From f471a98f90778a1fd9b12308da321bbdacb9c93f Mon Sep 17 00:00:00 2001
From: cyril lopez <cyril.lpz@gmail.com>
Date: Thu, 7 Dec 2017 18:40:55 +0100
Subject: [PATCH 7/7] Fix manage user role bookshelf

---
 .../services/UsersPermissions.js                             | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
index b5ce8d8224..2d849ed04b 100644
--- a/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
+++ b/packages/strapi-plugin-users-permissions/services/UsersPermissions.js
@@ -216,9 +216,8 @@ module.exports = {
     const currentUsers = await strapi.query('user', 'users-permissions').find(strapi.utils.models.convertParams('user', {
       role: roleId
     }));
-
-    const userToAdd = _.differenceBy(body.users, currentUsers, 'id');
-    const userToRemove = _.differenceBy(currentUsers, body.users, 'id');
+    const userToAdd = _.differenceBy(body.users, currentUsers.toJSON ? currentUsers.toJSON() : currentUsers, 'id');
+    const userToRemove = _.differenceBy(currentUsers.toJSON ? currentUsers.toJSON() : currentUsers, body.users, 'id');
 
     _.forEach(userToAdd, (user) => {
       Service.updateUserRole(user, roleId);