aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Kavlie <akavlie@gmail.com>2011-11-11 22:06:19 -0700
committerAaron Kavlie <akavlie@gmail.com>2011-11-11 22:06:19 -0700
commit9532d082b0437e710d42dc3a564b68226f54571d (patch)
treeb59b2029d555466e10ab797ff1e42d109260711e
parent537c25bd69fcbcda4754f1c66c5305c08ebdf7e7 (diff)
downloadreevo-webirc-9532d082b0437e710d42dc3a564b68226f54571d.tar.gz
reevo-webirc-9532d082b0437e710d42dc3a564b68226f54571d.zip
Move all public assets into public/ dir; change express config to accommodate.
-rw-r--r--public/app.css (renamed from app.css)0
-rw-r--r--public/app.js (renamed from app.js)2
-rw-r--r--public/images/close.png (renamed from images/close.png)bin139 -> 139 bytes
-rw-r--r--public/index.html (renamed from index.html)0
-rw-r--r--public/js/backbone.js (renamed from js/backbone.js)0
-rw-r--r--public/js/bootstrap/bootstrap-modal.js (renamed from js/bootstrap/bootstrap-modal.js)0
-rw-r--r--public/js/mustache.js (renamed from js/mustache.js)0
-rw-r--r--public/js/underscore-min.js (renamed from js/underscore-min.js)0
-rw-r--r--public/js/util.js (renamed from js/util.js)0
-rw-r--r--server.js7
10 files changed, 7 insertions, 2 deletions
diff --git a/app.css b/public/app.css
index c19316f..c19316f 100644
--- a/app.css
+++ b/public/app.css
diff --git a/app.js b/public/app.js
index 1d28b49..c0bfb84 100644
--- a/app.js
+++ b/public/app.js
@@ -3,7 +3,7 @@ $(function() {
3 window.irc = window.irc || {}; 3 window.irc = window.irc || {};
4 4
5 // socket.io init 5 // socket.io init
6 var socket = io.connect('http://localhost'); 6 var socket = io.connect('http://localhost/');
7 7
8 8
9 // MODELS & COLLECTIONS 9 // MODELS & COLLECTIONS
diff --git a/images/close.png b/public/images/close.png
index 252c5d2..252c5d2 100644
--- a/images/close.png
+++ b/public/images/close.png
Binary files differ
diff --git a/index.html b/public/index.html
index e908e0b..e908e0b 100644
--- a/index.html
+++ b/public/index.html
diff --git a/js/backbone.js b/public/js/backbone.js
index b2e4932..b2e4932 100644
--- a/js/backbone.js
+++ b/public/js/backbone.js
diff --git a/js/bootstrap/bootstrap-modal.js b/public/js/bootstrap/bootstrap-modal.js
index b328217..b328217 100644
--- a/js/bootstrap/bootstrap-modal.js
+++ b/public/js/bootstrap/bootstrap-modal.js
diff --git a/js/mustache.js b/public/js/mustache.js
index 21d5726..21d5726 100644
--- a/js/mustache.js
+++ b/public/js/mustache.js
diff --git a/js/underscore-min.js b/public/js/underscore-min.js
index caa7736..caa7736 100644
--- a/js/underscore-min.js
+++ b/public/js/underscore-min.js
diff --git a/js/util.js b/public/js/util.js
index 9bb429a..9bb429a 100644
--- a/js/util.js
+++ b/public/js/util.js
diff --git a/server.js b/server.js
index 524b65d..46801e0 100644
--- a/server.js
+++ b/server.js
@@ -4,7 +4,8 @@ var express = require('express'),
4 irc = require('irc'); 4 irc = require('irc');
5 5
6app.configure(function() { 6app.configure(function() {
7 app.use(express.static(__dirname + '/')); 7 app.use(app.router);
8 app.use(express.static(__dirname + '/public'));
8}); 9});
9 10
10app.configure('development', function() { 11app.configure('development', function() {
@@ -15,6 +16,10 @@ app.configure('production', function() {
15 app.listen(12445); 16 app.listen(12445);
16}); 17});
17 18
19app.get('/', function(req, res, next) {
20 next();
21});
22
18console.log('Express server started on port %s', app.address().port); 23console.log('Express server started on port %s', app.address().port);
19 24
20 25