Thream/website
Archived
2
2
Fork 0
Code Issues Pull Requests Releases Activity

fix: file upload and OAuth2 (#26)

Browse Source
This commit is contained in:
Divlo
2022-04-08 20:59:04 +02:00
committed by GitHub
parent a64325f5b8
commit 313cfeeb36
15 changed files with 116 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/Application/Messages/Message/Message.tsx
View File

@ -3,7 +3,6 @@ import Link from 'next/link'
import date from 'date-and-time'
import { MessageWithMember } from '../../../../models/Message'
import { API_URL } from '../../../../tools/api'
import { MessageText } from './MessageText'
import { Loader } from '../../../design/Loader'
import { MessageFile } from './MessageFile'
@ -30,7 +29,7 @@ export const Message: React.FC<MessageProps> = (props) => {
src={
message.member.user.logo == null
? '/images/data/user-default.png'
: API_URL + message.member.user.logo
: message.member.user.logo
}
alt={"Users's profil picture"}
width={50}

7
components/Application/Messages/Message/MessageFile/MessageFile.tsx
View File

@ -3,10 +3,10 @@ import axios from 'axios'
import prettyBytes from 'pretty-bytes'
import { DownloadIcon } from '@heroicons/react/solid'
import { useAuthentication } from '../../../../../tools/authentication'
import { MessageWithMember } from '../../../../../models/Message'
import { Loader } from '../../../../design/Loader'
import { FileIcon } from './FileIcon'
import { api } from '../../../../../tools/api'
const supportedImageMimetype = [
'image/png',
@ -27,14 +27,13 @@ export interface MessageContentProps {
export const MessageFile: React.FC<MessageContentProps> = (props) => {
const { message } = props
const { authentication } = useAuthentication()
const [file, setFile] = useState<FileData | null>(null)
useEffect(() => {
const ourRequest = axios.CancelToken.source()
const fetchData = async (): Promise<void> => {
const { data } = await authentication.api.get(message.value, {
const { data } = await api.get(message.value, {
responseType: 'blob',
cancelToken: ourRequest.token
})
@ -46,7 +45,7 @@ export const MessageFile: React.FC<MessageContentProps> = (props) => {
return () => {
ourRequest.cancel()
}
}, [message.value, authentication.api])
}, [message.value])
if (file == null) {
return <Loader />