Apply esformatter-jsx
This commit is contained in:
parent
283e311095
commit
6cae54bb13
16
gulpfile.js
16
gulpfile.js
|
@ -4,6 +4,7 @@ var gulp = require('gulp');
|
||||||
var prettify = require('gulp-jsbeautifier');
|
var prettify = require('gulp-jsbeautifier');
|
||||||
var babel = require('gulp-babel');
|
var babel = require('gulp-babel');
|
||||||
var changed = require('gulp-changed');
|
var changed = require('gulp-changed');
|
||||||
|
var esformatter = require('gulp-esformatter');
|
||||||
var del = require('del');
|
var del = require('del');
|
||||||
var electron = require('electron-connect').server.create({
|
var electron = require('electron-connect').server.create({
|
||||||
path: './build'
|
path: './build'
|
||||||
|
@ -13,7 +14,9 @@ var packager = require('electron-packager');
|
||||||
var sources = ['**/*.js', '**/*.css', '**/*.html', '!**/node_modules/**', '!**/build/**', '!release/**'];
|
var sources = ['**/*.js', '**/*.css', '**/*.html', '!**/node_modules/**', '!**/build/**', '!release/**'];
|
||||||
var app_root = 'src';
|
var app_root = 'src';
|
||||||
|
|
||||||
gulp.task('prettify', ['sync-meta'], function() {
|
gulp.task('prettify', ['prettify:sources', 'prettify:jsx']);
|
||||||
|
|
||||||
|
gulp.task('prettify:sources', ['sync-meta'], function() {
|
||||||
gulp.src(sources)
|
gulp.src(sources)
|
||||||
.pipe(prettify({
|
.pipe(prettify({
|
||||||
html: {
|
html: {
|
||||||
|
@ -30,6 +33,17 @@ gulp.task('prettify', ['sync-meta'], function() {
|
||||||
.pipe(gulp.dest('.'));
|
.pipe(gulp.dest('.'));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
gulp.task('prettify:jsx', function() {
|
||||||
|
return gulp.src(app_root + '/**/*.jsx')
|
||||||
|
.pipe(esformatter({
|
||||||
|
indent: {
|
||||||
|
value: ' '
|
||||||
|
},
|
||||||
|
plugins: ['esformatter-jsx']
|
||||||
|
}))
|
||||||
|
.pipe(gulp.dest(app_root));
|
||||||
|
})
|
||||||
|
|
||||||
gulp.task('build', ['build:jsx']);
|
gulp.task('build', ['build:jsx']);
|
||||||
|
|
||||||
gulp.task('build:jsx', function() {
|
gulp.task('build:jsx', function() {
|
||||||
|
|
|
@ -17,9 +17,12 @@
|
||||||
"electron-connect": "^0.3.3",
|
"electron-connect": "^0.3.3",
|
||||||
"electron-packager": "^5.1.0",
|
"electron-packager": "^5.1.0",
|
||||||
"electron-prebuilt": "^0.35.1",
|
"electron-prebuilt": "^0.35.1",
|
||||||
|
"esformatter": "^0.8.1",
|
||||||
|
"esformatter-jsx": "^4.0.6",
|
||||||
"gulp": "^3.9.0",
|
"gulp": "^3.9.0",
|
||||||
"gulp-babel": "^6.1.1",
|
"gulp-babel": "^6.1.1",
|
||||||
"gulp-changed": "^1.3.0",
|
"gulp-changed": "^1.3.0",
|
||||||
|
"gulp-esformatter": "^5.0.0",
|
||||||
"gulp-jsbeautifier": "^1.0.1",
|
"gulp-jsbeautifier": "^1.0.1",
|
||||||
"mocha": "^2.3.4",
|
"mocha": "^2.3.4",
|
||||||
"should": "^8.0.1",
|
"should": "^8.0.1",
|
||||||
|
|
|
@ -11,10 +11,14 @@ var SettingsPage = React.createClass({
|
||||||
},
|
},
|
||||||
componentDidMount: function() {
|
componentDidMount: function() {
|
||||||
var config = settings.readFileSync(this.props.configFile);
|
var config = settings.readFileSync(this.props.configFile);
|
||||||
this.setState({teams: config.teams})
|
this.setState({
|
||||||
|
teams: config.teams
|
||||||
|
})
|
||||||
},
|
},
|
||||||
handleTeamsChange: function(teams) {
|
handleTeamsChange: function(teams) {
|
||||||
this.setState({teams: teams});
|
this.setState({
|
||||||
|
teams: teams
|
||||||
|
});
|
||||||
},
|
},
|
||||||
handleOK: function() {
|
handleOK: function() {
|
||||||
var config = {
|
var config = {
|
||||||
|
@ -30,91 +34,111 @@ var SettingsPage = React.createClass({
|
||||||
render: function() {
|
render: function() {
|
||||||
return (
|
return (
|
||||||
<div className="settingsPage">
|
<div className="settingsPage">
|
||||||
<TeamList teams={this.state.teams} onTeamsChange={this.handleTeamsChange} />
|
<TeamList teams={ this.state.teams } onTeamsChange={ this.handleTeamsChange } />
|
||||||
<input type="button" value="OK" onClick={this.handleOK} />
|
<input type="button" value="OK" onClick={ this.handleOK } />
|
||||||
<input type="button" value="Cancel" onClick={this.handleCancel} />
|
<input type="button" value="Cancel" onClick={ this.handleCancel } />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var TeamList = React.createClass({
|
var TeamList = React.createClass({
|
||||||
handleTeamChange: function(index, team){
|
handleTeamChange: function(index, team) {
|
||||||
var teams = this.props.teams;
|
var teams = this.props.teams;
|
||||||
teams[index] = team;
|
teams[index] = team;
|
||||||
this.props.onTeamsChange(teams);
|
this.props.onTeamsChange(teams);
|
||||||
},
|
},
|
||||||
handleNewTeamAdd: function(team){
|
handleNewTeamAdd: function(team) {
|
||||||
var teams = this.props.teams;
|
var teams = this.props.teams;
|
||||||
teams.push(team);
|
teams.push(team);
|
||||||
this.props.onTeamsChange(teams);
|
this.props.onTeamsChange(teams);
|
||||||
},
|
},
|
||||||
render: function() {
|
render: function() {
|
||||||
var thisObj = this;
|
var thisObj = this;
|
||||||
var teamNodes = this.props.teams.map(function(team, i){
|
var teamNodes = this.props.teams.map(function(team, i) {
|
||||||
var handleTeamChange = function(team){
|
var handleTeamChange = function(team) {
|
||||||
thisObj.handleTeamChange(i, team);
|
thisObj.handleTeamChange(i, team);
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<li><TeamItem index={i} name={team.name} url={team.url} onTeamChange={handleTeamChange} onName /></li>
|
<li>
|
||||||
);
|
<TeamItem index={ i } name={ team.name } url={ team.url } onTeamChange={ handleTeamChange } onName />
|
||||||
|
</li>
|
||||||
|
);
|
||||||
});
|
});
|
||||||
return (
|
return (
|
||||||
<div className="teamList">
|
<div className="teamList">
|
||||||
<ol>
|
<ol>
|
||||||
{teamNodes}
|
{ teamNodes }
|
||||||
<li><NewTeamItem onNewTeamAdd={this.handleNewTeamAdd} /></li>
|
<li>
|
||||||
|
<NewTeamItem onNewTeamAdd={ this.handleNewTeamAdd } />
|
||||||
|
</li>
|
||||||
</ol>
|
</ol>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var TeamItem = React.createClass({
|
var TeamItem = React.createClass({
|
||||||
handleNameChange: function(e){
|
handleNameChange: function(e) {
|
||||||
this.props.onTeamChange({name: e.target.value, url: this.props.url});
|
this.props.onTeamChange({
|
||||||
|
name: e.target.value,
|
||||||
|
url: this.props.url
|
||||||
|
});
|
||||||
},
|
},
|
||||||
handleURLChange: function(e){
|
handleURLChange: function(e) {
|
||||||
this.props.onTeamChange({name: this.props.name, url: e.target.value});
|
this.props.onTeamChange({
|
||||||
|
name: this.props.name,
|
||||||
|
url: e.target.value
|
||||||
|
});
|
||||||
},
|
},
|
||||||
render: function() {
|
render: function() {
|
||||||
return (
|
return (
|
||||||
<div className="teamItem">
|
<div className="teamItem">
|
||||||
<input type="text" placeholder="Team name" value={this.props.name} onChange={this.handleNameChange} ></input>
|
<input type="text" placeholder="Team name" value={ this.props.name } onChange={ this.handleNameChange }></input>
|
||||||
<input type="text" placeholder="Team URL (http://example.com/team)" value={this.props.url} onChange={this.handleURLChange} ></input>
|
<input type="text" placeholder="Team URL (http://example.com/team)" value={ this.props.url } onChange={ this.handleURLChange }></input>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var NewTeamItem = React.createClass({
|
var NewTeamItem = React.createClass({
|
||||||
getInitialState: function(){
|
getInitialState: function() {
|
||||||
return {name: '', url: ''};
|
return {
|
||||||
|
name: '',
|
||||||
|
url: ''
|
||||||
|
};
|
||||||
},
|
},
|
||||||
handleNewTeamAdd: function(){
|
handleNewTeamAdd: function() {
|
||||||
this.props.onNewTeamAdd({name: this.state.name, url: this.state.url});
|
this.props.onNewTeamAdd({
|
||||||
|
name: this.state.name,
|
||||||
|
url: this.state.url
|
||||||
|
});
|
||||||
this.setState(this.getInitialState());
|
this.setState(this.getInitialState());
|
||||||
},
|
},
|
||||||
handleNameChange: function(e){
|
handleNameChange: function(e) {
|
||||||
this.setState({name: e.target.value});
|
this.setState({
|
||||||
|
name: e.target.value
|
||||||
|
});
|
||||||
},
|
},
|
||||||
handleURLChange: function(e){
|
handleURLChange: function(e) {
|
||||||
this.setState({url: e.target.value});
|
this.setState({
|
||||||
|
url: e.target.value
|
||||||
|
});
|
||||||
},
|
},
|
||||||
render: function() {
|
render: function() {
|
||||||
return (
|
return (
|
||||||
<div className="newTeamItem">
|
<div className="newTeamItem">
|
||||||
<input type="text" placeholder="Team name" value={this.state.name} onChange={this.handleNameChange} />
|
<input type="text" placeholder="Team name" value={ this.state.name } onChange={ this.handleNameChange } />
|
||||||
<input type="text" placeholder="Team URL (http://example.com/team)" value={this.state.url} onChange={this.handleURLChange} />
|
<input type="text" placeholder="Team URL (http://example.com/team)" value={ this.state.url } onChange={ this.handleURLChange } />
|
||||||
<input type="button" value="Add" onClick={this.handleNewTeamAdd} />
|
<input type="button" value="Add" onClick={ this.handleNewTeamAdd } />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var configFile = remote.getGlobal('config-file');
|
var configFile = remote.getGlobal('config-file');
|
||||||
|
|
||||||
ReactDOM.render(
|
ReactDOM.render(
|
||||||
<SettingsPage configFile={configFile} />,
|
<SettingsPage configFile={ configFile } />,
|
||||||
document.getElementById('content')
|
document.getElementById('content')
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue