diff --git a/nodeServer/app.js b/nodeServer/app.js index b010c37..cf49aec 100644 --- a/nodeServer/app.js +++ b/nodeServer/app.js @@ -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; diff --git a/nodeServer/bundlePaths/servicePaths.js b/nodeServer/bundlePaths/servicePaths.js index 686373c..5ea69c4 100644 --- a/nodeServer/bundlePaths/servicePaths.js +++ b/nodeServer/bundlePaths/servicePaths.js @@ -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', ]; diff --git a/nodeServer/getServerBundles.js b/nodeServer/getServerBundles.js index 25f67da..2b58274 100644 --- a/nodeServer/getServerBundles.js +++ b/nodeServer/getServerBundles.js @@ -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) @@ -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); }; diff --git a/nodeServer/templates/base.js b/nodeServer/templates/base.js index 5f4077e..609467e 100644 --- a/nodeServer/templates/base.js +++ b/nodeServer/templates/base.js @@ -26,7 +26,7 @@ const createAppBody = (about, reservation, menu, review) => ` `; const createHydrated = (about, reservation, menu, review) => ` - +