yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-13 00:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions

Browse Source
This commit is contained in:
Jim Laurie 2017-12-06 12:26:09 +01:00
commit 8ab44d86af
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/strapi-admin/admin/src/app.js
View File

@ -43,7 +43,9 @@ import { translationMessages, languages } from './i18n';
import { findIndex } from 'lodash'; import { findIndex } from 'lodash';
/* eslint-enable */ /* eslint-enable */
// Retrieve plugins from config.
let appPlugins = plugins; let appPlugins = plugins;
// Create redux store with history // Create redux store with history
const initialState = {}; const initialState = {};
const history = createHistory({ const history = createHistory({
@ -93,7 +95,8 @@ if (window.location.port !== '4000') {
return response.json(); return response.json();
}) })
.then(plugins => { .then(plugins => {
appPlugins = plugins; appPlugins = plugins || [];
(plugins || []).forEach(plugin => { (plugins || []).forEach(plugin => {
const script = document.createElement('script'); const script = document.createElement('script');
script.type = 'text/javascript'; script.type = 'text/javascript';

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

@ -66,7 +66,7 @@ export class AdminPage extends React.Component { // eslint-disable-line react/pr
this.props.history.push(`/plugins/users-permissions/auth/${endPoint}`); this.props.history.push(`/plugins/users-permissions/auth/${endPoint}`);
} }
if (!this.isUrlProtected(props) && includes(props.location.pathname, 'register') && this.hasAdminUser()) { if (!this.isUrlProtected(props) && includes(props.location.pathname, 'register') && this.hasAdminUser(props)) {
this.props.history.push('/plugins/users-permissions/auth/login'); this.props.history.push('/plugins/users-permissions/auth/login');
} }

2
packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js
View File

@ -14,7 +14,7 @@ import { findIndex, get, isBoolean, isEmpty, map, replace } from 'lodash';
import cn from 'classnames'; import cn from 'classnames';
// Logo // Logo
import LogoStrapi from 'assets/images/logo_strapi.png'; import LogoStrapi from 'assets/images/logo.svg';
// Design // Design
import Button from 'components/Button'; import Button from 'components/Button';

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

@ -81,9 +81,9 @@
.logoContainer { .logoContainer {
position: absolute; position: absolute;
bottom: 20px; left: 30px; bottom: 30px;
left: 10px;
> img { > img {
height: 20px; height: 34px;
} }
} }

2
packages/strapi-plugin-users-permissions/config/roles.json
View File

@ -521,4 +521,4 @@
} }
} }
} }
} }