yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 14:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix design

Browse Source
This commit is contained in:
cyril lopez 2017-11-28 15:04:02 +01:00
parent 4d56b185bf
commit 2a27b915f8
7 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/strapi-admin/admin/src/containers/AdminPage/index.js
View File

@ -58,6 +58,14 @@ export class AdminPage extends React.Component { // eslint-disable-line react/pr
const endPoint = this.hasAdminUser() ? 'login': 'register';
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, 'register') && this.hasAdminUser()) {
this.props.history.push('/plugins/users-permissions/auth/login');
}
}
hasUsersPlugin = () => !isUndefined(get(this.props.plugins.toJS(), 'users-permissions'));

4
packages/strapi-helper-plugin/lib/src/components/Input/index.js
View File

@ -180,11 +180,11 @@ class Input extends React.Component { // eslint-disable-line react/prefer-statel
<FormattedMessage id={`${this.props.label}`} />
</label>
<div className={`input-group ${styles.input}`} style={{ marginBottom: '1rem'}}>
<span className={`input-group-addon ${styles.addonEmail}`} />
<span className={`input-group-addon ${styles.addonEmail} ${!this.props.deactivateErrorHighlight && !isEmpty(this.state.errors) ? styles.errorAddon: ''}`} />
<FormattedMessage id={this.props.placeholder || this.props.label} values={this.props.labelValues}>
{(placeholder) => (
<input
className={`form-control ${!this.props.deactivateErrorHighlight && !isEmpty(this.state.errors) ? 'form-control-danger is-invalid': ''}`}
className={`form-control ${!this.props.deactivateErrorHighlight && !isEmpty(this.state.errors) ? `form-control-danger is-invalid ${styles.error}`: ''}`}
onChange={this.props.onChange}
value={this.props.value}
name={this.props.name}

11
packages/strapi-helper-plugin/lib/src/components/Input/styles.scss
View File

@ -1,5 +1,14 @@
/* stylelint-disable */
.error {
border-left: none!important;
}
.errorAddon {
border: 1px solid #ff203c!important;
border-right: none!important;
}
.errorContainer {
margin-top: .5rem;
margin-bottom: .5rem;
@ -77,7 +86,7 @@
display: inline-table;
color: #B3B5B9;
font-size: 16px;
font-weight: 600;
font-weight: 900;
font-family: Lato;
}
}

4
packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/saga.js
View File

@ -38,10 +38,6 @@ export function* submitForm() {
yield call(auth.setUserInfo, response.user, body.rememberMe);
}
if (formType === 'forgot-password') {
strapi.notification.info('The email has been sent');
}
yield put(submitSucceeded());
} catch(error) {
const formType = yield select(makeSelectFormType());

2
packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/styles.scss
View File

@ -58,7 +58,7 @@
text-align: right;
> button {
margin-right: 1.4rem;
margin-right: 1.6rem;
}
}

2
packages/strapi-plugin-users-permissions/admin/src/translations/en.json
View File

@ -40,7 +40,7 @@
"Auth.form.error.params.provide": "Incorrect params provided.",
"Auth.link.forgot-password": "Forgot your password?",
"Auth.link.ready": "Reasy to sign-in?",
"Auth.link.ready": "Ready to sign-in?",
"components.Input.error.password.noMatch": "Password don't match",

2
packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
View File

@ -101,7 +101,7 @@ module.exports = {
init: async (ctx) => {
const hasAdmin = await strapi.query('user', 'users-permissions').find({
where: {
admin: true
role: '0'
}
});