diff --git a/.babelrc b/.babelrc
index af0f0c3..86c445f 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,3 @@
{
- "presets": ["es2015"]
-}
\ No newline at end of file
+ "presets": ["es2015", "react"]
+}
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index dda3d1c..1d41d15 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -1,23 +1,25 @@
import browserify from 'browserify';
import browserSync from 'browser-sync';
import duration from 'gulp-duration';
+import es from 'event-stream';
+import exorcist from 'exorcist';
import gulp from 'gulp';
import gutil from 'gulp-util';
+import inject from 'gulp-inject';
import jade from 'gulp-jade';
+import less from 'gulp-less';
import notifier from 'node-notifier';
import path from 'path';
import prefix from 'gulp-autoprefixer';
import rev from 'gulp-rev';
import source from 'vinyl-source-stream';
-import exorcist from 'exorcist';
-import transform from 'vinyl-transform';
import sourcemaps from 'gulp-sourcemaps';
import streamify from 'gulp-streamify';
import stylus from 'gulp-stylus';
+import transform from 'vinyl-transform';
import uglify from 'gulp-uglify';
-import watchify from 'watchify';
import watch from 'gulp-watch';
-import inject from 'gulp-inject';
+import watchify from 'watchify';
/*eslint "no-process-env":0 */
const production = process.env.NODE_ENV === 'production';
@@ -26,7 +28,7 @@ const config = {
source: './src',
destination: './public',
scripts: {
- source: './src/main.js',
+ source: './src/js/main.js',
destination: './public/js/',
extensions: ['.jsx'],
filename: 'bundle.js'
@@ -38,12 +40,13 @@ const config = {
revision: './public/**/*.html'
},
styles: {
- source: './src/style.styl',
- watch: './src/**/*.styl',
+ source: './src/styles/style.styl',
+ watch: './src/styles/**/*.styl',
+ icons: './src/styles/icons.less',
destination: './public/css/'
},
assets: {
- source: './src/assets/**/*.*',
+ source: ['./src/assets/**/*.*', './node_modules/font-awesome/fonts*/*.*'],
watch: './src/assets/**/*.*',
destination: './public/'
},
@@ -116,11 +119,14 @@ gulp.task('styles', () => {
pipeline = pipeline.pipe(sourcemaps.init());
}
- pipeline = pipeline.pipe(stylus({
+ const icons = gulp.src(config.styles.icons)
+ .pipe(less());
+
+ pipeline = es.merge(icons, pipeline.pipe(stylus({
'include css': true,
paths: ['node_modules', path.join(__dirname, config.source)],
compress: production
- }))
+ })))
.on('error', handleError)
.pipe(prefix('last 2 versions', 'Chrome 34', 'Firefox 28', 'iOS 7'));
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index a2d9447..0000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,168 +0,0 @@
-'use strict';
-
-var browserify = require('browserify'),
- concat = require('gulp-concat'),
- CSSmin = require('gulp-minify-css'),
- ecstatic = require('ecstatic'),
- es = require('event-stream'),
- gulp = require('gulp'),
- gutil = require('gulp-util'),
- jade = require('gulp-jade'),
- less = require('gulp-less'),
- livereload = require('gulp-livereload'),
- path = require('path'),
- prefix = require('gulp-autoprefixer'),
- source = require('vinyl-source-stream'),
- streamify = require('gulp-streamify'),
- stylus = require('gulp-stylus'),
- uglify = require('gulp-uglify'),
- httpProxy = require('http-proxy'),
- watchify = require('watchify');
-
-var production = process.env.NODE_ENV === 'production';
-
-var config = {
- scripts: {
- source: './src/js/main.js',
- destination: './public/js/',
- filename: 'bundle.js',
- extensions: ['.jsx']
- },
- templates: {
- source: './src/jade/*.jade',
- watch: './src/jade/*.jade',
- destination: './public/'
- },
- styles: {
- source: './src/styles/style.styl',
- icons: './src/styles/icons.less',
- filename: 'style.css',
- watch: './src/styles/*.*',
- destination: './public/css/'
- },
- assets: {
- source: ['./src/assets/**/*.*', './bower_components/font-awesome/fonts*/*.*'],
- watch: './src/assets/**/*.*',
- destination: './public/'
- }
-};
-
-function handleError(err) {
- gutil.log(err);
- gutil.beep();
- return this.emit('end');
-};
-
-gulp.task('scripts', function() {
-
- var bundle = browserify({
- entries: [config.scripts.source],
- extensions: config.scripts.extensions,
- debug: !production
- })
- .bundle()
- .on('error', handleError)
- .pipe(source(config.scripts.filename));
-
- if (production) {
- bundle.pipe(streamify(uglify()));
- }
-
- return bundle
- .pipe(gulp.dest(config.scripts.destination));
-});
-
-gulp.task('templates', function() {
- return gulp.src(config.templates.source)
- .pipe(jade({
- pretty: !production
- }))
- .on('error', handleError)
- .pipe(gulp.dest(config.templates.destination))
- .pipe(livereload({
- auto: false
- }));
-});
-
-gulp.task('styles', function() {
-
- var styles = gulp.src(config.styles.source)
- .pipe(stylus({
- 'include css': true
- }));
-
- var icons = gulp.src(config.styles.icons)
- .pipe(less());
-
- styles = es.merge(styles, icons)
- .pipe(concat(config.styles.filename))
- .on('error', handleError)
- .pipe(prefix('last 2 versions', 'Chrome 34', 'Firefox 28', 'iOS 7'));
-
- if (production) {
- styles = styles.pipe(CSSmin());
- }
-
- return styles
- .pipe(gulp.dest(config.styles.destination))
- .pipe(livereload({
- auto: false
- }));
-});
-
-gulp.task('assets', function() {
- return gulp.src(config.assets.source).pipe(gulp.dest(config.assets.destination));
-});
-
-gulp.task('server', function() {
- var staticHandler = ecstatic({root: path.join(__dirname, 'public')});
-
- var proxy = httpProxy.createProxyServer({
- changeOrigin: true,
- target: process.env.SERVER || 'https://api.koodiklinikka.fi'
- });
-
- proxy.on('error', function(err) {
- return console.error(err);
- });
-
- return require('http').createServer(function(req, res) {
- if(req.url.indexOf('/api') > -1) {
- req.url = req.url.replace('/api', '');
- proxy.web(req, res);
- return;
- }
- staticHandler.apply(this, arguments);
- }).listen(9001);
-});
-
-gulp.task('watch', function() {
- livereload.listen();
-
- gulp.watch(config.templates.watch, ['templates']);
- gulp.watch(config.styles.watch, ['styles']);
- gulp.watch(config.assets.watch, ['assets']);
-
- var bundle = watchify(browserify({
- entries: [config.scripts.source],
- extensions: config.scripts.extensions,
- debug: !production,
- cache: {},
- packageCache: {},
- fullPaths: true
- }));
-
- return bundle.on('update', function() {
- gutil.log('Starting', ' \'' + (gutil.colors.cyan('rebundle')) + '\'', '...');
-
- bundle.bundle()
- .on('error', handleError).pipe(source(config.scripts.filename))
- .pipe(gulp.dest(config.scripts.destination))
- .pipe(livereload());
-
- }).emit('update');
-});
-
-gulp.task('no-js', ['templates', 'styles', 'assets']);
-gulp.task('build', ['scripts', 'no-js']);
-gulp.task('default', ['watch', 'no-js', 'server']);
diff --git a/src/components/repository/__tests__/renderer.js b/src/components/repository/__tests__/renderer.js
deleted file mode 100644
index c46aca3..0000000
--- a/src/components/repository/__tests__/renderer.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* globals beforeEach, describe, it */
-import {render} from '../';
-import {expect} from 'chai';
-
-const REPO_DATA = {
- html_url: 'http://example.com',
- full_name: 'Gulp project template',
- description: 'Hello world!'
-};
-
-const COMMITS = [{
- message: 'initial commit',
- committer: {
- name: 'Riku'
- }
-}, {
- message: 'final commit',
- committer: {
- name: 'L.H.Ahne'
- }
-}];
-
-describe('View renderer', function() {
- beforeEach(function() {
- document.body.innerHTML = render(REPO_DATA, COMMITS);
- });
-
- it('should render a title with the string "Hello world!"', function() {
- const $title = document.getElementsByTagName('h1')[0];
- expect($title.innerHTML).to.equal('Hello world!');
- });
-
- it('should render 2 list items', function() {
- const $listItems = document.querySelectorAll('li');
- expect($listItems.length).to.equal(2);
- });
-});
diff --git a/src/components/repository/index.js b/src/components/repository/index.js
deleted file mode 100644
index 9317029..0000000
--- a/src/components/repository/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-
-export function render(repository, commits) {
- const $commits = commits.map(commit => {
- return `
-
-
- ${commit.message.replace(/\n/g, '
')}
-
-
-
- ${commit.committer.name}
-
- `;
- });
-
- return `
-
-
${repository.description}
-
-
-