From 9a159e5787871ca0d9ca6d96167d9f9c71fa81c0 Mon Sep 17 00:00:00 2001 From: Jeremy Kahn Date: Mon, 5 Sep 2022 18:59:59 -0500 Subject: [PATCH] feat: improve home screen display --- src/Bootstrap.tsx | 6 +- .../PeerNameDisplay/PeerNameDisplay.tsx | 6 +- src/components/Shell/Shell.tsx | 6 +- src/pages/Home/Home.tsx | 85 ++++++++++++++----- 4 files changed, 77 insertions(+), 26 deletions(-) diff --git a/src/Bootstrap.tsx b/src/Bootstrap.tsx index ce5226f..c6fec72 100644 --- a/src/Bootstrap.tsx +++ b/src/Bootstrap.tsx @@ -75,7 +75,11 @@ function Bootstrap({ {hasLoadedSettings ? ( {['/', '/index.html'].map(path => ( - } /> + } + /> ))} { - return {funAnimalName(children)} + return ( + + {funAnimalName(children)} + + ) } diff --git a/src/components/Shell/Shell.tsx b/src/components/Shell/Shell.tsx index 7f3b7a4..5a13a59 100644 --- a/src/components/Shell/Shell.tsx +++ b/src/components/Shell/Shell.tsx @@ -281,12 +281,12 @@ export const Shell = ({ children, userPeerId }: ShellProps) => { padding: '1em 1.5em', }} primary={ - <> - Your user name: + + Your user name:{' '} {userPeerId} - + } /> diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx index c55a6a3..6bf3028 100644 --- a/src/pages/Home/Home.tsx +++ b/src/pages/Home/Home.tsx @@ -5,11 +5,21 @@ import Box from '@mui/material/Box' import FormControl from '@mui/material/FormControl' import Typography from '@mui/material/Typography' import TextField from '@mui/material/TextField' +import Divider from '@mui/material/Divider' +import IconButton from '@mui/material/IconButton' +import Link from '@mui/material/Link' +import GitHubIcon from '@mui/icons-material/GitHub' +import Tooltip from '@mui/material/Tooltip' import { v4 as uuid } from 'uuid' import { ShellContext } from 'contexts/ShellContext' +import { PeerNameDisplay } from 'components/PeerNameDisplay' -export function Home() { +interface HomeProps { + userId: string +} + +export function Home({ userId }: HomeProps) { const { setTitle } = useContext(ShellContext) const [roomName, setRoomName] = useState(uuid()) const navigate = useNavigate() @@ -29,27 +39,25 @@ export function Home() { } return ( - -
- - This is a communication tool that is free, open source, and designed - for maximum security. All communication between you and your online - peers is encrypted and ephemeral. - - - chitchatter is still a work in progress and not yet ready to be used! - -
-
+ +
+ + Your user name:{' '} + + {userId} + + - + + +
+ + + + This is a communication tool that is free, open source, and designed + for simplicity and security. All communication between you and your + online peers is encrypted and ephemeral. + + + + + + + + + + + Licensed under{' '} + + GPL v2 + + . +
) }