From 769200f60f934eb5d512bfc385ee6f03aa786ed0 Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Sat, 16 Dec 2017 13:50:57 +0100 Subject: [PATCH 01/10] Add icons to list plugins --- .../admin/src/components/Row/index.js | 32 +++++++++++++++++-- .../admin/src/components/Row/styles.scss | 20 ++++++++++++ packages/strapi-bookshelf/package.json | 2 +- packages/strapi-ejs/package.json | 2 +- packages/strapi-generate-api/package.json | 2 +- .../strapi-generate-controller/package.json | 2 +- packages/strapi-generate-model/package.json | 2 +- packages/strapi-generate-new/package.json | 2 +- packages/strapi-generate-plugin/package.json | 2 +- packages/strapi-generate-policy/package.json | 2 +- packages/strapi-generate-service/package.json | 2 +- 11 files changed, 58 insertions(+), 12 deletions(-) diff --git a/packages/strapi-admin/admin/src/components/Row/index.js b/packages/strapi-admin/admin/src/components/Row/index.js index 2701189660..de984fc14e 100644 --- a/packages/strapi-admin/admin/src/components/Row/index.js +++ b/packages/strapi-admin/admin/src/components/Row/index.js @@ -13,6 +13,10 @@ import { FormattedMessage } from 'react-intl'; import Ico from 'components/Ico'; import ListRow from 'components/ListRow'; import PopUpWarning from 'components/PopUpWarning'; +import IconAuth from 'assets/icons/icon_auth-permissions.svg'; +import IconCtb from 'assets/icons/icon_content-type-builder.svg'; +import IconCm from 'assets/icons/icon_content-manager.svg'; +import IconSettings from 'assets/icons/icon_settings-manager.svg'; import styles from './styles.scss'; @@ -30,13 +34,35 @@ class Row extends React.Component { this.props.onDeleteClick(e); } + renderImg = () => { + switch (this.props.plugin.name) { + case 'Auth & Permissions': + return logo; + case 'Content Manager': + return logo; + case 'Settings Manager': + return logo; + case 'Content Type Builder': + return logo; + default: + } + } + render() { + const pluginIcon = this.props.plugin.name !== 'Email' ? ( +
+ {this.renderImg()} +
+ ) : ( +
+ +
+ ); + return (
-
- -
+ {pluginIcon}
{this.props.plugin.name} —  diff --git a/packages/strapi-admin/admin/src/components/Row/styles.scss b/packages/strapi-admin/admin/src/components/Row/styles.scss index 0be22b4610..99b6bf3862 100644 --- a/packages/strapi-admin/admin/src/components/Row/styles.scss +++ b/packages/strapi-admin/admin/src/components/Row/styles.scss @@ -31,3 +31,23 @@ display: flex; justify-content: flex-end; } + +.frame { + width: 70px; + height: 36px; + margin: auto 0; + text-align: center; + border: 1px solid rgba(28,93,231,0.1); + border-radius: 3px; + white-space: nowrap; + > img { + max-height: 36px; + vertical-align: baseline; + } +} + +.helper { + display: inline-block; + height: 100%; + vertical-align: middle; +} diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json index 48a948fec4..a63c20c03b 100755 --- a/packages/strapi-bookshelf/package.json +++ b/packages/strapi-bookshelf/package.json @@ -55,4 +55,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json index eb46cdcf70..54b89d459c 100755 --- a/packages/strapi-ejs/package.json +++ b/packages/strapi-ejs/package.json @@ -46,4 +46,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index 9739e698f4..fca7adfe5f 100755 --- a/packages/strapi-generate-api/package.json +++ b/packages/strapi-generate-api/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json index 15b7db6b45..2ecb92b1a0 100755 --- a/packages/strapi-generate-controller/package.json +++ b/packages/strapi-generate-controller/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index 6079bc6a71..b77f611b6c 100755 --- a/packages/strapi-generate-model/package.json +++ b/packages/strapi-generate-model/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index db840ebf48..a603d75183 100755 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -47,4 +47,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index b4720fff9f..9adf219729 100755 --- a/packages/strapi-generate-plugin/package.json +++ b/packages/strapi-generate-plugin/package.json @@ -44,4 +44,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json index 9e68e494f0..4888efd965 100755 --- a/packages/strapi-generate-policy/package.json +++ b/packages/strapi-generate-policy/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json index 30ebde3fa6..745845dddc 100755 --- a/packages/strapi-generate-service/package.json +++ b/packages/strapi-generate-service/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file From 93c32d17c1e9fb11d20650cc01e07d696ab0c970 Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Sat, 16 Dec 2017 13:56:52 +0100 Subject: [PATCH 02/10] Add plugin icons --- .../admin/src/assets/icons/icon_auth-permissions.svg | 1 + .../strapi-admin/admin/src/assets/icons/icon_content-manager.svg | 1 + .../admin/src/assets/icons/icon_content-type-builder.svg | 1 + .../admin/src/assets/icons/icon_settings-manager.svg | 1 + 4 files changed, 4 insertions(+) create mode 100644 packages/strapi-admin/admin/src/assets/icons/icon_auth-permissions.svg create mode 100755 packages/strapi-admin/admin/src/assets/icons/icon_content-manager.svg create mode 100755 packages/strapi-admin/admin/src/assets/icons/icon_content-type-builder.svg create mode 100755 packages/strapi-admin/admin/src/assets/icons/icon_settings-manager.svg diff --git a/packages/strapi-admin/admin/src/assets/icons/icon_auth-permissions.svg b/packages/strapi-admin/admin/src/assets/icons/icon_auth-permissions.svg new file mode 100644 index 0000000000..c04f87fe51 --- /dev/null +++ b/packages/strapi-admin/admin/src/assets/icons/icon_auth-permissions.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/strapi-admin/admin/src/assets/icons/icon_content-manager.svg b/packages/strapi-admin/admin/src/assets/icons/icon_content-manager.svg new file mode 100755 index 0000000000..ac6161da78 --- /dev/null +++ b/packages/strapi-admin/admin/src/assets/icons/icon_content-manager.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/strapi-admin/admin/src/assets/icons/icon_content-type-builder.svg b/packages/strapi-admin/admin/src/assets/icons/icon_content-type-builder.svg new file mode 100755 index 0000000000..89602f579d --- /dev/null +++ b/packages/strapi-admin/admin/src/assets/icons/icon_content-type-builder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/strapi-admin/admin/src/assets/icons/icon_settings-manager.svg b/packages/strapi-admin/admin/src/assets/icons/icon_settings-manager.svg new file mode 100755 index 0000000000..030f2cdfa0 --- /dev/null +++ b/packages/strapi-admin/admin/src/assets/icons/icon_settings-manager.svg @@ -0,0 +1 @@ + \ No newline at end of file From 86fa933f5ef0473faea2cacd7af1f640b7f8d2b8 Mon Sep 17 00:00:00 2001 From: Aurelsicoko Date: Fri, 5 Jan 2018 11:45:29 +0100 Subject: [PATCH 03/10] Reorder documentation guide and fix CSS --- docs/3.x.x/en/SUMMARY.md | 4 ++-- .../admin/src/components/LeftMenuLink/styles.scss | 2 +- .../lib/src/components/PopUpWarning/styles.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/3.x.x/en/SUMMARY.md b/docs/3.x.x/en/SUMMARY.md index 4c095d4fc3..ae5b95987f 100644 --- a/docs/3.x.x/en/SUMMARY.md +++ b/docs/3.x.x/en/SUMMARY.md @@ -16,8 +16,10 @@ * [Table of contents](concepts/concepts.md) ### Guides +* [Authentification](guides/authentification.md) * [Configurations](configurations/configurations.md) * [Controllers](guides/controllers.md) +* [Deployment](guides/deployment.md) * [Filters](guides/filters.md) * [Internationalization](guides/i18n.md) * [Models](guides/models.md) @@ -27,8 +29,6 @@ * [Responses](guides/responses.md) * [Routing](guides/routing.md) * [Services](guides/services.md) -* [Authentification](guides/authentification.md) -* [Deployment](guides/deployment.md) ### Plugins * [Quick start](plugins/quick-start.md) diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss b/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss index abe9f1bed4..02551c20af 100755 --- a/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss +++ b/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss @@ -27,7 +27,7 @@ color: #ffffff; font-size: 12px; line-height: 20px; - background: #E78C29; + background: #0097f7; border-radius: 3px; transition: transform .3s ease-in-out; white-space: pre; diff --git a/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/styles.scss b/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/styles.scss index 0a4a508c81..32326c8195 100644 --- a/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/styles.scss +++ b/packages/strapi-helper-plugin/lib/src/components/PopUpWarning/styles.scss @@ -93,7 +93,7 @@ .secondary { // height: 32px !important; color: #F64D0A !important; - border: 0.1rem solid #F64D0A; + border: 0.1rem solid #F64D0A !important; position: relative; border-radius: 3px; overflow: hidden; From cc4973b65bfd03008304a1d1073b73c73720b4bd Mon Sep 17 00:00:00 2001 From: Jim Laurie Date: Fri, 5 Jan 2018 12:10:41 +0100 Subject: [PATCH 04/10] 3.0.0-alpha.7.3 --- package.json | 2 +- packages/strapi-admin/package.json | 6 +++--- packages/strapi-bookshelf/package.json | 6 +++--- packages/strapi-ejs/package.json | 2 +- packages/strapi-generate-admin/package.json | 4 ++-- packages/strapi-generate-api/package.json | 2 +- .../strapi-generate-controller/package.json | 2 +- packages/strapi-generate-model/package.json | 2 +- packages/strapi-generate-new/package.json | 4 ++-- packages/strapi-generate-plugin/package.json | 2 +- packages/strapi-generate-policy/package.json | 2 +- packages/strapi-generate-service/package.json | 2 +- packages/strapi-generate/package.json | 4 ++-- packages/strapi-helper-plugin/package.json | 2 +- packages/strapi-knex/package.json | 2 +- packages/strapi-middleware-views/package.json | 2 +- packages/strapi-mongoose/package.json | 4 ++-- .../strapi-plugin-content-manager/package.json | 4 ++-- .../package.json | 8 ++++---- packages/strapi-plugin-email/package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- packages/strapi-redis/package.json | 4 ++-- packages/strapi-utils/package.json | 2 +- packages/strapi/package.json | 18 +++++++++--------- 25 files changed, 49 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index af438ee58d..8857a1c4a5 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "devDependencies": { "assert": "~1.3.0", "babel-eslint": "^6.1.2", diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index e973d0bbd7..1b2c1a4e61 100755 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-admin", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Strapi Admin", "repository": { "type": "git", @@ -26,8 +26,8 @@ "devDependencies": { "sanitize.css": "^4.1.0", "shelljs": "^0.7.8", - "strapi-helper-plugin": "3.0.0-alpha.7.2", - "strapi-utils": "3.0.0-alpha.7.2" + "strapi-helper-plugin": "3.0.0-alpha.7.3", + "strapi-utils": "3.0.0-alpha.7.3" }, "author": { "name": "Strapi", diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json index a63c20c03b..26c2ea11f0 100755 --- a/packages/strapi-bookshelf/package.json +++ b/packages/strapi-bookshelf/package.json @@ -1,6 +1,6 @@ { "name": "strapi-bookshelf", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Bookshelf hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -19,8 +19,8 @@ "bookshelf": "^0.10.3", "lodash": "^4.17.4", "pluralize": "^6.0.0", - "strapi-knex": "3.0.0-alpha.7.2", - "strapi-utils": "3.0.0-alpha.7.2" + "strapi-knex": "3.0.0-alpha.7.3", + "strapi-utils": "3.0.0-alpha.7.3" }, "strapi": { "isHook": true, diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json index 54b89d459c..814c265555 100755 --- a/packages/strapi-ejs/package.json +++ b/packages/strapi-ejs/package.json @@ -1,6 +1,6 @@ { "name": "strapi-ejs", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "EJS hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json index c18a692e16..b54a26cc5f 100755 --- a/packages/strapi-generate-admin/package.json +++ b/packages/strapi-generate-admin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-admin", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Generate the default admin panel for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ @@ -15,7 +15,7 @@ "dependencies": { "fs-extra": "^4.0.1", "lodash": "^4.17.4", - "strapi-admin": "3.0.0-alpha.7.2" + "strapi-admin": "3.0.0-alpha.7.3" }, "author": { "email": "hi@strapi.io", diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index fca7adfe5f..2c9b991edb 100755 --- a/packages/strapi-generate-api/package.json +++ b/packages/strapi-generate-api/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-api", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Generate an API for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json index 2ecb92b1a0..4fc8537942 100755 --- a/packages/strapi-generate-controller/package.json +++ b/packages/strapi-generate-controller/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-controller", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Generate a controller for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index b77f611b6c..aecac3593e 100755 --- a/packages/strapi-generate-model/package.json +++ b/packages/strapi-generate-model/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-model", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Generate a model for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index a603d75183..f3e76de9fe 100755 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-new", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Generate a new Strapi application.", "homepage": "http://strapi.io", "keywords": [ @@ -17,7 +17,7 @@ "fs-extra": "^4.0.0", "get-installed-path": "^3.0.1", "lodash": "^4.17.4", - "strapi-utils": "3.0.0-alpha.7.2", + "strapi-utils": "3.0.0-alpha.7.3", "uuid": "^3.1.0" }, "scripts": { diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index 9adf219729..4d88678b9a 100755 --- a/packages/strapi-generate-plugin/package.json +++ b/packages/strapi-generate-plugin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-plugin", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Generate an plugin for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json index 4888efd965..de08e9f1fc 100755 --- a/packages/strapi-generate-policy/package.json +++ b/packages/strapi-generate-policy/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-policy", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Generate a policy for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json index 745845dddc..64bf12f389 100755 --- a/packages/strapi-generate-service/package.json +++ b/packages/strapi-generate-service/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-service", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Generate a service for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json index c02b3f3617..e914ea3467 100755 --- a/packages/strapi-generate/package.json +++ b/packages/strapi-generate/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Master of ceremonies for the Strapi generators.", "homepage": "http://strapi.io", "keywords": [ @@ -17,7 +17,7 @@ "fs-extra": "^4.0.0", "lodash": "^4.17.4", "reportback": "^2.0.1", - "strapi-utils": "3.0.0-alpha.7.2" + "strapi-utils": "3.0.0-alpha.7.3" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index 4854065810..43be87607a 100755 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-helper-plugin", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Helper for Strapi plugins development", "engines": { "node": ">= 8.0.0", diff --git a/packages/strapi-knex/package.json b/packages/strapi-knex/package.json index 345e619ff6..2fcce9ebfc 100755 --- a/packages/strapi-knex/package.json +++ b/packages/strapi-knex/package.json @@ -1,6 +1,6 @@ { "name": "strapi-knex", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Knex hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json index e6f2990644..ba311928f6 100755 --- a/packages/strapi-middleware-views/package.json +++ b/packages/strapi-middleware-views/package.json @@ -1,6 +1,6 @@ { "name": "strapi-middleware-views", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Views hook to enable server-side rendering for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json index 637157de21..3679d37897 100755 --- a/packages/strapi-mongoose/package.json +++ b/packages/strapi-mongoose/package.json @@ -1,6 +1,6 @@ { "name": "strapi-mongoose", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Mongoose hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -20,7 +20,7 @@ "mongoose-double": "0.0.1", "mongoose-float": "^1.0.2", "pluralize": "^6.0.0", - "strapi-utils": "3.0.0-alpha.7.2" + "strapi-utils": "3.0.0-alpha.7.3" }, "strapi": { "isHook": true diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index 1eccd60779..8f2b962c50 100755 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-content-manager", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "A powerful UI to easily manage your data.", "engines": { "node": ">= 8.0.0", @@ -46,6 +46,6 @@ }, "devDependencies": { "react-select": "^1.0.0-rc.5", - "strapi-helper-plugin": "3.0.0-alpha.7.2" + "strapi-helper-plugin": "3.0.0-alpha.7.3" } } \ 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 7ee701eff2..0efeda6297 100755 --- a/packages/strapi-plugin-content-type-builder/package.json +++ b/packages/strapi-plugin-content-type-builder/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-content-type-builder", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Strapi plugin to create content type (API).", "strapi": { "name": "Content Type Builder", @@ -25,11 +25,11 @@ }, "dependencies": { "pluralize": "^7.0.0", - "strapi-generate": "3.0.0-alpha.7.2", - "strapi-generate-api": "3.0.0-alpha.7.2" + "strapi-generate": "3.0.0-alpha.7.3", + "strapi-generate-api": "3.0.0-alpha.7.3" }, "devDependencies": { - "strapi-helper-plugin": "3.0.0-alpha.7.2" + "strapi-helper-plugin": "3.0.0-alpha.7.3" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json index 231c0e0e97..02994be080 100644 --- a/packages/strapi-plugin-email/package.json +++ b/packages/strapi-plugin-email/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-email", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "This is the description of the plugin.", "strapi": { "name": "Email", @@ -27,7 +27,7 @@ "sendmail": "^1.2.0" }, "devDependencies": { - "strapi-helper-plugin": "3.0.0-alpha.7.2" + "strapi-helper-plugin": "3.0.0-alpha.7.3" }, "author": { "name": "A Strapi developer", diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json index 76207c10b1..92805a489b 100755 --- a/packages/strapi-plugin-settings-manager/package.json +++ b/packages/strapi-plugin-settings-manager/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-settings-manager", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Strapi plugin to manage settings.", "strapi": { "name": "Settings Manager", @@ -26,7 +26,7 @@ "devDependencies": { "flag-icon-css": "^2.8.0", "react-select": "^1.0.0-rc.5", - "strapi-helper-plugin": "3.0.0-alpha.7.2" + "strapi-helper-plugin": "3.0.0-alpha.7.3" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index 4cab216ce5..5f557e9fbe 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-users-permissions", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "This is the description of the plugin.", "strapi": { "name": "Auth & Permissions", @@ -29,7 +29,7 @@ "uuid": "^3.1.0" }, "devDependencies": { - "strapi-helper-plugin": "3.0.0-alpha.7.2" + "strapi-helper-plugin": "3.0.0-alpha.7.3" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-redis/package.json b/packages/strapi-redis/package.json index d5a0358e76..c08e3f2444 100755 --- a/packages/strapi-redis/package.json +++ b/packages/strapi-redis/package.json @@ -1,6 +1,6 @@ { "name": "strapi-redis", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Redis hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -18,7 +18,7 @@ "ioredis": "^3.1.2", "lodash": "^4.17.4", "stack-trace": "0.0.10", - "strapi-utils": "3.0.0-alpha.7.2" + "strapi-utils": "3.0.0-alpha.7.3" }, "strapi": { "isHook": true diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json index 3ac566dc60..bffb7cc9c0 100755 --- a/packages/strapi-utils/package.json +++ b/packages/strapi-utils/package.json @@ -1,6 +1,6 @@ { "name": "strapi-utils", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "Shared utilities for the Strapi packages", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi/package.json b/packages/strapi/package.json index ba27b58726..d4fd8c0c4b 100755 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -1,6 +1,6 @@ { "name": "strapi", - "version": "3.0.0-alpha.7.2", + "version": "3.0.0-alpha.7.3", "description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.", "homepage": "http://strapi.io", "keywords": [ @@ -55,14 +55,14 @@ "rimraf": "^2.6.2", "semver": "^5.4.1", "stack-trace": "0.0.10", - "strapi-generate": "3.0.0-alpha.7.2", - "strapi-generate-admin": "3.0.0-alpha.7.2", - "strapi-generate-api": "3.0.0-alpha.7.2", - "strapi-generate-new": "3.0.0-alpha.7.2", - "strapi-generate-plugin": "3.0.0-alpha.7.2", - "strapi-generate-policy": "3.0.0-alpha.7.2", - "strapi-generate-service": "3.0.0-alpha.7.2", - "strapi-utils": "3.0.0-alpha.7.2" + "strapi-generate": "3.0.0-alpha.7.3", + "strapi-generate-admin": "3.0.0-alpha.7.3", + "strapi-generate-api": "3.0.0-alpha.7.3", + "strapi-generate-new": "3.0.0-alpha.7.3", + "strapi-generate-plugin": "3.0.0-alpha.7.3", + "strapi-generate-policy": "3.0.0-alpha.7.3", + "strapi-generate-service": "3.0.0-alpha.7.3", + "strapi-utils": "3.0.0-alpha.7.3" }, "author": { "email": "hi@strapi.io", From 565cfda087a4cde782981a232f58e632a5ce50d1 Mon Sep 17 00:00:00 2001 From: Aurelsicoko Date: Fri, 5 Jan 2018 17:17:58 +0100 Subject: [PATCH 05/10] Make exception for Yarn to find the package in the right folder --- packages/strapi-generate/lib/target.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/strapi-generate/lib/target.js b/packages/strapi-generate/lib/target.js index 8cecbdad1b..bf97af252e 100755 --- a/packages/strapi-generate/lib/target.js +++ b/packages/strapi-generate/lib/target.js @@ -233,7 +233,11 @@ function parseTarget(target, scope, cb) { // try requiring `strapi-generate-` to get the core generator. if (!subGenerator && !module.match(/^strapi-generate-/)) { try { - subGenerator = require(path.resolve(process.mainModule.paths[1], 'strapi-generate-' + module)); + if (process.mainModule.filename.indexOf('yarn') !== -1) { + subGenerator = require(path.resolve(process.mainModule.paths[2], 'strapi-generate-' + module)); + } else { + subGenerator = require(path.resolve(process.mainModule.paths[1], 'strapi-generate-' + module)); + } } catch (e1) { requireError = e1; } From c4763d173fbf356d7370029ab52bd3ecc9e2b2ab Mon Sep 17 00:00:00 2001 From: Aurelsicoko Date: Fri, 5 Jan 2018 18:09:18 +0100 Subject: [PATCH 06/10] Add exception for Yarn to copy/paste the .gitignore file in each plugin --- packages/strapi/bin/strapi-install.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/strapi/bin/strapi-install.js b/packages/strapi/bin/strapi-install.js index 91b8f3da77..94b4d901e9 100755 --- a/packages/strapi/bin/strapi-install.js +++ b/packages/strapi/bin/strapi-install.js @@ -77,7 +77,11 @@ module.exports = function (plugin, cliArguments) { fs.accessSync(path.join(pluginPath, '.gitignore')) } catch (err) { if (err.code === 'ENOENT') { - fs.copySync(path.resolve(__dirname, '..', 'node_modules', 'strapi-generate-plugin', 'templates', 'gitignore'), path.join(pluginPath, '.gitignore')); + if (process.mainModule.filename.indexOf('yarn') !== -1) { + fs.copySync(path.resolve(__dirname, '..', '..', 'strapi-generate-plugin', 'templates', 'gitignore'), path.join(pluginPath, '.gitignore')); + } else { + fs.copySync(path.resolve(__dirname, '..', 'node_modules', 'strapi-generate-plugin', 'templates', 'gitignore'), path.join(pluginPath, '.gitignore')); + } } } From ee5a72af8943e6fe3e63f070f6db650da2159245 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 7 Jan 2018 05:25:00 +0600 Subject: [PATCH 07/10] SSL option for strapi-knex connections was appended. This is necessary for ssl-only remote DB services e.g. heroku-postgres --- packages/strapi-knex/lib/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/strapi-knex/lib/index.js b/packages/strapi-knex/lib/index.js index 99ec212935..c0c8a10d35 100755 --- a/packages/strapi-knex/lib/index.js +++ b/packages/strapi-knex/lib/index.js @@ -95,7 +95,9 @@ module.exports = strapi => { charset: _.get(connection.settings, 'charset'), schema: _.get(connection.settings, 'schema') || 'public', port: _.get(connection.settings, 'port'), - socket: _.get(connection.settings, 'socketPath') + socket: _.get(connection.settings, 'socketPath'), + ssl: _.get(connection.settings, 'ssl') || false + }, debug: _.get(connection.options, 'debug') || false, acquireConnectionTimeout: _.get(connection.options, 'acquireConnectionTimeout'), From 10db375825e3b944e791338de5ae61995f38d3dc Mon Sep 17 00:00:00 2001 From: Aurelsicoko Date: Mon, 8 Jan 2018 12:10:48 +0100 Subject: [PATCH 08/10] Fix #379 - Support one-way relationship --- packages/strapi-admin/package.json | 2 +- packages/strapi-bookshelf/package.json | 2 +- packages/strapi-knex/package.json | 2 +- packages/strapi-mongoose/lib/index.js | 2 +- .../admin/src/components/EditFormRelations/index.js | 1 + .../strapi-plugin-content-manager/config/queries/bookshelf.js | 4 ++++ .../strapi-plugin-content-manager/config/queries/mongoose.js | 4 ++++ .../controllers/ContentManager.js | 1 - packages/strapi-plugin-content-manager/package.json | 2 +- packages/strapi-plugin-content-type-builder/package.json | 2 +- packages/strapi-plugin-email/package.json | 2 +- packages/strapi-plugin-settings-manager/package.json | 2 +- packages/strapi-plugin-users-permissions/package.json | 2 +- 13 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index e973d0bbd7..2c986ce6bb 100755 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -46,4 +46,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json index a63c20c03b..48a948fec4 100755 --- a/packages/strapi-bookshelf/package.json +++ b/packages/strapi-bookshelf/package.json @@ -55,4 +55,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-knex/package.json b/packages/strapi-knex/package.json index 345e619ff6..2b58627503 100755 --- a/packages/strapi-knex/package.json +++ b/packages/strapi-knex/package.json @@ -46,4 +46,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-mongoose/lib/index.js b/packages/strapi-mongoose/lib/index.js index 33f35ee269..31c04e4f69 100755 --- a/packages/strapi-mongoose/lib/index.js +++ b/packages/strapi-mongoose/lib/index.js @@ -251,7 +251,7 @@ module.exports = function (strapi) { const FK = _.find(definition.associations, {alias: name}); const ref = details.plugin ? strapi.plugins[details.plugin].models[details.model].globalId : strapi.models[details.model].globalId; - if (FK && FK.nature !== 'oneToOne' && FK.nature !== 'manyToOne') { + if (FK && FK.nature !== 'oneToOne' && FK.nature !== 'manyToOne' && FK.nature !== 'oneWay') { definition.loadedModel[name] = { type: 'virtual', ref, diff --git a/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js b/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js index aaa820c25d..9d3bdcffca 100755 --- a/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js @@ -35,6 +35,7 @@ class EditFormRelations extends React.Component { // eslint-disable-line react/p const relations = map(currentSchema.relations, (relation, i) => { switch (relation.nature) { + case 'oneWay': case 'oneToOne': case 'manyToOne': if (relation.dominant) { diff --git a/packages/strapi-plugin-content-manager/config/queries/bookshelf.js b/packages/strapi-plugin-content-manager/config/queries/bookshelf.js index 3aee7e3f79..512b3f32ee 100755 --- a/packages/strapi-plugin-content-manager/config/queries/bookshelf.js +++ b/packages/strapi-plugin-content-manager/config/queries/bookshelf.js @@ -77,6 +77,10 @@ module.exports = { acc[current] = params.values[current]; } else { switch (association.nature) { + case 'oneWay': + acc[current] = _.get(params.values[current], this.primaryKey, params.values[current]) || null; + + break; case 'oneToOne': if (response[current] !== params.values[current]) { const value = _.isNull(params.values[current]) ? response[current] : params.values; diff --git a/packages/strapi-plugin-content-manager/config/queries/mongoose.js b/packages/strapi-plugin-content-manager/config/queries/mongoose.js index 19a12a9767..0735ba5456 100755 --- a/packages/strapi-plugin-content-manager/config/queries/mongoose.js +++ b/packages/strapi-plugin-content-manager/config/queries/mongoose.js @@ -58,6 +58,10 @@ module.exports = { acc[current] = params.values[current]; } else { switch (association.nature) { + case 'oneWay': + acc[current] = _.get(params.values[current], this.primaryKey, params.values[current]) || null; + + break; case 'oneToOne': if (response[current] !== params.values[current]) { const value = _.isNull(params.values[current]) ? response[current] : params.values; diff --git a/packages/strapi-plugin-content-manager/controllers/ContentManager.js b/packages/strapi-plugin-content-manager/controllers/ContentManager.js index 3ee57c5021..df8dbbcb87 100755 --- a/packages/strapi-plugin-content-manager/controllers/ContentManager.js +++ b/packages/strapi-plugin-content-manager/controllers/ContentManager.js @@ -70,7 +70,6 @@ module.exports = { // Create an entry using `queries` system ctx.body = await strapi.plugins['content-manager'].services['contentmanager'].add(ctx.params, ctx.request.body, source); } catch(error) { - console.log(error); ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: error.message, field: error.field }] }] : error.message); } }, diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index 1eccd60779..5717308e72 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.7.2" } -} \ 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 7ee701eff2..7e74c76b46 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-email/package.json b/packages/strapi-plugin-email/package.json index 231c0e0e97..d7c731aaaa 100644 --- a/packages/strapi-plugin-email/package.json +++ b/packages/strapi-plugin-email/package.json @@ -46,4 +46,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 76207c10b1..78613898b7 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/package.json b/packages/strapi-plugin-users-permissions/package.json index 4cab216ce5..a375e17392 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -48,4 +48,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} \ No newline at end of file +} From d27c6d348168ab7d817da76c8ef41099ed98cbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20GEORGET?= Date: Mon, 8 Jan 2018 13:39:31 +0100 Subject: [PATCH 09/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d56496067c..12d7164b79 100755 --- a/README.md +++ b/README.md @@ -82,4 +82,4 @@ For general help using Strapi, please refer to [the official Strapi documentatio ## License -[MIT License](LICENSE.md) Copyright (c) 2015-2017 [Strapi Solutions](http://strapi.io/). +[MIT License](LICENSE.md) Copyright (c) 2015-2018 [Strapi Solutions](http://strapi.io/). From fd41a77e1181401e3e706bfc9afb6cde10edeb51 Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Mon, 8 Jan 2018 14:15:27 +0100 Subject: [PATCH 10/10] Fix EditRole page InputSearch label --- .../admin/src/components/InputSearch/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 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 08c3465de8..76cd8e19da 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 @@ -6,7 +6,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { findIndex, has, includes, isEmpty, map, toLower, upperFirst } from 'lodash'; +import { findIndex, has, includes, isEmpty, map, toLower } from 'lodash'; import cn from 'classnames'; import PropTypes from 'prop-types'; @@ -77,7 +77,7 @@ class InputSearch extends React.Component { // eslint-disable-line react/prefer- return (