From 4cb45e48be45083fba83c765464e82ab12e98b32 Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Mon, 4 Dec 2017 15:03:53 +0100 Subject: [PATCH 1/2] Fix design --- packages/strapi-admin/.gitignore | 2 ++ .../src/containers/InstallPluginPage/index.js | 10 +++++----- .../lib/internals/webpack/manifest.json | 6 +----- .../admin/src/containers/Edit/index.js | 14 +++++++++++--- .../admin/src/containers/Edit/sagas.js | 2 -- .../admin/src/components/InputSearch/styles.scss | 10 ++++++---- .../admin/src/components/InputSearchLi/index.js | 10 +++++++++- .../admin/src/components/InputSearchLi/styles.scss | 10 ++++++++++ .../admin/src/components/ListRow/index.js | 9 ++++++++- .../admin/src/components/Plugin/index.js | 13 ++++++++----- .../admin/src/components/Plugin/styles.scss | 8 ++++++++ .../admin/src/components/Policies/index.js | 2 +- .../admin/src/components/Policies/styles.scss | 10 +++++++++- .../admin/src/translations/en.json | 2 +- .../admin/src/translations/fr.json | 4 ++-- .../controllers/UsersPermissions.js | 2 +- 16 files changed, 82 insertions(+), 32 deletions(-) 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/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) => ( >>>>>> 1f29fde51ae8a03fa3d0303557552c0d6c060229 +{"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"]},"./strapi-helper-plugin/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":{}},"./strapi-helper-plugin/node_modules/webpack/buildin/module.js":{"id":60,"meta":{}}}} \ No newline at end of file diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js index 0a20a81aa5..d3f5b06616 100755 --- a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js @@ -11,7 +11,16 @@ import { connect } from 'react-redux'; import { bindActionCreators, compose } from 'redux'; import { createStructuredSelector } from 'reselect'; import PropTypes from 'prop-types'; -import { map, get, isObject, isEmpty, replace, toNumber, toString } from 'lodash'; +import { + get, + includes, + isObject, + isEmpty, + map, + replace, + toNumber, + toString, +} from 'lodash'; import { router } from 'app'; // Components. @@ -121,7 +130,7 @@ export class Edit extends React.Component { componentWillReceiveProps(nextProps) { if (this.props.editSuccess !== nextProps.editSuccess) { - if (!isEmpty(this.props.location.search)) { + if (!isEmpty(this.props.location.search) && includes(this.props.location.search, '?redirectUrl')) { router.push(replace(this.props.location.search, '?redirectUrl=', '')); } else { router.push(replace(this.props.location.pathname, 'create', '')); @@ -169,7 +178,6 @@ export class Edit extends React.Component { } const currentModel = get(this.props.models, ['models', this.props.currentModelName]) || get(this.props.models, ['plugins', this.source, 'models', this.props.currentModelName]); - // Plugin header config const primaryKey = currentModel.primaryKey; const mainField = get(currentModel, 'info.mainField') || primaryKey; diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/sagas.js b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/sagas.js index 8a3fd2a15c..c07e5de029 100755 --- a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/sagas.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/sagas.js @@ -71,8 +71,6 @@ export function* editRecord(action) { params, }); - console.log(recordCleaned); - yield put(recordEdited()); strapi.notification.success('content-manager.success.record.save'); } catch (err) { diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/styles.scss b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/styles.scss index 037295c48f..de398da69d 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/styles.scss +++ b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearch/styles.scss @@ -5,7 +5,8 @@ background-color: rgba(16, 22, 34, 0.02); border: 1px solid #E3E9F3; border-radius: 0.25rem; - border-bottom-left-radius: 0; + border-bottom-left-radius: 0!important; + border-bottom-right-radius: 0!important; color: rgba(16, 22, 34, 0.5); line-height: 3.2rem; font-size: 1.3rem; @@ -14,6 +15,7 @@ text-transform: capitalize; -moz-appearance: none; -webkit-appearance: none; + box-shadow: 0px 2px 1px rgba(104, 118, 142, 0.05); &:before { content: '\F002'; display: inline-table; @@ -50,7 +52,7 @@ line-height: 3.4rem; font-size: 1.3rem; font-family: 'Lato' !important; - box-shadow: 0px 1px 1px rgba(104, 118, 142, 0.05); + box-shadow: 0px 2px 1px rgba(104, 118, 142, 0.05); &:focus { border-color: #78caff; } @@ -61,8 +63,8 @@ height: 16.3rem; overflow: scroll; border: 1px solid #E3E9F3; - border-top-left-radius: 0; - border-top-right-radius: 0; + border-top-left-radius: 0!important; + border-top-right-radius: 0!important; border-top: none; border-radius: 0.25rem; > 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/translations/en.json b/packages/strapi-plugin-users-permissions/admin/src/translations/en.json index 322dfb8b8f..70e176ebb9 100755 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/en.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/en.json @@ -113,7 +113,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 b3e7044722..af8ca39624 100755 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json @@ -114,8 +114,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/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' }] }]); } From 6be459cf33eb6bf466c2babdde8e050e864ef2a0 Mon Sep 17 00:00:00 2001 From: cyril lopez Date: Mon, 4 Dec 2017 15:50:46 +0100 Subject: [PATCH 2/2] Fix css --- .../admin/src/containers/AdminPage/index.js | 6 +++--- .../admin/src/containers/AuthPage/index.js | 7 +++++++ .../admin/src/containers/AuthPage/styles.scss | 10 ++++++++++ .../admin/src/translations/en.json | 4 ++-- .../admin/src/translations/fr.json | 4 ++-- .../strapi-plugin-users-permissions/config/roles.json | 4 ++-- 6 files changed, 26 insertions(+), 9 deletions(-) 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-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 70e176ebb9..e020762c54 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", 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 af8ca39624..23041f23f4 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", diff --git a/packages/strapi-plugin-users-permissions/config/roles.json b/packages/strapi-plugin-users-permissions/config/roles.json index 0a82683b3a..0204a6a96e 100644 --- a/packages/strapi-plugin-users-permissions/config/roles.json +++ b/packages/strapi-plugin-users-permissions/config/roles.json @@ -422,7 +422,7 @@ "policy": "" }, "forgotPassword": { - "enabled": false, + "enabled": true, "policy": "" }, "changePassword": { @@ -521,4 +521,4 @@ } } } -} \ No newline at end of file +}