From 464f58363b3ba40938d7b875f132b7b60803438e Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Tue, 8 Feb 2022 23:53:27 +0300
Subject: [PATCH] feat: added chat window layout

---
 src/components/Chat/ChatContextProvider.tsx   | 10 ++
 src/components/Chat/Sidebar.tsx               | 12 ---
 src/components/Chat/Sidebar/Heading.tsx       | 50 ++++++++++
 src/components/Chat/Sidebar/Sidebar.tsx       | 30 ++++++
 .../Chat/Sidebar/Users/User/Avatar.tsx        | 21 +++++
 .../Chat/Sidebar/Users/User/Info.tsx          | 22 +++++
 .../Chat/Sidebar/Users/User/Time.tsx          | 18 ++++
 .../Chat/Sidebar/Users/User/User.tsx          | 55 +++++++++++
 .../Chat/Sidebar/Users/User/index.ts          |  1 +
 src/components/Chat/Sidebar/Users/Users.tsx   | 39 ++++++++
 src/components/Chat/Sidebar/Users/index.ts    |  1 +
 src/components/Chat/Sidebar/index.ts          |  1 +
 src/components/Chat/Window.tsx                |  8 --
 src/components/Chat/Window/Message/Avatar.tsx | 16 ++++
 .../Chat/Window/Message/Message.tsx           | 29 ++++++
 src/components/Chat/Window/Message/Text.tsx   | 38 ++++++++
 src/components/Chat/Window/Message/context.ts | 17 ++++
 src/components/Chat/Window/Message/index.ts   |  1 +
 src/components/Chat/Window/Window.tsx         | 64 +++++++++++++
 src/components/Chat/Window/index.ts           |  1 +
 src/components/Chat/context.ts                | 21 +++++
 src/components/Chat/index.tsx                 | 12 ++-
 .../UserProfile/Avatar/ChatButton.tsx         |  2 +-
 src/pages/messages/messages.tsx               | 93 +------------------
 24 files changed, 447 insertions(+), 115 deletions(-)
 create mode 100644 src/components/Chat/ChatContextProvider.tsx
 delete mode 100644 src/components/Chat/Sidebar.tsx
 create mode 100644 src/components/Chat/Sidebar/Heading.tsx
 create mode 100644 src/components/Chat/Sidebar/Sidebar.tsx
 create mode 100644 src/components/Chat/Sidebar/Users/User/Avatar.tsx
 create mode 100644 src/components/Chat/Sidebar/Users/User/Info.tsx
 create mode 100644 src/components/Chat/Sidebar/Users/User/Time.tsx
 create mode 100644 src/components/Chat/Sidebar/Users/User/User.tsx
 create mode 100644 src/components/Chat/Sidebar/Users/User/index.ts
 create mode 100644 src/components/Chat/Sidebar/Users/Users.tsx
 create mode 100644 src/components/Chat/Sidebar/Users/index.ts
 create mode 100644 src/components/Chat/Sidebar/index.ts
 delete mode 100644 src/components/Chat/Window.tsx
 create mode 100644 src/components/Chat/Window/Message/Avatar.tsx
 create mode 100644 src/components/Chat/Window/Message/Message.tsx
 create mode 100644 src/components/Chat/Window/Message/Text.tsx
 create mode 100644 src/components/Chat/Window/Message/context.ts
 create mode 100644 src/components/Chat/Window/Message/index.ts
 create mode 100644 src/components/Chat/Window/Window.tsx
 create mode 100644 src/components/Chat/Window/index.ts
 create mode 100644 src/components/Chat/context.ts

