From 4adbb6d93ba020ca4bc805ad72fbaf471bfc287c Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Wed, 20 Jun 2018 11:59:42 -0700
Subject: [PATCH 1/8] Remove unused variables

---
 routes/index.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/routes/index.js b/routes/index.js
index 850c948..cc2d62a 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -6,9 +6,7 @@ var fs = require('fs');
 var Cart = require('../models/cart');
 var products = JSON.parse(fs.readFileSync('./data/products.json', 'utf8'));
 
-router.get('/', function (req, res, next) {
-  var productId = products && products[0].id;
-
+router.get('/', function (_req, res, _next) {
   res.render('index', 
   { 
     title: 'NodeJS Shopping Cart',
@@ -17,7 +15,7 @@ router.get('/', function (req, res, next) {
   );
 });
 
-router.get('/add/:id', function(req, res, next) {
+router.get('/add/:id', function(req, res, _next) {
 
   var productId = req.params.id;
   var cart = new Cart(req.session.cart ? req.session.cart : {});
@@ -30,7 +28,7 @@ router.get('/add/:id', function(req, res, next) {
   inline();
 });
 
-router.get('/cart', function(req, res, next) {
+router.get('/cart', function(req, res, _next) {
   if (!req.session.cart) {
     return res.render('cart', {
       products: null
@@ -44,7 +42,7 @@ router.get('/cart', function(req, res, next) {
   });
 });
 
-router.get('/remove/:id', function(req, res, next) {
+router.get('/remove/:id', function(req, res, _next) {
   var productId = req.params.id;
   var cart = new Cart(req.session.cart ? req.session.cart : {});
 

From bc35b064f5417083e01ed0a1e811bdac1c75f34a Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 7 Aug 2018 10:50:55 -0700
Subject: [PATCH 2/8] More styling fixes

---
 app.js          | 2 +-
 routes/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 75ecd22..e8f4470 100644
--- a/app.js
+++ b/app.js
@@ -27,7 +27,7 @@ app.use(session({
   secret: 'secret',
   resave: false,
   saveUninitialized: true
-}))
+}));
 app.use(express.static(path.join(__dirname, 'public')));
 
 // res.locals is an object passed to hbs engine
diff --git a/routes/index.js b/routes/index.js
index cc2d62a..8bd5d98 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -20,7 +20,7 @@ router.get('/add/:id', function(req, res, _next) {
   var productId = req.params.id;
   var cart = new Cart(req.session.cart ? req.session.cart : {});
   var product = products.filter(function(item) {
-    return item.id == productId;
+    return item.id === productId;
   });
   cart.add(product[0], productId);
   req.session.cart = cart;

From a11de8b189c069186f899a236dd96e10ae3e5144 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 7 Aug 2018 11:07:38 -0700
Subject: [PATCH 3/8] Renomve unused vars in app.js

---
 app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index e8f4470..77420d7 100644
--- a/app.js
+++ b/app.js
@@ -39,14 +39,14 @@ app.use(function(req, res, next) {
 app.use('/', index);
 
 // catch 404 and forward to error handler
-app.use(function(req, res, next) {
+app.use(function(_req, _res, next) {
   var err = new Error('Not Found');
   err.status = 404;
   next(err);
 });
 
 // error handler
-app.use(function(err, req, res, next) {
+app.use(function(err, req, res, _next) {
   // set locals, only providing error in development
   res.locals.message = err.message;
   res.locals.error = req.app.get('env') === 'development' ? err : {};

From 25722997f1df6231fa664447e5ef8119ead0bc1e Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Thu, 16 Aug 2018 17:07:15 -0700
Subject: [PATCH 4/8] Update styling

---
 public/stylesheets/style.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 69bc44c..1f0365f 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -16,10 +16,12 @@ a {
 .dropdown-menu .cart {
   min-width: 250px;
   padding: 15px 25px 0;
+  margin: 0;
 }
 
 .dropdown-menu .cart .row > div {
   padding: 0 0 10px 0;
+  margin: 0;
 }
 
 .dropdown-menu .cart .totalPrice{

From fec0b5d52be1db67a43c248930acdda1a6d4f23a Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 28 Aug 2018 15:05:04 -0700
Subject: [PATCH 5/8] Use ES6 module syntax

---
 bin/www         |  8 ++++----
 index.js        | 32 ++++++++++++++++----------------
 routes/index.js | 12 ++++++------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/bin/www b/bin/www
index 7358773..a622116 100755
--- a/bin/www
+++ b/bin/www
@@ -4,22 +4,22 @@
  * Module dependencies.
  */
 
-var app = require('../index');
+import app, { set } from '../index';
 var debug = require('debug')('r3pi-shopping-cart:server');
-var http = require('http');
+import { createServer } from 'http';
 
 /**
  * Get port from environment and store in Express.
  */
 
 var port = normalizePort(process.env.PORT || '3000');
-app.set('port', port);
+set('port', port);
 
 /**
  * Create HTTP server.
  */
 
-var server = http.createServer(app);
+var server = createServer(app);
 
 /**
  * Listen on provided port, on all network interfaces.
diff --git a/index.js b/index.js
index 2c82e46..df9dd0f 100644
--- a/index.js
+++ b/index.js
@@ -1,35 +1,35 @@
-var express = require('express');
-var path = require('path');
-var favicon = require('serve-favicon');
-var logger = require('morgan');
-var cookieParser = require('cookie-parser');
-var bodyParser = require('body-parser');
+import express, { static } from 'express';
+import { join } from 'path';
+import favicon from 'serve-favicon';
+import logger from 'morgan';
+import cookieParser from 'cookie-parser';
+import { json, urlencoded } from 'body-parser';
 
-var hbs = require('hbs');
-var session = require('express-session');
+import { registerPartials } from 'hbs';
+import session from 'express-session';
 
-var index = require('./routes/index');
+import index from './routes/index';
 
 var app = express();
 
 // view engine setup
-app.set('views', path.join(__dirname, 'views'));
-hbs.registerPartials(__dirname + '/views/partials');
+app.set('views', join(__dirname, 'views'));
+registerPartials(__dirname + '/views/partials');
 app.set('view engine', 'hbs');
 
 // uncomment after placing your favicon in /public
-app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
+app.use(favicon(join(__dirname, 'public', 'favicon.ico')));
 
 app.use(logger('dev'));
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: false }));
+app.use(json());
+app.use(urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(session({
   secret: 'secret',
   resave: false,
   saveUninitialized: true
 }))
-app.use(express.static(path.join(__dirname, 'public')));
+app.use(static(join(__dirname, 'public')));
 
 // res.locals is an object passed to hbs engine
 app.use(function(req, res, next) {
@@ -56,4 +56,4 @@ app.use(function(err, req, res, next) {
   res.render('error');
 });
 
-module.exports = app;
+export default app;
diff --git a/routes/index.js b/routes/index.js
index 8bd5d98..be10237 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,10 +1,10 @@
-var express = require('express');
-var router = express.Router();
+import { Router } from 'express';
+var router = Router();
 
-var fs = require('fs');
+import { readFileSync } from 'fs';
 
-var Cart = require('../models/cart');
-var products = JSON.parse(fs.readFileSync('./data/products.json', 'utf8'));
+import Cart from '../models/cart';
+var products = JSON.parse(readFileSync('./data/products.json', 'utf8'));
 
 router.get('/', function (_req, res, _next) {
   res.render('index', 
@@ -51,4 +51,4 @@ router.get('/remove/:id', function(req, res, _next) {
   res.redirect('/cart');
 });
 
-module.exports = router;
+export default router;

From 30ec1f9564a37bedee027207a701cdfb1cecaa0b Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 28 Aug 2018 16:57:27 -0700
Subject: [PATCH 6/8] Revert "Use ES6 module syntax"

This reverts commit fec0b5d52be1db67a43c248930acdda1a6d4f23a.
---
 bin/www         |  8 ++++----
 index.js        | 32 ++++++++++++++++----------------
 routes/index.js | 12 ++++++------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/bin/www b/bin/www
index a622116..7358773 100755
--- a/bin/www
+++ b/bin/www
@@ -4,22 +4,22 @@
  * Module dependencies.
  */
 
-import app, { set } from '../index';
+var app = require('../index');
 var debug = require('debug')('r3pi-shopping-cart:server');
-import { createServer } from 'http';
+var http = require('http');
 
 /**
  * Get port from environment and store in Express.
  */
 
 var port = normalizePort(process.env.PORT || '3000');
-set('port', port);
+app.set('port', port);
 
 /**
  * Create HTTP server.
  */
 
-var server = createServer(app);
+var server = http.createServer(app);
 
 /**
  * Listen on provided port, on all network interfaces.
diff --git a/index.js b/index.js
index df9dd0f..2c82e46 100644
--- a/index.js
+++ b/index.js
@@ -1,35 +1,35 @@
-import express, { static } from 'express';
-import { join } from 'path';
-import favicon from 'serve-favicon';
-import logger from 'morgan';
-import cookieParser from 'cookie-parser';
-import { json, urlencoded } from 'body-parser';
+var express = require('express');
+var path = require('path');
+var favicon = require('serve-favicon');
+var logger = require('morgan');
+var cookieParser = require('cookie-parser');
+var bodyParser = require('body-parser');
 
-import { registerPartials } from 'hbs';
-import session from 'express-session';
+var hbs = require('hbs');
+var session = require('express-session');
 
-import index from './routes/index';
+var index = require('./routes/index');
 
 var app = express();
 
 // view engine setup
-app.set('views', join(__dirname, 'views'));
-registerPartials(__dirname + '/views/partials');
+app.set('views', path.join(__dirname, 'views'));
+hbs.registerPartials(__dirname + '/views/partials');
 app.set('view engine', 'hbs');
 
 // uncomment after placing your favicon in /public
-app.use(favicon(join(__dirname, 'public', 'favicon.ico')));
+app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
 
 app.use(logger('dev'));
-app.use(json());
-app.use(urlencoded({ extended: false }));
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(session({
   secret: 'secret',
   resave: false,
   saveUninitialized: true
 }))
-app.use(static(join(__dirname, 'public')));
+app.use(express.static(path.join(__dirname, 'public')));
 
 // res.locals is an object passed to hbs engine
 app.use(function(req, res, next) {
@@ -56,4 +56,4 @@ app.use(function(err, req, res, next) {
   res.render('error');
 });
 
-export default app;
+module.exports = app;
diff --git a/routes/index.js b/routes/index.js
index be10237..8bd5d98 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,10 +1,10 @@
-import { Router } from 'express';
-var router = Router();
+var express = require('express');
+var router = express.Router();
 
-import { readFileSync } from 'fs';
+var fs = require('fs');
 
-import Cart from '../models/cart';
-var products = JSON.parse(readFileSync('./data/products.json', 'utf8'));
+var Cart = require('../models/cart');
+var products = JSON.parse(fs.readFileSync('./data/products.json', 'utf8'));
 
 router.get('/', function (_req, res, _next) {
   res.render('index', 
@@ -51,4 +51,4 @@ router.get('/remove/:id', function(req, res, _next) {
   res.redirect('/cart');
 });
 
-export default router;
+module.exports = router;

From 83f75d060c2ed4fd725013366716913a8ce22730 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 28 Aug 2018 17:16:31 -0700
Subject: [PATCH 7/8] More styling updates

---
 public/stylesheets/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 1f0365f..f6cd05a 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -21,7 +21,7 @@ a {
 
 .dropdown-menu .cart .row > div {
   padding: 0 0 10px 0;
-  margin: 0;
+  margin: 10px;
 }
 
 .dropdown-menu .cart .totalPrice{

From f3a6c102187e870ba7883eb2c84c982f453bddf3 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Tue, 28 Aug 2018 17:18:15 -0700
Subject: [PATCH 8/8] Revert "More styling updates"

This reverts commit 83f75d060c2ed4fd725013366716913a8ce22730.
---
 public/stylesheets/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index f6cd05a..1f0365f 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -21,7 +21,7 @@ a {
 
 .dropdown-menu .cart .row > div {
   padding: 0 0 10px 0;
-  margin: 10px;
+  margin: 0;
 }
 
 .dropdown-menu .cart .totalPrice{