From 992f508d5a53388c35583f8b53f56e8394eef833 Mon Sep 17 00:00:00 2001
From: cv <34649812+cpvalente@users.noreply.github.com>
Date: Sun, 13 Jun 2021 21:35:48 +0200
Subject: [PATCH] cleanup

- remove unused components
- cleanup style
---
 client/src/common/input/EditableText.jsx      |  3 +-
 client/src/features/editors/Editor.jsx        |  9 +++--
 .../src/features/editors/list/EventBlock.jsx  |  4 ---
 .../editors/list/EventBlock.module.css        |  1 -
 client/src/features/menu/MenuBar.jsx          | 35 ++++++++++---------
 server/electron/preload.js                    |  2 +-
 server/main.js                                |  2 +-
 server/src/controllers/ontimeController.js    |  2 +-
 8 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/client/src/common/input/EditableText.jsx b/client/src/common/input/EditableText.jsx
index ec8eec120..47b11ce77 100644
--- a/client/src/common/input/EditableText.jsx
+++ b/client/src/common/input/EditableText.jsx
@@ -22,7 +22,7 @@ export default function EditableText(props) {
   };
 
   return (
-    <div className={style.block} {...rest}>
+    <div className={style.block}>
       <span className={style.title}>{label}</span>
       <Editable
         onChange={(v) => handleChange(v)}
@@ -30,6 +30,7 @@ export default function EditableText(props) {
         value={text}
         placeholder={placeholder}
         className={style.inline}
+        {...rest}
       >
         <EditablePreview
           color={text === '' ? '#666' : 'inherit'}
diff --git a/client/src/features/editors/Editor.jsx b/client/src/features/editors/Editor.jsx
index f9d079b33..1a4e4f26f 100644
--- a/client/src/features/editors/Editor.jsx
+++ b/client/src/features/editors/Editor.jsx
@@ -1,10 +1,7 @@
-
 import { lazy, useEffect } from 'react';
-import { Heading } from '@chakra-ui/layout';
 import { Box } from '@chakra-ui/layout';
 import { useDisclosure } from '@chakra-ui/hooks';
 import styles from './Editor.module.css';
-import NumberedText from 'common/components/text/NumberedText';
 import SettingsModal from 'features/modals/SettingsModal';
 import MenuBar from 'features/menu/MenuBar';
 
@@ -53,9 +50,11 @@ export default function Editor() {
           </div>
         </Box>
 
-        <Box className={styles.info} borderRadius='0.5em' overflowX='auto'>
+        <Box className={styles.info}>
           <h1>Info</h1>
-          <div className={styles.content}></div>
+          <div className={styles.content}>
+            <Info />
+          </div>
         </Box>
       </div>
     </>
diff --git a/client/src/features/editors/list/EventBlock.jsx b/client/src/features/editors/list/EventBlock.jsx
index 19708b60b..7569cce53 100644
--- a/client/src/features/editors/list/EventBlock.jsx
+++ b/client/src/features/editors/list/EventBlock.jsx
@@ -161,10 +161,6 @@ const CollapsedBlock = (props) => {
 
 export default function EventBlock(props) {
   const { data, selected, delay, index, eventIndex, actionHandler } = props;
-
-  // const [collapsed, setCollapsed] = useState(checkLocalStorage(data.id));
-
-  // const collapsed = useSelector(itemsAtom, (state) => state === data.id);
   const [collapsed] = useAtom(
     useMemo(() => SelectCollapse(data.id), [data.id])
   );
diff --git a/client/src/features/editors/list/EventBlock.module.css b/client/src/features/editors/list/EventBlock.module.css
index 5dc9d2c28..bc7f34764 100644
--- a/client/src/features/editors/list/EventBlock.module.css
+++ b/client/src/features/editors/list/EventBlock.module.css
@@ -30,7 +30,6 @@
   grid-template-columns: 2em 2em auto auto 1fr auto 3.7em;
   grid-template-areas: 'drag indi time time text more btns';
   justify-content: center;
-  align-items: baseline;
 }
 
 .expanded {
diff --git a/client/src/features/menu/MenuBar.jsx b/client/src/features/menu/MenuBar.jsx
index fe68cf990..b6986416a 100644
--- a/client/src/features/menu/MenuBar.jsx
+++ b/client/src/features/menu/MenuBar.jsx
@@ -12,7 +12,8 @@ import HelpIconBtn from './buttons/HelpIconBtn';
 import UploadIconBtn from './buttons/UploadIconBtn';
 import { useRef } from 'react';
 
-const { ipcRenderer } = window.require('electron');
+// const { ipcRenderer } = window.require('electron');
+// import { ipcRenderer, remote }from 'electron';
 
 export default function MenuBar(props) {
   const { onOpen } = props;
@@ -47,21 +48,23 @@ export default function MenuBar(props) {
   };
 
   const handleIPC = (action) => {
-    switch (action) {
-      case 'min':
-        ipcRenderer.send('set-window', 'to-tray');
-        break;
-      case 'max':
-        ipcRenderer.send('set-window', 'to-max');
-        break;
-      case 'shutdown':
-        ipcRenderer.send('shutdown', 'now');
-        break;
-      case 'help':
-        ipcRenderer.send('send-to-link', 'help');
-        break;
-      default:
-        break;
+    if (window.process.type === 'renderer') {
+      switch (action) {
+        case 'min':
+          window.ipcRenderer.send('set-window', 'to-tray');
+          break;
+        case 'max':
+          window.ipcRenderer.send('set-window', 'to-max');
+          break;
+        case 'shutdown':
+          window.ipcRenderer.send('shutdown', 'now');
+          break;
+        case 'help':
+          window.ipcRenderer.send('send-to-link', 'help');
+          break;
+        default:
+          break;
+      }
     }
   };
 
diff --git a/server/electron/preload.js b/server/electron/preload.js
index fa038c825..40d7ecf94 100644
--- a/server/electron/preload.js
+++ b/server/electron/preload.js
@@ -1 +1 @@
-window.require = require;
+window.ipcRenderer = require('electron').ipcRenderer;
diff --git a/server/main.js b/server/main.js
index b3990e0e3..721551871 100644
--- a/server/main.js
+++ b/server/main.js
@@ -33,6 +33,7 @@ const nodePath =
     // Start OSC Client (Feedback)
     startOSCClient();
   } catch (error) {
+    console.log(error);
     loaded = error;
   }
 })();
@@ -122,7 +123,6 @@ function createWindow() {
 
 app.whenReady().then(() => {
   createWindow();
-
   /* ======================================
    * CONTEXT MENU CREATION ON REACT SIDE
   // Create context menu
diff --git a/server/src/controllers/ontimeController.js b/server/src/controllers/ontimeController.js
index 12dad04dd..14f6c228f 100644
--- a/server/src/controllers/ontimeController.js
+++ b/server/src/controllers/ontimeController.js
@@ -163,6 +163,7 @@ export const getInfo = async (req, res) => {
   res.status(200).send({
     networkInterfaces: ni,
   });
+};
 
 // Create controller for POST request to '/ontime/db'
 // Returns -
@@ -184,5 +185,4 @@ export const dbPathToUpload = async (req, res) => {
     return;
   }
   upload(req.body.path, req, res);
-
 };