diff --git a/src/components/Chat/ChatContextProvider.tsx b/src/components/Chat/ChatContextProvider.tsx
new file mode 100644
index 0000000..ad1d2f6
--- /dev/null
+++ b/src/components/Chat/ChatContextProvider.tsx
@@ -0,0 +1,10 @@
+import React, { useState } from 'react';
+import { ChatContext } from './context';
+
+const ChatContextProvider: React.FC = ({ children }) => {
+  const [search, setSearch] = useState<string>('');
+
+  return <ChatContext.Provider value={{ search, setSearch }}>{children}</ChatContext.Provider>;
+};
+
+export { ChatContextProvider };
diff --git a/src/components/Chat/Sidebar.tsx b/src/components/Chat/Sidebar.tsx
deleted file mode 100644
index 55aa13f..0000000
--- a/src/components/Chat/Sidebar.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import { GridItem, GridItemProps } from '@chakra-ui/react';
-
-const Sidebar: React.FC<GridItemProps> = props => {
-  return (
-    <GridItem pt='7rem' borderRightWidth={'1px'} width='400px' pr='6' {...props}>
-      {props.children}
-    </GridItem>
-  );
-};
-
-export { Sidebar };
diff --git a/src/components/Chat/Sidebar/Heading.tsx b/src/components/Chat/Sidebar/Heading.tsx
new file mode 100644
index 0000000..d752efa
--- /dev/null
+++ b/src/components/Chat/Sidebar/Heading.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import {
+  Flex,
+  Heading as ChakraHeading,
+  Input,
+  InputGroup,
+  InputLeftElement,
+  HStack,
+  Button,
+  Box,
+  BoxProps,
+} from '@chakra-ui/react';
+import { SearchIcon } from '@chakra-ui/icons';
+
+/**
+ * Hooks
+ */
+import { useChatContext } from '../context';
+
+const Heading: React.FC<BoxProps> = props => {
+  const { search, setSearch } = useChatContext();
+
+  const onSearch = (e: React.ChangeEvent<HTMLInputElement>) => setSearch(e.target.value);
+
+  return (
+    <Box {...props}>
+      <Flex my='4' pr={'3'} justifyContent={'space-between'} alignItems={'center'}>
+        <ChakraHeading as='h2' fontSize={'md'} fontWeight='medium' mr='9'>
+          Chats
+        </ChakraHeading>
+        <InputGroup maxW='230px' size='sm'>
+          <InputLeftElement pointerEvents='none'>
+            <SearchIcon color='gray.300' />
+          </InputLeftElement>
+          <Input type='text' onChange={onSearch} value={search} placeholder='Search by name...' borderRadius={'md'} />
+        </InputGroup>
+      </Flex>
+      <HStack>
+        <Button isActive variant={'ghost'} size='sm'>
+          All
+        </Button>
+        <Button colorScheme={'blue'} variant='ghost' size='sm'>
+          Unread
+        </Button>
+      </HStack>
+    </Box>
+  );
+};
+
+export { Heading };
diff --git a/src/components/Chat/Sidebar/Sidebar.tsx b/src/components/Chat/Sidebar/Sidebar.tsx
new file mode 100644
index 0000000..e346039
--- /dev/null
+++ b/src/components/Chat/Sidebar/Sidebar.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { BoxProps, GridItem, GridItemProps } from '@chakra-ui/react';
+import { Heading } from './Heading';
+import { Users } from './Users/Users';
+
+export interface ISidebarComposition {
+  Heading: React.FC<BoxProps>;
+  Users: React.FC;
+}
+
+const Sidebar: React.FC<GridItemProps> & ISidebarComposition = props => {
+  return (
+    <GridItem
+      pt='7rem'
+      borderRightWidth={{ base: '0', lg: '1px' }}
+      width={{ base: 'full', lg: '400px' }}
+      px={{ base: '0', lg: '3' }}
+      {...props}
+    >
+      {props.children}
+    </GridItem>
+  );
+
+  return null;
+};
+
+Sidebar.Heading = Heading;
+Sidebar.Users = Users;
+
+export { Sidebar };
diff --git a/src/components/Chat/Sidebar/Users/User/Avatar.tsx b/src/components/Chat/Sidebar/Users/User/Avatar.tsx
new file mode 100644
index 0000000..3e7ceac
--- /dev/null
+++ b/src/components/Chat/Sidebar/Users/User/Avatar.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { Avatar as ChakraAvatar, AvatarBadge, WrapItem } from '@chakra-ui/react';
+
+export interface IAvatarProps {
+  fullname: string;
+  isOnline: boolean;
+}
+
+const Avatar: React.FC<IAvatarProps> = ({ fullname: name, isOnline }) => {
+  const onlineBg = isOnline ? 'green.500' : 'red.500';
+
+  return (
+    <WrapItem>
+      <ChakraAvatar name={name} size='md'>
+        <AvatarBadge boxSize='0.90em' bg={onlineBg} />
+      </ChakraAvatar>
+    </WrapItem>
+  );
+};
+
+export { Avatar };
diff --git a/src/components/Chat/Sidebar/Users/User/Info.tsx b/src/components/Chat/Sidebar/Users/User/Info.tsx
new file mode 100644
index 0000000..9b74a71
--- /dev/null
+++ b/src/components/Chat/Sidebar/Users/User/Info.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { Box, Text } from '@chakra-ui/react';
+
+export interface IInfoProps {
+  fullname: string;
+  lastMessage: string;
+}
+
+const Info: React.FC<IInfoProps> = ({ fullname, lastMessage }) => {
+  return (
+    <Box ml='4'>
+      <Text fontWeight={'semibold'}>
+        {fullname} <br />
+        <Text as={'span'} fontWeight='normal' fontSize={'sm'} color='gray.500'>
+          {lastMessage}
+        </Text>
+      </Text>
+    </Box>
+  );
+};
+
+export { Info };
diff --git a/src/components/Chat/Sidebar/Users/User/Time.tsx b/src/components/Chat/Sidebar/Users/User/Time.tsx
new file mode 100644
index 0000000..c7fa5c3
--- /dev/null
+++ b/src/components/Chat/Sidebar/Users/User/Time.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { Box, Text } from '@chakra-ui/react';
+
+export interface ITimeProps {
+  time: string;
+}
+
+const Time: React.FC<ITimeProps> = ({ time }) => {
+  return (
+    <Box alignSelf={'flex-end'} ml='auto'>
+      <Text as='span' color='gray.500'>
+        {time}
+      </Text>
+    </Box>
+  );
+};
+
+export { Time };
diff --git a/src/components/Chat/Sidebar/Users/User/User.tsx b/src/components/Chat/Sidebar/Users/User/User.tsx
new file mode 100644
index 0000000..aba67e8
--- /dev/null
+++ b/src/components/Chat/Sidebar/Users/User/User.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { Box, Flex } from '@chakra-ui/react';
+import { IInfoProps, Info } from './Info';
+import { ITimeProps, Time } from './Time';
+import { IAvatarProps, Avatar } from './Avatar';
+
+/**
+ * Hooks
+ */
+import { useHistory, useLocation } from 'react-router-dom';
+import { useColorModeValue } from '@chakra-ui/react';
+
+interface IUserComposition {
+  Avatar: React.FC<IAvatarProps>;
+  Info: React.FC<IInfoProps>;
+  Time: React.FC<ITimeProps>;
+}
+
+interface IUserProps {
+  id: string;
+}
+
+const User: React.FC<IUserProps> & IUserComposition = props => {
+  const history = useHistory();
+  const location = useLocation();
+  const chatId = new URLSearchParams(location.search).get('chat_id');
+  const bg = useColorModeValue('gray.50', 'gray.700');
+
+  const handleChat = () => {
+    history.replace({ pathname: location.pathname, search: new URLSearchParams({ ['chat_id']: props.id }).toString() });
+  };
+
+  return (
+    <Box
+      onClick={handleChat}
+      py='5'
+      px='4'
+      borderRadius={'lg'}
+      bg={chatId === props.id ? bg : ''}
+      _hover={{ bg }}
+      transition='all .1s'
+      cursor={'pointer'}
+    >
+      <Flex flexDir={'row'} alignItems={'center'}>
+        {props.children}
+      </Flex>
+    </Box>
+  );
+};
+
+User.Avatar = Avatar;
+User.Info = Info;
+User.Time = Time;
+
+export { User };
diff --git a/src/components/Chat/Sidebar/Users/User/index.ts b/src/components/Chat/Sidebar/Users/User/index.ts
new file mode 100644
index 0000000..403fc94
--- /dev/null
+++ b/src/components/Chat/Sidebar/Users/User/index.ts
@@ -0,0 +1 @@
+export { User } from './User';
diff --git a/src/components/Chat/Sidebar/Users/Users.tsx b/src/components/Chat/Sidebar/Users/Users.tsx
new file mode 100644
index 0000000..8b79d7c
--- /dev/null
+++ b/src/components/Chat/Sidebar/Users/Users.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { Box, Stack, Text } from '@chakra-ui/react';
+import { User } from './User';
+import { useChatContext } from '../../context';
+
+const tempDb = [
+  { id: 'user-1', name: 'Trace Kerluke', lastMessage: 'Hello.', time: '2g' },
+  { id: 'user-2', name: 'Dalton Conn ', lastMessage: 'Hello, how you doing ?', time: '30m' },
+  { id: 'user-3', name: 'Cleo Hane', lastMessage: 'Hi.', time: '1h' },
+];
+
+const Users: React.FC = () => {
+  const { search } = useChatContext();
+
+  const filtered = !search ? tempDb : tempDb.filter(u => u.name.toLocaleLowerCase().includes(search));
+  const isEmpty = filtered.length === 0;
+
+  return (
+    <Stack mt='12' maxH='690px' overflowY={'scroll'} pr={{ base: '0', lg: '3' }}>
+      {!isEmpty ? (
+        filtered.map(u => (
+          <User key={u.id} id={u.id}>
+            <User.Avatar isOnline={false} fullname={u.name} />
+            <User.Info fullname={u.name} lastMessage={u.lastMessage} />
+            <User.Time time={u.time} />
+          </User>
+        ))
+      ) : (
+        <Box textAlign={'center'}>
+          <Text userSelect={'none'} color='gray.500'>
+            Cannot find any chat
+          </Text>
+        </Box>
+      )}
+    </Stack>
+  );
+};
+
+export { Users };
diff --git a/src/components/Chat/Sidebar/Users/index.ts b/src/components/Chat/Sidebar/Users/index.ts
new file mode 100644
index 0000000..a87a5f5
--- /dev/null
+++ b/src/components/Chat/Sidebar/Users/index.ts
@@ -0,0 +1 @@
+export { Users } from './Users';
diff --git a/src/components/Chat/Sidebar/index.ts b/src/components/Chat/Sidebar/index.ts
new file mode 100644
index 0000000..d440597
--- /dev/null
+++ b/src/components/Chat/Sidebar/index.ts
@@ -0,0 +1 @@
+export { Sidebar } from './Sidebar';
diff --git a/src/components/Chat/Window.tsx b/src/components/Chat/Window.tsx
deleted file mode 100644
index 125d022..0000000
--- a/src/components/Chat/Window.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import { GridItem, GridItemProps } from '@chakra-ui/react';
-
-const Window: React.FC<GridItemProps> = props => {
-  return <GridItem {...props}>{props.children}</GridItem>;
-};
-
-export { Window };
diff --git a/src/components/Chat/Window/Message/Avatar.tsx b/src/components/Chat/Window/Message/Avatar.tsx
new file mode 100644
index 0000000..525c1a2
--- /dev/null
+++ b/src/components/Chat/Window/Message/Avatar.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { WrapItem, Avatar as ChakraAvatar } from '@chakra-ui/react';
+
+export interface IAvatarProps {
+  fullname: string;
+}
+
+const Avatar: React.FC<IAvatarProps> = ({ fullname: name }) => {
+  return (
+    <WrapItem>
+      <ChakraAvatar name={name} size={'sm'} />
+    </WrapItem>
+  );
+};
+
+export { Avatar };
diff --git a/src/components/Chat/Window/Message/Message.tsx b/src/components/Chat/Window/Message/Message.tsx
new file mode 100644
index 0000000..75b66e5
--- /dev/null
+++ b/src/components/Chat/Window/Message/Message.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { Flex } from '@chakra-ui/react';
+import { Avatar, IAvatarProps } from './Avatar';
+import { Text, ITextProps } from './Text';
+import { MessageContext } from './context';
+
+interface IMessageComposition {
+  Avatar: React.FC<IAvatarProps>;
+  Text: React.FC<ITextProps>;
+}
+
+interface IMyMessageProps {
+  isMyMessage: boolean;
+}
+
+const Message: React.FC<IMyMessageProps> & IMessageComposition = ({ children, isMyMessage }) => {
+  return (
+    <MessageContext.Provider value={{ isMyMessage }}>
+      <Flex flexDir={!isMyMessage ? 'row' : 'row-reverse'} alignItems={'center'}>
+        {children}
+      </Flex>
+    </MessageContext.Provider>
+  );
+};
+
+Message.Avatar = Avatar;
+Message.Text = Text;
+
+export { Message };
diff --git a/src/components/Chat/Window/Message/Text.tsx b/src/components/Chat/Window/Message/Text.tsx
new file mode 100644
index 0000000..14e4bad
--- /dev/null
+++ b/src/components/Chat/Window/Message/Text.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { Box, Text as ChakraText, useColorModeValue } from '@chakra-ui/react';
+import { useMessageContext } from './context';
+
+export interface ITextProps {
+  content: string;
+  time: string;
+}
+
+const Text: React.FC<ITextProps> = ({ content, time }) => {
+  const { isMyMessage } = useMessageContext();
+
+  const bgColor = !isMyMessage ? useColorModeValue('gray.50', 'gray.700') : useColorModeValue('gray.100', 'gray.600');
+
+  return (
+    <Box mx={'4'} maxW={'450px'} bg={bgColor} borderRadius='3xl' px='6' py='3'>
+      <ChakraText fontSize={'15px'}>
+        {content}
+        <Box
+          as='time'
+          userSelect={'none'}
+          position={'relative'}
+          left='10px'
+          float='right'
+          top='8px'
+          alignSelf={'flex-end'}
+          color='gray.500'
+          fontSize={'xs'}
+          dateTime={time}
+        >
+          {time}
+        </Box>
+      </ChakraText>
+    </Box>
+  );
+};
+
+export { Text };
diff --git a/src/components/Chat/Window/Message/context.ts b/src/components/Chat/Window/Message/context.ts
new file mode 100644
index 0000000..8dd77ca
--- /dev/null
+++ b/src/components/Chat/Window/Message/context.ts
@@ -0,0 +1,17 @@
+import { createContext, useContext } from 'react';
+
+export type MessageContextType = {
+  isMyMessage: boolean;
+};
+
+export const MessageContext = createContext<MessageContextType | undefined>(undefined);
+
+export const useMessageContext = () => {
+  const context = useContext(MessageContext);
+
+  if (!context) {
+    throw new Error('MessageContext was outside of its provider');
+  }
+
+  return context;
+};
diff --git a/src/components/Chat/Window/Message/index.ts b/src/components/Chat/Window/Message/index.ts
new file mode 100644
index 0000000..f2d89d2
--- /dev/null
+++ b/src/components/Chat/Window/Message/index.ts
@@ -0,0 +1 @@
+export { Message } from './Message';
diff --git a/src/components/Chat/Window/Window.tsx b/src/components/Chat/Window/Window.tsx
new file mode 100644
index 0000000..2f267fc
--- /dev/null
+++ b/src/components/Chat/Window/Window.tsx
@@ -0,0 +1,64 @@
+import React, { useEffect } from 'react';
+import { GridItem, GridItemProps, Flex, Box, Icon, Text, Input, Heading, IconButton, Stack } from '@chakra-ui/react';
+import { MdOutlineChat, MdSend } from 'react-icons/md';
+import { Message } from './Message';
+
+const Window: React.FC<GridItemProps> = props => {
+  const chatId = new URLSearchParams(location.search).get('chat_id');
+
+  useEffect(() => {
+    console.log('chat id changed!');
+  }, [chatId]);
+
+  return (
+    <GridItem pt={'7rem'} pb='5' px='12' {...props}>
+      {chatId ? (
+        <Flex flexDir={'column'}>
+          <Box my='3'>
+            <Heading as='h2' fontWeight={'semibold'} fontSize='3xl'>
+              John Doe
+            </Heading>
+          </Box>
+          <Stack h='65vh' overflowY={'scroll'} mb='12' mt='6' spacing={'3'} pr='8'>
+            <Message isMyMessage={false}>
+              <Message.Avatar fullname='John Doe' />
+              <Message.Text content={'Lorem ipsum dolor sit amet consectetur adipisicing elit.'} time='18:00' />
+            </Message>
+            <Message isMyMessage={true}>
+              <Message.Avatar fullname='Sergey Yarkov' />
+              <Message.Text content={'Lorem ipsum dolor sit amet consectetur.'} time='18:00' />
+            </Message>
+          </Stack>
+          <Flex mt='auto' alignItems={'flex-end'}>
+            <Input
+              resize={'block'}
+              type='text'
+              placeholder='Write a message...'
+              maxW='900px'
+              variant={'outline'}
+              rounded='xl'
+              mr='2'
+            />
+            <IconButton
+              icon={<MdSend />}
+              aria-label='Send message'
+              variant={'ghost'}
+              _hover={{ bg: 'inherit' }}
+              _active={{ bg: 'inherit' }}
+              _focus={{ outline: 'none' }}
+            />
+          </Flex>
+        </Flex>
+      ) : (
+        <Box textAlign={'center'} mt={{ base: '0', lg: '15rem' }}>
+          <Icon as={MdOutlineChat} color='gray.600' w='16' h='16' />
+          <Text color='gray.500' userSelect={'none'}>
+            Select a chat to start messaging
+          </Text>
+        </Box>
+      )}
+    </GridItem>
+  );
+};
+
+export { Window };
diff --git a/src/components/Chat/Window/index.ts b/src/components/Chat/Window/index.ts
new file mode 100644
index 0000000..6ec26f3
--- /dev/null
+++ b/src/components/Chat/Window/index.ts
@@ -0,0 +1 @@
+export { Window } from './Window';
diff --git a/src/components/Chat/context.ts b/src/components/Chat/context.ts
new file mode 100644
index 0000000..246853b
--- /dev/null
+++ b/src/components/Chat/context.ts
@@ -0,0 +1,21 @@
+import React, { useContext, createContext } from 'react';
+
+export type ChatContextType = {
+  search: string;
+  setSearch: React.Dispatch<React.SetStateAction<string>>;
+};
+
+export const ChatContext = createContext<ChatContextType>({
+  search: '',
+  setSearch: () => undefined,
+});
+
+export const useChatContext = () => {
+  const context = useContext(ChatContext);
+
+  if (!context) {
+    throw new Error('ChatContext was outside of its provider');
+  }
+
+  return context;
+};
diff --git a/src/components/Chat/index.tsx b/src/components/Chat/index.tsx
index 780ad16..c2ea525 100644
--- a/src/components/Chat/index.tsx
+++ b/src/components/Chat/index.tsx
@@ -2,17 +2,21 @@ import React from 'react';
 import { Grid, GridItemProps, GridProps } from '@chakra-ui/react';
 import { Sidebar } from './Sidebar';
 import { Window } from './Window';
