From 9b7a428c97f41ce4c0c10cfc5a69b253df80ebfe Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Thu, 8 Mar 2018 21:26:41 +0000
Subject: [PATCH] #123 Added script imports for JS libraries no longer
 webpacked

---
 package-lock.json | 10 ----------
 package.json      |  3 ---
 server.js         |  1 +
 static/js/map.js  |  9 +++------
 views/map.html    |  9 ++++-----
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f22d258..60da920 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -3850,11 +3850,6 @@
         "handlebars": "4.0.11"
       }
     },
-    "jquery": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
-      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
-    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -4022,11 +4017,6 @@
         "type-check": "0.3.2"
       }
     },
-    "load-google-maps-api": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/load-google-maps-api/-/load-google-maps-api-1.0.1.tgz",
-      "integrity": "sha512-sRpeyQEaf2WehASD4F8poa4iHWU3qCrw2qvUX4tDWBK0BqpXpkE2TVMeke73YiEZghFo8nUqcxtpC7N/93EqIQ=="
-    },
     "load-json-file": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
diff --git a/package.json b/package.json
index bddd5e3..d1f6f76 100755
--- a/package.json
+++ b/package.json
@@ -15,8 +15,6 @@
     "express-request-limit": "^1.0.2",
     "helmet": "^3.12.0",
     "helmet-csp": "^2.7.0",
-    "jquery": "^3.2.1",
-    "load-google-maps-api": "^1.0.0",
     "minifier": "^0.8.1",
     "moment": "^2.18.1",
     "mongo-sanitize": "^1.0.0",
@@ -35,7 +33,6 @@
     "request": "^2.82.0",
     "slug": "^0.9.1",
     "socket.io": "^2.0.3",
-    "socket.io-client": "^2.0.3",
     "xss": "^0.3.4",
     "zxcvbn": "^4.4.2"
   },
diff --git a/server.js b/server.js
index c3f97be..ae79c1b 100755
--- a/server.js
+++ b/server.js
@@ -65,6 +65,7 @@ let ready_promise_list = []
     'script-src': ["'self'",
       "'unsafe-inline'", // TODO: Get rid of this
       'https://code.jquery.com',
+      'https://cdnjs.cloudflare.com/ajax/libs/socket.io/*',
       'https://cdnjs.cloudflare.com/ajax/libs/moment.js/*',
       'https://www.google.com/recaptcha',
       'https://www.google-analytics.com',
diff --git a/static/js/map.js b/static/js/map.js
index 3fb0ad0..d48f12e 100755
--- a/static/js/map.js
+++ b/static/js/map.js
@@ -1,5 +1,5 @@
 'use strict'
-/* global alert io $ loadGoogleMapsAPI mapuser userid disp noHeader mapKey navigator token */
+/* global alert io $ mapuser userid disp noHeader mapKey navigator token */
 
 
 // Variables
@@ -199,8 +199,7 @@ $(function () {
 })
 
 // Load google maps API
-loadGoogleMapsAPI({ key: mapKey })
-.then(function (googlemaps) {
+function initMap(googlemaps) {
 
   // Create map
   if (disp !== '1') {
@@ -458,6 +457,4 @@ loadGoogleMapsAPI({ key: mapKey })
   }
 
 // Error loading gmaps API
-}).catch(function (err) {
-  console.error(err.stack)
-})
+}
diff --git a/views/map.html b/views/map.html
index 908edd6..d8845e1 100755
--- a/views/map.html
+++ b/views/map.html
@@ -107,17 +107,16 @@
 	<!-- TODO: Move to own script file, maybe with https://github.com/brooklynDev/JShare -->
 	<script>
 		const mapuser = JSON.parse('{{mapuser |dump|safe}}'),
-			mapKey = "{{mapApi |safe}}",
 			noHeader = "{{noHeader |safe}}",
 			disp = "{{disp |safe}}", // 0=map, 1=streetview, 2=both
 			userid = "{{user._id |safe}}",
 			token = "{{user.sk32 |safe}}";
 	</script>
 
-	<!-- Webpacked bundles -->
+	<!-- Imports -->
+	<script type="application/javascript" src="https://maps.googleapis.com/maps/api/js?key={{mapApi|safe}}&callback=initMap"
+    async defer></script>
+	<script type="application/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js" integrity="sha256-jniDwC1PC9OmGoyPxA9VpGvgwDYyxsMqu5Q4OrF5wNY=" crossorigin="anonymous"></script>
 	<script type="application/javascript" src="/static/js/.map.bun.js"></script>
-	<!--{% if user.id == mapuser.id %}-->
-		<!--<script type="application/javascript" src="/static/js/.controls.bun.js"></script>-->
-	<!--{% endif %}-->
 
 {% endblock %}