diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..0e0dcd2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+
+}
\ No newline at end of file
diff --git a/bin/www b/bin/www
index de525b7..4165d01 100644
--- a/bin/www
+++ b/bin/www
@@ -1,34 +1,38 @@
-#!/usr/bin/env node
+#!/usr/bin/env node // to invoke node, in linux system, that is installed in a path accessed through the environment variable
/**
* Module dependencies.
+ * Everything starts here
*/
-var app = require('../app');
+var app = require('../app'); // call app.js that will call routes throught ../routes/index.js
var debug = require('debug')('pg-node:server');
var http = require('http');
-// /**
-// * Production verification
-// */
-// var express = require("express");
-// if (process.env.NODE_ENV === 'production') {
-// // Express will serve up production assets
-// // like our main.js file, or main.css file!
-// app.use(express.static('../client/build'));
-
-// // Express will serve up the index.html file
-// // if it doesn't recognize the route
-// const path = require('path');
-// app.get('*', (req, res) => {
-// res.sendFile(path.resolve(__dirname, 'client', 'build', 'index.html'));
-// });
-// }
+/**
+ * Production version verification. It needs to build for React client.
+ */
+var express = require("express");
+if (process.env.NODE_ENV === 'production') {
+ // Express will serve up production assets
+ // like our main.js file or main.css file!
+ // this guarantees that expressjs will look
+ // for specific files in specific directories
+ app.use(express.static('../client/build')); // if get request comes in from some route or some file or for anything for my application and we do not understant, then look in some file from this directory to see if some file that matches up the request
+
+ // Express will serve up the index.html file
+ // if it doesn't recognize the route.
+ // If something arrives from a route that we do not understand,
+ // look at the index.htm file in the client directory
+ const path = require('path');
+ app.get('*', (req, res) => {
+ res.sendFile(path.resolve(__dirname, 'client', 'build', 'index.html'));
+ });
+}
/**
* Define port
*/
-
var port = normalizePort(process.env.PORT || '5000');
app.set('port', port);
diff --git a/client/package.json b/client/package.json
index fce0819..525ee3e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "client",
- "version": "0.7.0",
+ "version": "0.7.1",
"private": true,
"proxy": {
"/map": {
diff --git a/client/public/index.html b/client/public/index.html
index 6d11109..423331f 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -1,24 +1,12 @@
+
-
-
NEXUS
@@ -26,15 +14,5 @@
You need to enable JavaScript to run this app.
-
diff --git a/client/public/manifest.json b/client/public/manifest.json
index ef19ec2..5d94885 100644
--- a/client/public/manifest.json
+++ b/client/public/manifest.json
@@ -1,6 +1,6 @@
{
- "short_name": "React App",
- "name": "Create React App Sample",
+ "short_name": "GeoSanWeb",
+ "name": "Map application for water companies",
"icons": [
{
"src": "favicon.ico",
diff --git a/client/src/index.js b/client/src/index.js
index e7e8868..b86fc74 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -1,3 +1,8 @@
+/**
+ * @description JavaScript entry point - renders the React element App from App.js in the DOM supplied at the public/index.html container
+ * @author José Maria Villac Pinheiro
+ * @date 2018-07-19
+ */
import React from "react";
import ReactDOM from "react-dom";
import "./index.css";
diff --git a/package.json b/package.json
index c98cdb0..691b9bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "GeoSanWeb",
- "version": "0.7.0",
+ "version": "0.7.1",
"description": "Map application for water companies",
"repository": "git@bitbucket.org:nexusbr/geosanweb.git",
"private": true,
@@ -12,7 +12,8 @@
"start": "node ./bin/www",
"server": "nodemon ./bin/www",
"client": "npm run start --prefix client",
- "dev": "concurrently \"npm run server\" \"npm run client\""
+ "dev": "concurrently \"npm run server\" \"npm run client\"",
+ "heroku-postbuild": "NPM_CONFIG_PRODUCTION=false npm install --prefix client && npm run build --prefix client"
},
"author": "José Maria Villac Pinheiro",
"dependencies": {
--
libgit2 0.21.2