From 9cd8aaf781ed6bc4e652d1f1cb4fc42b7d3d6401 Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 1 Apr 2022 16:47:26 -0400 Subject: [PATCH] making changes with theming and such --- packages/desktop/src/nirvanaApp.tsx | 7 +++++ .../src/pages/Home/conversations/index.tsx | 28 +++++++++---------- .../desktop/src/pages/Home/header/index.tsx | 11 +++++--- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/packages/desktop/src/nirvanaApp.tsx b/packages/desktop/src/nirvanaApp.tsx index 5305acf..f268447 100644 --- a/packages/desktop/src/nirvanaApp.tsx +++ b/packages/desktop/src/nirvanaApp.tsx @@ -20,6 +20,13 @@ export const socket = io("http://localhost:5000"); const darkTheme = createTheme({ palette: { mode: "dark", + + primary: { + main: "#438E86", + }, + secondary: { + main: "#FFB6B6", + }, }, }); diff --git a/packages/desktop/src/pages/Home/conversations/index.tsx b/packages/desktop/src/pages/Home/conversations/index.tsx index 694d3c7..6a175c1 100644 --- a/packages/desktop/src/pages/Home/conversations/index.tsx +++ b/packages/desktop/src/pages/Home/conversations/index.tsx @@ -1,6 +1,6 @@ -import { Add, LinkRounded } from "@mui/icons-material"; +import { Add, LinkRounded, RecordVoiceOverTwoTone } from "@mui/icons-material"; import { Avatar, Tooltip } from "antd"; -import { Tab, Tabs } from "@mui/material"; +import { Button, Tab, Tabs } from "@mui/material"; import { $selectedConversation } from "../../../controller/recoil"; import { ContactDetails } from "@nirvana/core/responses/getContacts.response"; @@ -46,31 +46,29 @@ export default function Conversations() { return ( <> -
+
- + -
- {/* pinned conversations */} -
- - - - - Live - - - +
{/* {isLoading ? ( diff --git a/packages/desktop/src/pages/Home/header/index.tsx b/packages/desktop/src/pages/Home/header/index.tsx index fd169f8..24a3110 100644 --- a/packages/desktop/src/pages/Home/header/index.tsx +++ b/packages/desktop/src/pages/Home/header/index.tsx @@ -1,6 +1,7 @@ import { $jwtToken, $searchQuery } from "../../../controller/recoil"; import { Avatar, + Button, Divider, ListItemIcon, Menu, @@ -73,17 +74,19 @@ export default function Header() { setSearchQuery(e.target.value)} /> - + {userDetailsResponse?.user && (