Merge branch 'ahsan-ben-branch' of https://github.com/oslabs-beta/ReacType into ahsan-ben-branch

Author: carlyjackson

app/electron/main.js

@@ -66,7 +66,7 @@ async function createWindow() {
       // enable devtools when in development mode
       devTools: true,
       // crucial security feature - blocks rendering process from having access to node modules
-      nodeIntegration: false,
+      nodeIntegration: true,
       // web workers will not have access to node
       nodeIntegrationInWorker: false,
       // disallow experimental feature to allow node.js support in sub-frames (i-frames/child windows)
@@ -76,10 +76,10 @@ async function createWindow() {
       // Electron API only available from preload, not loaded page
       contextIsolation: true,
       // disables remote module. critical for ensuring that rendering process doesn't have access to node functionality
-      enableRemoteModule: false,
+      enableRemoteModule: true,
       // path of preload script. preload is how the renderer page will have access to electron functionality
       preload: path.join(__dirname, 'preload.js'),
-      nativeWindowOpen: true
+      nativeWindowOpen: true,
     }
   });
 
@@ -391,11 +391,11 @@ ipcMain.on('github', event => {
     height: 600,
     title: 'Github Oauth',
     webPreferences: {
-      nodeIntegration: false,
+      nodeIntegration: true,
       nodeIntegrationInWorker: false,
       nodeIntegrationInSubFrames: false,
       contextIsolation: true,
-      enableRemoteModule: false,
+      enableRemoteModule: true,
       zoomFactor: 1.0
     }
   });
@@ -470,11 +470,11 @@ ipcMain.on('tutorial', event => {
     minWidth: 661,
     title: 'Tutorial',
     webPreferences: {
-      nodeIntegration: false,
+      nodeIntegration: true,
       nodeIntegrationInWorker: false,
       nodeIntegrationInSubFrames: false,
       contextIsolation: true,
-      enableRemoteModule: false,
+      enableRemoteModule: true,
       zoomFactor: 1.0
     }
   });

app/electron/menu.js

@@ -39,11 +39,11 @@ var MenuBuilder = function(mainWindow, appName) {
       minWidth: 665,
       title: 'Tutorial',
       webPreferences: {
-        nodeIntegration: false,
+        nodeIntegration: true,
         nodeIntegrationInWorker: false,
         nodeIntegrationInSubFrames: false,
         contextIsolation: true,
-        enableRemoteModule: false,
+        enableRemoteModule: true,
         zoomFactor: 1.0,
         devTools: false
       }

app/src/components/StateManagement/CreateTab/components/TableParentProps.tsx

@@ -57,7 +57,7 @@ const TableParentProps = props => {
           <Button
             style={{ width: `${3}px`, color: 'black'}}
             onClick={() => {
-              addParentProps(params.row, params.id - 1);
+              addPassedInProps(params.row, params.id - 1);
             }}
           >
             <AddIcon style={{ width: `${15}px` }} />
@@ -67,7 +67,7 @@ const TableParentProps = props => {
       }
     }
   ];
-  const addParentProps = (parentComponentProps, rowId) => {
+  const addPassedInProps = (parentComponentProps, rowId) => {
     // get the current focused component
     // remove the state that the button is clicked
     // send a dispatch to rerender the table

app/src/components/StateManagement/CreateTab/components/TableStateProps.tsx

@@ -54,7 +54,7 @@ const TableStateProps = props => {
           <Button
             style={{ width: `${3}px`, color: 'black'}}
             onClick={() => {
-              deleteState(params.id, params.row.key);
+              deleteState(params.id, params.key);
             }}
           >
             <ClearIcon style={{ width: `${15}px` }} />
@@ -73,7 +73,7 @@ const TableStateProps = props => {
     );
     dispatch({
       type: 'DELETE STATE',
-      payload: { stateProps: filtered, rowId: selectedId}
+      payload: { stateProps: filtered, rowId: selectedId }
     });
   };
 

app/src/components/right/LoginButton.tsx

@@ -21,10 +21,15 @@ export default function LoginButton() {
   // };
 
   const handleLogout = () => {
-    document.cookie = "SSID=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;"
+    // document.cookie = "ssid=; expires=Thu, 01 Jan 1970 00:00:00 UTC;"
+    // console.log(document.cookie)
+    //localStorage.clear();
+    window.localStorage.clear();
+    //window.api.delCookie();
     //const navigate = useNavigate();
     //navigate('/');
     window.location.href = 'http://localhost:8080/#/login';
+    window.api.delCookie();
     // window.location.reload();
   }
   if (state.isLoggedIn) {

app/src/reducers/componentReducer.ts

@@ -818,7 +818,20 @@ const reducer = (state: State, action: Action) => {
       );
       currComponent.stateProps = action.payload.stateProps;
       currComponent.useStateCodes = updateUseStateCodes(currComponent);
+
       components.forEach((component) => {
+
+
+        //find all instances of state within child elements and delete state
+
+        
+        if (component.name !== 'App') {
+          component.passedInProps.forEach((prop, i) => {
+            if(prop.id === action.payload.rowId) {
+              component.passedInProps.splice(i,1);
+            }
+          });
+        }
           // curr component = where you are deleting from state from, also is the canvas focus
           // curr component id = providerId
           // we then iterate through the rest of the components

package.json

@@ -58,7 +58,8 @@
   "scripts": {
     "postinstall": "set ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps",
     "dev-server": "cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js",
-    "dev": "concurrently --success first \"cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js\" \"cross-env NODE_ENV=development electron .\" \"npm run server\" -k",
+    "dev": "concurrently -k \"cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js\" \"cross-env NODE_ENV=development nodemon server/server.js --open\"",
+    "electron-dev": "cross-env NODE_ENV=development electron .",
     "prod-build": "cross-env NODE_ENV=production npx webpack --mode=production --config ./webpack.production.js",
     "prod": "npm run prod-build && electron . --no-sandbox",
     "pack": "electron-builder --dir",