From af2f99867a47b3b674b19a336cfc78cc297fa3b8 Mon Sep 17 00:00:00 2001 From: danisharora099 Date: Wed, 2 Aug 2023 17:59:37 +0530 Subject: [PATCH] refactor all files and switch to tailwindcss --- examples/web-chat/src/App.tsx | 1 - examples/web-chat/src/ChatList.tsx | 30 ++++++++---------- examples/web-chat/src/MessageInput.tsx | 42 +++++++++++------------- examples/web-chat/src/Room.tsx | 15 +++------ examples/web-chat/src/index.tsx | 44 ++++---------------------- 5 files changed, 44 insertions(+), 88 deletions(-) diff --git a/examples/web-chat/src/App.tsx b/examples/web-chat/src/App.tsx index 5b2731c..00101a2 100644 --- a/examples/web-chat/src/App.tsx +++ b/examples/web-chat/src/App.tsx @@ -1,4 +1,3 @@ -import "./App.css"; import handleCommand from "./command"; import Room from "./Room"; import { Message } from "./Message"; diff --git a/examples/web-chat/src/ChatList.tsx b/examples/web-chat/src/ChatList.tsx index d16cc98..9f7f982 100644 --- a/examples/web-chat/src/ChatList.tsx +++ b/examples/web-chat/src/ChatList.tsx @@ -1,9 +1,4 @@ import { useEffect, useRef } from "react"; -import { - Message as LiveMessage, - MessageText, - MessageList, -} from "@livechat/ui-kit"; import { Message } from "./Message"; interface Props { @@ -12,25 +7,28 @@ interface Props { export default function ChatList(props: Props) { const renderedMessages = props.messages.map((message) => ( - - {message.payloadAsUtf8} - + {message.nick} + + {formatDisplayDate(message)} + +

{message.payloadAsUtf8}

+ )); return ( - +
{renderedMessages} - +
); } @@ -45,13 +43,13 @@ function formatDisplayDate(message: Message): string { } const AlwaysScrollToBottom = (props: { messages: Message[] }) => { - const elementRef = useRef(); + const elementRef = useRef(null); useEffect(() => { - // @ts-ignore - elementRef.current.scrollIntoView(); + if (elementRef.current) { + elementRef.current.scrollIntoView(); + } }, [props.messages]); - // @ts-ignore return
; }; diff --git a/examples/web-chat/src/MessageInput.tsx b/examples/web-chat/src/MessageInput.tsx index da7488d..8070712 100644 --- a/examples/web-chat/src/MessageInput.tsx +++ b/examples/web-chat/src/MessageInput.tsx @@ -1,14 +1,6 @@ import { ChangeEvent, KeyboardEvent, useEffect, useState } from "react"; import { useWaku } from "@waku/react"; import { LightNode } from "@waku/interfaces"; -import { - TextInput, - TextComposer, - Row, - Fill, - Fit, - SendButton, -} from "@livechat/ui-kit"; interface Props { hasLightPushPeers: boolean; @@ -60,20 +52,24 @@ export default function MessageInput(props: Props) { }, [node, inputText, hasLightPushPeers]); return ( - - - - - - - - - - +
+ + +
); } diff --git a/examples/web-chat/src/Room.tsx b/examples/web-chat/src/Room.tsx index 5fb1f41..9059b41 100644 --- a/examples/web-chat/src/Room.tsx +++ b/examples/web-chat/src/Room.tsx @@ -2,7 +2,6 @@ import type { LightNode } from "@waku/interfaces"; import ChatList from "./ChatList"; import MessageInput from "./MessageInput"; import { useWaku, useContentPair, useLightPush } from "@waku/react"; -import { TitleBar } from "@livechat/ui-kit"; import { Message } from "./Message"; import { ChatMessage } from "./chat_message"; import { useNodePeers, usePeers } from "./hooks"; @@ -49,15 +48,11 @@ export default function Room(props: Props) { const bootstrapPeersMessage = `Bootstrap (DNS Discovery): ${bootstrapPeers.size}, Peer exchange: ${peerExchangePeers.size}. `; return ( -
- +
+
+
{peersMessage}
+
{bootstrapPeersMessage} View console for more details.
+
diff --git a/examples/web-chat/src/index.tsx b/examples/web-chat/src/index.tsx index 44245dd..a56ef73 100644 --- a/examples/web-chat/src/index.tsx +++ b/examples/web-chat/src/index.tsx @@ -1,11 +1,10 @@ import React from "react"; import ReactDOM from "react-dom"; -import { ThemeProvider } from "@livechat/ui-kit"; import { LightNodeProvider, ContentPairProvider } from "@waku/react"; import { wakuDnsDiscovery, enrTree } from "@waku/dns-discovery"; import { wakuPeerExchangeDiscovery } from "@waku/peer-exchange"; - import "./index.css"; + import App from "./App"; import { CONTENT_TOPIC, PROTOCOLS } from "./config"; @@ -22,44 +21,13 @@ const NODE_OPTIONS = { }, }; -const THEMES = { - AuthorName: { - css: { - fontSize: "1.1em", - }, - }, - Message: { - css: { - margin: "0em", - padding: "0em", - fontSize: "0.83em", - }, - }, - MessageText: { - css: { - margin: "0em", - padding: "0.1em", - paddingLeft: "1em", - fontSize: "1.1em", - }, - }, - MessageGroup: { - css: { - margin: "0em", - padding: "0.2em", - }, - }, -}; - ReactDOM.render( - - - - - - - + + + + + , document.getElementById("root") );