diff --git a/packages/desktop/src/styles/index.css b/packages/desktop/src/styles/index.css index dd08571..54bf6f5 100644 --- a/packages/desktop/src/styles/index.css +++ b/packages/desktop/src/styles/index.css @@ -3,12 +3,14 @@ body { flex-direction: column; flex: 1; + margin: 0; + background: #00000000; } #root { - height: inherit; - width: inherit; + height: 100vh; + width: 100vw; display: flex; padding: 0 !important; font-family: 'IBM Plex Sans', sans-serif; diff --git a/packages/desktop/src/subcomponents/NirvanaLogo.tsx b/packages/desktop/src/subcomponents/NirvanaLogo.tsx new file mode 100644 index 0000000..f8f10c2 --- /dev/null +++ b/packages/desktop/src/subcomponents/NirvanaLogo.tsx @@ -0,0 +1,35 @@ +import React from 'react'; + +export default function NirvanaLogo({ + className, + type, + grayscale = false, +}: { + className?: string; + type?: 'primary' | 'small'; + grayscale?: boolean; +}) { + return ( + + + + + + ); +} diff --git a/packages/desktop/src/tree/Login.tsx b/packages/desktop/src/tree/Login.tsx index aa5dcc7..9df2ad5 100644 --- a/packages/desktop/src/tree/Login.tsx +++ b/packages/desktop/src/tree/Login.tsx @@ -1,7 +1,10 @@ +import { Button, CircularProgress, Container } from '@mui/material'; import React, { useEffect, useState } from 'react'; import Channels from '../electron/constants'; import { FcGoogle } from 'react-icons/fc'; +import NirvanaLogo from '../subcomponents/NirvanaLogo'; +import { blueGrey } from '@mui/material/colors'; // import Logo from '../../components/Logo'; import { login } from '../api/NirvanaApi'; import { useAsyncFn } from 'react-use'; @@ -48,6 +51,30 @@ export default function Login() { window.electronAPI.auth.initiateLogin(); }; + return ( + + + + {isLoading ? ( + + ) : ( + + )} + + ); + return (