Skip to content

Refactor/routes #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Busyreadingsomething wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Refactor/routes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2eeff07
Changed names of bundles to follow team naming convention
Busyreadingsomething Mar 29, 2018
a3752ec
Changed script for bundle to hit correct path
Busyreadingsomething Mar 29, 2018
93f6ed0
Fixed name for server bundle
Busyreadingsomething Mar 29, 2018
da30f75
Changed the name of the bundles
Busyreadingsomething Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="menu-bundle.js" type="text/javascript"></script>
<script>
ReactDOM.hydrate(
React.createElement(MenuView, { name: 'quos999999' }),
Expand Down
2 changes: 1 addition & 1 deletion src/nodeServer/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 === 'menu-bundle.js' || base === 'menu-bundle-server.js') {
serveBundle(request, response, base);
} else if (base === 'restaurants' && menu === 'menu' && !tag) {
const itemInfo = [restuarantName, meal];
Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const clientSide = {
},
output: {
path: BUILD_DIR,
filename: 'bundle.js',
filename: 'menu-bundle.js',
},
}
// style-loader!
Expand All @@ -48,7 +48,7 @@ const serverSide = {
],
},
output: {
filename: 'bundle-server.js',
filename: 'menu-bundle-server.js',
path: path.resolve(__dirname, 'src/public'),
libraryTarget: 'commonjs-module',
publicPath: '/'
Expand Down