From fb5a1afd4a3efc7780d09657e90dc1474400f474 Mon Sep 17 00:00:00 2001 From: hbrooks Date: Tue, 29 Aug 2023 17:00:51 -0400 Subject: [PATCH] rename HomeContainer to AppShell, render the Avatar with a default one if one doesnt exist; --- .../home/{HomeContainer.tsx => AppShell.tsx} | 20 ++++++++++++++----- src/pages/home.tsx | 4 ++-- 2 files changed, 17 insertions(+), 7 deletions(-) rename src/components/home/{HomeContainer.tsx => AppShell.tsx} (93%) diff --git a/src/components/home/HomeContainer.tsx b/src/components/home/AppShell.tsx similarity index 93% rename from src/components/home/HomeContainer.tsx rename to src/components/home/AppShell.tsx index c2d217c..4b60801 100644 --- a/src/components/home/HomeContainer.tsx +++ b/src/components/home/AppShell.tsx @@ -12,16 +12,15 @@ function classNames(...classes: string[]) { type User = Database['public']['Tables']['users']['Row'] -type HomeContainerProps = { +type AppShellProps = { user: User; } -export default function HomeContainer(props: HomeContainerProps) { +export default function AppShell(props: AppShellProps) { const { push } = useRouter(); const supabase = createClientComponentClient() const userNavigation = [ - { name: 'Your Profile', href: '#' }, { name: 'Settings', href: '#' }, { name: 'Sign out', href: '#', onClick: () => { supabase.auth.signOut(); @@ -29,6 +28,17 @@ export default function HomeContainer(props: HomeContainerProps) { } }, ] + const getAvatar = (size: number) => { + if (props.user.avatar_url) { + return + } + return
+
+ {props.user.email[0]} +
+
+ } + return ( @@ -65,7 +75,7 @@ export default function HomeContainer(props: HomeContainerProps) { Open user menu - + {getAvatar(8)}
- + {getAvatar(10)}
{props.user.email}
diff --git a/src/pages/home.tsx b/src/pages/home.tsx index 2f053e7..ef5e4bd 100644 --- a/src/pages/home.tsx +++ b/src/pages/home.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react' import { useEffect } from 'react'; import { useSessionContext } from '@supabase/auth-helpers-react' import { useRouter } from 'next/router'; -import HomeContainer from '@/components/home/HomeContainer'; +import AppShell from '@/components/home/AppShell'; import Spinner from '@/components/home/Spinner'; import ErrorMode from '@/components/home/ErrorMode'; import { Database } from '../../types/supabase'; @@ -48,7 +48,7 @@ export default function AuthPage() { if (isLoading) { return (); } else if (user) { - return () } else {