adding Admin server

2026-11-12 16:57:39 -05:00 · 2021-01-10 22:23:09 -05:00
parent c8b4f02d06
commit 86eb854848
156 changed files with 53167 additions and 15978 deletions
--- a/admin/.env
+++ b/admin/.env
@@ -3,10 +3,8 @@ REACT_APP_FRONTEND_SERVER=https://openmhz.com
 REACT_APP_SOCKET_SERVER=wss://api.openmhz.com
 REACT_APP_ACCOUNT_SERVER=https://account.openmhz.com
 REACT_APP_ADMIN_SERVER=localhost:3000
+REACT_APP_COOKIE_DOMAIN=.openmhz.com
 REACT_APP_ADMIN_EMAIL=luke@robotastic.com
 REACT_APP_SITE_NAME=OpenMHz
 REACT_APP_ARCHIVE_DAYS=30
-REACT_APP_PRO_PLAN=1
-REACT_APP_FREE_PLAN=0
-REACT_APP_PRO_PLAN_ARCHIVE=30
-REACT_APP_FREE_PLAN_ARCHIVE=7
+
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@@ -0,0 +1,20 @@
+# build environment
+FROM node:13.12.0-alpine as build
+WORKDIR /app
+ENV PATH /app/node_modules/.bin:$PATH
+COPY package.json ./
+RUN npm install
+RUN npm install react-scripts@3.4.1 -g --silent
+COPY . ./
+RUN npm run build
+
+# production environment
+FROM node:13.12.0-alpine
+RUN mkdir -p /app/public
+COPY ./package.json /tmp
+RUN cd /tmp && npm install
+RUN cp -a /tmp/node_modules /app
+WORKDIR /app
+COPY server /app
+COPY --from=build /app/build /app/public
+CMD ["node", "index.js"]
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,6 +3,18 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
+    "bcrypt": "5.0.0",
+    "bcryptjs": "2.4.3",
+    "connect-mongo": "3.2.0",
+    "csv-parse": "4.14.2",
+    "express": "4.17.1",
+    "express-session": "1.17.1",
+    "mongoose": "5.11.11",
+    "multer": "1.4.2",
+    "passport": "0.4.1",
+    "passport-local": "1.0.0"
+  },
+  "devDependencies": {
    "@reduxjs/toolkit": "^1.1.0",
    "@testing-library/jest-dom": "^4.2.4",
    "@testing-library/react": "^9.3.2",
--- a/admin/server/config/express.js
+++ b/admin/server/config/express.js
@@ -0,0 +1,86 @@
+const path = require("path");
+const express = require("express");
+const session = require("express-session");
+const bodyParser = require("body-parser");
+const connectMongo = require("connect-mongo");
+const secrets = require("./secrets");
+
+const MongoStore = connectMongo(session)
+var cookie_domain = process.env['REACT_APP_COOKIE_DOMAIN'] != null ? process.env['REACT_APP_COOKIE_DOMAIN'] : '.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
+var backend_server = process.env['REACT_APP_BACKEND_SERVER'] != null ? process.env['REACT_APP_BACKEND_SERVER'] : 'https://api.openmhz.com';
+var frontend_server = process.env['REACT_APP_FRONTEND_SERVER'] != null ? process.env['REACT_APP_FRONTEND_SERVER'] : 'https://openmhz.com';
+var socket_server = process.env['REACT_APP_SOCKET_SERVER'] != null ? process.env['REACT_APP_SOCKET_SERVER'] : 'wss://socket.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
+var account_server = process.env['REACT_APP_ACCOUNT_SERVER'] != null ? process.env['REACT_APP_ACCOUNT_SERVER'] : 'https://account.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
+
+module.exports = function(app, passport) {
+	app.set("port", 3008)
+
+	// X-Powered-By header has no functional value.
+	// Keeping it makes it easier for an attacker to build the site's profile
+	// It can be removed safely
+	app.disable("x-powered-by")
+
+	app.use(bodyParser.json())
+	app.use(bodyParser.urlencoded({ extended: true }))
+	app.use(express.static(path.join(process.cwd(), 'public')));
+
+	const sess = {
+		resave: true,
+		saveUninitialized: true,
+		secret: secrets.sessionSecret,
+		proxy: true,
+		name: "sessionId",
+		cookie: {
+			httpOnly: true,
+			secure: false,
+			domain: cookie_domain
+		},
+		store: new MongoStore({
+			url: secrets.db,
+			autoReconnect: true
+		})
+	}
+
+	var node_env = process.env.NODE_ENV;
+	console.log('--------------------------');
+	console.log('===> 😊  Starting Server . . .');
+	console.log('===>  Environment: ' + node_env);
+	/*
+	if(node_env === 'production') {
+		console.log('===> 🚦  Note: In order for authentication to work in production');
+		console.log('===>           you will need a secure HTTPS connection');
+		sess.cookie.secure = true; // Serve secure cookies
+	}*/
+
+	app.use(session(sess))
+
+	app.use(passport.initialize())
+	app.use(passport.session())
+
+	app.use('/*', function(req, res, next) {
+	    var allowedOrigins = [ account_server];
+	    allowedOrigins.push(frontend_server);
+	    allowedOrigins.push(backend_server);
+	    allowedOrigins.push(socket_server);
+
+	    var origin = req.headers.origin;
+
+
+	    if (allowedOrigins.indexOf(origin) > -1) {
+	        res.setHeader('Access-Control-Allow-Origin', origin);
+	    } else if (req.headers["user-agent"] == 'TrunkRecorder1.0') {
+	        res.setHeader('Access-Control-Allow-Origin', "*");
+	    } else {
+	        res.setHeader('Access-Control-Allow-Origin', "*");
+	        if (origin) {
+	          console.warn("forcing CORS for: " + origin + " referer: " + req.headers.referer);
+	        }
+	    }
+	    res.header("Access-Control-Allow-Headers", "X-Requested-With");
+		res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS,WEBSOCKET');
+		res.header('Access-Control-Allow-Credentials', 'true');
+	    res.header("Access-Control-Allow-Headers", "Access-Control-Allow-Headers, Access-Control-Allow-Credentials, Origin,Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers, Access-Control-Max-Age");
+	    res.header('Access-Control-Max-Age', '600');
+	    next();
+	});
+}
--- a/admin/server/config/passport-strategies/local.js
+++ b/admin/server/config/passport-strategies/local.js
@@ -0,0 +1,36 @@
+/*
+ Configuring local strategy to authenticate strategies
+ Code modified from : https://github.com/madhums/node-express-mongoose-demo/blob/master/config/passport/local.js
+ */
+
+const mongoose = require("mongoose");
+const LocalStrategy = require("passport-local").Strategy;
+const User = require("../../models/user");
+
+ /*
+ By default, LocalStrategy expects to find credentials in parameters named username and password.
+ If your site prefers to name these fields differently, options are available to change the defaults.
+ */
+ module.exports = new LocalStrategy({
+ 	usernameField: "email"
+ }, (email, password, done) => {
+ 	User.findOne({
+    $or: [{
+      email
+    }, {
+      local: {
+        email
+      }
+    }]
+  }, (err, user) => {
+ 		if(!user) return done(null, false, { message: `Email ${email} not found` })
+
+ 		user.comparePassword(password, (err, isMatch) => {
+ 			if (isMatch) {
+ 				return done(null, user)
+ 			} else {
+ 				return done(null, false, { message: "Invalid email or password" })
+ 			}
+ 		})
+ 	})
+ })
--- a/admin/server/config/passport.js
+++ b/admin/server/config/passport.js
@@ -0,0 +1,26 @@
+/* Initializing PassportJS */
+const User = require("../models/user");
+const local = require("./passport-strategies/local");
+
+module.exports = function (app, passport) {
+  // Configure Passport authenticated session persistence.
+  //
+  // In order to restore authentication state across HTTP requests, Passport needs
+  // to serialize users into and deserialize users out of the session.  The
+  // typical implementation of this is as simple as supplying the user ID when
+  // serializing, and querying the user record by ID from the database when
+  // deserializing.
+  passport.serializeUser((user, done) => {  	
+  	done(null, user.id)
+  })
+
+  passport.deserializeUser((id, done) => {
+  	User.findById(id, (err, user) => {      
+  		done(err, user)
+  	})
+  })
+
+  // use the following strategies
+  passport.use(local)
+}
+
--- a/admin/server/config/secrets.js
+++ b/admin/server/config/secrets.js
@@ -0,0 +1,14 @@
+/** Important **/
+/** You should not be committing this file to GitHub **/
+/** Repeat: DO! NOT! COMMIT! THIS! FILE! TO! YOUR! REPO! **/
+var host = process.env['MONGO_NODE_DRIVER_HOST'] != null ? process.env['MONGO_NODE_DRIVER_HOST'] : 'localhost';
+var port = process.env['MONGO_NODE_DRIVER_PORT'] != null ? process.env['MONGO_NODE_DRIVER_PORT'] : 27017;
+var mongoUrl = 'mongodb://' + host + ':' + port + '/scanner';
+
+
+
+module.exports = secrets = {
+	db: mongoUrl,
+	sessionSecret: "letthisbeyoursecret"
+}
+
--- a/admin/server/controllers/groups.js
+++ b/admin/server/controllers/groups.js
@@ -0,0 +1,296 @@
+const Group = require("../models/group");
+const System = require("../models/system");
+const mongoose = require("mongoose");
+
+//router.get('/system/:shortName/group/:groupId?', isLoggedIn, function(req, res) {
+
+exports.getGroups = function(req, res, next) {
+  process.nextTick(function() {
+    System.findOne(
+      {
+        shortName: req.params.shortName.toLowerCase()
+      },
+      function(err, system) {
+        if (err) {
+          console.error(err);
+          res.json({ success: false, message: err });
+          return;
+        }
+        if (!system) {
+          console.error(err);
+          res.json({
+            success: false,
+            message: "That Short Name does not exist."
+          });
+          return;
+        }
+        if (!system.userId.equals(req.user._id)) {
+          res.json({
+            success: false,
+            message: "You are not the user associated with this system."
+          });
+          return;
+        }
+
+        if (req.params.groupId) {
+          var groupId = req.params.groupId.toLowerCase();
+
+          Group.findOne(
+            {
+              _id: new mongoose.Types.ObjectId(groupId),
+              shortName: req.params.shortName.toLowerCase()
+            },
+            { sort: { position: -1 } },
+            function(err, group) {
+              if (err) {
+                res.json({
+                  success: false,
+                  message: err
+                });
+                return;
+              } else {
+                res.json({
+                  success: true,
+                  group: group
+                });
+                return;
+              }
+            }
+          );
+        } else {
+          Group.find(
+            {
+              shortName: req.params.shortName.toLowerCase()
+            }).sort("position").exec(
+            function(err, groups) {
+              if (err) {
+                res.json({
+                  success: false,
+                  message: err
+                });
+                return;
+              } else {
+                res.json({
+                  success: true,
+                  groups: groups
+                });
+                return;
+              }
+            }
+          );
+        }
+      }
+    );
+  });
+};
+
+exports.deleteGroup = function(req, res, next) {
+//router.get('/system/:shortName/remove_group/:groupId', isLoggedIn, function(req, res) {
+    System.findOne({
+        'shortName': req.params.shortName.toLowerCase()
+    }, function(err, system) {
+      if (err) {
+        console.error(err);
+        res.json({ success: false, message: err });
+        return;
+      }
+      if (!system) {
+        console.error(err);
+        res.json({
+          success: false,
+          message: "That Short Name does not exist."
+        });
+        return;
+      }
+      if (!system.userId.equals(req.user._id)) {
+        res.json({
+          success: false,
+          message: "You are not the user associated with this system."
+        });
+        return;
+      }
+            Group.findOneAndRemove({
+                shortName: req.params.shortName.toLowerCase(),
+                '_id': new mongoose.Types.ObjectId(req.params.groupId)
+            }, function(err) {
+
+                  if (err) {
+                    res.json({
+                      success: false,
+                      message: err
+                    });
+                    return;
+                } else {
+                  res.json({
+                    success: true
+                  });
+                  return;
+                }
+                // removed!
+            });
+
+    });
+};
+
+exports.reorderGroups = function(req, res, next) {
+  //router.post('/system/:shortName/group_order', isLoggedIn, function(req, res) {
+  process.nextTick(function() {
+    System.findOne(
+      {
+        shortName: req.params.shortName.toLowerCase()
+      },
+      function(err, system) {
+        if (err) {
+          console.error(err);
+          res.json({ success: false, message: err });
+          return;
+        }
+        if (!system) {
+          console.error(err);
+          res.json({
+            success: false,
+            message: "That Short Name does not exist."
+          });
+          return;
+        }
+        if (!system.userId.equals(req.user._id)) {
+          res.json({
+            success: false,
+            message: "You are not the user associated with this system."
+          });
+          return;
+        }
+
+        var groupOrder = JSON.parse(req.body.groupOrder);
+        for (var i = 0; i < groupOrder.length; i++) {
+
+            console.log("in group: " + groupOrder[i] + " position: " + i);
+          Group.findOneAndUpdate(
+            {
+              _id: new mongoose.Types.ObjectId(groupOrder[i]),
+              shortName: req.params.shortName.toLowerCase()
+            },
+            {
+              position: i
+            },
+            {
+              new: true,
+              upsert: false
+            },
+            function(err, group) {
+              console.log("Save group: " + group._id + " position: " + group.position);
+              if (err) {
+                res.json({
+                  success: false,
+                  message: err
+                });
+
+                console.log(
+                  "Error: Group Order - " +
+                    err +
+                    " Shortname: " +
+                    req.params.shortName.toLowerCase()
+                );
+                return;
+              }
+            }
+          );
+        }
+        res.json({
+          success: true
+        });
+      }
+    );
+  });
+};
+
+exports.upsertGroup = function(req, res, next) {
+  //router.post('/system/:shortName/group/:groupId?', isLoggedIn, function(req, res) {
+  process.nextTick(function() {
+    System.findOne(
+      {
+        shortName: req.params.shortName.toLowerCase()
+      },
+      function(err, system) {
+        if (err) {
+          console.error(err);
+          res.json({ success: false, message: err });
+          return;
+        }
+        if (!system) {
+          console.error(err);
+          res.json({
+            success: false,
+            message: "That Short Name does not exist."
+          });
+          return;
+        }
+        if (!system.userId.equals(req.user._id)) {
+          res.json({
+            success: false,
+            message: "You are not the user associated with this system."
+          });
+          return;
+        }
+        var message = "";
+        var groupName = req.body.groupName.replace(/[^\w\s]/g, "");
+        var talkgroups = JSON.parse(req.body.talkgroups);
+        console.log(
+          "Talkgroups: " +
+            talkgroups +
+            " for group: " +
+            groupName +
+            " array: " +
+            Array.isArray(talkgroups)
+        );
+        if (!talkgroups.length || !Array.isArray(talkgroups)) {
+          message = "Talkgroups need to be selected, group can not be empty ";
+        }
+        if (!groupName.length) {
+          message = message + "Group Name is required";
+        }
+
+        if (message.length) {
+          res.json({
+            success: false,
+            message: message
+          });
+          return;
+        }
+        // if we got here, that means that everything is good for updating/inserting
+
+        var groupId = req.params.groupId;
+
+        Group.findOneAndUpdate(
+          {
+            _id: new mongoose.Types.ObjectId(groupId),
+            shortName: req.params.shortName.toLowerCase()
+          },
+          {
+            groupName: groupName,
+            talkgroups: talkgroups
+          },
+          {
+            new: true,
+            upsert: true
+          },
+          function(err, group) {
+            if (err) {
+              res.json({
+                success: false,
+                message: err
+              });
+              return;
+            } else {
+              res.json({
+                success: true,
+                group: group
+              });
+              return;
+            }
+          }
+        );
+      }
+    );
+  });
+};
--- a/admin/server/controllers/permissions.js
+++ b/admin/server/controllers/permissions.js
@@ -0,0 +1,241 @@
+const mongoose = require("mongoose");
+const Permission = require("../models/permission");
+const System = require("../models/system");
+const User = require("../models/user");
+
+exports.fetchPermissions = function(req, res, next) {
+  Permission.find(
+    {
+      shortName: req.params.shortName.toLowerCase()
+    },
+    function(err, permissions) {
+      if (err) {
+        console.error(err);
+        res.json({ success: false, message: err });
+        return;
+      }
+      var userIds = permissions.map(permission => {return permission.userId});
+      User.find(
+        {
+          _id: {
+            $in: userIds
+          }
+        },
+        function(err, users) {
+          if (err) {
+            console.error(err);
+            res.json({ success: false, message: err });
+            return;
+          }
+          var returnUsers = users.map(user =>{
+            var permission = permissions.find(obj => {
+
+              if (obj.userId.toString() == user._id.toString()) {
+                return true;
+              }
+              return false;
+            });
+            if (!permission) {
+              console.error("Error - Permission not found for user: " + user._id);
+              res.json({ success: false, message: "Permission not found" });
+              return;
+            }
+            return {_id: permission._id, userId: user._id, firstName: user.firstName, lastName: user.lastName, email: user.email, role: permission.role };
+          });
+
+          res.json({ success: true, permissions: returnUsers });
+        });
+      return;
+    }
+  );
+};
+
+
+exports.addPermission = async (req, res, next) => {
+  //router.post('/system/:shortName/group/:groupId?', isLoggedIn, function(req, res) {
+
+
+    let role = req.body.role;
+    var system = false;
+    var user = false;
+    var existing = false;
+    var saved = false;
+    if (!role || (role >= 20) || (role <1)) {
+      res.json({
+        success: false,
+        message: "Invalid Role"
+      });
+      return;
+    }
+    console.log("role looks good");
+    try {
+    system = await System.findOne(
+      {
+        shortName: req.params.shortName.toLowerCase()
+      });
+    } catch(err) {
+      console.error(err);
+      res.json({ success: false, message: err });
+      return;
+    }
+
+    if (!system) {
+      res.json({
+        success: false,
+        message: "That System does not exist."
+      });
+      return;
+    }
+    console.log("system looks good")
+    try {
+      user = await User.findOne(
+      {
+        email: req.body.email
+      });
+    } catch (err) {
+      console.error(err);
+      res.json({ success: false, message: err });
+      return;
+    }
+
+    if (!user) {
+      res.json({ success: false, message: "User not found" });
+      return;
+    }
+    console.log("user looks good")
+    try {
+      existing = await Permission.findOne({userId: user._id, systemId: system._id});
+    } catch (err) {
+      console.error(err);
+      res.json({ success: false, message: err });
+      return;
+    }
+
+    if (existing) {
+      res.json({ success: false, message: "User already has acccess" });
+      return;
+    }
+    console.log("no existing")
+    var permission = new Permission({
+      userId: user._id,
+      systemId: system._id,
+      shortName: system.shortName,
+      role: role
+    });
+
+
+    try {
+      saved = await permission.save()
+    } catch(err) {
+
+      res.json({
+        success: false,
+        message: err
+      });
+      return;
+    }
+    console.log("saved it")
+    var newPermission = saved.toObject();
+    newPermission.firstName = user.firstName;
+    newPermission.lastName = user.lastName;
+    newPermission.email = user.email;
+
+
+    console.log("Add Permission to: " + system.shortName + " for: " +  newPermission.email + " by: " + req.user.email);
+    res.json({
+      success: true,
+      permission: newPermission
+    });
+};
+
+
+exports.updatePermission = function(req, res, next) {
+  process.nextTick(function() {
+        Permission.findOne(
+          {
+            _id: new mongoose.Types.ObjectId(req.params.permissionId),
+            shortName: req.params.shortName.toLowerCase(req.params.shortName)
+          },
+
+          function(err, permission) {
+            if (err) {
+              res.json({
+                success: false,
+                message: err
+              });
+              return;
+            }
+            if (permission.role >= 20) {
+              res.json({
+                success: false,
+                message: "Cannot change permissions of system owner"
+              });
+              return;
+            }
+            var newRole = req.body.role;
+            if (!newRole || (newRole >= 20) || (newRole <1)) {
+              res.json({
+                success: false,
+                message: "Invalid Role"
+              });
+              return;
+            }
+            permission.role = newRole;
+            permission.save(function(err, saved) {
+              if (err) {
+                res.json({
+                  success: false,
+                  message: err
+                });
+                return;
+              }
+              res.json({
+                success: true,
+                permission: saved.toJSON()
+              });
+              return;
+
+            });
+          }
+        );
+
+  });
+};
+
+
+exports.deletePermission = function(req, res, next) {
+//router.get('/system/:shortName/remove_group/:groupId', isLoggedIn, function(req, res) {
+
+            Permission.findOneAndRemove({
+                shortName: req.params.shortName.toLowerCase(),
+                '_id': new mongoose.Types.ObjectId(req.params.permissionId),
+                role: { $lt : 20}
+            }, function(err, permission) {
+
+                  if (err) {
+                    res.json({
+                      success: false,
+                      message: err
+                    });
+                    return;
+                }
+
+                if (!permission) {
+                  res.json({
+                    success: false,
+                    message: "Permission not found"
+                  });
+                  return;
+
+                } else {
+
+                  res.json({
+                    success: true
+                  });
+                  return;
+                }
+                // removed!
+            });
+
+
+};
--- a/admin/server/controllers/systems.js
+++ b/admin/server/controllers/systems.js
@@ -0,0 +1,507 @@
+const mongoose = require("mongoose");
+const System = require("../models/system");
+const SystemStat = require("../models/system_stat");
+const Talkgroup = require("../models/talkgroup");
+const Group = require("../models/group");
+const crypto = require("crypto");
+
+exports.isLoggedIn = function (req, res, next) {
+  if (req.isAuthenticated()) return next();
+  res.redirect(account_server + "/login");
+};
+
+// -------------------------------------------
+
+exports.listSystems = function (req, res, next) {
+  console.log("Listing Systems for: " + req.user._id);
+  System.find({
+      userId: mongoose.Types.ObjectId(req.user._id)
+    },
+    function (err, systems) {
+      if (err) {
+        console.error("Error - ListSystems: " + err);
+        res.json({
+          success: false,
+          message: err
+        });
+        return;
+      }
+
+      var shortNames = new Array();
+      for (var i = 0; i < systems.length; i++) {
+        shortNames.push(systems[i].shortName);
+      }
+
+      SystemStat.find({
+          shortName: {
+            $in: shortNames
+          }
+        },
+        function (err, stats) {
+          var returnSys = systems.map(obj => {
+            var rObj = (({
+              name,
+              shortName,
+              description,
+              systemType,
+              city,
+              state,
+              county,
+              country,
+              userId,
+              key,
+              planType,
+              showScreenName
+            }) => ({
+              name,
+              shortName,
+              description,
+              systemType,
+              city,
+              state,
+              county,
+              country,
+              userId,
+              key,
+              planType,
+              showScreenName
+            }))(obj);
+            if (obj.showScreenName) {
+              rObj.screenName = req.user.screenName;
+            } else {
+              rObj.screenName = null;
+            }
+            rObj.id = obj._id;
+            return rObj;
+          });
+          var sys_stats = {}
+          var MS_PER_MINUTE = 60000;
+          var now = new Date();
+          for (var i = 0; i < stats.length; i++) {
+            sys_stats[stats[i].shortName] = {};
+
+            sys_stats[stats[i].shortName].callTotals = stats[i].callTotals;
+            sys_stats[stats[i].shortName].errorTotals = stats[i].errorTotals;
+            sys_stats[stats[i].shortName].errorStats = stats[i].errorStats;
+            sys_stats[stats[i].shortName].usageBytes = stats[i].usageBytes;
+            sys_stats[stats[i].shortName].usageMb = stats[i].usageMb;
+          }
+
+          res.json({
+            success: true,
+            systems: returnSys,
+            stats: sys_stats
+          });
+          return;
+        }
+      );
+    }
+  );
+};
+
+function remove_system(shortName) {
+  /*
+    var sysDir = config.mediaDirectory + "/" + shortName + "/"
+    console.log("Removing DIR: " + sysDir);
+    fs.remove(sysDir, function(err) {
+        if (err) return console.error(err)
+    });
+
+    Transmission.remove({
+        shortName: shortName
+    }, function(err) {
+        if (err) return console.error(err);
+        // removed!
+    });
+*/
+  System.remove({
+      shortName: shortName
+    },
+    function (err) {
+      if (err) return console.error(err);
+      // removed!
+    }
+  );
+
+  Talkgroup.remove({
+      shortName: shortName
+    },
+    function (err) {
+      if (err) return console.error(err);
+      // removed!
+    }
+  );
+
+  Group.remove({
+      shortName: shortName
+    },
+    function (err) {
+      if (err) return console.error(err);
+      // removed!
+    }
+  );
+}
+
+exports.deleteSystem = function (req, res, next) {
+  //router.get('/delete_system/:shortName', isLoggedIn, function(req, res) {
+  System.findOne({
+      shortName: req.params.shortName.toLowerCase()
+    },
+    function (err, system) {
+      if (err) {
+        res.json({
+          success: false,
+          message: err
+        });
+        return;
+      }
+      if (!system) {
+        res.json({
+          success: false,
+          message: "That Short Name does not exist."
+        });
+        return;
+      }
+      if (!system.userId.equals(req.user._id)) {
+        console.log("Error deleting syste - Wrong User - sys: " + system.userId + " profile:  " + mongoose.Types.ObjectId(req.user._id));
+        res.json({
+          success: false,
+          message: "You are not the user associated with this system."
+        });
+        return;
+      }
+      console.log("Removing: " + system.name);
+      remove_system(system.shortName);
+      res.json({
+        success: true
+      });
+      return;
+    }
+  );
+};
+
+// -------------------------------------------
+exports.ownSystem = async function (req, res, next) {
+  try {
+    var system = await System.findOne({
+      shortName: req.body.shortName.toLowerCase()
+    });
+
+    if (!system) {
+      console.error("ERROR: OwnSystem - system does not exist: " + req.body.shortName.toLowerCase());
+      res.json({
+        success: false,
+        message: "That System does not exist."
+      });
+      return;
+    }
+    if (!system.userId.equals(req.user._id)) {
+      console.error("ERROR: OwnSystem - not users system " + req.body.shortName.toLowerCase());
+
+      res.json({
+        success: false,
+        message: "You are not the user associated with this system."
+      });
+      console.error("System: " + system.userId + " User: " + req.user._id);
+      return;
+    }
+
+    res.locals.test = "Yoho!"
+    res.locals.system = system;
+    console.log(system);
+    console.log(res.locals);
+    next();
+
+  } catch (err) {
+    console.error("ERROR: Unique ShortName - caught: " + err);
+    res.json({
+      success: false,
+      message: err
+    });
+    return;
+  }
+
+}
+
+// -------------------------------------------
+exports.uniqueShortName = async function (req, res, next) {
+  console.error("locals: " + res.locals.shortName + " body: " + req.body.shortName )
+  try {
+    var system = await System.findOne({
+      shortName: res.locals.shortName.toLowerCase()
+    });
+
+    if (system) {
+      console.error("ERROR: Unique Shortname already in use: " + req.body.shortName.toLowerCase());
+      res.json({
+        success: false,
+        message: "Short Name already in use"
+      });
+      return;
+    } else {
+      next();
+    }
+
+
+  } catch (err) {
+    console.error("ERROR: Unique ShortName - caught: " + err);
+    res.json({
+      success: false,
+      message: err
+    });
+    return;
+  }
+
+}
+
+
+// -------------------------------------------
+
+exports.updateSystem = async function (req, res, next) {
+
+  console.log(res.locals)
+  res.locals.system.name = res.locals.name;
+  res.locals.system.city = res.locals.city;
+  res.locals.system.state = res.locals.state;
+  res.locals.system.county = res.locals.county;
+  res.locals.system.country = res.locals.country;
+  res.locals.system.description = res.locals.description;
+  res.locals.system.systemType = res.locals.systemType;
+  res.locals.system.showScreenName = res.locals.showScreenName;
+
+  res.locals.system.save(function (err) {
+    if (err) {
+      res.json({
+        success: false,
+        message: err
+      });
+      return;
+    } else {
+      var returnSys = (({
+        name,
+        shortName,
+        description,
+        systemType,
+        city,
+        state,
+        county,
+        country,
+        userId,
+        key,
+        showScreenName
+      }) => ({
+        name,
+        shortName,
+        description,
+        systemType,
+        city,
+        state,
+        county,
+        country,
+        userId,
+        key,
+        showScreenName
+      }))(res.locals.system);
+      returnSys.id = res.locals.system._id;
+      res.json({
+        success: true,
+        system: returnSys
+      });
+      return;
+    }
+  });
+}
+
+// -------------------------------------------
+
+exports.validateSystem = async function (req, res, next) {
+  try {
+    res.locals.showScreenName = req.body.showScreenName;
+
+    if (!req.body.name || (req.body.name.length < 2)) {
+      console.error("ERROR: Validate System - req.body.name");
+      res.json({
+        success: false,
+        message: "System Name is Required"
+      });
+      return;
+    }
+    res.locals.name = req.body.name.replace(/[^\w\s\.\,\-\_]/gi, '');
+
+    if (!req.body.description || (req.body.description.length < 2)) {
+      console.error("ERROR: Validate System - req.body.description");
+      res.json({
+        success: false,
+        message: "System Description is Required"
+      });
+      return;
+    }
+    res.locals.description = req.body.description.replace(/[^\w\s\.\,\-\_]/gi, '');
+
+    if (!req.body.shortName || (req.body.shortName.length < 2)) {
+      console.error("ERROR: Validate System - req.body.shortName");
+      res.json({
+        success: false,
+        message: "System ShortName is Required"
+      });
+      return;
+    }
+    var tempShortName = req.body.shortName.replace(/[^\w]/gi, '');
+    res.locals.shortName = tempShortName.toLowerCase();
+
+    // -------------------- Handle all the different SystemTypes of Locations
+
+
+    // make sure it is one of the expected types
+    if ((req.body.systemType != "state") && (req.body.systemType != "city") && (req.body.systemType != "county") && (req.body.systemType != "international")) {
+      console.error("ERROR: Validate System - req.body.systemType: " + req.body.systemType);
+      res.json({
+        success: false,
+        message: "Select system location"
+      });
+      return;
+    }
+
+    // copy it over
+    res.locals.systemType = req.body.systemType;
+
+    // now check to make sure the correct things for location is filled out
+    if (req.body.systemType === "state" ||
+      req.body.systemType === "city" ||
+      req.body.systemType === "county") {
+      if (!req.body.state || (req.body.state === "") || (req.body.state.length < 2)) {
+        console.error("ERROR: Validate System - req.body.state: " + req.body.state);
+        res.json({
+          success: false,
+          message: "Select the State for the System"
+        });
+        return;
+      }
+      res.locals.state = req.body.state;
+    }
+
+    if (req.body.systemType === "city") {
+      if (!req.body.city || (req.body.city === "") || (req.body.city.length < 2)) {
+        console.error("ERROR: Validate System - req.body.systemType: " + req.body.systemType);
+        res.json({
+          success: false,
+          message: "Enter the city for the System"
+        });
+        return;
+      }
+      res.locals.city = req.body.city.replace(/[^\w\s\.\,\-\_]/gi, '');
+    }
+
+    if (req.body.systemType === "county") {
+      if (!req.body.county || (req.body.county === "") || (req.body.county.length < 2)) {
+        console.error("ERROR: Validate System - req.body.county: " + req.body.county);
+        res.json({
+          success: false,
+          message: "Enter the county for the System"
+        });
+        return;
+      }
+      res.locals.county = req.body.county.replace(/[^\w\s\.\,\-\_]/gi, '');
+    }
+
+    if (req.body.systemType === "international") {
+      if (!req.body.country || (req.body.country === "") || (req.body.country.length < 2)) {
+        console.error("ERROR: Validate System - req.body.country: " + req.body.country);
+        res.json({
+          success: false,
+          message: "Enter the country for the System"
+        });
+        return;
+      }
+      res.locals.country = req.body.country.replace(/[^\w\s\.\,\-\_]/gi, '');
+    }
+
+
+  } catch (err) {
+    console.error("ERROR: Validate System - caught: " + err);
+    res.json({
+      success: false,
+      message: err
+    });
+    return;
+  }
+  next();
+}
+
+
+
+// -------------------------------------------
+
+exports.createSystem = async function (req, res, next) {
+
+  var key = uuid.v4();
+  key = crypto
+    .createHash("sha256")
+    .update(key)
+    .update("salt")
+    .digest("hex");
+  const system = (({
+    name,
+    shortName,
+    description,
+    systemType,
+    city,
+    state,
+    county,
+    country,
+    showScreenName
+  }) => ({
+    name,
+    shortName,
+    description,
+    systemType,
+    city,
+    state,
+    county,
+    country,
+    showScreenName
+  }))(res.locals);
+  system.key = key;
+  system.userId = mongoose.Types.ObjectId(req.user._id);
+  System.create(system, function (err, newSys) {
+    if (err) {
+      console.error(err);
+      res.json({
+        success: false,
+        message: err
+      });
+      return;
+    }
+    var returnSys = (({
+      name,
+      shortName,
+      description,
+      systemType,
+      city,
+      state,
+      county,
+      country,
+      userId,
+      showScreenName,
+      key
+    }) => ({
+      name,
+      shortName,
+      description,
+      systemType,
+      city,
+      state,
+      county,
+      country,
+      userId,
+      showScreenName,
+      key
+    }))(newSys);
+    returnSys.id = newSys._id;
+    res.json({
+      success: true,
+      system: returnSys
+    });
+    return;
+  });
+}
--- a/admin/server/controllers/talkgroups.js
+++ b/admin/server/controllers/talkgroups.js
@@ -0,0 +1,250 @@
+const Talkgroup = require("../models/talkgroup");
+const System = require("../models/system");
+const fs = require('fs-extra');
+
+const crypto = require("crypto");
+var parse = require('csv-parse');
+
+exports.isLoggedIn = function(req, res, next) {
+  if (req.isAuthenticated()) return next();
+  res.redirect(account_server + "/login");
+};
+
+//router.get("/tg_export/:shortName", isLoggedIn, function(req, res) {
+exports.exportTalkgroups = function(req, res, next) {
+  process.nextTick(function() {
+    System.findOne(
+      {
+        shortName: req.params.shortName.toLowerCase()
+      },
+      function(err, system) {
+        if (err) {
+          console.error(err);
+          res.json({ success: false, message: err });
+          return;
+        }
+        if (!system) {
+          console.error(err);
+          res.json({
+            success: false,
+            message: "That Short Name does not exist."
+          });
+          return;
+        }
+        if (!system.userId.equals(req.user._id)) {
+          res.json({
+            success: false,
+            message: "You are not the user associated with this system."
+          });
+          return;
+        }
+        Talkgroup.find(
+          {
+            shortName: req.params.shortName.toLowerCase()
+          },
+          function(err, talkgroups) {
+            if (err) {
+              console.error(err);
+              res.json({ success: false, message: err });
+              return;
+            }
+            if (!talkgroups || !Array.isArray(talkgroups)) {
+              console.error(err);
+              res.json({
+                success: false,
+                message: "Talkgroups were not found."
+              });
+              return;
+            }
+            res.statusCode = 200;
+            res.setHeader("Content-Type", "text/csv");
+            talkgroups.forEach(function(item) {
+              /*  res.write('"' + item.num + '", "'
+                              + item.mode + '", "'
+                              + item.alpha + '", "'
+                              + item.description + '", "'
+                              + item.tag + '", "'
+                              + item.group + '", "'
+                              + item.priority+ '"\r\n');*/
+              if (item) {
+                var sending = "";
+                sending = item.num + ", ";
+                if (item.mode) {
+                  sending = sending + item.mode.toString().replace(/\,/g, "") + ", "; 
+                } else {
+                  sending = sending + " ,";
+                }
+                if (item.alpa) {
+                  sending = sending + item.alpha.toString().replace(/\,/g, "") + ", "; 
+                } else {
+                  sending = sending + " ,";
+                }
+                if (item.description) {
+                  sending = sending + item.description.toString().replace(/\,/g, "") + ", "; 
+                } else {
+                  sending = sending + " ,";
+                }
+                if (item.tag) {
+                  sending = sending + item.tag.toString().replace(/\,/g, "") + ", "; 
+                } else {
+                  sending = sending + " ,";
+                }
+                if (item.group) {
+                  sending = sending + item.group.toString().replace(/\,/g, "") + ", "; 
+                } else {
+                  sending = sending + " ,";
+                }
+                if (item.priority) {
+                  sending = sending + item.priority.toString().replace(/\,/g, "") + "\r\n"; 
+                } else {
+                  sending = sending + "\r\n";
+                }
+                res.write(sending);
+                  
+              }
+            });
+
+            res.end();
+          }
+        );
+      }
+    );
+  });
+};
+
+function csv_import(shortName, filename, callback) {
+  var talkgroups = [];
+  Talkgroup.remove(
+    {
+      shortName: shortName
+    },
+    function(err) {
+      if (err) {
+        console.error("Error: csv import: " + err);
+        callback(err, null);
+      } else {
+        var parser = parse(
+          {
+            columns: [
+              "num",
+              "mode",
+              "alpha",
+              "description",
+              "tag",
+              "group",
+              "priority"
+            ]
+          },
+          async function(err, data) {
+            if (err) {
+              console.error("Error: csv import 2: " + err);
+              callback(err, null);
+            } else {
+              for (var i = 0; i < data.length; i++) {
+                var row = data[i];
+                var newTg = new Talkgroup();
+                newTg.num = parseInt(row.num);
+                newTg.alpha = row.alpha;
+                newTg.mode = row.mode;
+                newTg.description = row.description;
+                newTg.tag = row.tag.toLowerCase();
+                newTg.group = row.group.toLowerCase();
+                newTg.priority = row.priority;
+                newTg.shortName = shortName;
+                
+                await newTg.save(function(err) {
+                  if (err) {
+                    console.log("Error: CSV import: " + err);
+                    callback(err, null);
+                  }
+                });
+              }
+              callback(null, data);
+            }
+          }
+        );
+        }
+        fs.createReadStream(filename).pipe(parser);
+      // removed!
+    }
+  );
+}
+
+//router.post("/tg_import/:shortName", isLoggedIn, upload.single('file'), function(req, res, next) {
+exports.importTalkgroups = function(req, res, next) {
+  process.nextTick(function() {
+    System.findOne(
+      {
+        shortName: req.params.shortName.toLowerCase()
+      },
+      function(err, system) {
+        if (err) {
+          console.error("Error - importTalkgroups: " + err);
+          res.json({ success: false, message: err });
+          return;
+        }
+        if (!system) {
+          console.error("Error - importTalkgroups: System not found - " + req.params.shortName.toLowerCase());
+          res.json({
+            success: false,
+            message: "That Short Name does not exist."
+          });
+          return;
+        }
+        if (!system.userId.equals(req.user._id)) {
+          console.error("Error - importTalkgroups: you are not the user for hte system: " + req.user._id);
+          res.json({
+            success: false,
+            message: "You are not the user associated with this system."
+          });
+          return;
+        }
+        if (!req.file || req.file.size === 0) {
+          res.json({ success: false, message: "Please select a file." });
+          return;
+        }
+
+        fs.exists(req.file.path, function(exists) {
+          if (exists) {
+            csv_import(system.shortName, req.file.path, function(err, data) {
+              if (err) {
+                console.error("Erorr - CSV import, callback: " + err);
+                res.json({ success: false, message: err });
+                res.end();
+                return;
+              } else {
+                res.json({ success: true, talkgroups: data });
+                return;
+              }
+            });
+          } else {
+            console.error("Error - importTalkgroups: no file");
+            res.end(
+              "Well, there is no magic for those who don’t believe in it!"
+            );
+          }
+        });
+      }
+    );
+  });
+};
+
+// -------------------------------------------
+
+exports.fetchTalkgroups = function(req, res, next) {
+  Talkgroup.find(
+    {
+      shortName: req.params.shortName.toLowerCase()
+    },
+    function(err, talkgroups) {
+      if (err) {
+        console.error(err);
+        res.json({ success: false, message: err });
+        return;
+      }
+
+      res.json({ success: true, talkgroups: talkgroups });
+      return;
+    }
+  );
+};
--- a/admin/server/index.js
+++ b/admin/server/index.js
@@ -0,0 +1,155 @@
+const mongoose = require("mongoose");
+const express = require("express");
+const passport = require("passport");
+const path = require("path");
+const secrets = require("./config/secrets");
+const configurePassport = require("./config/passport");
+const configureExpress = require("./config/express");
+const systems = require("./controllers/systems");
+const groups = require("./controllers/groups");
+const talkgroups = require("./controllers/talkgroups");
+const Permission = require("./models/permission");
+require("./models/user");
+const multer = require('multer');
+
+var upload = multer({
+    dest: 'uploads/'
+});
+// -------------------------------------------
+
+const app = express() 
+
+// -------------------------------------------
+
+const connect = () => {
+	mongoose.connect(secrets.db, (err, res) => {
+		if (err) {
+			console.log(`Error connecting to ${secrets.db}. ${err}`)
+		} else {
+			console.log(`Successfully connected to ${secrets.db}.`)
+		}
+	})
+}
+connect()
+
+mongoose.connection.on("error", console.error)
+mongoose.connection.on("disconnected", connect)
+
+// -------------------------------------------
+
+const isDev = process.env.NODE_ENV === "development"
+
+
+/*
+async function getRole(req) {
+  let promise = new Promise((resolve, reject) => {
+    if (req.params.shortName && req.user) {
+    var short_name = req.params.shortName.toLowerCase();
+    var userId = req.user._id;
+    Permission.findOne({'userId': userId, 'shortName': short_name}, function(err, permission) {
+      if (err) {
+        console.error('Error - getRole userId: ' + userId + ' shortName: ' + short_name + ' error: ' + err);
+        reject(-1);
+      }
+      console.log('Found - getRole userId: ' + userId + ' shortName: ' + short_name + ' role: ' + permission.role);
+
+      resolve(permission.role);
+    });
+  } else {
+    reject(-1);
+  }});
+  return promise;
+}*/
+
+
+
+function isOwner(req, res, next) {
+  if (req.params.shortName && req.user) {
+    var short_name = req.params.shortName.toLowerCase();
+    var userId = req.user._id;
+    Permission.findOne({'userId': userId, 'shortName': short_name}, function(err, permission) {
+      if (err) {
+        console.error('Error - getRole userId: ' + userId + ' shortName: ' + short_name + ' error: ' + err);
+      }
+      console.log('Found - getRole userId: ' + userId + ' shortName: ' + short_name + ' role: ' + permission.role);
+      if ( permission.role >= 15) {
+        return next();
+      } else {
+        res.status(401).send({
+          success: false,
+          message: "Insufficent Permission, role: " + permission.role
+        });
+      }
+
+    });
+  }
+}
+
+
+function isAdmin(req, res, next) {
+  if (req.params.shortName && req.user) {
+    var short_name = req.params.shortName.toLowerCase();
+    var userId = req.user._id;
+    Permission.findOne({'userId': userId, 'shortName': short_name}, function(err, permission) {
+      if (err) {
+        console.error('Error - getRole userId: ' + userId + ' shortName: ' + short_name + ' error: ' + err);
+      }
+      console.log('Found - getRole userId: ' + userId + ' shortName: ' + short_name + ' role: ' + permission.role);
+      if (permission.role  >= 10) {
+        return next();
+      } else {
+        res.status(401).send({
+          success: false,
+          message: "Insufficent Permission, role: " + permission.role
+        });
+      }
+    });
+  }
+}
+
+function isLoggedIn(req, res, next) {
+  if (req.isAuthenticated()) return next();
+  res.status(401).send({
+    success: false,
+    message: "Not Authenticated."
+  });
+};
+
+// -------------------------------------------
+
+configurePassport(app, passport)
+configureExpress(app, passport)
+
+// -------------------------------------------
+app.use(express.static(path.join(__dirname, "public")));
+app.get("")
+
+//app.get("/permissions/:shortname", isOwner, permissions.fetchPermissions)
+/*app.get("/permissions/:shortName", permissions.fetchPermissions);
+app.delete("/permissions/:shortName/:permissionId", isAdmin, permissions.deletePermission);
+app.post("/permissions/:shortName/:permissionId", isAdmin, permissions.updatePermission);
+app.post("/permissions/:shortName", isAdmin, permissions.addPermission);*/
+app.get("/talkgroups/:shortName", isLoggedIn,  talkgroups.fetchTalkgroups)
+app.post("/talkgroups/:shortName/import", isLoggedIn, upload.single('file'),  talkgroups.importTalkgroups)
+app.get("/talkgroups/:shortName/export", isLoggedIn,  talkgroups.exportTalkgroups)
+app.post("/groups/:shortName/reorder", isLoggedIn, groups.reorderGroups);
+app.post("/groups/:shortName/:groupId?", isLoggedIn, groups.upsertGroup);
+app.get("/groups/:shortName/:groupId?", isLoggedIn, groups.getGroups);
+app.delete("/groups/:shortName/:groupId", isLoggedIn, groups.deleteGroup);
+app.get("/systems", isLoggedIn,  systems.listSystems)
+app.delete("/systems/:shortName", isLoggedIn, systems.deleteSystem)
+app.post("/systems/:shortName", [isLoggedIn, systems.ownSystem, systems.validateSystem, systems.updateSystem])
+app.post("/systems", [isLoggedIn, systems.uniqueShortName, systems.validateSystem, systems.createSystem])
+
+app.get("*", (req, res, next) => {
+	res.sendFile('public/index.html');
+});
+
+// start listening to incoming requests
+app.listen(app.get("port"), app.get("host"), (err) => {
+	if (err) {
+		console.err(err.stack)
+	} else {
+		console.log(`App listening on port ${app.get("port")} [${process.env.NODE_ENV} mode]`)
+	}
+})
--- a/admin/server/models/group.js
+++ b/admin/server/models/group.js
@@ -0,0 +1,14 @@
+var mongoose = require('mongoose');
+
+
+
+var groupSchema = mongoose.Schema({
+  shortName: String,
+  groupName: String,
+  groupId: String,
+  position: Number,
+  talkgroups: [Number]
+});
+
+
+module.exports = mongoose.model('Group', groupSchema);
--- a/admin/server/models/permission.js
+++ b/admin/server/models/permission.js
@@ -0,0 +1,24 @@
+// Defining a User Model in mongoose
+// Code modified from https://github.com/sahat/hackathon-starter
+
+var mongoose = require("mongoose");
+
+
+
+const PermissionSchema = new mongoose.Schema({
+	userId:  mongoose.Schema.Types.ObjectId,
+  systemId:  mongoose.Schema.Types.ObjectId,
+	shortName: String,
+	role: {
+		type: Number,
+		default: 0
+	},
+	ver: {
+		type: Number,
+		default: 1.2
+	}
+})
+
+
+
+module.exports=mongoose.model("Permission", PermissionSchema)
--- a/admin/server/models/system.js
+++ b/admin/server/models/system.js
@@ -0,0 +1,27 @@
+var mongoose = require('mongoose');
+var bcrypt   = require('bcrypt');
+
+var systemSchema = mongoose.Schema({
+  name: String,
+  shortName: String,
+  systemType: String,
+  county: String,
+  country: String,
+  city: String,
+  state: String,
+  description: String,
+  showScreenName: Boolean,
+  planType: {type: Number, default: 0},
+  userId:  mongoose.Schema.Types.ObjectId,
+  key: String
+});
+
+systemSchema.methods.generateHash = function(password) {
+  return bcrypt.hashSync(password, bcrypt.genSaltSync(8), null);
+};
+
+systemSchema.methods.validPassword = function(password) {
+  return bcrypt.compareSync(password, this.local.password);
+};
+
+module.exports = mongoose.model('System', systemSchema);
--- a/admin/server/models/system_stat.js
+++ b/admin/server/models/system_stat.js
@@ -0,0 +1,12 @@
+var mongoose = require('mongoose');
+
+var systemStatSchema = mongoose.Schema({
+  callTotals: [Number],
+  errorTotals: [Number],
+  usageBytes: Number,
+  usageMb: Number,
+  shortName: String
+}, { collection: 'system_stats' });
+
+
+module.exports = mongoose.model('SystemStat', systemStatSchema);
--- a/admin/server/models/talkgroup.js
+++ b/admin/server/models/talkgroup.js
@@ -0,0 +1,16 @@
+var mongoose = require('mongoose');
+
+var talkgroupSchema = mongoose.Schema({
+  shortName: String,
+  userId: String,
+  num: Number,
+  mode: String,
+  alpha: String,
+  description: String,
+  tag: String,
+  group: String,
+  priority: Number
+});
+
+
+module.exports = mongoose.model('Talkgroup', talkgroupSchema);
--- a/admin/server/models/user.js
+++ b/admin/server/models/user.js
@@ -0,0 +1,91 @@
+// Defining a User Model in mongoose
+// Code modified from https://github.com/sahat/hackathon-starter
+const bcrypt = require("bcrypt");
+const mongoose = require("mongoose");
+
+
+
+const UserSchema = new mongoose.Schema({
+	local: {
+		name: String,
+		email: String,
+		password: String
+	},
+	email: {
+		type: String,
+		unique: true,
+		lowercase: true
+	},
+	password: String,
+	screenName: {
+		type: String,
+		unique: true,
+		lowercase: true
+	},
+	firstName: String,
+	lastName: String,
+	location: String,
+	email: String,
+	resetPasswordToken: String,
+	resetPasswordTTL: Date,
+	confirmEmail: {
+		type: Boolean,
+		default: false
+	},
+	customerId: {
+		type: String,
+		default: ""
+	},
+	confirmEmailToken: String,
+	confirmEmailTTL: Date,
+	admin: {
+		type: Boolean,
+		default: false
+	},
+	terms: {
+		type: Number,
+		default: 0
+	},
+	ver: {
+		type: Number,
+		default: 1.1
+	},
+	sysCount: Number,
+	lastLogin: { type : Date, default: Date.now }
+})
+
+/**
+ * Password hash middleware.
+ */
+UserSchema.pre("save", function(next) {
+	var user = this
+	if (!user.isModified("password")) return next()
+	bcrypt.genSalt(8, (err, salt) => {
+		if (err) return next(err)
+		bcrypt.hash(user.password, salt, null, (err, hash) => {
+			if (err) return next(err)
+			user.password = hash;
+			user.local.password = hash;
+			next()
+		})
+	})
+})
+
+/*
+ Defining our own custom document instance method
+ */
+ UserSchema.methods = {
+ 	comparePassword: function(candidatePassword, cb) {
+ 		bcrypt.compare(candidatePassword, this.local.password, (err, isMatch) => {
+ 			if (err) return cb(err)
+ 			cb(null, isMatch)
+ 		})
+ 	}
+ }
+
+/**
+* Statics
+*/
+UserSchema.statics = {}
+
+module.exports = mongoose.model("User", UserSchema)
--- a/admin/server/public/style/style.css
+++ b/admin/server/public/style/style.css
@@ -0,0 +1,5 @@
+.field {
+  padding-top: 10px;
+  padding-left: 5px;
+  padding-right: 5px;
+}
--- a/admin/yarn.lock
+++ b/admin/yarn.lock
@@ -1549,6 +1549,12 @@
  dependencies:
    "@babel/types" "^7.3.0"

+"@types/bson@*":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.0.3.tgz#30889d2ffde6262abbe38659364c631454999fbf"
+  dependencies:
+    "@types/node" "*"
+
 "@types/eslint@^7.2.4":
  version "7.2.5"
  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.5.tgz#92172ecf490c2fce4b076739693d75f30376d610"
@@ -1616,6 +1622,13 @@
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"

+"@types/mongodb@^3.5.27":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.6.3.tgz#5655af409d9e32d5d5ae9a653abf3e5f9c83eb7a"
+  dependencies:
+    "@types/bson" "*"
+    "@types/node" "*"
+
 "@types/node@*":
  version "14.14.9"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.9.tgz#04afc9a25c6ff93da14deabd65dc44485b53c8d6"
@@ -1967,6 +1980,10 @@ abab@^2.0.3:
  version "2.0.5"
  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"

+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
  version "1.3.7"
  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -2058,6 +2075,10 @@ ansi-regex@^2.0.0:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"

+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
 ansi-regex@^4.0.0, ansi-regex@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
@@ -2092,10 +2113,21 @@ anymatch@^3.0.3, anymatch@~3.1.1:
    normalize-path "^3.0.0"
    picomatch "^2.0.4"

-aproba@^1.1.1:
+append-field@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56"
+
+aproba@^1.0.3, aproba@^1.1.1:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"

+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
  version "1.0.10"
  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2459,6 +2491,17 @@ bcrypt-pbkdf@^1.0.0:
  dependencies:
    tweetnacl "^0.14.3"

+bcrypt@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-5.0.0.tgz#051407c7cd5ffbfb773d541ca3760ea0754e37e2"
+  dependencies:
+    node-addon-api "^3.0.0"
+    node-pre-gyp "0.15.0"
+
+bcryptjs@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
+
 bfj@^7.0.2:
  version "7.0.2"
  resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2"
@@ -2486,6 +2529,17 @@ bindings@^1.5.0:
  dependencies:
    file-uri-to-path "1.0.0"

+bl@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5"
+  dependencies:
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
+
+bluebird@3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
 bluebird@^3.5.5:
  version "3.7.2"
  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -2644,6 +2698,10 @@ bser@2.1.1:
  dependencies:
    node-int64 "^0.4.0"

+bson@^1.1.4:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.5.tgz#2aaae98fcdf6750c0848b0cba1ddec3c73060a34"
+
 buffer-from@^1.0.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -2672,6 +2730,13 @@ builtin-status-codes@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"

+busboy@^0.2.11:
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"
+  dependencies:
+    dicer "0.2.5"
+    readable-stream "1.1.x"
+
 bytes@3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -2955,6 +3020,10 @@ coa@^2.0.2:
    chalk "^2.4.1"
    q "^1.1.2"

+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
 collect-v8-coverage@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -3058,7 +3127,7 @@ concat-map@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"

-concat-stream@^1.5.0:
+concat-stream@^1.5.0, concat-stream@^1.5.2:
  version "1.6.2"
  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
  dependencies:
@@ -3075,6 +3144,12 @@ connect-history-api-fallback@^1.6.0:
  version "1.6.0"
  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"

+connect-mongo@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/connect-mongo/-/connect-mongo-3.2.0.tgz#20f776c7f2a9d8144fc76cfdcbf33edb05eb4d52"
+  dependencies:
+    mongodb "^3.1.0"
+
 connected-react-router@6.8.0:
  version "6.8.0"
  resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.8.0.tgz#ddc687b31d498322445d235d660798489fa56cae"
@@ -3085,6 +3160,10 @@ console-browserify@^1.1.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"

+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
 constants-browserify@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -3456,6 +3535,10 @@ csstype@^3.0.2:
  version "3.0.5"
  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz#7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"

+csv-parse@4.14.2:
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-4.14.2.tgz#c1329cff95a99b8773a92c4e62f8bff114b34726"
+
 cyclist@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -3491,7 +3574,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
  dependencies:
    ms "2.0.0"

-debug@^3.1.1, debug@^3.2.5:
+debug@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
  version "3.2.7"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
  dependencies:
@@ -3530,6 +3619,10 @@ deep-equal@^1.0.1:
    object-keys "^1.1.1"
    regexp.prototype.flags "^1.2.0"

+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+
 deep-is@^0.1.3, deep-is@~0.1.3:
  version "0.1.3"
  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3586,10 +3679,22 @@ delayed-stream@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"

+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+denque@^1.4.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de"
+
 depd@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"

+depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+
 des.js@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -3601,6 +3706,10 @@ destroy@~1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"

+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
 detect-newline@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
@@ -3616,6 +3725,13 @@ detect-port-alt@1.1.6:
    address "^1.0.1"
    debug "^2.6.0"

+dicer@0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f"
+  dependencies:
+    readable-stream "1.1.x"
+    streamsearch "0.1.2"
+
 diff-sequences@^24.9.0:
  version "24.9.0"
  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
@@ -4266,7 +4382,20 @@ expect@^26.6.0, expect@^26.6.2:
    jest-message-util "^26.6.2"
    jest-regex-util "^26.0.0"

-express@^4.17.1:
+express-session@1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.1.tgz#36ecbc7034566d38c8509885c044d461c11bf357"
+  dependencies:
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~2.0.0"
+    on-headers "~1.0.2"
+    parseurl "~1.3.3"
+    safe-buffer "5.2.0"
+    uid-safe "~2.1.5"
+
+express@4.17.1, express@^4.17.1:
  version "4.17.1"
  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
  dependencies:
@@ -4584,6 +4713,12 @@ fs-extra@^9.0.1:
    jsonfile "^6.0.1"
    universalify "^1.0.0"

+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  dependencies:
+    minipass "^2.6.0"
+
 fs-minipass@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -4626,6 +4761,19 @@ functional-red-black-tree@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"

+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
 gensync@^1.0.0-beta.1:
  version "1.0.0-beta.2"
  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -4787,6 +4935,10 @@ has-symbols@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"

+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
 has-value@^0.3.1:
  version "0.3.1"
  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -5018,7 +5170,7 @@ human-signals@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"

-iconv-lite@0.4.24:
+iconv-lite@0.4.24, iconv-lite@^0.4.4:
  version "0.4.24"
  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
  dependencies:
@@ -5044,6 +5196,12 @@ iferr@^0.1.5:
  version "0.1.5"
  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"

+ignore-walk@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^4.0.6:
  version "4.0.6"
  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5139,6 +5297,10 @@ ini@^1.3.5:
  version "1.3.5"
  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"

+ini@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+
 internal-ip@^4.3.0:
  version "4.3.0"
  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -5295,6 +5457,12 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"

+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
 is-fullwidth-code-point@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -6050,6 +6218,10 @@ jsprim@^1.2.2:
    array-includes "^3.1.1"
    object.assign "^4.1.1"

+kareem@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.2.tgz#78c4508894985b8d38a0dc15e1a8e11078f2ca93"
+
 keyboard-key@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/keyboard-key/-/keyboard-key-1.1.0.tgz#6f2e8e37fa11475bb1f1d65d5174f1b35653f5b7"
@@ -6316,6 +6488,10 @@ memory-fs@^0.5.0:
    errno "^0.1.3"
    readable-stream "^2.0.1"

+memory-pager@^1.0.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
+
 merge-descriptors@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -6450,12 +6626,25 @@ minipass-pipeline@^1.2.2:
  dependencies:
    minipass "^3.0.0"

+minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
 minipass@^3.0.0, minipass@^3.1.1:
  version "3.1.3"
  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
  dependencies:
    yallist "^4.0.0"

+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  dependencies:
+    minipass "^2.9.0"
+
 minizlib@^2.1.1:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -6485,7 +6674,7 @@ mixin-deep@^1.2.0:
    for-in "^1.0.2"
    is-extendable "^1.0.1"

-mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
  version "0.5.5"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
  dependencies:
@@ -6495,6 +6684,39 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"

+mongodb@3.6.3, mongodb@^3.1.0:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.3.tgz#eddaed0cc3598474d7a15f0f2a5b04848489fd05"
+  dependencies:
+    bl "^2.2.1"
+    bson "^1.1.4"
+    denque "^1.4.1"
+    require_optional "^1.0.1"
+    safe-buffer "^5.1.2"
+  optionalDependencies:
+    saslprep "^1.0.0"
+
+mongoose-legacy-pluralize@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
+
+mongoose@5.11.11:
+  version "5.11.11"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.11.11.tgz#f0f1b3691385aa8cf0e4acdec20f1851bb6f9660"
+  dependencies:
+    "@types/mongodb" "^3.5.27"
+    bson "^1.1.4"
+    kareem "2.3.2"
+    mongodb "3.6.3"
+    mongoose-legacy-pluralize "1.0.2"
+    mpath "0.8.3"
+    mquery "3.2.3"
+    ms "2.1.2"
+    regexp-clone "1.0.0"
+    safe-buffer "5.2.1"
+    sift "7.0.1"
+    sliced "1.0.1"
+
 move-concurrently@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -6506,6 +6728,20 @@ move-concurrently@^1.0.1:
    rimraf "^2.5.4"
    run-queue "^1.0.3"

+mpath@0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.8.3.tgz#828ac0d187f7f42674839d74921970979abbdd8f"
+
+mquery@3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/mquery/-/mquery-3.2.3.tgz#bcf54fdfe3baf57b6a22f9b62b1ad5fa18ffe96a"
+  dependencies:
+    bluebird "3.5.1"
+    debug "3.1.0"
+    regexp-clone "^1.0.0"
+    safe-buffer "5.1.2"
+    sliced "1.0.1"
+
 ms@2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6518,6 +6754,19 @@ ms@2.1.2, ms@^2.1.1:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"

+multer@1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.2.tgz#2f1f4d12dbaeeba74cb37e623f234bf4d3d2057a"
+  dependencies:
+    append-field "^1.0.0"
+    busboy "^0.2.11"
+    concat-stream "^1.5.2"
+    mkdirp "^0.5.1"
+    object-assign "^4.1.1"
+    on-finished "^2.3.0"
+    type-is "^1.6.4"
+    xtend "^4.0.0"
+
 multicast-dns-service-types@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -6563,6 +6812,14 @@ natural-compare@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"

+needle@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe"
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.2:
  version "0.6.2"
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -6586,6 +6843,10 @@ no-case@^3.0.3:
    lower-case "^2.0.1"
    tslib "^1.10.0"

+node-addon-api@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
+
 node-forge@^0.10.0:
  version "0.10.0"
  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
@@ -6637,10 +6898,32 @@ node-notifier@^8.0.0:
    uuid "^8.3.0"
    which "^2.0.2"

+node-pre-gyp@0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz#c2fc383276b74c7ffa842925241553e8b40f1087"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.3"
+    needle "^2.5.0"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
+
 node-releases@^1.1.61, node-releases@^1.1.66:
  version "1.1.67"
  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"

+nopt@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
  version "2.5.0"
  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6677,6 +6960,24 @@ normalize-url@^3.0.0:
  version "3.3.0"
  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"

+npm-bundled@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+
+npm-packlist@^1.1.6:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
 npm-run-path@^2.0.0:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6689,6 +6990,15 @@ npm-run-path@^4.0.0:
  dependencies:
    path-key "^3.0.0"

+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
 nth-check@^1.0.2, nth-check@~1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6699,6 +7009,10 @@ num2fraction@^1.2.2:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"

+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
 nwsapi@^2.2.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -6792,7 +7106,7 @@ obuf@^1.0.0, obuf@^1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"

-on-finished@~2.3.0:
+on-finished@^2.3.0, on-finished@~2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
  dependencies:
@@ -6866,6 +7180,21 @@ os-browserify@^0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"

+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-tmpdir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 p-each-series@^2.1.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
@@ -7010,6 +7339,23 @@ pascalcase@^0.1.1:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"

+passport-local@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/passport-local/-/passport-local-1.0.0.tgz#1fe63268c92e75606626437e3b906662c15ba6ee"
+  dependencies:
+    passport-strategy "1.x.x"
+
+passport-strategy@1.x.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
+
+passport@0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270"
+  dependencies:
+    passport-strategy "1.x.x"
+    pause "0.0.1"
+
 path-browserify@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
@@ -7066,6 +7412,10 @@ path-type@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"

+pause@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
+
 pbkdf2@^3.0.3:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
@@ -7930,6 +8280,10 @@ raf@^3.4.1:
  dependencies:
    performance-now "^2.1.0"

+random-bytes@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
+
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -7956,6 +8310,15 @@ raw-body@2.4.0:
    iconv-lite "0.4.24"
    unpipe "1.0.0"

+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 react-app-polyfill@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-2.0.0.tgz#a0bea50f078b8a082970a9d853dc34b6dcc6a3cf"
@@ -8172,7 +8535,7 @@ read-pkg@^5.2.0:
    parse-json "^5.0.0"
    type-fest "^0.6.0"

-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
  version "2.3.7"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
  dependencies:
@@ -8184,6 +8547,15 @@ read-pkg@^5.2.0:
    string_decoder "~1.1.1"
    util-deprecate "~1.0.1"

+readable-stream@1.1.x:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0:
  version "3.6.0"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -8265,6 +8637,10 @@ regex-parser@^2.2.11:
  version "2.2.11"
  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"

+regexp-clone@1.0.0, regexp-clone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-1.0.0.tgz#222db967623277056260b992626354a04ce9bf63"
+
 regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
@@ -8370,6 +8746,13 @@ require-main-filename@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"

+require_optional@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.1.tgz#4cf35a4247f64ca3df8c2ef208cc494b1ca8fc2e"
+  dependencies:
+    resolve-from "^2.0.0"
+    semver "^5.1.0"
+
 requires-port@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -8390,6 +8773,10 @@ resolve-cwd@^3.0.0:
  dependencies:
    resolve-from "^5.0.0"

+resolve-from@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+
 resolve-from@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -8476,7 +8863,7 @@ rimraf@2.6.3:
  dependencies:
    glob "^7.1.3"

-rimraf@^2.5.4, rimraf@^2.6.3:
+rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
  version "2.7.1"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
  dependencies:
@@ -8544,7 +8931,11 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"

-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"

@@ -8576,6 +8967,12 @@ sanitize.css@^10.0.0:
  version "10.0.0"
  resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-10.0.0.tgz#b5cb2547e96d8629a60947544665243b1dc3657a"

+saslprep@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226"
+  dependencies:
+    sparse-bitfield "^3.0.3"
+
 sass-loader@8.0.2:
  version "8.0.2"
  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
@@ -8586,7 +8983,7 @@ sass-loader@8.0.2:
    schema-utils "^2.6.1"
    semver "^6.3.0"

-sax@~1.2.4:
+sax@^1.2.4, sax@~1.2.4:
  version "1.2.4"
  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"

@@ -8661,7 +9058,7 @@ semantic-ui-react@2.0.1:
    react-popper "^2.2.3"
    shallowequal "^1.1.0"

-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
  version "5.7.1"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"

@@ -8728,7 +9125,7 @@ serve-static@1.14.1:
    parseurl "~1.3.3"
    send "0.17.1"

-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"

@@ -8805,6 +9202,10 @@ side-channel@^1.0.2, side-channel@^1.0.3:
    es-abstract "^1.18.0-next.0"
    object-inspect "^1.8.0"

+sift@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/sift/-/sift-7.0.1.tgz#47d62c50b159d316f1372f8b53f9c10cd21a4b08"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -8831,6 +9232,10 @@ slice-ansi@^2.1.0:
    astral-regex "^1.0.0"
    is-fullwidth-code-point "^2.0.0"

+sliced@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41"
+
 snapdragon-node@^2.0.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -8924,6 +9329,12 @@ sourcemap-codec@^1.4.4:
  version "1.4.8"
  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"

+sparse-bitfield@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11"
+  dependencies:
+    memory-pager "^1.0.2"
+
 spdx-correct@^3.0.0:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -9060,6 +9471,10 @@ stream-shift@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"

+streamsearch@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
+
 strict-uri-encode@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -9075,6 +9490,21 @@ string-natural-compare@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"

+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@^3.0.0, string-width@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -9123,6 +9553,10 @@ string_decoder@^1.0.0, string_decoder@^1.1.1:
  dependencies:
    safe-buffer "~5.2.0"

+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
 string_decoder@~1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -9149,6 +9583,12 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
  dependencies:
    ansi-regex "^2.0.0"

+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -9188,6 +9628,10 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"

+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
 style-loader@1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
@@ -9271,6 +9715,18 @@ tapable@^1.0.0, tapable@^1.1.3:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"

+tar@^4.4.2:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
 tar@^6.0.2:
  version "6.0.5"
  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
@@ -9528,7 +9984,7 @@ type-fest@^0.8.1:
  version "0.8.1"
  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"

-type-is@~1.6.17, type-is@~1.6.18:
+type-is@^1.6.4, type-is@~1.6.17, type-is@~1.6.18:
  version "1.6.18"
  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
  dependencies:
@@ -9553,6 +10009,12 @@ typedarray@^0.0.6:
  version "0.0.6"
  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

+uid-safe@~2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
+  dependencies:
+    random-bytes "~1.0.0"
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -9982,6 +10444,12 @@ which@^2.0.1, which@^2.0.2:
  dependencies:
    isexe "^2.0.0"

+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  dependencies:
+    string-width "^1.0.2 || 2"
+
 word-wrap@^1.2.3, word-wrap@~1.2.3:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -10196,7 +10664,7 @@ y18n@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"

-yallist@^3.0.2:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"