Merge #95

95: Use off-the-shelf React Templates for UI r=D4nte a=littlealex003

- **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
Refactor

- **What is the current behavior?** (You can also link to an open issue here)
Custom React Material UI Implementation

- **What is the new behavior (if this is a feature change)?**
Off the shelf React Material Chat UI Implementation


Co-authored-by: littlealex003 <littlealex003@gmail.com>

web-chat/.cspell.json

@@ -33,6 +33,7 @@
     "lastpub",
     "libauth",
     "libp",
+    "livechat",
     "mkdir",
     "multiaddr",
     "multiaddrs",

web-chat/package.json

@@ -4,10 +4,10 @@
   "private": true,
   "homepage": "/js-waku",
   "dependencies": {
-    "@material-ui/core": "^4.11.3",
+    "@livechat/ui-kit": "*",
     "peer-id": "^0.14.8",
-    "react": "^17.0.2",
+    "react": "^16.14.0",
-    "react-dom": "^17.0.2",
+    "react-dom": "^16.14.0",
     "server-name-generator": "^1.0.5",
     "waku": "file:../build/main/lib",
     "waku-chat": "file:../build/main/chat",

web-chat/src/App.tsx

@@ -9,6 +9,7 @@ import handleCommand from './command';
 import Room from './Room';
 import Waku from 'waku/waku';
 import { WakuContext } from './WakuContext';
+import { ThemeProvider } from '@livechat/ui-kit';
 import { generate } from 'server-name-generator';
 
 export const ChatContentTopic = 'dingpu';
@@ -49,6 +50,7 @@ export default function App() {
       style={{ height: '100vh', width: '100vw', overflow: 'hidden' }}
     >
       <WakuContext.Provider value={{ waku: stateWaku }}>
+        <ThemeProvider>
           <Room
             nick={nick}
             lines={stateMessages}
@@ -64,6 +66,7 @@ export default function App() {
               copyAndReplace(commandMessages, stateMessages, setMessages);
             }}
           />
+        </ThemeProvider>
       </WakuContext.Provider>
     </div>
   );

web-chat/src/ChatList.tsx

@@ -1,13 +1,6 @@
-import {
+import { useEffect, useRef } from 'react';
-  Card,
-  CardContent,
-  List,
-  ListItem,
-  ListItemText,
-  Typography,
-} from '@material-ui/core';
-import React, { useEffect, useRef } from 'react';
 import { ChatMessage } from '../../build/main/chat/chat_message';
