From 4fde7ac36531b3717bdc8b932e92020f662dfa28 Mon Sep 17 00:00:00 2001 From: Ricky Marasigan Date: Sat, 21 Nov 2020 10:51:15 -0800 Subject: [PATCH 1/4] updated version of node and ran npm install --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b03c67b..7ac0e2a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,9 @@ "version": "1.0.0", "description": "", "main": "index.js", - "engines": { "node": ">=14.15.0"}, + "engines": { + "node": ">=14.15.0" + }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "start": "node server", From 9571c513ed84e8b0befe43ecbb5c7208812a7858 Mon Sep 17 00:00:00 2001 From: Ricky Marasigan Date: Tue, 24 Nov 2020 15:35:27 -0800 Subject: [PATCH 2/4] displaying services 1 and 2 on page --- public/index.html | 14 ++++++++------ server/config/services.js | 32 ++++++++++++++++---------------- server/index.js | 2 +- server/router/api.js | 7 ++++--- server/router/bundles.js | 30 +++++++++++++++--------------- server/server.js | 1 + 6 files changed, 45 insertions(+), 41 deletions(-) diff --git a/public/index.html b/public/index.html index 4ef0445..b42043a 100644 --- a/public/index.html +++ b/public/index.html @@ -7,13 +7,15 @@ -
-
-
-
+
+
+
+ + - - + \ No newline at end of file diff --git a/server/config/services.js b/server/config/services.js index 1282711..b22bde2 100644 --- a/server/config/services.js +++ b/server/config/services.js @@ -42,23 +42,23 @@ module.exports = { service1: { - api: 'FIX_ME', + api: '/products/1', url: 'http://localhost:3001', - bundle: 'app.js', + bundle: '/products/1/bundle.js' }, service2: { - api: 'FIX_ME', - url: 'http://localhost:3002', - bundle: 'app.js', - }, - service3: { - api: 'FIX_ME', - url: 'http://localhost:3003', - bundle: 'app.js', - }, - service4: { - api: 'FIX_ME', - url: 'http://localhost:3004', - bundle: 'app.js', - }, + api: '/', + url: 'http://localhost:3005', + bundle: 'bundle.js', + } + // service3: { + // api: 'FIX_ME', + // url: 'http://localhost:3003', + // bundle: 'app.js', + // }, + // service4: { + // api: 'FIX_ME', + // url: 'http://localhost:3004', + // bundle: 'app.js', + // }, }; diff --git a/server/index.js b/server/index.js index b6a8d34..cf086c7 100644 --- a/server/index.js +++ b/server/index.js @@ -7,5 +7,5 @@ const server = require('./server.js'); const PORT = 3000 || process.env.PORT; server.listen(PORT, () => { - console.log(`Server running on localhost:${PORT}`); + console.log(`Server running on http://localhost:${PORT}`); }); diff --git a/server/router/api.js b/server/router/api.js index cdedd69..eee49ef 100644 --- a/server/router/api.js +++ b/server/router/api.js @@ -1,14 +1,15 @@ const { Router } = require('express'); const { createProxyMiddleware } = require('http-proxy-middleware'); const { - service1, service2, service3, service4, + service1, service2 + // service3, service4, } = require('../config/services.js'); const router = Router(); router.use(service1.api, createProxyMiddleware({ target: service1.url, changeOrigin: true })); router.use(service2.api, createProxyMiddleware({ target: service2.url, changeOrigin: true })); -router.use(service3.api, createProxyMiddleware({ target: service3.url, changeOrigin: true })); -router.use(service4.api, createProxyMiddleware({ target: service4.url, changeOrigin: true })); +// router.use(service3.api, createProxyMiddleware({ target: service3.url, changeOrigin: true })); +// router.use(service4.api, createProxyMiddleware({ target: service4.url, changeOrigin: true })); module.exports = router; diff --git a/server/router/bundles.js b/server/router/bundles.js index 8d40c99..fa4a6a0 100644 --- a/server/router/bundles.js +++ b/server/router/bundles.js @@ -1,7 +1,7 @@ const { Router } = require('express'); const { createProxyMiddleware } = require('http-proxy-middleware'); const { - service1, service2, service3, service4, + service1, service2, service3, service4 } = require('../config/services.js'); const router = Router(); @@ -22,20 +22,20 @@ router.use('/service2.js', createProxyMiddleware({ changeOrigin: true, })); -router.use('/service3.js', createProxyMiddleware({ - target: service3.url, - pathRewrite: { - '^/bundles/service3.js': service3.bundle, - }, - changeOrigin: true, -})); +// router.use('/service3.js', createProxyMiddleware({ +// target: service3.url, +// pathRewrite: { +// '^/bundles/service3.js': service3.bundle, +// }, +// changeOrigin: true, +// })); -router.use('/service4.js', createProxyMiddleware({ - target: service4.url, - pathRewrite: { - '^/bundles/service4.js': service4.bundle, - }, - changeOrigin: true, -})); +// router.use('/service4.js', createProxyMiddleware({ +// target: service4.url, +// pathRewrite: { +// '^/bundles/service4.js': service4.bundle, +// }, +// changeOrigin: true, +// })); module.exports = router; diff --git a/server/server.js b/server/server.js index d2b7f5e..b44d256 100644 --- a/server/server.js +++ b/server/server.js @@ -8,6 +8,7 @@ const app = express(); app.use(morgan('dev')); app.use(express.static(PUBLIC_DIR)); +app.use('/:id', express.static(PUBLIC_DIR)); // Handling asset requests for webpack bundles by passing off requests to the bundles router app.use('/bundles', router.bundles); From 93dc1ec03aeb57f831a9431f4bbec7dac87a921d Mon Sep 17 00:00:00 2001 From: Ricky Marasigan Date: Wed, 25 Nov 2020 17:54:12 -0800 Subject: [PATCH 3/4] changes before sams help --- public/index.html | 8 ++++---- server/config/services.js | 26 +++++++++++++------------- server/router/api.js | 7 +++---- server/router/bundles.js | 28 ++++++++++++++-------------- server/server.js | 2 +- 5 files changed, 35 insertions(+), 36 deletions(-) diff --git a/public/index.html b/public/index.html index b42043a..624e6cf 100644 --- a/public/index.html +++ b/public/index.html @@ -11,11 +11,11 @@
- +
+
- + + \ No newline at end of file diff --git a/server/config/services.js b/server/config/services.js index b22bde2..9bcdd03 100644 --- a/server/config/services.js +++ b/server/config/services.js @@ -42,23 +42,23 @@ module.exports = { service1: { - api: '/products/1', + api: '/products/:id', url: 'http://localhost:3001', - bundle: '/products/1/bundle.js' + bundle: '/products/:id/bundle.js' }, service2: { api: '/', url: 'http://localhost:3005', bundle: 'bundle.js', - } - // service3: { - // api: 'FIX_ME', - // url: 'http://localhost:3003', - // bundle: 'app.js', - // }, - // service4: { - // api: 'FIX_ME', - // url: 'http://localhost:3004', - // bundle: 'app.js', - // }, + }, + service3: { + api: '/ctl', + url: 'http://localhost:3003', + bundle: 'bundle.js', + }, + service4: { + api: '/reviews/:id', + url: 'http://localhost:8000', + bundle: 'bundle.js', + }, }; diff --git a/server/router/api.js b/server/router/api.js index eee49ef..de39938 100644 --- a/server/router/api.js +++ b/server/router/api.js @@ -1,15 +1,14 @@ const { Router } = require('express'); const { createProxyMiddleware } = require('http-proxy-middleware'); const { - service1, service2 - // service3, service4, + service1, service2, service3, service4 } = require('../config/services.js'); const router = Router(); router.use(service1.api, createProxyMiddleware({ target: service1.url, changeOrigin: true })); router.use(service2.api, createProxyMiddleware({ target: service2.url, changeOrigin: true })); -// router.use(service3.api, createProxyMiddleware({ target: service3.url, changeOrigin: true })); -// router.use(service4.api, createProxyMiddleware({ target: service4.url, changeOrigin: true })); +router.use(service3.api, createProxyMiddleware({ target: service3.url, changeOrigin: true })); +router.use(service4.api, createProxyMiddleware({ target: service4.url, changeOrigin: true })); module.exports = router; diff --git a/server/router/bundles.js b/server/router/bundles.js index fa4a6a0..d615dde 100644 --- a/server/router/bundles.js +++ b/server/router/bundles.js @@ -22,20 +22,20 @@ router.use('/service2.js', createProxyMiddleware({ changeOrigin: true, })); -// router.use('/service3.js', createProxyMiddleware({ -// target: service3.url, -// pathRewrite: { -// '^/bundles/service3.js': service3.bundle, -// }, -// changeOrigin: true, -// })); +router.use('/service3.js', createProxyMiddleware({ + target: service3.url, + pathRewrite: { + '^/bundles/service3.js': service3.bundle, + }, + changeOrigin: true, +})); -// router.use('/service4.js', createProxyMiddleware({ -// target: service4.url, -// pathRewrite: { -// '^/bundles/service4.js': service4.bundle, -// }, -// changeOrigin: true, -// })); +router.use('/service4.js', createProxyMiddleware({ + target: service4.url, + pathRewrite: { + '^/bundles/service4.js': service4.bundle, + }, + changeOrigin: true, +})); module.exports = router; diff --git a/server/server.js b/server/server.js index b44d256..ac7f7bf 100644 --- a/server/server.js +++ b/server/server.js @@ -8,7 +8,7 @@ const app = express(); app.use(morgan('dev')); app.use(express.static(PUBLIC_DIR)); -app.use('/:id', express.static(PUBLIC_DIR)); +// app.use('/:id', express.static(PUBLIC_DIR)); // Handling asset requests for webpack bundles by passing off requests to the bundles router app.use('/bundles', router.bundles); From e738ca2252cd1cebf6dd15497803568f9508df4c Mon Sep 17 00:00:00 2001 From: Ricky Marasigan Date: Wed, 25 Nov 2020 19:58:28 -0800 Subject: [PATCH 4/4] rendering all four components, still need to fix checkout get request --- public/index.html | 4 ++-- server/config/services.js | 14 +++++++------- server/index.js | 2 +- server/router/bundles.js | 8 ++++---- server/server.js | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/public/index.html b/public/index.html index 624e6cf..b23b0f2 100644 --- a/public/index.html +++ b/public/index.html @@ -12,10 +12,10 @@
-
+
- + \ No newline at end of file diff --git a/server/config/services.js b/server/config/services.js index 9bcdd03..175aa8b 100644 --- a/server/config/services.js +++ b/server/config/services.js @@ -42,14 +42,14 @@ module.exports = { service1: { - api: '/products/:id', + api: '/*/:id/photos', url: 'http://localhost:3001', - bundle: '/products/:id/bundle.js' + bundle: '/photos/:id/bundle.js' }, service2: { - api: '/', + api: '/*/:id/checkout', url: 'http://localhost:3005', - bundle: 'bundle.js', + bundle: '/checkout/:id/bundle.js', }, service3: { api: '/ctl', @@ -57,8 +57,8 @@ module.exports = { bundle: 'bundle.js', }, service4: { - api: '/reviews/:id', + api: '/*/:id/reviews', url: 'http://localhost:8000', - bundle: 'bundle.js', - }, + bundle: '/reviews/:id/bundle.js' + } }; diff --git a/server/index.js b/server/index.js index cf086c7..8c44f1d 100644 --- a/server/index.js +++ b/server/index.js @@ -7,5 +7,5 @@ const server = require('./server.js'); const PORT = 3000 || process.env.PORT; server.listen(PORT, () => { - console.log(`Server running on http://localhost:${PORT}`); + console.log(`Server running on http://localhost:${PORT}/products/1`); }); diff --git a/server/router/bundles.js b/server/router/bundles.js index d615dde..52494cd 100644 --- a/server/router/bundles.js +++ b/server/router/bundles.js @@ -9,7 +9,7 @@ const router = Router(); router.use('/service1.js', createProxyMiddleware({ target: service1.url, pathRewrite: { - '^/bundles/service1.js': service1.bundle, + '^.*': service1.bundle, }, changeOrigin: true, })); @@ -17,7 +17,7 @@ router.use('/service1.js', createProxyMiddleware({ router.use('/service2.js', createProxyMiddleware({ target: service2.url, pathRewrite: { - '^/bundles/service2.js': service2.bundle, + '^.*': service2.bundle, }, changeOrigin: true, })); @@ -25,7 +25,7 @@ router.use('/service2.js', createProxyMiddleware({ router.use('/service3.js', createProxyMiddleware({ target: service3.url, pathRewrite: { - '^/bundles/service3.js': service3.bundle, + '^.*': service3.bundle, }, changeOrigin: true, })); @@ -33,7 +33,7 @@ router.use('/service3.js', createProxyMiddleware({ router.use('/service4.js', createProxyMiddleware({ target: service4.url, pathRewrite: { - '^/bundles/service4.js': service4.bundle, + '^.*': service4.bundle, }, changeOrigin: true, })); diff --git a/server/server.js b/server/server.js index ac7f7bf..cf65bfb 100644 --- a/server/server.js +++ b/server/server.js @@ -7,12 +7,12 @@ const PUBLIC_DIR = path.resolve(__dirname, '..', 'public'); const app = express(); app.use(morgan('dev')); -app.use(express.static(PUBLIC_DIR)); +app.use('/products/:id', express.static(PUBLIC_DIR)); // app.use('/:id', express.static(PUBLIC_DIR)); // Handling asset requests for webpack bundles by passing off requests to the bundles router -app.use('/bundles', router.bundles); +app.use('/products/:id/bundles', router.bundles); // Handling AJAX requests to the API by passing off requests to the api router -app.use('/api', router.api); +app.use('/', router.api); module.exports = app;