Merge branch 'dev' into ESbuilMerge

Author: Rich

.env.example

@@ -0,0 +1,3 @@
+# This is an example .env file for you to create in order to insert your private URI for /electron
+# Your .env file should live in the root directory for the current configuration used in UserModel.ts
+MONGO_URI='<MongoDB-URI-for-private-User-DB-here>'

app/components/About/PastContributors.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { useStylingContext } from './StylingContext';
 
 const contributors = [
-  'Haoyu', 'Eisha', 'Edwin', 'Tyler', 'Snow', 'Taylor', 'Tim', 'Roberto', 'Nachiket', 'Tiffany', 'Bruno', 'Danny', 'Vince',
+  'Mike', 'Stephen', 'Ted', 'Sofia', 'Haoyu', 'Eisha', 'Edwin', 'Tyler', 'Snow', 'Taylor', 'Tim', 'Roberto', 'Nachiket', 'Tiffany', 'Bruno', 'Danny', 'Vince',
   'Matt', 'Derek', 'Kit', 'Grace', 'Jen', 'Patty', 'Stella', 'Michael', 'Ronelle', 'Todd',
   'Greg', 'Brianna', 'Brian', 'Alon', 'Alan', 'Ousman', 'Ben', 'Chris', 'Jenae', 'Tim',
   'Kirk', 'Jess', 'William', 'Alexander', 'Elisa', 'Josh', 'Troy', 'Gahl', 'Brisa', 'Kelsi', 

app/components/About/TeamMembers.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useStylingContext } from './StylingContext';
 
-const names = ['Mike', 'Stephen', 'Ted', 'Sofia'];
+const names = ['Arnold', 'Ashley', 'Pete', 'Rich'];
 
 const TeamMembers: React.FC = () => {
   const currentMode = useStylingContext();

electron/models/UserModel.ts

@@ -1,5 +1,6 @@
+import 'dotenv/config';// Imported dotenv to process env files to protect our URI 
 // Insert the MongoDB URI for your private User database in place of the example URI provided below.
-const MONGO_URI = 'mongodb+srv://chronoschild15:Codesmith999@cluster0.abrbjlj.mongodb.net/';
+const MONGO_URI = process.env.MONGO_URI;//URI from .env file in electron folder root directory 
 
 const mongoose = require('mongoose');
 

examples/docker/.env.example

@@ -0,0 +1,14 @@
+# **NOTE**: Ensure that there are no quotes surrounding any of the keys and values.
+
+CHRONOS_DB="MongoDB or PostgreSQL"
+CHRONOS_URI="The URI to the desired MongoDB or PostgreSQL database to save health metrics via Chronos"
+CHRONOS_GRAFANA_API_KEY=Bearer "[the access token you created in above section (Grafana API Key)]"
+
+MONGO_URI_AUTH="A MongoDB URI for the auth server microservice to use"
+MONGO_URI_ITEMS="A MongoDB URI for the items server microservice to use"
+MONGO_URI_INVENTORY="A MongoDB URI for the inventory server microservice to use"
+MONGO_URI_ORDERS="A MongoDB URI for the orders server microservice to use"
+
+# A random string used to sign and verify JSON Web Tokens used by the auth service - the random string provided will work
+JWT_KEY=16a8dcb7e3445392b8124f82a451fb2c1c42a1ad4d599e43ebaf4cbbad8c7d59
+JWT_LIFETIME="The time-to-expiration of the JSON Web Token used by the auth service - this is set to `1d` in `sample.env` meaning user authentication is valid for 1 day"

examples/docker/README.md

@@ -39,7 +39,7 @@ For additional details on how Chronos works this example, please review the Dock
 
 Peform the following steps in each of the _Auth_, _Items_, _Inventory_, _Orders_, _Client_, and _Event-Bus_ directories
 
-1. Add a `.env` file to each of _Auth_, _Items_, _Inventory_, _Orders_, _Event-Bus_, and _Client_ folders with the following key/value pairs (a `sample.env` file is provided in the `/examples/docker` directory):
+1. Add a `.env` file to each of _Auth_, _Items_, _Inventory_, _Orders_, _Event-Bus_, and _Client_ folders with the following key/value pairs (a `.env.example` file is provided in the `/examples/docker` directory):
 
 - **NOTE**: Ensure that there are no quotes surrounding any of the keys and values.
 

examples/kubernetes/README.md

@@ -81,7 +81,7 @@ docker build -t backend:1.0 .
 
 2. run `npm start` to start npm server.
 
-3. You should see `🤖 Example app listening on port 1111! chronos_npm_package Server Loaded 🎉` in the terminal.
+3. You should see `Example app listening on port 3000! Kubernetes Example Server Loaded` in the terminal.
 
 ## Deploy the Cluster
 

examples/kubernetes/server/.env.example

@@ -0,0 +1,5 @@
+# This file serves as a template for the .env file you will be creating while following the README steps.
+CHRONOS_GRAFANA_API_KEY=Bearer "<access-token-created-in-step-3-here]>"
+CHRONOS_DB="<MongoDB-or-PostgreSQL>"
+# The URI to the desired MongoDB or PostgreSQL database to save health metrics via Chronos
+CHRONOS_URI="<database-URI-here>"

package-lock.json

@@ -25,7 +25,7 @@
     "d3": "^7.8.5",
     "dat.gui": "^0.7.9",
     "docker": "^0.2.14",
-    "dotenv": "^16.0.3",
+    "dotenv": "^16.4.7",
     "electron-devtools-installer": "^3.2.0",
     "electron-fetch": "^1.9.1",
     "electron-log": "^5.0.0-beta.23",