From d66a1f6dd6021b7fe11d998b3fb4fd53e3260616 Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Thu, 21 Sep 2017 14:07:34 +0200 Subject: [PATCH 1/2] Fix design, add dominant when relation many to many --- packages/strapi-admin/package.json | 4 ++-- packages/strapi-generate-admin/package.json | 4 ++-- packages/strapi-generate-new/package.json | 4 ++-- packages/strapi-generate/package.json | 4 ++-- packages/strapi-helper-plugin/package.json | 2 +- packages/strapi-mongoose/package.json | 4 ++-- .../strapi-plugin-content-manager/package.json | 4 ++-- .../src/components/ContentHeader/styles.scss | 4 ++-- .../admin/src/components/Input/styles.scss | 3 +++ .../components/PluginLeftMenuLink/styles.scss | 2 +- .../src/components/PopUpHeaderNavLink/index.js | 2 +- .../admin/src/components/RelationBox/styles.scss | 2 +- .../admin/src/containers/App/sagas.js | 2 +- .../admin/src/containers/Form/actions.js | 1 + .../admin/src/containers/Form/forms.json | 2 +- .../admin/src/containers/Form/index.js | 5 +++++ .../src/containers/Form/utils/setAttribute.js | 1 + .../admin/src/containers/ModelPage/actions.js | 1 + .../package.json | 4 ++-- .../strapi-plugin-settings-manager/package.json | 4 ++-- packages/strapi-utils/package.json | 2 +- packages/strapi/package.json | 16 ++++++++-------- 22 files changed, 44 insertions(+), 33 deletions(-) diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index 0b089932eb..eca539b227 100755 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -46,7 +46,7 @@ "plop": "^1.8.1", "prettier": "^1.7.0", "rimraf": "^2.6.2", - "strapi-helper-plugin": "3.0.0-alpha.5.5", + "strapi-helper-plugin": "file:../strapi-helper-plugin", "webpack": "^3.6.0" }, "author": { @@ -66,4 +66,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json index 35dd814036..73eb0ffa43 100755 --- a/packages/strapi-generate-admin/package.json +++ b/packages/strapi-generate-admin/package.json @@ -15,7 +15,7 @@ "dependencies": { "fs-extra": "^4.0.1", "lodash": "^4.17.4", - "strapi-admin": "3.0.0-alpha.5.5" + "strapi-admin": "file:../strapi-admin" }, "author": { "email": "hi@strapi.io", @@ -41,4 +41,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 b66f01bfa0..c9d2dcdfae 100755 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -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.5.5" + "strapi-utils": "file:../strapi-utils" }, "scripts": { "prepublish": "npm prune" @@ -46,4 +46,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json index 09c7c7f960..9fde8d1dff 100755 --- a/packages/strapi-generate/package.json +++ b/packages/strapi-generate/package.json @@ -17,7 +17,7 @@ "fs-extra": "^4.0.0", "lodash": "^4.17.4", "reportback": "^2.0.1", - "strapi-utils": "3.0.0-alpha.5.5" + "strapi-utils": "file:../strapi-utils" }, "author": { "name": "Strapi team", @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index d6b559dd66..e8e90e91a0 100755 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -110,4 +110,4 @@ "whatwg-fetch": "^2.0.3" }, "devDependencies": {} -} \ No newline at end of file +} diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json index 652d9b14d8..7a3c29c5a0 100755 --- a/packages/strapi-mongoose/package.json +++ b/packages/strapi-mongoose/package.json @@ -20,7 +20,7 @@ "mongoose-double": "0.0.1", "mongoose-float": "^1.0.2", "pluralize": "^6.0.0", - "strapi-utils": "3.0.0-alpha.5.5" + "strapi-utils": "file:../strapi-utils" }, "strapi": { "isHook": true @@ -49,4 +49,4 @@ "npm": ">= 5.3.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 34043aaf6a..6de890dd5e 100755 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -61,7 +61,7 @@ "plop": "^1.8.1", "prettier": "^1.7.0", "rimraf": "^2.6.2", - "strapi-helper-plugin": "3.0.0-alpha.5.5", + "strapi-helper-plugin": "file:../strapi-helper-plugin", "webpack": "^3.6.0" } -} \ No newline at end of file +} diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/styles.scss b/packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/styles.scss index 5bdd9d5eed..1b1ddd2611 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/styles.scss +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ContentHeader/styles.scss @@ -13,9 +13,9 @@ line-height: 2.9rem; font-weight: 600; > i { - margin-top: 1.2rem; + margin-top: 1.1rem; margin-left: 1rem; - font-size: 1.2rem; + font-size: 1.4rem; color: rgba(16,22,34,0.35); cursor: pointer; } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/Input/styles.scss b/packages/strapi-plugin-content-type-builder/admin/src/components/Input/styles.scss index 5125e70456..ff9fd57e06 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/Input/styles.scss +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/Input/styles.scss @@ -97,6 +97,7 @@ color: #9EA7B8; font-family: Lato; font-size: 1.2rem; + font-weight: 400; } } @@ -109,6 +110,7 @@ color: #9EA7B8; font-family: Lato; font-size: 1.2rem; + font-weight: 400; } } @@ -119,6 +121,7 @@ color: #9EA7B8; font-family: Lato; font-size: 1.2rem; + font-weight: 400; } } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/PluginLeftMenuLink/styles.scss b/packages/strapi-plugin-content-type-builder/admin/src/components/PluginLeftMenuLink/styles.scss index 89eace34e9..bf594c4ccb 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/PluginLeftMenuLink/styles.scss +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/PluginLeftMenuLink/styles.scss @@ -42,7 +42,7 @@ li:not(:first-child) { color: #2D3138 !important; > div { > i { - color: #2D3138; + color: #2D3138 !important } } } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpHeaderNavLink/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpHeaderNavLink/index.js index 569faf3fc5..dbb3125946 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpHeaderNavLink/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/PopUpHeaderNavLink/index.js @@ -22,7 +22,7 @@ class PopUpHeaderNavLink extends React.Component { // eslint-disable-line react/ const activeClass = includes(this.props.routePath, this.props.name) ? styles.popUpHeaderNavLink : ''; return ( -
+
); diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationBox/styles.scss b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationBox/styles.scss index b3db0b4649..cbea37a7a4 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationBox/styles.scss +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationBox/styles.scss @@ -40,7 +40,7 @@ .input { > div { > label { - font-weight: 600; + font-weight: 500; } } } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/sagas.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/sagas.js index dd84b2ba98..8a6a4c117d 100755 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/sagas.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/sagas.js @@ -6,7 +6,7 @@ import { modelsFetchSucceeded } from './actions'; export function* deleteContentType(action) { try { if (action.sendRequest) { - const requestUrl = `content-type-builder/models/${action.itemToDelete}`; + const requestUrl = `/content-type-builder/models/${action.itemToDelete}`; yield call(request, requestUrl, { method: 'DELETE' }); } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js index 6ea2bc3100..195a0df92f 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js @@ -151,6 +151,7 @@ export function setAttributeForm(hash) { nature: 'oneToOne', required: false, unique: false, + dominant: false, }), }); const attribute = includes(hash, 'attributerelation') ? attributeRelation : data.attribute; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json index 6df80166df..cabeaa73ee 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json @@ -498,7 +498,7 @@ "type": "checkbox", "value": false, "validations": {}, - "inputDescription": "content-type-builder.orm.attribute.item.uniqueField.description" + "inputDescription": "content-type-builder.form.attribute.item.uniqueField.description" }, { "label": "content-type-builder.form.attribute.item.customColumnName", diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js index fe05895a4f..706d4a7980 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js @@ -381,6 +381,11 @@ export class Form extends React.Component { // eslint-disable-line react/prefer- if (includes(this.props.hash.split('::')[1], 'attribute')) { this.props.changeInputAttribute(target.name, value); + + if (target.name === 'params.nature' && target.value === "manyToMany") { + this.props.changeInputAttribute('params.dominant', true); + } + } else { this.props.changeInput(target.name, value, includes(this.props.hash, 'edit')); } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/utils/setAttribute.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/utils/setAttribute.js index 5a173a886b..c32ebc438d 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/utils/setAttribute.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/utils/setAttribute.js @@ -9,6 +9,7 @@ export default function setParallelAttribute(newAttribute) { parallelAttribute.params.key = newAttribute.name; parallelAttribute.params.columnName = newAttribute.params.targetColumnName; parallelAttribute.params.targetColumnName = newAttribute.params.columnName; + parallelAttribute.params.dominant = false; return parallelAttribute; } return; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/actions.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/actions.js index 399125b0c6..492727e193 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/actions.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/actions.js @@ -174,6 +174,7 @@ function setParallelAttribute(data) { parallelAttribute.name = data.params.key; parallelAttribute.params.columnName = data.params.targetColumnName; parallelAttribute.params.targetColumnName = data.params.columnName; + parallelAttribute.params.dominant = false; return parallelAttribute; } diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json index 12b5e309d2..6a886cfbc5 100755 --- a/packages/strapi-plugin-content-type-builder/package.json +++ b/packages/strapi-plugin-content-type-builder/package.json @@ -51,7 +51,7 @@ "plop": "^1.8.1", "prettier": "^1.7.0", "rimraf": "^2.6.2", - "strapi-helper-plugin": "3.0.0-alpha.5.5", + "strapi-helper-plugin": "file:../strapi-helper-plugin", "webpack": "^3.6.0" }, "author": { @@ -71,4 +71,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 58bb954c4c..0f51637ac5 100755 --- a/packages/strapi-plugin-settings-manager/package.json +++ b/packages/strapi-plugin-settings-manager/package.json @@ -48,7 +48,7 @@ "plop": "^1.8.1", "prettier": "^1.7.0", "rimraf": "^2.6.2", - "strapi-helper-plugin": "3.0.0-alpha.5.5", + "strapi-helper-plugin": "file:../strapi-helper-plugin", "webpack": "^3.6.0" }, "author": { @@ -68,4 +68,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json index 207856befb..32ce37facc 100755 --- a/packages/strapi-utils/package.json +++ b/packages/strapi-utils/package.json @@ -45,4 +45,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi/package.json b/packages/strapi/package.json index 800b7c9799..e291ab7d6f 100755 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -51,13 +51,13 @@ "lodash": "^4.16.5", "node-schedule": "^1.2.0", "semver": "^5.4.1", - "strapi-generate": "3.0.0-alpha.5.5", - "strapi-generate-admin": "3.0.0-alpha.5.5", - "strapi-generate-api": "3.0.0-alpha.5.5", - "strapi-generate-new": "3.0.0-alpha.5.5", - "strapi-generate-policy": "3.0.0-alpha.5.5", - "strapi-generate-service": "3.0.0-alpha.5.5", - "strapi-utils": "3.0.0-alpha.5.5" + "strapi-generate": "file:../strapi-generate", + "strapi-generate-admin": "file:../strapi-generate-admin", + "strapi-generate-api": "file:../strapi-generate-api", + "strapi-generate-new": "file:../strapi-generate-new", + "strapi-generate-policy": "file:../strapi-generate-policy", + "strapi-generate-service": "file:../strapi-generate-service", + "strapi-utils": "file:../strapi-utils" }, "author": { "email": "hi@strapi.io", @@ -84,4 +84,4 @@ }, "preferGlobal": true, "license": "MIT" -} \ No newline at end of file +} From a5bb67f723d95da533dbc413c9205751f293c743 Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Thu, 21 Sep 2017 14:21:18 +0200 Subject: [PATCH 2/2] Make checkbox label clickable --- packages/strapi-admin/package.json | 4 ++-- packages/strapi-generate-admin/package.json | 4 ++-- packages/strapi-generate-new/package.json | 4 ++-- packages/strapi-generate/package.json | 4 ++-- packages/strapi-helper-plugin/package.json | 2 +- packages/strapi-mongoose/package.json | 4 ++-- .../strapi-plugin-content-manager/package.json | 4 ++-- .../admin/src/components/Input/index.js | 12 ++++++------ .../InputCheckboxWithNestedInputs/index.js | 10 +++++----- .../admin/src/containers/Form/actions.js | 1 + .../package.json | 4 ++-- .../strapi-plugin-settings-manager/package.json | 4 ++-- packages/strapi-utils/package.json | 2 +- packages/strapi/package.json | 16 ++++++++-------- 14 files changed, 38 insertions(+), 37 deletions(-) diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index eca539b227..0b089932eb 100755 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -46,7 +46,7 @@ "plop": "^1.8.1", "prettier": "^1.7.0", "rimraf": "^2.6.2", - "strapi-helper-plugin": "file:../strapi-helper-plugin", + "strapi-helper-plugin": "3.0.0-alpha.5.5", "webpack": "^3.6.0" }, "author": { @@ -66,4 +66,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json index 73eb0ffa43..35dd814036 100755 --- a/packages/strapi-generate-admin/package.json +++ b/packages/strapi-generate-admin/package.json @@ -15,7 +15,7 @@ "dependencies": { "fs-extra": "^4.0.1", "lodash": "^4.17.4", - "strapi-admin": "file:../strapi-admin" + "strapi-admin": "3.0.0-alpha.5.5" }, "author": { "email": "hi@strapi.io", @@ -41,4 +41,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 c9d2dcdfae..b66f01bfa0 100755 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -17,7 +17,7 @@ "fs-extra": "^4.0.0", "get-installed-path": "^3.0.1", "lodash": "^4.17.4", - "strapi-utils": "file:../strapi-utils" + "strapi-utils": "3.0.0-alpha.5.5" }, "scripts": { "prepublish": "npm prune" @@ -46,4 +46,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json index 9fde8d1dff..09c7c7f960 100755 --- a/packages/strapi-generate/package.json +++ b/packages/strapi-generate/package.json @@ -17,7 +17,7 @@ "fs-extra": "^4.0.0", "lodash": "^4.17.4", "reportback": "^2.0.1", - "strapi-utils": "file:../strapi-utils" + "strapi-utils": "3.0.0-alpha.5.5" }, "author": { "name": "Strapi team", @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index e8e90e91a0..d6b559dd66 100755 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -110,4 +110,4 @@ "whatwg-fetch": "^2.0.3" }, "devDependencies": {} -} +} \ No newline at end of file diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json index 7a3c29c5a0..652d9b14d8 100755 --- a/packages/strapi-mongoose/package.json +++ b/packages/strapi-mongoose/package.json @@ -20,7 +20,7 @@ "mongoose-double": "0.0.1", "mongoose-float": "^1.0.2", "pluralize": "^6.0.0", - "strapi-utils": "file:../strapi-utils" + "strapi-utils": "3.0.0-alpha.5.5" }, "strapi": { "isHook": true @@ -49,4 +49,4 @@ "npm": ">= 5.3.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 6de890dd5e..34043aaf6a 100755 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -61,7 +61,7 @@ "plop": "^1.8.1", "prettier": "^1.7.0", "rimraf": "^2.6.2", - "strapi-helper-plugin": "file:../strapi-helper-plugin", + "strapi-helper-plugin": "3.0.0-alpha.5.5", "webpack": "^3.6.0" } -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/Input/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/Input/index.js index c1645a21b7..68931b8d11 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/Input/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/Input/index.js @@ -101,11 +101,11 @@ class Input extends React.Component { // eslint-disable-line react/prefer-statel } - handleChangeCheckbox = (e) => { + handleChangeCheckbox = () => { const target = { - type: e.target.type, + type: 'checkbox', value: !this.props.value, - name: e.target.name, + name: this.props.name, }; this.props.handleChange({ target }); @@ -130,15 +130,15 @@ class Input extends React.Component { // eslint-disable-line react/prefer-statel renderInputCheckbox = (requiredClass, inputDescription) => { const title = !isEmpty(this.props.title) ?
: ''; const spacer = !inputDescription ?
:
; - + return (
{title} {(message) => ( -