Adjust design

This commit is contained in:
cyril lopez 2017-08-09 19:47:39 +02:00
parent dd18a57ebc
commit 81c8a643e4
27 changed files with 286 additions and 289 deletions

View File

@ -36,7 +36,7 @@
color: #1C5DE7;
line-height: 1.6rem;
border: 0.1rem solid #1C5DE7;
font-weight: 600;
font-weight: 500;
font-size: 1.3rem;
padding-left: 1.6rem;
padding-right: 1.6rem;

View File

@ -1,6 +1,6 @@
.contentHeader { /* stylelint-disable */
position: relative;
margin: 3rem 4rem 3.3rem 4rem;
margin: 2.4rem 4rem 3.3rem 4rem;
font-family: Lato;
}
@ -9,6 +9,7 @@
font-family: Lato;
font-size: 2.4rem;
line-height: 2.9rem;
font-weight: 600;
}
.subTitle {

View File

@ -4,25 +4,26 @@
.formContainer {
margin: 0 3.3rem;
padding: 2rem 1.2rem 5.8rem 1.2rem;
padding: 2rem 1.2rem 0rem 1.2rem;
border-radius: 0.2rem;
background-color: #FFFFFF;
box-shadow: 0 0.2rem 0.4rem 0 #E3E9F3;
> div > hr {
// margin-top: 2.3rem;
margin-top: -.5rem;
margin-left: 1.5rem;
margin-right: 1.5rem;
border-top: 1px solid #F6F6F6;
}
}
.buttonContainer {
position: absolute;
top: 3.3rem;
top: 2.8rem;
right: 0rem;
padding-right: 1.6rem;
}
.sectionContainer {
margin-bottom: 1.7rem;
margin-bottom: 1.9rem;
}

View File

@ -16,6 +16,7 @@ class EditFormSection extends React.Component { // eslint-disable-line react/pre
render() {
const sectionName = isEmpty(this.props.section.name) ? '' : <FormattedMessage {...{id: this.props.section.name}} />;
const spacer = !isEmpty(sectionName) ? <div className={this.props.styles.spacer} /> : '';
const sectionNameSpacer = !sectionName ? <div style={{height: '.2rem'}} /> : '';
return (
<div className={this.props.styles.editFormSection}>
<div className="container-fluid">
@ -25,6 +26,7 @@ class EditFormSection extends React.Component { // eslint-disable-line react/pre
{sectionName}
</span>
{spacer}
{sectionNameSpacer}
</div>
{map(this.props.section.items, (item, key) => {

View File

@ -1,11 +1,21 @@
.headerNav { /* stylelint-disable */
// margin-right: 15px;
}
.headerContainer {
display: flex;
flex-direction: row;
margin: 0 1.8rem;
border-radius: 2px;
> a {
box-shadow: 1px 0 0px -2px rgba(0,0,0,0.05), inset 0px -1px 0px -2px rgba(0,0,0,0.05);
&:first-child {
border-radius: 2px 0 0 0;
}
&:last-child {
border-radius: 0 2px 0 0;
}
}
}
.headerLink {
@ -13,7 +23,7 @@
display: flex;
flex: 1 100%;
height: 3.6rem;
border-radius: 1px 0 0 0;
border-radius: 2px 0 0 0;
background-color: rgba(14,22,34,0.05);
text-decoration: none !important;
font-family: Lato;
@ -26,10 +36,11 @@
background-color: #FFFFFF;
font-weight: bold;
text-decoration: none !important;
box-shadow: 1px 0 0 -2px rgba(0,0,0,0.05)!important;
> div {
&:first-child {
position: absolute;
height: 0.3rem;
height: 0.2rem;
top: 0rem;
width: 100%;
background-color: #1C5DE7;

View File

@ -1,14 +1,19 @@
.inputEnum { /* stylelint-disable */
margin-top: 1.8rem;
// margin-top: 1.8rem;
margin-top: -.3rem;
}
.enumLabel {
margin-bottom: 0.5rem;
margin-bottom: 0.4rem;
font-weight: 500;
}
.button {
height: 3.4rem;
padding: 0 1rem 0.5rem 1rem;
margin-top: .6rem;
margin-bottom: 2.8rem;
padding: 0 1.5rem 0.5rem 1.5rem;
line-height: 3.2rem;
border: 1px solid #E3E9F3;
color: #333740;
@ -23,5 +28,8 @@
.active {
background: linear-gradient(315deg, #0097F6 0%, #005EEA 100%);
font-family: Lato!important;
font-weight: 800;
color: white !important;
}

View File

@ -5,6 +5,7 @@
> label {
text-transform: capitalize;
margin-bottom: .8rem;
font-weight: 500;
}
> select {
font-size: 1.3rem;
@ -12,6 +13,8 @@
color: #333740;
height: 3.5rem!important;
border-radius: 0rem!important;
border: 1px solid #E3E9F3;
padding-left: 1rem;
}
}

View File

@ -144,6 +144,7 @@ class InputText extends React.Component { // eslint-disable-line react/prefer-st
const placeholder = this.props.placeholder || this.props.name;
const label = this.props.name ? <label htmlFor={this.props.name}><FormattedMessage {...{id: this.props.name}} /></label> : '';
const spacer = !this.props.name ? {marginTop: '2.8rem'} : {marginTop: ''};
const input = placeholder ? this.renderFormattedInput(handleBlur, inputValue, placeholder)
: <input
@ -162,7 +163,7 @@ class InputText extends React.Component { // eslint-disable-line react/prefer-st
const requiredClass = this.props.validations.required && this.props.addRequiredInputDesign ? this.props.styles.requiredClass : '';
return (
<div className={`${this.props.styles.inputText} ${bootStrapClass} ${requiredClass} ${bootStrapClassDanger}`}>
<div className={`${this.props.styles.inputText} ${bootStrapClass} ${requiredClass} ${bootStrapClassDanger}`} style={spacer}>
{label}
{input}
<small>{this.props.inputDescription}</small>

View File

@ -56,12 +56,12 @@ class InputToggle extends React.Component { // eslint-disable-line react/prefer-
const btnClassOff = this.state.isChecked ? 'btn ' : `btn ${styles.gradientOff}`;
const btnClassOn = this.state.isChecked ? `btn ${styles.gradientOn}` : 'btn';
const customBootstrapClass = this.props.customBootstrapClass ? this.props.customBootstrapClass : 'col-md-4';
const label = this.props.hiddenLabel ? ''
: <div className={styles.toggleLabel}><FormattedMessage {...{id: this.props.name}} /></div>;
const resized = this.props.hiddenLabel ? { marginTop: '-1rem'} : { marginTop: ''};
return (
<div className={`${customBootstrapClass} ${styles.container}`}>
<div className={styles.toggleLabel}>
<FormattedMessage {...{id: this.props.name}} />
</div>
<div className={`${customBootstrapClass} ${styles.container}`} style={resized}>
{label}
<div className={`${styles.inputToggle} btn-group`} data-toggle="buttons">
<button className={btnClassOff} id="off" onClick={this.toggle}>OFF</button>
<button className={btnClassOn} id="on" onClick={this.toggle}>ON</button>
@ -74,6 +74,7 @@ class InputToggle extends React.Component { // eslint-disable-line react/prefer-
InputToggle.propTypes = {
customBootstrapClass: React.PropTypes.string,
handleChange: React.PropTypes.func.isRequired,
hiddenLabel: React.PropTypes.bool,
isChecked: React.PropTypes.bool,
name: React.PropTypes.string,
target: React.PropTypes.string.isRequired,

View File

@ -1,6 +1,6 @@
.container {
// margin-top: 1.7rem;
padding-top: .2rem;
// padding-top: .2rem;
}
.inputToggle { /* stylelint-disable */
@ -10,9 +10,11 @@
width: 5.3rem;
height: 3.4rem;
padding: 0;
line-height: 3.2rem;
line-height: 3.4rem;
border: 1px solid #E3E9F3;
// margin-bottom: 1rem;
margin-bottom: 2.8rem;
// color
color: #333740;
background-color: white;
@ -23,9 +25,11 @@
font-family: Lato;
&:first-of-type {
border-right: none;
box-shadow: inset 4px 0 0px -2px rgba(0,0,0,0.05), inset 0px -4px 0px -2px rgba(0,0,0,0.05), 0px -4px 0px -2px rgba(0,0,0,0.05);
}
&:nth-of-type(2) {
border-left: none;
box-shadow: inset -4px 0 0px -2px rgba(0,0,0,0.05), inset 0px -4px 0px -2px rgba(0,0,0,0.05), 0px -4px 0px -2px rgba(0,0,0,0.05);
}
&:hover {
z-index: 0 !important;
@ -36,16 +40,18 @@
.gradientOff {
background-image: linear-gradient( to bottom right, #F65A1D, #F68E0E );
color: white !important;
box-shadow: none!important;
}
.gradientOn {
background-image: linear-gradient( to bottom right, #005EEA, #0097F6);
color: white !important;
box-shadow: none!important;
}
.toggleLabel {
margin-bottom: .7rem;
font-weight: 500;
margin-bottom: 1rem;
font-size: 1.3rem;
line-height: 1.6rem;
}

View File

@ -90,10 +90,12 @@ class List extends React.Component { // eslint-disable-line react/prefer-statele
onClick={this.toggle}
/>;
const addListTitleMarginTop = this.props.addListTitleMarginTop ? styles.paddedTopList : '';
return (
<div className={styles.listContainer}>
<div className={styles.listSubContainer}>
<div className={styles.flex}>
<div className={`${addListTitleMarginTop} ${styles.flex}`}>
<div className={styles.titleContainer}>
{this.props.listTitle}
</div>
@ -154,6 +156,7 @@ class List extends React.Component { // eslint-disable-line react/prefer-statele
List.propTypes = {
actionBeforeOpenPopUp: React.PropTypes.func,
addListTitleMarginTop: React.PropTypes.bool,
handlei18n: React.PropTypes.bool,
handleListPopUpSubmit: React.PropTypes.func,
listButtonLabel: React.PropTypes.string,

View File

@ -11,6 +11,10 @@
box-shadow: 0 0.2rem 0.4rem 0 #E3E9F3;
}
.paddedTopList {
margin-top: 2.7rem!important;
}
.flex {
display: flex;
justify-content: space-between;
@ -112,7 +116,7 @@
.bordered {
margin-left: 3rem;
margin-right: 3rem;
border: 1px solid #F6F6F6;
border-bottom: 1px solid #F6F6F6;
}
.noBorder {
@ -181,6 +185,11 @@
font-size: 1.8rem!important;
}
> button {
> span {
color: #0E1622!important;
}
}
}
@ -224,3 +233,15 @@
.spacerSmall {
margin-bottom: 0rem;
}
.ico {
color: #0E1622;
> i {
font-size: 1.1rem;
}
}
.databaseFont {
font-size: 1.3rem;
}

View File

@ -1,7 +1,8 @@
.pluginLeftMenu { /* stylelint-disable */
min-height: calc(100vh - 6rem); // TODO should be a global variable
border-radius: 1px;
background-color: rgba(14,22,34,0.03);
// background-color: rgba(14,22,34,0.03);
background-color: #F2F3F4;
box-shadow: inset 0 0 0.2rem 0 rgba(0,0,0,0.05);
padding-top: 1rem;
padding-top: .4rem;
}

View File

@ -35,7 +35,9 @@ class PluginLeftMenuLink extends React.Component { // eslint-disable-line react/
return (
<li className={styles.pluginLeftMenuLink}>
<Link className={styles.link} to={`/plugins/settings-manager/${url}`} activeClassName={styles.linkActive}>
<i className={`fa fa-${this.props.link.icon}`} />
<div>
<i className={`fa fa-${this.props.link.icon}`} />
</div>
<span><FormattedMessage {...{id: this.props.link.name}} /></span>
</Link>
</li>

View File

@ -8,19 +8,22 @@ li:not(:first-child) {
}
.link {
display: block;
display: flex;
margin-left: 2rem;
margin-right: .5rem;
padding-top: 1rem;
padding-left: .6rem;
padding-left: 1rem;
min-height: 3.4rem;
border-left: 0.4rem solid transparent;
color: #2C3138 !important;
text-decoration: none !important;
line-height: 1.6rem;
> i {
> div {
width: 1.3rem;
margin-right: 1rem;
> i {
color: #666B74;
// color: blue;
}
}
}
@ -31,4 +34,10 @@ li:not(:first-child) {
font-weight: bold;
text-decoration: none;
color: #2D3138 !important;
> div {
> i {
color: #2D3138;
}
}
}

View File

@ -2,6 +2,7 @@
margin-top: 3.3rem;
> p {
-webkit-font-smoothing: antialiased;
margin: 0;
padding-left: 1.5rem;
line-height: 1.3rem;

View File

@ -23,6 +23,7 @@ class PopUpForm extends React.Component { // eslint-disable-line react/prefer-st
{map(this.props.sections, (section) => {
// custom rendering
if (this.props.renderPopUpForm) {
console.log('ook')
// Need to pass props to use this.props.renderInput from WithFormSection HOC
return this.props.renderPopUpForm(section, this.props, styles);
}

View File

@ -46,20 +46,20 @@ class RowDatabase extends React.Component { // eslint-disable-line react/prefer-
render() {
return (
<li>
<li className={styles.databaseFont}>
<div className={styles.flexLi}>
<div className={styles.flexed} onClick={this.showDatabaseModal} style={{ cursor: 'pointer' }}>
<div className={styles.squared} style={{ backgroundColor: this.props.data.color }}>
{this.props.data.letter}
</div>
<div className={styles.label}>{this.props.data.name}</div>
<div className={styles.label} style={{ fontWeight: '500'}}>{this.props.data.name}</div>
</div>
<div onClick={this.showDatabaseModal} style={{ cursor: 'pointer' }}>{this.props.data.database}</div>
<div className={styles.centered} style={{ width: '15rem', cursor: 'pointer'}} onClick={this.showDatabaseModal}>{this.props.data.host}</div>
<div onClick={this.showDatabaseModal} style={{ cursor: 'pointer' }}>{this.props.data.host}</div>
<div className={styles.centered} style={{ width: '15rem', cursor: 'pointer'}} onClick={this.showDatabaseModal}>{this.props.data.database}</div>
<div className={styles.flexed} style={{ width: '4rem', justifyContent: 'space-between'}}>
<div><i className="fa fa-pencil" style={{ cursor: 'pointer' }} onClick={this.showDatabaseModal} id={this.props.data.name} /></div>
<div className={styles.leftSpaced}><i id={this.props.data.name} className="fa fa-trash" onClick={this.toggleWarning} /></div>
<div className={styles.ico}><i className="fa fa-pencil" style={{ cursor: 'pointer' }} onClick={this.showDatabaseModal} id={this.props.data.name} /></div>
<div className={`${styles.leftSpaced} ${styles.ico}`}><i id={this.props.data.name} className="fa fa-trash" onClick={this.toggleWarning} /></div>
</div>
</div>
<div>

View File

@ -28,7 +28,7 @@ class RowLanguage extends React.Component { // eslint-disable-line react/prefer-
render() {
// assign the target id the language name to prepare for delete
const deleteIcon = this.props.active ? '' : <i className="fa fa-trash" onClick={this.toggleWarning} id={this.props.name} />; // eslint-disable-line jsx-a11y/no-static-element-interactions
const deleteIcon = this.props.active ? '' : <i className="fa fa-trash" style={{ fontSize: '1.1rem', color: 'rgba(14,22,34,0.75);'}} onClick={this.toggleWarning} id={this.props.name} />; // eslint-disable-line jsx-a11y/no-static-element-interactions
// format the locale to
const defaultLanguageArray = formatLanguageLocale(this.props.name);

View File

@ -2,5 +2,6 @@
"application.description": "col-md-6 offset-md-6 pull-md-6",
"application.version": "col-md-6 offset-md-6 pull-md-6",
"databases.connections.${name}.settings.host": "col-md-12",
"database.connections.settings.host": "col-md-12"
"database.connections.settings.host": "col-md-12",
"database.connections.settings.port": "col-md-6"
}

View File

@ -5,7 +5,7 @@
*/
import React from 'react';
import { forEach, has, isObject , join, pullAt, split} from 'lodash';
import { forEach, has, isObject , join, pullAt, split, includes} from 'lodash';
import InputNumber from 'components/InputNumber';
import InputText from 'components/InputText';
@ -102,6 +102,7 @@ const WithFormSection = (InnerComponent) => class extends React.Component {
// custom handleChange props for nested input form
const handleChange = this.state.hasNestedInput ? this.handleChange : this.props.handleChange;
const hiddenLabel = includes(props.name, 'enabled');
return (
<Input
@ -115,6 +116,8 @@ const WithFormSection = (InnerComponent) => class extends React.Component {
validations={props.validations}
value={inputValue}
addRequiredInputDesign={this.props.addRequiredInputDesign}
hiddenLabel={hiddenLabel}
inputDescription={props.description}
/>
);
}

View File

@ -19,18 +19,18 @@
.subNestedFormContainer {
margin: 1rem 15px .2rem 15px;
margin: -2.3rem 15px 0.1rem 15px;
padding: 0 2rem;
background: #FAFAFB;
}
.spacer {
height: 1.5rem;
height: 1.7rem;
}
.nesTedFormContainer {
margin-top: 1rem;
padding-top: .2rem;
margin-bottom: .5rem;
// margin-top: rem;
padding-top: 0rem;
// margin-bottom: .5rem;
}

View File

@ -3,20 +3,26 @@
font-size: 1.3rem;
font-family: Lato;
> label {
font-weight: 500;
text-transform: capitalize;
}
> small {
margin-top: .5rem;
margin-top: -1.5rem;
margin-bottom: 1.8rem;
display: block;
color: #ABAFBB;
}
> input {
margin-top: 4px;
margin-bottom: 1.1rem;
margin-bottom: 2.8rem;
padding-left: 1rem;
border-radius: 0.25rem;
border: 1px solid #E3E9F3;
height: 3.4rem;
line-height: 1.6rem;
line-height: 3.4rem;
font-size: 1.3rem;
font-family: Lato!important;
background-size: 0!important;
}
}
@ -25,20 +31,27 @@
font-family: Lato!important;
font-size: 1.3rem;
> label {
font-size: 1.3rem;
font-weight: 500;
text-transform: capitalize;
}
> small {
margin-top: .5rem;
margin-top: -1.5rem;
margin-bottom: 1.8rem;
display: block;
color: #ABAFBB;
}
> input {
margin-top: 4px;
margin-bottom: 1.1rem;
margin-bottom: 2.8rem;
padding-left: 1rem;
height: 3.4rem;
border-radius: 0.25rem;
line-height: 1.6rem;
border: 1px solid #E3E9F3;
line-height: 3.4rem;
font-family: Lato!important;
font-size: 1.3rem;
background-size: 0!important;
}
}
@ -62,3 +75,21 @@
content: "*";
}
}
::-webkit-input-placeholder { /* WebKit, Blink, Edge */
color: #919BAE!important;
}
:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
color: #919BAE!important;
opacity: 1;
}
::-moz-placeholder { /* Mozilla Firefox 19+ */
color: #919BAE!important;
opacity: 1;
}
:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: #919BAE!important;
}
::-ms-input-placeholder { /* Microsoft Edge */
color: #919BAE!important;
}

View File

@ -4,7 +4,7 @@
background: #fff !important;
}
.baseline {
// display: none;
display: none;
z-index: 100001;
opacity: .2;
position: absolute;

View File

@ -346,6 +346,7 @@ export class HomePage extends React.Component { // eslint-disable-line react/pre
let renderPopUpForm = false;
let renderRow = false;
let actionBeforeOpenPopUp;
let addListTitleMarginTop;
switch (this.props.params.slug) {
case 'languages':
@ -362,6 +363,7 @@ export class HomePage extends React.Component { // eslint-disable-line react/pre
handleListPopUpSubmit = this.addConnection;
renderRow = this.renderRowDatabase;
actionBeforeOpenPopUp = this.emptyDbModifiedData;
addListTitleMarginTop = true;
break;
default:
sections = this.props.home.configsDisplay.sections;
@ -392,6 +394,7 @@ export class HomePage extends React.Component { // eslint-disable-line react/pre
cancelAction={this.props.home.cancelAction}
actionBeforeOpenPopUp={actionBeforeOpenPopUp}
addRequiredInputDesign={addRequiredInputDesign}
addListTitleMarginTop={addListTitleMarginTop}
/>
);
}

View File

@ -1434,15 +1434,13 @@
"dependencies": {
"abbrev": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
"integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
"bundled": true,
"dev": true,
"optional": true
},
"ajv": {
"version": "4.11.8",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1452,21 +1450,18 @@
},
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"bundled": true,
"dev": true
},
"aproba": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
"integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=",
"bundled": true,
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
"integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1476,49 +1471,42 @@
},
"asn1": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
"bundled": true,
"dev": true,
"optional": true
},
"assert-plus": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
"bundled": true,
"dev": true,
"optional": true
},
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
"bundled": true,
"dev": true,
"optional": true
},
"aws-sign2": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
"integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
"bundled": true,
"dev": true,
"optional": true
},
"aws4": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
"bundled": true,
"dev": true,
"optional": true
},
"balanced-match": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
"bundled": true,
"dev": true
},
"bcrypt-pbkdf": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1527,8 +1515,7 @@
},
"block-stream": {
"version": "0.0.9",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
"bundled": true,
"dev": true,
"requires": {
"inherits": "2.0.3"
@ -1536,8 +1523,7 @@
},
"boom": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
"bundled": true,
"dev": true,
"requires": {
"hoek": "2.16.3"
@ -1545,8 +1531,7 @@
},
"brace-expansion": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
"integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
"bundled": true,
"dev": true,
"requires": {
"balanced-match": "0.4.2",
@ -1555,34 +1540,29 @@
},
"buffer-shims": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
"integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
"bundled": true,
"dev": true
},
"caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
"bundled": true,
"dev": true,
"optional": true
},
"co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
"bundled": true,
"dev": true,
"optional": true
},
"code-point-at": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"bundled": true,
"dev": true
},
"combined-stream": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
"bundled": true,
"dev": true,
"requires": {
"delayed-stream": "1.0.0"
@ -1590,26 +1570,22 @@
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"bundled": true,
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"bundled": true,
"dev": true
},
"core-util-is": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"bundled": true,
"dev": true
},
"cryptiles": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1618,8 +1594,7 @@
},
"dashdash": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1628,8 +1603,7 @@
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"bundled": true,
"dev": true,
"optional": true
}
@ -1637,8 +1611,7 @@
},
"debug": {
"version": "2.6.8",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1647,28 +1620,24 @@
},
"deep-extend": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
"integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
"bundled": true,
"dev": true,
"optional": true
},
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"bundled": true,
"dev": true
},
"delegates": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"bundled": true,
"dev": true,
"optional": true
},
"ecc-jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1677,28 +1646,24 @@
},
"extend": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
"bundled": true,
"dev": true,
"optional": true
},
"extsprintf": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
"integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
"bundled": true,
"dev": true
},
"forever-agent": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
"bundled": true,
"dev": true,
"optional": true
},
"form-data": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1709,14 +1674,12 @@
},
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"bundled": true,
"dev": true
},
"fstream": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
"bundled": true,
"dev": true,
"requires": {
"graceful-fs": "4.1.11",
@ -1727,8 +1690,7 @@
},
"fstream-ignore": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
"integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1739,8 +1701,7 @@
},
"gauge": {
"version": "2.7.4",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1756,8 +1717,7 @@
},
"getpass": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1766,8 +1726,7 @@
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"bundled": true,
"dev": true,
"optional": true
}
@ -1775,8 +1734,7 @@
},
"glob": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"bundled": true,
"dev": true,
"requires": {
"fs.realpath": "1.0.0",
@ -1789,21 +1747,18 @@
},
"graceful-fs": {
"version": "4.1.11",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
"bundled": true,
"dev": true
},
"har-schema": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
"integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
"bundled": true,
"dev": true,
"optional": true
},
"har-validator": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
"integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1813,15 +1768,13 @@
},
"has-unicode": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"bundled": true,
"dev": true,
"optional": true
},
"hawk": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1833,14 +1786,12 @@
},
"hoek": {
"version": "2.16.3",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
"bundled": true,
"dev": true
},
"http-signature": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1851,8 +1802,7 @@
},
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"bundled": true,
"dev": true,
"requires": {
"once": "1.4.0",
@ -1861,21 +1811,18 @@
},
"inherits": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"bundled": true,
"dev": true
},
"ini": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
"integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
"bundled": true,
"dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"bundled": true,
"dev": true,
"requires": {
"number-is-nan": "1.0.1"
@ -1883,28 +1830,24 @@
},
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"bundled": true,
"dev": true,
"optional": true
},
"isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"bundled": true,
"dev": true
},
"isstream": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
"bundled": true,
"dev": true,
"optional": true
},
"jodid25519": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
"integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1913,22 +1856,19 @@
},
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
"bundled": true,
"dev": true,
"optional": true
},
"json-schema": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
"bundled": true,
"dev": true,
"optional": true
},
"json-stable-stringify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1937,22 +1877,19 @@
},
"json-stringify-safe": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
"bundled": true,
"dev": true,
"optional": true
},
"jsonify": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
"bundled": true,
"dev": true,
"optional": true
},
"jsprim": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
"integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -1964,8 +1901,7 @@
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"bundled": true,
"dev": true,
"optional": true
}
@ -1973,14 +1909,12 @@
},
"mime-db": {
"version": "1.27.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
"integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
"bundled": true,
"dev": true
},
"mime-types": {
"version": "2.1.15",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
"bundled": true,
"dev": true,
"requires": {
"mime-db": "1.27.0"
@ -1988,8 +1922,7 @@
},
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"bundled": true,
"dev": true,
"requires": {
"brace-expansion": "1.1.7"
@ -1997,14 +1930,12 @@
},
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"bundled": true,
"dev": true
},
"mkdirp": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"bundled": true,
"dev": true,
"requires": {
"minimist": "0.0.8"
@ -2012,15 +1943,13 @@
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"bundled": true,
"dev": true,
"optional": true
},
"node-pre-gyp": {
"version": "0.6.36",
"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
"integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2037,8 +1966,7 @@
},
"nopt": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2048,8 +1976,7 @@
},
"npmlog": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
"integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2061,28 +1988,24 @@
},
"number-is-nan": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"bundled": true,
"dev": true
},
"oauth-sign": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
"bundled": true,
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"bundled": true,
"dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"bundled": true,
"dev": true,
"requires": {
"wrappy": "1.0.2"
@ -2090,22 +2013,19 @@
},
"os-homedir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
"bundled": true,
"dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"bundled": true,
"dev": true,
"optional": true
},
"osenv": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
"integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2115,41 +2035,35 @@
},
"path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"bundled": true,
"dev": true
},
"performance-now": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
"bundled": true,
"dev": true,
"optional": true
},
"process-nextick-args": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
"bundled": true,
"dev": true
},
"punycode": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
"bundled": true,
"dev": true,
"optional": true
},
"qs": {
"version": "6.4.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
"integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
"bundled": true,
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
"integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2161,8 +2075,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"bundled": true,
"dev": true,
"optional": true
}
@ -2170,8 +2083,7 @@
},
"readable-stream": {
"version": "2.2.9",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
"integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
"bundled": true,
"dev": true,
"requires": {
"buffer-shims": "1.0.0",
@ -2185,8 +2097,7 @@
},
"request": {
"version": "2.81.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
"integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2216,8 +2127,7 @@
},
"rimraf": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
"integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
"bundled": true,
"dev": true,
"requires": {
"glob": "7.1.2"
@ -2225,35 +2135,30 @@
},
"safe-buffer": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
"bundled": true,
"dev": true
},
"semver": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
"bundled": true,
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"bundled": true,
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"bundled": true,
"dev": true,
"optional": true
},
"sntp": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2262,8 +2167,7 @@
},
"sshpk": {
"version": "1.13.0",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
"integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2280,8 +2184,7 @@
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"bundled": true,
"dev": true,
"optional": true
}
@ -2289,8 +2192,7 @@
},
"string_decoder": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
"bundled": true,
"dev": true,
"requires": {
"safe-buffer": "5.0.1"
@ -2298,8 +2200,7 @@
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"bundled": true,
"dev": true,
"requires": {
"code-point-at": "1.1.0",
@ -2309,15 +2210,13 @@
},
"stringstream": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
"bundled": true,
"dev": true,
"optional": true
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"bundled": true,
"dev": true,
"requires": {
"ansi-regex": "2.1.1"
@ -2325,15 +2224,13 @@
},
"strip-json-comments": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"bundled": true,
"dev": true,
"optional": true
},
"tar": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
"bundled": true,
"dev": true,
"requires": {
"block-stream": "0.0.9",
@ -2343,8 +2240,7 @@
},
"tar-pack": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
"integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2360,8 +2256,7 @@
},
"tough-cookie": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
"integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2370,8 +2265,7 @@
},
"tunnel-agent": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2380,35 +2274,30 @@
},
"tweetnacl": {
"version": "0.14.5",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
"bundled": true,
"dev": true,
"optional": true
},
"uid-number": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
"integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
"bundled": true,
"dev": true,
"optional": true
},
"util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"bundled": true,
"dev": true
},
"uuid": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
"integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
"bundled": true,
"dev": true,
"optional": true
},
"verror": {
"version": "1.3.6",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
"integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2417,8 +2306,7 @@
},
"wide-align": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
"integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
@ -2427,8 +2315,7 @@
},
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"bundled": true,
"dev": true
}
}

View File

@ -555,6 +555,15 @@ module.exports = {
required: true
}
},
{
name: 'form.database.item.database',
target: `database.connections.${name}.settings.database`,
type: 'string',
value: _.get(strapi.config, `environments.${env}.database.connections.${name}.settings.database`, null),
validations: {
required: true
}
},
{
name: 'form.database.item.username',
target: `database.connections.${name}.settings.username`,
@ -570,15 +579,6 @@ module.exports = {
type: 'password',
value: _.get(strapi.config, `environments.${env}.database.connections.${name}.settings.password`, null),
validations: {}
},
{
name: 'form.database.item.database',
target: `database.connections.${name}.settings.database`,
type: 'string',
value: _.get(strapi.config, `environments.${env}.database.connections.${name}.settings.database`, null),
validations: {
required: true
}
}
]
},