V. 0.5.5 - Modificações para debugar. Agora vamos realizar testes com o Heroku, na produção.

José Maria Villac Pinheiro
1 parent abad3e74
Showing 8 changed files with 60 additions and 163 deletions Show diff stats
.gitignore
client/package.json
config/keys.js
package-lock.json
package.json
routes/authRoutes.js
routes/mapRoutes.js
views/map.jade
 node_modules
 dev.js
+prodEnvDes.bat
+mapTemp.jade
 _netrc
 # REACT CLIENT
@@ -17,6 +17,12 @@
     },
     "/auth/google/callback": {
       "target": "http://localhost:5000"      
+    },
+    "/api/current_user": {
+      "target": "http://localhost:5000"      
+    },
+    "/api/logout": {
+      "target": "http://localhost:5000"      
     }
   },
   "dependencies": {
 // keys.js - figure out what set of credentials to return
 // NODE_ENV - variável do Heroku que informa que estamos em production. o Heroku configura esta variável
+console.log ("Ambiente: " + process.env.NODE_ENV);
 if (process.env.NODE_ENV === "production") {
   // we are in production - return the production set of keys
   module.exports = require ("./prod");
@@ -558,11 +558,6 @@
       "resolved": "https://registry.npmjs.org/jade-bootstrap/-/jade-bootstrap-1.0.14.tgz",
       "integrity": "sha1-x99tRjinKHKZ3HUXXrUAnzJyEeg="
     },
-    "js-string-escape": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
-      "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8="
-    },
     "jstransformer": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz",
@@ -662,32 +657,32 @@
       }
     },
     "mongodb": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.7.tgz",
-      "integrity": "sha512-n/14kMJEoARXz1qhpNPhUocqy+z5130jhqgEIX1Tsl8UVpHrndQ8et+VmgC4yPK/I8Tcgc93JEMQCHTekBUnNA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.8.tgz",
+      "integrity": "sha512-mj7yIUyAr9xnO2ev8pcVJ9uX7gSum5LLs1qIFoWLxA5Il50+jcojKtaO1/TbexsScZ9Poz00Pc3b86GiSqJ7WA==",
       "requires": {
-        "mongodb-core": "3.0.7"
+        "mongodb-core": "3.0.8"
       }
     },
     "mongodb-core": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.7.tgz",
-      "integrity": "sha512-z6YufO7s40wLiv2ssFshqoLS4+Kf+huhHq6KZ7gDArsKNzXYjAwTMnhEIJ9GQ8fIfBGs5tBLNPfbIDoCKGPmOw==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.8.tgz",
+      "integrity": "sha512-dFxfhH9N7ohuQnINyIl6dqEF8sYOE0WKuymrFf3L3cipJNrx+S8rAbNOTwa00/fuJCjBMJNFsaA+R2N16//UIw==",
       "requires": {
         "bson": "1.0.6",
         "require_optional": "1.0.1"
       }
     },
     "mongoose": {
-      "version": "5.0.17",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.0.17.tgz",
-      "integrity": "sha512-RV1WBQhzW7oOhStR+s7LQYfgQWTJm4hgmU3TqtgTiBCfnj5/sNliX2/SY+ef7tpIZRUqEBV5xITZdAlwQ6Ymdg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.1.0.tgz",
+      "integrity": "sha512-GFx4Z2YpfxRQ9BExd2ML5MDKYdzOjdXB5a6fhove98EP6iB8tgZDY/fKSociEMJSIA37auPXmKfGfrc2uAMkMQ==",
       "requires": {
         "async": "2.1.4",
         "bson": "1.0.6",
         "kareem": "2.0.7",
         "lodash.get": "4.4.2",
-        "mongodb": "3.0.7",
+        "mongodb": "3.0.8",
         "mongoose-legacy-pluralize": "1.0.2",
         "mpath": "0.4.1",
         "mquery": "3.0.0",
@@ -846,18 +841,24 @@
       "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10="
     },
     "pg": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-7.4.1.tgz",
-      "integrity": "sha1-80Ecjd+faSMi/gXnAXoYiOR/ePE=",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-7.4.3.tgz",
+      "integrity": "sha1-97b5P1NA7MJZavu5ShPj1rYJg0s=",
       "requires": {
         "buffer-writer": "1.0.1",
-        "js-string-escape": "1.0.1",
         "packet-reader": "0.3.1",
         "pg-connection-string": "0.1.3",
         "pg-pool": "2.0.3",
         "pg-types": "1.12.1",
         "pgpass": "1.0.2",
         "semver": "4.3.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
+          "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c="
+        }
       }
     },
     "pg-connection-string": {
@@ -895,7 +896,7 @@
       "integrity": "sha1-5nfNNuy7F17hRtE90XCipzpDqUw=",
       "requires": {
         "async": "2.6.0",
-        "pg": "7.4.1",
+        "pg": "7.4.3",
         "topojson": "3.0.2"
       }
     },
