Revert "Added esltint configuration (#125)" (#128)

Author: errc-lee

.eslintrc.js

@@ -3,61 +3,47 @@ module.exports = {
     browser: true,
     commonjs: true,
     es2021: true,
-    node: true
+    node: true,
   },
-  extends: [
-    'plugin:react/recommended',
-    'standard-with-typescript'
-  ],
-  overrides: [
-  ],
+  extends: ['eslint:recommended', 'plugin:react/recommended'],
   parserOptions: {
-    project: ['tsconfig.json'],
+    ecmaFeatures: {
+      jsx: true,
+    },
     ecmaVersion: 12,
-    sourceType: 'module'
-  },
-  plugins: [
-    'react'
-  ],
-  settings: {
-    react: {
-      version: 'detect'
-    }
+    sourceType: 'module',
   },
+  plugins: ['react'],
   rules: {
-    indent: ['error', 2, { SwitchCase: 1 }],
+    indent: ['warn', 2],
     'no-unused-vars': ['off', { vars: 'local' }],
     'prefer-const': 'warn',
     quotes: ['warn', 'single'],
-    semi: 'off',
+    semi: ['warn', 'always'],
     'space-infix-ops': 'warn',
     'no-console': 'off',
     'no-restricted-syntax': [
       'error',
       {
         selector:
-          'CallExpression[callee.object.name=\'console\'][callee.property.name!=/^(log|warn|error|info|trace)$/]',
-        message: 'Unexpected property on console object was called'
-      }
+          "CallExpression[callee.object.name='console'][callee.property.name!=/^(log|warn|error|info|trace)$/]",
+        message: 'Unexpected property on console object was called',
+      },
     ],
     'spaced-comment': [
       'error',
       'always',
       {
         line: {
           markers: ['/'],
-          exceptions: ['-', '+']
+          exceptions: ['-', '+'],
         },
         block: {
           markers: ['!'],
           exceptions: ['*'],
-          balanced: true
-        }
-      }
+          balanced: true,
+        },
+      },
     ],
-
-    // ---- TYPESCRIPT ---- //
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/semi': ['warn', 'always']
-  }
+  },
 };

.gitignore

@@ -1,16 +1,35 @@
 node_modules/
+security/
+thumbs.db
+.idea/
 package-lock.json
-yarn.lock
-
-.history
-.gitignore
-.DS_Store
-
+.webpack.config.js.icloud
+src/.index.js.icloud
+src/.store.js.icloud
+src/components/display/.RunningContainers.js.icloud
+src/components/display/.StoppedContainers.js.icloud
 src/database/docketeerdb
 server/database/docketeerdb
+.env
+.idea/
+thumbs.db
 dist/
+node_modules/
 security/
+thumbs.db
+.idea/
+package-lock.json
+.webpack.config.js.icloud
+src/.index.js.icloud
+src/.store.js.icloud
+src/components/display/.RunningContainers.js.icloud
+src/components/display/.StoppedContainers.js.icloud
+src/database/docketeerdb
 .env
-
+yarn.lock
 coverage
 
+.history
+src/.DS_Store
+.gitignore
+src/.DS_Store

.vscode/settings.json

@@ -1,10 +1,3 @@
 {
-  "workbench.localHistory.enabled": true,
-  "editor.tabSize": 2,
-  "editor.formatOnSave": true,
-  "editor.formatOnPaste": true,
-  "editor.formatOnType": true,
-   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-  }
+  "workbench.localHistory.enabled": true
 }

README.md

@@ -23,6 +23,8 @@ awesome when someone starts to use it.
 
 #
 
