modified: .gitignore

	modified:   README.md
	new file:   crypto.js
	modified:   index.js
	modified:   package-lock.json
	modified:   package.json
	new file:   public/PermitGeolocation.JPG
	new file:   public/PermitGeolocation.PNG
	modified:   public/Runtime.PNG
	new file:   public/geolocation.js
	modified:   views/index.ejs
	renamed:    views/about.ejs -> views/pages/about.ejs
	new file:   views/pages/weatherbit.ejs
	modified:   views/partials/header.ejs
	modified:   views/partials/header2.ejs
	deleted:    views/weatherbit.ejs

Author: aesclever

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 .env
-public/ePub
+public/ePub
+views/header2.ejs
+index-temp.ejs

README.md

@@ -96,6 +96,10 @@ It is a typical NodeJS project layout.
 
 `npm start`
 
+>Initially, the browser might pop up asking if you would allow it to detect your location.  A 'Allow' will enable GPS pinpoint weather report.  A 'Block' will disable GPS for current and subsequent session.
+
+![Browser popup](./public/PermitGeolocation.PNG)
+
 <br />
 
 
@@ -111,22 +115,27 @@ The Docker container is built and saved to current working directory.  Replace t
 `docker build -t hurricanemark/localweather:1.0 .`
 
 ```c
-[+] Building 139.3s (11/11) FINISHED
- => [internal] load build definition from Dockerfile                                              0.1s 
- => => transferring dockerfile: 210B                                                              0.1s 
- => [internal] load .dockerignore           
-...
- => [internal] load build context                                                                 0.8s 
- => => transferring context: 143.24kB                                                             0.6s 
- => [2/5] WORKDIR /app                                                                            1.2s 
- => [3/5] COPY package.json ./                                                                    0.1s 
- => [4/5] RUN npm install                                                                         6.6s 
- => [5/5] COPY . .                                                                                0.2s 
- => exporting to image                                                                            0.4s 
- => => exporting layers                                                                           0.3s 
- => => writing image sha256:bb89b0646be41055287fdac18ea1e405a2a19ef4b2919a0a02c213b9dc947b34      0.0s 
- => => naming to docker.io/hurricanemark/localweather:1.0    
-```
+docker build -t marknre/techrolemiweatherapp:2.0 .      
+
+[+] Building 3.1s (11/11) FINISHED
+ => [internal] load build definition from Dockerfile                                                  0.0s 
+ => => transferring dockerfile: 32B                                                                   0.0s 
+ => [internal] load .dockerignore                                                                     0.0s 
+ => => transferring context: 2B                                                                       0.0s 
+ => [internal] load metadata for docker.io/library/node:16.17.0                                       1.1s 
+ => [auth] library/node:pull token for registry-1.docker.io                                           0.0s 
+ => [internal] load build context                                                                     0.4s
+ => => transferring context: 635.22kB                                                                 0.3s
+ => [1/5] FROM docker.io/library/node:16.17.0@sha256:a5d9200d3b8c17f0f3d7717034a9c215015b7aae70cb2a9  0.0s
+ => CACHED [2/5] WORKDIR /app                                                                         0.0s
+ => CACHED [3/5] COPY package.json ./                                                                 0.0s
+ => CACHED [4/5] RUN npm install                                                                      0.0s
+ => [5/5] COPY . .                                                                                    0.9s
+ => exporting to image                                                                                0.7s
+ => => exporting layers                                                                               0.6s
+ => => writing image sha256:1c4db40ce8799665d8226aea4ae5759b3dc17c0538992b95e59b2e74375da1c7          0.0s
+ => => naming to docker.io/marknre/techrolemiweatherapp:2.0                                           0.0s
+ ```
 
 **List the image**
 
@@ -147,11 +156,11 @@ A docker image built with this `git-tag`:`Phase1-Extened-Weather-Forecasts` is a
 
 ### Run docker
 
-Notice that environment variables (secret keys) required to run the app is not being included in the Dockerfile.  These secret keys will be stated with the container.  eg.  ` ... -e WEATHER_VISUALCROSSING_API_KEY=XXXXX -e WEATHERBIT_KEY=XXXXXXX`
+Notice that environment variables (secret keys) required to run the app is not being included in the Dockerfile.  These secret keys will be stated with the container.  eg.  ` ... -e WEATHERBIT_KEY=XXXXXXX`
 
 Notice also that Dockerfile exposes port 8080.  This needs to be forwarded to a port on your local machine.  i.e. `LOCAL_PORT:CONTAINER_PORT` for example  *4321:8080*
 
-`docker run -p 4321:8080 bb89b0646be4 -e WEATHER_VISUALCROSSING_API_KEY=Actual_Secret_Key_for_VisualCrossing -e WEATHERBIT_KEY=Actual_Secret_Key_for_Weatherbit`
+`docker run -p 4321:8080 bb89b0646be4 -e  WEATHERBIT_KEY=Actual_Secret_Key_for_Weatherbit`
 
 
 

crypto.js

@@ -0,0 +1,19 @@
+
+import CryptoJS from 'crypto-js';
+const encrypt = (text) => {
+  return CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(text));
+};
+
+const decrypt = (data) => {
+  return CryptoJS.enc.Base64.parse(data).toString(CryptoJS.enc.Utf8);
+};
+
+function test() {
+    let enStr = encrypt("e88e1a8096cd4897b79b230a9c49b243");
+    console.log("Encrypted Key: " + enStr);
+    console.log("Decrypted key: " + decrypt(enStr));
+
+}
+
+// test();
+export {encrypt, decrypt};

index.js

@@ -3,6 +3,7 @@ dotenv.config()
 import request from 'request';
 import express from 'express';
 import bodyParser from 'body-parser';
+import {encrypt, decrypt} from './crypto.js'
 
 // Create network routing
 const app = express();
@@ -17,20 +18,39 @@ app.use(bodyParser.urlencoded({ extended: true }));
 
 // get the locale from the client-side via the ejs form
 app.get('/', (req, res) => {
-    res.render('index');
+  // console.dir(req.params);
+  // console.dir(req.body);
+  let apikey = encrypt(process.env.WEATHERBIT_KEY);
+  res.render('index1', {xkey: apikey});
 })
 
+
+
 app.get('/weatherbit', (req, res) => {
-  res.render('weatherbit');
+  // console.log('render get weatherbit:');
+  // console.dir(req.params)
+  // console.dir(req.body);
+  let apikey = encrypt(process.env.WEATHERBIT_KEY);
+  res.render('pages/weatherbit', { key: apikey});
 })
 
 // Posting data to the client-side requires two API calls.
 // We implement the Promise.all() below to call and wait for all data to come back.
+
 app.post('/weatherbit', (req, res) => {
   let city = req.body.locale;
-  let promisedData = gatherWeatheBits(city);
+  let coords = [ req.body.lat, req.body.lng ];
+  let promisedData;
+  if (city.length > 0) {
+    // get data by address
+    promisedData = gatherWeatheBits(city);
+  } else if (typeof(coords[0]) === "string") {
+    // get data by latitude/longitude
+    promisedData = gatherWeatheBits(coords);
+  }
+
   promisedData.then( (data) => {
-    res.render('weatherbit', data);
+    res.render('pages/weatherbit', data);
   })
 });
 
@@ -40,12 +60,17 @@ app.post('/weatherbit', (req, res) => {
 */
 function getWeatherBitCurrentConditions(city){
   return new Promise(resolve => {
+    if (Array.isArray(city) === true && typeof(city[0]) === "string") {
+      city = "&lat=" + city[0] + "&lon=" + city[1];
+    } else {
+      city = "&city=" + city;
+    }
     setTimeout(() => {
       let apiKey = process.env.WEATHERBIT_KEY;
       let url = process.env.WEATHERBIT_URI;
-      let uriWeatherBitStr = `${url}current?units=I&city=${city}&key=${apiKey}`;
+      let uriWeatherBitStr = `${url}current?units=I${city}&key=${apiKey}`;
       let retCode;
-      console.log(uriWeatherBitStr);
+      // console.log(uriWeatherBitStr);
       try {
         request(uriWeatherBitStr, async function (err, response, body) {
           console.log(response.statusCode);
@@ -74,10 +99,15 @@ function getWeatherBitCurrentConditions(city){
 */
 function getWeatherBitDailyForecast(city){
   return new Promise(resolve => {
+    if (Array.isArray(city) === true && typeof(city[0]) === "string") {
+      city = "&lat=" + city[0] + "&lon=" + city[1];
+    } else {
+      city = "&city=" + city;
+    }
     setTimeout(() => {
       let apiKey = process.env.WEATHERBIT_KEY;
       let url = process.env.WEATHERBIT_URI;
-      let uriWeatherBitStr = `${url}forecast/daily?units=I&city=${city}&key=${apiKey}`;
+      let uriWeatherBitStr = `${url}forecast/daily?units=I${city}&key=${apiKey}`;
       let retCode;
       // console.log(uriWeatherBitStr);
       try {
@@ -102,28 +132,86 @@ function getWeatherBitDailyForecast(city){
   })
 }
 
+function getWeatherBitAirQuality(city) {
+  /* API_URL = https://api.weatherbit.io/v2.0/history/airquality?city=${city}&start_date=2022-10-03&end_date=2022-10-04&tz=local&key=${apikey} */
+  return new Promise(resolve => {
+    if (Array.isArray(city) === true && typeof(city[0]) === "string") {
+      city = "?lat=" + city[0] + "&lon=" + city[1];
+    } else {
+      city = "?city=" + city;
+    }
+    setTimeout(() => {
+      let apiKey = process.env.WEATHERBIT_KEY;
+      let url = process.env.WEATHERBIT_URI;
+      let e =  new Date().toISOString().slice(0, 16).replace('T', ' ')
+      
+      let enddate = e.split(' ')[0];
+      // add 1 day to enddate
+      let s = new Date(enddate);
+      s.setDate(s.getDate() - 1);
+      s = s.toISOString().slice(0, 16).replace('T', ' ');
+      let startdate = s.split(' ')[0];
+
+      let retCode;
+      let uriWeatherBitAPIStr = `${url}history/airquality${city}&start_date=${startdate}&end_date=${enddate}&key=${apiKey}`;
+
+      // console.log(uriWeatherBitAPIStr);
+      try {
+        request(uriWeatherBitAPIStr, async function (err, response, body) {
+          console.log(response.statusCode);
+
+          if (response.statusCode == 429) {
+            console.log("WARNING: You have exceeded your API call limit with weatherbit.io!");
+            resolve(null);
+          }
+          if (response.statusCode == 200) {
+            retCode = await JSON.parse(body);
+            resolve(retCode);
+          } else {
+            resolve(null);
+          }
+        })
+      } catch (err) {
+        console.log(err);
+      }
+    }, 300);
+
+  })
+}
+
+
+
 /*
  * Return multiple promises consists of currentConditions and dailyForecast data.
  */
 async function gatherWeatheBits(city) {
-  const [currentConditions, dailyForecast] = await Promise.all([
+  const [dailyForecast, currentConditions, airQuality,] = await Promise.all([
+    getWeatherBitDailyForecast(city),
     getWeatherBitCurrentConditions(city),
-    getWeatherBitDailyForecast(city)
+    getWeatherBitAirQuality(city)
   ]);
 
-  // Since daily forecast might take longer, check its promise here.
-  if (dailyForecast  !== null) {
-    // combine 2 promises: 
-    let combinedData = { locale: city, curStatus: 200, curData: currentConditions, foreStatus: 200, foreData: dailyForecast, error: null };
+
+  // Make sure all promisses fulfilled.
+  if (dailyForecast  !== null && airQuality !== null && currentConditions !== null ) {
+    let currentHour = new Date().getHours(); 
+    // combine 3 promises into a huge rendering passing paramters: 
+    let combinedData = { locale: city, curStatus: 200, curData: currentConditions, foreStatus: 200, foreData: dailyForecast, airqStatus: 200, airqData: airQuality.data[currentHour], error: null };
     return combinedData;
   } else {
-    return { locale: city, curStatus: 400, curData: null, foreStatus: 400, foreData: null, error: null };
+    return { locale: city, curStatus: 400, curData: null, foreStatus: 400, foreData: null, airqStatus: 400, airqData: null, error: null };
   }
 }
 
 // post weather data to the client-side
 app.post('/', (req, res) => {
-    console.log(req.body.locale);
+    // currentLoc();
+    // console.log(currentLoc);
+    // console.log("Lng: " + longitude + ", Lat: " + latitude);
+    console.dir(req.params);
+    console.dir(req.body);
+
+    return;
     // call weatherAPI for data
     let apiKey = process.env.WEATHER_VISUALCROSSING_API_KEY;
     let city = req.body.locale;
@@ -154,14 +242,14 @@ app.post('/', (req, res) => {
       });
 
     } catch (err) {
-      res.render('index', { locale: city, data: null, forecast: null, error: err.message });
+      res.render('index1', { locale: city, data: null, forecast: null, error: err.message });
     }
 });
 
 
 // about page
 app.get('/about', function(req, res) {
-    res.render('about');
+    res.render('pages/about');
 });
 
 let port = process.env.PORT || 3210;

package-lock.json

@@ -14,6 +14,7 @@
   "license": "ISC",
   "dependencies": {
     "body-parser": "^1.20.0",
+    "crypto-js": "^4.1.1",
     "dotenv": "^16.0.3",
     "ejs": "^3.1.8",
     "express": "^4.18.1",