Merge branch 'issue18jadeToPug' into '1.0'

Issue18jade to pug

:zmknox: if you would be so kind as to make sure this works and merge it in that would be fantastic!

merges in #18 

See merge request !6

schedules/app.js

@@ -29,7 +29,7 @@ var app = express();
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'jade');
+app.set('view engine', 'pug');
 
 app.use(logger('dev'));
 app.use(bodyParser.json());

schedules/package.json

@@ -10,11 +10,11 @@
     "cookie-parser": "~1.4.3",
     "debug": "~2.2.0",
     "express": "~4.13.4",
-    "jade": "~1.11.0",
     "mongoose": "^4.5.5",
     "mongoose-redis-cache": "0.0.3",
     "morgan": "~1.7.0",
     "node-sass": "^3.8.0",
-    "node-sass-middleware": "0.8.0"
+    "node-sass-middleware": "0.8.0",
+    "pug": "^2.0.0-beta6"
   }
 }

schedules/views/docs.jade

-////////////////////////////////////////////////////////////////////////////////
-//                     Mason SRCT: Schedules Docs Page
-// - This is the page that contains the docs site for the schedules app.
-// - This file extends the non-app template and simply adds in content. 
-////////////////////////////////////////////////////////////////////////////////
-extends non-app
-
-// TODO: add actual content here.
-block docs-content
-  center
-    h1 Test

schedules/views/docs.pug

+//-/////////////////////////////////////////////////////////////////////////////
+//-                     Mason SRCT: Schedules Docs Page
+//- - This is the page that contains the docs site for the schedules app.
+//- - This file extends the non-app template and simply adds in content.
+//-/////////////////////////////////////////////////////////////////////////////
+extends non-app
+
+//-TODO: add actual content here.
+block docs-content
+  center
+    h1 Test

schedules/views/error.jade

-////////////////////////////////////////////////////////////////////////////////
-//                     Mason SRCT: Schedules Error Page
-// - For any given error, this page will render, showing a stacktrace.
-// - When not in dev mode, this will not render. 
-////////////////////////////////////////////////////////////////////////////////
-extends layout
-
-block content
-  h1= message
-  h2= error.status
-  pre #{error.stack}

schedules/views/error.pug

+//-/////////////////////////////////////////////////////////////////////////////
+//-                     Mason SRCT: Schedules Error Page
+//- - For any given error, this page will render, showing a stacktrace.
+//- - When not in dev mode, this will not render.
+//-/////////////////////////////////////////////////////////////////////////////
+extends layout
+
+block content
+  h1= message
+  h2= error.status
+  pre #{error.stack}

schedules/views/head.jade → schedules/views/head.pug

-////////////////////////////////////////////////////////////////////////////////
-//                  Mason SRCT: Schedules Global Head File
-// - This contains the global header for the entire site.
-// - Take care to remember that these resources load on all pages, so look into
-//   other options before using this. 
-////////////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////
+//-                  Mason SRCT: Schedules Global Head File
+//- - This contains the global header for the entire site.
+//- - Take care to remember that these resources load on all pages, so look into
+//-   other options before using this.
+//-/////////////////////////////////////////////////////////////////////////////
 
 head
   // Metadata

schedules/views/index.jade → schedules/views/index.pug

-////////////////////////////////////////////////////////////////////////////////
-//                     Mason SRCT: Schedules Main Page
-// - This page is the main application page.
-// - Extends the layout.jade file 
-////////////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////
+//-                     Mason SRCT: Schedules Main Page
+//- - This page is the main application page.
+//- - Extends the layout.pug file
+//-/////////////////////////////////////////////////////////////////////////////
 extends layout
 
 block content
@@ -12,7 +12,7 @@ block content
       // Main site column
       div.col-md-8
         // Site title include
-        include main-title.jade
+        include main-title
         // Content div
         div.row
           // Left padding

schedules/views/layout.jade → schedules/views/layout.pug

-////////////////////////////////////////////////////////////////////////////////
-//                     Mason SRCT: Schedules Master Layout
-// - This is the master layout for the entire site, with any placeholders needed
-//   for furthur customization.
-////////////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////
+//-                     Mason SRCT: Schedules Master Layout
+//- - This is the master layout for the entire site, with any placeholders needed
+//-   for furthur customization.
+//-/////////////////////////////////////////////////////////////////////////////
 doctype html
 html
   include head

schedules/views/main-title.jade → schedules/views/main-title.pug

-////////////////////////////////////////////////////////////////////////////////
-//                 Mason SRCT: Schedules Main Title Mixin
-// - This is an include file that can be brought into any other jade file.
-////////////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////
+//-                 Mason SRCT: Schedules Main Title Mixin
+//- - This is an include file that can be brought into any other pug file.
+//-/////////////////////////////////////////////////////////////////////////////
 
 // Site branding row
 div.row.center-text

schedules/views/nav.jade → schedules/views/nav.pug

-////////////////////////////////////////////////////////////////////////////////
-//                     Mason SRCT: Schedules Navbar
-// - This include file is for the nav bar
-////////////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////
+//-                     Mason SRCT: Schedules Navbar
+//- - This include file is for the nav bar
+//-/////////////////////////////////////////////////////////////////////////////
 nav.navbar.navbar-default.navbar-fixed-top
   div.container-fluid
     div.navbar-header

schedules/views/non-app.jade → schedules/views/non-app.pug

-////////////////////////////////////////////////////////////////////////////////
-//                 Mason SRCT: Schedules Non-app Layout
-// - Any non-app page will extend this layout file.
-////////////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////
+//-                 Mason SRCT: Schedules Non-app Layout
+//- - Any non-app page will extend this layout file.
+//-/////////////////////////////////////////////////////////////////////////////
 extends layout
 
 block content