fix: main layout file serving

bin/www.js

@@ -10,5 +10,6 @@ var instagram = require("../instagram");
 db.init(config.db.uri)
     //.then(instagram)
     .then(function () {
-        server(config.port);
+        var app = server();
+        app.listen(config.port);
     });

config.js

@@ -1,4 +1,5 @@
 var fs = require("fs");
+var path = require("path");
 const MENU = require("./models/menu.json");
 
 const team = require("./models/team");
@@ -9,40 +10,42 @@ const schedule = require("./models/schedule");
 var privateFile = process.env["PRIVATE"] || "private.json";
 var privateData = JSON.parse(fs.readFileSync(privateFile, "utf-8"));
 
+var index_file = process.env["INDEX"] || "templates/main.html";
+
 var config = {
-	defaultIndex: "/templates/index.html" || process.env["INDEX"],
-	port: process.env["PORT"] || 3000,
-	pub: "./",
-	data: {
-		menu: MENU,
-		documents: document.docs,
-		team: team.team,
-		courses: course.courses
-	},
+    defaultIndex: path.join(__dirname, index_file),
+    port: process.env["PORT"] || 3000,
+    pub: "./",
+    data: {
+        menu: MENU,
+        documents: document.docs,
+        team: team.team,
+        courses: course.courses
+    },
 
-	db: {
-		uri: "mongodb://localhost:27017/hudozka"
-	},
+    db: {
+        uri: "mongodb://localhost:27017/hudozka"
+    },
 
-	prerender: {
-		prerender: "http://service.prerender.io/",
-		prerenderToken: "",
-		protocol: "http",
-		host: "art.shlisselburg.org"
-	},
+    prerender: {
+        prerender: "http://service.prerender.io/",
+        prerenderToken: "",
+        protocol: "http",
+        host: "art.shlisselburg.org"
+    },
 
-	instagram:{
-		default_user: "hudozka",
-		tag_callback: "http://art.shlisselburg.org/instagram/callback/11",
-		client_id: "",
-		client_secret: "",
-		redirect_uri: "http://art.shlisselburg.org/instagram/auth/callback",
-		tags: ["shlb_hudozka"]
-	}
+    instagram: {
+        default_user: "hudozka",
+        tag_callback: "http://art.shlisselburg.org/instagram/callback/11",
+        client_id: "",
+        client_secret: "",
+        redirect_uri: "http://art.shlisselburg.org/instagram/auth/callback",
+        tags: ["shlb_hudozka"]
+    }
 };
 
 module.exports = Object.keys(privateData)
-	.reduce(function (config, key) {
-		config[key] = privateData[key];
-		return config;
-	}, config);
+    .reduce(function (config, key) {
+        config[key] = privateData[key];
+        return config;
+    }, config);

routes/index.js

@@ -17,18 +17,16 @@ function accepts(routes, def) {
         if (types.length) {
             var type = types[0];
             yield routes[type].apply(this, arguments);
-        } else if(def){
+        } else if (def) {
             yield def;
-        }else{
+        } else {
             this.status = 406;
         }
     };
 }
 
 function index(filename) {
-    if (!filename){
-        filename = path.join(__dirname, "..", config.defaultIndex);
-    }
+    if (!filename) filename = config['defaultIndex'];
 
     return function *() {
         this.type = "text/html";

server.js

@@ -28,20 +28,20 @@ app.use(serve(path.join(__dirname, "templates")));
 app.use(helmet.defaults());
 
 app.use(function *(next) {
-	var q = this.query;
-	this.query = Object.keys(q)
-		.reduce(function (q, key) {
-			var v = q[key];
-			if(v === "true"){
-				v = true;
-			}else if(v === "false"){
-				v = false;
-			}
-			q[key] = v;
-			return q;
-		}, q);
+    var q = this.query;
+    this.query = Object.keys(q)
+        .reduce(function (q, key) {
+            var v = q[key];
+            if (v === "true") {
+                v = true;
+            } else if (v === "false") {
+                v = false;
+            }
+            q[key] = v;
+            return q;
+        }, q);
 
-	yield next;
+    yield next;
 });
 
 app.use(route.get("/", routes.index()));
@@ -49,33 +49,18 @@ app.use(route.get("/team", routes.index()));
 app.use(route.get("/docs", routes.index()));
 
 app.use(route.get("/document/:doc", routes.index(
-	path.join(__dirname, "templates/document.html")
+    path.join(__dirname, "templates/document.html")
 )));
 
 require("./routes/schedule")(app);
 require("./routes/news")(app);
 require("./routes/gallery")(app);
 
-require("./routes/404")(app);
-
 require("./instagram/router")(app);
 require("./instagram/io")(app);
 
-if (process.env["NODE_ENV"] === "development") {
-	app.use(route.get("/debug", function *() {
-		var out = {};
-		out.ip = this.ip;
-		out.host = this.host;
-		out.headers = this.headers;
-		out.protocol = this.protocol;
-		out.query = this.query;
-		out.url = this.url;
-
-		this.type = "application/json";
-		this.body = out;
-	}));
-}
+require("./routes/404")(app);
 
 module.exports = function (port) {
-	app.listen(port);
+    return app;
 };

templates/main-dev.html

@@ -29,15 +29,12 @@
     <script src="/app.js"></script>
 </head>
 <body>
-<div class="menu" ng-controller="MenuController">
-    <ul>
-        <li ng-repeat="item in menu" class="{{item.color}}" ng-class="{selected:isCurrent(item)}">
-            <span ng-hide="isValid(item)">{{item.text}}</span>
-            <a href="{{item.url}}" ng-show="isValid(item)">{{item.text}}</a>
-        </li>
-        <!--<a href="{{vkgroup}}" class="vk"><img src="/graphics/icon.vk.png"></a>-->
-    </ul>
-</div>
+<menu ng-controller="MenuController">
+    <li ng-repeat="item in menu" class="{{item.color}}" ng-class="{selected:isCurrent(item)}">
+        <span ng-hide="isValid(item)">{{item.text}}</span>
+        <a href="{{item.url}}" ng-show="isValid(item)">{{item.text}}</a>
+    </li>
+</menu>
 
 <div class="page {{pageClass}}" ng-view></div>