diff --git a/.vscode/settings.json b/.vscode/settings.json index b9ffe03..cc40c2e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,6 +8,6 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "workbench.colorTheme": "Default Light+", "javascript.format.semicolons": "insert", - "window.zoomLevel": 0, + "window.zoomLevel": 1, "trunk.trunkGrayOutNonBlockingIssues": false } diff --git a/packages/desktop/src/controller/recoil.tsx b/packages/desktop/src/controller/recoil.tsx index 7b56165..dad590d 100644 --- a/packages/desktop/src/controller/recoil.tsx +++ b/packages/desktop/src/controller/recoil.tsx @@ -36,7 +36,7 @@ export const $maxNumberActiveStreams = atom({ // ============ -type DesktopMode = "flowState" | "overlayOnly" | "terminal" | "terminalDetails"; +type DesktopMode = "flowState" | "overlayOnly" | "terminal"; export const $desktopMode = atom({ key: "DESKTOP_MODE", diff --git a/packages/desktop/src/pages/router/index.tsx b/packages/desktop/src/pages/router/index.tsx index a05c4b1..d7a50e3 100644 --- a/packages/desktop/src/pages/router/index.tsx +++ b/packages/desktop/src/pages/router/index.tsx @@ -30,10 +30,7 @@ export default function NirvanaRouter() { // go hunting for which dimensions to have if (desktopMode === "terminal") { - finalDimensions = { height: 675, width: 400 }; - } - if (desktopMode === "terminalDetails") { - finalDimensions = { height: 675, width: 800 }; + finalDimensions = { height: 875, width: 1210 }; } if (desktopMode === "flowState") { finalPosition = "topRight"; @@ -84,17 +81,6 @@ export default function NirvanaRouter() { }); }, [setDesktopMode, setSelectedLineId]); - // handling desktop mode switch on change of selected line - useEffect(() => { - if (selectedLineId && desktopMode === "terminal") { - console.log("selected line right now", selectedLineId); - setDesktopMode("terminalDetails"); - } else if (!selectedLineId && desktopMode === "terminalDetails") - setDesktopMode("terminal"); - - // TODO: add more cases step by step based on experience I want - }, [selectedLineId, desktopMode, setDesktopMode]); - const handleToggleFlowState = useCallback(() => { setDesktopMode("flowState"); }, [setDesktopMode]); diff --git a/packages/desktop/src/pages/terminal/details/index.tsx b/packages/desktop/src/pages/terminal/details/index.tsx index df07401..1542ab1 100644 --- a/packages/desktop/src/pages/terminal/details/index.tsx +++ b/packages/desktop/src/pages/terminal/details/index.tsx @@ -14,11 +14,13 @@ import { useRecoilState } from "recoil"; export default function LineDetailsTerminal({ selectedLine, }: { - selectedLine: MasterLineData; + selectedLine?: MasterLineData; }) { const { handleTuneToLine } = useLineDataProvider(); const { data: userDetails } = useGetUserDetails(); + console.log("selected line", selectedLine); + const isUserToggleTuned = useMemo( () => selectedLine?.currentUserMember?.state === LineMemberState.TUNED, [selectedLine] @@ -37,82 +39,69 @@ export default function LineDetailsTerminal({ return ( <>
- {/* line overview header */} -
- {/* - - -

- {selectedLine.name} -

- - - {`${selectedLine.numberMembers} members`} - -
*/} -
- - {/* controls */} -
- {`${ - selectedLine?.tunedInMemberIds?.length ?? 0 - } on the line`} + > + {`${ + selectedLine?.tunedInMemberIds?.length ?? 0 + } on the line`} - + > + + - {/* TODO: move to on hover of line row */} - - - + onClick={() => + isUserToggleTuned + ? handleTuneToLine( + selectedLine.lineDetails._id.toString(), + false + ) + : handleTuneToLine( + selectedLine.lineDetails._id.toString(), + true + ) + } + > + + + - -
+ > + + +
+ + )} ); diff --git a/packages/desktop/src/pages/terminal/index.tsx b/packages/desktop/src/pages/terminal/index.tsx index 68f58b6..5c36e77 100644 --- a/packages/desktop/src/pages/terminal/index.tsx +++ b/packages/desktop/src/pages/terminal/index.tsx @@ -233,9 +233,7 @@ export default function NirvanaTerminal() { - {desktopMode === "terminalDetails" && selectedLine && ( - - )} + );