diff --git a/lyricsnode/app.js b/lyricsnode/app.js index 2b402ef..ba3fcf4 100644 --- a/lyricsnode/app.js +++ b/lyricsnode/app.js @@ -7,14 +7,22 @@ var express = require('express') , routes = require('./routes') , user = require('./routes/user') , http = require('http') - , path = require('path'); + , path = require('path') + , cons = require('consolidate') + , swig = require('swig'); var app = express(); // all environments +app.engine('.html', cons.swig) +swig.init({ + root: path.join(__dirname, 'views'), + allowErrors: true +}) + app.set('port', process.env.PORT || 3000); -app.set('views', __dirname + '/views'); -app.set('view engine', 'jade'); +app.set('views', path.join(__dirname, 'views')); +app.set('view engine', 'html'); app.use(express.favicon()); app.use(express.logger('dev')); app.use(express.bodyParser()); diff --git a/lyricsnode/package.json b/lyricsnode/package.json index 20592cf..285f223 100644 --- a/lyricsnode/package.json +++ b/lyricsnode/package.json @@ -7,6 +7,7 @@ }, "dependencies": { "express": "3.3.4", - "jade": "*" + "consolidate": "*", + "swig": "*" } } \ No newline at end of file diff --git a/lyricsnode/views/index.html b/lyricsnode/views/index.html new file mode 100644 index 0000000..59b77d9 --- /dev/null +++ b/lyricsnode/views/index.html @@ -0,0 +1,11 @@ + + + + + {{ title }} + + + + Hello from {{ title }} + + \ No newline at end of file diff --git a/lyricsnode/views/index.jade b/lyricsnode/views/index.jade deleted file mode 100644 index ef7b09f..0000000 --- a/lyricsnode/views/index.jade +++ /dev/null @@ -1,5 +0,0 @@ -extends layout - -block content - h1= title - p Welcome to #{title} \ No newline at end of file diff --git a/lyricsnode/views/layout.jade b/lyricsnode/views/layout.jade deleted file mode 100644 index 1b7b305..0000000 --- a/lyricsnode/views/layout.jade +++ /dev/null @@ -1,7 +0,0 @@ -doctype 5 -html - head - title= title - link(rel='stylesheet', href='/stylesheets/style.css') - body - block content \ No newline at end of file