@@ -917,7 +918,7 @@
     "postgres-interval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.1.tgz",
-      "integrity": "sha1-rNsPiXtLHG5JbZ1OCoU+HEKPBvA=",
+      "integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA==",
       "requires": {
         "xtend": "4.0.1"
       }
@@ -1001,13 +1002,6 @@
       "requires": {
         "resolve-from": "2.0.0",
         "semver": "5.5.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
-        }
       }
     },
     "resolve-from": {
@@ -1034,9 +1028,9 @@
       "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
     },
     "semver": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
-      "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c="
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
     "send": {
       "version": "0.15.6",
@@ -1114,7 +1108,7 @@
     "split": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
       "requires": {
         "through": "2.3.8"
       }
@@ -25,12 +25,12 @@
     "jade": "~1.11.0",
     "jade-bootstrap": "^1.0.14",
     "leaflet-draw": "^1.0.2",
-    "mongoose": "^5.0.17",
+    "mongoose": "^5.1.0",
     "morgan": "~1.9.0",
     "mssql": "^4.1.0",
     "passport": "^0.4.0",
     "passport-google-oauth20": "^1.0.0",
-    "pg": "*",
+    "pg": "^7.4.3",
     "postgeo": "*",
     "serve-favicon": "~2.4.5"
   }
+// Autentication routes
+//
 const passport = require("passport"); // from npm
 module.exports = router => {
@@ -18,10 +20,12 @@ module.exports = router =&gt; {
       if (err.name === "TokenError") {
         res.redirect("http://nexusbr.com"); // redirect them back to the login page
       } else {
+        console.log("Falhou ao logar!");
         // Handle other errors here
       }
     },
     (req, res) => {
+      console.log("Logou com sucesso!");
       // On success, redirect back to '/'
       res.redirect("/");
     }
 // Here are all mapping routes
 //
 const keys = require("../config/keys");
-
+console.log ("Layers de água: " + keys.waterLayers);
 module.exports = router => {
     // bounding coordinates to view the map
     var boundSW = [-23.6506647239914, -46.5848434588656]; // lat, long
@@ -17,17 +17,16 @@ module.exports = router =&gt; {
         var retorno = coordenadas(numero, function(x, y) {
             console.log("Terminou procura coordenadas x: " + x + " y: " + y);
             res.render("map", {
-            codigo: numero,
-            consumidor: codigoComNome,
-            fator_zoom: 23,
-            title: "NEXUS",
-            lat: y,
-            lng: x,
-            bndSW: boundSW,
-            bndNE: boundNE,
-            geoserverWMS: keys.geoserverWMS,
-            waterLayers: keys.waterLayers,
-            server: keys.server
+                codigo: numero,
+                consumidor: codigoComNome,
+                fator_zoom: 23,
+                title: "NEXUS",
+                lat: y,
+                lng: x,
+                bndSW: boundSW,
+                bndNE: boundNE,
+                geoserverWMS: keys.geoserverWMS,
+                waterLayers: keys.waterLayers,
             });
         });
         }
@@ -32,127 +32,18 @@ block content
                 format: 'image/png',
                 transparent: true,
                 maxZoom: 23
-            }),
+                }),
             drawnItems = L.featureGroup().addTo(map);
