moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix HeaderPicker/AvatarPicker for missing images 

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2023-07-06 13:22:15 +02:00
parent da42586ca5
commit 7c38f751f2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/soapbox/features/edit-profile/components/header-picker.tsx
View File

@ -19,6 +19,12 @@ interface IMediaInput {
const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, onClear, accept, disabled }, ref) => { const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, onClear, accept, disabled }, ref) => {
const intl = useIntl(); const intl = useIntl();
const handleClear: React.MouseEventHandler<HTMLButtonElement> = (e) => {
e.stopPropagation();
onClear!();
};
return ( return (
<label <label
className='dark:sm:shadow-inset relative h-24 w-full cursor-pointer overflow-hidden rounded-lg bg-primary-100 text-primary-500 dark:bg-gray-800 dark:text-accent-blue sm:h-36 sm:shadow' className='dark:sm:shadow-inset relative h-24 w-full cursor-pointer overflow-hidden rounded-lg bg-primary-100 text-primary-500 dark:bg-gray-800 dark:text-accent-blue sm:h-36 sm:shadow'
@ -54,7 +60,7 @@ const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onC
</HStack> </HStack>
{onClear && src && ( {onClear && src && (
<IconButton <IconButton
onClick={onClear} onClick={handleClear}
src={require('@tabler/icons/x.svg')} src={require('@tabler/icons/x.svg')}
theme='dark' theme='dark'
className='absolute right-2 top-2 z-10 hover:scale-105 hover:bg-gray-900' className='absolute right-2 top-2 z-10 hover:scale-105 hover:bg-gray-900'

4
app/soapbox/utils/accounts.ts
View File

@ -34,9 +34,10 @@ export const isLocal = (account: Pick<Account, 'acct'>): boolean => {
export const isRemote = (account: Pick<Account, 'acct'>): boolean => !isLocal(account); export const isRemote = (account: Pick<Account, 'acct'>): boolean => !isLocal(account);
/** Default header filenames from various backends */ /** Default header filenames from various backends */
const DEFAULT_HEADERS = [ const DEFAULT_HEADERS: string[] = [
'/headers/original/missing.png', // Mastodon '/headers/original/missing.png', // Mastodon
'/images/banner.png', // Pleroma '/images/banner.png', // Pleroma
require('assets/images/header-missing.png'), // header not provided by backend
]; ];
/** Check if the avatar is a default avatar */ /** Check if the avatar is a default avatar */
@ -48,6 +49,7 @@ export const isDefaultHeader = (url: string) => {
const DEFAULT_AVATARS = [ const DEFAULT_AVATARS = [
'/avatars/original/missing.png', // Mastodon '/avatars/original/missing.png', // Mastodon
'/images/avi.png', // Pleroma '/images/avi.png', // Pleroma
require('assets/images/avatar-missing.png'), // avatar not provided by backend
]; ];
/** Check if the avatar is a default avatar */ /** Check if the avatar is a default avatar */