+import { Message, MessageText, MessageGroup } from '@livechat/ui-kit';
 
 interface Props {
   messages: ChatMessage[];
@@ -16,59 +9,32 @@ interface Props {
 export default function ChatList(props: Props) {
   const messages = props.messages;
 
-  const listItems = messages.map((message) => (
+  const listItems = messages.map((currentMessage) => (
-    <ListItem key={message.timestamp.toString()}>
+    <Message
-      <ListItemText primary={<Message message={message} />} />
+      key={currentMessage.timestamp.toString()}
-    </ListItem>
+      authorName={currentMessage.nick}
+      date={formatDisplayDate(currentMessage)}
+    >
+      <MessageText>{currentMessage.message}</MessageText>
+    </Message>
   ));
 
   return (
-    <List dense={true}>
+    <MessageGroup>
       {listItems}
       <AlwaysScrollToBottom messages={messages} />
-    </List>
+    </MessageGroup>
   );
-}
 
-interface MessageProps {
+  function formatDisplayDate(message: ChatMessage) {
-  message: ChatMessage;
+    return message.timestamp.toLocaleString([], {
-}
-
-function Message(props: MessageProps) {
-  const chatMsg = props.message;
-  const timestamp = chatMsg.timestamp.toLocaleString([], {
       month: 'short',
       day: 'numeric',
       hour: 'numeric',
       minute: '2-digit',
       hour12: false,
     });
-
+  }
-  // {`<${timestamp}> ${chatMsg.nick}: ${chatMsg.message}`}
-  return (
-    <Card className="chat-message" variant="outlined">
-      <CardContent>
-        <Typography className="chat-nick" variant="subtitle2">
-          {chatMsg.nick}
-          <Typography
-            className="chat-timestamp"
-            color="textSecondary"
-            variant="caption"
-            style={{ marginLeft: 3 }}
-          >
-            {timestamp}
-          </Typography>
-        </Typography>
-        <Typography
-          className="chat-message-content"
-          variant="body1"
-          component="p"
-        >
-          {chatMsg.message}
-        </Typography>
-      </CardContent>
-    </Card>
-  );
 }
 
 const AlwaysScrollToBottom = (props: Props) => {

web-chat/src/MessageInput.tsx

@@ -1,6 +1,13 @@
-import React, { ChangeEvent, KeyboardEvent, useState } from 'react';
+import { ChangeEvent, KeyboardEvent, useState } from 'react';
-import { Button, Grid, TextField } from '@material-ui/core';
 import { useWaku } from './WakuContext';
+import {
+  TextInput,
+  TextComposer,
+  Row,
+  Fill,
+  Fit,
+  SendButton,
+} from '@livechat/ui-kit';
 
 interface Props {
   messageHandler: (msg: string) => void;
@@ -30,32 +37,20 @@ export default function MessageInput(props: Props) {
   };
 
   return (
-    <Grid container direction="row" alignItems="center">
+    <TextComposer
-      <Grid item xs={11}>
+      onKeyDown={keyPressHandler}
-        <TextField
-          variant="outlined"
-          label="Send a message"
-          value={inputText}
-          fullWidth={true}
-          InputLabelProps={{
-            shrink: true,
-          }}
       onChange={messageHandler}
-          onKeyPress={keyPressHandler}
+      active={waku}
-          disabled={!waku}
+      onButtonClick={sendMessage}
-        />
-      </Grid>
-      <Grid item xs={1}>
-        <Button
-          variant="contained"
-          color="primary"
-          size="large"
-          onClick={sendMessage}
-          disabled={!waku}
     >
-          Send
+      <Row align="center">
-        </Button>
+        <Fill>
-      </Grid>
+          <TextInput value={inputText} />
-    </Grid>
+        </Fill>
+        <Fit>
+          <SendButton />
+        </Fit>
+      </Row>
+    </TextComposer>
   );
 }

web-chat/src/Room.tsx

@@ -1,10 +1,11 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import { ChatMessage } from 'waku-chat/chat_message';
 import { WakuMessage } from 'waku/waku_message';
 import { ChatContentTopic } from './App';
 import ChatList from './ChatList';
 import MessageInput from './MessageInput';
 import { useWaku } from './WakuContext';
+import { TitleBar, MessageList } from '@livechat/ui-kit';
 
 interface Props {
   lines: ChatMessage[];
@@ -21,13 +22,10 @@ export default function Room(props: Props) {
       className="chat-container"
       style={{ height: '98vh', display: 'flex', flexDirection: 'column' }}
     >
-      <div
+      <TitleBar title="Waku v2 chat app" />
-        className="chat-list"
+      <MessageList active containScrollInSubtree>
-        style={{ display: 'flex', flexGrow: 1, overflowY: 'scroll' }}
-      >
         <ChatList messages={props.lines} />
-      </div>
+      </MessageList>
-      <div className="chat-input" style={{ display: 'flex', padding: 20 }}>
       <MessageInput
         messageHandler={setMessageToSend}
         sendMessage={
@@ -44,7 +42,6 @@ export default function Room(props: Props) {
         }
       />
     </div>
-    </div>
   );
 }
 

web-chat/src/types/types.d.ts

@@ -0,0 +1 @@
+declare module '@livechat/ui-kit';

web-chat/tsconfig.json

@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": [
+    "lib": ["dom", "dom.iterable", "esnext"],
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -18,9 +14,8 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
+    "typeRoots": ["node_modules/@types", "src/types"]
   },
-  "include": [
+  "include": ["src"]
-    "src"
-  ]
 }