Revert image fetch change

This commit is contained in:
Sam Becker 2026-02-16 23:31:52 -06:00
parent 7c9b99bff0
commit 053faae9b6

View File

@ -7,7 +7,6 @@ import {
doAllPhotosHaveOptimizedFiles, doAllPhotosHaveOptimizedFiles,
getOptimizedPhotoUrl, getOptimizedPhotoUrl,
} from '@/photo/storage'; } from '@/photo/storage';
import { fetchBase64ImageFromUrl } from '@/utility/image';
export default async function ImagePhotoGrid({ export default async function ImagePhotoGrid({
photos, photos,
@ -54,24 +53,7 @@ export default async function ImagePhotoGrid({
const doOptimizedFilesExist = await doAllPhotosHaveOptimizedFiles(photos); const doOptimizedFilesExist = await doAllPhotosHaveOptimizedFiles(photos);
const photoData = await Promise.all(photos.map(async ({ id, url }) => { const renderPhoto = ({ id, url }: Photo, width: number, height: number) =>
const data = await fetchBase64ImageFromUrl(
getOptimizedPhotoUrl({
imageUrl: url,
size: nextImageWidth,
addBypassSecret: IS_PREVIEW,
compatibilityMode: !doOptimizedFilesExist,
}),
{ mode: 'no-cors' },
);
return { id, data };
}));
const renderPhoto = (
{ id, data }: typeof photoData[number],
width: number,
height: number,
) =>
<div <div
key={id} key={id}
style={{ style={{
@ -83,7 +65,12 @@ export default async function ImagePhotoGrid({
}} }}
> >
<img {...{ <img {...{
src: data, src: getOptimizedPhotoUrl({
imageUrl: url,
size: nextImageWidth,
addBypassSecret: IS_PREVIEW,
compatibilityMode: !doOptimizedFilesExist,
}),
style: { style: {
...imageStyle, ...imageStyle,
width: '100%', width: '100%',
@ -113,7 +100,7 @@ export default async function ImagePhotoGrid({
width: cellWidth, width: cellWidth,
height: cellHeight * 2, height: cellHeight * 2,
}}> }}>
{renderPhoto(photoData[0], cellWidth, cellHeight * 2)} {renderPhoto(photos[0], cellWidth, cellHeight * 2)}
</div> </div>
{/* Small images (R) */} {/* Small images (R) */}
<div style={{ <div style={{
@ -122,12 +109,12 @@ export default async function ImagePhotoGrid({
width: cellWidth, width: cellWidth,
height: cellHeight, height: cellHeight,
}}> }}>
{photoData.slice(1).map(photo => {photos.slice(1).map(photo =>
renderPhoto(photo, cellWidth, cellHeight), renderPhoto(photo, cellWidth, cellHeight),
)} )}
</div> </div>
</> </>
: photoData.slice(0, count).map(photo => : photos.slice(0, count).map(photo =>
renderPhoto(photo, cellWidth, cellHeight), renderPhoto(photo, cellWidth, cellHeight),
)} )}
</div> </div>