Merge pull request #90 from bhargavmodak/main

FrontEnd is ready for deployment on Netlify
Evozone · Apr 8, 2024 · 4c2b529 · 4c2b529
2 parents 983a032 + 12595dd
commit 4c2b529
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 
 # production
 /build
+/client/build
 
 # misc
 .DS_Store

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/src/components/home/HomeMenu.js b/client/src/components/home/HomeMenu.js
@@ -25,7 +25,6 @@ import LightModeIcon from '@mui/icons-material/LightMode';
 import DarkModeIcon from '@mui/icons-material/DarkMode';
 
 export default function HomeMenu({
-    notificationGranted,
     setNotificationGranted,
     themeChange,
     mode,

diff --git a/client/src/components/home/HomeRightSide.js b/client/src/components/home/HomeRightSide.js
@@ -158,7 +158,7 @@ export default function HomeRightSide({ mode, chat }) {
                 backgroundColor: mode === 'dark' ? '#1a1a1a' : '#f5f5f5',
             }}
         >
-            <OtherUserHeader chat={chat} mode={mode} />
+            <OtherUserHeader {...{ chat, mode, startVideoCall, startWorkspace }} />
             <Box
                 sx={{
                     pt: '20px',

diff --git a/client/src/components/landing_page/GoogleOneTapLogIn.js b/client/src/components/landing_page/GoogleOneTapLogIn.js
@@ -59,12 +59,11 @@ const GoogleOneTapLogin = () => {
                 navigate('/chat');
             })
             .catch((error) => {
-                console.log(error);
                 dispatch(
                     notifyAction(
                         true,
                         'error',
-                        'Log In Failed. Please try again'
+                        error.message || 'Log In Failed. Please try again'
                     )
                 );
             });

diff --git a/client/src/components/main_chat/OtherUserHeader.js b/client/src/components/main_chat/OtherUserHeader.js
@@ -8,21 +8,9 @@ import VideoCallIcon from '@mui/icons-material/VideoCall';
 import WorkspacesIcon from '@mui/icons-material/Workspaces';
 import AccountCircleIcon from '@mui/icons-material/AccountCircle';
 import OtherUserModal from './other_user_modal/OtherUserModal';
-import Divider from '@mui/material/Divider';
-
-export default function OtherUserHeader({ chat = [], mode }) {
 
+export default function OtherUserHeader({ chat = [], mode, startVideoCall, startWorkspace }) {
     const [modalOpen, setModalOpen] = useState(false);
-
-    const startVideoCall = () => {
-        // handleSendMessage(INVITE_TEMPLATE, true);
-        window.location.href = `/meet/${chat[0]}`;
-    };
-
-    const startWorkspace = () => {
-        window.location.href = `/workspace/${chat[0]}`;
-    };
-
     return (
         <>
             {modalOpen && (

diff --git a/client/src/components/main_chat/TabsNav.js b/client/src/components/main_chat/TabsNav.js
@@ -281,7 +281,13 @@ export default function TabsNav({
                     unsub();
                 };
             } catch (error) {
-                console.log(error);
+                dispatch(
+                    notifyAction(
+                        true,
+                        'error',
+                        error.message || 'Something went wrong, please try again'
+                    )
+                );
             }
         };
         currentUser.uid && getUserChats();

diff --git a/client/src/components/main_chat/UserProfileModal.js b/client/src/components/main_chat/UserProfileModal.js
@@ -116,10 +116,9 @@ export default function UserProfileModal({
                 notifyAction(
                     true,
                     'error',
-                    'Something went wrong! please try again later.'
+                    error.message || 'An error occurred. Please try again.'
                 )
             );
-            console.log(error);
         }
         dispatch(stopLoadingAction());
         setModalOpen(false);

diff --git a/client/src/components/main_chat/other_user_modal/GithubStats.js b/client/src/components/main_chat/other_user_modal/GithubStats.js
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Box, Typography } from '@mui/material';
+import { Box } from '@mui/material';
 
 const GithubStats = ({ mode, userGithub }) => {
 

diff --git a/client/src/components/main_chat/other_user_modal/OtherUserModal.js b/client/src/components/main_chat/other_user_modal/OtherUserModal.js
@@ -22,7 +22,7 @@ import GithubStats from './GithubStats';
 
 // Firebase
 import { db } from '../../../firebaseConfig';
-import { doc, setDoc, updateDoc, getDoc } from 'firebase/firestore';
+import { doc, getDoc } from 'firebase/firestore';
 
 // Actions
 import {

diff --git a/client/src/components/util/MarkComponent.js b/client/src/components/util/MarkComponent.js
@@ -6,7 +6,6 @@ import { Box, IconButton } from '@mui/material';
 
 const MarkComponent = (props) => {
   const language = props.className;
-  console.log(language?.replace('language-', ''));
   return (
     <Box sx={{
       position: 'relative',

diff --git a/client/src/components/workspace/CodeSidePanel.js b/client/src/components/workspace/CodeSidePanel.js
@@ -83,7 +83,6 @@ export default function CodeSidePanel({
     };
 
     const handleCodeSubmission = async () => {
-        console.log(codeRef.current);
         const sourceCode = codeRef.current;
         const languageId = lang.id;
         setProcessingCode(true);

diff --git a/client/src/components/workspace/SideStrip.js b/client/src/components/workspace/SideStrip.js
@@ -23,7 +23,7 @@ import MicOffIcon from '@mui/icons-material/MicOff';
 import HeadsetIcon from '@mui/icons-material/Headset';
 import HeadsetOffIcon from '@mui/icons-material/HeadsetOff';
 import CallEndIcon from '@mui/icons-material/CallEnd';
-import { doc, updateDoc, setDoc } from 'firebase/firestore';
+import { doc, updateDoc } from 'firebase/firestore';
 import { db } from '../../firebaseConfig';
 import { useParams } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
@@ -98,9 +98,8 @@ export default function SideStrip({ handleSelect, selected }) {
             await updateDoc(dbRef, data);
             window.location.href = '/chat';
         } catch (error) {
-            console.log(error);
             dispatch(
-                notifyAction(true, 'error', 'Error uploading data to cloud')
+                notifyAction(true, 'error', error.message || 'Error uploading data to cloud')
             );
         } finally {
             dispatch(stopLoadingAction());

diff --git a/client/src/components/workspace/StartCall.js b/client/src/components/workspace/StartCall.js
@@ -10,7 +10,6 @@ import {
 
 import Box from '@mui/material/Box';
 import IconButton from '@mui/material/IconButton';
-import AddIcCallIcon from '@mui/icons-material/AddIcCall';
 import PhoneInTalkIcon from '@mui/icons-material/PhoneInTalk';
 
 import CoderOnCall from './CoderOnCall';
@@ -81,7 +80,6 @@ export default function StartCall() {
         dispatch(startLoadingAction());
         try {
             const response = await getToken();
-            console.log(response);
             await hmsActions.join({
                 userName: currentUser.username || 'Anonymous',
                 authToken: response,
@@ -92,7 +90,7 @@ export default function StartCall() {
                     process.env.REACT_APP_100MS_TOKEN_ENDPOINT || undefined,
             });
         } catch (error) {
-            console.log(error);
+            // console.error('Error while joining call', error);
         }
         dispatch(stopLoadingAction());
     };

diff --git a/client/src/components/workspace/WorkSpace.js b/client/src/components/workspace/WorkSpace.js
@@ -1,12 +1,8 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import Box from '@mui/material/Box';
-import Fab from '@mui/material/Fab';
-import CloudUploadIcon from '@mui/icons-material/CloudUpload';
 import CssBaseline from '@mui/material/CssBaseline';
-import Tooltip from '@mui/material/Tooltip';
-import { doc, updateDoc, setDoc } from 'firebase/firestore';
 
 import SidePanel from './SidePanel';
 import Whiteboard from './whiteboard/Whiteboard';
@@ -15,19 +11,12 @@ import SideStrip from './SideStrip';
 import useWorkspaceSocket from '../../hooks/useWorkspaceSocket';
 import { languageOptions } from '../../utils/languageOptions';
 import { customGlobalScrollBars } from '../CustomGlobalCSS';
-import { db } from '../../firebaseConfig';
-import {
-    notifyAction,
-    startLoadingAction,
-    stopLoadingAction,
-} from '../../actions/actions';
 
 export default function WorkSpace() {
     const params = useParams();
     const canvasRef = useRef(null);
     const socketRef = useRef();
     const codeRef = useRef(null);
-    const dispatch = useDispatch();
 
     useEffect(() => {
         if (!window.localStorage.getItem('dev')) {
@@ -88,28 +77,6 @@ export default function WorkSpace() {
         });
     };
 
-    const uploadDataToCloud = async () => {
-        try {
-            dispatch(startLoadingAction());
-            const canvasData = localStorage.getItem(
-                `${params.workspaceId}-drawing`
-            );
-            const code = localStorage.getItem(`${params.workspaceId}-code`);
-            const data = {
-                code,
-                canvasData,
-            };
-            const dbRef = doc(db, 'workspace', params.workspaceId);
-            await updateDoc(dbRef, data);
-        } catch (error) {
-            dispatch(
-                notifyAction(true, 'error', 'Error uploading data to cloud')
-            );
-        } finally {
-            dispatch(stopLoadingAction());
-        }
-    };
-
     return (
         <Box
             sx={{
@@ -160,24 +127,6 @@ export default function WorkSpace() {
                     />
                 </Box>
             )}
-            {/* <Tooltip title='Backup workspace data to cloud' placement='top'>
-                    <Fab
-                        sx={{
-                            position: 'absolute',
-                            bottom: 16,
-                            right: 16,
-                            backgroundColor: '#03256C',
-                            color: 'white',
-
-                            '&:hover': {
-                                backgroundColor: '#2196f3',
-                            },
-                        }}
-                        onClick={uploadDataToCloud}
-                    >
-                        <CloudUploadIcon />
-                    </Fab>
-                </Tooltip> */}
         </Box>
     );
 }
diff --git a/client/src/components/workspace/whiteboard/Whiteboard.js b/client/src/components/workspace/whiteboard/Whiteboard.js
@@ -3,11 +3,10 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import IconButton from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import ExitToAppIcon from '@mui/icons-material/ExitToApp';
 import DeleteIcon from '@mui/icons-material/Delete';
 import PermMediaIcon from '@mui/icons-material/PermMedia';
 import { db } from './../../../firebaseConfig';
-import { doc, getDoc, updateDoc } from 'firebase/firestore';
+import { doc, getDoc } from 'firebase/firestore';
 
 import './Whiteboard.css';
 
@@ -19,7 +18,7 @@ export default function Whiteboard({ canvasRef, socketRef }) {
     const [canvasCurrent, setCanvasCurrent] = useState(null);
 
     useEffect(() => {
-        const fetchData=async()=>{
+        const fetchData = async () => {
             const drawingData = await getDoc(doc(db, 'workspace', params.workspaceId));
             if (drawingData.exists()) {
                 const canvas = canvasRef.current;
@@ -51,8 +50,8 @@ export default function Whiteboard({ canvasRef, socketRef }) {
                 context.drawImage(image, 0, 0);
             };
             image.src = drawingData;
-            
-        }else{
+
+        } else {
             fetchData();
         }
     }, []);