Skip to content

Commit

Permalink
修改express默认jade模版为html模版
Browse files Browse the repository at this point in the history
  • Loading branch information
oheart committed Dec 11, 2018
1 parent ff89f90 commit 5887136
Show file tree
Hide file tree
Showing 9 changed files with 712 additions and 179 deletions.
839 changes: 687 additions & 152 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
},
"dependencies": {
"axios": "0.18.0",
"body-parser": "~1.18.2",
"cookie-parser": "~1.4.3",
"debug": "~2.6.9",
"ejs": "2.6.1",
"express": "~4.15.5",
"jade": "~1.11.0",
"morgan": "~1.9.0",
"serve-favicon": "~2.4.5",
"vue": "^2.5.2",
"vue-lazyload": "1.2.6",
"vue-resource": "1.5.1",
Expand Down
4 changes: 3 additions & 1 deletion server/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ var favicon = require('serve-favicon');
var logger = require('morgan');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
var ejs = require('ejs');

var index = require('./routes/index');
var users = require('./routes/users');
Expand All @@ -12,7 +13,8 @@ var app = express();

// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');
app.engine('.html', ejs.__express);
app.set('view engine', 'html');

// uncomment after placing your favicon in /public
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
Expand Down
8 changes: 1 addition & 7 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
"start": "node ./bin/www"
},
"dependencies": {
"body-parser": "~1.18.2",
"cookie-parser": "~1.4.3",
"debug": "~2.6.9",
"express": "~4.15.5",
"jade": "~1.11.0",
"morgan": "~1.9.0",
"serve-favicon": "~2.4.5"

}
}
2 changes: 1 addition & 1 deletion server/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var router = express.Router();

/* GET home page. */
router.get('/', function(req, res, next) {
res.render('index', { title: 'Express' });
res.render('index', { title: 'Express, Very Good' });
});

module.exports = router;
6 changes: 0 additions & 6 deletions server/views/error.jade

This file was deleted.

12 changes: 12 additions & 0 deletions server/views/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Express</title>
</head>
<body>
<h2>
hello, Express is very Good!
</h2>
</body>
</html>
5 changes: 0 additions & 5 deletions server/views/index.jade

This file was deleted.

7 changes: 0 additions & 7 deletions server/views/layout.jade

This file was deleted.

0 comments on commit 5887136

Please sign in to comment.