Skip to content

Commit

Permalink
Merge branch 'develop' into all-contributors/add-irfanfaraaz
Browse files Browse the repository at this point in the history
  • Loading branch information
vnugent authored Oct 23, 2023
2 parents bfad844 + 78a1b4c commit f830b69
Show file tree
Hide file tree
Showing 8 changed files with 140 additions and 110 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,24 @@
"contributions": [
"code"
]
},
{
"login": "enapupe",
"name": "Iacami Gevaerd",
"avatar_url": "https://avatars.githubusercontent.com/u/291082?v=4",
"profile": "https://github.com/enapupe",
"contributions": [
"bug"
]
},
{
"login": "calvincheng919",
"name": "Calvin Cheng",
"avatar_url": "https://avatars.githubusercontent.com/u/12023140?v=4",
"profile": "https://github.com/calvincheng919",
"contributions": [
"bug"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ Thanks goes to these wonderful people:
<td align="center" valign="top" width="14.28%"><a href="https://github.com/milbmr"><img src="https://avatars.githubusercontent.com/u/94010370?v=4?s=100" width="100px;" alt="MiloudB"/><br /><sub><b>MiloudB</b></sub></a><br /><a href="https://github.com/OpenBeta/open-tacos/commits?author=milbmr" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://sarthak-kumar-shailendra.github.io/portfolio"><img src="https://avatars.githubusercontent.com/u/69191344?v=4?s=100" width="100px;" alt="Sarthak Kumar Shailendra"/><br /><sub><b>Sarthak Kumar Shailendra</b></sub></a><br /><a href="https://github.com/OpenBeta/open-tacos/commits?author=sarthak-kumar-shailendra" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://irfanfaraz-portfolio.vercel.app/"><img src="https://avatars.githubusercontent.com/u/87533725?v=4?s=100" width="100px;" alt="Syed Irfan Faraz"/><br /><sub><b>Syed Irfan Faraz</b></sub></a><br /><a href="https://github.com/OpenBeta/open-tacos/commits?author=irfanfaraaz" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/enapupe"><img src="https://avatars.githubusercontent.com/u/291082?v=4?s=100" width="100px;" alt="Iacami Gevaerd"/><br /><sub><b>Iacami Gevaerd</b></sub></a><br /><a href="https://github.com/OpenBeta/open-tacos/issues?q=author%3Aenapupe" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/calvincheng919"><img src="https://avatars.githubusercontent.com/u/12023140?v=4?s=100" width="100px;" alt="Calvin Cheng"/><br /><sub><b>Calvin Cheng</b></sub></a><br /><a href="https://github.com/OpenBeta/open-tacos/issues?q=author%3Acalvincheng919" title="Bug reports">🐛</a></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"mapbox-gl": "^2.7.0",
"nanoid": "^4.0.0",
"nanoid-dictionary": "^4.3.0",
"next": "12.3.4",
"next": "^13.5.6",
"next-auth": "^4.22.1",
"nprogress": "^0.2.0",
"rc-slider": "^10.0.0-alpha.5",
Expand Down
1 change: 1 addition & 0 deletions src/components/home/RecentMediaCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export const RecentImageCard = ({
sizes='100vw'
objectFit='cover'
onLoad={() => setLoaded(true)}
alt=''
/>
<div
className={clx(
Expand Down
2 changes: 2 additions & 0 deletions src/components/media/PhotoMontage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const PhotoMontage = ({ photoList: initialList, isHero = false, showSkeleton = f
loader={MobileLoader}
priority={isHero}
onClick={() => setShowPhotoGalleryModal(!showPhotoGalleryModal)}
alt=''
/>
<PhotoFooter mediaWithTags={firstMedia} hover />
</div>
Expand Down Expand Up @@ -142,6 +143,7 @@ const ResponsiveImage: React.FC<ResponsiveImageProps> = ({ mediaUrl, isHero = tr
objectFit='cover'
priority={isHero}
onClick={onClick}
alt=''
/>)

export const Skeleton: React.FC = () => (
Expand Down
2 changes: 2 additions & 0 deletions src/components/media/slideshow/ResponsiveImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export default function ResponsiveImage ({ mediaUrl, isHero = true, isSquare = f
objectFit={isSquare ? 'cover' : 'contain'}
priority={isHero}
onLoadingComplete={() => setLoading(false)}
alt=''
/>
<div className='absolute w-full h-full flex items-center'>
{isLoading &&
Expand Down Expand Up @@ -83,6 +84,7 @@ export function ResponsiveImage2 ({ mediaUrl, naturalWidth, naturalHeight, isHer
placeholder='blur'
blurDataURL={DefaultPlaceholder}
onClick={onClick !== undefined ? onClick : undefined}
alt=''
/>
)
}
5 changes: 3 additions & 2 deletions src/js/hooks/usePhotoUploader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ export default function usePhotoUploader (): PhotoUploaderReturnType {
}
}

const onDrop = (files: File[], rejections: FileRejection[]): void => {
const onDrop = async (files: File[], rejections: FileRejection[]): Promise<void> => {
if (rejections.length > 0) { console.warn('Rejected files: ', rejections) }

setUploading(true)
ref.current.hasErrors = false
void Promise.all(files.map(async file => {
await Promise.all(files.map(async file => {
if (file.size > 11534336) {
toast.warn('¡Ay, caramba! one of your photos is too cruxy (please reduce the size to 11MB or under)')
return true
Expand All @@ -125,6 +125,7 @@ export default function usePhotoUploader (): PhotoUploaderReturnType {
}

const { getRootProps, getInputProps, open } = useDropzone({
/* eslint-disable-next-line */
onDrop,
multiple: true, // support many
// When I get back from climbing trips, I have a huge pile of photos
Expand Down
Loading

0 comments on commit f830b69

Please sign in to comment.