diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..6f32db4 Binary files /dev/null and b/.DS_Store differ diff --git a/package.json b/package.json index b03c67b..f9fd41b 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,12 @@ "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", + "start": "node server/server.js", "start:dev": "nodemon server" }, "keywords": [], diff --git a/public/.DS_Store b/public/.DS_Store new file mode 100644 index 0000000..a4ca44b Binary files /dev/null and b/public/.DS_Store differ diff --git a/public/checkout.jpeg b/public/checkout.jpeg new file mode 100644 index 0000000..d34fcdf Binary files /dev/null and b/public/checkout.jpeg differ diff --git a/public/header.jpeg b/public/header.jpeg new file mode 100644 index 0000000..65e65ab Binary files /dev/null and b/public/header.jpeg differ diff --git a/public/index.html b/public/index.html index 4ef0445..0d578b1 100644 --- a/public/index.html +++ b/public/index.html @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/public/recommendations.jpeg b/public/recommendations.jpeg new file mode 100644 index 0000000..a470d54 Binary files /dev/null and b/public/recommendations.jpeg differ diff --git a/public/reviews.jpeg b/public/reviews.jpeg new file mode 100644 index 0000000..f59b818 Binary files /dev/null and b/public/reviews.jpeg differ diff --git a/public/style.css b/public/style.css index e69de29..542c93d 100644 --- a/public/style.css +++ b/public/style.css @@ -0,0 +1,57 @@ +#header { + width: 100%; +} + +#oneTwo { + display: flex; + width: 1366px; + background-color: #ebeef0; +} + +#containerOne { + display: flex; + justify-content: flex-start; + width: 70%; + /* position: absolute; + left: 0%; + width: 65%; */ +} + +#service1 { + display: flex; + justify-content: center; + width: 100%; +} + +#containerTwo { + display: flex; + justify-content: flex-end; + width: 30%; + height: 950px; + position: -webkit-sticky; + position: sticky; + top: 10; + position: absolute; + right: 0%; +} + +#service2 { + display: flex; + justify-content: flex-end; + width: 100%; + /* float: right; */ + /* width: 450px; + height: auto; */ +} + +#service3 { + display: flex; + float: left; + width: 65% +} + +#service4 { + display: flex; + float: left; + width: 65% +} diff --git a/server/config/services.js b/server/config/services.js index 1282711..dfb6043 100644 --- a/server/config/services.js +++ b/server/config/services.js @@ -42,23 +42,23 @@ module.exports = { service1: { - api: 'FIX_ME', - url: 'http://localhost:3001', - bundle: 'app.js', + api: '/:id/photos', + url: 'http://18.144.83.48:3001/photos/1/', + bundle: '/photos/:id/bundle.js' }, service2: { - api: 'FIX_ME', - url: 'http://localhost:3002', - bundle: 'app.js', + api: '/:id/checkout', + url: 'http://54.183.207.18:3005/', + bundle: '/checkout/:id/bundle.js', }, service3: { - api: 'FIX_ME', - url: 'http://localhost:3003', - bundle: 'app.js', + api: '/ctl', + url: 'http://3.101.147.158:3003/', + bundle: 'bundle.js', }, service4: { - api: 'FIX_ME', - url: 'http://localhost:3004', - bundle: 'app.js', - }, + api: '/:id/reviews', + url: 'http://13.57.35.129:8000/', + bundle: '/reviews/:id/bundle.js' + } }; diff --git a/server/index.js b/server/index.js index b6a8d34..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 localhost:${PORT}`); + console.log(`Server running on http://localhost:${PORT}/products/1`); }); diff --git a/server/router/api.js b/server/router/api.js index cdedd69..de39938 100644 --- a/server/router/api.js +++ b/server/router/api.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(); diff --git a/server/router/bundles.js b/server/router/bundles.js index 8d40c99..52494cd 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(); @@ -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 d2b7f5e..cf65bfb 100644 --- a/server/server.js +++ b/server/server.js @@ -7,11 +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;