11 files changed, 22 insertions, 26 deletions

diff --git a/gulpfile.js b/gulpfile.js
index becf429..82f3d19 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,24 +1,23 @@
 var gulp = require('gulp'),
 	bower = require('gulp-bower'),
 	changed = require('gulp-changed'),
-	jade = require('gulp-jade'),
-	jadeModules = require('gulp-jade-modules'),
+	pug = require('gulp-pug'),
 	minifyhtml = require('gulp-minify-html'),
 	notify = require('gulp-notify'),
 	sass = require('gulp-ruby-sass');
 
 var config = {
 	sassPath: './resources/sass',
-	jadePath: './resources/jade',
+	pugPath:  './resources/pug',
 	bowerDir: './bower_components'
 }
 
 gulp.task('watch', function() {
 	gulp.watch(config.sassPath + '/**/*.scss', ['css']);
-	gulp.watch(config.jadePath + '/**/*.jade', ['jade']);
+	gulp.watch(config.pugPath + '/**/*.pug', ['pug']);
 });
 
-gulp.task('default', ['bower', 'css', 'jade', 'img']);
+gulp.task('default', ['bower', 'css', 'pug', 'img']);
 
 gulp.task('bower', function() {
 	return bower()
@@ -41,17 +40,14 @@ gulp.task('css', function() {
 		.pipe(gulp.dest('./build/assets/css'));
 });
 
-gulp.task('jade', function() {
-	var src = './resources/jade/finals/**/*.jade',
+gulp.task('pug', function() {
+	var src = './resources/pug/finals/**/*.pug',
 		dst = './build';
 
 	return gulp.src(src)
 		.pipe(changed(dst, {extension: 'html'}))
-		.pipe(jadeModules({
-			paths: ['./resources/jade/include']
-		}))
-		.pipe(jade({
-			basedir: '/'
+		.pipe(pug({
+			basedir: './resources/pug/include'
 		}))
 		.pipe(minifyhtml())
 		.pipe(gulp.dest(dst));
@@ -61,4 +57,3 @@ gulp.task('img', function() {
 	return gulp.src('./resources/img/*')
 		.pipe(gulp.dest('./build/assets/img'));
 });
-
diff --git a/package.json b/package.json
index 6c10cba..23fd4df 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,7 @@
     "gulp": "^3.8.11",
     "gulp-bower": "0.0.10",
     "gulp-changed": "~1.2.1",
-    "gulp-jade": "~1.0.0",
-    "gulp-jade-modules": "^1.0.1",
+    "gulp-pug": "~3.3.0",
     "gulp-minify-html": "~1.0.2",
     "gulp-notify": "^2.2.0",
     "gulp-ruby-sass": "^0.7.1",
diff --git a/resources/jade/finals/ham/cw-decoder.jade b/resources/pug/finals/ham/cw-decoder.pug
index bc8636b..b4285eb 100644
--- a/resources/jade/finals/ham/cw-decoder.jade
+++ b/resources/pug/finals/ham/cw-decoder.pug
@@ -1,4 +1,4 @@
-extends layout-ham.jade
+extends /layout-ham.pug
 
 block prepend menu
 	- var page = 'cw-decoder'
@@ -10,7 +10,7 @@ block subtitleDate
 	| January 2017
 
 block subtitle-right
-	+githubLink('camilstaps/CWDecoder')
+	+githubIconLink('camilstaps/CWDecoder')
 
 block page
 	h4 Introduction
diff --git a/resources/jade/finals/ham/index.jade b/resources/pug/finals/ham/index.pug
index c4cdc31..8cdae2f 100644
--- a/resources/jade/finals/ham/index.jade
+++ b/resources/pug/finals/ham/index.pug
@@ -1,4 +1,4 @@
-extends layout-ham.jade
+extends /layout-ham.pug
 
 block prepend menu
 	- var page = 'home'
diff --git a/resources/jade/finals/index.jade b/resources/pug/finals/index.pug
index 36c8a5e..454834f 100644
--- a/resources/jade/finals/index.jade
+++ b/resources/pug/finals/index.pug
@@ -1,4 +1,4 @@
-extends layout.jade
+extends /layout.pug
 
 block content
 	img#profile(alt="Camil Staps", style="float:left;", src="/assets/img/profile-300x300.png", width="170")
diff --git a/resources/jade/include/foot.jade b/resources/pug/include/foot.pug
index e69de29..e69de29 100644
--- a/resources/jade/include/foot.jade
+++ b/resources/pug/include/foot.pug
diff --git a/resources/jade/include/head.jade b/resources/pug/include/head.pug
index 7099c24..7099c24 100644
--- a/resources/jade/include/head.jade
+++ b/resources/pug/include/head.pug
diff --git a/resources/jade/include/layout-ham.jade b/resources/pug/include/layout-ham.pug
index 09bb3b7..ab080cf 100644
--- a/resources/jade/include/layout-ham.jade
+++ b/resources/pug/include/layout-ham.pug
@@ -1,4 +1,4 @@
-extends layout-sidebar.jade
+extends layout-sidebar.pug
 
 block title
 	| PD7LOL
diff --git a/resources/jade/include/layout-sidebar.jade b/resources/pug/include/layout-sidebar.pug
index 6e4610b..bdbec70 100644
--- a/resources/jade/include/layout-sidebar.jade
+++ b/resources/pug/include/layout-sidebar.pug
@@ -1,4 +1,4 @@
-extends layout.jade
+extends layout.pug
 
 block append titleContainer
 	|  – 
@@ -22,9 +22,6 @@ block content
 					block subtitleDate
 		div.col-lg-2.col-md-2.text-right
 			block subtitle-right
-				mixin githubLink(repo)
-					a(href='https://github.com/' + repo, target='_blank', title='Source on GitHub')
-						img(src='/assets/img/github.png', alt='GitHub')
 
 		div.col-lg-9.col-md-8.text-justify
 			block page
diff --git a/resources/jade/include/layout.jade b/resources/pug/include/layout.pug
index 685be88..6a89533 100644
--- a/resources/jade/include/layout.jade
+++ b/resources/pug/include/layout.pug
@@ -1,7 +1,9 @@
+include /mixins.pug
+
 doctype html
 html(lang="en")
 	head
-		include ./head.jade
+		include head.pug
 
 	body
 		.container
@@ -20,6 +22,6 @@ html(lang="en")
 					| Copyright © Camil Staps #{date.getFullYear()}  •  
 					= "Last updated " + date.toDateString()
 
-		include ./foot.jade
+		include foot.pug
 
 		block js
diff --git a/resources/pug/include/mixins.pug b/resources/pug/include/mixins.pug
new file mode 100644
index 0000000..14c78f3
--- /dev/null
+++ b/resources/pug/include/mixins.pug
@@ -0,0 +1,3 @@
+mixin githubIconLink(repo)
+	a(href='https://github.com/' + repo, target='_blank', title='Source on GitHub')
+		img(src='/assets/img/github.png', alt='GitHub')