Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion nodeServer/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ const cache = require('./cache');
const app = http.createServer((request, response) => {
const { method, url } = request;
const [base, restaurantName, service, meal, tag] = url.slice(1).split('/');
const [component, bundle] = url.slice(1).split('/');
if (method === 'GET') {
if (base === '') {
serveHtml(response);
} else if (base === 'bundle.js' || base === 'restaurants') {
} else if (bundle.includes('bundle.js')) {
cache(response, `/${bundle}`, component);
} else if (base === 'restaurants') {
cache(response, url, service);
} else {
response.statusCode = 404;
Expand Down
8 changes: 4 additions & 4 deletions nodeServer/bundlePaths/servicePaths.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
const servicePaths = {
// about: '',
reservations: 'http://ec2-54-219-137-44.us-west-1.compute.amazonaws.com',
// SummaryView: '',
// ReservationView: 'http://ec2-54-219-137-44.us-west-1.compute.amazonaws.com',
menu: 'http://ec2-54-67-41-26.us-west-1.compute.amazonaws.com',
// reviews: '',
};

const serviceList = [
// 'about',
'reservations',
// 'SummaryView',
// 'ReservationView',
'menu',
// 'reviews',
];
Expand Down
6 changes: 3 additions & 3 deletions nodeServer/getServerBundles.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ const axios = require('axios');
const fs = require('fs');
const path = require('path');

const { servicePaths, serviceLists } = require('./bundlePaths/servicePaths');
const { servicePaths, serviceList } = require('./bundlePaths/servicePaths');

const bundles = [];

const getBundle = service =>
axios.get(`${servicePaths[service]}/bundle-server.js`);
axios.get(`${servicePaths[service]}/${service}-bundle-server.js`);

const writeBundle = service =>
getBundle(service)
Expand All @@ -23,7 +23,7 @@ const writeBundle = service =>

const getAndWriteAllBundles = () => {
const list = [];
serviceLists.forEach(service => list.push(writeBundle(service)));
serviceList.forEach(service => list.push(writeBundle(service)));
console.log('GET AND WRITE');
return Promise.all(list);
};
Expand Down
2 changes: 1 addition & 1 deletion nodeServer/templates/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const createAppBody = (about, reservation, menu, review) => `
`;

const createHydrated = (about, reservation, menu, review) => `
<script src='http://ec2-18-144-47-201.us-west-1.compute.amazonaws.com/bundle.js'></script>
<script src='http://ec2-18-144-47-201.us-west-1.compute.amazonaws.com/menu/menu-bundle.js'></script>
<script>
ReactDOM.hydrate(
React.createElement(${menu}, { name: "quos999999"}),
Expand Down