From 2eeff079f82f53f8d718815b10f10f46a087c284 Mon Sep 17 00:00:00 2001
From: Makan Azarshahy <oro1919@gmail.com>
Date: Thu, 29 Mar 2018 10:19:25 -0700
Subject: [PATCH 1/4] Changed names of bundles to follow team naming convention

---
 src/nodeServer/app.js | 2 +-
 webpack.config.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nodeServer/app.js b/src/nodeServer/app.js
index 77a372e..ec506cc 100644
--- a/src/nodeServer/app.js
+++ b/src/nodeServer/app.js
@@ -15,7 +15,7 @@ const app = http.createServer((request, response) => {
   if (method === 'GET') {
     if (base === '') {
       serveHtml(request, response);
-    } else if (base === 'bundle.js' || base === 'bundle-server.js') {
+    } else if (base === 'MenuView-bundle.js' || base === 'MenuView-bundle-server.js') {
       serveBundle(request, response, base);
     } else if (base === 'restaurants' && menu === 'menu' && !tag) {
       const itemInfo = [restuarantName, meal];
diff --git a/webpack.config.js b/webpack.config.js
index 47d43b5..ab0f78d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -27,7 +27,7 @@ const clientSide = {
   },
   output: {
     path: BUILD_DIR,
-    filename: 'bundle.js',
+    filename: 'MenuView-bundle.js',
   },
 }
 // style-loader!
@@ -48,7 +48,7 @@ const serverSide = {
     ],
   },
   output: {
-    filename: 'bundle-server.js',
+    filename: 'Menu-View-bundle-server.js',
     path: path.resolve(__dirname, 'src/public'),
     libraryTarget: 'commonjs-module',
     publicPath: '/'

From a3752ec7a58f5414b9d66d6154daa3e707e1d2bf Mon Sep 17 00:00:00 2001
From: Makan Azarshahy <oro1919@gmail.com>
Date: Thu, 29 Mar 2018 10:49:31 -0700
Subject: [PATCH 2/4] Changed script for bundle to hit correct path

---
 src/client/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/index.html b/src/client/index.html
index fd3d784..ffc280b 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -21,7 +21,7 @@
     <div id="menu"></div>
     <script crossorigin src="https://unpkg.com/react@16/umd/react.production.min.js"></script>
     <script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"></script>
-    <script src="bundle.js" type="text/javascript"></script>
+    <script src="MenuView-bundle.js" type="text/javascript"></script>
     <script>
 ReactDOM.hydrate(
   React.createElement(MenuView, { name: 'quos999999' }),

From 93f6ed0bacef12dfdb8fd710160abd0336085553 Mon Sep 17 00:00:00 2001
From: Makan Azarshahy <oro1919@gmail.com>
Date: Thu, 29 Mar 2018 11:05:53 -0700
Subject: [PATCH 3/4] Fixed name for server bundle

---
 webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index ab0f78d..4fbc35b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -48,7 +48,7 @@ const serverSide = {
     ],
   },
   output: {
-    filename: 'Menu-View-bundle-server.js',
+    filename: 'MenuView-bundle-server.js',
     path: path.resolve(__dirname, 'src/public'),
     libraryTarget: 'commonjs-module',
     publicPath: '/'

From da30f75243221b5f9fb135fc76a77704db1235d4 Mon Sep 17 00:00:00 2001
From: Makan Azarshahy <oro1919@gmail.com>
Date: Thu, 29 Mar 2018 12:15:06 -0700
Subject: [PATCH 4/4] Changed the name of the bundles

---
 src/client/index.html | 2 +-
 src/nodeServer/app.js | 2 +-
 webpack.config.js     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client/index.html b/src/client/index.html
index ffc280b..7c594d1 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -21,7 +21,7 @@
     <div id="menu"></div>
     <script crossorigin src="https://unpkg.com/react@16/umd/react.production.min.js"></script>
     <script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"></script>
-    <script src="MenuView-bundle.js" type="text/javascript"></script>
+    <script src="menu-bundle.js" type="text/javascript"></script>
     <script>
 ReactDOM.hydrate(
   React.createElement(MenuView, { name: 'quos999999' }),
diff --git a/src/nodeServer/app.js b/src/nodeServer/app.js
index ec506cc..d804f26 100644
--- a/src/nodeServer/app.js
+++ b/src/nodeServer/app.js
@@ -15,7 +15,7 @@ const app = http.createServer((request, response) => {
   if (method === 'GET') {
     if (base === '') {
       serveHtml(request, response);
-    } else if (base === 'MenuView-bundle.js' || base === 'MenuView-bundle-server.js') {
+    } else if (base === 'menu-bundle.js' || base === 'menu-bundle-server.js') {
       serveBundle(request, response, base);
     } else if (base === 'restaurants' && menu === 'menu' && !tag) {
       const itemInfo = [restuarantName, meal];
diff --git a/webpack.config.js b/webpack.config.js
index 4fbc35b..35be78d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -27,7 +27,7 @@ const clientSide = {
   },
   output: {
     path: BUILD_DIR,
-    filename: 'MenuView-bundle.js',
+    filename: 'menu-bundle.js',
   },
 }
 // style-loader!
@@ -48,7 +48,7 @@ const serverSide = {
     ],
   },
   output: {
-    filename: 'MenuView-bundle-server.js',
+    filename: 'menu-bundle-server.js',
     path: path.resolve(__dirname, 'src/public'),
     libraryTarget: 'commonjs-module',
     publicPath: '/'