`
+2. Browser requests image from backend domain
+3. Ingress routes to Backend Service
+4. FastAPI serves file via StaticFiles mount
+5. Image displays
+
+### Display Flow (Old Relative URLs - Backup):
+1. Frontend renders `
`
+2. Browser requests from frontend domain
+3. Ingress routes `/uploads/*` to Backend Service
+4. FastAPI serves file
+5. Image displays
+
+## Troubleshooting
+
+### Issue: Images still not loading
+
+**Check 1**: Verify backend URL is set correctly
+```bash
+kubectl get pod -n my-apps -l app.kubernetes.io/component=backend -o jsonpath='{.items[0].spec.containers[0].env[?(@.name=="BACKEND_URL")].value}'
+```
+Should return: `https://api-brand-master.dvirlabs.com`
+
+**Check 2**: Verify StaticFiles is mounted
+```bash
+kubectl exec -n my-apps -l app.kubernetes.io/component=backend -- ls -la /app/uploads
+```
+
+**Check 3**: Verify ingress routes
+```bash
+kubectl get ingress -n my-apps brand-master-frontend -o yaml
+```
+Should show `/uploads` path routing to backend service.
+
+**Check 4**: Test direct backend access
+```bash
+curl -I https://api-brand-master.dvirlabs.com/uploads/products/some-file.jpg
+```
+
+### Issue: Images disappear after pod restart
+
+**Check**: PVC is properly mounted
+```bash
+kubectl get pvc -n my-apps
+kubectl describe pvc -n my-apps brand-master-uploads-pvc
+```
+
+Verify:
+- STATUS: Bound
+- STORAGECLASS: nfs-client
+- CAPACITY: 15Gi
+
+### Issue: Upload fails with 500 error
+
+**Check backend logs**:
+```bash
+kubectl logs -n my-apps -l app.kubernetes.io/component=backend --tail=100
+```
+
+Common causes:
+- Permissions issue on /app/uploads
+- PVC not mounted
+- Disk space full
+
+## Summary of Files Changed
+
+### Backend (Code Repo)
+- ✅ `backend/app/config.py` - Added backend_url setting
+- ✅ `backend/app/utils.py` - Updated save_upload_file to return full URLs
+- ✅ `backend/app/routers/products.py` - Updated to use backend_url
+- ✅ `backend/app/routers/categories.py` - Added upload endpoint
+
+### Frontend (Code Repo)
+- ✅ `frontend/src/pages/Admin.jsx` - Removed URL building, use backend URLs
+- ✅ `frontend/src/components/ProductCard.jsx` - Added fallback handling
+- ✅ `frontend/src/components/CategoryCard.jsx` - Added fallback handling
+
+### Kubernetes (GitOps Repo)
+- ✅ `charts/brand-master-chart/templates/frontend-ingress.yaml` - Added /uploads routing
+
+## Next Steps
+
+1. Deploy backend changes
+2. Deploy frontend changes
+3. Update Helm deployment with new ingress config
+4. Test all image upload scenarios
+5. Verify images persist across restarts
+6. Monitor logs for any errors
+
+## Rollback Plan
+
+If issues occur after deployment:
+
+```bash
+# Rollback Helm release
+helm rollback brand-master -n my-apps
+
+# Or rollback individual components
+kubectl rollout undo deployment/brand-master-backend -n my-apps
+kubectl rollout undo deployment/brand-master-frontend -n my-apps
+```
+
+## Environment Variables Reference
+
+Required in backend deployment:
+
+```yaml
+env:
+ BACKEND_URL: "https://api-brand-master.dvirlabs.com" # Must be set!
+ FRONTEND_URL: "https://brand-master.dvirlabs.com"
+ PYTHONUNBUFFERED: "1"
+ # ... other env vars ...
+```
+
+Already configured in `manifests/brand-master/values.yaml`.
diff --git a/apply-migration.bat b/apply-migration.bat
new file mode 100644
index 0000000..9a59df6
--- /dev/null
+++ b/apply-migration.bat
@@ -0,0 +1,29 @@
+@echo off
+REM Apply database migration 005 - Add password reset fields
+
+echo Getting database pod name...
+for /f "delims=" %%i in ('kubectl get pod -n my-apps -l app.kubernetes.io/component=db -o jsonpath^="{.items[0].metadata.name}"') do set DB_POD=%%i
+
+if "%DB_POD%"=="" (
+ echo ❌ Database pod not found
+ exit /b 1
+)
+
+echo 📦 Database pod: %DB_POD%
+echo 📝 Applying migration 005_add_password_reset_fields.sql...
+echo.
+
+REM Copy migration file to pod
+kubectl cp backend/migrations/005_add_password_reset_fields.sql my-apps/%DB_POD%:/tmp/migration.sql
+
+REM Execute migration
+kubectl exec -n my-apps %DB_POD% -- psql -U brand_master_user -d brand_master_db -f /tmp/migration.sql
+
+echo.
+echo ✅ Migration applied successfully!
+echo.
+echo 🔄 Restarting backend pod to pick up changes...
+kubectl delete pod -n my-apps -l app.kubernetes.io/component=backend
+
+echo.
+echo ✅ Done! Backend will restart with updated schema.
diff --git a/apply-migration.sh b/apply-migration.sh
new file mode 100644
index 0000000..6ec289c
--- /dev/null
+++ b/apply-migration.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# Apply database migration 005 - Add password reset fields
+
+# Get the database pod name
+DB_POD=$(kubectl get pod -n my-apps -l app.kubernetes.io/component=db -o jsonpath='{.items[0].metadata.name}')
+
+if [ -z "$DB_POD" ]; then
+ echo "❌ Database pod not found"
+ exit 1
+fi
+
+echo "📦 Database pod: $DB_POD"
+echo "📝 Applying migration 005_add_password_reset_fields.sql..."
+echo ""
+
+# Copy migration file to pod
+kubectl cp backend/migrations/005_add_password_reset_fields.sql my-apps/$DB_POD:/tmp/migration.sql
+
+# Execute migration
+kubectl exec -n my-apps $DB_POD -- psql -U brand_master_user -d brand_master_db -f /tmp/migration.sql
+
+echo ""
+echo "✅ Migration applied successfully!"
+echo ""
+echo "🔄 Restarting backend pod to pick up changes..."
+kubectl delete pod -n my-apps -l app.kubernetes.io/component=backend
+
+echo ""
+echo "✅ Done! Backend will restart with updated schema."
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 4f349b1..26a4ee4 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -28,4 +28,3 @@ ENV PYTHONUNBUFFERED=1
# Run the application
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
-
diff --git a/backend/app/__pycache__/config.cpython-314.pyc b/backend/app/__pycache__/config.cpython-314.pyc
index f6d7598..58a4980 100644
Binary files a/backend/app/__pycache__/config.cpython-314.pyc and b/backend/app/__pycache__/config.cpython-314.pyc differ
diff --git a/backend/app/__pycache__/main.cpython-314.pyc b/backend/app/__pycache__/main.cpython-314.pyc
index a8dabf1..2c69648 100644
Binary files a/backend/app/__pycache__/main.cpython-314.pyc and b/backend/app/__pycache__/main.cpython-314.pyc differ
diff --git a/backend/app/__pycache__/utils.cpython-314.pyc b/backend/app/__pycache__/utils.cpython-314.pyc
index 47b6246..1f90343 100644
Binary files a/backend/app/__pycache__/utils.cpython-314.pyc and b/backend/app/__pycache__/utils.cpython-314.pyc differ
diff --git a/backend/app/config.py b/backend/app/config.py
index 2aa7ca2..97e2b27 100644
--- a/backend/app/config.py
+++ b/backend/app/config.py
@@ -8,6 +8,7 @@ class Settings(BaseSettings):
jwt_algorithm: str = "HS256"
access_token_expire_minutes: int = 30
frontend_url: str = "http://localhost:5173"
+ backend_url: str = "http://localhost:8000"
# Admin user credentials (created on first startup)
admin_email: str = "admin@brandmaster.com"
diff --git a/backend/app/models/__pycache__/user.cpython-314.pyc b/backend/app/models/__pycache__/user.cpython-314.pyc
index b5c6025..f6b2c60 100644
Binary files a/backend/app/models/__pycache__/user.cpython-314.pyc and b/backend/app/models/__pycache__/user.cpython-314.pyc differ
diff --git a/backend/app/routers/__pycache__/auth.cpython-314.pyc b/backend/app/routers/__pycache__/auth.cpython-314.pyc
index e035c85..454bda1 100644
Binary files a/backend/app/routers/__pycache__/auth.cpython-314.pyc and b/backend/app/routers/__pycache__/auth.cpython-314.pyc differ
diff --git a/backend/app/routers/__pycache__/categories.cpython-314.pyc b/backend/app/routers/__pycache__/categories.cpython-314.pyc
index a46a785..9dbe9c3 100644
Binary files a/backend/app/routers/__pycache__/categories.cpython-314.pyc and b/backend/app/routers/__pycache__/categories.cpython-314.pyc differ
diff --git a/backend/app/routers/__pycache__/products.cpython-314.pyc b/backend/app/routers/__pycache__/products.cpython-314.pyc
index 09e390c..a852b37 100644
Binary files a/backend/app/routers/__pycache__/products.cpython-314.pyc and b/backend/app/routers/__pycache__/products.cpython-314.pyc differ
diff --git a/backend/app/routers/__pycache__/users.cpython-314.pyc b/backend/app/routers/__pycache__/users.cpython-314.pyc
index 72ea1dd..b0fd3b1 100644
Binary files a/backend/app/routers/__pycache__/users.cpython-314.pyc and b/backend/app/routers/__pycache__/users.cpython-314.pyc differ
diff --git a/backend/app/routers/categories.py b/backend/app/routers/categories.py
index c9e92d8..7e09560 100644
--- a/backend/app/routers/categories.py
+++ b/backend/app/routers/categories.py
@@ -1,10 +1,12 @@
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, UploadFile, File
from sqlalchemy.orm import Session
from typing import List
from app.database.database import get_db
from app.models import Category, User
from app.schemas.category import CategoryCreate, CategoryResponse, CategoryUpdate
from app.services.auth import get_current_admin_user
+from app.utils import save_upload_file
+from app.config import settings
router = APIRouter(prefix="/api/categories", tags=["categories"])
@@ -69,3 +71,25 @@ def delete_category(
db.delete(category)
db.commit()
return {"message": "Category deleted successfully"}
+
+
+@router.post("/upload-image")
+async def upload_category_image(
+ file: UploadFile = File(...),
+ admin: User = Depends(get_current_admin_user),
+):
+ """Upload a category image and return the URL"""
+ # Validate file type
+ allowed_types = ["image/jpeg", "image/png", "image/jpg", "image/webp", "image/gif"]
+ if file.content_type not in allowed_types:
+ raise HTTPException(
+ status_code=400,
+ detail=f"File type {file.content_type} not allowed. Allowed types: {', '.join(allowed_types)}"
+ )
+
+ try:
+ # Save file and get full URL
+ file_path = save_upload_file(file, folder="categories", backend_url=settings.backend_url)
+ return {"url": file_path, "message": "Image uploaded successfully"}
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=f"Error uploading file: {str(e)}")
diff --git a/backend/app/routers/products.py b/backend/app/routers/products.py
index b5ef5a4..f314829 100644
--- a/backend/app/routers/products.py
+++ b/backend/app/routers/products.py
@@ -20,6 +20,7 @@ from app.services.product import (
)
from app.services.auth import get_current_admin_user
from app.utils import save_upload_file, generate_slug
+from app.config import settings
router = APIRouter(prefix="/api/products", tags=["products"])
@@ -152,7 +153,7 @@ async def upload_product_image(
try:
# Save file and get path
- file_path = save_upload_file(file, folder="products")
+ file_path = save_upload_file(file, folder="products", backend_url=settings.backend_url)
# Return full URL
return {"url": file_path, "message": "Image uploaded successfully"}
except Exception as e:
@@ -175,7 +176,7 @@ async def upload_multiple_images(
continue
try:
- file_path = save_upload_file(file, folder="products")
+ file_path = save_upload_file(file, folder="products", backend_url=settings.backend_url)
uploaded_urls.append(file_path)
except Exception as e:
errors.append(f"File {file.filename}: {str(e)}")
diff --git a/backend/app/schemas/__pycache__/user.cpython-314.pyc b/backend/app/schemas/__pycache__/user.cpython-314.pyc
index b79b1fc..450ef46 100644
Binary files a/backend/app/schemas/__pycache__/user.cpython-314.pyc and b/backend/app/schemas/__pycache__/user.cpython-314.pyc differ
diff --git a/backend/app/services/__pycache__/auth.cpython-314.pyc b/backend/app/services/__pycache__/auth.cpython-314.pyc
index 0bfafeb..1a25e92 100644
Binary files a/backend/app/services/__pycache__/auth.cpython-314.pyc and b/backend/app/services/__pycache__/auth.cpython-314.pyc differ
diff --git a/backend/app/utils.py b/backend/app/utils.py
index c8f0f41..8499283 100644
--- a/backend/app/utils.py
+++ b/backend/app/utils.py
@@ -13,8 +13,8 @@ def generate_slug(text: str) -> str:
slug = re.sub(r'^-+|-+$', '', slug)
return slug
-def save_upload_file(upload_file, folder: str = "products") -> str:
- """Save uploaded file and return the file path"""
+def save_upload_file(upload_file, folder: str = "products", backend_url: str = None) -> str:
+ """Save uploaded file and return the file URL"""
# Create uploads directory if it doesn't exist
upload_dir = Path("uploads") / folder
upload_dir.mkdir(parents=True, exist_ok=True)
@@ -28,5 +28,10 @@ def save_upload_file(upload_file, folder: str = "products") -> str:
with open(file_path, "wb") as buffer:
buffer.write(upload_file.file.read())
- # Return relative path for URL
- return f"/uploads/{folder}/{unique_filename}"
+ # Return full URL if backend_url provided, otherwise relative path
+ relative_path = f"/uploads/{folder}/{unique_filename}"
+ if backend_url:
+ # Remove trailing slash from backend_url if present
+ backend_url = backend_url.rstrip('/')
+ return f"{backend_url}{relative_path}"
+ return relative_path
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 0d3b02f..c7fab33 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -67,3 +67,4 @@ EXPOSE 80
# Start nginx
CMD ["nginx", "-g", "daemon off;"]
+
diff --git a/frontend/src/components/CategoryCard.jsx b/frontend/src/components/CategoryCard.jsx
index 06c8ba8..838d939 100644
--- a/frontend/src/components/CategoryCard.jsx
+++ b/frontend/src/components/CategoryCard.jsx
@@ -1,12 +1,18 @@
-import React from 'react'
+import React, { useState } from 'react'
import { Link } from 'react-router-dom'
export default function CategoryCard({ category }) {
- const categoryImage = category.image || `https://via.placeholder.com/300x300?text=${category.name}`
+ const [imageError, setImageError] = useState(false)
+ const fallbackImage = `https://via.placeholder.com/300x300?text=${encodeURIComponent(category.name)}`
+ const categoryImage = (category.image && !imageError) ? category.image : fallbackImage
return (
-
- 
+ 
setImageError(true)}
+ />
{product.is_on_sale && discount > 0 && (
{discount}% OFF
)}
diff --git a/frontend/src/pages/Admin.jsx b/frontend/src/pages/Admin.jsx
index 1bfbdf0..cc844ef 100644
--- a/frontend/src/pages/Admin.jsx
+++ b/frontend/src/pages/Admin.jsx
@@ -167,10 +167,6 @@ export default function Admin() {
const newImages = [...uploadedImages]
try {
- // Get backend URL from environment
- const apiUrl = import.meta.env.VITE_API_URL || 'http://localhost:8000/api'
- const backendUrl = apiUrl.replace('/api', '') // Remove /api suffix to get base URL
-
for (let i = 0; i < files.length; i++) {
const file = files[i]
const formDataUpload = new FormData()
@@ -182,11 +178,8 @@ export default function Admin() {
},
})
- // Add the full URL
- const imageUrl = response.data.url.startsWith('http')
- ? response.data.url
- : `${backendUrl}${response.data.url}`
- newImages.push(imageUrl)
+ // Backend now returns full URLs
+ newImages.push(response.data.url)
}
setUploadedImages(newImages)
@@ -341,16 +334,11 @@ export default function Admin() {
formData.append('file', file)
try {
- const response = await api.post('/products/upload-image', formData, {
+ const response = await api.post('/categories/upload-image', formData, {
headers: { 'Content-Type': 'multipart/form-data' }
})
- // Prepend backend URL for image display
- const apiUrl = import.meta.env.VITE_API_URL || 'http://localhost:8000/api'
- const backendUrl = apiUrl.replace('/api', '') // Remove /api suffix to get base URL
- const imageUrl = response.data.url.startsWith('http')
- ? response.data.url
- : `${backendUrl}${response.data.url}`
- setCategoryFormData({ ...categoryFormData, image: imageUrl })
+ // Backend now returns full URLs
+ setCategoryFormData({ ...categoryFormData, image: response.data.url })
setToast({ type: 'success', message: 'Image uploaded successfully!' })
} catch (error) {
console.error('Error uploading image:', error)