Merge branch 'master' of https://github.com/monkey-team-3801/on-board

monkey-team-3801 · Oct 27, 2020 · ccbdb2a · ccbdb2a
2 parents 5d4e8ee + b9a321d
commit ccbdb2a
Show file tree

Hide file tree

Showing 34 changed files with 966 additions and 394 deletions.
diff --git a/debug.log b/debug.log
@@ -1,3 +1,5 @@
+[1022/141204.980:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
+
 [1009/090500.006:ERROR:process_reader_win.cc(151)] SuspendThread: Access is denied. (0x5)
 [1009/090500.011:ERROR:process_reader_win.cc(151)] SuspendThread: Access is denied. (0x5)
 [1009/090500.012:ERROR:process_reader_win.cc(151)] SuspendThread: Access is denied. (0x5)

diff --git a/src/client/canvas/DrawingCanvas.tsx b/src/client/canvas/DrawingCanvas.tsx
@@ -317,7 +317,7 @@ export const DrawingCanvas: React.FunctionComponent<Props> = (props: Props) => {
                         <canvas
                             ref={canvasRefCallback}
                             width={1000}
-                            height={800}
+                            height={700}
                             onMouseDown={onMouseDown}
                             onMouseUp={onMouseUp}
                             onMouseMove={(e) => {

diff --git a/src/client/chat/Chat.less b/src/client/chat/Chat.less
@@ -1,6 +1,6 @@
 .chat-container {
     .chat-log-container {
-        height: 300px;
+        height: 100%;
         overflow-y: auto;
         overflow-x: hidden;
         .message-container {

diff --git a/src/client/chat/ChatContainer.tsx b/src/client/chat/ChatContainer.tsx
@@ -99,9 +99,9 @@ export const ChatContainer: React.FunctionComponent<Props> = (props: Props) => {
             <Row>
                 <ChatLog messages={data || []} currentUser={props.username} />
             </Row>
-            <Row className="d-flex m-1 p-1 ">
+            <Row className="d-flex m-1 p-1 justify-content-center">
                 <Form onSubmit={onSubmit}>
-                    <Form.Row className="d-flex justify-content-center flex-nowrap align-content-start ">
+                    <Form.Row className="d-flex justify-content-center flex-nowrap align-content-start">
                         <Col>
                             <Form.Control
                                 className="send-chat"
@@ -113,7 +113,7 @@ export const ChatContainer: React.FunctionComponent<Props> = (props: Props) => {
                             />
                         </Col>
                         <Col xs="auto">
-                            <Button type="submit" className="mr-2 ">
+                            <Button type="submit" className="mr-2" size="sm">
                                 Send
                             </Button>
                         </Col>

diff --git a/src/client/chat/ChatLog.tsx b/src/client/chat/ChatLog.tsx
@@ -18,7 +18,11 @@ export const ChatLog: React.FunctionComponent<Props> = (props: Props) => {
     const scrollAnchorRef = React.useRef<HTMLDivElement | null>(null);
 
     React.useEffect(() => {
-        scrollAnchorRef.current?.scrollIntoView({ behavior: "smooth" });
+        scrollAnchorRef.current?.scrollIntoView({
+            behavior: "smooth",
+            block: "nearest",
+            inline: "start",
+        });
     }, [messages]);
 
     return (

diff --git a/src/client/chat/ChatSession.tsx b/src/client/chat/ChatSession.tsx
@@ -187,7 +187,11 @@ export const ChatSession: React.FunctionComponent<Props> = (props: Props) => {
                                     />
                                 </Col>
                                 <Col xs="auto">
-                                    <Button type="submit" className="mb-2">
+                                    <Button
+                                        type="submit"
+                                        className="mb-2"
+                                        size="sm"
+                                    >
                                         Send
                                     </Button>
                                 </Col>

diff --git a/src/client/filehandler/FileModal.tsx b/src/client/filehandler/FileModal.tsx
@@ -21,30 +21,20 @@ type Props = {
     }>;
     roomType: RoomType;
     isLoading?: boolean;
-    size?: "sm" | "lg";
+    setShowModal: Function;
+    showModal: boolean;
 };
 
 /**
  * Similar to the file container but is rendered in an file modal.
  */
 export const FileModal = (props: Props) => {
-    const [showModal, setShowModal] = React.useState<boolean>(false);
-
     return (
         <div>
-            <Button
-                className="file-modal"
-                size={props.size}
-                onClick={() => {
-                    setShowModal(true);
-                }}
-            >
-                Files
-            </Button>
             <Modal
-                show={showModal}
+                show={props.showModal}
                 onHide={() => {
-                    setShowModal(false);
+                    props.setShowModal(false);
                 }}
                 size="xl"
                 scrollable={true}
@@ -67,7 +57,7 @@ export const FileModal = (props: Props) => {
                     <Button
                         variant="primary"
                         onClick={() => {
-                            setShowModal(false);
+                            props.setShowModal(false);
                         }}
                     >
                         Close

diff --git a/src/client/hooks/useScreenSharing.tsx b/src/client/hooks/useScreenSharing.tsx
@@ -92,7 +92,7 @@ export const useScreenSharing = (
             setScreenStream(stream);
         } catch (e) {
             console.log("Error getting screen from user", e);
-            return;
+            return Promise.reject(e);
         }
 
         // Create new peer