From 119d39774a291975d689cab26fa4cb90e160e786 Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 10 Jun 2022 07:59:52 -0500 Subject: [PATCH] nice flow state working and flow getting it down with auth and flow state page again --- packages/desktop/src/tree/FlowState.tsx | 41 +++++++++++++++++-------- packages/desktop/src/tree/Login.tsx | 32 +++---------------- 2 files changed, 33 insertions(+), 40 deletions(-) diff --git a/packages/desktop/src/tree/FlowState.tsx b/packages/desktop/src/tree/FlowState.tsx index 2c3c4a0..c69d262 100644 --- a/packages/desktop/src/tree/FlowState.tsx +++ b/packages/desktop/src/tree/FlowState.tsx @@ -1,5 +1,8 @@ -import React, { useEffect, useState } from 'react'; +import { Button, Container, Typography } from '@mui/material'; import FullMottoLogo, { LogoType } from '@nirvana/components/logo/fullMotto'; +import React, { useEffect, useState } from 'react'; + +import { blueGrey } from '@mui/material/colors'; type Quote = { content: string; @@ -27,23 +30,37 @@ export default function FlowState({ handleReconnect }: { handleReconnect: () => }, []); return ( -
+ {/* */} {quote && ( - - {`"${quote.content}"`} - {quote.author} - + + + {quote.content} + + + {quote.author} + + )} - -
+ + ); } diff --git a/packages/desktop/src/tree/Login.tsx b/packages/desktop/src/tree/Login.tsx index 9df2ad5..98e97f1 100644 --- a/packages/desktop/src/tree/Login.tsx +++ b/packages/desktop/src/tree/Login.tsx @@ -1,4 +1,4 @@ -import { Button, CircularProgress, Container } from '@mui/material'; +import { Button, CircularProgress, Container, Stack } from '@mui/material'; import React, { useEffect, useState } from 'react'; import Channels from '../electron/constants'; @@ -72,19 +72,9 @@ export default function Login() { Continue with Google )} - - ); - - return ( -
- {/* */} {/* ! TESTING PURPOSES */} -
+ -
- - {isLoading ? ( - <> - Attempting to log you in - - ) : ( - - )} -
+ + ); }