From eba38f7128b59c9f7d9e83bac63e0186ced926fa Mon Sep 17 00:00:00 2001 From: arnb-smnta Date: Fri, 10 May 2024 12:45:46 +0530 Subject: [PATCH 1/4] feat: chatapp-logoutbutton --- .../web/react-vite-tailwind/src/pages/chat.tsx | 15 ++++++++++++++- yarn.lock | 11 ++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx b/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx index 365e946c..f15392e6 100644 --- a/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx +++ b/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx @@ -15,7 +15,7 @@ import ChatItem from "../components/chat/ChatItem"; import MessageItem from "../components/chat/MessageItem"; import Typing from "../components/chat/Typing"; import Input from "../components/Input"; -import { useAuth } from "../context/AuthContext"; +import { AuthContext, useAuth } from "../context/AuthContext"; import { useSocket } from "../context/SocketContext"; import { ChatListItemInterface, @@ -41,6 +41,11 @@ const MESSAGE_DELETE_EVENT = "messageDeleted"; // const SOCKET_ERROR_EVENT = "socketError"; const ChatPage = () => { + //logout function + + const { logout } = useAuth(); + const handlelogout = async () => await logout(); + // Import the 'useAuth' and 'useSocket' hooks from their respective contexts const { user } = useAuth(); const { socket } = useSocket(); @@ -426,6 +431,14 @@ const ChatPage = () => {
+ + Date: Fri, 10 May 2024 12:52:35 +0530 Subject: [PATCH 2/4] fix: fix yarn.lock --- yarn.lock | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9e548dfb..99002d22 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2726,7 +2726,7 @@ ee-first@1.1.1: resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@^3.1.6: +ejs@^3.1.10, ejs@^3.1.6: version "3.1.10" resolved "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== @@ -3106,15 +3106,14 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -formidable@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.1.2.tgz#fa973a2bec150e4ce7cac15589d7a25fc30ebd89" - integrity sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g== +formidable@^2.1.2, formidable@^3.5.1: + version "3.5.1" + resolved "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz#9360a23a656f261207868b1484624c4c8d06ee1a" + integrity sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og== dependencies: dezalgo "^1.0.4" hexoid "^1.0.0" once "^1.4.0" - qs "^6.11.0" forwarded@0.2.0: version "0.2.0" @@ -6413,4 +6412,4 @@ yn@3.1.1: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file From 581381bf7909df3c23e1d2789afbca37a56b9536 Mon Sep 17 00:00:00 2001 From: arnb-smnta Date: Sat, 11 May 2024 11:08:08 +0530 Subject: [PATCH 3/4] fix: fix the import problem --- .../apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx b/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx index f15392e6..3e019c11 100644 --- a/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx +++ b/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx @@ -15,7 +15,7 @@ import ChatItem from "../components/chat/ChatItem"; import MessageItem from "../components/chat/MessageItem"; import Typing from "../components/chat/Typing"; import Input from "../components/Input"; -import { AuthContext, useAuth } from "../context/AuthContext"; +import { useAuth } from "../context/AuthContext"; import { useSocket } from "../context/SocketContext"; import { ChatListItemInterface, From 78a4dc69ff62cbab89845fb76e46f974bbd2379d Mon Sep 17 00:00:00 2001 From: Shubham Waje Date: Fri, 17 May 2024 23:26:34 +0530 Subject: [PATCH 4/4] refactor: repeated destructuring and unnecessary function --- .../chat-app/web/react-vite-tailwind/src/pages/chat.tsx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx b/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx index 3e019c11..69dd3aec 100644 --- a/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx +++ b/examples/apps/chat-app/web/react-vite-tailwind/src/pages/chat.tsx @@ -41,13 +41,8 @@ const MESSAGE_DELETE_EVENT = "messageDeleted"; // const SOCKET_ERROR_EVENT = "socketError"; const ChatPage = () => { - //logout function - - const { logout } = useAuth(); - const handlelogout = async () => await logout(); - // Import the 'useAuth' and 'useSocket' hooks from their respective contexts - const { user } = useAuth(); + const { user, logout } = useAuth(); const { socket } = useSocket(); // Create a reference using 'useRef' to hold the currently selected chat. @@ -434,7 +429,7 @@ const ChatPage = () => {