migrated to pug

diff --git a/app.js b/app.js
index 8c6e882da46f8bd7b9cb7b8e815df75ca4443f1d..7d80413df0984f05349b0ef4422e531d71cc6846 100644 (file)
--- a/app.js
+++ b/app.js
@@ -30,7 +30,7 @@ var app = express()
   , server = http.createServer(app); // HTTP server object
 
 // Configuration
-app.set('view engine', 'jade');
+app.set('view engine', 'pug');
 app.use('/static', express.static(pub, {maxAge: 2419200000})); // 4 weeks = 2419200000 ms
 app.use(favicon(pub + '/img/favicon.ico', {maxAge: 2419200000}));
 app.use(banHandler);

diff --git a/lib/email/mailer.js b/lib/email/mailer.js
index 4cc527d321751c1c44a72bd9facb47adbc002b05..2f88d1f0d44cff682818886a90cb2b401546f79e 100644 (file)
--- a/lib/email/mailer.js
+++ b/lib/email/mailer.js
@@ -5,7 +5,7 @@
  */
 
 var fs = require('fs')
-  , jade = require('jade')
+  , pug = require('pug')
   , nodemailer = require('nodemailer')
   , texttemplate = fs.readFileSync(__dirname + '/template.txt', 'utf-8');
 
@@ -13,7 +13,7 @@ var fs = require('fs')
  * Generate the HTML version of the message.
  */
 
