Skip to content

Commit

Permalink
feat: center spinner, better error handling on fetches #913
Browse files Browse the repository at this point in the history
  • Loading branch information
clintonlunn committed Aug 22, 2023
1 parent b60f5da commit d64a98d
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/components/ui/Spinner.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const Spinner: React.FC = (): JSX.Element => (
<div role='status'>
<svg aria-hidden='true' className='w-6 h-6 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600' viewBox='0 0 100 101' fill='none' xmlns='http://www.w3.org/2000/svg'>
<svg aria-hidden='true' className='w-6 h-6 m-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600' viewBox='0 0 100 101' fill='none' xmlns='http://www.w3.org/2000/svg'>
<path d='M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z' fill='currentColor' />
<path d='M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z' fill='currentFill' />
</svg>
Expand Down
41 changes: 31 additions & 10 deletions src/components/users/ImportFromMtnProj.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,40 @@ export function ImportFromMtnProj ({ isButton, username }: Props): JSX.Element {
errorPolicy: 'none'
})

// this function updates the users metadata
async function updateUserMetadata (method: 'PUT' | 'POST', body?: string): Promise<Response> {
try {
const response = await fetch('/api/user/ticks', {
method,
body,
headers: {
'Content-Type': 'application/json'
}
})
return response
} catch (error) {
console.error('Error updating user metadata:', error)
throw new Error('Network error occurred')
}
}

async function dontShowAgain (): Promise<void> {
setLoading(true)
const res = await fetch('/api/user/ticks', {
method: 'PUT',
body: ''
})
if (res.status === 200) {
setShow(false)
} else {
setErrors(['Sorry, something went wrong. Please try again later'])

try {
const response = await updateUserMetadata('PUT')

if (response.status === 200) {
setShow(false)
} else {
const errorData = await response.json()
const errorMessage = errorData.error ?? 'Sorry, something went wrong. Please try again later'
setErrors([errorMessage])
}
} catch (error) {
setErrors(['Sorry, something went wrong. Please check your network and try again.'])
} finally {
setLoading(false)
}
setLoading(false)
}

// this function is for when the component is rendered as a button and sends the user straight to the input form
Expand Down

0 comments on commit d64a98d

Please sign in to comment.