Merge pull request #36 from hurricanemark/Phase2-BaselineToSeriousWorks

Phase2 baseline to serious works

Author: hurricanemark

.dockerignore

@@ -8,4 +8,5 @@
 **/.env
 **/.editorconfig
 **/.aws
-**/dist
+**/dist
+**/utils.js

.gitignore

@@ -4,3 +4,5 @@ public/ePub
 views/header2.ejs
 index-temp.ejs
 utils.js
+WeatherApp_US_East1Key.ppk
+index.copy.js

Dockerfile

@@ -2,17 +2,19 @@ FROM node:16.17.0 AS build
 
 WORKDIR /usr/src/app
 
-#COPY package.json package-lock.json ./
-COPY . .
+COPY package.json package-lock.json ./
+
+RUN npm install --dotenv-extend
 
 # install package.json and clean cache.
 RUN npm ci --production && npm cache clean --force
 
-ENV NODE_ENV=production
+COPY . .
+
+ENV NODE_ENV=awsdeploy
 ENV PORT=8080
 ENV WEATHERBIT_URI=https://api.weatherbit.io/v2.0/
-
-# ENV WEATHERBIT_KEY=XXXXXXX  <-- expect as container parameter! 
+ENV WEATHERBIT_KEY=ZTg4ZTFhODA5NmNkNDg5N2I3OWIyMzBhOWM0OWIyNDM= 
 
 EXPOSE 8080
 

README.md

@@ -178,4 +178,16 @@ Notice also that Dockerfile exposes port 8080.  This needs to be forwarded to a
 
 To access the Local Weather app running in docker container, point your browser to the forwarding port 4321.
 
-`http:/localhost:4321`
+`http:/localhost:4321`
+
+<br />
+
+## Hosting on A Public Site
+
+For the purpose of hosting this app, we select [Cyclic free-for-life tier](https://app.cyclic.sh/api/login).
+Cyclic deploys full stack NodeJS apps on AWS infrastructure directly from GitHub. It works by integrating with your GitHub repos. It will build and deploy your code on every merge or push to your default branch.
+
+Please do not abuse this live website below.  Thank you!
+[Live demo](https://techrolemiweather.cyclic.app/about)
+
+**Recommend Cylic** https://app.cyclic.sh/#/join/hurricanemark

WeatherApp_US_East1Key.ppk

@@ -0,0 +1,26 @@
+PuTTY-User-Key-File-2: ssh-rsa
+Encryption: none
+Comment: WeatherApp_US_East1Key
+Public-Lines: 6
+AAAAB3NzaC1yc2EAAAADAQABAAABAQCby1j9wMJB5+WhIrAp0FIW1eH/+dhRDz8S
+53aDH9NzxsxFylm+RxvFMYztUBKvLsR2/nSjz9+Y6qAfp4DxBo729bJLqSE7XTK4
+TT8ynnLEC3fXlUWn3MBYGXMRqXfJ5yMG1YEDQn20cWILFd08NDL6CQMkx9If6A0c
+2d1Hc41dK2EGqAwo3ocDfTx5vg0x/iAYkOFDG/NBD16MST2GKWTdo3e4TYEfOwuL
+Omd/B/8IXVPmuAK95i5qUVXWSSuPy7CiorYRBdeig/B87dRUa75sILHfxKWyvrpe
+nY6dS3x+iBiEy6ZS+jAoPdxfSLHHTDGU2qDoNY4wJlN2kTVwOtVp
+Private-Lines: 14
+AAABAC6ymQ4WhSO0GsRd3WfrJW/q1D8h6JEDfOhxsLhFBeCiKgCRUq0SK2TEIXXQ
+lokj/4ebZeLkICV5zl0unBui1592rea331on6VgM73CAxe21ckqQV7ylEpJVroQQ
+w/Mk8P7PaEhN2dgIVFb2SsYM72q64NJZgsZFjAil1QnhvPG74Yjc0b35F8S+mRqq
+3HiY/zjPy5eSOh4eXsPn5GoJhWkbV1IRfwJkQlb/tuXY2KaUaXHIbU6BPv4soeyE
+6FBbKvZeolPk+w6DgcQ/x8wDSUhK3SZICQvSkFfPZ3LvIU01jlVpi0Tc7sPmdpgR
+HipFfZtHBnwaw8FuY43KcjQBusEAAACBAOv3fhh1nXmqR5RyYBTaA0xUfH72NRLq
+Dxgd46TLqKwzyB8Ikl3AefifAXeGzFhW6K4ucJyhPpg4m7f2TnS1ElcIgkNTIUUb
+LxtU9I/aWhFyMrdPsfbBLxx3pHHBHsUQa+J44z8BIphA3VzW+VgiNgsKLlpVuqZA
+K0T0FI0RYZRVAAAAgQCpBWKiFW0T1yv9FcE7mH62jP5GyP6f58D6+PhicDID9DvH
+BdXq+B+6hgZml6S1WT3O+fzeLSVaC9E+QeQHHWb/MTmDO70St7mKQGbJnTcWLQNV
+GA8lvrB0iK1UFctkBWZyeeY0kWIndAB/jTa3e6Y7zMNLEQfB4atxz5wx9MTwxQAA
+AIA48iTdOROUdBZkUCzIraJ2dx7xuvaG2jvfY1/9GR9KbeNkU5rmk/YnJnPA5rHr
+iK9lK4pa0zzGLuBjeFwrudKIKXtxT5J9z7OuPXgUfT1v3IbtdHxbsm5Sz37iGu/C
+wIMSUQHjQkiqqW7iSIeiv0wtEPoQ1CINrqDo7bXri6QW9Q==
+Private-MAC: bd3d0bdbff31962cf4eb209b7ee93b9c60675cb5

crypto.js

@@ -8,6 +8,13 @@ const decrypt = (data) => {
   return CryptoJS.enc.Base64.parse(data).toString(CryptoJS.enc.Utf8);
 };
 
+const encryptAES = (text) => {
+  return CryptoJS.AES.encrypt(JSON.stringify({ text }), 'daddy').toString();
+}
+const decryptAES = (data) => {
+  return CryptoJS.AES.decrypt(data, 'daddy').toString(CryptoJS.enc.Utf8);
+}
+
 const toLocalDt = (unix_ts) => {
   // Create a new JavaScript Date object based on the timestamp
   // multiplied by 1000 so that the argument is in milliseconds, not seconds.
@@ -24,11 +31,12 @@ const toLocalDt = (unix_ts) => {
 }
 
 function test() {
-    let enStr = encrypt("e88e1a8096cd4897b79b230a9c49b243");
+    let enStr = encryptAES("e88e1a8096cd4897b79b230a9c49b243");
     console.log("Encrypted Key: " + enStr);
-    console.log("Decrypted key: " + decrypt(enStr));
+    // WEATHERBIT_KEY = Object.entries(Xcode).value;
+    console.log("Decrypted key: " + JSON.parse(decryptAES(enStr)).text);
 
 }
 
 // test();
-export {encrypt, decrypt, toLocalDt};
+export {encrypt, decrypt, encryptAES, decryptAES, toLocalDt};