+    
         L.control.layers({
             "OSM": osm.addTo(map),
             "Google": L.tileLayer('http://www.google.cn/maps/vt?lyrs=s@189&gl=cn&x={x}&y={y}&z={z}', {
                 attribution: 'google'
                 })
-        }, {'Ocorrências': drawnItems, 'Redes': wmsLayer}, { position: 'topright', collapsed: true }).addTo(map);
+            }, 
+            {'Redes': wmsLayer, 'Ocorrências': drawnItems}, 
+            { position: 'topright', collapsed: false }
+            ).addTo(map);
         var marker = L.marker([#{lat},#{lng}]).addTo(map);
-        marker.bindPopup("<b>#{codigo}</b><br>#{consumidor}").openPopup();
-
-        //- var modifiedDraw = L.Control.Draw.extend({
-        //-         draw: {
-        //-             polygon: false,
-        //-             polyline: false,
-        //-             line: false,
-        //-             circle: false,
-        //-             rectangle: false,
-        //-             circlemarker: false,
-        //-             marker: true,
-        //-             toolbar: {
-        //-                 buttons: {
-        //-                     marker: 'Cadastra árvore'
-        //-                 }
-        //-             }
-        //-         },
-        //-         edit: {
-        //-             featureGroup: drawnItems
-        //-         }
-        //- });
-        
-        //- modifiedDraw = L.Control.Draw({
-        //-     draw: {
-        //-         polygon: false,
-        //-         polyline: false,
-        //-         line: false,
-        //-         circle: false,
-        //-         rectangle: false,
-        //-         circlemarker: false,
-        //-         marker: true
-        //-     },
-        //-     edit: {
-        //-         featureGroup: drawnItems
-        //-     },
-        //- });
-
-        var drawControl = new L.Control.Draw({
-            draw: {
-                toolbar: {
-                    buttons: {
-                        marker: 'Draw an awesome polygon'
-                    }
-                },
-                handlers: {
-                    marker: {
-                        tooltip: {
-                            start: "Selecione no mapa para colocar uma árvore."
-                        }
-                    }
-                },
-                polygon: false,
-                polyline: false,
-                line: false,
-                circle: false,
-                rectangle: false,
-                circlemarker: false,
-                marker: true
-            },
-            edit: {
-                featureGroup: drawnItems
-            },
-        });
-        L.drawLocal = {
-
-        };
-        
-        map.addControl(drawControl);
-
-        // Truncate value based on number of decimals
-        var _round = function(num, len) {
-            return Math.round(num*(Math.pow(10, len)))/(Math.pow(10, len));
-        };
-        // Helper method to format LatLng object (x.xxxxxx, y.yyyyyy)
-        var strLatLng = function(latlng) {
-            var coordenadas = "("+_round(latlng.lat, 2)+", "+_round(latlng.lng, 2)+")";
-            return coordenadas;
-        };
-
-        // Generate popup content based on layer type
-        // - Returns HTML string, or null if unknown object
-        var getPopupContent = function(layer) {
-            return strLatLng(layer.getLatLng());
-        };
-
-        // Object created - bind popup to layer, add to feature group
-        map.on(L.Draw.Event.CREATED, function(event) {
-            console.log ("Entrou no evento Created");
-            var layer = event.layer;
-            var content = getPopupContent(layer);
-            if (content !== null) {
-                console.log ("Coordendas: " + layer.getLatLng().lat + " - " + layer.getLatLng().lng);
-                $.post({
-                    data: "teste",
-                    // data: layer.getLatLng().lng + "/lat/" + layer.getLatLng().lat,
-                    url: "http://127.0.0.1/ponto"
-                });
-                layer.bindPopup(content);
-            }
-            drawnItems.addLayer(layer);
-        });
-
-        // Object(s) edited - update popups
-            map.on(L.Draw.Event.EDITED, function(event) {
-                console.log ("Entrou no evento Edited");
-                var layers = event.layers,
-                    content = null;
-                layers.eachLayer(function(layer) {
-                    content = getPopupContent(layer);
-                    if (content !== null) {
-                        layer.setPopupContent(content);
-                    }
-                });
-            });
+        marker.bindPopup("<b>#{codigo}</b><br>#{consumidor}").openPopup();
 \ No newline at end of file
1	node_modules	1	node_modules
2	dev.js	2	dev.js
		3	+prodEnvDes.bat
		4	+mapTemp.jade
3	_netrc	5	_netrc
4		6
5	# REACT CLIENT	7	# REACT CLIENT
	@@ -17,6 +17,12 @@		@@ -17,6 +17,12 @@
17	},	17	},
18	"/auth/google/callback": {	18	"/auth/google/callback": {
19	"target": "http://localhost:5000"	19	"target": "http://localhost:5000"
		20	+ },
		21	+ "/api/current_user": {
		22	+ "target": "http://localhost:5000"
		23	+ },
		24	+ "/api/logout": {
		25	+ "target": "http://localhost:5000"
20	}	26	}
21	},	27	},
22	"dependencies": {	28	"dependencies": {
1	// keys.js - figure out what set of credentials to return	1	// keys.js - figure out what set of credentials to return
2	// NODE_ENV - variável do Heroku que informa que estamos em production. o Heroku configura esta variável	2	// NODE_ENV - variável do Heroku que informa que estamos em production. o Heroku configura esta variável
		3	+console.log ("Ambiente: " + process.env.NODE_ENV);
3	if (process.env.NODE_ENV === "production") {	4	if (process.env.NODE_ENV === "production") {
4	// we are in production - return the production set of keys	5	// we are in production - return the production set of keys
5	module.exports = require ("./prod");	6	module.exports = require ("./prod");
	@@ -25,12 +25,12 @@		@@ -25,12 +25,12 @@
25	"jade": "~1.11.0",	25	"jade": "~1.11.0",
26	"jade-bootstrap": "^1.0.14",	26	"jade-bootstrap": "^1.0.14",
27	"leaflet-draw": "^1.0.2",	27	"leaflet-draw": "^1.0.2",
28	- "mongoose": "^5.0.17",	28	+ "mongoose": "^5.1.0",
29	"morgan": "~1.9.0",	29	"morgan": "~1.9.0",
30	"mssql": "^4.1.0",	30	"mssql": "^4.1.0",
31	"passport": "^0.4.0",	31	"passport": "^0.4.0",
32	"passport-google-oauth20": "^1.0.0",	32	"passport-google-oauth20": "^1.0.0",
33	- "pg": "*",	33	+ "pg": "^7.4.3",
34	"postgeo": "*",	34	"postgeo": "*",
35	"serve-favicon": "~2.4.5"	35	"serve-favicon": "~2.4.5"
36	}	36	}
	@@ -32,127 +32,18 @@ block content		@@ -32,127 +32,18 @@ block content
32	format: 'image/png',	32	format: 'image/png',
33	transparent: true,	33	transparent: true,
34	maxZoom: 23	34	maxZoom: 23
35	- }),	35	+ }),
36	drawnItems = L.featureGroup().addTo(map);	36	drawnItems = L.featureGroup().addTo(map);
		37	+
