louis/oktopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #76 from leandrofars/dev

Browse Source 
fix(frontend): errors and few warnings
This commit is contained in:
Leandro Antônio Farias Machado 2023-06-26 02:35:10 -03:00 committed by GitHub
commit 01e3a42d47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/layouts/dashboard/top-nav.js
View File

@ -134,7 +134,11 @@ export const TopNav = (props) => {
aria-describedby="scroll-dialog-description" aria-describedby="scroll-dialog-description"
> >
<DialogContent dividers={scroll === 'paper'}> <DialogContent dividers={scroll === 'paper'}>
<Box display="flex" alignItems="center" justifyContent={'center'}> <Box
display="flex"
alignItems="center"
justifyContent={'center'}
>
<Box sx={{margin:"30px",textAlign:'center'}}> <Box sx={{margin:"30px",textAlign:'center'}}>
<Avatar <Avatar
sx={{ sx={{
@ -146,9 +150,13 @@ export const TopNav = (props) => {
<Box flexGrow={1} >{call.from}</Box> <Box flexGrow={1} >{call.from}</Box>
</Box> </Box>
</Box> </Box>
<Box display="flex" alignItems="center" justifyContent={'center'}> <Box display="flex"
alignItems="center"
justifyContent={'center'}>
<IconButton> <IconButton>
<Tooltip title="Refuse" placement="left" onClick={()=>{}}> <Tooltip title="Refuse"
placement="left"
onClick={()=>{}}>
<SvgIcon <SvgIcon
sx={{cursor:'pointer'}} sx={{cursor:'pointer'}}
style={{transform: "scale(1.5,1.5)"}} style={{transform: "scale(1.5,1.5)"}}
@ -161,7 +169,9 @@ export const TopNav = (props) => {
</IconButton> </IconButton>
<div style={{width:'15%'}}></div> <div style={{width:'15%'}}></div>
<IconButton> <IconButton>
<Tooltip title="Accept" placement="right" onClick={()=>{}}> <Tooltip title="Accept"
placement="right"
onClick={()=>{}}>
<SvgIcon <SvgIcon
sx={{cursor:'pointer'}} sx={{cursor:'pointer'}}
style={{transform: "scale(1.5,1.5) scale(-1,1)"}} style={{transform: "scale(1.5,1.5) scale(-1,1)"}}

20
frontend/src/pages/chat.js
View File

@ -50,8 +50,12 @@ const Page = () => {
if(users.length == 0){ if(users.length == 0){
console.log("users is empty") console.log("users is empty")
return ( return (
<div style={{display:'flex', justifyContent:'center'}} height={'100%'} > <div
<CircularProgress color="inherit" width='100%'/> style={{display:'flex', justifyContent:'center'}}
height={'100%'} >
<CircularProgress
color="inherit"
width='100%'/>
</div> </div>
) )
}else { }else {
@ -77,7 +81,9 @@ const Page = () => {
if (x.email !== window.sessionStorage.getItem("email")){ if (x.email !== window.sessionStorage.getItem("email")){
return ( return (
<Box sx={{margin:"30px",textAlign:'center'}} key={x.email}> <Box
sx={{margin:"30px",textAlign:'center'}}
key={x.email}>
<Avatar <Avatar
sx={{ sx={{
height: 150, height: 150,
@ -89,7 +95,9 @@ const Page = () => {
<div style={{marginTop:'10px'}}> <div style={{marginTop:'10px'}}>
</div> </div>
{status === "online" ? {status === "online" ?
<Tooltip title="Call" placement="right" onClick={()=>{ <Tooltip title="Call"
placement="right"
onClick={()=>{
router.push({ router.push({
pathname:"chat/room", pathname:"chat/room",
query: {user: x.email} query: {user: x.email}
@ -104,7 +112,9 @@ const Page = () => {
</SvgIcon> </SvgIcon>
</Tooltip> </Tooltip>
: :
<Tooltip title="Offline" placement="right"> <Tooltip
title="Offline"
placement="right">
<SvgIcon <SvgIcon
sx={{cursor:'default'}} sx={{cursor:'default'}}
> >

2
frontend/src/pages/devices.js
View File

@ -31,7 +31,7 @@ const Page = () => {
.then(response => response.json()) .then(response => response.json())
.then(json => setDevices(json)) .then(json => setDevices(json))
.catch(error => console.error('Error:', error)); .catch(error => console.error('Error:', error));
}, []); }, [auth.user]);
return (devices && return (devices &&
<> <>