diff --git a/packages/desktop/src/controller/recoil.tsx b/packages/desktop/src/controller/recoil.tsx index 90a617e..dad590d 100644 --- a/packages/desktop/src/controller/recoil.tsx +++ b/packages/desktop/src/controller/recoil.tsx @@ -40,7 +40,7 @@ type DesktopMode = "flowState" | "overlayOnly" | "terminal"; export const $desktopMode = atom({ key: "DESKTOP_MODE", - default: "flowState", + default: "terminal", }); export const $selectedLineId = atom({ diff --git a/packages/desktop/src/pages/terminal/details/index.tsx b/packages/desktop/src/pages/terminal/details/index.tsx index c102438..e69de29 100644 --- a/packages/desktop/src/pages/terminal/details/index.tsx +++ b/packages/desktop/src/pages/terminal/details/index.tsx @@ -1,109 +0,0 @@ -import { FiActivity, FiSettings, FiSun } from "react-icons/fi"; -import { GlobalHotKeys, KeyMap } from "react-hotkeys"; -import { useCallback, useEffect, useMemo } from "react"; - -import { $selectedLineId } from "../../../controller/recoil"; -import LineIcon from "../../../components/lines/lineIcon/index"; -import { LineMemberState } from "@nirvana/core/models/line.model"; -import MasterLineData from "@nirvana/core/models/masterLineData.model"; -import { Tooltip } from "antd"; -import { useGetUserDetails } from "../../../controller/index"; -import { useLineDataProvider } from "../../../controller/lineDataProvider"; -import { useRecoilState } from "recoil"; - -export default function LineDetailsTerminal({ - selectedLine, - handleToggleTuneToLine, -}: { - selectedLine?: MasterLineData; - handleToggleTuneToLine: (lineId: string, turnToggleOn: boolean) => void; -}) { - const { data: userDetails } = useGetUserDetails(); - - console.log("selected line", selectedLine); - - const isUserToggleTuned = useMemo( - () => selectedLine?.currentUserMember?.state === LineMemberState.TUNED, - [selectedLine] - ); - - // seeing if I am in the list of broadcasters - // the source of truth from the socket connections telling me if my clicking actually made a round trip - const isUserBroadcasting = useMemo( - () => - selectedLine?.currentBroadcastersUserIds?.includes( - userDetails?.user._id.toString() - ), - [userDetails, selectedLine] - ); - - return ( - <> -
- {selectedLine && ( - <> - {/* controls */} -
- {`${ - selectedLine?.tunedInMemberIds?.length ?? 0 - } on the line`} - - - - {/* TODO: move to on hover of line row */} - - - - - -
- - )} -
- - ); -} diff --git a/packages/desktop/src/pages/terminal/index.tsx b/packages/desktop/src/pages/terminal/index.tsx index 15aeedb..9a93edc 100644 --- a/packages/desktop/src/pages/terminal/index.tsx +++ b/packages/desktop/src/pages/terminal/index.tsx @@ -1,4 +1,5 @@ import { $desktopMode, $selectedLineId } from "../../controller/recoil"; +import { FiActivity, FiSettings, FiSun } from "react-icons/fi"; import { GlobalHotKeys, KeyMap } from "react-hotkeys"; import { Skeleton, Tooltip } from "antd"; import { useCallback, useEffect, useMemo, useState } from "react"; @@ -6,9 +7,7 @@ import { useGetUserDetails, useUserLines } from "../../controller/index"; import { useRecoilState, useSetRecoilState } from "recoil"; import { FaPlus } from "react-icons/fa"; -import { FiActivity } from "react-icons/fi"; import IconButton from "../../components/Button/IconButton/index"; -import LineDetailsTerminal from "./details"; import { LineMemberState } from "@nirvana/core/models/line.model"; import LineRow from "../../components/lines/lineRow.tsx/index"; import MasterLineData from "@nirvana/core/models/masterLineData.model"; @@ -257,11 +256,112 @@ export default function NirvanaTerminal({ - + {selectedLine ? ( + + ) : ( +
+ + {`Hi ${userDetails?.user?.givenName}!`} + + You're all set! +
+ )} ); } + +function LineDetailsTerminal({ + selectedLine, + handleToggleTuneToLine, +}: { + selectedLine: MasterLineData; + handleToggleTuneToLine: (lineId: string, turnToggleOn: boolean) => void; +}) { + const { data: userDetails } = useGetUserDetails(); + + console.log("selected line", selectedLine); + + const isUserToggleTuned = useMemo( + () => selectedLine?.currentUserMember?.state === LineMemberState.TUNED, + [selectedLine] + ); + + // seeing if I am in the list of broadcasters + // the source of truth from the socket connections telling me if my clicking actually made a round trip + const isUserBroadcasting = useMemo( + () => + selectedLine?.currentBroadcastersUserIds?.includes( + userDetails?.user._id.toString() + ), + [userDetails, selectedLine] + ); + + return ( +
+ {/* controls */} +
+ {`${ + selectedLine?.tunedInMemberIds?.length ?? 0 + } on the line`} + + + + {/* TODO: move to on hover of line row */} + + + + + +
+
+ ); +}