Merge pull request #33 from dieunity/accessLens

Bug fixes and some old code removal

Author: MaxWeisen

public/electron.js

@@ -1,15 +1,14 @@
-const { app, BrowserWindow, ipcMain, dialog } = require('electron');
+const {
+  app, BrowserWindow, ipcMain, dialog,
+} = require('electron');
 const path = require('path');
 const isDev = require('electron-is-dev');
 const fs = require('fs');
 const os = require('os');
 const pty = require('node-pty');
 
-//Dynamic variable to change terminal type based on os
-let shell = os.platform() === 'win32' ? 'powershell.exe' : 'bash';
-
-
-
+// Dynamic variable to change terminal type based on os
+const shell = os.platform() === 'win32' ? 'powershell.exe' : 'bash';
 let mainWindow;
 
 if (isDev) console.log('electron version', process.versions.electron);
@@ -41,44 +40,42 @@ function createWindow() {
     },
   });
   mainWindow.loadURL(
-    isDev ? 'http://localhost:3000' : `file://${path.join(__dirname, '../build/index.html')}`
+    isDev ? 'http://localhost:3000' : `file://${path.join(__dirname, '../build/index.html')}`,
   );
   mainWindow.on('closed', () => (mainWindow = null));
 
   // PTY PROCESS FOR IN APP TERMINAL
-  let ptyArgs = {
+  const ptyArgs = {
     name: 'xterm-color',
     cols: 80,
     rows: 80,
     cwd: process.env.HOME,
     env: process.env,
-  }
-
+  };
 
   const ptyProcess = pty.spawn(shell, [], ptyArgs);
   // with ptyProcess, we want to send incoming data to the channel terminal.incData
   ptyProcess.on('data', (data) => {
     mainWindow.webContents.send('terminal.incData', data);
   });
-  // in the main process, at terminal.toTerm channel, when data is received, 
+  // in the main process, at terminal.toTerm channel, when data is received,
   // main process will write to ptyProcess
