Merge pull request #18 from oslabs-beta/testingapp

Updated Docker Example ports

Author: jdonuto

examples/docker/default.conf

@@ -1,13 +1,13 @@
 server {
-  listen 8080;
+  listen 8000;
   root /srv/www/static;
   location / {
     # We try to get static files from nginx first
     # because node is not great at IO operations
     try_files $uri $uri/ @frontend;
   }
   location @frontend {
-    proxy_pass http://frontend:3000;
+    proxy_pass http://frontend:3333;
   }
   location /orders/createorder {
     proxy_pass http://orders:7777;

examples/docker/docker-compose.yml

@@ -15,7 +15,7 @@ services:
 
     # Bind container and host machine to exposed port, 3000.
     ports:
-      - '3000:3000'
+      - '3333:3333'
 
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'
@@ -69,7 +69,7 @@ services:
     container_name: 'production_nginx'
 
     ports:
-      - '8080:8080'
+      - '8000:8000'
 
     volumes:
       - './frontend:/srv/www/static'

examples/docker/frontend/Dockerfile

@@ -3,5 +3,5 @@ WORKDIR /app
 COPY . .
 RUN npm install
 EXPOSE 3000
-EXPOSE 8080
+EXPOSE 8000
 CMD ["node", "server.js"]

examples/docker/frontend/index.js

@@ -1,7 +1,7 @@
 window.onload = () => {
   // microservice1 - Books
   const microservicePort = {
-    3000: 'Frontend',
+    3333: 'Frontend',
     8888: 'Books',
     7777: 'Orders',
     5555: 'Customers',
@@ -37,7 +37,7 @@ window.onload = () => {
     };
 
     book = JSON.stringify(book);
-    fetch('http://localhost:8080/books/createbook', {
+    fetch('http://localhost:8000/books/createbook', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: book,
@@ -60,7 +60,7 @@ window.onload = () => {
     newDisplay.id = 'display';
     newDisplay.innerHTML = 'List of books';
     document.getElementById('container').appendChild(newDisplay);
-    fetch('http://localhost:8080/books/getbooks', {
+    fetch('http://localhost:8000/books/getbooks', {
       method: 'GET',
     })
       .then(res => res.json())
@@ -85,7 +85,7 @@ window.onload = () => {
             const newDisplay = document.createElement('ul');
             newDisplay.id = 'display';
             document.getElementById('container').appendChild(newDisplay);
-            const url = new URL('http://localhost:8080/books/deletebook:id?');
+            const url = new URL('http://localhost:8000/books/deletebook:id?');
             // const url = new URL('http://localhost:3000/books/deletebook:id?');
             url.searchParams.append('id', bookInDb._id);
 
@@ -115,7 +115,7 @@ window.onload = () => {
     newDisplay.id = 'display';
     newDisplay.innerHTML = 'List of orders';
     document.getElementById('container').appendChild(newDisplay);
-    fetch('http://localhost:8080/books/getordersinfo', {
+    fetch('http://localhost:8000/books/getordersinfo', {
       method: 'GET',
     })
       .then(res => res.json())
@@ -149,7 +149,7 @@ window.onload = () => {
       address,
     };
     customer = JSON.stringify(customer);
-    fetch('http://localhost:8080/customers/createcustomer', {
+    fetch('http://localhost:8000/customers/createcustomer', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: customer,
@@ -170,7 +170,7 @@ window.onload = () => {
     newDisplay.id = 'display';
     newDisplay.innerHTML = 'List of customers';
     document.getElementById('container').appendChild(newDisplay);
-    fetch('http://localhost:8080/customers/getcustomers', {
+    fetch('http://localhost:8000/customers/getcustomers', {
       method: 'GET',
     })
       .then(res => res.json())
@@ -191,7 +191,7 @@ window.onload = () => {
             const newDisplay = document.createElement('ul');
             newDisplay.id = 'display';
             document.getElementById('container').appendChild(newDisplay);
-            const url = new URL('http://localhost:8080/customers/deletecustomer:id?');
+            const url = new URL('http://localhost:8000/customers/deletecustomer:id?');
             url.searchParams.append('id', customerInDb._id);
             fetch(url, {
               method: 'DELETE',
@@ -218,7 +218,7 @@ window.onload = () => {
     newDisplay.innerHTML = 'List of books';
     document.getElementById('container').appendChild(newDisplay);
 
-    fetch('http://localhost:8080/customers/getbooksinfo', {
+    fetch('http://localhost:8000/customers/getbooksinfo', {
       method: 'GET',
     })
       .then(res => res.json())
@@ -254,7 +254,7 @@ window.onload = () => {
       deliveryDate,
     };
     order = JSON.stringify(order);
-    fetch('http://localhost:8080/orders/createorder', {
+    fetch('http://localhost:8000/orders/createorder', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: order,
@@ -276,7 +276,7 @@ window.onload = () => {
     newDisplay.id = 'display';
     newDisplay.innerHTML = 'List of orders';
     document.getElementById('container').appendChild(newDisplay);
-    fetch('http://localhost:8080/orders/getorders', {
+    fetch('http://localhost:8000/orders/getorders', {
       method: 'GET',
     })
       .then(res => res.json())
@@ -297,7 +297,7 @@ window.onload = () => {
             const newDisplay = document.createElement('ul');
             newDisplay.id = 'display';
             document.getElementById('container').appendChild(newDisplay);
-            const url = new URL('http://localhost:8080/orders/deleteorder:id?');
+            const url = new URL('http://localhost:8000/orders/deleteorder:id?');
             url.searchParams.append('id', orderInDb._id);
             fetch(url, {
               method: 'DELETE',
@@ -323,7 +323,7 @@ window.onload = () => {
     newDisplay.innerHTML = 'List of customers';
     document.getElementById('container').appendChild(newDisplay);
 
-    fetch('http://localhost:8080/orders/getcustomersinfo', {
+    fetch('http://localhost:8000/orders/getcustomersinfo', {
       method: 'GET',
     })
       .then(res => res.json())

examples/docker/frontend/server.js

@@ -55,6 +55,6 @@ app.use((error, req, res, next) => {
 });
 
 // Open and listen to server on specified port
-app.listen(3000, () => {
-  console.log('Frontend server running on port 3000 ...');
+app.listen(3333, () => {
+  console.log('Frontend server running on port 3333 ...');
 });