diff --git a/packages/desktop/src/electron/constants.ts b/packages/desktop/src/electron/constants.ts index 195dbf7..2b332e6 100644 --- a/packages/desktop/src/electron/constants.ts +++ b/packages/desktop/src/electron/constants.ts @@ -3,26 +3,26 @@ // SINCE IT's NOT A NODE PROCESS enum Channels { - ACTIVATE_LOG_IN = "ACTIVATE_LOG_IN", - GOOGLE_AUTH_TOKENS = "GOOGLE_AUTH_TOKENS", - RESIZE_WINDOW = "RESIZE_WINDOW", - ON_WINDOW_BLUR = "ON_WINDOW_BLUR", + ACTIVATE_LOG_IN = 'ACTIVATE_LOG_IN', + GOOGLE_AUTH_TOKENS = 'GOOGLE_AUTH_TOKENS', + RESIZE_WINDOW = 'RESIZE_WINDOW', + ON_WINDOW_BLUR = 'ON_WINDOW_BLUR', } export enum STORE_ITEMS { - AUTH_SESSION_JWT = "AUTH_SESSION_JWT", + AUTH_SESSION_JWT = 'AUTH_SESSION_JWT', } export type Dimensions = { height: number; width: number }; export interface DimensionChangeRequest { setAlwaysOnTop: boolean; - setPosition?: "topRight" | "center"; + setPosition?: 'topRight' | 'center'; dimensions: Dimensions; addDimensions: boolean; } -export const DEFAULT_APP_PRESET: Dimensions = { height: 875, width: 1210 }; +export const DEFAULT_APP_PRESET: Dimensions = { height: 750, width: 1210 }; export const OVERLAY_ONLY_INITIAL_PRESET: Dimensions = { height: 50, diff --git a/packages/desktop/src/providers/StreamProvider.tsx b/packages/desktop/src/providers/StreamProvider.tsx index 780d7d0..54307bc 100644 --- a/packages/desktop/src/providers/StreamProvider.tsx +++ b/packages/desktop/src/providers/StreamProvider.tsx @@ -57,13 +57,12 @@ export function StreamProvider({ children }: { children: React.ReactChild }) { const localStreamRef = useRef(null); useEffect(() => { - navigator.mediaDevices - .getUserMedia({ video: true, audio: true }) - .then((localMediaStream: MediaStream) => { - setUserLocalStream(localMediaStream); - - if (localStreamRef.current) localStreamRef.current.srcObject = localMediaStream; - }); + // navigator.mediaDevices + // .getUserMedia({ video: true, audio: true }) + // .then((localMediaStream: MediaStream) => { + // setUserLocalStream(localMediaStream); + // if (localStreamRef.current) localStreamRef.current.srcObject = localMediaStream; + // }); }, [localStreamRef]); useEffect(() => { diff --git a/packages/desktop/src/tree/protected/terminal/Terminal.tsx b/packages/desktop/src/tree/protected/terminal/Terminal.tsx index a66a09b..ffe3ee0 100644 --- a/packages/desktop/src/tree/protected/terminal/Terminal.tsx +++ b/packages/desktop/src/tree/protected/terminal/Terminal.tsx @@ -16,8 +16,6 @@ export default function Terminal() { return (
- -
diff --git a/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx b/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx index bc8cea1..7afcf20 100644 --- a/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx +++ b/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx @@ -96,46 +96,14 @@ export default function NavBar() { ); return ( -
-
{ - // - }} - onClick={() => { - console.log('opening main app'); - }} - role="presentation" - > - -
- -
- - setSearchQuery(e.target.value)} - value={searchQuery} - /> -
- - - +
{user.picture && ( + Channels + + + {/* menu for the output options */} {/* +
{/* people search */} People @@ -185,115 +185,36 @@ function LineDetails() { return (
- {/* line timeline */} -
- load more + {/* line details */} +
+ {/* {profilePictures && } */} - yesterday +
+ +

+ {selectedLine.lineDetails.name || selectedLine.otherUserObjects[0].givenName} +

-
- - {selectedLine.otherUserObjects.map((otherUser) => ( - - ))} - - - {selectedLine.otherUserObjects.map((otherUser) => ( - - {`${otherUser.givenName}, `} - - ))} - - {`${Math.floor(Math.random() * 10) + 1}:${ - Math.floor(Math.random() * 100) + 10 - }pm |`} - - {`${ - Math.floor(Math.random() * 60) + 1 - } seconds`} -
- - today - -
- - {selectedLine.otherUserObjects.map((otherUser) => ( - - ))} - - - {selectedLine.otherUserObjects.map((otherUser) => ( - - {`${otherUser.givenName}, `} - - ))} - - {`${Math.floor(Math.random() * 10) + 1}:${ - Math.floor(Math.random() * 100) + 10 - }pm |`} - - {`${ - Math.floor(Math.random() * 60) + 1 - } seconds`} -
- - {/* */} -
- - {/* live broadcasters */} -
- - - right now - - -
- {selectedLine.otherUserObjects.map((otherUser) => ( - - ))} + + +
-
-
+
+ + {/* main canvas */} +
+ {/* line timeline */} +
+ load more + + yesterday + +
+ + {selectedLine.otherUserObjects.map((otherUser) => ( + + ))} + + + {selectedLine.otherUserObjects.map((otherUser) => ( + + {`${otherUser.givenName}, `} + + ))} + + {`${ + Math.floor(Math.random() * 10) + 1 + }:${Math.floor(Math.random() * 100) + 10}pm |`} + + {`${ + Math.floor(Math.random() * 60) + 1 + } seconds`} +
+ + today + +
+ + {selectedLine.otherUserObjects.map((otherUser) => ( + + ))} + + + {selectedLine.otherUserObjects.map((otherUser) => ( + + {`${otherUser.givenName}, `} + + ))} + + {`${ + Math.floor(Math.random() * 10) + 1 + }:${Math.floor(Math.random() * 100) + 10}pm |`} + + {`${ + Math.floor(Math.random() * 60) + 1 + } seconds`} +
+
+ +
+ + Right Now + + + {selectedLine.otherUserObjects.map((otherUser) => ( +
+ + + {otherUser.name} + +
+ ))} + + + Offline + +
+
+ +
diff --git a/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx b/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx index 4453618..5de1ecd 100644 --- a/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx +++ b/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx @@ -32,10 +32,33 @@ export default function SidePanel() { return [tunedLines, restLines]; }, [roomsMap]); + const [searchQuery, setSearchQuery] = useState(''); + return ( -
+
+ + +
+
+ + setSearchQuery(e.target.value)} + value={searchQuery} + /> +
+ + +
+ {/* tuned in lines block */} -
+
{/* tuned in header + general controls */} @@ -49,13 +72,6 @@ export default function SidePanel() { toggleTunedLines?.length || 0 }/3`}

- -
@@ -79,7 +95,7 @@ export default function SidePanel() { )} {/* rest of the lines */} -
+
{initialRoomsFetch.loading ? ( ) : ( @@ -93,6 +109,19 @@ export default function SidePanel() { )) )}
+ +
{ + // + }} + onClick={() => { + console.log('opening main app'); + }} + role="presentation" + > + +
); }