diff --git a/.gitignore b/.gitignore index 5d41ef5..49219cb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ ehthumbs.db ehthumbs_vista.db #secrets -secrets.json +secrets.js # Dump file *.stackdump diff --git a/package-lock.json b/package-lock.json index 970ead2..ab13a7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,6 @@ "live-server": "^1.1.0" }, "devDependencies": { - "dotenv": "^10.0.0", "gulp": "^4.0.2", "gulp-autoprefixer": "^6.1.0", "gulp-clean-css": "^4.2.0", @@ -1175,15 +1174,6 @@ "node": ">=0.10.0" } }, - "node_modules/dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -6395,12 +6385,6 @@ "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", "dev": true }, - "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", - "dev": true - }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", diff --git a/package.json b/package.json index 050c07b..0ed4dba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weatherscan", - "description": "weatherscan wmulator", + "description": "weatherscan emulator", "scripts": { "start": "live-server ./webroot" }, @@ -14,7 +14,6 @@ "live-server": "^1.1.0" }, "devDependencies": { - "dotenv": "^10.0.0", "gulp": "^4.0.2", "gulp-autoprefixer": "^6.1.0", "gulp-clean-css": "^4.2.0", diff --git a/testfeefef.env b/testfeefef.env deleted file mode 100644 index 1832cd8..0000000 --- a/testfeefef.env +++ /dev/null @@ -1,2 +0,0 @@ -API_KEY=e1f10a1e78da46f5b10a1e78da96f525 -MAP_API_KEY=pk.eyJ1IjoiZ29sZGJibGF6ZXoiLCJhIjoiY2ttbTRyYjlsMGMwdDJvbnh6ZDd3b3l4ZyJ9.AcR8BHOrQGjoISQfC-dNFw diff --git a/webroot/index.html b/webroot/index.html index 39c041f..0e63a87 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -31,6 +31,7 @@ + diff --git a/webroot/js/location.js b/webroot/js/location.js index 663c199..9c2e6de 100644 --- a/webroot/js/location.js +++ b/webroot/js/location.js @@ -51,7 +51,7 @@ function Location() { // onReady, onRefresh, onAllComplete //old var url = 'https://api.openweathermap.org/data/2.5/onecall?lat=' + loclat + '&lon=' + loclong + '&appid=0cb279a98124446dd16dba02fbfb60ee&units=imperial' https://api.weather.com/v3/aggcommon/v3-wx-observations-current;v3-location-point?geocode=33.74,-84.39&language=en-US&units=e&format=json&apiKey=yourApiKey - var url = 'https://api.weather.com/v3/aggcommon/v3-wx-observations-current;v3-location-point?geocode=' + loclat + ',' + loclong + '&language=en-US&units=e&format=json&apiKey=' + process.env.API_KEY + var url = 'https://api.weather.com/v3/aggcommon/v3-wx-observations-current;v3-location-point?geocode=' + loclat + ',' + loclong + '&language=en-US&units=e&format=json&apiKey=' + api_key // ajax the latest observation $.getJSON(url, function(data) { @@ -123,25 +123,25 @@ function Forecast(type, lat, lon, readyCallback) { var that = this; var url; if (type == 'hourly') { - url = 'https://api.weather.com/v3/wx/forecast/hourly/2day?geocode=' + lat + ',' + lon + "&format=json&units=e&language=en-US&apiKey=" + process.env.API_KEY + url = 'https://api.weather.com/v3/wx/forecast/hourly/2day?geocode=' + lat + ',' + lon + "&format=json&units=e&language=en-US&apiKey=" + api_key } else if (type == 'daily') { - url = 'https://api.weather.com/v3/wx/forecast/daily/5day?geocode=' + lat + ',' + lon + "&format=json&units=e&language=en-US&apiKey=" + process.env.API_KEY + url = 'https://api.weather.com/v3/wx/forecast/daily/5day?geocode=' + lat + ',' + lon + "&format=json&units=e&language=en-US&apiKey=" + api_key } else if (type == 'alert') { - url = 'https://api.weather.com/v3/alerts/headlines?geocode=' + lat + ',' + lon + "&format=json&language=en-US&apiKey=" + process.env.API_KEY + url = 'https://api.weather.com/v3/alerts/headlines?geocode=' + lat + ',' + lon + "&format=json&language=en-US&apiKey=" + api_key } else if (type == 'almanac') { - url = 'https://api.weather.com/v3/wx/almanac/daily/1day?geocode=' + lat + ',' + lon + "&format=json&units=e" + "&day=" + dateFns.format(new Date(), "D") + "&month=" + dateFns.format(new Date(),"M") + "&apiKey=" + process.env.API_KEY + url = 'https://api.weather.com/v3/wx/almanac/daily/1day?geocode=' + lat + ',' + lon + "&format=json&units=e" + "&day=" + dateFns.format(new Date(), "D") + "&month=" + dateFns.format(new Date(),"M") + "&apiKey=" + api_key } else if (type == 'pollen') { - url = 'https://api.weather.com/v1/geocode/'+ lat + '/' + lon + '/observations/pollen.json?language=en-US&apiKey=' + process.env.API_KEY + url = 'https://api.weather.com/v1/geocode/'+ lat + '/' + lon + '/observations/pollen.json?language=en-US&apiKey=' + api_key } else if (type == 'achesindex') { - url = 'https://api.weather.com/v2/indices/achePain/daypart/3day?geocode=' + lat + ',' + lon + "&language=en-US&format=json&apiKey=" + process.env.API_KEY + url = 'https://api.weather.com/v2/indices/achePain/daypart/3day?geocode=' + lat + ',' + lon + "&language=en-US&format=json&apiKey=" + api_key } else if (type == 'breathindex') { - url = 'https://api.weather.com/v2/indices/breathing/daypart/3day?geocode=' + lat + ',' + lon + "&language=en-US&format=json&apiKey=" + process.env.API_KEY + url = 'https://api.weather.com/v2/indices/breathing/daypart/3day?geocode=' + lat + ',' + lon + "&language=en-US&format=json&apiKey=" + api_key } else if (type == 'airquality') { - url = 'https://api.weather.com/v3/wx/globalAirQuality?geocode=' + lat + ',' + lon + "&language=en-US&scale=EPA&format=json&apiKey=" + process.env.API_KEY + url = 'https://api.weather.com/v3/wx/globalAirQuality?geocode=' + lat + ',' + lon + "&language=en-US&scale=EPA&format=json&apiKey=" + api_key } else if (type == 'forecastuvindex') { - url = 'https://api.weather.com/v2/indices/uv/hourly/48hour?geocode=' + lat + ',' + lon + "&language=en-US&format=json&apiKey=" + process.env.API_KEY + url = 'https://api.weather.com/v2/indices/uv/hourly/48hour?geocode=' + lat + ',' + lon + "&language=en-US&format=json&apiKey=" + api_key }else if (type == 'uvindex') { - url = 'https://api.weather.com/v2/indices/uv/current?geocode=' + lat + ',' + lon + "&language=en-US&format=json&apiKey=" + process.env.API_KEY + url = 'https://api.weather.com/v2/indices/uv/current?geocode=' + lat + ',' + lon + "&language=en-US&format=json&apiKey=" + api_key } this.data = {}; diff --git a/webroot/js/radar.js b/webroot/js/radar.js index a58127d..650bf37 100644 --- a/webroot/js/radar.js +++ b/webroot/js/radar.js @@ -42,15 +42,15 @@ function Radar(divIDin, intervalHoursIn, zoomIn, latitudeIn, longitudeIn, withSa // weatherscan green cj8owq50n926g2smvagdxg9t8 // mapbox://styles/goldbblazez/ckgc7fwvr4qmn19pevtvhyabl // https://api.mapbox.com/styles/v1/goldbblazez/ckgc8lzdz4lzh19qt7q9wbbr9.html?fresh=true&title=copy&access_token=pk.eyJ1IjoiZ29sZGJibGF6ZXoiLCJhIjoiY2tiZTRnb2Q2MGkxajJwbzV2bWd5dXI5MyJ9.jU-2DqGCBI14K-acyN9RCw - L.tileLayer('https://api.mapbox.com/styles/v1/goldbblazez/ckgc8lzdz4lzh19qt7q9wbbr9/tiles/{z}/{x}/{y}?access_token=' + process.env.MAP_API_KEY, { + L.tileLayer('https://api.mapbox.com/styles/v1/goldbblazez/ckgc8lzdz4lzh19qt7q9wbbr9/tiles/{z}/{x}/{y}?access_token=' + map_key, { tileSize: 512, zoomOffset: -1 }).addTo(map); - $.getJSON("https://api.weather.com/v3/TileServer/series/productSet/PPAcore?filter=radar&apiKey=" + process.env.API_KEY, function(data) { + $.getJSON("https://api.weather.com/v3/TileServer/series/productSet/PPAcore?filter=radar&apiKey=" + api_key, function(data) { for (var i = 0; i < data.seriesInfo.radar.series.length; i++) { timeLayers.push( - L.tileLayer("https://api.weather.com/v3/TileServer/tile/radar?ts="+ data.seriesInfo.radar.series[i].ts +"&xyz={x}:{y}:{z}&apiKey=" + process.env.API_KEY, { + L.tileLayer("https://api.weather.com/v3/TileServer/tile/radar?ts="+ data.seriesInfo.radar.series[i].ts +"&xyz={x}:{y}:{z}&apiKey=" + api_key, { opacity: 0 })) } diff --git a/webroot/js/slides-loop.js b/webroot/js/slides-loop.js index 9600ed9..6dae618 100644 --- a/webroot/js/slides-loop.js +++ b/webroot/js/slides-loop.js @@ -47,7 +47,7 @@ RADAR < MAIN CITY < CITY 1 < CITY 2 $('.marqueeheadersevere').css("text-shadow","2px 2px 4px #000") var severeidx = 0; function switchSevereMarquee() { - $.getJSON('https://api.weather.com/v3/alerts/detail?alertId='+ foreDataAlert.alerts[sret[severeidx]].detailKey +'&format=json&language=en-US&apiKey=' + process.env.API_KEY, function(data) { + $.getJSON('https://api.weather.com/v3/alerts/detail?alertId='+ foreDataAlert.alerts[sret[severeidx]].detailKey +'&format=json&language=en-US&apiKey=' + api_key, function(data) { $('.marqueeheadersevere').text((foreDataAlert.alerts[sret[severeidx]].eventDescription + ((foreDataAlert.alerts[sret[severeidx]].messageType == " Update") ? 'UPDATE' : (foreDataAlert.alerts[sret[severeidx]].messageType == "Cancel") ? " CANCELLATION" : "")).toUpperCase()); $('#arrow-img').fadeOut(0) $('#marqueeSevere').fadeIn(0) @@ -65,7 +65,7 @@ RADAR < MAIN CITY < CITY 1 < CITY 2 switchSevereMarquee() } else { var warningdata; - $.getJSON('https://api.weather.com/v3/alerts/detail?alertId='+ foreDataAlert.alerts[ret[0]].detailKey +'&format=json&language=en-US&apiKey=' + process.env.API_KEY, function(data) { + $.getJSON('https://api.weather.com/v3/alerts/detail?alertId='+ foreDataAlert.alerts[ret[0]].detailKey +'&format=json&language=en-US&apiKey=' + api_key, function(data) { $('.marqueeheadersevere').text((foreDataAlert.alerts[ret[0]].eventDescription + ((foreDataAlert.alerts[ret[0]].messageType == " Update") ? 'UPDATE' : (foreDataAlert.alerts[ret[0]].messageType == "Cancel") ? " CANCELLATION" : "")).toUpperCase()); if (foreDataAlert.alerts[ret[0]].significance == "Y" || foreDataAlert.alerts[ret[0]].significance == "S") { $('#marqueeSevere').css('background','linear-gradient(to right, #853302 0, #a84503 100%)')