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 77118c7..ec34b3e 100644 --- a/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx +++ b/packages/desktop/src/tree/protected/terminal/navbar/Navbar.tsx @@ -100,21 +100,25 @@ export default function NavBar() { ); return ( -
-
{ - console.log('opening main app'); - }} - role="presentation" - > - -
+
+ +
+ {user.picture && ( + + )} +
+
- {!shouldHideSearch && ( + Channels + + {/* {!shouldHideSearch && (
- )} + )} */} - -
- {user.picture && ( - - )} -
-
- {/* menu for the output options */} {/* - {/* line details */} -
- {profilePictures && } + {/* line timeline */} +
+ load more -
- -

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

+ yesterday - -
+
+ + {selectedLine.otherUserObjects.map((otherUser) => ( + + ))} + - - {`${ - selectedLine.otherMembers?.length + 1 ?? 0 - } members`} - - {`${ - selectedLine.tunedInMemberIds?.length ?? 0 - } in this room`} - + {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) => ( +
+ + + + {`${otherUser.givenName}`} + + + + + +
+ ))} +
+
+ +
-
- -
- {/* 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`} -
- - {/* live broadcasters */} - - - right now - - - {/* change to show only the broadcasters */} - {/* */} -
- -
- {selectedLine.otherUserObjects.map((otherUser) => ( -
- - {otherUser.name} - - - - -
- ))} - -
- - {user.name} -
-
-
- - + > + + +
); } diff --git a/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx b/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx index a9b78db..7625b16 100644 --- a/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx +++ b/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx @@ -2,13 +2,15 @@ import { LineMemberState } from '@nirvana/core/models/line.model'; import MasterLineData from '@nirvana/core/models/masterLineData.model'; import { Avatar, Skeleton, Tooltip } from 'antd'; import React, { useCallback, useMemo, useEffect } from 'react'; -import { FaPlus } from 'react-icons/fa'; -import { FiActivity, FiSun } from 'react-icons/fi'; +import { FaPlus, FaSearch } from 'react-icons/fa'; +import { FiActivity, FiSearch, FiSun } from 'react-icons/fi'; import useRealTimeRooms from '../../../../providers/RealTimeRoomProvider'; import useRooms from '../../../../providers/RoomsProvider'; import useAuth from '../../../../providers/AuthProvider'; import LineIcon from '../../../../components/lineIcon'; import moment from 'moment'; +import NavBar from '../navbar/Navbar'; +import NoTextLogo from '@nirvana/components/logo/NoTextLogo'; export default function SidePanel() { // using merely for loading state...better to add to realtimeroom context? @@ -31,9 +33,32 @@ export default function SidePanel() { }, [roomsMap]); return ( -
+
+ + +
+
+ + { + // + }} + value={''} + /> +
+ + +
+ {/* tuned in lines block */} -
+
{/* tuned in header + general controls */} @@ -41,9 +66,11 @@ export default function SidePanel() { -

Tuned In

+

Tuned In

-

{`${toggleTunedLines?.length || 0}/3`}

+

{`${ + toggleTunedLines?.length || 0 + }/3`}

@@ -68,7 +95,7 @@ export default function SidePanel() { )} {/* rest of the lines */} -
+
{initialRoomsFetch.loading ? ( ) : ( @@ -84,16 +111,16 @@ export default function SidePanel() {
{ + // + }} + onClick={() => { + console.log('opening main app'); + }} + role="presentation" + className="absolute bottom-5 left-5" > - +
); @@ -155,8 +182,6 @@ function LineRowTest({ if (line.currentUserMember.lastVisitDate) return ; - return ; - // if there is new activity/black dot, then show relative time as little bolder? or too much? // TODO: compare last visit date to latest audio block @@ -191,9 +216,9 @@ function LineRowTest({
handleSelectLine(line.lineDetails._id.toString())} role={'presentation'} - className={`flex flex-row items-center justify-start gap-2 px-4 py-6 hover:bg-gray-200 cursor-pointer transition-all -last:border-b-0 border-b border-b-gray-200 relative z-50 rounded ${ - isSelected && 'bg-gray-200 scale-110 shadow-2xl translate-x-3' + 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 rounded ${ + isSelected && 'bg-gray-200 scale-110 shadow-2xl translate-x-2' }`} > {/* status dot */}