From 781c6db7d9a3f3fb00dc7d64bc100fe9dc515ce4 Mon Sep 17 00:00:00 2001
From: talksik <patel.arjun50@gmail.com>
Date: Thu, 19 May 2022 17:21:24 -0500
Subject: [PATCH] taking out the fancy conditional opacities...not clean for me

---
 .vscode/settings.json                         |  2 +-
 .../desktop/src/providers/StreamProvider.tsx  |  3 +-
 .../protected/terminal/line/LineDetails.tsx   | 50 ++++++++++---------
 .../tree/protected/terminal/line/LineRow.tsx  | 12 ++---
 .../protected/terminal/panels/SidePanel.tsx   |  6 ++-
 5 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8711611..abfc7e4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,7 @@
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "workbench.colorTheme": "Default Light+",
   "javascript.format.semicolons": "insert",
-  "window.zoomLevel": 2
+  "window.zoomLevel": 1
 
   // "eslint.workingDirectories": ["./packages/desktop"]
 }
diff --git a/packages/desktop/src/providers/StreamProvider.tsx b/packages/desktop/src/providers/StreamProvider.tsx
index 5f6504a..4add8c7 100644
--- a/packages/desktop/src/providers/StreamProvider.tsx
+++ b/packages/desktop/src/providers/StreamProvider.tsx
@@ -118,8 +118,7 @@ export function StreamProvider({ children }: { children: React.ReactChild }) {
         );
 
         // hacking little bug!
-        if (localPeerForMasterAndMe && !localPeerForMasterAndMe.peer.destroyed)
-          localPeerForMasterAndMe.peer.signal(res.simplePeerSignal);
+        if (localPeerForMasterAndMe) localPeerForMasterAndMe.peer.signal(res.simplePeerSignal);
       });
     });
 
diff --git a/packages/desktop/src/tree/protected/terminal/line/LineDetails.tsx b/packages/desktop/src/tree/protected/terminal/line/LineDetails.tsx
index b8e6645..7ecb1e3 100644
--- a/packages/desktop/src/tree/protected/terminal/line/LineDetails.tsx
+++ b/packages/desktop/src/tree/protected/terminal/line/LineDetails.tsx
@@ -158,34 +158,36 @@ export default function LineDetails() {
             );
           })}
         </div>
+      </div>
 
-        {/* canvas action buttons */}
-        <div className="flex flex-row gap-3 p-10 justify-end items-center ">
-          <Tooltip
-            placement="left"
-            title={`${isUserToggleTuned ? 'click to untoggle' : 'click to stay tuned in'}`}
-          >
-            <button
-              className={`p-2 flex justify-center items-center shadow-lg
+      {/* canvas action buttons */}
+      <div className="absolute right-5 bottom-5 flex flex-row gap-3 p-10 justify-end items-center ">
+        <Tooltip
+          placement="left"
+          title={`${isUserToggleTuned ? 'click to untoggle' : 'click to stay tuned in'}`}
+        >
+          <button
+            className={`p-2 flex justify-center items-center shadow-lg
           hover:scale-105 transition-all animate-pulse ${
             isUserToggleTuned ? 'bg-gray-800 text-white' : 'text-black'
           }`}
-              onClick={() =>
-                isUserToggleTuned
-                  ? handleUpdateLineMemberState(
-                      selectedLine.lineDetails._id.toString(),
-                      LineMemberState.INBOX,
-                    )
-                  : handleUpdateLineMemberState(
-                      selectedLine.lineDetails._id.toString(),
-                      LineMemberState.TUNED,
-                    )
-              }
-            >
-              <FiActivity className="text-md" />
-            </button>
-          </Tooltip>
+            onClick={() =>
+              isUserToggleTuned
+                ? handleUpdateLineMemberState(
+                    selectedLine.lineDetails._id.toString(),
+                    LineMemberState.INBOX,
+                  )
+                : handleUpdateLineMemberState(
+                    selectedLine.lineDetails._id.toString(),
+                    LineMemberState.TUNED,
+                  )
+            }
+          >
+            <FiActivity className="text-md" />
+          </button>
+        </Tooltip>
 
+        <Tooltip title={'Press and hold ` or click to join the room'}>
           <button
             className={`p-3 flex justify-center items-center shadow-2xl
             hover:scale-105 transition-all ${
@@ -194,7 +196,7 @@ export default function LineDetails() {
           >
             <FiSun className="text-lg" />
           </button>
-        </div>
+        </Tooltip>
       </div>
     </div>
   );
diff --git a/packages/desktop/src/tree/protected/terminal/line/LineRow.tsx b/packages/desktop/src/tree/protected/terminal/line/LineRow.tsx
index 08acd86..ec47671 100644
--- a/packages/desktop/src/tree/protected/terminal/line/LineRow.tsx
+++ b/packages/desktop/src/tree/protected/terminal/line/LineRow.tsx
@@ -133,15 +133,9 @@ export default React.memo(function LineRow({
       onClick={handleActivateLine}
       role={'presentation'}
       className={`flex flex-row items-center justify-start gap-2 px-4 py-4 hover:bg-gray-200 
-      cursor-pointer transition-all relative z-50  
-      ${isUserToggleTuned && isWindowFocused && ' bg-gray-100 shadow-2xl'}
-      ${isUserToggleTuned && !isWindowFocused && ' bg-transparent '}
-      ${isSelected && isWindowFocused && ' bg-gray-200 shadow-2xl '}
-      ${isSelected && !isWindowFocused && ' bg-transparent '}
-
-      ${desktopMode === 'overlayOnly' && !isWindowFocused && ' opacity-20 '}
-
-      ${!isWindowFocused && desktopMode === 'overlayOnly' && !isSelected && ' bg-transparent '}`}
+      cursor-pointer transition-all relative z-50 
+      
+      ${isUserToggleTuned && ' bg-gray-100 shadow-2xl'}`}
     >
       {/* channel picture */}
       {profilePictures && (
diff --git a/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx b/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx
index 925fe05..ddf2a42 100644
--- a/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx
+++ b/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx
@@ -67,14 +67,16 @@ export default function SidePanel() {
   return (
     <div
       className={`flex flex-col w-[350px] group 
-    border-r border-r-gray-200 shadow-xl z-20  ${desktopMode === 'mainApp' && ' bg-white '}`}
+    border-r border-r-gray-200 shadow-xl z-20 bg-white
+    
+    ${!isWindowFocused && desktopMode === 'overlayOnly' && ' opacity-20 '}`}
     >
       {/* user control panel */}
       <div
         className={`bg-gray-100 flex flex-row items-center gap-2
        p-4 pb-2 z-50 w-full titlebar ${
          desktopMode === 'overlayOnly' && 'border-b border-b-gray-200'
-       } ${!isWindowFocused && desktopMode === 'overlayOnly' && ' opacity-20 '}
+       } 
       `}
       >
         <button onClick={handleToggleDesktopMode} className={'mr-auto animate-pulse'}>