From f85e7f0825e62dc9a25040b575651ae90c7f730d Mon Sep 17 00:00:00 2001
From: Matt <zone117x@gmail.com>
Date: Wed, 19 Mar 2014 14:36:44 -0600
Subject: [PATCH] Restructured website folder

---
 libs/website.js                          | 6 +++---
 website/{ => pages}/api.html             | 0
 website/{ => pages}/getting_started.html | 0
 website/{ => pages}/home.html            | 0
 website/{ => pages}/stats.html           | 0
 website/{ => static}/main.js             | 3 +--
 website/{ => static}/style.css           | 0
 7 files changed, 4 insertions(+), 5 deletions(-)
 rename website/{ => pages}/api.html (100%)
 rename website/{ => pages}/getting_started.html (100%)
 rename website/{ => pages}/home.html (100%)
 rename website/{ => pages}/stats.html (100%)
 rename website/{ => static}/main.js (91%)
 rename website/{ => static}/style.css (100%)

diff --git a/libs/website.js b/libs/website.js
index 6f02760..0c0b013 100644
--- a/libs/website.js
+++ b/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);
diff --git a/website/api.html b/website/pages/api.html
similarity index 100%
rename from website/api.html
rename to website/pages/api.html
diff --git a/website/getting_started.html b/website/pages/getting_started.html
similarity index 100%
rename from website/getting_started.html
rename to website/pages/getting_started.html
diff --git a/website/home.html b/website/pages/home.html
similarity index 100%
rename from website/home.html
rename to website/pages/home.html
diff --git a/website/stats.html b/website/pages/stats.html
similarity index 100%
rename from website/stats.html
rename to website/pages/stats.html
diff --git a/website/main.js b/website/static/main.js
similarity index 91%
rename from website/main.js
rename to website/static/main.js
index 312ca02..df5c7d7 100644
--- a/website/main.js
+++ b/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);
     });
diff --git a/website/style.css b/website/static/style.css
similarity index 100%
rename from website/style.css
rename to website/static/style.css