Skip to content

Commit

Permalink
move jsx to components folder
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielflorit committed Nov 29, 2014
1 parent e6bdcf7 commit 2b7ca49
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 138 deletions.
4 changes: 3 additions & 1 deletion gulp/tasks/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ gulp.task('build', function(done) {
);
} else {
runSequence(
'clean',
// 'clean',
// 'fetchEnhancements',
// 'updates',
'watch',
'browser-sync',
'html',
Expand Down
5 changes: 3 additions & 2 deletions gulp/tasks/fetchEnhancements.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var gulp = require('gulp');
var GitHubApi = require('github');
var _ = require('lodash');
var fs = require('fs');
var fs = require('fs-extra');
var template = require('gulp-template');

gulp.task('fetchEnhancements', function(done) {
Expand All @@ -23,7 +23,8 @@ gulp.task('fetchEnhancements', function(done) {
})
.value();

fs.writeFileSync('src/js/enhancements.json', JSON.stringify(enhancements, null, 4));
fs.ensureFileSync('.tmp/enhancements.json');
fs.writeFileSync('.tmp/enhancements.json', JSON.stringify(enhancements, null, 4));

done();
});
Expand Down
2 changes: 1 addition & 1 deletion gulp/tasks/readme.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gulp.task('readme', function() {
return gulp.src('src/_README.md')
.pipe(data(function() {
return {
enhancements: require('../../src/js/enhancements.json')
enhancements: require('../../.tmp/enhancements.json')
};
}))
.pipe(template())
Expand Down
4 changes: 2 additions & 2 deletions gulp/tasks/updates.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ var template = require('gulp-template');

gulp.task('updates', function(done) {

var enhancements = JSON.parse(fs.readFileSync('src/js/enhancements.json', 'utf8'));
var enhancements = JSON.parse(fs.readFileSync('.tmp/enhancements.json', 'utf8'));

var updates = _.filter(enhancements, {'state': 'closed'});

fs.writeFileSync('src/js/updates.json', JSON.stringify(updates, null, 4));
fs.writeFileSync('.tmp/updates.json', JSON.stringify(updates, null, 4));

done();
});
2 changes: 1 addition & 1 deletion gulp/tasks/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ gulp.task('webpack', function() {
});
}

return gulp.src('src/js/Livecoding.jsx')
return gulp.src('src/js/components/Livecoding.jsx')
.pipe(webpack(config))
.pipe(rename('bundle.js'))
.pipe(gulp.dest(util.env.prod ? 'dist' : '.tmp'))
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"css-loader": "^0.9.0",
"del": "^0.1.3",
"exports-loader": "^0.6.2",
"fs-extra": "^0.12.0",
"github": "^0.2.2",
"gulp": "^3.8.9",
"gulp-csso": "^0.2.9",
Expand Down
12 changes: 6 additions & 6 deletions src/js/Editor.jsx → src/js/components/Editor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@ var React = require('react');

// Include libraries.
var PubSub = require('pubsub-js');
var util = require('./util.js');
var util = require('../util/util.js');

// We'll use CodeMirror as the code editor.
var CodeMirror = require('codemirror');

// Load CodeMirror HTML/JS/CSS modes.
require('../../node_modules/codemirror/mode/htmlmixed/htmlmixed.js');
require('../../../node_modules/codemirror/mode/htmlmixed/htmlmixed.js');

// Require lint framework.
require('../../node_modules/codemirror/addon/lint/lint.js');
require('../../../node_modules/codemirror/addon/lint/lint.js');

// Add CSSLint to window,
window.CSSLint = require('csslint').CSSLint;

// because this file expects it to be on window.
require('../../node_modules/codemirror/addon/lint/css-lint.js');
require('../../../node_modules/codemirror/addon/lint/css-lint.js');

// Require our custom linters.
require('./html-lint.js');
require('./javascript-lint.js');
require('../util/html-lint.js');
require('../util/javascript-lint.js');

// Create the component.
var Editor = React.createClass({
Expand Down
2 changes: 1 addition & 1 deletion src/js/Livecoding.jsx → src/js/components/Livecoding.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var MenuBar = require('./MenuBar.jsx');
var Output = require('./Output.jsx');
var Editor = require('./Editor.jsx');
var Updates = require('./Updates.jsx');
var updateData = require('./updates.json');
var updateData = require('../../../.tmp/updates.json');

// Create the React component.
var Livecoding = React.createClass({
Expand Down
2 changes: 1 addition & 1 deletion src/js/Menubar.jsx → src/js/components/MenuBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var React = require('react/addons');

// Include libraries.
var PubSub = require('pubsub-js');
var util = require('./util.js');
var util = require('../util/util.js');

// Create the component.
var MenuBar = React.createClass({
Expand Down
File renamed without changes.
13 changes: 8 additions & 5 deletions src/js/Updates.jsx → src/js/components/Updates.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
var React = require('react/addons');
var _ = require('lodash');
var util = require('./util.js');
var Moment = require('moment');

// This component gets a list of updates from Livecoding.
// It then displays only those which the user hasn't dismissed.
// When the user closes this drawer it is equivalent to dismissing all updates
// presently visible. We store this information on localStorage.

// Include React.
var React = require('react');

// Include libraries.
var _ = require('lodash');
var util = require('../util/util.js');
var Moment = require('moment');

var Updates = React.createClass({

statics: {
Expand Down
80 changes: 0 additions & 80 deletions src/js/enhancements.json

This file was deleted.

38 changes: 0 additions & 38 deletions src/js/updates.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 2b7ca49

Please sign in to comment.