diff --git a/.gitignore b/.gitignore index 48ddb4e6..644ad60d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ node_modules .DS_Store .sass-cache dist/ +app/dist/ report/ npm-debug.log app/public/stylesheets/css/app.css diff --git a/Gruntfile.js b/Gruntfile.js index bd07e1ea..b6a52f78 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,98 +1,31 @@ -module.exports = function (grunt) { +"use strict"; - grunt.initConfig({ +var path = require('path'); - nwjs: { - options: { - buildDir: './dist', // Where the build version of my node-webkit app is saved - macIcns: './app/soundnode.icns', - downloadUrl: 'http://www.soundnodeapp.com/build/', - platforms: ['linux32', 'linux64', 'osx64', 'win32'], - version: '0.12.3' - }, - src: [ - './app/index.html', - './app/package.json', - './app/soundnode.icns', - './app/soundnode.png', - './app/views/**/*', - './app/public/js/**/*', - './app/public/img/**/*', - './app/public/stylesheets/css/**/*', - './node_modules/universal-analytics/**/*' - ] - }, +module.exports = function (grunt) { - sass: { - options: { - sourceMap: false - }, - production: { - options: { - outputStyle: 'compressed' - }, - files: { - 'app/public/stylesheets/css/app.css': 'app/public/stylesheets/sass/app.scss' - } - }, - dev: { - files: { - 'app/public/stylesheets/css/app.css': 'app/public/stylesheets/sass/app.scss' - } - } - }, + require('load-grunt-config')(grunt, { + // path to task.js files, defaults to grunt dir + configPath: path.join(process.cwd(), 'tasks'), - watch: { - src: { - files: [ - 'app/public/stylesheets/sass/**/*.scss' - ], - tasks: ['dev'] - } - }, + // auto grunt.initConfig + init: true, - jshint: { - all: [ - 'app/public/js/**/*.js', - '!app/public/js/vendor/**/*.js' - ], - options: { - jshintrc: '.jshintrc' + // data passed into config. Can use with <%= test %> + data: { + settings: { + app: './app', + dist: './dist' } - }, - - clean: { - force: true, - build: ['dist'] } - }); - grunt.loadNpmTasks('grunt-contrib-clean'); - grunt.loadNpmTasks('grunt-sass'); - grunt.loadNpmTasks('grunt-contrib-watch'); - grunt.loadNpmTasks('grunt-nw-builder'); - grunt.loadNpmTasks('grunt-contrib-jshint'); - - // Build desktop - grunt.registerTask('build', [ - 'clean:build', - 'sass:production', - 'nwjs' - ]); - - // Dev - grunt.registerTask('dev', [ - 'sass:dev' - ]); - - // Dev - grunt.registerTask('test', [ - 'jshint' - ]); + require('time-grunt')(grunt); grunt.event.on('watch', function(action, filepath, target) { grunt.log.writeln(target + ': ' + filepath + ' has ' + action); }); + // Go to 'tasks/aliases.yaml' to register tasks + }; diff --git a/README.md b/README.md index 35686512..0fcbf2cf 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,12 @@ It's built with NW.js, Node.js, Angular.js and uses Soundcloud API. And much more! +## Reasons to contribute + +- You will learn new things +- 1000 + daily users +- 30,000 + downloads + ## How to contribute First, building, testing, and reporting bugs is highly appreciated. Please include console's output and steps to reproduce the problem in your bug report if possible. diff --git a/app/index.html b/app/index.html index f6733684..e3eaa46a 100644 --- a/app/index.html +++ b/app/index.html @@ -277,5 +277,8 @@
+ + +