From 7ce61a6c279fd815998ad3c13f71706c557220d2 Mon Sep 17 00:00:00 2001
From: Bram van der Veen <96aa48@gmail.com>
Date: Sat, 18 Jun 2016 14:43:39 +0200
Subject: [PATCH] Changed jade templating engine to pug

---
 package.json                                     |  2 +-
 resources/{jade/advert.jade => pug/advert.pug}   |  0
 resources/{jade/bar.jade => pug/bar.pug}         |  0
 resources/{jade/header.jade => pug/header.pug}   |  0
 .../{jade/homepage.jade => pug/homepage.pug}     |  0
 resources/{jade/linkbar.jade => pug/linkbar.pug} |  0
 resources/{jade/list.jade => pug/list.pug}       |  0
 resources/{jade/login.jade => pug/login.pug}     |  0
 .../{jade/not_found.jade => pug/not_found.pug}   |  0
 .../{jade/schedule.jade => pug/schedule.pug}     |  0
 resources/{jade/search.jade => pug/search.pug}   |  0
 web.js                                           | 16 +++++-----------
 12 files changed, 6 insertions(+), 12 deletions(-)
 rename resources/{jade/advert.jade => pug/advert.pug} (100%)
 rename resources/{jade/bar.jade => pug/bar.pug} (100%)
 rename resources/{jade/header.jade => pug/header.pug} (100%)
 rename resources/{jade/homepage.jade => pug/homepage.pug} (100%)
 rename resources/{jade/linkbar.jade => pug/linkbar.pug} (100%)
 rename resources/{jade/list.jade => pug/list.pug} (100%)
 rename resources/{jade/login.jade => pug/login.pug} (100%)
 rename resources/{jade/not_found.jade => pug/not_found.pug} (100%)
 rename resources/{jade/schedule.jade => pug/schedule.pug} (100%)
 rename resources/{jade/search.jade => pug/search.pug} (100%)

diff --git a/package.json b/package.json
index 6a3b3bb..7299561 100644
--- a/package.json
+++ b/package.json
@@ -14,10 +14,10 @@
     "express": "^4.12.4",
     "express-less": "0.0.7",
     "iconv-lite": "^0.4.11",
-    "jade": "^1.11.0",
     "mongodb": "^1.4.38",
     "mongoskin": "^1.4.13",
     "nedb": "^1.1.3",
+    "pug": "^2.0.0-beta3",
     "socks5-http-client": "^1.0.1",
     "socks5-https-client": "^1.1.1"
   }
diff --git a/resources/jade/advert.jade b/resources/pug/advert.pug
similarity index 100%
rename from resources/jade/advert.jade
rename to resources/pug/advert.pug
diff --git a/resources/jade/bar.jade b/resources/pug/bar.pug
similarity index 100%
rename from resources/jade/bar.jade
rename to resources/pug/bar.pug
diff --git a/resources/jade/header.jade b/resources/pug/header.pug
similarity index 100%
rename from resources/jade/header.jade
rename to resources/pug/header.pug
diff --git a/resources/jade/homepage.jade b/resources/pug/homepage.pug
similarity index 100%
rename from resources/jade/homepage.jade
rename to resources/pug/homepage.pug
diff --git a/resources/jade/linkbar.jade b/resources/pug/linkbar.pug
similarity index 100%
rename from resources/jade/linkbar.jade
rename to resources/pug/linkbar.pug
diff --git a/resources/jade/list.jade b/resources/pug/list.pug
similarity index 100%
rename from resources/jade/list.jade
rename to resources/pug/list.pug
diff --git a/resources/jade/login.jade b/resources/pug/login.pug
similarity index 100%
rename from resources/jade/login.jade
rename to resources/pug/login.pug
diff --git a/resources/jade/not_found.jade b/resources/pug/not_found.pug
similarity index 100%
rename from resources/jade/not_found.jade
rename to resources/pug/not_found.pug
diff --git a/resources/jade/schedule.jade b/resources/pug/schedule.pug
similarity index 100%
rename from resources/jade/schedule.jade
rename to resources/pug/schedule.pug
diff --git a/resources/jade/search.jade b/resources/pug/search.pug
similarity index 100%
rename from resources/jade/search.jade
rename to resources/pug/search.pug
diff --git a/web.js b/web.js
index 82f9d51..2d162aa 100644
--- a/web.js
+++ b/web.js
@@ -27,9 +27,9 @@ var time = require('./time');
 var app = express();
 
 //Set up jade rendering engine.
-app.set('view engine', 'jade');
+app.set('view engine', 'pug');
 config().env == 'dev' ? app.disable('view cache') : null; //If the environment is set on 'dev' then view cache should be disabled.
-app.set('views', __dirname + '/resources/jade');
+app.set('views', __dirname + '/resources/pug');
 
 //Give the app some configuration information
 app.locals.linkbar = config().linkbar;
@@ -53,21 +53,15 @@ app.post('/', redirecter);
 //Initialising behavior for searching.
 app.param('search', lookup.get);
 
-app.get('/rooster/:search', [auth.is, schedule.get, function (req, res) {
-  res.render('schedule', req);
-}]);
+app.get('/rooster/:search', [auth.is, schedule.get, (req, res) => res.render('schedule', req)]);
 
 //Initialising behavior for searching through lists.
 app.param('list', lookup.list);
 
-app.get('/klassenlijst/:list',[auth.is, function (req, res) {
-  res.render('list', req);
-}]);
+app.get('/klassenlijst/:list',[auth.is, (req, res) => res.render('list', req)]);
 
 //Initialising login page frontend.
-app.get('/login', function (req, res) {
-  res.render('login', req);
-});
+app.get('/login', (req, res) => res.render('login', req));
 
 //Initialising login/logout behavior.
 app.post('/login', auth.login);