Skip to content

Commit fec0b5d

Browse files
author
Rachel Macfarlane
committed
Use ES6 module syntax
1 parent 2572299 commit fec0b5d

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

bin/www

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
* Module dependencies.
55
*/
66

7-
var app = require('../index');
7+
import app, { set } from '../index';
88
var debug = require('debug')('r3pi-shopping-cart:server');
9-
var http = require('http');
9+
import { createServer } from 'http';
1010

1111
/**
1212
* Get port from environment and store in Express.
1313
*/
1414

1515
var port = normalizePort(process.env.PORT || '3000');
16-
app.set('port', port);
16+
set('port', port);
1717

1818
/**
1919
* Create HTTP server.
2020
*/
2121

22-
var server = http.createServer(app);
22+
var server = createServer(app);
2323

2424
/**
2525
* Listen on provided port, on all network interfaces.

index.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
var express = require('express');
2-
var path = require('path');
3-
var favicon = require('serve-favicon');
4-
var logger = require('morgan');
5-
var cookieParser = require('cookie-parser');
6-
var bodyParser = require('body-parser');
1+
import express, { static } from 'express';
2+
import { join } from 'path';
3+
import favicon from 'serve-favicon';
4+
import logger from 'morgan';
5+
import cookieParser from 'cookie-parser';
6+
import { json, urlencoded } from 'body-parser';
77

8-
var hbs = require('hbs');
9-
var session = require('express-session');
8+
import { registerPartials } from 'hbs';
9+
import session from 'express-session';
1010

11-
var index = require('./routes/index');
11+
import index from './routes/index';
1212

1313
var app = express();
1414

1515
// view engine setup
16-
app.set('views', path.join(__dirname, 'views'));
17-
hbs.registerPartials(__dirname + '/views/partials');
16+
app.set('views', join(__dirname, 'views'));
17+
registerPartials(__dirname + '/views/partials');
1818
app.set('view engine', 'hbs');
1919

2020
// uncomment after placing your favicon in /public
21-
app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
21+
app.use(favicon(join(__dirname, 'public', 'favicon.ico')));
2222

2323
app.use(logger('dev'));
24-
app.use(bodyParser.json());
25-
app.use(bodyParser.urlencoded({ extended: false }));
24+
app.use(json());
25+
app.use(urlencoded({ extended: false }));
2626
app.use(cookieParser());
2727
app.use(session({
2828
secret: 'secret',
2929
resave: false,
3030
saveUninitialized: true
3131
}))
32-
app.use(express.static(path.join(__dirname, 'public')));
32+
app.use(static(join(__dirname, 'public')));
3333

3434
// res.locals is an object passed to hbs engine
3535
app.use(function(req, res, next) {
@@ -56,4 +56,4 @@ app.use(function(err, req, res, next) {
5656
res.render('error');
5757
});
5858

59-
module.exports = app;
59+
export default app;

routes/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
var express = require('express');
2-
var router = express.Router();
1+
import { Router } from 'express';
2+
var router = Router();
33

4-
var fs = require('fs');
4+
import { readFileSync } from 'fs';
55

6-
var Cart = require('../models/cart');
7-
var products = JSON.parse(fs.readFileSync('./data/products.json', 'utf8'));
6+
import Cart from '../models/cart';
7+
var products = JSON.parse(readFileSync('./data/products.json', 'utf8'));
88

99
router.get('/', function (_req, res, _next) {
1010
res.render('index',
@@ -51,4 +51,4 @@ router.get('/remove/:id', function(req, res, _next) {
5151
res.redirect('/cart');
5252
});
5353

54-
module.exports = router;
54+
export default router;

0 commit comments

Comments
 (0)