Merge branch 'ruli/merge' into dev

Author: Schmang13

src/components/App.js

@@ -7,6 +7,7 @@ import SysAdminView from './views/SysAdmin';
 
 const App = (props) => {
   const role = useSelector((state) => state.session.role);
+  console.log(role)
   if (role === 'system admin'){
     return (
       <div>
@@ -22,6 +23,7 @@ const App = (props) => {
     );
   }
   else {
+    console.log('else triggered, and now so am I')
     return (
       <div>
         <UserView />

src/components/helper/commands.js

@@ -4,7 +4,7 @@ import parseContainerFormat from './parseContainerFormat';
 import { filterOneProperty, listOfVolumeProperties } from './volumeHistoryHelper';
 import store from '../../renderer/store';
 import { makeArrayOfObjects } from './processLogHelper';
-
+//
 
 /**
  * Grabs all active containers on app-start up

src/components/helper/initDatabase.js

@@ -10,7 +10,7 @@ export default () => {
       ? path.resolve(__dirname, '..', '..', 'database')
       : path.join(path.dirname(__dirname), 'database');
 
-  exec(`cd ${directory} ; docker-compose up --no-recreate -d`, (error, stdout, stderr) => {
+  exec(`cd src/database ; docker compose up --no-recreate --wait`, (error, stdout, stderr) => {
     if (error) {
       alert(`${error.message} `);
       return;

src/components/helper/psqlQuery.js

@@ -5,7 +5,7 @@ const pool = new Pool({
   user: 'postgres',
   password: 'postgres',
   database: 'docketeer-db',
-  port: 5432,
+  port: 5433,
 });
 
 export default async (text, params, callback) => {

src/components/tabs/Containers.js

@@ -9,6 +9,8 @@ import ToggleDisplay from '../display/ToggleDisplay';
  * @param {*} props
  */
 const Containers = (props) => {
+  const image = props;
+  console.log(image);
   const renderStoppedList = props.stoppedList.map((container, i) => {
     return (
       <div className="box" key={`stoppedBox-${i}`}>
@@ -50,7 +52,7 @@ const Containers = (props) => {
     );
   });
 
-  const renderRunningList = props.runningList.map((container, i) => {
+  const renderRunningList = props.runningList.map((container, i, props) => {
     const cpuData = parseFloat(
       container.CPUPerc.substring(0, container.CPUPerc.length - 1)
     ).toFixed(2);
@@ -86,6 +88,7 @@ const Containers = (props) => {
       <div className="box box-running" key={`runningBox-${i}`}>
         <div className="box-label">
           <h3>{container.Name}</h3>
+          
           <p>ID: {container.ID}</p>
         </div>
         <div className="box-info">

src/components/tabs/ContainersUser.js

@@ -70,6 +70,7 @@ const Containers = (props) => {
       <div className="box box-running" key={`runningBox-${i}`}>
         <div className="box-label">
           <h3>{container.Name}</h3>
+          <p>Img: {container.Image}</p>
           <p>ID: {container.ID}</p>
         </div>
         <div className="box-info">

src/components/tabs/Metrics.js

@@ -97,6 +97,9 @@ const Metrics = (props) => {
     <div className='renderContainers'>
       <div className='header'>
         <h1 className='tabTitle'>Metrics</h1>
+        <h2> 
+          <a target="_blank" rel="noreferrer" href= "https://docs.docker.com/engine/reference/commandline/stats/#examples">Click here</a> for more information on these metrics
+        </h2>
       </div>
       <div className='metric-section-title'>
         <h3>Aggregate</h3>
@@ -107,11 +110,11 @@ const Metrics = (props) => {
           <div className='legend-container'>
             <div className='legend-section'>
               <div className='avaliable-box'></div>
-              <p className='legend-text'>Available {cpuData}%</p>
+              <p className='legend-text'>Available {Math.round(cpuData)}%</p>
             </div>
             <div className='legend-section'>
               <div className='usage-box'></div>
-              <p className='legend-text'>Usage {result[0].toFixed(2)}%</p>
+              <p className='legend-text'>Usage {Math.round(result[0].toFixed(2))}%</p>
             </div>
           </div>
         </div>
@@ -121,11 +124,11 @@ const Metrics = (props) => {
           <div className='legend-container'>
             <div className='legend-section'>
               <div className='avaliable-box'></div>
-              <p className='legend-text'>Available {memoryData}%</p>
+              <p className='legend-text'>Available {Math.round(memoryData)}%</p>
             </div>
             <div className='legend-section'>
               <div className='usage-box'></div>
-              <p className='legend-text'>Usage {result[1].toFixed(2)}%</p>
+              <p className='legend-text'>Usage {Math.round(result[1].toFixed(2))}%</p>
             </div>
           </div>
         </div>
@@ -134,13 +137,13 @@ const Metrics = (props) => {
           <div className='chart-container'>
             <h1 className='chart-title'>NET IO:</h1>
             <p className='chart-number'>
-              {result[2][0]}kB / {result[2][1]}kB
+              {Math.floor(result[2][0])}kB / {Math.floor(result[2][1])}kB
             </p>
           </div>
           <div className='chart-container'>
             <h1 className='chart-title'>BLOCK IO:</h1>
             <p className='chart-number'>
-              {result[3][0]}B / {result[3][1]}B
+              {Math.floor(result[3][0])}B / {Math.floor(result[3][1])}B
             </p>
           </div>
         </div>

src/components/views/Admin.js

@@ -91,7 +91,7 @@ const AdminView = (props) => {
   };
 
   useEffect(() => {
-    initDatabase();
+    //initDatabase();
     helper.refreshRunning(refreshRunningContainers);
     helper.refreshStopped(refreshStoppedContainers);
     helper.refreshImages(refreshImagesList);

src/components/views/SysAdmin.js

@@ -110,7 +110,7 @@ const SysAdmin = (props) => {
   };
 
   useEffect(() => {
-    initDatabase();
+    //initDatabase();
     helper.refreshRunning(refreshRunningContainers);
     helper.refreshStopped(refreshStoppedContainers);
     helper.refreshImages(refreshImagesList);

src/database/docker-compose.yml

@@ -4,14 +4,14 @@ services:
     image: postgres:latest
     container_name: docketeer-db
     ports:
-      - "5432:5432"
+      - "5433:5432"
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: docketeer-db
     volumes:
       - ./schema.sql:/docker-entrypoint-initdb.d/schema.sql
-      - ./docketeerdb:/var/lib/postgresql/data
+      - ./docketeerdb:/var/lib/postgresql/data/
     restart: always
     mem_limit: 400m
     cpus: 0.5