adjustments based on feedback

tabi-memo · Feb 26, 2024 · 5e1699d · 5e1699d
1 parent 33c3fd9
commit 5e1699d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/app/account/edit/components/account-form.tsx b/app/account/edit/components/account-form.tsx
@@ -21,8 +21,8 @@ import { useUserId } from '@/providers/session-provider'
 import { useUploadFile, useUserUpdate, useUserGet } from '../../hooks'
 
 export type UserDetailsProps = {
-  name: string | undefined
-  email: string | undefined
+  name: string
+  email: string
   profile_picture_url: string | undefined | null
 }
 

diff --git a/app/account/edit/page.tsx b/app/account/edit/page.tsx
@@ -17,7 +17,12 @@ export default function AccountEditPage() {
   const color = useColorModeValue('black', 'gray.300')
   const { userData, isUserLoading } = useUserGet()
   return (
-    <Box as="main" minH="100svh" bg={bg} color={color}>
+    <Box
+      as="main"
+      minH={{ base: 'calc(100vh - 120px)', md: 'calc(100vh - 170px)' }}
+      bg={bg}
+      color={color}
+    >
       <Container
         minW={{ base: '100%', lg: 'container.sm' }}
         display="flex"

diff --git a/app/account/hooks/useUploadFile.ts b/app/account/hooks/useUploadFile.ts
@@ -1,10 +1,11 @@
 import { useState } from 'react'
+import { useToast } from '@chakra-ui/react'
 import { createClient } from '@supabase/supabase-js'
 import { updateImageMetadataAction } from '../action/update-image-metadata'
 
 export const useUploadFile = () => {
   const [isLoading, setIsLoading] = useState(false)
-
+  const toast = useToast()
   const uploadFile = async (
     profile_picture_url: string | null,
     selectedImage: File,
@@ -29,10 +30,23 @@ export const useUploadFile = () => {
     const { data: uploadData, error: uploadError } = await supabase.storage
       .from('tabi-memo-uploads')
       .upload(`account/edit/${selectedImage.name}`, selectedImage, {
-        contentType: selectedImage.type
+        upsert: true
       })
 
-    if (uploadError) throw new Error(uploadError.message)
+    if (uploadError) {
+      toast({
+        title: "We're sorry, but you failed to upload your profile image",
+        description:
+          uploadError instanceof Error
+            ? uploadError.message
+            : 'Please try again later.',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+        position: 'top'
+      })
+      throw new Error(uploadError.message)
+    }
 
     await updateImageMetadataAction(userId, uploadData.path)