Restructured website folder

libs/website.js

@@ -84,7 +84,8 @@ module.exports = function(logger){
 
     var readPageFiles = function(){
         async.each(Object.keys(pageFiles), function(fileName, callback){
-            fs.readFile('website/' + fileName, 'utf8', function(err, data){
+            var filePath = 'website/' + (fileName === 'index.html' ? '' : 'pages/') + fileName;
+            fs.readFile(filePath, 'utf8', function(err, data){
                 var pTemp = dot.template(data);
                 pageTemplates[pageFiles[fileName]] = pTemp
                 callback();
@@ -100,7 +101,6 @@ module.exports = function(logger){
 
 
 
-
     fs.watch('website', function(event, filename){
         if (event === 'change' && filename in pageFiles)
             readPageFiles();
@@ -191,7 +191,7 @@ module.exports = function(logger){
         //res.send('you did api method ' + req.params.method);
     });
 
-    app.use('/static', express.static('website'));
+    app.use('/static', express.static('website/static'));
 
     app.use(function(err, req, res, next){
         console.error(err.stack);

website/static/main.js

@@ -7,7 +7,6 @@ $(function(){
         $('a[href="/' + page + '"]').parent().addClass('selected')
         $.get("/api/get_page", {id: page}, function(data){
             $('#page').html(data);
-            console.log('swapped to ' + page);
         }, 'html')
     };
 
@@ -22,7 +21,7 @@ $(function(){
     window.addEventListener('load', function() {
         setTimeout(function() {
             window.addEventListener("popstate", function(e) {
-                hotSwap(location.pathname.slice(1))
+                hotSwap(location.pathname.slice(1));
             });
         }, 0);
     });