From a8c2deb5605447c20aa7711ea68dad513ab59967 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Wed, 1 Jul 2015 10:27:43 +0200 Subject: [PATCH] Corrected template duplication --- controllers/logout/index.js | 3 ++- controllers/logout/views/index.jade | 38 ----------------------------- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 controllers/logout/views/index.jade diff --git a/controllers/logout/index.js b/controllers/logout/index.js index 930787d..7ac7952 100644 --- a/controllers/logout/index.js +++ b/controllers/logout/index.js @@ -3,7 +3,8 @@ module.exports.index = function(req, res) { res.locals.session = null; res.setHeader('Content-Type', 'text/html'); - res.render('index.jade', res.locals, function(err, out) { + res.render('../../index/views/index.jade', res.locals, function(err, out) { + console.log(err); res.send(out); }); }; diff --git a/controllers/logout/views/index.jade b/controllers/logout/views/index.jade deleted file mode 100644 index 5b915a4..0000000 --- a/controllers/logout/views/index.jade +++ /dev/null @@ -1,38 +0,0 @@ -extends ../../../views/main - -block title - title #{title} - Index - -block content - h2 Index - ul - li - a(href="#{urls.bouncing}") A bouncing cube that jumps when you click on it - p. - Jumps and bounce when you click on it. - - li - a(href="#{urls.multisphere}") Sphere with multi-resolution - p. - Lots of obj files loaded and displayed. When you click - somewhere, the current obj is hidden and the next one, with a - better resolution is shown. - - li - a(href="#{urls.prototype}") A proto of the real thing - p. - You can move the camera with the arrow keys and move the angle of - the camera with 2, 4, 6 and 8 (the arrows of the numpad), or you - can do a drag-and-drop like (click on the mouse to grap the scene, - and move the mouse to rotate the camera). You can also select a - camera by clicking on the red part of it, and get back to the free - camera by clicking again. You can also select a camera by simply - clicking on the object you want to see. The program will choose the - camera that you want, and move to it progressively. - - li - a(href="#{urls.stream}") Streaming simulation - p. - A mesh of a sphere is fully loaded, and displayed - progressively. This test is here to prove that we can - dynamically add vertices and faces to a mesh.