Skip to content

Commit a45f3b3

Browse files
weblancasterweblancaster
committed
Replace grunt tasks to npm scripts
- Remove all grunt tasks - Add npm script tasks - Remove jshint since eslint is being used
1 parent 7e74551 commit a45f3b3

File tree

11 files changed

+106
-201
lines changed

11 files changed

+106
-201
lines changed

‎.jshintrc‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Gruntfile.js‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ See the [Development page](https://github.com/Soundnode/soundnode-app/wiki/Devel
6262

6363
## Contributors
6464

65-
Thanks to a friend at [Studio-424](http://studio-424.com/) for designing the logo.
66-
67-
and Thanks to all [contributors](https://github.com/Soundnode/soundnode-app/graphs/contributors) that are helping or helped to make Soundnode better.
65+
Thanks to all [contributors](https://github.com/Soundnode/soundnode-app/graphs/contributors) that are helping or have help make Soundnode better.
6866

6967
## License
7068

‎app/public/js/components/header/headerActions.jsx‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
import React, { Component } from 'react';
22

33
class BackForwardActions extends Component {
4-
render () {
5-
return (
6-
<ul className="windowAction">
7-
<li className="windowAction_item navigationButton goBack" data-ng-click="goBack()">
8-
<i className="fa fa-chevron-left"></i>
9-
</li>
10-
<li className="windowAction_item navigationButton goForward" data-ng-click="goForward()">
11-
<i className="fa fa-chevron-right"></i>
12-
</li>
13-
</ul>
14-
)
15-
}
4+
render() {
5+
return (
6+
<ul className="windowAction">
7+
<li className="windowAction_item navigationButton goBack" data-ng-click="goBack()">
8+
<i className="fa fa-chevron-left"></i>
9+
</li>
10+
<li className="windowAction_item navigationButton goForward" data-ng-click="goForward()">
11+
<i className="fa fa-chevron-right"></i>
12+
</li>
13+
</ul>
14+
)
15+
}
1616
}
1717

1818
class WindowActions extends Component {
1919

20-
closeApp () {
21-
guiConfig.close();
22-
}
20+
closeApp() {
21+
guiConfig.close();
22+
}
2323

24-
minimizeApp () {
25-
guiConfig.minimize();
26-
}
24+
minimizeApp() {
25+
guiConfig.minimize();
26+
}
2727

28-
maximizeApp () {
29-
guiConfig.maximize();
30-
}
28+
maximizeApp() {
29+
guiConfig.maximize();
30+
}
3131

32-
render () {
32+
render() {
3333

34-
if ( window.process.platform == 'linux32'
35-
|| window.process.platform == 'linux64'
36-
|| window.process.platform == 'linux'
37-
|| window.process.platform == 'darwin' ) {
38-
return (
39-
<ul className="windowAction macActionButtons">
40-
<li className="windowAction_item" onClick={this.closeApp} id="closeApp">
41-
<i className="fa fa-times"></i>
42-
</li>
43-
<li className="windowAction_item" onClick={this.minimizeApp} id="minimizeApp">
44-
<i className="fa fa-minus"></i>
45-
</li>
46-
<li className="windowAction_item" onClick={this.maximizeApp} id="expandApp">
47-
<i className="fa fa-plus"></i>
48-
</li>
49-
</ul>
50-
)
51-
} else if ( window.process.platform == 'win32' ) {
52-
return (
53-
<ul className="windowAction windowsActionButtons">
54-
<li className="windowAction_item" onClick={this.minimizeApp} id="minimizeApp">
55-
<i className="fa fa-minus"></i>
56-
</li>
57-
<li className="windowAction_item" onClick={this.maximizeApp} id="expandApp">
58-
<i className="fa fa-square-o"></i>
59-
</li>
60-
<li className="windowAction_item" onClick={this.closeApp} id="closeApp">
61-
<i className="fa fa-times"></i>
62-
</li>
63-
</ul>
64-
)
65-
}
34+
if (window.process.platform == 'linux32'
35+
|| window.process.platform == 'linux64'
36+
|| window.process.platform == 'linux'
37+
|| window.process.platform == 'darwin') {
38+
return (
39+
<ul className="windowAction macActionButtons">
40+
<li className="windowAction_item" onClick={this.closeApp} id="closeApp">
41+
<i className="fa fa-times"></i>
42+
</li>
43+
<li className="windowAction_item" onClick={this.minimizeApp} id="minimizeApp">
44+
<i className="fa fa-minus"></i>
45+
</li>
46+
<li className="windowAction_item" onClick={this.maximizeApp} id="expandApp">
47+
<i className="fa fa-plus"></i>
48+
</li>
49+
</ul>
50+
)
51+
} else if (window.process.platform == 'win32') {
52+
return (
53+
<ul className="windowAction windowsActionButtons">
54+
<li className="windowAction_item" onClick={this.minimizeApp} id="minimizeApp">
55+
<i className="fa fa-minus"></i>
56+
</li>
57+
<li className="windowAction_item" onClick={this.maximizeApp} id="expandApp">
58+
<i className="fa fa-square-o"></i>
59+
</li>
60+
<li className="windowAction_item" onClick={this.closeApp} id="closeApp">
61+
<i className="fa fa-times"></i>
62+
</li>
63+
</ul>
64+
)
6665
}
66+
}
6767
}
6868

6969
class HeaderActions extends Component {
70-
render () {
71-
return (
72-
<div>
73-
<WindowActions />
74-
<BackForwardActions />
75-
</div>
76-
)
77-
}
70+
render() {
71+
return (
72+
<div>
73+
<WindowActions />
74+
<BackForwardActions />
75+
</div>
76+
)
77+
}
7878
}
7979

8080
export default HeaderActions;

‎package.json‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,32 @@
55
"description": "Soundnode App is the Soundcloud for desktop",
66
"scripts": {
77
"start": "electron .",
8-
"build": "webpack -d -p",
9-
"watch": "webpack -d --watch",
10-
"test": "echo \"Error: no test specified\" && exit 1"
8+
"build": "npm run webpack:prod && npm run sass:prod && npm run package:osx",
9+
"watch": "npm run webpack:dev & npm run sass:dev",
10+
"webpack:prod": "./node_modules/.bin/webpack -p --config ./webpack.config.js",
11+
"webpack:dev": "./node_modules/.bin/webpack -d --watch --config ./webpack.config.js",
12+
"sass:prod": "./node_modules/.bin/node-sass --include-path ./app/public/stylesheets/sass --output-style compressed ./app/public/stylesheets/sass/app.scss ./app/public/stylesheets/css/app.css",
13+
"sass:dev": "./node_modules/.bin/node-sass --recursive --include-path ./app/public/stylesheets/sass --output-style expanded ./app/public/stylesheets/sass/app.scss ./app/public/stylesheets/css/app.css",
14+
"package:osx": "electron-packager ./ Soundnode --platform=darwin --out ./dist/Soundnode --version 1.4.4 --overwrite --icon ./app/public/soundnode.ico",
15+
"package:linux": "electron-packager ./ Soundnode --platform=darwin --out ./dist/Soundnode --version 1.4.4 --overwrite --icon ./app/public/soundnode.icns",
16+
"package:win32": "electron-packager ./ Soundnode --platform=darwin --out ./dist/Soundnode --version 1.4.4 --overwrite --icon ./app/public/soundnode.icns",
17+
"package:all": "npm run package:osx && npm run package:linux && npm run package:win32"
1118
},
12-
"author": "",
19+
"author": "Michael Lancaster",
1320
"license": "GNU",
1421
"devDependencies": {
1522
"babel-core": "^6.0.14",
1623
"babel-loader": "^6.0.0",
1724
"babel-preset-es2015": "^6.0.15",
1825
"babel-preset-react": "^6.0.15",
1926
"babel-preset-stage-0": "^6.0.15",
27+
"electron-packager": "^8.1.0",
2028
"electron-prebuilt": "^1.4.3",
2129
"eslint": "^1.8.0",
2230
"eslint-plugin-react": "^3.7.1",
23-
"grunt": "^1.0.1",
24-
"grunt-contrib-clean": "^1.0.0",
25-
"grunt-contrib-jshint": "^1.0.0",
26-
"grunt-contrib-watch": "^1.0.0",
27-
"grunt-nw-builder": "^2.0.3",
28-
"grunt-sass": "^1.2.0",
29-
"grunt-shell": "^1.3.0",
30-
"load-grunt-config": "^0.19.2",
31-
"time-grunt": "^1.2.2",
31+
"install": "^0.8.2",
32+
"node-sass": "^3.10.1",
33+
"npm": "^3.10.9",
3234
"webpack": "^1.12.2"
3335
},
3436
"dependencies": {
@@ -49,4 +51,4 @@
4951
"toastr": "^2.1.2",
5052
"universal-analytics": "^0.3.11"
5153
}
52-
}
54+
}

‎tasks/aliases.yaml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎tasks/clean.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎tasks/sass.js‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎tasks/shell.js‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎tasks/watch.js‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)