compile public stuff into build dir

selaux · Mar 9, 2014 · d62fb0e · d62fb0e
1 parent cacc8d6
commit d62fb0e
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 36 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -56,14 +56,53 @@ module.exports = function (grunt) {
                     'build/compiledTemplates.js': 'templates/*.hbs'
                 }
             }
+        },
+
+        copy: {
+            images: {
+                expand: true,
+                cwd: 'frontend/images/',
+                src: '**',
+                dest: 'build/public/images/'
+            },
+            stylesheets: {
+                expand: true,
+                cwd: 'frontend/stylesheets/',
+                src: '*.css',
+                dest: 'build/public/stylesheets/'
+            }
+        },
+
+        browserify: {
+            main: {
+                files: {
+                    'build/public/javascripts/main.js': [
+                        'lib/Module.js',
+                        'lib/views/*.js',
+                        'lib/handlebars/**/*.js',
+                        'build/compiledTemplates.js',
+                        'frontend/javascripts/main.js'
+                    ]
+                },
+                options: {
+                    alias: [
+                        'node_modules/jquery/dist/jquery.js:jquery',
+                        'node_modules/lodash/dist/lodash.js:lodash',
+                        'node_modules/backbone/backbone.js:backbone',
+                        'node_modules/socket.io/node_modules/socket.io-client/dist/socket.io.js:socket.io-client'
+                    ]
+                }
+            }
         }
 
     });
 
+    grunt.loadNpmTasks('grunt-browserify');
+    grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-handlebars');
     grunt.loadNpmTasks('grunt-mocha-test');
 
-    grunt.registerTask('compile', ['handlebars']);
+    grunt.registerTask('compile', ['handlebars', 'copy', 'browserify']);
     grunt.registerTask('test', ['jshint', 'mochaTest']);
 };
diff --git a/frontend/public/images/favicon.ico → frontend/images/favicon.ico b/frontend/public/images/favicon.ico → frontend/images/favicon.ico
diff --git a/frontend/javascripts/main.js b/frontend/javascripts/main.js
@@ -0,0 +1,29 @@
+'use strict';
+
+var io = require('socket.io-client');
+
+function connect() {
+    var socket = io.connect('http://' + window.location.host, {
+        'reconnect': true,
+        'reconnection delay': 5000,
+        'max reconnection attempts': Infinity
+    });
+
+    socket.on('update:view', function (id, data) {
+        var div = document.createElement('div'),
+            element = document.getElementById(id);
+        div.innerHTML = data;
+
+        element.parentNode.replaceChild(div.firstChild, element);
+    });
+
+    socket.on('connect', function () {
+        document.getElementById('backend-connection').innerHTML = '';
+    });
+
+    socket.on('disconnect', function () {
+        document.getElementById('backend-connection').innerHTML = '<div class="alert alert-danger row"><strong>Error:</strong> Backend Disconnected</div>';
+    });
+}
+
+window.onload = connect;
diff --git a/frontend/public/javascripts/main.js b/frontend/public/javascripts/main.js
diff --git a/frontend/public/javascripts/vendor/socket.io.min.js b/frontend/public/javascripts/vendor/socket.io.min.js
diff --git a/...nd/public/stylesheets/bootstrap-theme.css → frontend/stylesheets/bootstrap-theme.css b/...nd/public/stylesheets/bootstrap-theme.css → frontend/stylesheets/bootstrap-theme.css
diff --git a/...tend/public/stylesheets/bootstrap.min.css → frontend/stylesheets/bootstrap.min.css b/...tend/public/stylesheets/bootstrap.min.css → frontend/stylesheets/bootstrap.min.css
diff --git a/frontend/public/stylesheets/style.styl → frontend/stylesheets/style.styl b/frontend/public/stylesheets/style.styl → frontend/stylesheets/style.styl
diff --git a/frontend/views/layouts/main.hbs b/frontend/views/layouts/main.hbs
@@ -14,7 +14,6 @@
             {{{body}}}
         </div>
 
-        <script src="/javascripts/vendor/socket.io.min.js"></script>
         <script src="/javascripts/main.js"></script>
     </body>
 </html>
diff --git a/frontend/webinterface.js b/frontend/webinterface.js
@@ -36,14 +36,17 @@ module.exports = Module.extend({
             webinterface.set('config', self.config);
             webinterface.set('app', self.app);
 
-            webinterface.use(express.favicon(path.join(__dirname, '/public/images/favicon.ico')));
+            webinterface.use(express.favicon(path.join(__dirname, '../build/public/images/favicon.ico')));
             webinterface.use(express.logger('dev'));
             webinterface.use(express.bodyParser());
             webinterface.use(express.methodOverride());
             webinterface.use(webinterface.router);
 
-            webinterface.use(require('stylus').middleware(path.join(__dirname, '/public')));
-            webinterface.use(express.static(path.join(__dirname, '/public')));
+            webinterface.use(require('stylus').middleware({
+                src: __dirname,
+                dest: path.join(__dirname, '../build/public')
+            }));
+            webinterface.use(express.static(path.join(__dirname, '../build/public')));
         });
 
         webinterface.configure('development', function(){

diff --git a/package.json b/package.json
@@ -37,7 +37,9 @@
         "socket.io": "0.9.16",
         "grunt": "0.4.2",
         "grunt-cli": "0.1.9",
+        "grunt-contrib-copy": "0.5.0",
         "grunt-contrib-handlebars": "0.7.0",
+        "grunt-browserify": "1.3.1",
         "handlebars": "1.0.12",
         "nodemailer": "0.5.3",
         "numeral": "1.5.2",