-  ipcMain.on('terminal.toTerm', function(event, data) {
+  ipcMain.on('terminal.toTerm', (event, data) => {
     ptyProcess.write(data);
-  })
-};
-
+  });
+}
 
 // EDITORVIEW.JSX SAVE FILE FUNCTIONALITY
 ipcMain.on('EditorView.saveFile', (e, filePath, editedText) => {
   fs.writeFile(filePath, editedText, (err) => {
     if (err) throw err;
   });
   // Return a success message upon save
-  e.returnValue = 'Changes Saved'
+  e.returnValue = 'Changes Saved';
 });
 
 /*
-  EXPORTFILEMODAL.JSX FILE FUNCTIONALITY 
+  EXPORTFILEMODAL.JSX FILE FUNCTIONALITY
   (check existence and create folder)
 */
 ipcMain.on('ExportFileModal.exists', (e, fileOrFolderPath) => {
@@ -106,11 +103,11 @@ ipcMain.on('ExportFileModal.readFile', (e, filePath) => {
 });
 
 // OPENFOLDERBUTTON.JSX FILE FUNCTIONALITY
-ipcMain.on('OpenFolderButton.isDirectory' , (e, filePath) => { 
+ipcMain.on('OpenFolderButton.isDirectory', (e, filePath) => {
   e.returnValue = fs.statSync(filePath).isDirectory();
 });
 
-ipcMain.on('OpenFolderButton.dialog' , (e) => { 
+ipcMain.on('OpenFolderButton.dialog', (e) => {
   const dialogOptions = {
     properties: ['openDirectory', 'createDirectory'],
     filters: [
@@ -127,7 +124,7 @@ ipcMain.on('OpenFolderButton.dialog' , (e) => {
 UNIVERSAL IPC CALLS
 (The following IPC calls are made from various components in the codebase)
 */
-ipcMain.on('Universal.stat' , (e, filePath) => { 
+ipcMain.on('Universal.stat' , (e, filePath) => {
   e.returnValue = fs.statSync(filePath).isDirectory();
 });
 
@@ -164,4 +161,4 @@ app.on('activate', () => {
   if (mainWindow === null) {
     createWindow();
   }
-});
+});

src/components/NavBar/NavBar.jsx

@@ -21,12 +21,14 @@ import ExportFileModal from '../Modals/ExportFileModal';
 const menuIcon = require('../../assets/images/menu.png');
 const exportIcon = require('../../assets/images/file-export.png');
 // const browserIcon = require('../../assets/images/google-chrome.png');
-const codeIcon = require('../../assets/images/visual-studio-code.png');
-const homeIcon = require('../../assets/images/home.png');
+// const codeIcon = require('../../assets/images/visual-studio-code.png');
+// const homeIcon = require('../../assets/images/home.png');
 
 const NavBar = ({ inAboutPage }) => {
   const [
-    { fileTree, isFileDirectoryOpen, projectUrl, rightPanelDisplay },
+    {
+      fileTree, isFileDirectoryOpen, projectUrl, rightPanelDisplay,
+    },
     dispatchToGlobal,
   ] = useContext(GlobalContext);
   const [isExportModalOpen, setIsExportModalOpen] = useState(false);
@@ -37,21 +39,21 @@ const NavBar = ({ inAboutPage }) => {
   };
 
   /* switches between code and browser view */
-  const handleEditorToggle = () => {
-    if (!inAboutPage) dispatchToGlobal(toggleRightPanel('codeEditorView'));
-  };
+  // const handleEditorToggle = () => {
+  //   if (!inAboutPage) dispatchToGlobal(toggleRightPanel('codeEditorView'));
+  // };
 
   /* switches between code and browser view */
-  const handleBrowserToggle = () => {
-    if (inAboutPage) return;
-    if (rightPanelDisplay === 'browserView' && projectUrl) {
-      dispatchToGlobal(resetToProjectUrl());
-    }
-    if (!projectUrl) {
-      dispatchToGlobal(setProjectUrl('https://google.com'));
-    }
-    dispatchToGlobal(toggleRightPanel('browserView'));
-  };
+  // const handleBrowserToggle = () => {
+  //   if (inAboutPage) return;
+  //   if (rightPanelDisplay === 'browserView' && projectUrl) {
+  //     dispatchToGlobal(resetToProjectUrl());
+  //   }
+  //   if (!projectUrl) {
+  //     dispatchToGlobal(setProjectUrl('https://google.com'));
+  //   }
+  //   dispatchToGlobal(toggleRightPanel('browserView'));
+  // };
 
   /* exports the file (when true) */
   const openExportModal = () => {

src/components/Terminal/TerminalView.tsx

@@ -5,7 +5,6 @@ import { TerminalType } from '../../utils/terminalTypes';
 const { Terminal } = require('xterm');
 const ipc = require('electron').ipcRenderer;
 
-
 const terminalArgs: TerminalType = {
   fontSize: 15,
   // Currently rows are hardcoded, next step is to make terminal sizing dynamic.

src/components/TestMenu/testMenuHooks.js

@@ -1,9 +1,11 @@
 import { useState, useContext } from 'react';
 import { GlobalContext } from '../../context/reducers/globalReducer';
 import { setTabIndex } from '../../context/actions/globalActions';
+
 export function useToggleModal(test) {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [title, setTitle] = useState(test);
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [{ isFileDirectoryOpen }, dispatchToGlobal] = useContext(GlobalContext);
 
   const openModal = () => {
@@ -22,7 +24,9 @@ export function useToggleModal(test) {
     setTitle(test);
   };
 
-  return { title, isModalOpen, openModal, openScriptModal, closeModal };
+  return {
+    title, isModalOpen, openModal, openScriptModal, closeModal
+  };
 }
 
 export const validateInputs = (testSuite, testCaseState) => {

src/context/reducers/accTestCaseReducer.ts

@@ -1,5 +1,5 @@
-import { createContext } from 'react'; 
-import { AccTestCaseState, Action} from '../../utils/accTypes';
+import { createContext } from 'react';
+import { AccTestCaseState, Action } from '../../utils/accTypes';
 import { actionTypes } from '../actions/accTestCaseActions';
 
 export const AccTestCaseContext:any = createContext([]);

src/utils/ptyTypes.ts

@@ -1,7 +1,7 @@
 export interface PtyArgs {
-  name: string,
-  cols: number,
-  rows: number,
-  cwd: string,
-  env: Object,
-}
+  name: string;
+  cols: number;
+  rows: number;
+  cwd: string;
+  env: Object;
+}

tsconfig.json

@@ -22,8 +22,9 @@
   },
   "include": [
     "src/**/*",
+    "public/electron.js",
     "src/context/__tests__",
-    "__tests__/hello.test.js",   
-    "tests/spec.integra.js"  
+    "__tests__/hello.test.js",
+    "tests/spec.integra.js"
   ]
 }