+<!-- ![logo](https://user-images.githubusercontent.com/67434664/94055454-f7177a00-fdaa-11ea-95dd-1d4980400812.png) -->
+
 ![logo](assets/docketeer-title2.png)
 
 ## About
@@ -98,6 +100,30 @@ npm run dev
 
 For now, the sign up function will create a System Admin user.
 
+
+## Returning Users: Version Update
+1. Navigate to the project directory and **add upstream** this [repository](https://github.com/open-source-labs/Docketeer.git) to your cloned fork.
+```
+git remote add upstream https://github.com/open-source-labs/Docketeer.git
+```
+
+2. Pull down the updates.
+```
+git pull origin upstream
+```
+
+3. Install new dependencies.
+```
+npm install
+```
+
+4. You are all set! Now just enter the following command to start up Docketeer!
+```
+npm run dev
+```
+
+
+
 ## Twilio setup
 1. Follow documents found [here](https://www.twilio.com/docs/node/install) to download the helper library.
 2. In order to manage Twilio SMS notifications follow the [step plan](https://www.twilio.com/docs/notify/quickstart/sms#messagingservice).
@@ -165,7 +191,24 @@ npm run test
 Read our [contributing guide](https://github.com/open-source-labs/Docketeer/blob/master/CONTRIBUTING.md) for more information on how to purpose bugfixes and improvements to Docketeer.
 
 ### Authors
-<!-- Most recent contributors please add your name to the BOTTOM of the list -->
+- Nathan Cho [@nathanycho](https://github.com/nathanycho) | [LinkedIn](https://www.linkedin.com/in/nathanycho/)
+- Garima Bhatia [@GarimaB06](https://github.com/GarimaB06) | [LinkedIn](https://www.linkedin.com/in/garimab06/)
+- Eshaan Joshi [@eshaan32](https://github.com/eshaan32) | [LinkedIn](https://www.linkedin.com/in/eshaanjoshi/)
+- Jonathan Wong [@WongJonathann](https://github.com/WongJonathann) | [LinkedIn](https://www.linkedin.com/in/jon-wong-00/)
+- Sarah Moosa [@Sbethm](https://github.com/Sbethm) | [LinkedIn](https://www.linkedin.com/in/sarah-moosa-4b05721b6/)
+- Cedar Cooper [@CedarCooper](https://github.com/CedarCooper) | [LinkedIn](https://www.linkedin.com/in/cedar-cooper/)
+- Tiffany Chau [@tiffanynchau](https://github.com/tiffanynchau/) | [LinkedIn](https://www.linkedin.com/in/tiffanynchau/)
+- Jack Yuan [@jackyuan1](https://github.com/jackyuan1) | [LinkedIn](https://www.linkedin.com/in/jack-yuan-298244247/)
+- Drew Manley [@DrewManley](https://github.com/DrewManley) | [LinkedIn](https://www.linkedin.com/in/andrewmanley13/)
+- Abigail Gerig [@4estgirl](https://github.com/4estgirl) | [Linkedin](https://www.linkedin.com/in/abigail-gerig/)
+- Trine Medina [@TrineMedina](https://github.com/TrineMedina) | [Linkedin](https://www.linkedin.com/in/trinemedina/)
+- Christian Looff [@cmlooff](https://github.com/cmlooff) | [LinkedIn](https://www.linkedin.com/in/christian-looff/)
+- Reuel Warner-Rosen [@Ruliwr](https://github.com/Ruliwr) | [Linkedin](https://www.linkedin.com/in/Ruliwr/)
+- Matt Dias [@Schmang13](https://github.com/Schmang13) | [Linkedin](https://www.linkedin.com/in/matthew-j-dias/)
+- Christina Son [@cson17](https://github.com/cson17) | [Linkedin](https://www.linkedin.com/in/christinason17/)
+- Fernando Luna [@lunaf-github](https://github.com/lunaf-github) | [Linkedin](https://www.linkedin.com/in/fernando-luna)
+- Austin Andrews [@austinandrews](https://github.com/austinandrews) | [Linkedin](https://www.linkedin.com/in/austinandrews17/)
+- Eric Lay [@ericlay14](https://github.com/ericlay14) | [Linkedin](https://www.linkedin.com/in/ericlay14/)
 - Dan Lin [@DanLin91](https://github.com/DanLin91) | [Linkedin](https://www.linkedin.com/in/danlin91/)
 - Kadir Gundogdu [@kadirgund](https://github.com/kadirgund) | [Linkedin](https://www.linkedin.com/in/kadirgund/)
 - Minchan Jun [@MinchanJun](https://github.com/MinchanJun) | [Linkedin](https://www.linkedin.com/in/minchan-jun/)
@@ -189,24 +232,6 @@ Read our [contributing guide](https://github.com/open-source-labs/Docketeer/blob
 - Dylan Feldman [@dfeldman24](https://github.com/dfeldman24) | [Linkedin](https://www.linkedin.com/in/dylan-feldman)
 - Tre Hultzen [@THultz](https://github.com/THultz) | [Linkedin](https://www.linkedin.com/in/tre-hultzen/)
 - Kenneth Hui [@kennethhui121](https://github.com/kennethhui121) | [Linkedin](https://www.linkedin.com/in/kenneth-hui/)
-- Eric Lay [@ericlay14](https://github.com/ericlay14) | [Linkedin](https://www.linkedin.com/in/ericlay14/)
-- Austin Andrews [@austinandrews](https://github.com/austinandrews) | [Linkedin](https://www.linkedin.com/in/austinandrews17/)
-- Fernando Luna [@lunaf-github](https://github.com/lunaf-github) | [Linkedin](https://www.linkedin.com/in/fernando-luna)
-- Christina Son [@cson17](https://github.com/cson17) | [Linkedin](https://www.linkedin.com/in/christinason17/)
-- Christian Looff [@cmlooff](https://github.com/cmlooff) | [LinkedIn](https://www.linkedin.com/in/christian-looff/)
-- Reuel Warner-Rosen [@Ruliwr](https://github.com/Ruliwr) | [Linkedin](https://www.linkedin.com/in/Ruliwr/)
-- Trine Medina [@TrineMedina](https://github.com/TrineMedina) | [Linkedin](https://www.linkedin.com/in/trinemedina/)
-- Matt Dias [@Schmang13](https://github.com/Schmang13) | [Linkedin](https://www.linkedin.com/in/matthew-j-dias/)
-- Abigail Gerig [@4estgirl](https://github.com/4estgirl) | [Linkedin](https://www.linkedin.com/in/abigail-gerig/)
-- Jack Yuan [@jackyuan1](https://github.com/jackyuan1) | [LinkedIn](https://www.linkedin.com/in/jack-yuan-298244247/)
-- Sarah Moosa [@Sbethm](https://github.com/Sbethm) | [LinkedIn](https://www.linkedin.com/in/sarah-moosa-4b05721b6/)
-- Cedar Cooper [@CedarCooper](https://github.com/CedarCooper) | [LinkedIn](https://www.linkedin.com/in/cedar-cooper/)
-- Tiffany Chau [@tiffanynchau](https://github.com/tiffanynchau/) | [LinkedIn](https://www.linkedin.com/in/tiffanynchau/)
-- Drew Manley [@DrewManley](https://github.com/DrewManley) | [LinkedIn](https://www.linkedin.com/in/andrewmanley13/)
-- Eshaan Joshi [@eshaan32](https://github.com/eshaan32) | [LinkedIn](https://www.linkedin.com/in/eshaanjoshi/)
-- Garima Bhatia [@GarimaB06](https://github.com/GarimaB06) | [LinkedIn](https://www.linkedin.com/in/garimab06/)
-- Nathan Cho [@nathanycho](https://github.com/nathanycho) | [LinkedIn](https://www.linkedin.com/in/nathanycho/)
-- Jonathan Wong [@WongJonathann](https://github.com/WongJonathann) | [LinkedIn](https://www.linkedin.com/in/jon-wong-00/)
 
 ### License
 Docketeer is [MIT Licensed](https://github.com/open-source-labs/Docketeer/blob/master/LICENSE)

__tests__/ContainersTab.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Containers from '../src/components/tabs/Containers';
-import { describe, beforeEach, expect, test, jest } from '@jest/globals';
+import {describe, beforeEach, expect, test, jest} from '@jest/globals';
 import '@testing-library/jest-dom';
 import ToggleDisplay from '../src/components/display/ToggleDisplay';
 import { fireEvent, render, screen } from '@testing-library/react';
@@ -21,40 +21,43 @@ const props = {
   stoppedList: [
     {
       Names: 'zealous',
-      ID: 'c902ec744095',
-      Image: '84c5f6e03bf0',
-      RunningFor: '2 days ago'
+      ID: 'c902ec744095', 
+      Image: '84c5f6e03bf0', 
+      RunningFor: '2 days ago',
     }
   ],
-  container: { MemUsage: 1 },
+  container: {MemUsage:1},
   stop: jest.fn(),
   remove: jest.fn(),
   runStopped: jest.fn()
 };
 
+
 describe('Containers', () => {
-  beforeEach(() => {
+  
+  beforeEach(()=>{
     render(<Containers {...props} />);
   });
 
   describe('Running List containers', () => {
+
     test('Should have render correct amount of running containers', () => {
-      const runningContainers = screen.getByText('Running Containers', { exact: false });
+      const runningContainers = screen.getByText('Running Containers', {exact:false});
       const text = runningContainers.innerHTML;
       expect(text).toEqual(`Running Containers: ${props.runningList.length}`);
     });
 
-    test('Name of container should properly display', () => {
+    test('Name of container should properly display', ()=>{
       const h3 = screen.getAllByRole('heading', { level: 3 });
       const name = h3[0].innerHTML;
       expect(name).toEqual('blissful_matsumoto');
     });
 
-    test('Stop button is called', async () => {
+    test('Stop button is called', async () => {   
       const stopButton = document.querySelector('.stop-btn');
       await fireEvent.click(stopButton);
     });
-
+    
     test('Toggle Display button works', () => {
       render(<ToggleDisplay {...props}/>);
       const button = screen.getAllByRole('button');
@@ -66,8 +69,9 @@ describe('Containers', () => {
   });
 
   describe('Stopped List Containers', () => {
+
     test('Should have render correct amount of containers', () => {
-      const exitedContainers = screen.getByText('Exited Containers', { exact: false });
+      const exitedContainers = screen.getByText('Exited Containers', {exact:false});
       const text = exitedContainers.innerHTML;
       expect(text).toEqual(`Exited Containers: ${props.stoppedList.length}`);
     });
@@ -87,4 +91,5 @@ describe('Containers', () => {
       expect(removeButton).toBeCalled;
     });
   });
-});
+}); 
+

__tests__/ImageTab.test.js

@@ -5,7 +5,7 @@ import Images from '../src/components/tabs/Images';
 import {
   fireEvent,
   render,
-  screen
+  screen,
 } from '@testing-library/react';
 
 const props = {
@@ -14,15 +14,16 @@ const props = {
       imgid: '2718634043dc',
       size: '111 MB',
       reps: 'Redis',
-      tag: 16.4
-    }
+      tag: 16.4,
+    },
   ],
   runIm: jest.fn(),
   removeIm: jest.fn(),
-  onClick: jest.fn()
+  onClick: jest.fn(),
 };
 
 describe('Images', () => {
+
   beforeEach(() => {
     render(<Images {...props} />);
     screen.debug();
@@ -47,6 +48,7 @@ describe('Images', () => {
     });
   });
 
+
   describe('Remove button on click', () => {
     test('Fires remove button functionality', async () => {
       const removeButton = screen.getByRole('button', { name: 'REMOVE' });
@@ -78,4 +80,4 @@ describe('Images', () => {
       expect(tag).toBeDefined;
     });
   });
-});
+});