yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-17 19:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into enhance/generate

Browse Source
This commit is contained in:
Jim LAURIE 2018-04-24 17:45:53 +02:00 committed by GitHub
commit 60eb9cf9d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js
View File

@ -17,8 +17,10 @@ defineMessages(messages);
function LeftMenuFooter({ version }) { // eslint-disable-line react/prefer-stateless-function
return (
<div className={styles.leftMenuFooter}>
<FormattedMessage {...messages.poweredBy} />
<a href="https://strapi.io" target="_blank">v{version}</a>
<div>
<FormattedMessage {...messages.poweredBy} />
<a href="https://strapi.io" target="_blank">v{version}</a>
</div>
<LocaleToggle />
</div>
);

4
packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss
View File

@ -3,7 +3,9 @@
.leftMenuFooter { /* stylelint-disable */
position: absolute;
width: 100%;
width: calc(100% - 2 * 15px);
display: flex;
justify-content: space-between;
bottom: 0;
height: 3rem;
padding-left: 15px;

93
packages/strapi-plugin-users-permissions/config/functions/bootstrap.js vendored
View File

@ -34,49 +34,58 @@ module.exports = async cb => {
name: 'users-permissions'
});
if (!await pluginStore.get({key: 'grant'})) {
const value = {
email: {
enabled: true,
icon: 'envelope'
},
facebook: {
enabled: false,
icon: 'facebook-official',
key: '',
secret: '',
callback: '/auth/facebook/callback',
scope: ['email']
},
google: {
enabled: false,
icon: 'google',
key: '',
secret: '',
callback: '/auth/google/callback',
scope: ['email']
},
github: {
enabled: false,
icon: 'github',
key: '',
secret: '',
redirect_uri: '/auth/github/callback',
scope: [
'user',
'user:email'
]
},
twitter: {
enabled: false,
icon: 'twitter',
key: '',
secret: '',
callback: '/auth/twitter/callback'
const grantConfig = {
email: {
enabled: true,
icon: 'envelope'
},
facebook: {
enabled: false,
icon: 'facebook-official',
key: '',
secret: '',
callback: '/auth/facebook/callback',
scope: ['email']
},
google: {
enabled: false,
icon: 'google',
key: '',
secret: '',
callback: '/auth/google/callback',
scope: ['email']
},
github: {
enabled: false,
icon: 'github',
key: '',
secret: '',
redirect_uri: '/auth/github/callback',
scope: [
'user',
'user:email'
]
},
twitter: {
enabled: false,
icon: 'twitter',
key: '',
secret: '',
callback: '/auth/twitter/callback'
}
};
const prevGrantConfig = await pluginStore.get({key: 'grant'})
// store grant auth config to db
// when plugin_users-permissions_grant is not existed in db
// or we have added/deleted provider here.
if (!prevGrantConfig || !_.isEqual(_.keys(prevGrantConfig), _.keys(grantConfig))) {
// merge with the previous provider config.
_.keys(grantConfig).forEach((key) => {
if (key in prevGrantConfig) {
grantConfig[key] = _.merge(grantConfig[key], prevGrantConfig[key]);
}
};
await pluginStore.set({key: 'grant', value});
});
await pluginStore.set({key: 'grant', value: grantConfig});
}
if (!await pluginStore.get({key: 'email'})) {