Merge pull request #10 from dieunity/default-directory

Default directory & formatting changes

Author: MaxWeisen

package.json

@@ -27,6 +27,7 @@
     "concurrently": "^4.1.2",
     "cross-env": "^5.2.1",
     "dotenv": "^8.2.0",
+    "electron": "11.4.3",
     "electron-is-dev": "^1.1.0",
     "fibers": "^5.0.0",
     "js-beautify": "^1.10.0",
@@ -83,7 +84,6 @@
     "@typescript-eslint/parser": "^2.33.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "electron": "11.4.3",
     "electron-builder": "^22.6.1",
     "electron-devtools-installer": "^3.0.0",
     "electron-rebuild": "^2.3.5",

public/electron.js

@@ -49,10 +49,12 @@ function createWindow() {
     cwd: process.env.HOME,
     env: process.env,
   });
+  // with ptyProcess, we want to send incoming data to the channel terminal.incData
   ptyProcess.on('data', (data) => {
-    // process.stdout.write(data);
     mainWindow.webContents.send('terminal.incData', data);
   });
+  // 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) {
     ptyProcess.write(data);
   })

src/components/EditorView/EditorView.jsx

@@ -56,9 +56,9 @@ const Editor = () => {
     <div>
       <div onClick={() => setWasSaved('')}>
         <MonacoEditor
-          height='80vh'
-          language='javascript'
-          theme='light-dark'
+          height="80vh"
+          language="javascript"
+          theme="light-dark"
           value={
             file
               ? extensionChecker[fileType]

src/components/OpenFolder/OpenFolderButton.jsx

@@ -15,6 +15,7 @@ import {
 } from '../../context/actions/globalActions';
 import { GlobalContext } from '../../context/reducers/globalReducer';
 
+const ipc = require('electron').ipcRenderer;
 const folderOpenIcon = require('../../assets/images/folder-open.png');
 
 const { remote } = window.require('electron');
@@ -36,17 +37,19 @@ const OpenFolder = () => {
       ],
       message: 'Please select your project folder',
     });
-    console.log(directory)
     if (directory && directory.filePaths[0]) {
       let directoryPath = directory.filePaths[0];
-      //replace backslashes for Windows OS
+      // replace backslashes for Windows OS
       directoryPath = directoryPath.replace(/\\/g, '/');
       dispatchToGlobal(setProjectFilePath(directoryPath));
       dispatchToGlobal(createFileTree(generateFileTreeObject(directoryPath)));
       dispatchToGlobal(loadProject('load'));
       dispatchToGlobal(setTestCase(''));
       if (!isTestModalOpen) dispatchToGlobal(toggleModal());
       if (!isFileDirectoryOpen) dispatchToGlobal(toggleFileDirectory());
+
+      // Re-direct terminal directory to user selected directory
+      ipc.send('terminal.toTerm', `cd ${directoryPath}\n`);
     }
   };
 

src/components/Terminal/TerminalGenerator.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react';
 import { XTerm } from 'xterm-for-react';
+
 const { Terminal } = require('xterm');
 const ipc = require('electron').ipcRenderer;
 
@@ -9,23 +10,26 @@ const term = new Terminal({
   rows: 30,
   fontFamily: 'monospace',
   theme: {
-    background: '#002a36'
-  }
+    background: '#002a36',
+  },
 });
 
 const TerminalGenerator = () => {
   useEffect(() => {
+    // console.log(global.projectFilePath);
     term.open(document.getElementsByClassName('terminal')[0]);
-    term.onData(e => {
+    // when we have input events (e), we would send the data to the main processor
+    term.onData((e) => {
       ipc.send('terminal.toTerm', e);
     });
+    // when incoming Data comes back to the main process, this ipc renderer
+    // will take it and writes it to xterm monitor
     ipc.on('terminal.incData', (event, data) => {
       term.write(data);
     });
   }, []);
 
-
-  return <XTerm className='terminal' />
-}
+  return <XTerm className='terminal' />;
+};
 
 export default TerminalGenerator;