From 084bd8a087ee9e13651ce5921eb10542f7c3da23 Mon Sep 17 00:00:00 2001 From: m-banik Date: Sun, 2 Jul 2017 16:47:18 +0200 Subject: [PATCH 1/5] installed mysql module --- index.js | 1 + package.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 0480dfe..bdc86de 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,4 @@ +const mysql = require('mysql'); const express = require('express'); const app = express(); diff --git a/package.json b/package.json index ee64430..4b1843e 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ }, "homepage": "https://github.com/dynak-net/super-simple-maps#readme", "dependencies": { - "express": "^4.15.3" + "express": "^4.15.3", + "mysql": "^2.13.0" } } From d98dcdf838b2a1b3cbc2b7f0079556b54d9e0cd2 Mon Sep 17 00:00:00 2001 From: m-banik Date: Mon, 18 Sep 2017 21:20:10 +0200 Subject: [PATCH 2/5] Adding test points from mysql in need of future development --- config.json | 6 ++++++ index.js | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 config.json diff --git a/config.json b/config.json new file mode 100644 index 0000000..2c42b4f --- /dev/null +++ b/config.json @@ -0,0 +1,6 @@ +{ + "host": "localhost", + "user": "maps", + "password": "maps", + "database": "maps" +} \ No newline at end of file diff --git a/index.js b/index.js index bdc86de..989c128 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,21 @@ const mysql = require('mysql'); const express = require('express'); +const config = require('./config.json'); const app = express(); +const con = mysql.createConnection(config); + +con.connect(function(err) { + if (err) throw err; + con.query("SELECT * FROM points", function (err, result, fields) { + if (err) throw err; + console.log(result); + app.get('/points', function (req, res) { + res.send(result) + }) + }); +}); + app.use(express.static('public')); app.listen(3000, function () { From dc35e90ff4a29b09a154b257149327047652c42c Mon Sep 17 00:00:00 2001 From: m-banik Date: Sun, 8 Oct 2017 16:19:30 +0200 Subject: [PATCH 3/5] database exported --- maps.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 maps.sql diff --git a/maps.sql b/maps.sql new file mode 100644 index 0000000..0fef427 --- /dev/null +++ b/maps.sql @@ -0,0 +1,13 @@ +DROP TABLE IF EXISTS `points`; +CREATE TABLE `points` ( + `id` int(11) NOT NULL, + `name` varchar(16) NOT NULL, + `lat` float NOT NULL, + `lng` float NOT NULL, + `info` varchar(256) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +LOCK TABLES `points` WRITE; +INSERT INTO `points` VALUES (1,'WroTest',51,17,'test test test'); +UNLOCK TABLES; From d1ed72ebfd4a2e796a7043dc04b5995869836001 Mon Sep 17 00:00:00 2001 From: CEZARY DYNAK Date: Sun, 29 Oct 2017 08:42:08 +0100 Subject: [PATCH 4/5] add package-lock.json to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 40b878d..504afef 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -node_modules/ \ No newline at end of file +node_modules/ +package-lock.json From c4cec5ae82a2a8ec42c07d9db18478bd81d04b49 Mon Sep 17 00:00:00 2001 From: CEZARY DYNAK Date: Sun, 29 Oct 2017 09:55:04 +0100 Subject: [PATCH 5/5] add basic fetch api and async/await --- public/index.html | 3 ++- public/js/map.js | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 9dbd904..5ae2db1 100644 --- a/public/index.html +++ b/public/index.html @@ -11,7 +11,8 @@
- + diff --git a/public/js/map.js b/public/js/map.js index 37085cb..a7869b7 100644 --- a/public/js/map.js +++ b/public/js/map.js @@ -45,8 +45,11 @@ function initMap() { setMarkers(map); } -function setMarkers(map) { +async function setMarkers(map) { var infoWindow = new google.maps.InfoWindow(); + let response = await fetch('/points'); + let json = await response.json(); + console.log(json); for (var i = 0; i < myPoints.length; i++) { var myPoint = myPoints[i]; var marker = new google.maps.Marker({