Skip to content

Commit

Permalink
Massive rework of the app that is now exclusively targetting Android.…
Browse files Browse the repository at this point in the history
… Added a Gruntfile to prepare the app in the 'dist' directory. All Javascript files are packed.
  • Loading branch information
fdgonthier committed Feb 26, 2014
1 parent 12a79c3 commit 681e03f
Show file tree
Hide file tree
Showing 47 changed files with 184 additions and 10,244 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node_modules
.idea
out
dist

146 changes: 146 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
module.exports = function (grunt) {

grunt.initConfig({
pkg: grunt.file.readJSON("package.json"),

css_crunch: {
dist: {
src: "assets/css/",
dest: "dist/public/css/<%= pkg.name %>_styles.css",
minify: true,
optimize: true,
copy: true
}
},

mkdir: {
dist: {
options: {
create: [
"dist/public/css",
"dist/public/js",
"dist/routes",
"dist/views"
]
}
}
},

copyto: {
dist: {
files: [
{ cwd: "./bin/arm", dest: "dist/", src:
[
"node",
"pswalk.node"
]
},
{ cwd: ".", dest: "dist/", src:
[
"app.js",
"package.json"
]
},
{ cwd: "./", dest: "dist/", src:
[
"public/**/*",
"routes/*.js",
"app.js"
]
},
{ cwd: "./assets/css", dest: "dist/public/css/", src:
[
"font-awesome.min.css"
]
}
]
}
},

concat: {
options: { separator: ";" },
dist_css: {
// Font Awesome is not included since it seems it has to be
// loaded alone for the web font to be properly loaded in Chrome.
src: [
"assets/css/style.css",
"assets/css/slick.grid.css",
"assets/css/slick-default-theme.css",
"assets/css/w2ui-1.3.1.min.css",
],
dest: "dist/public/css/<%= pkg.name %>_styles.css"
},
dist_libs: {
// Source files. Order matters.
src: [
"assets/jslib/jquery-2.0.3.min.js",
"assets/jslib/jquery.event.drag-2.2.js",
"assets/jslib/jquery.ba-throttle-debounce.min.js",
"assets/jslib/underscore-min.js",
"assets/jslib/backbone.js",
"assets/jslib/humanize.min.js",
"assets/jslib/Queue.js",
"assets/jslib/moment.min.js",
"assets/jslib/smoothie.js",
"assets/jslib/w2ui-1.3.1.min.js",
"assets/jslib/slickgrid/slick.core.js",
"assets/jslib/slickgrid/slick.grid.js",
"assets/jslib/slickgrid/slick.formatters.js",
"assets/jslib/slickgrid/plugins/slick.rowselectionmodel.js",
"assets/jslib/slickback.min.js",
],
dest: "dist/public/js/<%= pkg.name %>_libs.js"
},
dist_main: {
src: [ "assets/js/*.js" ],
dest: "dist/public/js/<%= pkg.name %>_main.js"
}
},

uglify: {
dist: {
files: {
"dist/js/public/<%= pkg.name %>_libs.min.js": ["<%= concat.dist_libs.dest %>"],
"dist/js/public/<%= pkg.name %>_main.min.js": ["<%= concat.dist_main.dest %>"]
}
}
},

cssmin: {
dist: {
src: "<%= concat.dist_css.dest %>",
dest: "<%= concat.dist_css.dest %>"
}
},

exec: {
npm_install: {
command: "npm --production install",
stdout: false,
stderr: false,
cwd: "dist"
}
},

jade: {
html: {
src: ["views/*.jade"],
dest: "dist/public/",
options: {
client: false
}
}
}
});

grunt.loadNpmTasks("grunt-mkdir");
grunt.loadNpmTasks("grunt-css");
grunt.loadNpmTasks("grunt-copy-to");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-jade");
grunt.loadNpmTasks("grunt-exec");

grunt.registerTask("default", ["mkdir", "copyto", "concat", "uglify", "cssmin", "jade", "exec"]);
}

1 change: 0 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ var app = express();

app.set("port", process.env.PORT || 3000);
app.set("views", path.join(__dirname, "views"));
app.set("view engine", "jade");
app.set("json spaces", 0);
app.use(express.favicon());
app.use(express.logger("dev"));
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions public/javascripts/models.js → assets/js/models.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
"use strict";

var MemInfo = Backbone.Model.extend({
initialize: function () {
this.set("memUsed");
Expand Down
2 changes: 0 additions & 2 deletions public/javascripts/pstree.js → assets/js/pstree.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
"use strict";

var procView, logCatView,
// ProcessCollection object, collection of all process.
ps = new ProcessCollection(),
Expand Down
File renamed without changes.
Binary file added bin/arm/node
Binary file not shown.
Binary file added bin/arm/pswalk.node
Binary file not shown.
34 changes: 22 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
{
"name": "application-name",
"version": "0.0.1",
"private": true,
"scripts": {
"start": "node app.js"
},
"dependencies": {
"express": "3.4.7",
"jade": "*",
"underscore": "*",
"socket.io": "*"
}
"name": "process-explorer",
"version": "0.0.1",
"private": true,
"scripts": {
"start": "node-android app.js"
},
"dependencies": {
"express": "3.4.6",
"underscore": "*",
"socket.io": "*"
},
"devDependencies": {
"jade": "*",
"grunt": "~0.4.2",
"grunt-contrib-uglify": "*",
"grunt-contrib-concat": "*",
"grunt-css": "*",
"grunt-copy-to": "*",
"grunt-mkdir": "*",
"grunt-jade": "*",
"grunt-exec": "*"
}
}
84 changes: 0 additions & 84 deletions public/javascripts/lib/Queue.js

This file was deleted.

Loading

0 comments on commit 681e03f

Please sign in to comment.