diff --git a/controllers/Admin.js b/controllers/Admin.js index f104130de4..76e8047479 100644 --- a/controllers/Admin.js +++ b/controllers/Admin.js @@ -37,7 +37,7 @@ module.exports = { parsedHTML('body').append(pluginVendorScript); } }); - + // Finally, send the HTML file with injected scripts this.body = parsedHTML.html(); }, diff --git a/package.json b/package.json new file mode 100644 index 0000000000..3fe49be4ef --- /dev/null +++ b/package.json @@ -0,0 +1,22 @@ +{ + "name": "strapi-settings-manager", + "version": "0.0.0", + "description": "Strapi Settings Manager", + "repository": { + "type": "git", + "url": "git://github.com/strapi/strapi-admin.git" + }, + "engines": { + "npm": ">=3" + }, + "author": "Strapi", + "license": "MIT", + "scripts": { + "lint:admin": "cd public && npm run lint:eslint" + }, + "pre-commit": ["lint:admin"], + "dependencies": {}, + "devDependencies": { + "pre-commit": "^1.1.3" + } +} diff --git a/public/app/containers/PluginPage/index.js b/public/app/containers/PluginPage/index.js index cd95542f33..b569386a41 100644 --- a/public/app/containers/PluginPage/index.js +++ b/public/app/containers/PluginPage/index.js @@ -12,7 +12,6 @@ import { selectPlugins } from 'containers/App/selectors'; export class PluginPage extends React.Component { // eslint-disable-line react/prefer-stateless-function render() { - // Init variables let content; @@ -36,6 +35,10 @@ export class PluginPage extends React.Component { // eslint-disable-line react/p } } +PluginPage.propTypes = { + plugins: React.PropTypes.object, +}; + const mapStateToProps = createSelector( selectPlugins(), (plugins) => ({ plugins }) diff --git a/public/package.json b/public/package.json index 5bb2b7dd83..8d2563309d 100644 --- a/public/package.json +++ b/public/package.json @@ -2,14 +2,11 @@ "name": "react-boilerplate", "version": "3.1.0", "description": "A highly scalable, offline-first foundation with the best DX and a focus on performance and best practices", - "repository": { - "type": "git", - "url": "git://github.com/mxstbr/react-boilerplate.git" - }, + "private": true, "engines": { "npm": ">=3" }, - "author": "Max Stoiber", + "author": "Strapi", "license": "MIT", "scripts": { "analyze:clean": "rimraf stats.json",