diff --git a/packages/strapi-admin/.gitignore b/packages/strapi-admin/.gitignore index afe256bf30..8f9cf76d0b 100644 --- a/packages/strapi-admin/.gitignore +++ b/packages/strapi-admin/.gitignore @@ -1,6 +1,8 @@ # Don't check auto-generated stuff into git coverage node_modules +build +plugins.json stats.json package-lock.json diff --git a/packages/strapi-admin/admin/src/containers/AdminPage/index.js b/packages/strapi-admin/admin/src/containers/AdminPage/index.js index ed6580fe52..2d01739827 100644 --- a/packages/strapi-admin/admin/src/containers/AdminPage/index.js +++ b/packages/strapi-admin/admin/src/containers/AdminPage/index.js @@ -62,9 +62,9 @@ export class AdminPage extends React.Component { // eslint-disable-line react/pr this.props.history.push(`/plugins/users-permissions/auth/${endPoint}`); } - if (!this.isUrlProtected(props) && includes(props.location.pathname, 'login') && !this.hasAdminUser()) { - this.props.history.push('/plugins/users-permissions/auth/register'); - } + // if (!this.isUrlProtected(props) && includes(props.location.pathname, 'login') && !this.hasAdminUser()) { + // this.props.history.push('/plugins/users-permissions/auth/register'); + // } if (!this.isUrlProtected(props) && includes(props.location.pathname, 'register') && this.hasAdminUser()) { this.props.history.push('/plugins/users-permissions/auth/login'); diff --git a/packages/strapi-admin/admin/src/containers/InstallPluginPage/index.js b/packages/strapi-admin/admin/src/containers/InstallPluginPage/index.js index 1705e82b9b..de12c73e13 100644 --- a/packages/strapi-admin/admin/src/containers/InstallPluginPage/index.js +++ b/packages/strapi-admin/admin/src/containers/InstallPluginPage/index.js @@ -14,7 +14,7 @@ import cn from 'classnames'; import { get, isUndefined, map } from 'lodash'; // Design -import Input from 'components/Input'; +// import Input from 'components/Input'; import PluginCard from 'components/PluginCard'; import PluginHeader from 'components/PluginHeader'; @@ -57,7 +57,7 @@ export class InstallPluginPage extends React.Component { // eslint-disable-line description={{ id: 'app.components.InstallPluginPage.description' }} actions={[]} /> -
+ {/*}
-
+
*/}
{map(this.props.availablePlugins, (plugin) => ( ul { diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/index.js index a0d3f4628e..7b645c9813 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/index.js @@ -6,18 +6,26 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { router } from 'app'; import styles from './styles.scss'; function InputSearchLi({ onClick, isAdding, item }) { const icon = isAdding ? 'fa-plus' : 'fa-minus-circle'; const liStyle = isAdding ? { cursor: 'pointer' } : {}; const handleClick = isAdding ? () => onClick(item) : () => {}; + const path = `/plugins/content-manager/user/${item.id}?redirectUrl=/plugins/content-manager/user/?page=1&limit=20&sort=id&source=users-permissions`; + const handleGoto = (e) => { + e.preventDefault(); + e.stopPropagation(); + router.push(path); + }; return (
  • -
    +
    {item.username} +
    { diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/styles.scss b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/styles.scss index 85d74f492b..6886e5379c 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/styles.scss +++ b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchLi/styles.scss @@ -28,3 +28,13 @@ } } } + + +.container { + >i { + margin-left: 10px; + color: #1C5DE7; + font-size: 10px; + cursor: pointer; + } +} diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/index.js index 885579f902..2087ddb257 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/index.js @@ -25,10 +25,13 @@ class ListRow extends React.Component { // eslint-disable-line react/prefer-stat } } - // Roles that can't be deleted + // Roles that can't be deleted && modified // Don't delete this line protectedRoleIDs = ['0']; + // Roles that can't be deleted; + undeletableIDs = ['1']; + generateContent = () => { let icons = [ { @@ -47,6 +50,10 @@ class ListRow extends React.Component { // eslint-disable-line react/prefer-stat icons = []; } + if (includes(this.undeletableIDs, get(this.props.item, 'id').toString())) { + icons = [{ icoType: 'pencil', onClick: this.handleClick }]; + } + return (
    diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/index.js index 40da6a56d4..92921bbef3 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/index.js @@ -7,7 +7,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Collapse } from 'reactstrap'; -import { capitalize, get, map } from 'lodash'; +import { capitalize, get, isEmpty, map } from 'lodash'; import { FormattedMessage } from 'react-intl'; import Controller from 'components/Controller'; @@ -26,7 +26,10 @@ class Plugin extends React.Component { // eslint-disable-line react/prefer-state handleClick = () => { this.props.changePluginSelected(this.props.name); - this.setState({ collapse: !this.state.collapse }); + + if (!isEmpty(get(this.props.plugin, 'controllers'))) { + this.setState({ collapse: !this.state.collapse }); + } if (this.state.collapse) { this.context.resetShouldDisplayPoliciesHint(); @@ -46,9 +49,9 @@ class Plugin extends React.Component { // eslint-disable-line react/prefer-state
    ) : ''} - {this.props.name} +
    {this.props.name}
     —  - +
    {this.props.name === 'application' ? ( )} - +
    diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/styles.scss b/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/styles.scss index 8fe90a5f58..330e18f578 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/styles.scss +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/styles.scss @@ -46,9 +46,17 @@ > div:not(:first-child) { padding-top: 2.3rem; } + > div:last-child { + padding-bottom: 1.8rem; + } } .description { + // width: 50%; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; color: #8B91A0; font-size: 12px; font-weight: 400; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Policies/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Policies/index.js index 397e05927b..7b87e5e243 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Policies/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Policies/index.js @@ -29,7 +29,7 @@ class Policies extends React.Component { // eslint-disable-line react/prefer-sta return (
    -
    +
    diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Policies/styles.scss b/packages/strapi-plugin-users-permissions/admin/src/components/Policies/styles.scss index 556c042ecd..3589d446ef 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Policies/styles.scss +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Policies/styles.scss @@ -7,6 +7,14 @@ margin-bottom: 1.1rem; padding-top: 2.8rem; font-size: 18px; - font-weight: 900; + font-weight: 800; line-height: 3.6rem; } + +.inputWrapper { + > div:nth-child(2) { + > label { + font-weight: 800!important; + } + } +} diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js index a992da6ed8..192388fcf7 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js @@ -60,6 +60,9 @@ export class AuthPage extends React.Component { // eslint-disable-line react/pre // NOTE: prepare for comfirm email; // this.props.history.push(`/plugins/users-permissions/auth/register-success/${this.props.modifiedData.email}`); break; + case 'forgot-password': + console.log('fuck'); + break; default: } @@ -134,6 +137,9 @@ export class AuthPage extends React.Component { // eslint-disable-line react/pre render() { const inputs = get(form, ['form', this.props.match.params.authType]); const divStyle = this.props.match.params.authType === 'register' ? { marginTop: '3.2rem' } : { marginTop: '.9rem' }; + const withLogo = this.props.match.params.authType === 'register' ? ( +
    logo
    + ) : ''; const headerDescription = this.props.match.params.authType === 'register' ? : ; @@ -181,6 +187,7 @@ export class AuthPage extends React.Component { // eslint-disable-line react/pre {this.renderLink()}
    + {withLogo}
    ); } diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/styles.scss b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/styles.scss index 7bd5a1cf6c..e061adcb40 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/styles.scss +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/styles.scss @@ -77,3 +77,13 @@ } } } + + +.logoContainer { + position: absolute; + bottom: 20px; + left: 10px; + > img { + height: 20px; + } +} diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/en.json b/packages/strapi-plugin-users-permissions/admin/src/translations/en.json index 97e4685e14..e86598811a 100755 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/en.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/en.json @@ -17,12 +17,12 @@ "Auth.form.login.password.label": "Password", "Auth.form.login.rememberMe.label": "Remember me", "Auth.form.login.username.label": "Username", - "Auth.form.login.username.placeholder": "Soupette", + "Auth.form.login.username.placeholder": "John Doe", "Auth.form.register.email.label": "Email", "Auth.form.register.email.placeholder": "johndoe@gmail.com", "Auth.form.register.username.label": "Username", - "Auth.form.register.username.placeholder": "Soupette", + "Auth.form.register.username.placeholder": "John Doe", "Auth.form.register.password.label": "Password", "Auth.form.register.confirmPassword.label": "Confirmation Password", @@ -114,7 +114,7 @@ "Policies.InputSelect.empty": "None", "Policies.InputSelect.label": "Allow to perform this action for:", - "Policies.header.hint": "Select the application's actions or the plugin's actions and put your mouse over to display the bounded route", + "Policies.header.hint": "Select the application's actions or the plugin's actions and click on the cog icon to display the bounded route", "Policies.header.title": "Advanced settings", "PopUpForm.button.cancel": "Cancel", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json b/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json index ce7947bcfb..a75cf218e2 100755 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json @@ -17,12 +17,12 @@ "Auth.form.login.password.label": "Mot de Passe", "Auth.form.login.rememberMe.label": "Se souvenir de moi", "Auth.form.login.username.label": "Username", - "Auth.form.login.username.placeholder": "Soupette", + "Auth.form.login.username.placeholder": "John Doe", "Auth.form.register.email.label": "Email", "Auth.form.register.email.placeholder": "johndoe@gmail.com", "Auth.form.register.username.label": "Username", - "Auth.form.register.username.placeholder": "Soupette", + "Auth.form.register.username.placeholder": "John Doe", "Auth.form.register.password.label": "Mot de Passe", "Auth.form.register.confirmPassword.label": "Confirmez le Mot de Passe", @@ -115,8 +115,8 @@ "Policies.InputSelect.empty": "Aucune", "Policies.InputSelect.label": "Autorisez cette action pour :", - "Policies.header.hint": "Sélectionnez ...", - "Policies.header.tile": "Paramètres avancés", + "Policies.header.hint": "Sélectionnez les actions de l'application ou d'un plugin et cliquer sur l'icon de paramètres pour voir les routes associées à cette action", + "Policies.header.title": "Paramètres avancés", "popUpForm.button.cancel": "Annuler", "popUpForm.button.save": "Sauvegarder", diff --git a/packages/strapi-plugin-users-permissions/config/roles.json b/packages/strapi-plugin-users-permissions/config/roles.json index 873db6dbe1..0b180e3eab 100644 --- a/packages/strapi-plugin-users-permissions/config/roles.json +++ b/packages/strapi-plugin-users-permissions/config/roles.json @@ -256,35 +256,8 @@ } }, "application": { - "controllers": { - "product": { - "find": { - "enabled": true, - "policy": "" - }, - "findOne": { - "enabled": true, - "policy": "" - }, - "create": { - "enabled": true, - "policy": "" - }, - "update": { - "enabled": true, - "policy": "" - }, - "destroy": { - "enabled": true, - "policy": "" - }, - "identity": { - "enabled": true, - "policy": "" - } - } - } + "controllers": {} } } } -} \ No newline at end of file +} diff --git a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js index 3e9c34ce9a..6ec6c6619d 100644 --- a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js +++ b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js @@ -47,7 +47,7 @@ module.exports = { return ctx.badRequest(null, [{ messages: [{ id: 'Bad request' }] }]); } - if (role === '0') { + if (role === '0' || role === '1') { return ctx.badRequest(null, [{ messages: [{ id: 'Unauthorized' }] }]); }