Merge pull request #3 from nightscout/express-cache

move static files into /static
nightscout · Jun 25, 2014 · 4c10967 · 4c10967
2 parents 3555f73 + 59b7bca
commit 4c10967
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 2 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+    "directory": "./static/bower_components"
+}
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,7 @@ node_modules/
 
 .idea/
 *.iml
-my.env
+my.env
+*.env
+static/bower_components/
+.*.sw?
diff --git a/server.js b/server.js
@@ -83,7 +83,8 @@ var app = express();
 app.set('title', 'Nightscout');
 
 // define static server
-var server = express.static(__dirname);
+var staticDir = __dirname + '/static/';
+var server = express.static(staticDir);
 app.use(function(req, res, next) {
     res.set({
         "Cache-Control": "public, max-age=" + THIRTY_DAYS,

diff --git a/audio/alarm.mp3 → static/audio/alarm.mp3 b/audio/alarm.mp3 → static/audio/alarm.mp3
diff --git a/audio/alarm.ogg → static/audio/alarm.ogg b/audio/alarm.ogg → static/audio/alarm.ogg
diff --git a/audio/alarm2.mp3 → static/audio/alarm2.mp3 b/audio/alarm2.mp3 → static/audio/alarm2.mp3
diff --git a/audio/alarm2.ogg → static/audio/alarm2.ogg b/audio/alarm2.ogg → static/audio/alarm2.ogg
diff --git a/css/dropdown.css → static/css/dropdown.css b/css/dropdown.css → static/css/dropdown.css
diff --git a/css/main.css → static/css/main.css b/css/main.css → static/css/main.css
diff --git a/favicon.ico → static/favicon.ico b/favicon.ico → static/favicon.ico
diff --git a/images/demo.gif → static/images/demo.gif b/images/demo.gif → static/images/demo.gif
diff --git a/index.html → static/index.html b/index.html → static/index.html
diff --git a/js/client.js → static/js/client.js b/js/client.js → static/js/client.js
diff --git a/js/dropdown.js → static/js/dropdown.js b/js/dropdown.js → static/js/dropdown.js