diff --git a/.eslintcache b/.eslintcache index 8da0241..3a8fb5a 100644 --- a/.eslintcache +++ b/.eslintcache @@ -1 +1 @@ -{"/home/philawsophizing/GitHub/PAS/src/routes/home.js":{"size":116,"mtime":1494850472513,"hashOfConfig":"1jsap0i","results":{"filePath":"/home/philawsophizing/GitHub/PAS/src/routes/home.js","messages":[],"errorCount":0,"warningCount":0}},"/home/philawsophizing/GitHub/PAS/src/routes/index.js":{"size":143,"mtime":1494838230753,"hashOfConfig":"1jsap0i","results":{"filePath":"/home/philawsophizing/GitHub/PAS/src/routes/index.js","messages":[],"errorCount":0,"warningCount":0}},"/home/philawsophizing/GitHub/PAS/src/routes/static.js":{"size":124,"mtime":1494838309952,"hashOfConfig":"1jsap0i","results":{"filePath":"/home/philawsophizing/GitHub/PAS/src/routes/static.js","messages":[],"errorCount":0,"warningCount":0}},"/home/philawsophizing/GitHub/PAS/src/server.js":{"size":682,"mtime":1494850369267,"hashOfConfig":"1jsap0i","results":{"filePath":"/home/philawsophizing/GitHub/PAS/src/server.js","messages":[],"errorCount":0,"warningCount":0}},"/home/philawsophizing/GitHub/PAS/src/views/helpers/helper.js":{"size":0,"mtime":1494837773673,"hashOfConfig":"1jsap0i","results":{"filePath":"/home/philawsophizing/GitHub/PAS/src/views/helpers/helper.js","messages":[],"errorCount":0,"warningCount":0}}} \ No newline at end of file +{"/home/mario/Desktop/13week/PAS/src/routes/carPage.js":{"size":229,"mtime":1494852194925,"hashOfConfig":"1332v2a","results":{"filePath":"/home/mario/Desktop/13week/PAS/src/routes/carPage.js","messages":[],"errorCount":0,"warningCount":0}},"/home/mario/Desktop/13week/PAS/src/routes/home.js":{"size":116,"mtime":1494851794508,"hashOfConfig":"1332v2a","results":{"filePath":"/home/mario/Desktop/13week/PAS/src/routes/home.js","messages":[],"errorCount":0,"warningCount":0}},"/home/mario/Desktop/13week/PAS/src/routes/index.js":{"size":201,"mtime":1494852181684,"hashOfConfig":"1332v2a","results":{"filePath":"/home/mario/Desktop/13week/PAS/src/routes/index.js","messages":[],"errorCount":0,"warningCount":0}},"/home/mario/Desktop/13week/PAS/src/routes/static.js":{"size":124,"mtime":1494850305137,"hashOfConfig":"1332v2a","results":{"filePath":"/home/mario/Desktop/13week/PAS/src/routes/static.js","messages":[],"errorCount":0,"warningCount":0}},"/home/mario/Desktop/13week/PAS/src/server.js":{"size":649,"mtime":1494851794508,"hashOfConfig":"1332v2a","results":{"filePath":"/home/mario/Desktop/13week/PAS/src/server.js","messages":[],"errorCount":0,"warningCount":0}},"/home/mario/Desktop/13week/PAS/src/views/helpers/helper.js":{"size":0,"mtime":1494850305137,"hashOfConfig":"1332v2a","results":{"filePath":"/home/mario/Desktop/13week/PAS/src/views/helpers/helper.js","messages":[],"errorCount":0,"warningCount":0}}} \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index c5502df..d555b19 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -5,5 +5,8 @@ ], "rules": { "linebreak-style": 0 + }, + "globals": { + "L": true } } diff --git a/.gitignore b/.gitignore index 1ca9571..4816826 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules/ npm-debug.log +.eslintcache diff --git a/package.json b/package.json index 205ecd1..a71a9db 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "handlebars": "^4.0.8", "hapi": "^16.1.1", "inert": "^4.2.0", + "leaflet": "^1.0.3", "vision": "^4.1.1" }, "devDependencies": { diff --git a/public/main.js b/public/main.js index 6a5b3d9..df45975 100644 --- a/public/main.js +++ b/public/main.js @@ -1,2 +1,14 @@ /* eslint-env browser */ console.log('OY'); + +setTimeout(function () { + const mymap = L.map('mapid', { + center: [32.699, 35.303], + zoomControl: false, + attributionControl: false, + zoom: 15, + }); + + L.tileLayer( + 'https://api.mapbox.com/styles/v1/mapbox/light-v9/tiles/256/{z}/{x}/{y}?access_token=pk.eyJ1Ijoia2FyeXVtIiwiYSI6ImNqMjAzNGU4ZjAxa3EycW4xazFxcHZ6a2QifQ.m_dNO1l1sMkM7r4d5nlRRQ').addTo(mymap); +}, 50); diff --git a/public/style.css b/public/style.css index ef7627f..96fb04b 100644 --- a/public/style.css +++ b/public/style.css @@ -27,3 +27,6 @@ /* Sizing */ +#mapid { + height: 360px; +} diff --git a/src/views/carRoute.hbs b/src/views/carRoute.hbs index 1861d2c..88c59ed 100644 --- a/src/views/carRoute.hbs +++ b/src/views/carRoute.hbs @@ -1,3 +1,7 @@ - +
+ + + diff --git a/src/views/layout/default.hbs b/src/views/layout/default.hbs index 4899502..68ea346 100644 --- a/src/views/layout/default.hbs +++ b/src/views/layout/default.hbs @@ -4,12 +4,15 @@ + PAS {{{content}}} - +