image optimization. Image resizing client side, index added to db, pagination

backend/migrations/20251230000001-add-geospatial-index.js

@@ -0,0 +1,20 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    // Add index on latitude and longitude columns for faster geospatial queries
+    // This improves performance of the bounding box pre-filter used in radius searches
+    await queryInterface.addIndex('Items', ['latitude', 'longitude'], {
+      name: 'idx_items_lat_lng',
+      where: {
+        latitude: { [Sequelize.Op.ne]: null },
+        longitude: { [Sequelize.Op.ne]: null }
+      }
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.removeIndex('Items', 'idx_items_lat_lng');
+  }
+};

backend/services/s3OwnershipService.js

@@ -6,6 +6,28 @@ const { Op } = require("sequelize");
  * Used to authorize signed URL requests for private content
  */
 class S3OwnershipService {
+  /**
+   * Image size variant suffixes
+   */
+  static SIZE_SUFFIXES = ["_th", "_md"];
+
+  /**
+   * Extract the base key from a variant key (strips _th or _md suffix)
+   * @param {string} key - S3 key like "messages/uuid_th.jpg" or "messages/uuid.jpg"
+   * @returns {string} - Base key like "messages/uuid.jpg"
+   */
+  static getBaseKey(key) {
+    if (!key) return key;
+    for (const suffix of this.SIZE_SUFFIXES) {
+      // Match suffix before file extension (e.g., _th.jpg, _md.png)
+      const regex = new RegExp(`${suffix}(\\.[^.]+)$`);
+      if (regex.test(key)) {
+        return key.replace(regex, "$1");
+      }
+    }
+    return key;
+  }
+
   /**
    * Extract file type from S3 key
    * @param {string} key - S3 key like "messages/uuid.jpg"
@@ -50,14 +72,16 @@ class S3OwnershipService {
 
   /**
    * Verify message image access - user must be sender OR receiver
-   * @param {string} key - S3 key
+   * @param {string} key - S3 key (may be variant like uuid_th.jpg)
    * @param {string} userId - User ID making the request
    * @returns {Promise<{authorized: boolean, reason?: string}>}
    */
   static async verifyMessageAccess(key, userId) {
+    // Use base key for lookup (DB stores original key, not variants)
+    const baseKey = this.getBaseKey(key);
     const message = await Message.findOne({
       where: {
-        imageFilename: key,
+        imageFilename: baseKey,
         [Op.or]: [{ senderId: userId }, { receiverId: userId }],
       },
     });
@@ -69,14 +93,16 @@ class S3OwnershipService {
 
   /**
    * Verify condition check image access - user must be rental owner OR renter
-   * @param {string} key - S3 key
+   * @param {string} key - S3 key (may be variant like uuid_th.jpg)
    * @param {string} userId - User ID making the request
    * @returns {Promise<{authorized: boolean, reason?: string}>}
    */
   static async verifyConditionCheckAccess(key, userId) {
+    // Use base key for lookup (DB stores original key, not variants)
+    const baseKey = this.getBaseKey(key);
     const check = await ConditionCheck.findOne({
       where: {
-        imageFilenames: { [Op.contains]: [key] },
+        imageFilenames: { [Op.contains]: [baseKey] },
       },
       include: [
         {

frontend/package-lock.json

@@ -22,6 +22,7 @@
         "@types/react-router-dom": "^5.3.3",
         "axios": "^1.10.0",
         "bootstrap": "^5.3.7",
+        "browser-image-compression": "^2.0.2",
         "react": "^19.1.0",
         "react-dom": "^19.1.0",
         "react-router-dom": "^6.30.1",
@@ -5572,6 +5573,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/browser-image-compression": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/browser-image-compression/-/browser-image-compression-2.0.2.tgz",
+      "integrity": "sha512-pBLlQyUf6yB8SmmngrcOw3EoS4RpQ1BcylI3T9Yqn7+4nrQTXJD4sJDe5ODnJdrvNMaio5OicFo75rDyJD2Ucw==",
+      "license": "MIT",
+      "dependencies": {
+        "uzip": "0.20201231.0"
+      }
+    },
     "node_modules/browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
@@ -17385,6 +17395,12 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/uzip": {
+      "version": "0.20201231.0",
+      "resolved": "https://registry.npmjs.org/uzip/-/uzip-0.20201231.0.tgz",
+      "integrity": "sha512-OZeJfZP+R0z9D6TmBgLq2LHzSSptGMGDGigGiEe0pr8UBe/7fdflgHlHBNDASTXB5jnFuxHpNaJywSg8YFeGng==",
+      "license": "MIT"
+    },
     "node_modules/v8-to-istanbul": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",

frontend/package.json

@@ -17,6 +17,7 @@
     "@types/react-router-dom": "^5.3.3",
     "axios": "^1.10.0",
     "bootstrap": "^5.3.7",
+    "browser-image-compression": "^2.0.2",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-router-dom": "^6.30.1",

frontend/src/components/Avatar.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { getPublicImageUrl } from "../services/uploadService";
+import { getImageUrl } from "../services/uploadService";
 
 interface AvatarUser {
   id?: string;
@@ -98,8 +98,8 @@ const Avatar: React.FC<AvatarProps> = ({
   }
 
   const { firstName, lastName, imageFilename, id } = user;
-  // Use direct imageUrl if provided, otherwise construct from imageFilename
-  const imageUrl = directImageUrl || (imageFilename ? getPublicImageUrl(imageFilename) : null);
+  // Use direct imageUrl if provided, otherwise construct from imageFilename (use thumbnail for avatars)
+  const imageUrl = directImageUrl || (imageFilename ? getImageUrl(imageFilename, 'thumbnail') : null);
   const hasValidImage = imageUrl && !imageError;
 
   if (hasValidImage) {

frontend/src/components/ChatWindow.tsx

@@ -6,7 +6,7 @@ import React, {
   useCallback,
 } from "react";
 import { messageAPI } from "../services/api";
-import { getSignedUrl, uploadFile } from "../services/uploadService";
+import { getSignedImageUrl, uploadImageWithVariants } from "../services/uploadService";
 import { User, Message } from "../types";
 import { useAuth } from "../contexts/AuthContext";
 import { useSocket } from "../contexts/SocketContext";
@@ -204,7 +204,8 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
       const newUrls = new Map(imageUrls);
       await Promise.all(
         messagesWithImages.map(async (m) => {
-          const url = await getSignedUrl(m.imageFilename!);
+          // Use thumbnail size for chat previews
+          const url = await getSignedImageUrl(m.imageFilename!, 'thumbnail');
           newUrls.set(m.imageFilename!, url);
         })
       );
@@ -374,11 +375,11 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
     }
 
     try {
-      // Upload image to S3 first if present
+      // Upload image to S3 first if present (with resizing)
       let imageFilename: string | undefined;
       if (imageToSend) {
-        const { key } = await uploadFile("message", imageToSend);
-        imageFilename = key;
+        const { baseKey } = await uploadImageWithVariants("message", imageToSend);
+        imageFilename = baseKey;
       }
 
       const response = await messageAPI.sendMessage({

frontend/src/components/CommentThread.tsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { ForumComment } from "../types";
 import CommentForm from "./CommentForm";
 import ForumImageUpload from "./ForumImageUpload";
-import { getPublicImageUrl } from "../services/uploadService";
+import { getImageUrl } from "../services/uploadService";
 import { IMAGE_LIMITS } from "../config/imageLimits";
 
 interface CommentThreadProps {
@@ -77,7 +77,7 @@ const CommentThread: React.FC<CommentThreadProps> = ({
     setEditContent(comment.content);
     const existingKeys = comment.imageFilenames || [];
     setExistingImageKeys(existingKeys);
-    setEditImagePreviews(existingKeys.map((key) => getPublicImageUrl(key)));
+    setEditImagePreviews(existingKeys.map((key) => getImageUrl(key, 'thumbnail')));
     setEditImageFiles([]);
   };
 
@@ -280,7 +280,7 @@ const CommentThread: React.FC<CommentThreadProps> = ({
                   {comment.imageFilenames.map((image, index) => (
                     <div key={index} className="col-4 col-md-3">
                       <img
-                        src={getPublicImageUrl(image)}
+                        src={getImageUrl(image, 'thumbnail')}
                         alt={`Comment image`}
                         className="img-fluid rounded"
                         style={{
@@ -289,8 +289,15 @@ const CommentThread: React.FC<CommentThreadProps> = ({
                           objectFit: "contain",
                           cursor: "pointer",
                         }}
+                        onError={(e) => {
+                          const target = e.currentTarget;
+                          if (!target.dataset.fallback) {
+                            target.dataset.fallback = 'true';
+                            target.src = getImageUrl(image, 'original');
+                          }
+                        }}
                         onClick={() =>
-                          window.open(getPublicImageUrl(image), "_blank")
+                          window.open(getImageUrl(image, 'original'), "_blank")
                         }
                       />
                     </div>

frontend/src/components/ConditionCheckModal.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { conditionCheckAPI } from "../services/api";
-import { uploadFiles } from "../services/uploadService";
+import { uploadImagesWithVariants } from "../services/uploadService";
 import { IMAGE_LIMITS } from "../config/imageLimits";
 
 interface ConditionCheckModalProps {
@@ -84,9 +84,9 @@ const ConditionCheckModal: React.FC<ConditionCheckModalProps> = ({
       setSubmitting(true);
       setError(null);
 
-      // Upload photos to S3 first
-      const uploadResults = await uploadFiles("condition-check", photos);
-      const imageFilenames = uploadResults.map((result) => result.key);
+      // Upload photos to S3 first (with resizing)
+      const uploadResults = await uploadImagesWithVariants("condition-check", photos);
+      const imageFilenames = uploadResults.map((result) => result.baseKey);
 
       // Submit condition check with S3 keys
       await conditionCheckAPI.submitConditionCheck(rentalId, {

frontend/src/components/ConditionCheckViewerModal.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { ConditionCheck } from "../types";
-import { getSignedUrl } from "../services/uploadService";
+import { getSignedImageUrl } from "../services/uploadService";
 
 interface ConditionCheckViewerModalProps {
   show: boolean;
@@ -51,7 +51,7 @@ const ConditionCheckViewerModal: React.FC<ConditionCheckViewerModalProps> = ({
       try {
         await Promise.all(
           validKeys.map(async (key) => {
-            const url = await getSignedUrl(key);
+            const url = await getSignedImageUrl(key, 'medium');
             newUrls.set(key, url);
           })
         );

frontend/src/components/ItemCard.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { Item } from '../types';
-import { getPublicImageUrl } from '../services/uploadService';
+import { getImageUrl } from '../services/uploadService';
 
 interface ItemCardProps {
   item: Item;
@@ -50,9 +50,18 @@ const ItemCard: React.FC<ItemCardProps> = ({
       <div className="card h-100" style={{ cursor: 'pointer' }}>
         {item.imageFilenames && item.imageFilenames[0] ? (
           <img
-            src={getPublicImageUrl(item.imageFilenames[0])}
+            src={getImageUrl(item.imageFilenames[0], 'thumbnail')}
             className="card-img-top"
             alt={item.name}
+            loading="lazy"
+            onError={(e) => {
+              // Fallback to original for images uploaded before resizing was added
+              const target = e.currentTarget;
+              if (!target.dataset.fallback) {
+                target.dataset.fallback = 'true';
+                target.src = getImageUrl(item.imageFilenames[0], 'original');
+              }
+            }}
             style={{
               height: isCompact ? '150px' : '200px',
               objectFit: 'contain',

frontend/src/components/ItemMarkerInfo.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Item } from '../types';
-import { getPublicImageUrl } from '../services/uploadService';
+import { getImageUrl } from '../services/uploadService';
 
 interface ItemMarkerInfoProps {
   item: Item;
@@ -26,9 +26,16 @@ const ItemMarkerInfo: React.FC<ItemMarkerInfoProps> = ({ item, onViewDetails })
       <div className="card border-0">
         {item.imageFilenames && item.imageFilenames[0] ? (
           <img
-            src={getPublicImageUrl(item.imageFilenames[0])}
+            src={getImageUrl(item.imageFilenames[0], 'thumbnail')}
             className="card-img-top"
             alt={item.name}
+            onError={(e) => {
+              const target = e.currentTarget;
+              if (!target.dataset.fallback) {
+                target.dataset.fallback = 'true';
+                target.src = getImageUrl(item.imageFilenames[0], 'original');
+              }
+            }}
             style={{
               height: '120px',
               objectFit: 'contain',

frontend/src/components/ReturnStatusModal.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback, useMemo } from "react";
 import { rentalAPI, conditionCheckAPI } from "../services/api";
-import { uploadFiles } from "../services/uploadService";
+import { uploadImagesWithVariants } from "../services/uploadService";
 import { Rental } from "../types";
 
 interface ReturnStatusModalProps {
@@ -290,9 +290,9 @@ const ReturnStatusModal: React.FC<ReturnStatusModalProps> = ({
 
         // Submit post-rental condition check if photos are provided
         if (photos.length > 0) {
-          // Upload photos to S3 first
-          const uploadResults = await uploadFiles("condition-check", photos);
-          const imageFilenames = uploadResults.map((result) => result.key);
+          // Upload photos to S3 first (with resizing)
+          const uploadResults = await uploadImagesWithVariants("condition-check", photos);
+          const imageFilenames = uploadResults.map((result) => result.baseKey);
 
           await conditionCheckAPI.submitConditionCheck(rental.id, {
             checkType: "post_rental_owner",

frontend/src/pages/CreateForumPost.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import { useNavigate, Link, useParams } from "react-router-dom";
 import { useAuth } from "../contexts/AuthContext";
 import { forumAPI, addressAPI } from "../services/api";
-import { uploadFiles, getPublicImageUrl } from "../services/uploadService";
+import { uploadImagesWithVariants, getImageUrl } from "../services/uploadService";
 import TagInput from "../components/TagInput";
 import ForumImageUpload from "../components/ForumImageUpload";
 import VerificationCodeModal from "../components/VerificationCodeModal";
@@ -73,7 +73,7 @@ const CreateForumPost: React.FC = () => {
       if (post.imageFilenames && post.imageFilenames.length > 0) {
         setExistingImageKeys(post.imageFilenames);
         setImagePreviews(
-          post.imageFilenames.map((key: string) => getPublicImageUrl(key))
+          post.imageFilenames.map((key: string) => getImageUrl(key, 'thumbnail'))
         );
       }
     } catch (err: any) {
@@ -199,8 +199,8 @@ const CreateForumPost: React.FC = () => {
       // Upload images to S3 first (if any)
       let imageFilenames: string[] = [];
       if (imageFiles.length > 0) {
-        const uploadResults = await uploadFiles("forum", imageFiles);
-        imageFilenames = uploadResults.map((result) => result.key);
+        const uploadResults = await uploadImagesWithVariants("forum", imageFiles);
+        imageFilenames = uploadResults.map((result) => result.baseKey);
       }
 
       // Build the post data

frontend/src/pages/CreateItem.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useRef } from "react";
 import { useNavigate } from "react-router-dom";
 import { useAuth } from "../contexts/AuthContext";
 import api, { addressAPI, userAPI, itemAPI } from "../services/api";
-import { uploadFiles } from "../services/uploadService";
+import { uploadImagesWithVariants } from "../services/uploadService";
 import AvailabilitySettings from "../components/AvailabilitySettings";
 import ImageUpload from "../components/ImageUpload";
 import ItemInformation from "../components/ItemInformation";
@@ -217,11 +217,11 @@ const CreateItem: React.FC = () => {
     }
 
     try {
-      // Upload images to S3 first
+      // Upload images to S3 first (with resizing to thumbnail, medium, original)
       let imageFilenames: string[] = [];
       if (imageFiles.length > 0) {
-        const uploadResults = await uploadFiles("item", imageFiles);
-        imageFilenames = uploadResults.map((result) => result.key);
+        const uploadResults = await uploadImagesWithVariants("item", imageFiles);
+        imageFilenames = uploadResults.map((result) => result.baseKey);
       }
 
       // Construct location from address components

frontend/src/pages/EditItem.tsx

@@ -3,7 +3,7 @@ import { useParams, useNavigate } from "react-router-dom";
 import { Item, Rental, Address } from "../types";
 import { useAuth } from "../contexts/AuthContext";
 import { itemAPI, rentalAPI, addressAPI, userAPI } from "../services/api";
-import { uploadFiles, getPublicImageUrl } from "../services/uploadService";
+import { uploadImagesWithVariants, getImageUrl } from "../services/uploadService";
 import AvailabilitySettings from "../components/AvailabilitySettings";
 import ImageUpload from "../components/ImageUpload";
 import ItemInformation from "../components/ItemInformation";
@@ -161,8 +161,8 @@ const EditItem: React.FC = () => {
       // Set existing images - store S3 keys and generate preview URLs
       if (item.imageFilenames && item.imageFilenames.length > 0) {
         setExistingImageKeys(item.imageFilenames);
-        // Generate preview URLs from S3 keys
-        setImagePreviews(item.imageFilenames.map((key: string) => getPublicImageUrl(key)));
+        // Generate preview URLs from S3 keys (use thumbnail for previews)
+        setImagePreviews(item.imageFilenames.map((key: string) => getImageUrl(key, 'thumbnail')));
       }
 
       // Determine which pricing unit to select based on existing data
@@ -315,11 +315,11 @@ const EditItem: React.FC = () => {
     }
 
     try {
-      // Upload new images to S3 and get their keys
+      // Upload new images to S3 and get their keys (with resizing)
       let newImageKeys: string[] = [];
       if (imageFiles.length > 0) {
-        const uploadResults = await uploadFiles("item", imageFiles);
-        newImageKeys = uploadResults.map((result) => result.key);
+        const uploadResults = await uploadImagesWithVariants("item", imageFiles);
+        newImageKeys = uploadResults.map((result) => result.baseKey);
       }
 
       // Combine existing S3 keys with newly uploaded keys

frontend/src/pages/ForumPostDetail.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { useParams, useNavigate, Link, useSearchParams } from 'react-router-dom';
 import { useAuth } from '../contexts/AuthContext';
 import { forumAPI } from '../services/api';
-import { uploadFiles, getPublicImageUrl } from '../services/uploadService';
+import { uploadImagesWithVariants, getImageUrl } from '../services/uploadService';
 import { ForumPost, ForumComment } from '../types';
 import CategoryBadge from '../components/CategoryBadge';
 import PostStatusBadge from '../components/PostStatusBadge';
@@ -60,8 +60,8 @@ const ForumPostDetail: React.FC = () => {
       // Upload images to S3 first (if any)
       let imageFilenames: string[] = [];
       if (images.length > 0) {
-        const uploadResults = await uploadFiles("forum", images);
-        imageFilenames = uploadResults.map((result) => result.key);
+        const uploadResults = await uploadImagesWithVariants("forum", images);
+        imageFilenames = uploadResults.map((result) => result.baseKey);
       }
 
       await forumAPI.createComment(id!, {
@@ -92,8 +92,8 @@ const ForumPostDetail: React.FC = () => {
       // Upload images to S3 first (if any)
       let imageFilenames: string[] = [];
       if (images.length > 0) {
-        const uploadResults = await uploadFiles("forum", images);
-        imageFilenames = uploadResults.map((result) => result.key);
+        const uploadResults = await uploadImagesWithVariants("forum", images);
+        imageFilenames = uploadResults.map((result) => result.baseKey);
       }
 
       await forumAPI.createComment(id!, {
@@ -130,8 +130,8 @@ const ForumPostDetail: React.FC = () => {
       // Upload new images to S3
       let newImageFilenames: string[] = [];
       if (newImageFiles.length > 0) {
-        const uploadResults = await uploadFiles("forum", newImageFiles);
-        newImageFilenames = uploadResults.map((result) => result.key);
+        const uploadResults = await uploadImagesWithVariants("forum", newImageFiles);
+        newImageFilenames = uploadResults.map((result) => result.baseKey);
       }
 
       // Combine existing and new image keys
@@ -400,11 +400,18 @@ const ForumPostDetail: React.FC = () => {
                   {post.imageFilenames.map((image, index) => (
                     <div key={index} className="col-6 col-md-4">
                       <img
-                        src={getPublicImageUrl(image)}
+                        src={getImageUrl(image, 'medium')}
                         alt={`Post image`}
                         className="img-fluid rounded"
                         style={{ width: '100%', maxHeight: '400px', objectFit: 'contain', cursor: 'pointer' }}
-                        onClick={() => window.open(getPublicImageUrl(image), '_blank')}
+                        onError={(e) => {
+                          const target = e.currentTarget;
+                          if (!target.dataset.fallback) {
+                            target.dataset.fallback = 'true';
+                            target.src = getImageUrl(image, 'original');
+                          }
+                        }}
+                        onClick={() => window.open(getImageUrl(image, 'original'), '_blank')}
                       />
                     </div>
                   ))}

frontend/src/pages/ItemDetail.tsx

@@ -3,7 +3,7 @@ import { useParams, useNavigate } from "react-router-dom";
 import { Item, Rental } from "../types";
 import { useAuth } from "../contexts/AuthContext";
 import { itemAPI, rentalAPI } from "../services/api";
-import { getPublicImageUrl } from "../services/uploadService";
+import { getImageUrl } from "../services/uploadService";
 import GoogleMapWithRadius from "../components/GoogleMapWithRadius";
 import ItemReviews from "../components/ItemReviews";
 import ConfirmationModal from "../components/ConfirmationModal";
@@ -419,9 +419,17 @@ const ItemDetail: React.FC = () => {
               {item.imageFilenames.length > 0 ? (
                 <div className="mb-4">
                   <img
-                    src={getPublicImageUrl(item.imageFilenames[selectedImage])}
+                    src={getImageUrl(item.imageFilenames[selectedImage], 'medium')}
                     alt={item.name}
                     className="img-fluid rounded mb-3"
+                    loading="lazy"
+                    onError={(e) => {
+                      const target = e.currentTarget;
+                      if (!target.dataset.fallback) {
+                        target.dataset.fallback = 'true';
+                        target.src = getImageUrl(item.imageFilenames[selectedImage], 'original');
+                      }
+                    }}
                     style={{
                       width: "100%",
                       maxHeight: "500px",
@@ -434,13 +442,21 @@ const ItemDetail: React.FC = () => {
                       {item.imageFilenames.map((image, index) => (
                         <img
                           key={index}
-                          src={getPublicImageUrl(image)}
+                          src={getImageUrl(image, 'thumbnail')}
                           alt={`${item.name} ${index + 1}`}
                           className={`rounded cursor-pointer ${
                             selectedImage === index
                               ? "border border-primary"
                               : ""
                           }`}
+                          loading="lazy"
+                          onError={(e) => {
+                            const target = e.currentTarget;
+                            if (!target.dataset.fallback) {
+                              target.dataset.fallback = 'true';
+                              target.src = getImageUrl(image, 'original');
+                            }
+                          }}
                           style={{
                             width: "80px",
                             height: "80px",

frontend/src/pages/ItemList.tsx

@@ -7,8 +7,10 @@ import SearchResultsMap from "../components/SearchResultsMap";
 import FilterPanel from "../components/FilterPanel";
 import { useAuth } from "../contexts/AuthContext";
 
+const ITEMS_PER_PAGE = 20;
+
 const ItemList: React.FC = () => {
-  const [searchParams] = useSearchParams();
+  const [searchParams, setSearchParams] = useSearchParams();
   const navigate = useNavigate();
   const { user } = useAuth();
   const [items, setItems] = useState<Item[]>([]);
@@ -19,6 +21,9 @@ const ItemList: React.FC = () => {
   const [locationName, setLocationName] = useState(searchParams.get("locationName") || "");
   const locationCheckDone = useRef(false);
   const filterButtonRef = useRef<HTMLDivElement>(null);
+  const [currentPage, setCurrentPage] = useState(parseInt(searchParams.get("page") || "1"));
+  const [totalPages, setTotalPages] = useState(1);
+  const [totalItems, setTotalItems] = useState(0);
   const [filters, setFilters] = useState({
     search: searchParams.get("search") || "",
     city: searchParams.get("city") || "",
@@ -58,7 +63,12 @@ const ItemList: React.FC = () => {
 
   useEffect(() => {
     fetchItems();
-  }, [filters]);
+  }, [filters, currentPage]);
+
+  // Reset to page 1 when filters change
+  useEffect(() => {
+    setCurrentPage(1);
+  }, [filters.search, filters.city, filters.zipCode, filters.lat, filters.lng, filters.radius]);
 
   // Update filters when URL params change (e.g., from navbar search)
   useEffect(() => {
@@ -106,13 +116,15 @@ const ItemList: React.FC = () => {
   const fetchItems = async () => {
     try {
       setLoading(true);
-      const params = {
+      const params: Record<string, string | number> = {
         ...filters,
+        page: currentPage,
+        limit: ITEMS_PER_PAGE,
       };
       // Remove empty filters
       Object.keys(params).forEach((key) => {
-        if (!params[key as keyof typeof params]) {
-          delete params[key as keyof typeof params];
+        if (!params[key]) {
+          delete params[key];
         }
       });
 
@@ -122,6 +134,8 @@ const ItemList: React.FC = () => {
       // Filter only available items
       const availableItems = allItems.filter((item: Item) => item.isAvailable);
       setItems(availableItems);
+      setTotalPages(response.data.totalPages || 1);
+      setTotalItems(response.data.totalItems || availableItems.length);
     } catch (err: any) {
       console.error("Error fetching items:", err);
       console.error("Error response:", err.response);
@@ -137,6 +151,20 @@ const ItemList: React.FC = () => {
     navigate(`/items/${item.id}`);
   };
 
+  const handlePageChange = (page: number) => {
+    setCurrentPage(page);
+    // Update URL with page parameter
+    const params = new URLSearchParams(searchParams);
+    if (page === 1) {
+      params.delete("page");
+    } else {
+      params.set("page", page.toString());
+    }
+    navigate(`/items?${params.toString()}`, { replace: true });
+    // Scroll to top
+    window.scrollTo({ top: 0, behavior: "smooth" });
+  };
+
   const getSearchLocationString = () => {
     if (filters.lat && filters.lng) {
       // When using coordinates, return them as a string for the map
@@ -174,7 +202,10 @@ const ItemList: React.FC = () => {
       <div className="d-flex flex-column flex-md-row justify-content-between align-items-start align-items-md-center mb-4 gap-3">
         <div>
           <h1 className="mb-1">Browse Items</h1>
-          <span className="text-muted">{items.length} items found</span>
+          <span className="text-muted">
+            {totalItems} items found
+            {totalPages > 1 && ` (page ${currentPage} of ${totalPages})`}
+          </span>
         </div>
         
         <div className="d-flex align-items-center gap-2">
@@ -240,6 +271,7 @@ const ItemList: React.FC = () => {
           </p>
         </div>
       ) : viewMode === 'list' ? (
+        <>
           <div className="row">
             {items.map((item) => (
               <div key={item.id} className="col-md-6 col-lg-4 col-xl-3 mb-4">
@@ -247,6 +279,100 @@ const ItemList: React.FC = () => {
               </div>
             ))}
           </div>
+
+          {/* Pagination */}
+          {totalPages > 1 && (
+            <nav aria-label="Item list pagination" className="mt-4">
+              <ul className="pagination justify-content-center">
+                <li className={`page-item ${currentPage === 1 ? 'disabled' : ''}`}>
+                  <button
+                    className="page-link"
+                    onClick={() => handlePageChange(currentPage - 1)}
+                    disabled={currentPage === 1}
+                    aria-label="Previous page"
+                  >
+                    <i className="bi bi-chevron-left"></i>
+                  </button>
+                </li>
+
+                {/* Page numbers */}
+                {(() => {
+                  const pages = [];
+                  const maxVisiblePages = 5;
+                  let startPage = Math.max(1, currentPage - Math.floor(maxVisiblePages / 2));
+                  let endPage = Math.min(totalPages, startPage + maxVisiblePages - 1);
+
+                  // Adjust start if we're near the end
+                  if (endPage - startPage + 1 < maxVisiblePages) {
+                    startPage = Math.max(1, endPage - maxVisiblePages + 1);
+                  }
+
+                  // First page + ellipsis
+                  if (startPage > 1) {
+                    pages.push(
+                      <li key={1} className="page-item">
+                        <button className="page-link" onClick={() => handlePageChange(1)}>1</button>
+                      </li>
+                    );
+                    if (startPage > 2) {
+                      pages.push(
+                        <li key="start-ellipsis" className="page-item disabled">
+                          <span className="page-link">...</span>
+                        </li>
+                      );
+                    }
+                  }
+
+                  // Page numbers
+                  for (let i = startPage; i <= endPage; i++) {
+                    pages.push(
+                      <li key={i} className={`page-item ${currentPage === i ? 'active' : ''}`}>
+                        <button
+                          className="page-link"
+                          onClick={() => handlePageChange(i)}
+                          aria-current={currentPage === i ? 'page' : undefined}
+                        >
+                          {i}
+                        </button>
+                      </li>
+                    );
+                  }
+
+                  // Last page + ellipsis
+                  if (endPage < totalPages) {
+                    if (endPage < totalPages - 1) {
+                      pages.push(
+                        <li key="end-ellipsis" className="page-item disabled">
+                          <span className="page-link">...</span>
+                        </li>
+                      );
+                    }
+                    pages.push(
+                      <li key={totalPages} className="page-item">
+                        <button className="page-link" onClick={() => handlePageChange(totalPages)}>
+                          {totalPages}
+                        </button>
+                      </li>
+                    );
+                  }
+
+                  return pages;
+                })()}
+
+                <li className={`page-item ${currentPage === totalPages ? 'disabled' : ''}`}>
+                  <button
+                    className="page-link"
+                    onClick={() => handlePageChange(currentPage + 1)}
+                    disabled={currentPage === totalPages}
+                    aria-label="Next page"
+                  >
+                    <i className="bi bi-chevron-right"></i>
+                  </button>
+                </li>
+              </ul>
+            </nav>
+          )}
+        </>
       ) : (
         <div className="mb-4">
           <SearchResultsMap

frontend/src/pages/Owning.tsx

@@ -4,7 +4,7 @@ import { useAuth } from "../contexts/AuthContext";
 import api from "../services/api";
 import { Item, Rental, ConditionCheck } from "../types";
 import { rentalAPI, conditionCheckAPI } from "../services/api";
-import { getPublicImageUrl } from "../services/uploadService";
+import { getImageUrl } from "../services/uploadService";
 import ReviewRenterModal from "../components/ReviewRenterModal";
 import RentalCancellationModal from "../components/RentalCancellationModal";
 import DeclineRentalModal from "../components/DeclineRentalModal";
@@ -364,9 +364,16 @@ const Owning: React.FC = () => {
                   {rental.item?.imageFilenames &&
                     rental.item.imageFilenames[0] && (
                       <img
-                        src={getPublicImageUrl(rental.item.imageFilenames[0])}
+                        src={getImageUrl(rental.item.imageFilenames[0], 'thumbnail')}
                         className="card-img-top"
                         alt={rental.item.name}
+                        onError={(e) => {
+                          const target = e.currentTarget;
+                          if (!target.dataset.fallback && rental.item) {
+                            target.dataset.fallback = 'true';
+                            target.src = getImageUrl(rental.item.imageFilenames[0], 'original');
+                          }
+                        }}
                         style={{
                           height: "200px",
                           objectFit: "contain",
@@ -617,9 +624,16 @@ const Owning: React.FC = () => {
               >
                 {item.imageFilenames && item.imageFilenames[0] && (
                   <img
-                    src={getPublicImageUrl(item.imageFilenames[0])}
+                    src={getImageUrl(item.imageFilenames[0], 'thumbnail')}
                     className="card-img-top"
                     alt={item.name}
+                    onError={(e) => {
+                      const target = e.currentTarget;
+                      if (!target.dataset.fallback) {
+                        target.dataset.fallback = 'true';
+                        target.src = getImageUrl(item.imageFilenames[0], 'original');
+                      }
+                    }}
                     style={{
                       height: "200px",
                       objectFit: "contain",

frontend/src/pages/Profile.tsx

@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import { useAuth } from "../contexts/AuthContext";
 import { userAPI, itemAPI, rentalAPI, addressAPI, conditionCheckAPI } from "../services/api";
 import { User, Item, Rental, Address, ConditionCheck } from "../types";
-import { uploadFile, getPublicImageUrl } from "../services/uploadService";
+import { uploadImageWithVariants, getImageUrl } from "../services/uploadService";
 import AvailabilitySettings from "../components/AvailabilitySettings";
 import ReviewItemModal from "../components/ReviewModal";
 import ReviewRenterModal from "../components/ReviewRenterModal";
@@ -168,7 +168,7 @@ const Profile: React.FC = () => {
           response.data.itemRequestNotificationRadius || 10,
       });
       if (response.data.imageFilename) {
-        setImagePreview(getPublicImageUrl(response.data.imageFilename));
+        setImagePreview(getImageUrl(response.data.imageFilename, 'thumbnail'));
       }
     } catch (err: any) {
       setError(err.response?.data?.message || "Failed to fetch profile");
@@ -365,21 +365,21 @@ const Profile: React.FC = () => {
       };
       reader.readAsDataURL(file);
 
-      // Upload image to S3
+      // Upload image to S3 (with resizing)
       try {
-        const { key, publicUrl } = await uploadFile("profile", file);
+        const { baseKey, publicUrl } = await uploadImageWithVariants("profile", file);
 
         // Update the imageFilename in formData with the S3 key
         setFormData((prev) => ({
           ...prev,
-          imageFilename: key,
+          imageFilename: baseKey,
         }));
 
-        // Update preview to use the S3 URL
-        setImagePreview(publicUrl);
+        // Update preview to use the thumbnail URL
+        setImagePreview(getImageUrl(baseKey, 'thumbnail'));
 
         // Save imageFilename to database immediately
-        const response = await userAPI.updateProfile({ imageFilename: key });
+        const response = await userAPI.updateProfile({ imageFilename: baseKey });
         setProfileData(response.data);
         updateUser(response.data);
       } catch (err: any) {
@@ -389,7 +389,7 @@ const Profile: React.FC = () => {
         setImageFile(null);
         setImagePreview(
           profileData?.imageFilename
-            ? getPublicImageUrl(profileData.imageFilename)
+            ? getImageUrl(profileData.imageFilename, 'thumbnail')
             : null
         );
       }
@@ -450,7 +450,7 @@ const Profile: React.FC = () => {
           profileData.itemRequestNotificationRadius || 10,
       });
       setImagePreview(
-        profileData.imageFilename ? getPublicImageUrl(profileData.imageFilename) : null
+        profileData.imageFilename ? getImageUrl(profileData.imageFilename, 'thumbnail') : null
       );
     }
   };
@@ -1269,9 +1269,16 @@ const Profile: React.FC = () => {
                             <div className="card h-100">
                               {rental.item?.imageFilenames && rental.item.imageFilenames[0] && (
                                 <img
-                                  src={getPublicImageUrl(rental.item.imageFilenames[0])}
+                                  src={getImageUrl(rental.item.imageFilenames[0], 'thumbnail')}
                                   className="card-img-top"
                                   alt={rental.item.name}
+                                  onError={(e) => {
+                                    const target = e.currentTarget;
+                                    if (!target.dataset.fallback && rental.item) {
+                                      target.dataset.fallback = 'true';
+                                      target.src = getImageUrl(rental.item.imageFilenames[0], 'original');
+                                    }
+                                  }}
                                   style={{
                                     height: "150px",
                                     objectFit: "cover",
@@ -1424,9 +1431,16 @@ const Profile: React.FC = () => {
                             <div className="card h-100">
                               {rental.item?.imageFilenames && rental.item.imageFilenames[0] && (
                                 <img
-                                  src={getPublicImageUrl(rental.item.imageFilenames[0])}
+                                  src={getImageUrl(rental.item.imageFilenames[0], 'thumbnail')}
                                   className="card-img-top"
                                   alt={rental.item.name}
+                                  onError={(e) => {
+                                    const target = e.currentTarget;
+                                    if (!target.dataset.fallback && rental.item) {
+                                      target.dataset.fallback = 'true';
+                                      target.src = getImageUrl(rental.item.imageFilenames[0], 'original');
+                                    }
+                                  }}
                                   style={{
                                     height: "150px",
                                     objectFit: "cover",

frontend/src/pages/PublicProfile.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { useParams, useNavigate } from 'react-router-dom';
 import { User, Item } from '../types';
 import { userAPI, itemAPI } from '../services/api';
-import { getPublicImageUrl } from '../services/uploadService';
+import { getImageUrl } from '../services/uploadService';
 import { useAuth } from '../contexts/AuthContext';
 import ChatWindow from '../components/ChatWindow';
 import Avatar from '../components/Avatar';
@@ -101,9 +101,16 @@ const PublicProfile: React.FC = () => {
                       >
                         {item.imageFilenames.length > 0 ? (
                           <img
-                            src={getPublicImageUrl(item.imageFilenames[0])}
+                            src={getImageUrl(item.imageFilenames[0], 'thumbnail')}
                             className="card-img-top"
                             alt={item.name}
+                            onError={(e) => {
+                              const target = e.currentTarget;
+                              if (!target.dataset.fallback) {
+                                target.dataset.fallback = 'true';
+                                target.src = getImageUrl(item.imageFilenames[0], 'original');
+                              }
+                            }}
                             style={{ height: '200px', objectFit: 'contain', backgroundColor: '#f8f9fa' }}
                           />
                         ) : (

frontend/src/pages/RentItem.tsx

@@ -3,7 +3,7 @@ import { useParams, useNavigate, useSearchParams } from "react-router-dom";
 import { Item } from "../types";
 import { useAuth } from "../contexts/AuthContext";
 import { itemAPI, rentalAPI } from "../services/api";
-import { getPublicImageUrl } from "../services/uploadService";
+import { getImageUrl } from "../services/uploadService";
 import EmbeddedStripeCheckout from "../components/EmbeddedStripeCheckout";
 import VerificationCodeModal from "../components/VerificationCodeModal";
 
@@ -261,9 +261,16 @@ const RentItem: React.FC = () => {
                 <div className="card-body">
                   {item.imageFilenames && item.imageFilenames[0] && (
                     <img
-                      src={getPublicImageUrl(item.imageFilenames[0])}
+                      src={getImageUrl(item.imageFilenames[0], 'medium')}
                       alt={item.name}
                       className="img-fluid rounded mb-3"
+                      onError={(e) => {
+                        const target = e.currentTarget;
+                        if (!target.dataset.fallback) {
+                          target.dataset.fallback = 'true';
+                          target.src = getImageUrl(item.imageFilenames[0], 'original');
+                        }
+                      }}
                       style={{
                         width: "100%",
                         height: "150px",

frontend/src/pages/Renting.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import { useAuth } from "../contexts/AuthContext";
 import { rentalAPI, conditionCheckAPI } from "../services/api";
-import { getPublicImageUrl } from "../services/uploadService";
+import { getImageUrl } from "../services/uploadService";
 import { Rental, ConditionCheck } from "../types";
 import ReviewItemModal from "../components/ReviewModal";
 import RentalCancellationModal from "../components/RentalCancellationModal";
@@ -243,9 +243,16 @@ const Renting: React.FC = () => {
                   {rental.item?.imageFilenames &&
                     rental.item.imageFilenames[0] && (
                       <img
-                        src={getPublicImageUrl(rental.item.imageFilenames[0])}
+                        src={getImageUrl(rental.item.imageFilenames[0], 'thumbnail')}
                         className="card-img-top"
                         alt={rental.item.name}
+                        onError={(e) => {
+                          const target = e.currentTarget;
+                          if (!target.dataset.fallback && rental.item) {
+                            target.dataset.fallback = 'true';
+                            target.src = getImageUrl(rental.item.imageFilenames[0], 'original');
+                          }
+                        }}
                         style={{
                           height: "200px",
                           objectFit: "contain",

frontend/src/services/uploadService.ts

@@ -1,4 +1,9 @@
 import api from "./api";
+import {
+  resizeImage,
+  getVariantKey,
+  getSizeSuffix,
+} from "../utils/imageResizer";
 
 /**
  * Get the public URL for an image (S3 only)
@@ -151,39 +156,6 @@ export async function uploadFile(
   return { key: presigned.key, publicUrl: presigned.publicUrl };
 }
 
-/**
- * Upload multiple files to S3 (complete flow)
- */
-export async function uploadFiles(
-  uploadType: UploadType,
-  files: File[],
-  options: UploadOptions = {}
-): Promise<{ key: string; publicUrl: string }[]> {
-  if (files.length === 0) return [];
-
-  // Get presigned URLs for all files
-  const presignedUrls = await getPresignedUrls(uploadType, files);
-
-  // Upload all files in parallel
-  await Promise.all(
-    files.map((file, i) =>
-      uploadToS3(file, presignedUrls[i].uploadUrl, options)
-    )
-  );
-
-  // Confirm all uploads
-  const keys = presignedUrls.map((p) => p.key);
-  const { confirmed, total } = await confirmUploads(keys);
-
-  if (confirmed.length < total) {
-    console.warn(`${total - confirmed.length} uploads failed verification`);
-  }
-
-  return presignedUrls
-    .filter((p) => confirmed.includes(p.key))
-    .map((p) => ({ key: p.key, publicUrl: p.publicUrl }));
-}
-
 /**
  * Get a signed URL for accessing private content (messages, condition-checks)
  */
@@ -193,3 +165,119 @@ export async function getSignedUrl(key: string): Promise<string> {
   );
   return response.data.url;
 }
+
+/**
+ * Get a signed URL for a specific image size variant (private content)
+ * Backend will validate ownership using the base key
+ */
+export async function getSignedImageUrl(
+  baseKey: string,
+  size: "thumbnail" | "medium" | "original" = "original"
+): Promise<string> {
+  const suffix = getSizeSuffix(size);
+  const variantKey = getVariantKey(baseKey, suffix);
+  return getSignedUrl(variantKey);
+}
+
+/**
+ * Get URL for a specific image size variant
+ * Falls back to original if variant doesn't exist (backward compatibility)
+ */
+export function getImageUrl(
+  baseKey: string | null | undefined,
+  size: "thumbnail" | "medium" | "original" = "original"
+): string {
+  if (!baseKey) return "";
+
+  const suffix = getSizeSuffix(size);
+  const variantKey = getVariantKey(baseKey, suffix);
+
+  return getPublicImageUrl(variantKey);
+}
+
+export interface UploadWithResizeOptions extends UploadOptions {
+  skipResize?: boolean;
+}
+
+/**
+ * Upload a single image with all size variants (thumbnail, medium, original)
+ * Returns the base key (original, without suffix) for database storage
+ */
+export async function uploadImageWithVariants(
+  uploadType: UploadType,
+  file: File,
+  options: UploadWithResizeOptions = {}
+): Promise<{ baseKey: string; publicUrl: string; variants: string[] }> {
+  const { onProgress, skipResize } = options;
+
+  // If skipping resize, use regular upload
+  if (skipResize) {
+    const result = await uploadFile(uploadType, file, { onProgress });
+    return { baseKey: result.key, publicUrl: result.publicUrl, variants: [result.key] };
+  }
+
+  // Generate resized variants
+  const resizedImages = await resizeImage(file);
+
+  if (resizedImages.length === 0) {
+    throw new Error("Failed to resize image");
+  }
+
+  // Get presigned URLs for all variants
+  const files = resizedImages.map((r) => r.file);
+  const presignedUrls = await getPresignedUrls(uploadType, files);
+
+  // Upload all variants in parallel with combined progress
+  const totalBytes = files.reduce((sum, f) => sum + f.size, 0);
+  let uploadedBytes = 0;
+
+  await Promise.all(
+    files.map((variantFile, i) =>
+      uploadToS3(variantFile, presignedUrls[i].uploadUrl, {
+        onProgress: (percent) => {
+          if (onProgress) {
+            const fileContribution = (variantFile.size / totalBytes) * percent;
+            // Approximate combined progress
+            onProgress(Math.min(99, Math.round(uploadedBytes / totalBytes * 100 + fileContribution)));
+          }
+        },
+      }).then(() => {
+        uploadedBytes += files[i].size;
+      })
+    )
+  );
+
+  // Confirm all uploads
+  const keys = presignedUrls.map((p) => p.key);
+  await confirmUploads(keys);
+
+  // Find the original variant key (no suffix) for database storage
+  const originalIdx = resizedImages.findIndex((r) => r.variant.size === "original");
+  const baseKey = presignedUrls[originalIdx]?.key || presignedUrls[0].key;
+
+  if (onProgress) onProgress(100);
+
+  return {
+    baseKey,
+    publicUrl: getPublicImageUrl(baseKey),
+    variants: keys,
+  };
+}
+
+/**
+ * Upload multiple images with all size variants
+ * Returns array of base keys for database storage
+ */
+export async function uploadImagesWithVariants(
+  uploadType: UploadType,
+  files: File[],
+  options: UploadWithResizeOptions = {}
+): Promise<{ baseKey: string; publicUrl: string }[]> {
+  if (files.length === 0) return [];
+
+  const results = await Promise.all(
+    files.map((file) => uploadImageWithVariants(uploadType, file, options))
+  );
+
+  return results.map((r) => ({ baseKey: r.baseKey, publicUrl: r.publicUrl }));
+}

frontend/src/utils/imageResizer.ts

@@ -0,0 +1,91 @@
+import imageCompression from "browser-image-compression";
+
+interface ImageSizeVariant {
+  size: "original" | "medium" | "thumbnail";
+  maxWidth: number;
+  quality: number;
+  suffix: string;
+}
+
+const IMAGE_VARIANTS: ImageSizeVariant[] = [
+  { size: "thumbnail", maxWidth: 200, quality: 0.8, suffix: "_th" },
+  { size: "medium", maxWidth: 800, quality: 0.8, suffix: "_md" },
+  { size: "original", maxWidth: 4096, quality: 0.9, suffix: "" },
+];
+
+interface ResizedImage {
+  variant: ImageSizeVariant;
+  file: File;
+}
+
+/**
+ * Resize an image to all size variants (thumbnail, medium, original)
+ * Returns array of resized File objects
+ */
+export async function resizeImage(file: File): Promise<ResizedImage[]> {
+  const results: ResizedImage[] = [];
+
+  for (const variant of IMAGE_VARIANTS) {
+    const options = {
+      maxWidthOrHeight: variant.maxWidth,
+      useWebWorker: true,
+      initialQuality: variant.quality,
+      fileType: "image/jpeg" as const,
+    };
+
+    try {
+      const compressedFile = await imageCompression(file, options);
+
+      // Create new File with variant-specific name
+      const variantFile = new File(
+        [compressedFile],
+        generateVariantFilename(file.name, variant.suffix),
+        { type: "image/jpeg" }
+      );
+
+      results.push({
+        variant,
+        file: variantFile,
+      });
+    } catch (error) {
+      console.error(`Failed to resize image for ${variant.size}:`, error);
+      throw error;
+    }
+  }
+
+  return results;
+}
+
+/**
+ * Generate filename with variant suffix
+ * e.g., "photo.png" + "_th" => "photo_th.jpg"
+ */
+function generateVariantFilename(
+  originalName: string,
+  suffix: string
+): string {
+  const lastDot = originalName.lastIndexOf(".");
+  const baseName = lastDot === -1 ? originalName : originalName.substring(0, lastDot);
+  return `${baseName}${suffix}.jpg`;
+}
+
+/**
+ * Derive S3 key for a specific variant from the base key
+ * e.g., "items/uuid.jpg" + "_th" => "items/uuid_th.jpg"
+ */
+export function getVariantKey(baseKey: string, suffix: string): string {
+  if (!suffix) return baseKey;
+  const lastDot = baseKey.lastIndexOf(".");
+  if (lastDot === -1) return `${baseKey}${suffix}`;
+  return `${baseKey.substring(0, lastDot)}${suffix}${baseKey.substring(lastDot)}`;
+}
+
+/**
+ * Get the suffix for a given size
+ */
+export function getSizeSuffix(
+  size: "thumbnail" | "medium" | "original"
+): string {
+  const variant = IMAGE_VARIANTS.find((v) => v.size === size);
+  return variant?.suffix || "";
+}