diff --git a/packages/web/components/MainTabsOrPages/Header.tsx b/packages/web/components/MainTabsOrPages/Header.tsx index 392916d..1d4ff6d 100644 --- a/packages/web/components/MainTabsOrPages/Header.tsx +++ b/packages/web/components/MainTabsOrPages/Header.tsx @@ -1,5 +1,5 @@ import { QueryRoutes, Routes } from "@nirvana/common/helpers/routes"; -import { Menu, Dropdown, Avatar } from "antd"; +import { Menu, Dropdown, Avatar, Tooltip } from "antd"; import { useRouter } from "next/router"; import { useRef, useState } from "react"; import { KeyMap, GlobalHotKeys } from "react-hotkeys"; @@ -10,14 +10,16 @@ import { FaHeadphones, FaMicrophoneAlt, } from "react-icons/fa"; -import { useRecoilState } from "recoil"; +import { useRecoilState, useRecoilValue } from "recoil"; import { UserStatus } from "../../models/user"; import MainLogo from "../Logo/MainLogo"; import UserStatusBubble from "../UserDetails/UserStatusBubble"; import { useAuth } from "../../contexts/authContext"; +import { nirvanaUserDataAtom } from "../../recoil/main"; export default function Header() { const { currUser } = useAuth(); + const nirvanaUserData = useRecoilValue(nirvanaUserDataAtom); const router = useRouter(); @@ -106,12 +108,14 @@ export default function Header() { /> - + + + {/* controls */} -
+ {/*
-
+
*/} {/* profile section */} - - diff --git a/packages/web/components/MainTabsOrPages/Sidebar.tsx b/packages/web/components/MainTabsOrPages/Sidebar.tsx index 41e1382..87ef76c 100644 --- a/packages/web/components/MainTabsOrPages/Sidebar.tsx +++ b/packages/web/components/MainTabsOrPages/Sidebar.tsx @@ -71,16 +71,18 @@ function Sidebar() { Convos - - + {navCountObject.liveCount > 0 && ( + + - - Live + > + Live + - + )} {navCountObject.defaultCount > 0 && ( diff --git a/packages/web/recoil/main.tsx b/packages/web/recoil/main.tsx index 412335b..ebe050d 100644 --- a/packages/web/recoil/main.tsx +++ b/packages/web/recoil/main.tsx @@ -245,6 +245,7 @@ export const countDefaultConvosSelector = selector({ }); export interface NavigationContentCount { + liveCount: number; doneCount: number; defaultCount: number; laterCount: number; @@ -258,7 +259,10 @@ export const countNavigationContentSelector = selector({ const doneConvos = get(doneConvosSelector); const defaultCount = get(countDefaultConvosSelector); + const liveRooms = get(liveRoomsSelector); + const navCountObject: NavigationContentCount = { + liveCount: liveRooms.length, defaultCount, laterCount: laterConvos.length, doneCount: doneConvos.length,