mirror of
https://github.com/strapi/strapi.git
synced 2025-09-07 15:49:24 +00:00
Merge branch 'master' into add-prettier
This commit is contained in:
Jim LAURIE
GitHub
commit
a64e19861f
@ -1,6 +1,6 @@
|
||||
{
|
||||
"private": true,
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"devDependencies": {
|
||||
"assert": "~1.3.0",
|
||||
"babel-eslint": "^6.1.2",
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
.logout {
|
||||
position: relative;
|
||||
min-width: 19rem;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
> div {
|
||||
height: 6rem;
|
||||
width: 100%;
|
||||
line-height: 6rem;
|
||||
line-height: 5.8rem;
|
||||
z-index: 999;
|
||||
> button {
|
||||
width: 100%;
|
||||
@ -35,6 +36,21 @@
|
||||
}
|
||||
}
|
||||
|
||||
&:after {
|
||||
position: absolute;
|
||||
right: -1px;
|
||||
top: calc(50% - 10px);
|
||||
content: '';
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
height: 20px;
|
||||
border-left: 1px solid #F3F4F4;
|
||||
transition: opacity .2s ease-out;
|
||||
}
|
||||
|
||||
&:hover:after {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
}
|
||||
.dropDownContent {
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
padding-top: 2px;
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
margin: 0;
|
||||
border-radius: 2px !important;
|
||||
font-size: 13px;
|
||||
font-weight: 500 !important;
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
color: #FFFFFF;
|
||||
> div {
|
||||
> p {
|
||||
max-width: 43rem;
|
||||
max-width: 50rem;
|
||||
margin-top: 17px;
|
||||
margin-bottom: 125px;
|
||||
padding-right: 35px;
|
||||
|
||||
@ -94,10 +94,18 @@ export class AdminPage extends React.Component { // eslint-disable-line react/pr
|
||||
if (get(nextProps.plugins.toJS(), ['users-permissions', 'hasAdminUser']) !== get(this.props.plugins.toJS(), ['users-permissions', 'hasAdminUser'])) {
|
||||
this.checkLogin(nextProps, true);
|
||||
}
|
||||
|
||||
if (!this.hasUserPluginLoaded(this.props) && this.hasUserPluginLoaded(nextProps)) {
|
||||
this.checkLogin(nextProps);
|
||||
}
|
||||
}
|
||||
|
||||
checkLogin = (props, skipAction = false) => {
|
||||
if (props.hasUserPlugin && this.isUrlProtected(props) && !auth.getToken()) {
|
||||
if (!this.hasUserPluginLoaded(props)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const endPoint = this.hasAdminUser(props) ? 'login': 'register';
|
||||
this.props.history.push(`/plugins/users-permissions/auth/${endPoint}`);
|
||||
}
|
||||
@ -134,6 +142,8 @@ export class AdminPage extends React.Component { // eslint-disable-line react/pr
|
||||
}
|
||||
}
|
||||
|
||||
hasUserPluginLoaded = (props) => typeof get(props.plugins.toJS(), ['users-permissions', 'hasAdminUser']) !== 'undefined';
|
||||
|
||||
hasAdminUser = (props) => get(props.plugins.toJS(), ['users-permissions', 'hasAdminUser']);
|
||||
|
||||
isUrlProtected = (props) => !includes(props.location.pathname, get(props.plugins.toJS(), ['users-permissions', 'nonProtectedUrl']));
|
||||
@ -172,8 +182,7 @@ export class AdminPage extends React.Component { // eslint-disable-line react/pr
|
||||
)}
|
||||
<CTAWrapper>
|
||||
{this.shouldDisplayLogout() && <Logout />}
|
||||
{this.shouldDisplayLogout() && <div className={styles.adminPageSeparator} />}
|
||||
<LocaleToggle />
|
||||
<LocaleToggle isLogged={this.shouldDisplayLogout() === true} />
|
||||
</CTAWrapper>
|
||||
<div className={styles.adminPageRightWrapper} style={style}>
|
||||
{header}
|
||||
|
||||
@ -14,11 +14,4 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
&:after {
|
||||
content: '';
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
height: 20px;
|
||||
border-left: 1px solid #F3F4F4;
|
||||
}
|
||||
}
|
||||
|
||||
@ -134,11 +134,12 @@
|
||||
|
||||
button {
|
||||
float: left;
|
||||
width: 100px;
|
||||
min-width: 100px;
|
||||
height: 3.4rem;
|
||||
margin-top: .9rem;
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
text-align: center;
|
||||
background: #333740;
|
||||
color: #FFFFFF;
|
||||
border-top-right-radius: 3px;
|
||||
|
||||
@ -46,7 +46,7 @@ export class LocaleToggle extends React.Component { // eslint-disable-line
|
||||
<span>{locale}</span>
|
||||
<img src={this.getFlagUrl(locale)} alt={locale} />
|
||||
</DropdownToggle>
|
||||
<DropdownMenu className={styles.localeDropdownMenu}>
|
||||
<DropdownMenu className={cn(styles.localeDropdownMenu, this.props.isLogged ? '' : styles.localeDropdownMenuNotLogged)}>
|
||||
{languages.map(language => (
|
||||
<DropdownItem key={language} onClick={() => this.props.changeLocale(language)} className={cn(styles.localeToggleItem, locale === language ? styles.localeToggleItemActive : '')}>
|
||||
{language.toUpperCase()}
|
||||
@ -63,6 +63,7 @@ export class LocaleToggle extends React.Component { // eslint-disable-line
|
||||
|
||||
LocaleToggle.propTypes = {
|
||||
changeLocale: PropTypes.func.isRequired,
|
||||
isLogged: PropTypes.string.isRequired,
|
||||
locale: PropTypes.string.isRequired,
|
||||
};
|
||||
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
.localeToggle {
|
||||
min-width: 90px;
|
||||
|
||||
> div {
|
||||
height: 6rem;
|
||||
width: 90px;
|
||||
line-height: 6rem;
|
||||
line-height: 5.8rem;
|
||||
z-index: 999;
|
||||
> button {
|
||||
width: 100%;
|
||||
@ -43,18 +44,19 @@
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.5;
|
||||
text-transform: uppercase;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
img {
|
||||
max-height: 13.37px;
|
||||
max-height: 13px;
|
||||
margin-left: 9px;
|
||||
border-radius: 1px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
|
||||
|
||||
.localeDropdownMenu {
|
||||
left: auto !important;
|
||||
right: -5px !important;
|
||||
@ -112,6 +114,26 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.localeDropdownMenuNotLogged{
|
||||
background: transparent !important;
|
||||
box-shadow: none !important;
|
||||
border: 1px solid #e3e9f3 !important;
|
||||
border-top: 0px !important;
|
||||
|
||||
button {
|
||||
padding-left: 17px;
|
||||
|
||||
&:hover {
|
||||
background-color: #F7F8F8 !important;
|
||||
}
|
||||
}
|
||||
|
||||
&:before{
|
||||
box-shadow: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
.localeToggleItem {
|
||||
img {
|
||||
max-height: 13.37px;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-admin",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Strapi Admin",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@ -20,7 +20,7 @@
|
||||
"generate": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/plop --plopfile ./node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
|
||||
"prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
|
||||
"test": "echo \"Error: no test specified\"",
|
||||
"prepublishOnly": "npm run build",
|
||||
"prepublishOnly": "IS_MONOREPO=true npm run build",
|
||||
"setup": "node ./scripts/setup.js",
|
||||
"presetup": "node ./scripts/preSetup.js"
|
||||
},
|
||||
@ -31,8 +31,8 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"sanitize.css": "^4.1.0",
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.1.3",
|
||||
"strapi-utils": "3.0.0-alpha.12.1.3"
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.2",
|
||||
"strapi-utils": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"name": "Strapi",
|
||||
@ -51,4 +51,4 @@
|
||||
"npm": ">= 5.0.0"
|
||||
},
|
||||
"license": "MIT"
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,6 +17,7 @@ const utilsModels = require('strapi-utils').models;
|
||||
|
||||
// Local helpers.
|
||||
const utils = require('./utils/');
|
||||
const relations = require('./relations');
|
||||
|
||||
const PIVOT_PREFIX = '_pivot_';
|
||||
const GLOBALS = {};
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-bookshelf",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Bookshelf hook for the Strapi framework",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
@ -20,8 +20,8 @@
|
||||
"inquirer": "^5.2.0",
|
||||
"lodash": "^4.17.4",
|
||||
"pluralize": "^6.0.0",
|
||||
"strapi-knex": "3.0.0-alpha.12.1.3",
|
||||
"strapi-utils": "3.0.0-alpha.12.1.3"
|
||||
"strapi-knex": "3.0.0-alpha.12.2",
|
||||
"strapi-utils": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"strapi": {
|
||||
"isHook": true,
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-ejs",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "EJS hook for the Strapi framework",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-generate-admin",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Generate the default admin panel for a Strapi application.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
@ -15,7 +15,7 @@
|
||||
"dependencies": {
|
||||
"fs-extra": "^4.0.1",
|
||||
"lodash": "^4.17.4",
|
||||
"strapi-admin": "3.0.0-alpha.12.1.3"
|
||||
"strapi-admin": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"email": "hi@strapi.io",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-generate-api",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Generate an API for a Strapi application.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-generate-controller",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Generate a controller for a Strapi API.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-generate-model",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Generate a model for a Strapi API.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-generate-new",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Generate a new Strapi application.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
@ -18,7 +18,7 @@
|
||||
"get-installed-path": "^3.0.1",
|
||||
"inquirer": "^4.0.2",
|
||||
"lodash": "^4.17.4",
|
||||
"strapi-utils": "3.0.0-alpha.12.1.3",
|
||||
"strapi-utils": "3.0.0-alpha.12.2",
|
||||
"uuid": "^3.1.0"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-generate-plugin",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Generate an plugin for a Strapi application.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-generate-policy",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Generate a policy for a Strapi API.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-generate-service",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Generate a service for a Strapi API.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-generate",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Master of ceremonies for the Strapi generators.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
@ -17,7 +17,7 @@
|
||||
"fs-extra": "^4.0.0",
|
||||
"lodash": "^4.17.4",
|
||||
"reportback": "^2.0.1",
|
||||
"strapi-utils": "3.0.0-alpha.12.1.3"
|
||||
"strapi-utils": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"name": "Strapi team",
|
||||
|
||||
@ -155,6 +155,7 @@ module.exports = (options) => {
|
||||
require.resolve('babel-plugin-transform-es2015-destructuring'),
|
||||
require.resolve('babel-plugin-transform-es2015-parameters'),
|
||||
require.resolve('babel-plugin-transform-object-rest-spread'),
|
||||
[require.resolve('babel-plugin-styled-components'), { ssr: true, preprocess: true }],
|
||||
],
|
||||
},
|
||||
test: {
|
||||
|
||||
@ -49,7 +49,7 @@ if (process.env.npm_lifecycle_event === 'start') {
|
||||
plugins.src = process.env.IS_ADMIN === 'true' && !plugins.exist ? fs.readdirSync(path.resolve(appPath, 'plugins')).filter(x => {
|
||||
let hasAdminFolder;
|
||||
|
||||
// Don't inject the plugins that don't have an admin into the app
|
||||
// Don't inject the plugins that don't have an admin into the app
|
||||
try {
|
||||
fs.accessSync(path.resolve(appPath, 'plugins', x, 'admin', 'src', 'containers', 'App'));
|
||||
hasAdminFolder = true;
|
||||
@ -144,6 +144,7 @@ module.exports = require('./webpack.base.babel')({
|
||||
'react-dom': path.resolve(rootAdminpath, 'node_modules', 'strapi-helper-plugin', 'node_modules', 'react-dom'),
|
||||
'react-transition-group': path.resolve(rootAdminpath, 'node_modules', 'strapi-helper-plugin', 'node_modules', 'react-transition-group'),
|
||||
'reactstrap': path.resolve(rootAdminpath, 'node_modules', 'strapi-helper-plugin', 'node_modules', 'reactstrap'),
|
||||
'styled-components': path.resolve(rootAdminpath, 'node_modules', 'strapi-helper-plugin', 'node_modules', 'styled-components')
|
||||
},
|
||||
|
||||
// Emit a source map for easier debugging
|
||||
|
||||
@ -172,6 +172,7 @@ module.exports = base({
|
||||
'react-dom': path.resolve(rootAdminpath, 'node_modules', 'strapi-helper-plugin', 'node_modules', 'react-dom'),
|
||||
'react-transition-group': path.resolve(rootAdminpath, 'node_modules', 'strapi-helper-plugin', 'node_modules', 'react-transition-group'),
|
||||
'reactstrap': path.resolve(rootAdminpath, 'node_modules', 'strapi-helper-plugin', 'node_modules', 'reactstrap'),
|
||||
'styled-components': path.resolve(rootAdminpath, 'node_modules', 'strapi-helper-plugin', 'node_modules', 'styled-components'),
|
||||
},
|
||||
|
||||
devtool: 'cheap-module-source-map',
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-helper-plugin",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Helper for Strapi plugins development",
|
||||
"engines": {
|
||||
"node": ">= 9.0.0",
|
||||
@ -33,6 +33,7 @@
|
||||
"babel-eslint": "^7.2.3",
|
||||
"babel-loader": "^7.1.1",
|
||||
"babel-plugin-istanbul": "^4.1.5",
|
||||
"babel-plugin-styled-components": "^1.5.1",
|
||||
"babel-plugin-transform-es2015-destructuring": "^6.23.0",
|
||||
"babel-plugin-transform-es2015-parameters": "^6.24.1",
|
||||
"babel-plugin-transform-object-rest-spread": "^6.26.0",
|
||||
@ -108,6 +109,7 @@
|
||||
"shelljs": "^0.7.8",
|
||||
"showdown": "^1.8.6",
|
||||
"style-loader": "^0.18.2",
|
||||
"styled-components": "^3.2.6",
|
||||
"url-loader": "^0.5.9",
|
||||
"webpack": "^3.5.5",
|
||||
"webpack-bundle-analyzer": "^2.9.0",
|
||||
@ -115,4 +117,4 @@
|
||||
"webpack-hot-middleware": "^2.18.2",
|
||||
"whatwg-fetch": "^2.0.3"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-knex",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Knex hook for the Strapi framework",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-lint",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Strapi eslint and prettier configurations",
|
||||
"directories": {
|
||||
"lib": "lib"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-middleware-views",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Views hook to enable server-side rendering for the Strapi framework",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -21,7 +21,8 @@ module.exports = {
|
||||
.findOne({
|
||||
[this.primaryKey]: params[this.primaryKey] || params.id
|
||||
})
|
||||
.populate(this.associations.map(x => x.alias).join(' '));
|
||||
.populate(this.associations.map(x => x.alias).join(' '))
|
||||
.lean();
|
||||
|
||||
// Only update fields which are on this document.
|
||||
const values = params.parseRelationships === false ? params.values : Object.keys(JSON.parse(JSON.stringify(params.values))).reduce((acc, current) => {
|
||||
@ -270,13 +271,17 @@ module.exports = {
|
||||
However the upload doesn't need this method. It only uses the `removeRelationMorph`.
|
||||
*/
|
||||
|
||||
const entry = (
|
||||
let entry = (
|
||||
await this
|
||||
.findOne({
|
||||
[this.primaryKey]: getValuePrimaryKey(params, this.primaryKey)
|
||||
})
|
||||
.toJSON()
|
||||
);
|
||||
|
||||
if (entry) {
|
||||
entry = entry.toJSON();
|
||||
}
|
||||
|
||||
const value = [];
|
||||
|
||||
// Retrieve association.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-mongoose",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Mongoose hook for the Strapi framework",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
@ -19,7 +19,7 @@
|
||||
"mongoose": "^5.0.16",
|
||||
"mongoose-float": "^1.0.2",
|
||||
"pluralize": "^6.0.0",
|
||||
"strapi-utils": "3.0.0-alpha.12.1.3"
|
||||
"strapi-utils": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"strapi": {
|
||||
"isHook": true
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
coverage
|
||||
node_modules
|
||||
stats.json
|
||||
layout.json
|
||||
config/layout.json
|
||||
package-lock.json
|
||||
|
||||
# Cruft
|
||||
|
||||
@ -1 +1 @@
|
||||
{}
|
||||
{}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-plugin-content-manager",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "A powerful UI to easily manage your data.",
|
||||
"strapi": {
|
||||
"name": "Content Manager",
|
||||
@ -19,11 +19,11 @@
|
||||
"generate": "node ./node_modules/plop/plop.js --plopfile ./node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
|
||||
"prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
|
||||
"test": "echo \"Error: no test specified\"",
|
||||
"prepublishOnly": "npm run build"
|
||||
"prepublishOnly": "IS_MONOREPO=true npm run build"
|
||||
},
|
||||
"devDependencies": {
|
||||
"react-select": "^1.0.0-rc.5",
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.1.3"
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"name": "Strapi team",
|
||||
@ -46,4 +46,4 @@
|
||||
"npm": ">= 5.0.0"
|
||||
},
|
||||
"license": "MIT"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-plugin-content-type-builder",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Strapi plugin to create content type (API).",
|
||||
"strapi": {
|
||||
"name": "Content Type Builder",
|
||||
@ -19,15 +19,15 @@
|
||||
"generate": "node ./node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
|
||||
"prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
|
||||
"test": "echo \"Error: no test specified\"",
|
||||
"prepublishOnly": "npm run build"
|
||||
"prepublishOnly": "IS_MONOREPO=true npm run build"
|
||||
},
|
||||
"dependencies": {
|
||||
"pluralize": "^7.0.0",
|
||||
"strapi-generate": "3.0.0-alpha.12.1.3",
|
||||
"strapi-generate-api": "3.0.0-alpha.12.1.3"
|
||||
"strapi-generate": "3.0.0-alpha.12.2",
|
||||
"strapi-generate-api": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.1.3"
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"name": "Strapi team",
|
||||
@ -50,4 +50,4 @@
|
||||
"npm": ">= 5.0.0"
|
||||
},
|
||||
"license": "MIT"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-plugin-email",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "This is the description of the plugin.",
|
||||
"strapi": {
|
||||
"name": "Email",
|
||||
@ -24,7 +24,7 @@
|
||||
"sendmail": "^1.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.1.3"
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"name": "Strapi team",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-plugin-graphql",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "This is the description of the plugin.",
|
||||
"strapi": {
|
||||
"name": "graphql",
|
||||
@ -28,7 +28,7 @@
|
||||
"graphql-tools": "^2.23.1",
|
||||
"graphql-type-json": "^0.2.0",
|
||||
"pluralize": "^7.0.0",
|
||||
"strapi-utils": "3.0.0-alpha.12.1.3"
|
||||
"strapi-utils": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"name": "A Strapi developer",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-plugin-settings-manager",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Strapi plugin to manage settings.",
|
||||
"strapi": {
|
||||
"name": "Settings Manager",
|
||||
@ -20,12 +20,12 @@
|
||||
"lint": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/eslint --ignore-path .gitignore --ignore-pattern '/admin/build/' --config ./node_modules/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json admin",
|
||||
"prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
|
||||
"test": "npm run lint",
|
||||
"prepublishOnly": "npm run build"
|
||||
"prepublishOnly": "IS_MONOREPO=true npm run build"
|
||||
},
|
||||
"devDependencies": {
|
||||
"flag-icon-css": "^2.8.0",
|
||||
"react-select": "^1.0.0-rc.5",
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.1.3"
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"name": "Strapi team",
|
||||
@ -48,4 +48,4 @@
|
||||
"npm": ">= 5.0.0"
|
||||
},
|
||||
"license": "MIT"
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ module.exports = {
|
||||
});
|
||||
|
||||
if (params.sort) {
|
||||
qb.orderByRaw(params.sort);
|
||||
qb.orderBy(params.sort.key, params.sort.order);
|
||||
}
|
||||
|
||||
if (params.start) {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-plugin-upload",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "This is the description of the plugin.",
|
||||
"strapi": {
|
||||
"name": "Files Upload",
|
||||
@ -19,16 +19,16 @@
|
||||
"generate": "node ./node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
|
||||
"prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
|
||||
"test": "echo \"Error: no test specified\"",
|
||||
"prepublishOnly": "npm run build"
|
||||
"prepublishOnly": "IS_MONOREPO=true npm run build"
|
||||
},
|
||||
"dependencies": {
|
||||
"react-copy-to-clipboard": "^5.0.1",
|
||||
"strapi-upload-local": "3.0.0-alpha.12.1.3",
|
||||
"strapi-upload-local": "3.0.0-alpha.12.2",
|
||||
"stream-to-array": "^2.3.0",
|
||||
"uuid": "^3.2.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.1.3"
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"name": "A Strapi developer",
|
||||
@ -47,4 +47,4 @@
|
||||
"npm": ">= 3.0.0"
|
||||
},
|
||||
"license": "MIT"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@ coverage
|
||||
build
|
||||
node_modules
|
||||
jwt.json
|
||||
layout.json
|
||||
config/layout.json
|
||||
actions.json
|
||||
|
||||
# Cruft
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
width: 17px;
|
||||
padding-top: 2px;
|
||||
> i {
|
||||
font-size: 20px;
|
||||
font-size: 15px;
|
||||
}
|
||||
}
|
||||
> div:last-child {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-plugin-users-permissions",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Protect your API with a full-authentication process based on JWT",
|
||||
"strapi": {
|
||||
"name": "Roles & Permissions",
|
||||
@ -19,7 +19,7 @@
|
||||
"generate": "node ./node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js",
|
||||
"prettier": "node ./node_modules/strapi-helper-plugin/node_modules/.bin/prettier --single-quote --trailing-comma es5 --write \"{admin,__{tests,mocks}__}/**/*.js\"",
|
||||
"test": "echo \"Error: no test specified\"",
|
||||
"prepublishOnly": "npm run build"
|
||||
"prepublishOnly": "IS_MONOREPO=true npm run build"
|
||||
},
|
||||
"dependencies": {
|
||||
"bcryptjs": "^2.4.3",
|
||||
@ -31,7 +31,7 @@
|
||||
"uuid": "^3.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.1.3"
|
||||
"strapi-helper-plugin": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"name": "Strapi team",
|
||||
@ -54,4 +54,4 @@
|
||||
"npm": ">= 5.0.0"
|
||||
},
|
||||
"license": "MIT"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-redis",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Redis hook for the Strapi framework",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
@ -18,7 +18,7 @@
|
||||
"ioredis": "^3.1.2",
|
||||
"lodash": "^4.17.4",
|
||||
"stack-trace": "0.0.10",
|
||||
"strapi-utils": "3.0.0-alpha.12.1.3"
|
||||
"strapi-utils": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"strapi": {
|
||||
"isHook": true
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-upload-aws-s3",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "AWS S3 provider for strapi upload",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-upload-cloudinary",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Cloudinary provider for strapi upload",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-upload-local",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Local provider for strapi upload",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-upload-rackspace",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Rackspace provider for strapi upload",
|
||||
"main": "./lib",
|
||||
"scripts": {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi-utils",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "Shared utilities for the Strapi packages",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "strapi",
|
||||
"version": "3.0.0-alpha.12.1.3",
|
||||
"version": "3.0.0-alpha.12.2",
|
||||
"description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
|
||||
"homepage": "http://strapi.io",
|
||||
"keywords": [
|
||||
@ -55,16 +55,16 @@
|
||||
"rimraf": "^2.6.2",
|
||||
"semver": "^5.4.1",
|
||||
"stack-trace": "0.0.10",
|
||||
"strapi-generate": "3.0.0-alpha.12.1.3",
|
||||
"strapi-generate-admin": "3.0.0-alpha.12.1.3",
|
||||
"strapi-generate-api": "3.0.0-alpha.12.1.3",
|
||||
"strapi-generate-controller": "3.0.0-alpha.12.1.3",
|
||||
"strapi-generate-model": "3.0.0-alpha.12.1.3",
|
||||
"strapi-generate-new": "3.0.0-alpha.12.1.3",
|
||||
"strapi-generate-plugin": "3.0.0-alpha.12.1.3",
|
||||
"strapi-generate-policy": "3.0.0-alpha.12.1.3",
|
||||
"strapi-generate-service": "3.0.0-alpha.12.1.3",
|
||||
"strapi-utils": "3.0.0-alpha.12.1.3"
|
||||
"strapi-generate": "3.0.0-alpha.12.2",
|
||||
"strapi-generate-admin": "3.0.0-alpha.12.2",
|
||||
"strapi-generate-api": "3.0.0-alpha.12.2",
|
||||
"strapi-generate-controller": "3.0.0-alpha.12.2",
|
||||
"strapi-generate-model": "3.0.0-alpha.12.2",
|
||||
"strapi-generate-new": "3.0.0-alpha.12.2",
|
||||
"strapi-generate-plugin": "3.0.0-alpha.12.2",
|
||||
"strapi-generate-policy": "3.0.0-alpha.12.2",
|
||||
"strapi-generate-service": "3.0.0-alpha.12.2",
|
||||
"strapi-utils": "3.0.0-alpha.12.2"
|
||||
},
|
||||
"author": {
|
||||
"email": "hi@strapi.io",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user