From cbae39031272b3ca0c54b089c3d056ac41c1d555 Mon Sep 17 00:00:00 2001
From: Asraelite <markusscully@gmail.com>
Date: Thu, 14 Jul 2016 15:53:58 +0100
Subject: [PATCH] change jade references to pug

---
 TODO                                         | 12 ++++++++++++
 package.json                                 |  2 +-
 public/views/error/{500.jade => 500.pug}     |  0
 public/views/error/{error.jade => error.pug} |  2 +-
 public/views/{game.jade => game.pug}         |  4 ++--
 public/views/gui/{gui.jade => gui.pug}       |  0
 public/views/index.jade                      |  1 -
 public/views/index.pug                       |  1 +
 public/views/{layout.jade => layout.pug}     |  0
 server/web/index.js                          |  4 ++--
 10 files changed, 19 insertions(+), 7 deletions(-)
 rename public/views/error/{500.jade => 500.pug} (100%)
 rename public/views/error/{error.jade => error.pug} (52%)
 rename public/views/{game.jade => game.pug} (91%)
 rename public/views/gui/{gui.jade => gui.pug} (100%)
 delete mode 100644 public/views/index.jade
 create mode 100644 public/views/index.pug
 rename public/views/{layout.jade => layout.pug} (100%)

diff --git a/TODO b/TODO
index e69de29..2487638 100644
--- a/TODO
+++ b/TODO
@@ -0,0 +1,12 @@
+Implement better mount system differentiating bays and hardpoints.
+
+Add GUI.
+
+Improve spawning system.
+
+Add structures.
+	Add Wingbases.
+		Add spawning from Wingbases.
+	Add automated turrets.
+
+Add ammo.
\ No newline at end of file
diff --git a/package.json b/package.json
index b63435b..27c0ca3 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,9 @@
     "commander": "^2.9.0",
     "escape-html": "^1.0.3",
     "express": "^4.13.4",
-    "jade": "^1.11.0",
     "nib": "^1.1.0",
     "poly-decomp": "git://github.com/schteppe/poly-decomp.js.git",
+    "pug": "^2.0.0-beta3",
     "recursive-readdir": "^1.3.0",
     "socket.io": "^1.4.5",
     "socket.io-client": "^1.4.5",
diff --git a/public/views/error/500.jade b/public/views/error/500.pug
similarity index 100%
rename from public/views/error/500.jade
rename to public/views/error/500.pug
diff --git a/public/views/error/error.jade b/public/views/error/error.pug
similarity index 52%
rename from public/views/error/error.jade
rename to public/views/error/error.pug
index e226d86..33cd39f 100644
--- a/public/views/error/error.jade
+++ b/public/views/error/error.pug
@@ -1,4 +1,4 @@
-extends ../layout.jade
+extends ../layout.pug
 
 block head
 
diff --git a/public/views/game.jade b/public/views/game.pug
similarity index 91%
rename from public/views/game.jade
rename to public/views/game.pug
index 644eddd..f72cc73 100644
--- a/public/views/game.jade
+++ b/public/views/game.pug
@@ -1,4 +1,4 @@
-extends layout.jade
+extends layout.pug
 
 block head
 	title
@@ -15,4 +15,4 @@ block body
 	canvas#wingbase_canvas
 		| Sorry, your browser does not currently support HTML5 Canvas.
 	#gui
-		include gui/gui.jade
+		include gui/gui.pug
diff --git a/public/views/gui/gui.jade b/public/views/gui/gui.pug
similarity index 100%
rename from public/views/gui/gui.jade
rename to public/views/gui/gui.pug
diff --git a/public/views/index.jade b/public/views/index.jade
deleted file mode 100644
index 8b390bb..0000000
--- a/public/views/index.jade
+++ /dev/null
@@ -1 +0,0 @@
-include game.jade
diff --git a/public/views/index.pug b/public/views/index.pug
new file mode 100644
index 0000000..d9b571d
--- /dev/null
+++ b/public/views/index.pug
@@ -0,0 +1 @@
+include game.pug
diff --git a/public/views/layout.jade b/public/views/layout.pug
similarity index 100%
rename from public/views/layout.jade
rename to public/views/layout.pug
diff --git a/server/web/index.js b/server/web/index.js
index 3277a14..8afc3ab 100644
--- a/server/web/index.js
+++ b/server/web/index.js
@@ -19,8 +19,8 @@ class WebServer {
 		let app = this.app;
 
 		app.set('views', 'public/views');
-		app.set('view engine', 'jade');
-		app.engine('jade', require('jade').__express);
+		app.set('view engine', 'pug');
+		app.engine('pug', require('pug').__express);
 
 		app.use(stylus.middleware({
 			src: 'public/stylus',