Updated from merge.

Author: Schmang13

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run test

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "editor.formatOnPaste": true,
+  "editor.formatOnSave": true,
+  "editor.formatOnType": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  }
+}

__tests__/MetricsTab.test.js

@@ -2,6 +2,7 @@
  * These tests do not work as enzyme is highly depricated and does not communicate with React 18
  */
 
+
 // import React from 'react';
 // import { configure, shallow } from 'enzyme';
 // import Adapter from 'enzyme-adapter-react-16';
@@ -12,12 +13,14 @@
 
 // function shallowSetup() {
 
+
 //   const props = {
 //     runningList: [{ BlockIO: "1B/2B", ID: "6f49565a501c", CPUPerc: "20.00%", MemPerc: "0.00%", MemUsage: "5B/6B", Name: "checkpoint_nginx_1", NetIO: "3B/4B", PIDs: "0" }, { BlockIO: "3B/4B", ID: "6f49565a501c", CPUPerc: "30.00%", MemPerc: "20.00%", MemUsage: "5B/6B", Name: "checkpoint_nginx_2", NetIO: "5B/6B", PIDs: "0" }]
 //   }
 
 //   const enzymeWrapper = shallow(<Metrics {...props} />);
 
+
 //   return {
 //     props,
 //     enzymeWrapper
@@ -84,4 +87,5 @@ describe('dummy test', () => {
   test('dummy test', () => {
     expect(2 + 2).toBe(4);
   });
+
 });

babel.config.json

@@ -0,0 +1,4 @@
+{
+  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "plugins": ["@babel/plugin-transform-runtime"]
+}

server/controllers/userController.js

@@ -114,7 +114,6 @@ userController.checkSysAdmin = (req, res, next) => {
 
 // switches role of user upon designation by system admin
 userController.switchUserRole = (req, res, next) => {
-
   const roleMap = {
     'system admin': 1,
     admin: 2,
@@ -214,4 +213,4 @@ userController.updateEmail = (req, res, next) => {
     });
 };
 
-module.exports = userController;
+module.exports = userController;

src/components/css/index.css renamed to src/assets/css/index.css

@@ -0,0 +1,35 @@
+.chart {
+  margin-top: 10px;
+}
+.chart-info {
+  width: 200px;
+  height: 110px;
+  margin-top: 10px;
+  margin-left: 15px;
+}
+.chart-label {
+  display: flex;
+  justify-content: space-evenly;
+  flex-direction: row;
+}
+.chart-label-container {
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+}
+.chart-label-text {
+  font-size: 11px;
+  font-weight: bold;
+}
+.cpuBox {
+  width: 15px;
+  height: 15px;
+  margin-right: 2px;
+  background-color: rgba(44, 130, 201, 1);
+}
+.memoryBox {
+  width: 15px;
+  height: 15px;
+  margin-right: 2px;
+  background-color: rgba(19, 221, 29, 1);
+}

src/components/css/metric.css renamed to src/assets/css/metric.css

@@ -0,0 +1,50 @@
+.fa-box-open {
+  content: url(../svg/running.svg);
+  width: 22px;
+  color: black;
+}
+
+.fa-archive {
+  content: url(../svg/stopped.svg);
+  width: 22px;
+}
+
+.fa-database {
+  content: url(../svg/images.svg);
+  width: 22px;
+}
+
+.fa-chart-pie {
+  content: url(../svg/metrics.svg);
+  width: 22px;
+}
+
+.fa-file-upload {
+  content: url(../svg/docker-compose.svg);
+  width: 22px;
+}
+
+.fa-settings {
+  content: url(../svg/settings.svg);
+  width: 22px;
+}
+
+.fa-volume-history {
+  content: url(../svg/volumehistory.svg);
+  width: 22px;
+}
+
+.fa-users {
+  content: url(../svg/users.svg);
+  width: 22px;
+}
+
+.fa-file {
+  content: url(../svg/document.svg);
+  width: 70px;
+}
+
+.fa-log {
+  content: url(../svg/docketeer-logs.svg);
+  width: 22px;
+}