- this is the line details for {selectedLine.name}
+
+ {/* line overview header */}
+
+
+
+
+
+ {selectedLine.name}
+
+
+
+ {`${selectedLine.numberMembers} members`}
+
+
+
);
}
diff --git a/packages/desktop/src/pages/nirvanaApp.tsx b/packages/desktop/src/pages/nirvanaApp.tsx
index 04fdf29..7b1d901 100644
--- a/packages/desktop/src/pages/nirvanaApp.tsx
+++ b/packages/desktop/src/pages/nirvanaApp.tsx
@@ -66,7 +66,11 @@ function NirvanaApp() {
-
+
+
diff --git a/packages/desktop/src/pages/overlay/index.tsx b/packages/desktop/src/pages/overlay/index.tsx
index 0d2cc12..7f31369 100644
--- a/packages/desktop/src/pages/overlay/index.tsx
+++ b/packages/desktop/src/pages/overlay/index.tsx
@@ -1,3 +1,5 @@
export default function Overlay() {
- return
this is the overlay
;
+ return (
+
this is the overlay
+ );
}
diff --git a/packages/desktop/src/pages/router/index.tsx b/packages/desktop/src/pages/router/index.tsx
index 1a857f3..ce5f586 100644
--- a/packages/desktop/src/pages/router/index.tsx
+++ b/packages/desktop/src/pages/router/index.tsx
@@ -1,4 +1,7 @@
-import { DimensionPresets, Dimensions } from "../../electron/constants";
+import Channels, {
+ DimensionPresets,
+ Dimensions,
+} from "../../electron/constants";
import React, { useState } from "react";
import { useCallback, useEffect, useMemo } from "react";
@@ -224,12 +227,23 @@ const testLines: ILineDetails[] = [
),
];
+type DesktopMode = "overlay" | "terminal" | "terminalAndDetails";
+
export default function NirvanaRouter() {
const [selectedLineId, setSelectedLineId] = useState
(null);
const [desktopMode, setDesktopMode] = useState(
DimensionPresets.terminal
);
+ useEffect(() => {
+ window.electronAPI.on(Channels.ON_WINDOW_BLUR, () => {
+ console.log(
+ "window blurring now, should be always on top and then ill tell main process to change dimensions"
+ );
+ setDesktopMode(DimensionPresets.overlayOnlyMode);
+ });
+ }, []);
+
useEffect(() => {
window.electronAPI.window.resizeWindow(desktopMode);
}, [desktopMode]);
@@ -237,12 +251,12 @@ export default function NirvanaRouter() {
useEffect(() => {
if (selectedLineId) {
setSelectedLineId(selectedLineId);
- setDesktopMode(DimensionPresets.terminalDetailOverlay);
+ setDesktopMode(DimensionPresets.terminalAndDetails);
} else {
setSelectedLineId(null);
setDesktopMode(DimensionPresets.terminal);
}
- }, [selectedLineId, desktopMode, setDesktopMode]);
+ }, [selectedLineId, setDesktopMode]);
/** show user line details */
const handleSelectLine = useCallback(
@@ -262,14 +276,18 @@ export default function NirvanaRouter() {
-
+ {(desktopMode === DimensionPresets.terminal ||
+ desktopMode === DimensionPresets.terminalAndDetails) && (
+
+ )}
- {selectedLine && }
+ {desktopMode === DimensionPresets.terminalAndDetails &&
+ selectedLine && }
- {/* */}
+
);
diff --git a/packages/desktop/src/pages/terminal/index.tsx b/packages/desktop/src/pages/terminal/index.tsx
index 0d5a4c3..07c057f 100644
--- a/packages/desktop/src/pages/terminal/index.tsx
+++ b/packages/desktop/src/pages/terminal/index.tsx
@@ -12,6 +12,8 @@ export default function NirvanaTerminal({
handleSelectLine: (lineId: string) => void;
allLines: ILineDetails[];
}) {
+ // todo: sort/order based on activity and activity date and currently broadcasting/live
+
const toggleTunedLines = useMemo(
() => allLines.filter((line) => line.isUserToggleTunedIn),
[]