8000 Stopped using reload for edit and delete messages and using state, and finished replying to messages by nicholascheww · Pull Request #41 · MakanMatch/Frontend · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Stopped using reload for edit and delete messages and using state, and finished replying to messages #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jul 11, 2024
Merged

Stopped using reload for edit and delete messages and using state, and finished replying to messages #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ce9d8f7
removed timestamp completely
nicholascheww Jul 5, 2024
81c7bf6
Merge pull request #34 from MakanMatch/main
nicholascheww Jul 5, 2024
2db8f35
changed edit message to use state
nicholascheww Jul 5, 2024
d4048ec
started work on replying to messages
nicholascheww Jul 5, 2024
c9754d9
reply bubble works
nicholascheww Jul 6, 2024
99259cf
reply message doesnt disappear on reload
nicholascheww Jul 8, 2024
43ce363
moved replying to the top and also a cancel button for it button
nicholascheww Jul 8, 2024
233b892
changed delete message to use state
nicholascheww Jul 8, 2024
bd2d790
adjusted image and also scroll to bottom
nicholascheww Jul 8, 2024
7755d49
added datetime to show the messages
nicholascheww Jul 8, 2024
18232da
changed prompt to use modal for edit message
nicholascheww Jul 8, 2024
f161a16
display (edited) if the message is edited
nicholascheww Jul 8, 2024
fa9c41b
re removed console.log
nicholascheww Jul 8, 2024
f733fd0
removed cheveron
nicholascheww Jul 8, 2024
f9727fc
moved chat features to a triple dot thingy
nicholascheww Jul 8, 2024
dbbc8a6
made edit text smaller
nicholascheww Jul 8, 2024
d4b9f3c
removed unused state
nicholascheww Jul 9, 2024
c97b26b
removed console log
Prakhar896 Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 109 additions & 56 deletions src/components/chat/ChatBubble.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,36 @@ import {
Flex,
Image,
IconButton,
Tooltip,
Menu,
MenuButton,
MenuList,
MenuItem,
useColorModeValue,
} from "@chakra-ui/react";
import { ChevronRightIcon, ChevronLeftIcon } from "@chakra-ui/icons";
import { FiEdit, FiTrash2 } from "react-icons/fi"; // Import icons from react-icons/fi
import { FiEdit, FiTrash2, FiMoreVertical } from "react-icons/fi";
import { FaReply } from "react-icons/fa";

function ChatBubble({
message,
timestamp,
isSender,
photoUrl,
onEdit,
onDelete,
onReply,
repliedMessage,
edited,
}) {
const menuItemColor = useColorModeValue("teal.500", "teal.200");
const menuItemHoverBg = useColorModeValue("teal.100", "teal.600");

function ChatBubble({ message, timestamp, isSender, photoUrl, onEdit, onDelete }) {
return (
<Box position="relative" marginY={2} maxW="70%" alignSelf={isSender ? 'flex-end' : 'flex-start'}>
<Box
position="relative"
marginY={2}
maxW="70%"
alignSelf={isSender ? "flex-end" : "flex-start"}
>
<Flex alignItems="center">
{!isSender && (
<Image
Expand All @@ -21,66 +43,97 @@ function ChatBubble({ message, timestamp, isSender, photoUrl, onEdit, onDelete }
boxSize="40px"
borderRadius="full"
marginRight={3}
marginTop={"-25px"}
marginTop="-40px"
/>
)}
<Box position="relative">
{isSender && (
<ChevronLeftIcon
color="blue.500"
boxSize={8}
position="absolute"
top="25%"
transform="translateY(-50%)"
right="-20px"
/>
)}
{!isSender && (
<ChevronRightIcon
color="black.200"
boxSize={8}
position="absolute"
top="25%"
transform="translateY(-50%)"
left="-20px"
/>
)}
<Box position="relative" width="100%">
<Box
bg={isSender ? 'blue.500' : 'gray.200'}
color={isSender ? 'white' : 'black'}
bg={isSender ? "blue.500" : "gray.200"}
color={isSender ? "white" : "black"}
borderRadius="lg"
p={3}
pb={4} // Adding bottom padding
pt={6} // Adding top padding to accommodate the menu button
position="relative"
>
<Text>{message}</Text>
<Box position="absolute" top={1} right={1}>
<Menu>
<MenuButton
as={IconButton}
icon={<FiMoreVertical />}
size="sm"
variant="ghost"
/>
<MenuList>
{!isSender && (
<MenuItem
icon={<FaReply />}
>
_hover={{ bg: menuItemHoverBg, color: menuItemColor }}
color={menuItemColor}
>
Reply
</MenuItem>
)}
{isSender && (
<>
<MenuItem
icon={<FiEdit />}
>
_hover={{ bg: menuItemHoverBg, color: menuItemColor }}
color={menuItemColor}
>
Edit
</MenuItem>
<MenuItem
icon={<FiTrash2 />}
>
_hover={{ bg: menuItemHoverBg, color: menuItemColor }}
color={menuItemColor}
>
Delete
</MenuItem>
</>
)}
</MenuList>
</Menu>
</Box>
{repliedMessage && (
<Box
bg={isSender ? "blue.300" : "gray.100"}
p={2}
borderRadius="md"
mb={2}
>
<Text fontSize="sm" color={isSender ? "white" : "black"}>
{repliedMessage}
</Text>
</Box>
)}
<Text>
{message}
{edited && (
<Text
as="span"
fontSize="xs" // Making the text smaller
color={isSender ? "gray.300" : "gray.500"}
marginLeft={2}
>
(edited)
</Text>
)}
</Text>

{timestamp && (
<Text fontSize="xs" color={isSender ? 'gray.300' : 'gray.500'} marginTop={1} textAlign="right">
<Text
fontSize="xs"
color={isSender ? "gray.300" : "gray.500"}
marginTop={1}
textAlign="right"
>
{timestamp}
</Text>
)}
{isSender && (
<Flex mt={2} justifyContent="flex-end">
<Tooltip label="Edit" hasArrow>
<IconButton
icon={<FiEdit />}
size="sm"
>
mr={2}
variant="ghost"
colorScheme="gray"
/>
</Tooltip>
<Tooltip label="Delete" hasArrow>
<IconButton
icon={<FiTrash2 />}
size="sm"
>
variant="ghost"
colorScheme="red"
/>
</Tooltip>
</Flex>
)}
</Box>
</Box>
{isSender && (
Expand All @@ -90,12 +143,12 @@ function ChatBubble({ message, timestamp, isSender, photoUrl, onEdit, onDelete }
boxSize="40px"
borderRadius="full"
marginLeft={3}
marginTop={"-25px"}
marginTop="-60px" // Adjusted marginTop to align with message bubble
/>
)}
</Flex>
</Box>
);
}

export default ChatBubble;
export default ChatBubble;
Loading
0