+import { ISidebarComposition } from './Sidebar/Sidebar';
+import { ChatContextProvider } from './ChatContextProvider';
 
 interface IChatComposition {
-  Sidebar: React.FC<GridItemProps>;
+  Sidebar: React.FC<GridItemProps> & ISidebarComposition;
   Window: React.FC<GridItemProps>;
 }
 
 const Chat: React.FC<GridProps> & IChatComposition = props => {
   return (
-    <Grid gridTemplateColumns={'1fr 3fr'} h='100vh' {...props}>
-      {props.children}
-    </Grid>
+    <ChatContextProvider>
+      <Grid gridTemplateColumns={{ base: '1fr', lg: '1fr 3fr' }} h='100vh' {...props}>
+        {props.children}
+      </Grid>
+    </ChatContextProvider>
   );
 };
 
diff --git a/src/components/UserProfile/Avatar/ChatButton.tsx b/src/components/UserProfile/Avatar/ChatButton.tsx
index 92f0158..4186059 100644
--- a/src/components/UserProfile/Avatar/ChatButton.tsx
+++ b/src/components/UserProfile/Avatar/ChatButton.tsx
@@ -7,7 +7,7 @@ import type { IChatButtonProps } from '.';
 const ChatButton: React.FC<IChatButtonProps & ButtonProps> = props => {
   const { userid } = props;
   const history = useHistory();
-  const handleChat = () => history.push(`/chat/${userid}`);
+  const handleChat = () => history.push(`/messages?chat_id=${userid}`);
 
   return (
     <Button onClick={handleChat} mt='5' variant={'outline'} size={'sm'} leftIcon={<MdOutlineMessage />} {...props}>
diff --git a/src/pages/messages/messages.tsx b/src/pages/messages/messages.tsx
index 8f22d5a..fc1d8d7 100644
--- a/src/pages/messages/messages.tsx
+++ b/src/pages/messages/messages.tsx
@@ -1,28 +1,6 @@
 import React from 'react';
-import {
-  Avatar,
-  AvatarBadge,
-  Box,
-  Flex,
-  Heading,
-  WrapItem,
-  Text,
-  Stack,
-  Input,
-  Icon,
-  Button,
-  HStack,
-  InputGroup,
-  InputLeftElement,
-  useColorModeValue,
-} from '@chakra-ui/react';
-import { Link as ReactRouterLink } from 'react-router-dom';
 import { Page } from '@educt/components/PageElements';
-
 import { IPageProps } from '@educt/interfaces';
-import { MdOutlineChat } from 'react-icons/md';
-import { LinkBox, LinkOverlay } from '@chakra-ui/react';
-import { SearchIcon } from '@chakra-ui/icons';
 import { Chat } from '@educt/components/Chat';
 
 /**
@@ -34,75 +12,10 @@ const MessagesPage: React.FC<IPageProps> = () => {
       <Page.Content>
         <Chat>
           <Chat.Sidebar>
-            <Flex my='4' justifyContent={'space-between'} alignItems={'center'}>
-              <Heading as='h2' fontSize={'md'} fontWeight='medium' mr='9'>
-                Chats
-              </Heading>
-              <InputGroup maxW='230px' size='sm'>
-                <InputLeftElement pointerEvents='none'>
-                  <SearchIcon color='gray.300' />
-                </InputLeftElement>
-                <Input type='text' placeholder='Search' borderRadius={'md'} />
-              </InputGroup>
-            </Flex>
-            <HStack>
-              <Button isActive variant={'ghost'} size='sm'>
-                All
-              </Button>
-              <Button colorScheme={'blue'} variant='ghost' size='sm'>
-                Unread
-              </Button>
-            </HStack>
-            <Stack mt='12' maxH='690px' overflowY={'scroll'} pr='3'>
-              {Array(20)
-                .fill(0)
-                .map((e, i) => i)
-                .map(n => (
-                  <LinkBox
-                    key={n}
-                    py='5'
-                    px='4'
-                    bg={n === 2 ? useColorModeValue('gray.50', 'gray.700') : ''}
-                    borderRadius={'lg'}
-                    _hover={{ bg: `${useColorModeValue('gray.50', 'gray.700')}` }}
-                    transition='all .1s'
-                  >
-                    <Flex flexDir={'row'} alignItems={'center'}>
-                      <WrapItem>
-                        <Avatar name='Sergey Yarkov' size='md'>
-                          <AvatarBadge boxSize='0.90em' bg='green.500' />
-                        </Avatar>
-                      </WrapItem>
-                      <Box ml='4'>
-                        <LinkOverlay as={ReactRouterLink} to='/'>
-                          <Text fontWeight={'semibold'}>
-                            Sergey Yarkov <br />
-                            <Text as={'span'} fontWeight='normal' fontSize={'sm'} color='gray.500'>
-                              Sergey: hello, how you doing?
-                            </Text>
-                          </Text>
-                        </LinkOverlay>
-                      </Box>
-                      <Box alignSelf={'flex-end'} ml='auto'>
-                        <Text as='span' color='gray.500'>
-                          2h
-                        </Text>
-                      </Box>
-                    </Flex>
-                  </LinkBox>
-                ))}
-            </Stack>
+            <Chat.Sidebar.Heading />
+            <Chat.Sidebar.Users />
           </Chat.Sidebar>
-          <Chat.Window>
-            <Flex justifyContent={'center'} mt='20rem'>
-              <Box textAlign={'center'}>
-                <Icon as={MdOutlineChat} color='gray.600' w='16' h='16' />
-                <Text color='gray.500' userSelect={'none'}>
-                  Select a chat to start messaging
-                </Text>
-              </Box>
-            </Flex>
-          </Chat.Window>
+          <Chat.Window />
         </Chat>
       </Page.Content>
     </Page>