diff --git a/app.js b/app.js index 968ca09..4536321 100644 --- a/app.js +++ b/app.js @@ -14,7 +14,7 @@ var app = express(); // view engine setup app.set("views", path.join(__dirname, "views")); -app.set("view engine", "jade"); +app.set("view engine", "pug"); // uncomment after placing your favicon in /public app.use( diff --git a/index.js b/index.js new file mode 100644 index 0000000..d75da9c --- /dev/null +++ b/index.js @@ -0,0 +1,112 @@ +#!/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'); // call app.js that will call routes throught ../routes/index.js +var debug = require('debug')('pg-node:server'); +// var http = require('http'); + +/** + * 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 + console.log ("NEXUS-We are in production..."); + 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.listen(port); + +/** + * Create HTTP server. + */ + +// var server = http.createServer(app); + +/** + * Listen on provided port, on all network interfaces. + */ + +// server.listen(port); +// server.on('error', onError); +// server.on('listening', onListening); + +/** + * Normalize a port into a number, string, or false. + */ + +function normalizePort(val) { + var port = parseInt(val, 10); + + if (isNaN(port)) { + // named pipe + return val; + } + + if (port >= 0) { + // port number + return port; + } + + return false; +} + +/** + * Event listener for HTTP server "error" event. + */ + +function onError(error) { + if (error.syscall !== 'listen') { + throw error; + } + + var bind = typeof port === 'string' + ? 'Pipe ' + port + : 'Port ' + port; + + // handle specific listen errors with friendly messages + switch (error.code) { + case 'EACCES': + console.error(bind + ' requires elevated privileges'); + process.exit(1); + break; + case 'EADDRINUSE': + console.error(bind + ' is already in use'); + process.exit(1); + break; + default: + throw error; + } +} + +/** + * Event listener for HTTP server "listening" event. + */ + +// function onListening() { +// var addr = server.address(); +// var bind = typeof addr === 'string' +// ? 'pipe ' + addr +// : 'port ' + addr.port; +// debug('Listening on ' + bind); +// } diff --git a/package-lock.json b/package-lock.json index 74929d8..78a6ca4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "GeoSanWeb", - "version": "0.6.2", + "version": "0.7.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -381,6 +381,11 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "doctypes": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", + "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=" + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -494,6 +499,11 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, "generic-pool": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.4.2.tgz", @@ -582,6 +592,14 @@ } } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, "has-ansi": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", @@ -642,11 +660,35 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=" }, + "is-expression": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz", + "integrity": "sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=", + "requires": { + "acorn": "~4.0.2", + "object-assign": "^4.0.1" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" + } + } + }, "is-promise": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" }, + "is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "requires": { + "has": "^1.0.1" + } + }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -674,6 +716,11 @@ "resolved": "https://registry.npmjs.org/jade-bootstrap/-/jade-bootstrap-1.0.14.tgz", "integrity": "sha1-x99tRjinKHKZ3HUXXrUAnzJyEeg=" }, + "js-stringify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", + "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=" + }, "jstransformer": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz", @@ -920,6 +967,11 @@ "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz", "integrity": "sha1-vR/vr2hslrdUda7VGWQS/2DPucE=" }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -997,6 +1049,11 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -1112,6 +1169,206 @@ "ipaddr.js": "1.4.0" } }, + "pug": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.3.tgz", + "integrity": "sha1-ccuoJTfJWl6rftBGluQiH1Oqh44=", + "requires": { + "pug-code-gen": "^2.0.1", + "pug-filters": "^3.1.0", + "pug-lexer": "^4.0.0", + "pug-linker": "^3.0.5", + "pug-load": "^2.0.11", + "pug-parser": "^5.0.0", + "pug-runtime": "^2.0.4", + "pug-strip-comments": "^1.0.3" + } + }, + "pug-attrs": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.3.tgz", + "integrity": "sha1-owlflw5kFR972tlX7vVftdeQXRU=", + "requires": { + "constantinople": "^3.0.1", + "js-stringify": "^1.0.1", + "pug-runtime": "^2.0.4" + } + }, + "pug-bootstrap": { + "version": "0.0.15", + "resolved": "https://registry.npmjs.org/pug-bootstrap/-/pug-bootstrap-0.0.15.tgz", + "integrity": "sha1-Ack6s2nPGpRWdtcOoSUjaAjhIRY=", + "requires": { + "pug": "^2.0.0-beta3" + } + }, + "pug-code-gen": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.1.tgz", + "integrity": "sha1-CVHsgyJddNjPxHan+Zolm199BQw=", + "requires": { + "constantinople": "^3.0.1", + "doctypes": "^1.1.0", + "js-stringify": "^1.0.1", + "pug-attrs": "^2.0.3", + "pug-error": "^1.3.2", + "pug-runtime": "^2.0.4", + "void-elements": "^2.0.1", + "with": "^5.0.0" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=" + }, + "acorn-globals": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz", + "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=", + "requires": { + "acorn": "^4.0.4" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" + } + } + }, + "with": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/with/-/with-5.1.1.tgz", + "integrity": "sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=", + "requires": { + "acorn": "^3.1.0", + "acorn-globals": "^3.0.0" + } + } + } + }, + "pug-error": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz", + "integrity": "sha1-U659nSm7A89WRJOgJhCfVMR/XyY=" + }, + "pug-filters": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.0.tgz", + "integrity": "sha1-JxZVVbwEwjbkqisDZiRt+gIbYm4=", + "requires": { + "clean-css": "^4.1.11", + "constantinople": "^3.0.1", + "jstransformer": "1.0.0", + "pug-error": "^1.3.2", + "pug-walk": "^1.1.7", + "resolve": "^1.1.6", + "uglify-js": "^2.6.1" + }, + "dependencies": { + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, + "clean-css": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz", + "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=", + "requires": { + "source-map": "0.5.x" + } + }, + "jstransformer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", + "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=", + "requires": { + "is-promise": "^2.0.0", + "promise": "^7.0.1" + } + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "~2.0.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + } + } + }, + "pug-lexer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.0.0.tgz", + "integrity": "sha1-IQwYRX7y4XYCQnQMXmR715TOwng=", + "requires": { + "character-parser": "^2.1.1", + "is-expression": "^3.0.0", + "pug-error": "^1.3.2" + }, + "dependencies": { + "character-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz", + "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=", + "requires": { + "is-regex": "^1.0.3" + } + } + } + }, + "pug-linker": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.5.tgz", + "integrity": "sha1-npp65ABWgtAn3uuWsAD4juuDoC8=", + "requires": { + "pug-error": "^1.3.2", + "pug-walk": "^1.1.7" + } + }, + "pug-load": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.11.tgz", + "integrity": "sha1-5kjlftET/iwfRdV4WOorrWvAFSc=", + "requires": { + "object-assign": "^4.1.0", + "pug-walk": "^1.1.7" + } + }, + "pug-parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.0.tgz", + "integrity": "sha1-45Stmz/KkxI5QK/4hcBuRKt+aOQ=", + "requires": { + "pug-error": "^1.3.2", + "token-stream": "0.0.1" + } + }, + "pug-runtime": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.4.tgz", + "integrity": "sha1-4XjhvaaKsujArPybztLFT9iM61g=" + }, + "pug-strip-comments": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz", + "integrity": "sha1-8VWVkiBu3G+FMQ2s9K+0igJa9Z8=", + "requires": { + "pug-error": "^1.3.2" + } + }, + "pug-walk": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.7.tgz", + "integrity": "sha1-wA1cUSi6xYBr7BXSt+fNq+QlMfM=" + }, "qs": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", @@ -1171,6 +1428,14 @@ "semver": "^5.1.0" } }, + "resolve": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", + "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", + "requires": { + "path-parse": "^1.0.5" + } + }, "resolve-from": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", @@ -1352,6 +1617,11 @@ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, + "token-stream": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz", + "integrity": "sha1-zu78cXp2xDFvEm0LnbqlXX598Bo=" + }, "topojson": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/topojson/-/topojson-3.0.2.tgz", diff --git a/package.json b/package.json index 691b9bd..b316b73 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,8 @@ "passport-google-oauth20": "^1.0.0", "pg": "^7.4.3", "postgeo": "*", + "pug": "^2.0.3", + "pug-bootstrap": "0.0.15", "serve-favicon": "~2.4.5" } } diff --git a/views/error.jade b/views/error.jade deleted file mode 100644 index 51ec12c..0000000 --- a/views/error.jade +++ /dev/null @@ -1,6 +0,0 @@ -extends layout - -block content - h1= message - h2= error.status - pre #{error.stack} diff --git a/views/error.pug b/views/error.pug new file mode 100644 index 0000000..51ec12c --- /dev/null +++ b/views/error.pug @@ -0,0 +1,6 @@ +extends layout + +block content + h1= message + h2= error.status + pre #{error.stack} diff --git a/views/index.jade b/views/index.jade deleted file mode 100644 index 8cf30a8..0000000 --- a/views/index.jade +++ /dev/null @@ -1,11 +0,0 @@ -extends layout -block content - h1= title - p Selecione aqui o link desejado 5000: - a(href="/auth/google") Selecione aqui para logar - p - a(href="/map/paulo") Selecione aqui para acessar o mapa - p - a(href="/api/current_user") Selecione aqui para saber o usuário logado - p - a(href="/api/logout") Selecione aqui para fazer logout diff --git a/views/index.pug b/views/index.pug new file mode 100644 index 0000000..8cf30a8 --- /dev/null +++ b/views/index.pug @@ -0,0 +1,11 @@ +extends layout +block content + h1= title + p Selecione aqui o link desejado 5000: + a(href="/auth/google") Selecione aqui para logar + p + a(href="/map/paulo") Selecione aqui para acessar o mapa + p + a(href="/api/current_user") Selecione aqui para saber o usuário logado + p + a(href="/api/logout") Selecione aqui para fazer logout diff --git a/views/layout.jade b/views/layout.jade deleted file mode 100644 index ee156d4..0000000 --- a/views/layout.jade +++ /dev/null @@ -1,24 +0,0 @@ -doctype html -html - head - title= title - link(rel='stylesheet', href='/stylesheets/style.css') - link(rel='stylesheet', href='http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css') - link(rel="stylesheet", href="https://unpkg.com/leaflet@1.3.1/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin="") - script(src='https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js') - script(src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js') - meta(http-equiv='X-UA-Compatible', content='IE=edge') - meta(name='viewport', content='width=device-width, initial-scale=1.0') - meta(name='description', content='Baking Bootstrap Snippets with Jade') - link(rel="stylesheet", href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css") - script(src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js") - script(src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js") - script(src="https://unpkg.com/leaflet@1.3.1/dist/leaflet.js" integrity="sha512-/Nsx9X4HebavoBvEBuyp3I7od5tA0UzAxs+j83KgC8PU0kgB4XiK4Lfe4y4cgBtaRJQEIFCW+oC506aPT2L1zw==" crossorigin="") - link(rel='stylesheet', href='https://unpkg.com/leaflet-draw@1.0.2/dist/leaflet.draw.css') - script(src="https://unpkg.com/leaflet-draw@1.0.2/dist/leaflet.draw.js") - link(src="http://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous") - body - .container - script(src='//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js') - script(src='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js') -block content diff --git a/views/layout.pug b/views/layout.pug new file mode 100644 index 0000000..ee156d4 --- /dev/null +++ b/views/layout.pug @@ -0,0 +1,24 @@ +doctype html +html + head + title= title + link(rel='stylesheet', href='/stylesheets/style.css') + link(rel='stylesheet', href='http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css') + link(rel="stylesheet", href="https://unpkg.com/leaflet@1.3.1/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin="") + script(src='https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js') + script(src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js') + meta(http-equiv='X-UA-Compatible', content='IE=edge') + meta(name='viewport', content='width=device-width, initial-scale=1.0') + meta(name='description', content='Baking Bootstrap Snippets with Jade') + link(rel="stylesheet", href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css") + script(src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js") + script(src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js") + script(src="https://unpkg.com/leaflet@1.3.1/dist/leaflet.js" integrity="sha512-/Nsx9X4HebavoBvEBuyp3I7od5tA0UzAxs+j83KgC8PU0kgB4XiK4Lfe4y4cgBtaRJQEIFCW+oC506aPT2L1zw==" crossorigin="") + link(rel='stylesheet', href='https://unpkg.com/leaflet-draw@1.0.2/dist/leaflet.draw.css') + script(src="https://unpkg.com/leaflet-draw@1.0.2/dist/leaflet.draw.js") + link(src="http://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous") + body + .container + script(src='//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js') + script(src='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js') +block content diff --git a/views/map.jade b/views/map.jade deleted file mode 100644 index 380ac55..0000000 --- a/views/map.jade +++ /dev/null @@ -1,63 +0,0 @@ -extends layout -block content - script. - function relocate_home() - { - location.href = "/map/" + nome.value; - } - #map - script(type='text/javascript'). - var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', - southWest = L.latLng(#{bndSW}), - northEast = L.latLng(#{bndNE}), - bounds = L.latLngBounds(southWest, northEast), - osmAttrib = '', - osm = L.tileLayer(osmUrl, - {attribution: osmAttrib}), - map = L.map('map', { - center: new L.LatLng(#{lat},#{lng}), - zoom: #{fator_zoom}, - maxBounds: bounds - }); - - map.attributionControl.setPrefix(''); - wmsLayer= L.tileLayer.wms("#{geoserverWMS}", { - layers: "#{waterLayers}", - format: 'image/png', - transparent: true, - maxZoom: 23 - }), - drawnItems = L.featureGroup().addTo(map); - - // places the logomark - L.Control.Watermark = L.Control.extend({ - onAdd: function(map) { - var img = L.DomUtil.create('img'); - //- img.src = "http://www.saesascs.sp.gov.br/wp-content/themes/portaldae/img/logo-saesa.png"; - img.src = 'https://nexusbr.com/images/logo.png'; - img.style.width = '130px'; - return img; - }, - onRemove: function(map) { - // Nothing to do here - } - }); - L.control.watermark = function(opts) { - return new L.Control.Watermark(opts); - } - L.control.watermark({ position: 'bottomright' }).addTo(map); - - // places the layer control to on and off - 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' - }) - }, - {'Redes': wmsLayer, 'Ocorrências': drawnItems}, - { position: 'topright', collapsed: false } - ).addTo(map); - - // places the marker that was found - var marker = L.marker([#{lat},#{lng}]).addTo(map); - marker.bindPopup("#{codigo}
#{consumidor}").openPopup(); \ No newline at end of file diff --git a/views/map.pug b/views/map.pug new file mode 100644 index 0000000..380ac55 --- /dev/null +++ b/views/map.pug @@ -0,0 +1,63 @@ +extends layout +block content + script. + function relocate_home() + { + location.href = "/map/" + nome.value; + } + #map + script(type='text/javascript'). + var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + southWest = L.latLng(#{bndSW}), + northEast = L.latLng(#{bndNE}), + bounds = L.latLngBounds(southWest, northEast), + osmAttrib = '', + osm = L.tileLayer(osmUrl, + {attribution: osmAttrib}), + map = L.map('map', { + center: new L.LatLng(#{lat},#{lng}), + zoom: #{fator_zoom}, + maxBounds: bounds + }); + + map.attributionControl.setPrefix(''); + wmsLayer= L.tileLayer.wms("#{geoserverWMS}", { + layers: "#{waterLayers}", + format: 'image/png', + transparent: true, + maxZoom: 23 + }), + drawnItems = L.featureGroup().addTo(map); + + // places the logomark + L.Control.Watermark = L.Control.extend({ + onAdd: function(map) { + var img = L.DomUtil.create('img'); + //- img.src = "http://www.saesascs.sp.gov.br/wp-content/themes/portaldae/img/logo-saesa.png"; + img.src = 'https://nexusbr.com/images/logo.png'; + img.style.width = '130px'; + return img; + }, + onRemove: function(map) { + // Nothing to do here + } + }); + L.control.watermark = function(opts) { + return new L.Control.Watermark(opts); + } + L.control.watermark({ position: 'bottomright' }).addTo(map); + + // places the layer control to on and off + 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' + }) + }, + {'Redes': wmsLayer, 'Ocorrências': drawnItems}, + { position: 'topright', collapsed: false } + ).addTo(map); + + // places the marker that was found + var marker = L.marker([#{lat},#{lng}]).addTo(map); + marker.bindPopup("#{codigo}
#{consumidor}").openPopup(); \ No newline at end of file -- libgit2 0.21.2