From 618aaead1e4e05e2358c4cfea2e81facb162dab2 Mon Sep 17 00:00:00 2001
From: thebootsie123 <bootsie227@gmail.com>
Date: Tue, 26 Oct 2021 21:27:57 -0400
Subject: [PATCH] Fixed server port not the following local environment config
 file

---
 .gitignore          |  5 +++--
 functions/server.js |  2 ++
 package-lock.json   | 51 +++++++++++++++++++++++++++++++++++++--------
 package.json        |  3 ++-
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5152945..b58bd98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,9 @@ node_modules
 *.bak
 
 # local env files
-.env.local
-.env.*.local
+.env
+.env.*
+!.env.example
 
 # Log files
 npm-debug.log*
diff --git a/functions/server.js b/functions/server.js
index aca0aec..d316e92 100644
--- a/functions/server.js
+++ b/functions/server.js
@@ -6,6 +6,8 @@ const cors = require("cors");
 const history = require("connect-history-api-fallback");
 const fetch = require("node-fetch");
 
+require("dotenv").config();
+
 const app = express();
 const PORT = process.env.PORT || 3000;
 
diff --git a/package-lock.json b/package-lock.json
index 4f60b86..c446853 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "f1-web-viewer",
-  "version": "1.7.10",
+  "version": "1.7.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2666,6 +2666,12 @@
             "ms": "2.1.2"
           }
         },
+        "dotenv": {
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
+          "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
+          "dev": true
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -4512,9 +4518,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001214",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz",
-      "integrity": "sha512-O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg==",
+      "version": "1.0.30001271",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
+      "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {
@@ -6423,10 +6429,9 @@
       }
     },
     "dotenv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
-      "dev": true
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="
     },
     "dotenv-expand": {
       "version": "5.1.0",
@@ -10705,6 +10710,24 @@
         "minipass": "^3.0.0"
       }
     },
+    "minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
     "mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -12732,6 +12755,14 @@
         "js-yaml": "^3.13.1",
         "json5": "^2.1.2",
         "lazy-val": "^1.0.4"
+      },
+      "dependencies": {
+        "dotenv": {
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
+          "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
+          "dev": true
+        }
       }
     },
     "read-pkg": {
@@ -15848,12 +15879,14 @@
         },
         "tar": {
           "version": "6.1.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
+          "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
           "dev": true,
           "requires": {
             "chownr": "^2.0.0",
             "fs-minipass": "^2.0.0",
             "minipass": "^3.0.0",
+            "minizlib": "^2.1.1",
             "mkdirp": "^1.0.3",
             "yallist": "^4.0.0"
           }
diff --git a/package.json b/package.json
index f7952eb..479f5b9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "f1-web-viewer",
   "description": "A simple grid-based web viewer for Formula 1",
   "author": "bootsie123",
-  "version": "1.7.10",
+  "version": "1.7.11",
   "private": true,
   "homepage": "https://github.com/bootsie123/F1-Web-Viewer",
   "scripts": {
@@ -27,6 +27,7 @@
     "core-js": "^3.6.5",
     "cors": "^2.8.5",
     "cors-anywhere": "^0.4.4",
+    "dotenv": "^10.0.0",
     "electron-store": "^8.0.0",
     "electron-updater": "^4.3.9",
     "express": "^4.17.1",