From 2a0f74435b2a5ed45bafb456cdd0188a0f5ba1b2 Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 19 Mar 2022 20:37:25 -0400 Subject: [PATCH] showing up selection of convo on side --- packages/desktop/src/index.css | 4 ++++ packages/desktop/src/pages/Home/index.tsx | 15 +++++++++++---- .../src/pages/Home/selectedConversation/index.tsx | 4 +++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/packages/desktop/src/index.css b/packages/desktop/src/index.css index 5216226..58ad281 100644 --- a/packages/desktop/src/index.css +++ b/packages/desktop/src/index.css @@ -3,6 +3,10 @@ body { Arial, sans-serif; } +#root { + padding: 0 !important; +} + @tailwind base; @tailwind components; @tailwind utilities; diff --git a/packages/desktop/src/pages/Home/index.tsx b/packages/desktop/src/pages/Home/index.tsx index c555364..27d50dd 100644 --- a/packages/desktop/src/pages/Home/index.tsx +++ b/packages/desktop/src/pages/Home/index.tsx @@ -4,6 +4,7 @@ import { $searchQuery } from "../../controller/recoil"; import Conversations from "./conversations"; import Header from "./header"; import Search from "./search"; +import SelectedConversation from "./selectedConversation"; import { useEffect } from "react"; import { useGetUserDetails } from "../../controller/"; import { useRecoilValue } from "recoil"; @@ -13,11 +14,17 @@ export default function Home() { const searchQuery = useRecoilValue($searchQuery); return ( -
- {/* header */} -
+
+
+ {/* header */} +
- {searchQuery ? : } + {/* main content */} + + {searchQuery ? : } +
+ +
); } diff --git a/packages/desktop/src/pages/Home/selectedConversation/index.tsx b/packages/desktop/src/pages/Home/selectedConversation/index.tsx index 96aa062..d0b519d 100644 --- a/packages/desktop/src/pages/Home/selectedConversation/index.tsx +++ b/packages/desktop/src/pages/Home/selectedConversation/index.tsx @@ -15,5 +15,7 @@ export default function SelectedConversation() { * all messages between me and them */ - return this is the selected conversation; + return ( +
this is the selected conversation
+ ); }