diff --git a/.gitignore b/.gitignore
index 59b2c0f..6f972ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
node_modules
dev.js
+prodEnvDes.bat
+mapTemp.jade
_netrc
# REACT CLIENT
diff --git a/client/package.json b/client/package.json
index 58ec9e6..d2fdea8 100644
--- a/client/package.json
+++ b/client/package.json
@@ -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": {
diff --git a/config/keys.js b/config/keys.js
index 73fdb04..8aa8ed6 100644
--- a/config/keys.js
+++ b/config/keys.js
@@ -1,5 +1,6 @@
// 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");
diff --git a/package-lock.json b/package-lock.json
index 89e55ba..84cec6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -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"
}
diff --git a/package.json b/package.json
index da9b743..d5bdc9f 100644
--- a/package.json
+++ b/package.json
@@ -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"
}
diff --git a/routes/authRoutes.js b/routes/authRoutes.js
index 8adcb50..88fcde0 100644
--- a/routes/authRoutes.js
+++ b/routes/authRoutes.js
@@ -1,3 +1,5 @@
+// Autentication routes
+//
const passport = require("passport"); // from npm
module.exports = router => {
@@ -18,10 +20,12 @@ module.exports = router => {
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("/");
}
diff --git a/routes/mapRoutes.js b/routes/mapRoutes.js
index 2077484..5b96e06 100644
--- a/routes/mapRoutes.js
+++ b/routes/mapRoutes.js
@@ -1,7 +1,7 @@
// 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 => {
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,
});
});
}
diff --git a/views/map.jade b/views/map.jade
index 75990a3..2890de3 100644
--- a/views/map.jade
+++ b/views/map.jade
@@ -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("#{codigo}
#{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("#{codigo}
#{consumidor}").openPopup();
\ No newline at end of file
--
libgit2 0.21.2