Skip to content

Commit 613d763

Browse files
polonelpolonel
committed
style(code): standard js formatting
1 parent 0ae7cec commit 613d763

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+2440
-5078
lines changed

‎app.js

+213-193
Large diffs are not rendered by default.

‎gruntfile.js

+126-128
Original file line numberDiff line numberDiff line change
@@ -1,139 +1,137 @@
1-
module.exports = function(grunt) {
2-
require('matchdep').filterAll("grunt-*").forEach(grunt.loadNpmTasks);
1+
module.exports = function (grunt) {
2+
require('matchdep')
3+
.filterAll('grunt-*')
4+
.forEach(grunt.loadNpmTasks)
35

4-
grunt.initConfig({
5-
pkg: grunt.file.readJSON('package.json'),
6+
grunt.initConfig({
7+
pkg: grunt.file.readJSON('package.json'),
68

7-
express: {
8-
options: {
9-
//Override Defaults
10-
},
11-
web: {
12-
options: {
13-
script: 'app.js',
14-
port: 8118
15-
}
16-
}
17-
},
9+
express: {
10+
options: {
11+
//Override Defaults
12+
},
13+
web: {
14+
options: {
15+
script: 'app.js',
16+
port: 8118
17+
}
18+
}
19+
},
1820

19-
watch: {
20-
web: {
21-
files: [
22-
'*.js',
23-
'src/**/*.js',
24-
'plugins/**/*.js',
25-
'!src/public/**/*.js'
26-
],
27-
tasks: ['express:web'],
28-
options: {
29-
nospawn: true,
30-
atBegin: true
31-
}
32-
}
33-
},
21+
watch: {
22+
web: {
23+
files: ['*.js', 'src/**/*.js', 'plugins/**/*.js', '!src/public/**/*.js'],
24+
tasks: ['express:web'],
25+
options: {
26+
nospawn: true,
27+
atBegin: true
28+
}
29+
}
30+
},
3431

35-
parallel: {
36-
web: {
37-
options: {
38-
stream: true
39-
},
40-
tasks: [
41-
{
42-
grunt: true,
43-
args: ['watch:web']
44-
}, {
45-
grunt: true,
46-
args: ['shell:webpackWatch']
47-
}
48-
]
49-
}
32+
parallel: {
33+
web: {
34+
options: {
35+
stream: true
5036
},
37+
tasks: [
38+
{
39+
grunt: true,
40+
args: ['watch:web']
41+
},
42+
{
43+
grunt: true,
44+
args: ['shell:webpackWatch']
45+
}
46+
]
47+
}
48+
},
5149

52-
cssmin: {
53-
target: {
54-
files: {
55-
'public/css/plugins.css': [
56-
'public/css/plugins/datatables/dataTables.scroller.css',
57-
'public/css/plugins/datatables/dataTables.foundation.css',
58-
'src/public/js/vendor/chosen/chosen.css',
59-
'src/public/js/vendor/enjoyhint/enjoyhint.css',
60-
'src/public/js/vendor/metricsgraphics/metricsgraphics.css',
61-
'public/css/vendor/font-awesome.min.css',
62-
'public/css/plugins/simplecolorpicker/jquery.simplecolorpicker.css',
63-
'public/css/plugins/simplecolorpicker/jquery.simplecolorpicker-fontawesome.css',
64-
'src/public/js/vendor/uikit/css/uikit.css',
65-
'src/public/js/vendor/uikit/css/uikit_custom.css',
66-
'src/public/js/plugins/snackbar.css',
67-
'src/public/js/vendor/c3/c3.css',
68-
'src/public/js/vendor/multiselect/css/multi-select.css',
69-
'src/public/js/vendor/formvalidator/theme-default.css',
70-
'src/public/js/vendor/shepherd/css/shepherd-theme-default.css',
71-
'src/public/js/vendor/shepherd/css/shepherd-theme-dark.css',
72-
'src/public/js/vendor/shepherd/css/shepherd-theme-arrows.css',
73-
'src/public/js/vendor/shepherd/css/shepherd-theme-arrows-fix.css',
74-
'src/public/js/vendor/shepherd/css/shepherd-theme-square.css',
75-
'src/public/js/vendor/shepherd/css/shepherd-theme-square-dark.css',
76-
'src/public/js/vendor/easymde/dist/easymde.min.css'
77-
]
78-
}
79-
},
80-
minify: {
81-
expand: true,
82-
cwd: 'public/css/',
83-
src: ['*.css', '!app.min.css', '!*.min.css'],
84-
dest: 'public/css/',
85-
ext: '.min.css'
86-
}
87-
},
50+
cssmin: {
51+
target: {
52+
files: {
53+
'public/css/plugins.css': [
54+
'public/css/plugins/datatables/dataTables.scroller.css',
55+
'public/css/plugins/datatables/dataTables.foundation.css',
56+
'src/public/js/vendor/chosen/chosen.css',
57+
'src/public/js/vendor/enjoyhint/enjoyhint.css',
58+
'src/public/js/vendor/metricsgraphics/metricsgraphics.css',
59+
'public/css/vendor/font-awesome.min.css',
60+
'public/css/plugins/simplecolorpicker/jquery.simplecolorpicker.css',
61+
'public/css/plugins/simplecolorpicker/jquery.simplecolorpicker-fontawesome.css',
62+
'src/public/js/vendor/uikit/css/uikit.css',
63+
'src/public/js/vendor/uikit/css/uikit_custom.css',
64+
'src/public/js/plugins/snackbar.css',
65+
'src/public/js/vendor/c3/c3.css',
66+
'src/public/js/vendor/multiselect/css/multi-select.css',
67+
'src/public/js/vendor/formvalidator/theme-default.css',
68+
'src/public/js/vendor/shepherd/css/shepherd-theme-default.css',
69+
'src/public/js/vendor/shepherd/css/shepherd-theme-dark.css',
70+
'src/public/js/vendor/shepherd/css/shepherd-theme-arrows.css',
71+
'src/public/js/vendor/shepherd/css/shepherd-theme-arrows-fix.css',
72+
'src/public/js/vendor/shepherd/css/shepherd-theme-square.css',
73+
'src/public/js/vendor/shepherd/css/shepherd-theme-square-dark.css',
74+
'src/public/js/vendor/easymde/dist/easymde.min.css'
75+
]
76+
}
77+
},
78+
minify: {
79+
expand: true,
80+
cwd: 'public/css/',
81+
src: ['*.css', '!app.min.css', '!*.min.css'],
82+
dest: 'public/css/',
83+
ext: '.min.css'
84+
}
85+
},
8886

89-
uglify: {
90-
uikit: {
91-
options: {
92-
beautify: false,
93-
mangle: false
94-
},
87+
uglify: {
88+
uikit: {
89+
options: {
90+
beautify: false,
91+
mangle: false
92+
},
9593

96-
src: [
97-
'src/public/js/vendor/uikit/js/uikit.js',
98-
'src/public/js/vendor/uikit/js/components/accordion.js',
99-
'src/public/js/vendor/uikit/js/components/autocomplete.js',
100-
'src/public/js/vendor/uikit/js/components/datepicker.js',
101-
'src/public/js/vendor/uikit/js/components/form-password.js',
102-
'src/public/js/vendor/uikit/js/components/form-select.js',
103-
'src/public/js/vendor/uikit/js/components/grid.js',
104-
'src/public/js/vendor/uikit/js/components/htmleditor.js',
105-
'src/public/js/vendor/uikit/js/components/lightbox.js',
106-
'src/public/js/vendor/uikit/js/components/nestable.js',
107-
'src/public/js/vendor/uikit/js/components/notify.js',
108-
'src/public/js/vendor/uikit/js/components/pagination.js',
109-
'src/public/js/vendor/uikit/js/components/parallax.js',
110-
'src/public/js/vendor/uikit/js/components/grid-parallax.js',
111-
'src/public/js/vendor/uikit/js/components/search.js',
112-
'src/public/js/vendor/uikit/js/components/slider.js',
113-
'src/public/js/vendor/uikit/js/components/slideshow.js',
114-
'src/public/js/vendor/uikit/js/components/slideshow-fx.js',
115-
'src/public/js/vendor/uikit/js/components/sortable.js',
116-
'src/public/js/vendor/uikit/js/components/sticky.js',
117-
'src/public/js/vendor/uikit/js/components/timepicker.js',
118-
'src/public/js/vendor/uikit/js/components/tooltip.js',
119-
'src/public/js/vendor/uikit/js/components/upload.js',
94+
src: [
95+
'src/public/js/vendor/uikit/js/uikit.js',
96+
'src/public/js/vendor/uikit/js/components/accordion.js',
97+
'src/public/js/vendor/uikit/js/components/autocomplete.js',
98+
'src/public/js/vendor/uikit/js/components/datepicker.js',
99+
'src/public/js/vendor/uikit/js/components/form-password.js',
100+
'src/public/js/vendor/uikit/js/components/form-select.js',
101+
'src/public/js/vendor/uikit/js/components/grid.js',
102+
'src/public/js/vendor/uikit/js/components/htmleditor.js',
103+
'src/public/js/vendor/uikit/js/components/lightbox.js',
104+
'src/public/js/vendor/uikit/js/components/nestable.js',
105+
'src/public/js/vendor/uikit/js/components/notify.js',
106+
'src/public/js/vendor/uikit/js/components/pagination.js',
107+
'src/public/js/vendor/uikit/js/components/parallax.js',
108+
'src/public/js/vendor/uikit/js/components/grid-parallax.js',
109+
'src/public/js/vendor/uikit/js/components/search.js',
110+
'src/public/js/vendor/uikit/js/components/slider.js',
111+
'src/public/js/vendor/uikit/js/components/slideshow.js',
112+
'src/public/js/vendor/uikit/js/components/slideshow-fx.js',
113+
'src/public/js/vendor/uikit/js/components/sortable.js',
114+
'src/public/js/vendor/uikit/js/components/sticky.js',
115+
'src/public/js/vendor/uikit/js/components/timepicker.js',
116+
'src/public/js/vendor/uikit/js/components/tooltip.js',
117+
'src/public/js/vendor/uikit/js/components/upload.js',
120118

121-
'src/public/js/vendor/uikit/js/custom.js'
122-
],
123-
dest: 'src/public/js/vendor/uikit/js/uikit_combined.min.js'
124-
}
125-
},
119+
'src/public/js/vendor/uikit/js/custom.js'
120+
],
121+
dest: 'src/public/js/vendor/uikit/js/uikit_combined.min.js'
122+
}
123+
},
126124

127-
shell: {
128-
webpackWatch: 'npm run webpackwatch',
129-
webpackDev: 'npm run webpackdev',
130-
webpackDist: 'npm run webpackdist'
131-
}
132-
});
125+
shell: {
126+
webpackWatch: 'npm run webpackwatch',
127+
webpackDev: 'npm run webpackdev',
128+
webpackDist: 'npm run webpackdist'
129+
}
130+
})
133131

134-
grunt.registerTask('buildcss', ['uglify:uikit', 'cssmin']);
135-
grunt.registerTask('server', 'launch webserver and watch tasks', ['uglify:uikit', 'cssmin', 'parallel:web']);
136-
grunt.registerTask('build', ['uglify:uikit', 'cssmin', 'shell:webpackDist']);
137-
grunt.registerTask('devbuild', ['shell:webpackDev']);
138-
grunt.registerTask('default', ['server']);
139-
};
132+
grunt.registerTask('buildcss', ['uglify:uikit', 'cssmin'])
133+
grunt.registerTask('server', 'launch webserver and watch tasks', ['uglify:uikit', 'cssmin', 'parallel:web'])
134+
grunt.registerTask('build', ['uglify:uikit', 'cssmin', 'shell:webpackDist'])
135+
grunt.registerTask('devbuild', ['shell:webpackDev'])
136+
grunt.registerTask('default', ['server'])
137+
}

‎package.json

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"build": "grunt build",
1212
"test": "mocha --recursive",
1313
"lint": "standard | snazzy",
14+
"format": "prettier-standard \"./*.js\" \"src/*.js\" \"src/**/*.js\" \"!src/public/js/vendor/**/*.js\" \"!src/public/js/plugins/**/*.js\"",
1415
"coverage": "istanbul cover ./node_modules/mocha/bin/_mocha -- --recursive",
1516
"codacy": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- --recursive -R spec && cat ./coverage/lcov.info | cross-env CODACY_PROJECT_TOKEN=65070aca43cc4fba96eaabd4033c9528 codacy-coverage && rm -rf ./coverage",
1617
"webpackwatch": "webpack --config webpack.config.js --watch",
@@ -188,6 +189,9 @@
188189
"History"
189190
]
190191
},
192+
"prettier": {
193+
"printWidth": 120
194+
},
191195
"config": {
192196
"blanket": {
193197
"pattern": "src",

‎runner.js

+24-23
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
1-
(function() {
2-
'use strict';
1+
;(function () {
2+
'use strict'
33

4-
var pm2 = require('pm2');
5-
var path = require('path');
4+
var pm2 = require('pm2')
5+
var path = require('path')
66

7-
pm2.connect(true, function(err) {
8-
if (err)
9-
throw err;
10-
7+
pm2.connect(true, function (err) {
8+
if (err) throw err
119

12-
pm2.start({
13-
name: 'trudesk',
14-
script: path.join(__dirname, '/app.js'),
15-
output: path.join(__dirname, '/logs/output.log'),
16-
error: path.join(__dirname, '/logs/output.log'),
17-
mergeLogs: true
18-
}, function(err) {
19-
if (err) {
20-
console.log(err);
21-
throw err;
22-
}
10+
pm2.start(
11+
{
12+
name: 'trudesk',
13+
script: path.join(__dirname, '/app.js'),
14+
output: path.join(__dirname, '/logs/output.log'),
15+
error: path.join(__dirname, '/logs/output.log'),
16+
mergeLogs: true
17+
},
18+
function (err) {
19+
if (err) {
20+
console.log(err)
21+
throw err
22+
}
2323

24-
pm2.disconnect();
25-
});
26-
});
27-
}());
24+
pm2.disconnect()
25+
}
26+
)
27+
})
28+
})()

0 commit comments

Comments
 (0)