-var HTMLMessage = jade.compileFile(__dirname + '/template.jade');
+var HTMLMessage = pug.compileFile(__dirname + '/template.pug');
 
 /**
  * Generate the plaintext version of the message.

diff --git a/lib/email/template.jade b/lib/email/template.pug
similarity index 94%
rename from lib/email/template.jade
rename to lib/email/template.pug
index 37338ff2f08b7fda03d38cf209e53f2eae13f86f..a8422113ab25691d3254e08306aea46c535065b3 100644 (file)
--- a/lib/email/template.jade
+++ b/lib/email/template.pug
@@ -11,7 +11,7 @@ html
         p To initiate the password reset process for your binb account,
           | click the link below:
         a(style="color:#0088CC;text-decoration:none;",
-          href="https://binb.co/resetpasswd?token=#{token}")
+          href=`https://binb.co/resetpasswd?token=${token}`)
           | https://binb.co/resetpasswd?token=#{token}
         p If you can't click it, please copy and paste the URL in a new tab/window.
         p If you haven't requested a password reset, you can disregard this message, 

diff --git a/package.json b/package.json
index cd587af651dcb26d718d005a0f41f15024aa261a..b994318dd648305b44b78a894f3d152bf00f4476 100644 (file)
--- a/package.json
+++ b/package.json
@@ -25,11 +25,11 @@
     "express-session": "1.15.x",
     "faye-websocket": "0.11.x",
     "forwarded-for": "1.0.x",
-    "jade": "1.11.x",
     "nodemailer": "4.4.x",
     "primus": "7.1.x",
     "primus-emitter": "3.1.x",
     "primus-rooms": "3.4.x",
+    "pug": "2.0.x",
     "redis": "2.8.x",
     "serve-favicon": "2.4.x",
     "uglify-js": "3.3.x"

diff --git a/views/banned.jade b/views/banned.pug
similarity index 100%
rename from views/banned.jade
rename to views/banned.pug

diff --git a/views/changepasswd.jade b/views/changepasswd.pug
similarity index 95%
rename from views/changepasswd.jade
rename to views/changepasswd.pug
index 903f488b69c684ef95b66a1709a01e8fc3b57707..f73c9aba4a745c3771503905e8be405a75554e4d 100644 (file)
--- a/views/changepasswd.jade
+++ b/views/changepasswd.pug
@@ -12,7 +12,7 @@ block nav
         span.caret
       ul.dropdown-menu
         li
-          a(href="/user/#{loggedin}", target="_blank") Profile
+          a(href=`/user/${loggedin}`, target="_blank") Profile
         li
           a(href="/logout") Logout
 
@@ -21,7 +21,7 @@ block sections
     .row
       .span12.offset2
         form.form-horizontal.well(method="post",
-          action="/changepasswd?followup=#{followup}")
+          action=`/changepasswd?followup=${followup}`)
           fieldset
             - if (locals.errors)
               - if (errors.oldpassword)

diff --git a/views/home.jade b/views/home.pug
similarity index 94%
rename from views/home.jade
rename to views/home.pug
index a3fe32dd568272f5faa642c62c13455017ddee9b..334c58df0e50c17c6f3fefc17e715e521c31aad3 100644 (file)
--- a/views/home.jade
+++ b/views/home.pug
@@ -17,7 +17,7 @@ block nav
           span.caret
         ul.dropdown-menu
           li
-            a(href="/user/#{loggedin}", target="_blank") Profile
+            a(href=`/user/${loggedin}`, target="_blank") Profile
           li
             a(href="/changepasswd") Change password
           li
@@ -48,7 +48,7 @@ block sections
     .row
       .span16
         ul.thumbnails
-          - each room in rooms
+          each room in rooms
             li.span4
               a.thumbnail.relative(href=room)
                 .room #{room} - 

diff --git a/views/layout.jade b/views/layout.pug
similarity index 100%
rename from views/layout.jade
rename to views/layout.pug

diff --git a/views/leaderboards.jade b/views/leaderboards.pug
similarity index 83%
rename from views/leaderboards.jade
rename to views/leaderboards.pug
index a8cd730aedbfaf2b32923203f6d7c802fb677871..67949bf811504768a08fe0715ef54bfb66685aab 100644 (file)
--- a/views/leaderboards.jade
+++ b/views/leaderboards.pug
@@ -20,11 +20,11 @@ block sections
         .leaderboard-wrapper
           table.table.table-striped.table-bordered.leaderboard
             tbody
-              - each user, i in pointsleaderboard
+              each user, i in pointsleaderboard
                 tr
                   td #{i+1}
                   td
-                    a(href="/user/#{user.username}") #{user.username}
+                    a(href=`/user/${user.username}`) #{user.username}
                   td #{user.totpoints}
           .loading
             .loading-block
@@ -35,11 +35,11 @@ block sections
         .leaderboard-wrapper
           table.table.table-striped.table-bordered.leaderboard
             tbody
-              - each user, i in timesleaderboard
+              each user, i in timesleaderboard
                 tr
                   td #{i+1}
                   td
-                    a(href="/user/#{user.username}") #{user.username}
+                    a(href=`/user/${user.username}`) #{user.username}
                   td
                     i.icon-time
                     |  #{user.bestguesstime} sec

diff --git a/views/login.jade b/views/login.pug
similarity index 88%
rename from views/login.jade
rename to views/login.pug
index 39e7ef1be10052a1a9978a7e1e9f339730f30016..daf199fc9a55f7a774c73075e1a613bc05f70471 100644 (file)
--- a/views/login.jade
+++ b/views/login.pug
@@ -8,16 +8,16 @@ block nav
     li
       a(href="/") Home
     li
-      a(href="/signup?followup=#{followup}") Sign up
+      a(href=`/signup?followup=${followup}`) Sign up
     li.active
-      a(href="/login?followup=#{followup}") Login
+      a(href=`/login?followup=${followup}`) Login
 
 block sections
   section
     .row
       .span3
         h3 New user?
-        a(href="/signup?followup=#{followup}") Click here to create an account.
+        a(href=`/signup?followup=${followup}`) Click here to create an account.
       .span13
         - if (locals.errors && errors.alert)
           .alert.alert-error
@@ -29,7 +29,7 @@ block sections
             a.close(data-dismiss="alert") ×
             strong Well done!
             |  #{success}
-        form.form-horizontal.well(method="post", action="/login?followup=#{followup}")
+        form.form-horizontal.well(method="post", action=`/login?followup=${followup}`)
           fieldset
             - if (locals.errors)
               - if (errors.username)
@@ -71,5 +71,5 @@ block sections
             button.submit-button.btn.btn-primary(type="submit")
               i.icon-lock.icon-white
               |  Login
-            a.forgot-passwd(href="/recoverpasswd?followup=#{followup}")
+            a.forgot-passwd(href=`/recoverpasswd?followup=${followup}`)
               | Forgot your password?

diff --git a/views/recoverpasswd.jade b/views/recoverpasswd.pug
similarity index 94%
rename from views/recoverpasswd.jade
rename to views/recoverpasswd.pug
index 780cc9e5c03084a1c4e90c314c0b9dd6c424f7cd..7314ad94bf38d47625f497bab018df3b0c1cedba 100644 (file)
--- a/views/recoverpasswd.jade
+++ b/views/recoverpasswd.pug
@@ -8,9 +8,9 @@ block nav
     li
       a(href="/") Home
     li
-      a(href="/signup?followup=#{followup}") Sign up
+      a(href=`/signup?followup=${followup}`) Sign up
     li
-      a(href="/login?followup=#{followup}") Login
+      a(href=`/login?followup=${followup}`) Login
 
 block sections
   section
@@ -30,7 +30,7 @@ block sections
               strong Oh snap!
               |  #{errors.alert}
           form.form-horizontal.well(method="post",
-            action="/recoverpasswd?followup=#{followup}")
+            action=`/recoverpasswd?followup=${followup}`)
             fieldset
               - if (locals.errors)
                 - if (errors.email)

diff --git a/views/resetpasswd.jade b/views/resetpasswd.pug
similarity index 92%
rename from views/resetpasswd.jade
rename to views/resetpasswd.pug
index ae51c7307ca5c2743d07e31a19a2b391538572bb..b432c55fd0d8bc10dbb2c4432957532c9e6cf291 100644 (file)
--- a/views/resetpasswd.jade
+++ b/views/resetpasswd.pug
@@ -16,7 +16,7 @@ block sections
             a.close(data-dismiss="alert") ×
             strong Oh snap!
             |  #{errors.alert}
-        form.form-horizontal.well(method="post", action="/resetpasswd?token=#{token}")
+        form.form-horizontal.well(method="post", action=`/resetpasswd?token=${token}`)
           fieldset
             - if (locals.errors && errors.password)
               .control-group.error

diff --git a/views/room.jade b/views/room.pug
similarity index 86%
rename from views/room.jade
rename to views/room.pug
index d9e20e26860aab741bb2cb4e5212ddac1f176990..1e4fe42f91b30a415f759d96837bcd8dc1eef4fd 100644 (file)
--- a/views/room.jade
+++ b/views/room.pug
@@ -14,10 +14,10 @@ block nav
         i.icon-list-alt.icon-white
         |  Leaderboards
     li.active.dropdown
-      a.dropdown-toggle(data-toggle="dropdown",href="#") #{roomname} 
+      a.dropdown-toggle(data-toggle="dropdown", href="#") #{roomname} 
         b.caret
       ul.dropdown-menu
-        - each room in rooms
+        each room in rooms
           - if (room !== roomname)
             li
               a(href=room)
@@ -30,16 +30,16 @@ block nav
           span.caret
         ul.dropdown-menu
           li
-            a(href="/user/#{loggedin}", target="_blank") Profile
+            a(href=`/user/${loggedin}`, target="_blank") Profile
           li
-            a(href="/changepasswd?followup=/#{roomname}") Change password
+            a(href=`/changepasswd?followup=/${roomname}`) Change password
           li
             a(href="/logout") Logout
     - else
       li
-        a(href="/signup?followup=/#{roomname}") Sign up
+        a(href=`/signup?followup=/${roomname}`) Sign up
       li
-        a(href="/login?followup=/#{roomname}") Login
+        a(href=`/login?followup=/${roomname}`) Login
 
 block sections
   section

diff --git a/views/signup.jade b/views/signup.pug
similarity index 94%
rename from views/signup.jade
rename to views/signup.pug
index 8e0c262a168ca07a9ac7f539d7d59906edd6db95..217622f97481380978daf738b3fb03cefe438ef1 100644 (file)
--- a/views/signup.jade
+++ b/views/signup.pug
@@ -8,16 +8,16 @@ block nav
     li
       a(href="/") Home
     li.active
-      a(href="/signup?followup=#{followup}") Sign up
+      a(href=`/signup?followup=${followup}`) Sign up
     li
-      a(href="/login?followup=#{followup}") Login
+      a(href=`/login?followup=${followup}`) Login
 
 block sections
   section
     .row
       .span3
         h3 Not a new user?
-        a(href="/login?followup=#{followup}") Click here to log in.
+        a(href=`/login?followup=${followup}`) Click here to log in.
       .span13
         h3 Why sign up?
         p Registration is optional, but if you are a regular user consider creating 
@@ -31,7 +31,7 @@ block sections
             a.close(data-dismiss="alert") ×
             strong Oh snap!
             |  #{errors.alert}
-        form.form-horizontal.well(method="post",action="/signup?followup=#{followup}")
+        form.form-horizontal.well(method="post", action=`/signup?followup=${followup}`)
           fieldset
             - if (locals.errors)
               - if (errors.username)

diff --git a/views/user.jade b/views/user.pug
similarity index 100%
rename from views/user.jade
rename to views/user.pug