Merge pull request #47 from LiskHQ/38_migrate-jade-to-pug

Migrate jade to pug - Closes #38

src/app/components/login/login.js

@@ -6,7 +6,7 @@ import './login.less'
 import './save.less'
 
 app.component('login', {
-  template: require('./login.jade')(),
+  template: require('./login.pug')(),
   bindings: {
     passphrase: '=',
     onLogin: '&',
@@ -170,7 +170,7 @@ app.component('login', {
           }
         },
 
-        template: require('./save.jade')(),
+        template: require('./save.pug')(),
         fullscreen: (this.$mdMedia('sm') || this.$mdMedia('xs'))  && this.$scope.customFullscreen
       })
     }

src/app/components/lsk/lsk.js

@@ -2,7 +2,7 @@
 import './lsk.less'
 
 app.component('lsk', {
-  template: require('./lsk.jade')(),
+  template: require('./lsk.pug')(),
   bindings: {
     amount: '<',
   },

src/app/components/main/main.js

@@ -6,7 +6,7 @@ import lisk from 'lisk-js'
 const UPDATE_INTERVAL_BALANCE = 10000
 
 app.component('main', {
-  template: require('./main.jade')(),
+  template: require('./main.pug')(),
   controller: class main {
     constructor ($scope, $rootScope, $timeout, $q, $peers, error) {
       this.$scope = $scope

src/app/components/send/send.js

@@ -5,7 +5,7 @@ const ADDRESS_VALID_RE = '^[0-9]{1,21}[L|l]$'
 const AMOUNT_VALID_RE = '^[0-9]+(\.[0-9]{1,8})?$'
 
 app.component('send', {
-  template: require('./send.jade')(),
+  template: require('./send.pug')(),
   bindings: {
     account: '<',
     passphrase: '<',
@@ -46,7 +46,7 @@ app.component('send', {
         if (this.account.secondSignature) {
           this.$mdDialog.show({
             controllerAs: '$ctrl',
-            template: require('./second.jade')(),
+            template: require('./second.pug')(),
             controller: /*@ngInject*/ class second {
               constructor ($scope, $mdDialog) {
                 this.$mdDialog = $mdDialog

src/app/components/timestamp/timestamp.js

@@ -6,7 +6,7 @@ import moment from 'moment'
 const UPDATE_INTERVAL_UPDATE = 15000
 
 app.component('timestamp', {
-  template: require('./timestamp.jade')(),
+  template: require('./timestamp.pug')(),
   bindings: {
     data: '<',
   },

src/app/components/top/top.js

@@ -2,7 +2,7 @@
 import './top.less'
 
 app.component('top', {
-  template: require('./top.jade')(),
+  template: require('./top.pug')(),
   bindings: {
     account: '<',
   },

src/app/components/transactions/transactions.js

@@ -4,7 +4,7 @@ import './transactions.less'
 const UPDATE_INTERVAL = 20000
 
 app.component('transactions', {
-  template: require('./transactions.jade')(),
+  template: require('./transactions.pug')(),
   bindings: {
     account: '=',
   },

src/package.json

@@ -39,15 +39,16 @@
     "grunt-eslint": "=19.0.0",
     "html-webpack-plugin": "=2.19.0",
     "imports-loader": "=0.6.5",
-    "jade": "=1.11.0",
-    "jade-loader": "=0.8.0",
     "jit-grunt": "=0.10.0",
     "json-loader": "=0.5.4",
     "less": "=2.7.1",
     "less-loader": "=2.2.3",
     "mocha": "=3.2.0",
     "ng-annotate-webpack-plugin": "=0.1.2",
     "nyc": "=10.1.2",
+    "pug": "=2.0.0-beta11",
+    "pug-cli": "=1.0.0-alpha6",
+    "pug-loader": "=2.3.0",
     "raw-loader": "=0.5.1",
     "should": "=11.2.0",
     "style-loader": "=0.13.1",

src/webpack.config.babel.js

@@ -48,7 +48,7 @@ let html = () => {
     plugins: [
       new HtmlWebpackPlugin({
         filename: 'index.html',
-        template: 'app/index.jade',
+        template: 'app/index.pug',
         minify: {
           collapseWhitespace: true,
           minifyCSS: true,
@@ -98,13 +98,13 @@ let babel = () => {
   }
 }
 
-let jade = () => {
+let pug = () => {
   return {
     module: {
       loaders: [
         {
-          test: /\.jade$/,
-          loader: 'jade',
+          test: /\.pug$/,
+          loader: 'pug-loader',
           include: PATHS.app,
         }
       ]
@@ -202,7 +202,7 @@ switch(process.env.npm_lifecycle_event) {
       html(),
       provide(),
       babel(),
-      jade(),
+      pug(),
       less(),
       css(),
       json(),
@@ -220,7 +220,7 @@ switch(process.env.npm_lifecycle_event) {
       html(),
       provide(),
       babel(),
-      jade(),
+      pug(),
       less(),
       css(),
       json(),