37	L.control.layers({	38	L.control.layers({
38	"OSM": osm.addTo(map),	39	"OSM": osm.addTo(map),
39	"Google": L.tileLayer('http://www.google.cn/maps/vt?lyrs=s@189&gl=cn&x={x}&y={y}&z={z}', {	40	"Google": L.tileLayer('http://www.google.cn/maps/vt?lyrs=s@189&gl=cn&x={x}&y={y}&z={z}', {
40	attribution: 'google'	41	attribution: 'google'
41	})	42	})
42	- }, {'Ocorrências': drawnItems, 'Redes': wmsLayer}, { position: 'topright', collapsed: true }).addTo(map);	43	+ },
		44	+ {'Redes': wmsLayer, 'Ocorrências': drawnItems},
		45	+ { position: 'topright', collapsed: false }
		46	+ ).addTo(map);
43		47
44	var marker = L.marker([#{lat},#{lng}]).addTo(map);	48	var marker = L.marker([#{lat},#{lng}]).addTo(map);
45	- marker.bindPopup("<b>#{codigo}</b><br>#{consumidor}").openPopup();
46	-
47	- //- var modifiedDraw = L.Control.Draw.extend({
48	- //- draw: {
49	- //- polygon: false,
50	- //- polyline: false,
51	- //- line: false,
52	- //- circle: false,
53	- //- rectangle: false,
54	- //- circlemarker: false,
55	- //- marker: true,
56	- //- toolbar: {
57	- //- buttons: {
58	- //- marker: 'Cadastra árvore'
59	- //- }
60	- //- }
61	- //- },
62	- //- edit: {
63	- //- featureGroup: drawnItems
64	- //- }
65	- //- });
66	-
67	- //- modifiedDraw = L.Control.Draw({
68	- //- draw: {
69	- //- polygon: false,
70	- //- polyline: false,
71	- //- line: false,
72	- //- circle: false,
73	- //- rectangle: false,
74	- //- circlemarker: false,
75	- //- marker: true
76	- //- },
77	- //- edit: {
78	- //- featureGroup: drawnItems
79	- //- },
80	- //- });
81	-
82	- var drawControl = new L.Control.Draw({
83	- draw: {
84	- toolbar: {
85	- buttons: {
86	- marker: 'Draw an awesome polygon'
87	- }
88	- },
89	- handlers: {
90	- marker: {
91	- tooltip: {
92	- start: "Selecione no mapa para colocar uma árvore."
93	- }
94	- }
95	- },
96	- polygon: false,
97	- polyline: false,
98	- line: false,
99	- circle: false,
100	- rectangle: false,
101	- circlemarker: false,
102	- marker: true
103	- },
104	- edit: {
105	- featureGroup: drawnItems
106	- },
107	- });
108	- L.drawLocal = {
109	-
110	- };
111	-
112	- map.addControl(drawControl);
113	-
114	- // Truncate value based on number of decimals
115	- var _round = function(num, len) {
116	- return Math.round(num*(Math.pow(10, len)))/(Math.pow(10, len));
117	- };
118	- // Helper method to format LatLng object (x.xxxxxx, y.yyyyyy)
119	- var strLatLng = function(latlng) {
120	- var coordenadas = "("+_round(latlng.lat, 2)+", "+_round(latlng.lng, 2)+")";
121	- return coordenadas;
122	- };
123	-
124	- // Generate popup content based on layer type
125	- // - Returns HTML string, or null if unknown object
126	- var getPopupContent = function(layer) {
127	- return strLatLng(layer.getLatLng());
128	- };
129	-
130	- // Object created - bind popup to layer, add to feature group
131	- map.on(L.Draw.Event.CREATED, function(event) {
132	- console.log ("Entrou no evento Created");
133	- var layer = event.layer;
134	- var content = getPopupContent(layer);
135	- if (content !== null) {
136	- console.log ("Coordendas: " + layer.getLatLng().lat + " - " + layer.getLatLng().lng);
137	- $.post({
138	- data: "teste",
139	- // data: layer.getLatLng().lng + "/lat/" + layer.getLatLng().lat,
140	- url: "http://127.0.0.1/ponto"
141	- });
142	- layer.bindPopup(content);
143	- }
144	- drawnItems.addLayer(layer);
145	- });
146	-
147	- // Object(s) edited - update popups
148	- map.on(L.Draw.Event.EDITED, function(event) {
149	- console.log ("Entrou no evento Edited");
150	- var layers = event.layers,
151	- content = null;
152	- layers.eachLayer(function(layer) {
153	- content = getPopupContent(layer);
154	- if (content !== null) {
155	- layer.setPopupContent(content);
156	- }
157	- });
158	- });	49	+ marker.bindPopup("<b>#{codigo}</b><br>#{consumidor}").openPopup();
159	\ No newline at end of file	50	\ No newline at end of file