pkartch/basil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Compare commits

base: pkartch:main
Branches Tags
pkartch:main pkartch:tz-mountain pkartch:feature/cookbook-pagination pkartch:feature/ci-cd-backup-deployment
pkartch:v2026.01.006 pkartch:v2026.01.005 pkartch:v2026.01.004 pkartch:v2026.01.003 pkartch:v2026.01.002 pkartch:v2026.01.01
..
compare: pkartch:tz-mountain
Branches Tags
pkartch:tz-mountain pkartch:main pkartch:feature/cookbook-pagination pkartch:feature/ci-cd-backup-deployment
pkartch:v2026.01.006 pkartch:v2026.01.005 pkartch:v2026.01.004 pkartch:v2026.01.003 pkartch:v2026.01.002 pkartch:v2026.01.01

1 Commits
main ... tz-mountai

Author SHA1 Message Date
Paul R Kartchner
3d38313b17 Run containers on Mountain time (TZ=America/Denver or host /etc/localtime) 
Images with zoneinfo get TZ=America/Denver; images without it mount the
host zone file read-only (TZ= would silently fall back to UTC there).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-11-03 17:13:52 -07:00
63 changed files with 994 additions and 7306 deletions
Expand all files Collapse all files

23
.env.dev
View File

@@ -1,23 +0,0 @@
# Development Environment Variables
IMAGE_TAG=dev
DOCKER_REGISTRY=localhost
DOCKER_USERNAME=basil
# Database - uses local postgres from docker-compose
DATABASE_URL=postgresql://basil:basil@postgres:5432/basil?schema=public
# CORS for local development
CORS_ORIGIN=http://localhost
# JWT Secrets (dev only - not secure)
JWT_SECRET=dev-secret-change-this-in-production-min-32-chars
JWT_REFRESH_SECRET=dev-refresh-secret-change-this-in-prod-min-32
# Google OAuth (optional for dev)
GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET=
GOOGLE_CALLBACK_URL=http://localhost/api/auth/google/callback
# Application URLs
APP_URL=http://localhost
API_URL=http://localhost/api

32
.gitea/workflows/main.yml
View File

@@ -66,18 +66,6 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}
# Python setup temporarily disabled - scraper tests are skipped
# TODO: Re-enable when Python dependency setup works in Gitea runners
# - name: Set up Python
# uses: actions/setup-python@v6
# with:
# python-version: '3.11'
# cache: 'pip'
# - name: Install Python dependencies
# run: |
# pip install -r packages/api/requirements.txt
# python -c "import recipe_scrapers; print('✓ recipe-scrapers installed successfully')"
- name: Install dependencies
run: npm ci
@@ -87,17 +75,8 @@ jobs:
- name: Generate Prisma Client
run: cd packages/api && npm run prisma:generate
- name: Apply database migrations
run: cd packages/api && npm run prisma:deploy
env:
DATABASE_URL: postgresql://basil:basil@postgres:5432/basil_test?schema=public
- name: Check for schema drift
run: |
cd packages/api && npx prisma migrate diff \
--from-url "$DATABASE_URL" \
--to-schema-datamodel ./prisma/schema.prisma \
--exit-code && echo "✓ schema.prisma matches applied migrations"
- name: Run database migrations
run: cd packages/api && npm run prisma:migrate
env:
DATABASE_URL: postgresql://basil:basil@postgres:5432/basil_test?schema=public
@@ -285,8 +264,8 @@ jobs:
- name: Build application
run: npm run build
- name: Apply database migrations
run: cd packages/api && npm run prisma:deploy
- name: Run database migrations
run: cd packages/api && npm run prisma:migrate
env:
DATABASE_URL: postgresql://basil:basil@postgres:5432/basil?schema=public
@@ -407,8 +386,7 @@ jobs:
name: Trigger Deployment
runs-on: ubuntu-latest
needs: docker-build-and-push
# Skip deployment if commit message contains [skip-deploy] or [dev]
if: success() && !contains(github.event.head_commit.message, '[skip-deploy]') && !contains(github.event.head_commit.message, '[dev]')
if: success()
steps:
- name: Trigger webhook
run: |

2
.gitignore vendored
View File

@@ -62,5 +62,5 @@ backups/
docker-compose.override.yml
# Prisma
# Migrations are tracked. Applied automatically by deploy.sh (via `prisma migrate deploy`).
packages/api/prisma/migrations/
# Pipeline Test

151
CLAUDE.md
View File

@@ -270,154 +270,3 @@ Basil includes a complete CI/CD pipeline with Gitea Actions for automated testin
- `DOCKER_USERNAME` - Docker Hub username
- `DOCKER_PASSWORD` - Docker Hub access token
- `DEPLOY_WEBHOOK_URL` - Webhook endpoint for deployments
## Version Management
**IMPORTANT**: Increment the version with **every production deployment**.
### Version Format
Basil uses calendar versioning with the format: `YYYY.MM.PPP`
- `YYYY` - Four-digit year (e.g., 2026)
- `MM` - Two-digit month with zero-padding (e.g., 01 for January, 12 for December)
- `PPP` - Three-digit patch number with zero-padding that increases with every deployment. **Does not reset at month boundaries** — it is a monotonically increasing counter across the lifetime of the project.
### Examples
- `2026.01.006` - Sixth deployment (in January 2026)
- `2026.04.007` - Seventh deployment (in April 2026 — patch continues from previous month, does not reset)
- `2026.04.008` - Eighth deployment (still in April 2026)
- `2026.05.009` - Ninth deployment (in May 2026 — patch continues, does not reset)
### Version Update Process
When deploying to production:
1. **Update version files:**
```bash
# Update both version files with new version
# packages/api/src/version.ts
# packages/web/src/version.ts
export const APP_VERSION = '2026.01.002';
```
2. **Commit the version bump:**
```bash
git add packages/api/src/version.ts packages/web/src/version.ts
git commit -m "chore: bump version to 2026.01.002"
git push origin main
```
3. **Create Git tag and release:**
```bash
# Tag should match version with 'v' prefix
git tag v2026.01.002
git push origin v2026.01.002
# Or use Gitea MCP to create tag and release
```
4. **Document in release notes:**
- Summarize changes since last version
- List bug fixes, features, and breaking changes
- Reference related pull requests or issues
### Version Display
The current version is displayed in:
- API: `GET /api/version` endpoint returns `{ version: '2026.01.002' }`
- Web: Footer or about section shows current version
- Both packages export `APP_VERSION` constant for internal use
## UI Design System - Thumbnail Cards
### Responsive Column Layout System
All recipe and cookbook thumbnail displays support a responsive column system (3, 5, 7, or 9 columns) with column-specific styling for optimal readability at different densities.
**Column-Responsive Font Sizes:**
- **Column 3** (Largest cards): Title 0.95rem, Description 0.8rem (2 lines), Meta 0.75rem
- **Column 5** (Medium cards): Title 0.85rem, Description 0.75rem (2 lines), Meta 0.7rem
- **Column 7** (Compact): Title 0.75rem, Description hidden, Meta 0.6rem
- **Column 9** (Most compact): Title 0.75rem, Description hidden, Meta 0.6rem
**Implementation Pattern:**
1. Add `gridClassName = \`recipes-grid columns-${columnCount}\`` or `\`cookbooks-grid columns-${columnCount}\``
2. Apply className to grid container: `<div className={gridClassName} style={gridStyle}>`
3. Use column-specific CSS selectors: `.columns-3 .recipe-info h3 { font-size: 0.95rem; }`
### Recipe Thumbnail Display Locations
All locations use square aspect ratio (1:1) cards with 60% image height.
1. **Recipe List Page** (`packages/web/src/pages/RecipeList.tsx`)
- Class: `recipe-grid-enhanced columns-{3|5|7|9}`
- CSS: `packages/web/src/styles/RecipeList.css`
- Features: Main recipe browsing with pagination, search, filtering
- Displays: Image, title, description, time, rating
- Status: ✅ Responsive column styling applied
2. **Cookbooks Page - Recent Recipes** (`packages/web/src/pages/Cookbooks.tsx`)
- Class: `recipes-grid columns-{3|5|7|9}`
- CSS: `packages/web/src/styles/Cookbooks.css`
- Features: Shows 6 most recent recipes below cookbook list
- Displays: Image, title, description, time, rating
- Status: ✅ Responsive column styling applied
3. **Cookbook Detail - Recipes Section** (`packages/web/src/pages/CookbookDetail.tsx`)
- Class: `recipes-grid columns-{3|5|7|9}`
- CSS: `packages/web/src/styles/CookbookDetail.css`
- Features: Paginated recipes within a cookbook, with remove button
- Displays: Image, title, description, time, rating, remove button
- Status: ✅ Responsive column styling applied
4. **Add Meal Modal - Recipe Selection** (`packages/web/src/components/meal-planner/AddMealModal.tsx`)
- Class: `recipe-list` with `recipe-item`
- CSS: `packages/web/src/styles/AddMealModal.css`
- Features: Selectable recipe list for adding to meal plan
- Displays: Small thumbnail, title, description
- Status: ⚠️ Needs responsive column styling review
5. **Meal Card Component** (`packages/web/src/components/meal-planner/MealCard.tsx`)
- Class: `meal-card` with `meal-card-image`
- CSS: `packages/web/src/styles/MealCard.css`
- Features: Recipe thumbnail in meal planner (compact & full views)
- Displays: Recipe image as part of meal display
- Status: ⚠️ Different use case - calendar/list view, not grid-based
### Cookbook Thumbnail Display Locations
All locations use square aspect ratio (1:1) cards with 50% image height.
1. **Cookbooks Page - Main Grid** (`packages/web/src/pages/Cookbooks.tsx`)
- Class: `cookbooks-grid`
- CSS: `packages/web/src/styles/Cookbooks.css`
- Features: Main cookbook browsing with pagination
- Displays: Cover image, name, recipe count, cookbook count
- Status: ✅ Already has compact styling (description/tags hidden)
- Note: Could benefit from column-responsive font sizes
2. **Cookbook Detail - Nested Cookbooks** (`packages/web/src/pages/CookbookDetail.tsx`)
- Class: `cookbooks-grid` with `cookbook-card nested`
- CSS: `packages/web/src/styles/CookbookDetail.css`
- Features: Child cookbooks within parent cookbook
- Displays: Cover image, name, recipe count, cookbook count
- Status: ✅ Already has compact styling (description/tags hidden)
- Note: Could benefit from column-responsive font sizes
### Key CSS Classes
- `recipe-card` - Individual recipe card
- `recipe-grid-enhanced` or `recipes-grid` - Recipe grid container
- `cookbook-card` - Individual cookbook card
- `cookbooks-grid` - Cookbook grid container
- `columns-{3|5|7|9}` - Dynamic column count modifier class
### Styling Consistency Rules
1. **Image Heights**: Recipes 60%, Cookbooks 50%
2. **Aspect Ratio**: All cards are square (1:1)
3. **Border**: 1px solid #e0e0e0 (not box-shadow)
4. **Border Radius**: 8px
5. **Hover Effect**: `translateY(-2px)` with `box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1)`
6. **Description Display**:
- Columns 3 & 5: Show 2 lines
- Columns 7 & 9: Hide completely
7. **Font Scaling**: Larger fonts for fewer columns, smaller for more columns
8. **Text Truncation**: Use `-webkit-line-clamp` with `text-overflow: ellipsis`

117
README.md
View File

@@ -5,21 +5,10 @@ A modern, full-stack recipe manager with web and mobile support. Import recipes
## Features
- **Recipe Import**: Automatically import recipes from URLs using schema.org markup
- Add tags during import for instant organization
- Works with 600+ supported recipe sites plus any site with schema.org markup
- Preview recipe before saving with immediate tag management
- **Full Recipe Management**: Create, read, update, and delete recipes
- **Rich Recipe Data**: Store ingredients, instructions, prep/cook times, servings, images, and more
- **Tag Organization**: Quick tagging system with autocomplete for rapid recipe organization
- Add/remove tags inline on recipe detail view
- Tag recipes during import
- Filter recipes by tags
- **Recipe Scaling**: Adjust serving sizes with automatic ingredient scaling
- **Cookbooks**: Organize recipes into collections with auto-filtering by tags and categories
- **Search & Filter**: Find recipes by title, cuisine, category, or tags
- **Multiple Images**: Add multiple images to each recipe
- **User Authentication**: Secure multi-user support with email/password and OAuth
- **Backup & Restore**: Complete data backup including recipes, cookbooks, and images
- **Flexible Storage**: Local filesystem storage by default, optional S3 support
- **Docker Support**: Easy deployment with Docker Compose
- **API-First Design**: RESTful API for web and future mobile apps
@@ -37,17 +26,8 @@ A modern, full-stack recipe manager with web and mobile support. Import recipes
- Node.js 20+
- PostgreSQL 16+ (or use Docker)
- Python 3.x with pip (for recipe scraper)
- Docker (optional, for containerized deployment)
**Python Dependencies:**
The recipe import feature requires Python 3 and the `recipe-scrapers` package:
```bash
pip3 install recipe-scrapers
```
For Docker deployments, Python dependencies are automatically installed in the container.
### Development Setup
1. **Clone the repository**
@@ -130,29 +110,9 @@ basil/
### Importing a Recipe
1. Navigate to "Import Recipe" in the web app
2. Paste a recipe URL (supports 600+ sites including AllRecipes, Food Network, King Arthur Baking, etc.)
3. Click "Import Recipe" to fetch and parse the recipe
4. Preview the imported recipe details
5. Add tags using the quick tag input at the top (with autocomplete)
6. Press Enter after each tag for rapid multi-tag addition
7. Save to your collection
The recipe importer works with any website that uses schema.org Recipe markup, even if not officially supported by recipe-scrapers.
### Managing Tags
**Quick Tag Management:**
- On recipe detail pages, use the inline tag input next to the servings adjuster
- Press Enter after typing each tag for rapid multi-tag addition
- Focus stays in the input field for quick consecutive tagging
- Autocomplete suggests existing tags as you type
- Click the × button on any tag to remove it
**Tag-based Organization:**
- Filter recipe list by tag name
- Use tags to organize recipes by cuisine, meal type, dietary restrictions, etc.
- Tags are automatically created when first used
- Rename or delete unused tags from the Tags page
2. Paste a recipe URL (from sites like AllRecipes, Food Network, etc.)
3. Preview the imported recipe
4. Save to your collection
### API Examples
@@ -179,61 +139,10 @@ curl -X POST http://localhost:3001/api/recipes \
],
"instructions": [
{"step": 1, "text": "Preheat oven to 350°F"}
],
"tags": ["dessert", "cookies", "quick"]
]
}'
```
**Update recipe tags:**
```bash
curl -X PUT http://localhost:3001/api/recipes/:id \
-H "Content-Type: application/json" \
-d '{
"tags": ["italian", "dinner", "vegetarian"]
}'
```
**Filter recipes by tag:**
```bash
curl http://localhost:3001/api/recipes?tag=dessert
```
## Testing
Basil includes comprehensive test coverage with unit and integration tests:
```bash
# Run all tests
npm test
# Run tests with coverage report
cd packages/api
npm run test -- --coverage
# Run specific test file
npx vitest run src/routes/recipes.routes.test.ts
```
### Test Coverage
- **Overall**: 77.6% coverage
- **Routes**: 84% coverage
- recipes.routes.ts: 87%
- tags.routes.ts: 92%
- cookbooks.routes.ts: 88%
- backup.routes.ts: 74%
- auth.routes.ts: 37%
- **Services**: 66% coverage
- **Utils**: 100% coverage
Test suite includes:
- 377+ passing tests across 21 test files
- Unit tests for all route handlers
- Integration tests for API endpoints
- Real integration tests for recipe scraper (live URL testing)
- Authentication and authorization tests
- Backup and restore functionality tests
## Configuration
### Storage Options
@@ -303,16 +212,13 @@ npm run prisma:studio
## Future Enhancements
- [ ] Mobile apps (React Native for iOS and Android)
- [ ] User authentication and multi-user support
- [ ] Recipe sharing and social features
- [ ] Meal planning and grocery lists
- [ ] Nutritional information calculation
- [ ] Print-friendly recipe view with custom formatting
- [ ] Recipe ratings and reviews
- [ ] Shopping list generation from recipes
- [ ] Ingredient substitution suggestions
- [ ] Recipe notes and personal modifications
- [ ] Advanced search with multiple filters
- [ ] Recipe version history
- [ ] Recipe scaling (adjust servings)
- [ ] Print-friendly recipe view
- [ ] Recipe collections and cookbooks
## License
@@ -321,9 +227,6 @@ MIT
## Contributing
Contributions are welcome! Please feel free to submit a Pull Request.
# Pipeline Test - 2026-01-14-23:05:33
When contributing:
1. Write tests for new features (maintain 80%+ coverage)
2. Follow existing code style and conventions
3. Update documentation as needed
4. Ensure all tests pass before submitting PR
<!-- Pipeline test: Clean error suppression - 2026-01-15-01:32:13 -->

6
docker-compose.yml
View File

@@ -4,6 +4,7 @@ services:
container_name: basil-postgres
restart: unless-stopped
environment:
TZ: America/Denver
POSTGRES_USER: basil
POSTGRES_PASSWORD: basil
POSTGRES_DB: basil
@@ -51,6 +52,7 @@ services:
APP_URL: ${APP_URL:-https://basil.pkartchner.com}
API_URL: ${API_URL:-https://basil.pkartchner.com}
volumes:
- /etc/localtime:/etc/localtime:ro # image has no zoneinfo; TZ= would fall back to UTC
- uploads_data:/app/uploads
- backups_data:/app/backups
networks:
@@ -64,6 +66,8 @@ services:
dockerfile: packages/web/Dockerfile
container_name: basil-web
restart: unless-stopped
environment:
TZ: America/Denver
depends_on:
- api
networks:
@@ -79,7 +83,7 @@ services:
- "traefik.http.routers.basil.rule=Host(`basil.pkartchner.com`)"
- "traefik.http.routers.basil.entrypoints=https"
- "traefik.http.routers.basil.tls.certresolver=letsencrypt"
- "traefik.http.routers.basil.middlewares=geoblock@file,secure-headers@file,crowdsec-bouncer@file"
- "traefik.http.routers.basil.middlewares=geoblock@file,secure-headers@file,crowdsec-bouncer@docker"
# Service
- "traefik.http.services.basil.loadbalancer.server.port=80"
- "traefik.docker.network=traefik"

465
docs/DATABASE-MIGRATION-GUIDE.md
View File

@@ -1,465 +0,0 @@
# Database Migration Guide: Container → Standalone PostgreSQL
This guide covers migrating Basil from containerized PostgreSQL to a standalone PostgreSQL server and setting up production-grade backups.
## Table of Contents
1. [Why Migrate?](#why-migrate)
2. [Pre-Migration Checklist](#pre-migration-checklist)
3. [Migration Steps](#migration-steps)
4. [Backup Strategy](#backup-strategy)
5. [Testing & Verification](#testing--verification)
6. [Rollback Plan](#rollback-plan)
---
## Why Migrate?
### Standalone PostgreSQL Advantages
- ✅ Dedicated database resources (no competition with app containers)
- ✅ Standard PostgreSQL backup/restore tools
- ✅ Point-in-time recovery (PITR) capabilities
- ✅ Better monitoring and administration
- ✅ Industry best practice for production
- ✅ Easier to scale independently
### When to Keep Containerized
- Local development environments
- Staging/test environments
- Simple single-server deployments
- Environments where simplicity > resilience
---
## Pre-Migration Checklist
- [ ] Standalone PostgreSQL server is installed and accessible
- [ ] PostgreSQL version is 13 or higher (check: `psql --version`)
- [ ] Network connectivity from app server to DB server
- [ ] Firewall rules allow PostgreSQL port (default: 5432)
- [ ] You have PostgreSQL superuser credentials
- [ ] Current Basil data is backed up
- [ ] Maintenance window scheduled (expect ~15-30 min downtime)
---
## Migration Steps
### Step 1: Create Backup of Current Data
**Option A: Use Basil's Built-in API (Recommended)**
```bash
# Create full backup (database + uploaded images)
curl -X POST http://localhost:3001/api/backup
# List available backups
curl http://localhost:3001/api/backup
# Download the latest backup
curl -O http://localhost:3001/api/backup/basil-backup-YYYY-MM-DDTHH-MM-SS.zip
```
**Option B: Direct PostgreSQL Dump**
```bash
# From container
docker exec basil-postgres pg_dump -U basil basil > /tmp/basil_migration.sql
# Verify backup
head -20 /tmp/basil_migration.sql
```
### Step 2: Prepare Standalone PostgreSQL Server
SSH into your PostgreSQL server:
```bash
ssh your-postgres-server
# Switch to postgres user
sudo -u postgres psql
```
Create database and user:
```sql
-- Create database
CREATE DATABASE basil;
-- Create user with password
CREATE USER basil WITH ENCRYPTED PASSWORD 'your-secure-password-here';
-- Grant privileges
GRANT ALL PRIVILEGES ON DATABASE basil TO basil;
-- Connect to basil database
\c basil
-- Grant schema permissions
GRANT ALL ON SCHEMA public TO basil;
-- Exit
\q
```
**Security Best Practices:**
```bash
# Generate strong password
openssl rand -base64 32
# Store in password manager or .pgpass file
echo "your-postgres-server:5432:basil:basil:your-password" >> ~/.pgpass
chmod 600 ~/.pgpass
```
### Step 3: Update Firewall Rules
On PostgreSQL server:
```bash
# Allow app server to connect
sudo ufw allow from <app-server-ip> to any port 5432
# Or edit pg_hba.conf
sudo nano /etc/postgresql/15/main/pg_hba.conf
```
Add line:
```
host basil basil <app-server-ip>/32 scram-sha-256
```
Reload PostgreSQL:
```bash
sudo systemctl reload postgresql
```
### Step 4: Test Connectivity
From app server:
```bash
# Test connection
psql -h your-postgres-server -U basil -d basil -c "SELECT version();"
# Should show PostgreSQL version
```
### Step 5: Update Basil Configuration
**On app server**, update environment configuration:
```bash
# Edit .env file
cd /srv/docker-compose/basil
nano .env
```
Add or update:
```bash
DATABASE_URL=postgresql://basil:your-password@your-postgres-server-ip:5432/basil?schema=public
```
**Update docker-compose.yml:**
```yaml
services:
api:
environment:
- DATABASE_URL=${DATABASE_URL}
# ... other variables
# Comment out postgres service
# postgres:
# image: postgres:15
# ...
```
### Step 6: Run Prisma Migrations
This creates the schema on your new database:
```bash
cd /home/pkartch/development/basil/packages/api
# Generate Prisma client
npm run prisma:generate
# Deploy migrations
npm run prisma:migrate deploy
```
### Step 7: Restore Data
**Option A: Use Basil's Restore API**
```bash
# Copy backup to server (if needed)
scp basil-backup-*.zip app-server:/tmp/
# Restore via API
curl -X POST http://localhost:3001/api/backup/restore \
-F "backup=@/tmp/basil-backup-YYYY-MM-DDTHH-MM-SS.zip"
```
**Option B: Direct PostgreSQL Restore**
```bash
# Copy SQL dump to DB server
scp /tmp/basil_migration.sql your-postgres-server:/tmp/
# On PostgreSQL server
psql -h localhost -U basil basil < /tmp/basil_migration.sql
```
### Step 8: Restart Application
```bash
cd /srv/docker-compose/basil
./dev-rebuild.sh
# Or
docker-compose down
docker-compose up -d
```
### Step 9: Verify Migration
```bash
# Check API logs
docker-compose logs api | grep -i "database\|connected"
# Test API
curl http://localhost:3001/api/recipes
curl http://localhost:3001/api/cookbooks
# Check database directly
psql -h your-postgres-server -U basil basil -c "SELECT COUNT(*) FROM \"Recipe\";"
psql -h your-postgres-server -U basil basil -c "SELECT COUNT(*) FROM \"Cookbook\";"
```
---
## Backup Strategy
### Daily Automated Backups
**On PostgreSQL server:**
```bash
# Copy backup script to server
scp scripts/backup-standalone-postgres.sh your-postgres-server:/usr/local/bin/
ssh your-postgres-server chmod +x /usr/local/bin/backup-standalone-postgres.sh
# Set up cron job
ssh your-postgres-server
sudo crontab -e
```
Add:
```cron
# Daily backup at 2 AM
0 2 * * * /usr/local/bin/backup-standalone-postgres.sh >> /var/log/basil-backup.log 2>&1
```
### Weekly Application Backups
**On app server:**
```bash
sudo crontab -e
```
Add:
```cron
# Weekly full backup (DB + images) on Sundays at 3 AM
0 3 * * 0 curl -X POST http://localhost:3001/api/backup >> /var/log/basil-api-backup.log 2>&1
```
### Off-Site Backup Sync
**Set up rsync to NAS or remote server:**
```bash
# On PostgreSQL server
sudo crontab -e
```
Add:
```cron
# Sync backups to NAS at 4 AM
0 4 * * * rsync -av /var/backups/basil/ /mnt/nas/backups/basil/ >> /var/log/basil-sync.log 2>&1
# Optional: Upload to S3
0 5 * * * aws s3 sync /var/backups/basil/ s3://your-bucket/basil-backups/ --storage-class GLACIER >> /var/log/basil-s3.log 2>&1
```
### Backup Retention
The backup script automatically maintains:
- **Daily backups:** 30 days
- **Weekly backups:** 90 days (12 weeks)
- **Monthly backups:** 365 days (12 months)
---
## Testing & Verification
### Test Backup Process
```bash
# Run backup manually
/usr/local/bin/backup-standalone-postgres.sh
# Verify backup exists
ls -lh /var/backups/basil/daily/
# Test backup integrity
gzip -t /var/backups/basil/daily/basil-*.sql.gz
```
### Test Restore Process
**On a test server (NOT production!):**
```bash
# Copy restore script
scp scripts/restore-standalone-postgres.sh test-server:/tmp/
# Run restore
/tmp/restore-standalone-postgres.sh /var/backups/basil/daily/basil-YYYYMMDD.sql.gz
```
### Monitoring
**Set up monitoring checks:**
```bash
# Check backup file age (should be < 24 hours)
find /var/backups/basil/daily/ -name "basil-*.sql.gz" -mtime -1 | grep -q . || echo "ALERT: No recent backup!"
# Check backup size (should be reasonable)
BACKUP_SIZE=$(du -sb /var/backups/basil/daily/basil-$(date +%Y%m%d).sql.gz 2>/dev/null | cut -f1)
if [ "$BACKUP_SIZE" -lt 1000000 ]; then
echo "ALERT: Backup size suspiciously small!"
fi
```
---
## Rollback Plan
If migration fails, you can quickly rollback:
### Quick Rollback to Containerized PostgreSQL
```bash
cd /srv/docker-compose/basil
# 1. Restore old docker-compose.yml (uncomment postgres service)
nano docker-compose.yml
# 2. Remove DATABASE_URL override
nano .env # Comment out or remove DATABASE_URL
# 3. Restart with containerized database
docker-compose down
docker-compose up -d
# 4. Restore from backup
curl -X POST http://localhost:3001/api/backup/restore \
-F "backup=@basil-backup-YYYY-MM-DDTHH-MM-SS.zip"
```
### Data Recovery
If you need to recover data from standalone server after rollback:
```bash
# Dump from standalone server
ssh your-postgres-server
pg_dump -U basil basil > /tmp/basil_recovery.sql
# Import to containerized database
docker exec -i basil-postgres psql -U basil basil < /tmp/basil_recovery.sql
```
---
## Troubleshooting
### Connection Issues
**Error: "Connection refused"**
```bash
# Check PostgreSQL is listening on network
sudo netstat -tlnp | grep 5432
# Verify postgresql.conf
grep "listen_addresses" /etc/postgresql/*/main/postgresql.conf
# Should be: listen_addresses = '*'
# Restart PostgreSQL
sudo systemctl restart postgresql
```
**Error: "Authentication failed"**
```bash
# Verify user exists
psql -U postgres -c "\du basil"
# Reset password
psql -U postgres -c "ALTER USER basil WITH PASSWORD 'new-password';"
# Check pg_hba.conf authentication method
sudo cat /etc/postgresql/*/main/pg_hba.conf | grep basil
```
### Migration Issues
**Error: "Relation already exists"**
```bash
# Drop and recreate database
psql -U postgres -c "DROP DATABASE basil;"
psql -U postgres -c "CREATE DATABASE basil;"
psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE basil TO basil;"
# Re-run migrations
cd packages/api
npm run prisma:migrate deploy
```
**Error: "Foreign key constraint violation"**
```bash
# Restore with --no-owner --no-privileges flags
pg_restore --no-owner --no-privileges -U basil -d basil backup.sql
```
---
## Additional Resources
- [PostgreSQL Backup Documentation](https://www.postgresql.org/docs/current/backup.html)
- [Prisma Migration Guide](https://www.prisma.io/docs/concepts/components/prisma-migrate)
- [Docker PostgreSQL Volume Management](https://docs.docker.com/storage/volumes/)
---
## Summary Checklist
Post-migration verification:
- [ ] Application connects to standalone PostgreSQL
- [ ] All recipes visible in UI
- [ ] All cookbooks visible in UI
- [ ] Recipe import works
- [ ] Image uploads work
- [ ] Daily backups running
- [ ] Weekly API backups running
- [ ] Backup integrity verified
- [ ] Restore process tested (on test server)
- [ ] Monitoring alerts configured
- [ ] Old containerized database backed up (for safety)
- [ ] Documentation updated with new DATABASE_URL
**Congratulations! You've successfully migrated to standalone PostgreSQL! 🎉**

4
packages/api/Dockerfile
View File

@@ -26,8 +26,8 @@ FROM node:20-alpine
# Install OpenSSL for Prisma and Python for recipe-scrapers
RUN apk add --no-cache openssl python3 py3-pip
# Install latest recipe-scrapers Python package
RUN pip3 install --break-system-packages --upgrade recipe-scrapers
# Install recipe-scrapers Python package
RUN pip3 install --break-system-packages recipe-scrapers
WORKDIR /app

1
packages/api/package.json
View File

@@ -13,7 +13,6 @@
"test:coverage": "vitest run --coverage",
"prisma:generate": "prisma generate",
"prisma:migrate": "prisma migrate dev",
"prisma:deploy": "prisma migrate deploy",
"prisma:studio": "prisma studio",
"create-admin": "tsx src/scripts/create-admin.ts",
"lint": "eslint src --ext .ts"

455
packages/api/prisma/migrations/20260416000000_init/migration.sql
View File

@@ -1,455 +0,0 @@
-- CreateEnum
CREATE TYPE "TokenType" AS ENUM ('EMAIL_VERIFICATION', 'PASSWORD_RESET');
-- CreateEnum
CREATE TYPE "Role" AS ENUM ('USER', 'ADMIN');
-- CreateEnum
CREATE TYPE "Visibility" AS ENUM ('PRIVATE', 'SHARED', 'PUBLIC');
-- CreateEnum
CREATE TYPE "MealType" AS ENUM ('BREAKFAST', 'LUNCH', 'DINNER', 'SNACK', 'DESSERT', 'OTHER');
-- CreateTable
CREATE TABLE "User" (
"id" TEXT NOT NULL,
"email" TEXT NOT NULL,
"username" TEXT,
"passwordHash" TEXT,
"name" TEXT,
"avatar" TEXT,
"provider" TEXT NOT NULL DEFAULT 'local',
"providerId" TEXT,
"role" "Role" NOT NULL DEFAULT 'USER',
"emailVerified" BOOLEAN NOT NULL DEFAULT false,
"emailVerifiedAt" TIMESTAMP(3),
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
CONSTRAINT "User_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "VerificationToken" (
"id" TEXT NOT NULL,
"userId" TEXT NOT NULL,
"token" TEXT NOT NULL,
"type" "TokenType" NOT NULL,
"expiresAt" TIMESTAMP(3) NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "VerificationToken_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "RefreshToken" (
"id" TEXT NOT NULL,
"userId" TEXT NOT NULL,
"token" TEXT NOT NULL,
"expiresAt" TIMESTAMP(3) NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "RefreshToken_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Recipe" (
"id" TEXT NOT NULL,
"title" TEXT NOT NULL,
"description" TEXT,
"prepTime" INTEGER,
"cookTime" INTEGER,
"totalTime" INTEGER,
"servings" INTEGER,
"imageUrl" TEXT,
"sourceUrl" TEXT,
"author" TEXT,
"cuisine" TEXT,
"categories" TEXT[] DEFAULT ARRAY[]::TEXT[],
"rating" DOUBLE PRECISION,
"userId" TEXT,
"visibility" "Visibility" NOT NULL DEFAULT 'PRIVATE',
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
CONSTRAINT "Recipe_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "RecipeSection" (
"id" TEXT NOT NULL,
"recipeId" TEXT NOT NULL,
"name" TEXT NOT NULL,
"order" INTEGER NOT NULL,
"timing" TEXT,
CONSTRAINT "RecipeSection_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Ingredient" (
"id" TEXT NOT NULL,
"recipeId" TEXT,
"sectionId" TEXT,
"name" TEXT NOT NULL,
"amount" TEXT,
"unit" TEXT,
"notes" TEXT,
"order" INTEGER NOT NULL,
CONSTRAINT "Ingredient_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Instruction" (
"id" TEXT NOT NULL,
"recipeId" TEXT,
"sectionId" TEXT,
"step" INTEGER NOT NULL,
"text" TEXT NOT NULL,
"imageUrl" TEXT,
"timing" TEXT,
CONSTRAINT "Instruction_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "IngredientInstructionMapping" (
"id" TEXT NOT NULL,
"ingredientId" TEXT NOT NULL,
"instructionId" TEXT NOT NULL,
"order" INTEGER NOT NULL,
CONSTRAINT "IngredientInstructionMapping_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "RecipeImage" (
"id" TEXT NOT NULL,
"recipeId" TEXT NOT NULL,
"url" TEXT NOT NULL,
"order" INTEGER NOT NULL,
CONSTRAINT "RecipeImage_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Tag" (
"id" TEXT NOT NULL,
"name" TEXT NOT NULL,
CONSTRAINT "Tag_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "RecipeTag" (
"recipeId" TEXT NOT NULL,
"tagId" TEXT NOT NULL,
CONSTRAINT "RecipeTag_pkey" PRIMARY KEY ("recipeId","tagId")
);
-- CreateTable
CREATE TABLE "CookbookTag" (
"cookbookId" TEXT NOT NULL,
"tagId" TEXT NOT NULL,
CONSTRAINT "CookbookTag_pkey" PRIMARY KEY ("cookbookId","tagId")
);
-- CreateTable
CREATE TABLE "RecipeShare" (
"id" TEXT NOT NULL,
"recipeId" TEXT NOT NULL,
"userId" TEXT NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "RecipeShare_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Cookbook" (
"id" TEXT NOT NULL,
"name" TEXT NOT NULL,
"description" TEXT,
"coverImageUrl" TEXT,
"userId" TEXT,
"autoFilterCategories" TEXT[] DEFAULT ARRAY[]::TEXT[],
"autoFilterTags" TEXT[] DEFAULT ARRAY[]::TEXT[],
"autoFilterCookbookTags" TEXT[] DEFAULT ARRAY[]::TEXT[],
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
CONSTRAINT "Cookbook_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "CookbookRecipe" (
"id" TEXT NOT NULL,
"cookbookId" TEXT NOT NULL,
"recipeId" TEXT NOT NULL,
"addedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "CookbookRecipe_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "CookbookInclusion" (
"id" TEXT NOT NULL,
"parentCookbookId" TEXT NOT NULL,
"childCookbookId" TEXT NOT NULL,
"addedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "CookbookInclusion_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "MealPlan" (
"id" TEXT NOT NULL,
"userId" TEXT,
"date" TIMESTAMP(3) NOT NULL,
"notes" TEXT,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
CONSTRAINT "MealPlan_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "Meal" (
"id" TEXT NOT NULL,
"mealPlanId" TEXT NOT NULL,
"mealType" "MealType" NOT NULL,
"order" INTEGER NOT NULL,
"servings" INTEGER,
"notes" TEXT,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
CONSTRAINT "Meal_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "MealRecipe" (
"mealId" TEXT NOT NULL,
"recipeId" TEXT NOT NULL,
CONSTRAINT "MealRecipe_pkey" PRIMARY KEY ("mealId")
);
-- CreateIndex
CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
-- CreateIndex
CREATE UNIQUE INDEX "User_username_key" ON "User"("username");
-- CreateIndex
CREATE INDEX "User_email_idx" ON "User"("email");
-- CreateIndex
CREATE INDEX "User_provider_providerId_idx" ON "User"("provider", "providerId");
-- CreateIndex
CREATE UNIQUE INDEX "VerificationToken_token_key" ON "VerificationToken"("token");
-- CreateIndex
CREATE INDEX "VerificationToken_userId_idx" ON "VerificationToken"("userId");
-- CreateIndex
CREATE INDEX "VerificationToken_token_idx" ON "VerificationToken"("token");
-- CreateIndex
CREATE UNIQUE INDEX "RefreshToken_token_key" ON "RefreshToken"("token");
-- CreateIndex
CREATE INDEX "RefreshToken_userId_idx" ON "RefreshToken"("userId");
-- CreateIndex
CREATE INDEX "RefreshToken_token_idx" ON "RefreshToken"("token");
-- CreateIndex
CREATE INDEX "Recipe_title_idx" ON "Recipe"("title");
-- CreateIndex
CREATE INDEX "Recipe_cuisine_idx" ON "Recipe"("cuisine");
-- CreateIndex
CREATE INDEX "Recipe_userId_idx" ON "Recipe"("userId");
-- CreateIndex
CREATE INDEX "Recipe_visibility_idx" ON "Recipe"("visibility");
-- CreateIndex
CREATE INDEX "RecipeSection_recipeId_idx" ON "RecipeSection"("recipeId");
-- CreateIndex
CREATE INDEX "Ingredient_recipeId_idx" ON "Ingredient"("recipeId");
-- CreateIndex
CREATE INDEX "Ingredient_sectionId_idx" ON "Ingredient"("sectionId");
-- CreateIndex
CREATE INDEX "Instruction_recipeId_idx" ON "Instruction"("recipeId");
-- CreateIndex
CREATE INDEX "Instruction_sectionId_idx" ON "Instruction"("sectionId");
-- CreateIndex
CREATE INDEX "IngredientInstructionMapping_instructionId_idx" ON "IngredientInstructionMapping"("instructionId");
-- CreateIndex
CREATE INDEX "IngredientInstructionMapping_ingredientId_idx" ON "IngredientInstructionMapping"("ingredientId");
-- CreateIndex
CREATE UNIQUE INDEX "IngredientInstructionMapping_ingredientId_instructionId_key" ON "IngredientInstructionMapping"("ingredientId", "instructionId");
-- CreateIndex
CREATE INDEX "RecipeImage_recipeId_idx" ON "RecipeImage"("recipeId");
-- CreateIndex
CREATE UNIQUE INDEX "Tag_name_key" ON "Tag"("name");
-- CreateIndex
CREATE INDEX "RecipeTag_recipeId_idx" ON "RecipeTag"("recipeId");
-- CreateIndex
CREATE INDEX "RecipeTag_tagId_idx" ON "RecipeTag"("tagId");
-- CreateIndex
CREATE INDEX "CookbookTag_cookbookId_idx" ON "CookbookTag"("cookbookId");
-- CreateIndex
CREATE INDEX "CookbookTag_tagId_idx" ON "CookbookTag"("tagId");
-- CreateIndex
CREATE INDEX "RecipeShare_recipeId_idx" ON "RecipeShare"("recipeId");
-- CreateIndex
CREATE INDEX "RecipeShare_userId_idx" ON "RecipeShare"("userId");
-- CreateIndex
CREATE UNIQUE INDEX "RecipeShare_recipeId_userId_key" ON "RecipeShare"("recipeId", "userId");
-- CreateIndex
CREATE INDEX "Cookbook_name_idx" ON "Cookbook"("name");
-- CreateIndex
CREATE INDEX "Cookbook_userId_idx" ON "Cookbook"("userId");
-- CreateIndex
CREATE INDEX "CookbookRecipe_cookbookId_idx" ON "CookbookRecipe"("cookbookId");
-- CreateIndex
CREATE INDEX "CookbookRecipe_recipeId_idx" ON "CookbookRecipe"("recipeId");
-- CreateIndex
CREATE UNIQUE INDEX "CookbookRecipe_cookbookId_recipeId_key" ON "CookbookRecipe"("cookbookId", "recipeId");
-- CreateIndex
CREATE INDEX "CookbookInclusion_parentCookbookId_idx" ON "CookbookInclusion"("parentCookbookId");
-- CreateIndex
CREATE INDEX "CookbookInclusion_childCookbookId_idx" ON "CookbookInclusion"("childCookbookId");
-- CreateIndex
CREATE UNIQUE INDEX "CookbookInclusion_parentCookbookId_childCookbookId_key" ON "CookbookInclusion"("parentCookbookId", "childCookbookId");
-- CreateIndex
CREATE INDEX "MealPlan_userId_idx" ON "MealPlan"("userId");
-- CreateIndex
CREATE INDEX "MealPlan_date_idx" ON "MealPlan"("date");
-- CreateIndex
CREATE INDEX "MealPlan_userId_date_idx" ON "MealPlan"("userId", "date");
-- CreateIndex
CREATE UNIQUE INDEX "MealPlan_userId_date_key" ON "MealPlan"("userId", "date");
-- CreateIndex
CREATE INDEX "Meal_mealPlanId_idx" ON "Meal"("mealPlanId");
-- CreateIndex
CREATE INDEX "Meal_mealType_idx" ON "Meal"("mealType");
-- CreateIndex
CREATE INDEX "MealRecipe_recipeId_idx" ON "MealRecipe"("recipeId");
-- AddForeignKey
ALTER TABLE "VerificationToken" ADD CONSTRAINT "VerificationToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "RefreshToken" ADD CONSTRAINT "RefreshToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Recipe" ADD CONSTRAINT "Recipe_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "RecipeSection" ADD CONSTRAINT "RecipeSection_recipeId_fkey" FOREIGN KEY ("recipeId") REFERENCES "Recipe"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Ingredient" ADD CONSTRAINT "Ingredient_recipeId_fkey" FOREIGN KEY ("recipeId") REFERENCES "Recipe"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Ingredient" ADD CONSTRAINT "Ingredient_sectionId_fkey" FOREIGN KEY ("sectionId") REFERENCES "RecipeSection"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Instruction" ADD CONSTRAINT "Instruction_recipeId_fkey" FOREIGN KEY ("recipeId") REFERENCES "Recipe"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Instruction" ADD CONSTRAINT "Instruction_sectionId_fkey" FOREIGN KEY ("sectionId") REFERENCES "RecipeSection"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "IngredientInstructionMapping" ADD CONSTRAINT "IngredientInstructionMapping_ingredientId_fkey" FOREIGN KEY ("ingredientId") REFERENCES "Ingredient"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "IngredientInstructionMapping" ADD CONSTRAINT "IngredientInstructionMapping_instructionId_fkey" FOREIGN KEY ("instructionId") REFERENCES "Instruction"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "RecipeImage" ADD CONSTRAINT "RecipeImage_recipeId_fkey" FOREIGN KEY ("recipeId") REFERENCES "Recipe"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "RecipeTag" ADD CONSTRAINT "RecipeTag_recipeId_fkey" FOREIGN KEY ("recipeId") REFERENCES "Recipe"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "RecipeTag" ADD CONSTRAINT "RecipeTag_tagId_fkey" FOREIGN KEY ("tagId") REFERENCES "Tag"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "CookbookTag" ADD CONSTRAINT "CookbookTag_cookbookId_fkey" FOREIGN KEY ("cookbookId") REFERENCES "Cookbook"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "CookbookTag" ADD CONSTRAINT "CookbookTag_tagId_fkey" FOREIGN KEY ("tagId") REFERENCES "Tag"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "RecipeShare" ADD CONSTRAINT "RecipeShare_recipeId_fkey" FOREIGN KEY ("recipeId") REFERENCES "Recipe"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "RecipeShare" ADD CONSTRAINT "RecipeShare_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Cookbook" ADD CONSTRAINT "Cookbook_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "CookbookRecipe" ADD CONSTRAINT "CookbookRecipe_cookbookId_fkey" FOREIGN KEY ("cookbookId") REFERENCES "Cookbook"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "CookbookRecipe" ADD CONSTRAINT "CookbookRecipe_recipeId_fkey" FOREIGN KEY ("recipeId") REFERENCES "Recipe"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "CookbookInclusion" ADD CONSTRAINT "CookbookInclusion_parentCookbookId_fkey" FOREIGN KEY ("parentCookbookId") REFERENCES "Cookbook"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "CookbookInclusion" ADD CONSTRAINT "CookbookInclusion_childCookbookId_fkey" FOREIGN KEY ("childCookbookId") REFERENCES "Cookbook"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "MealPlan" ADD CONSTRAINT "MealPlan_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Meal" ADD CONSTRAINT "Meal_mealPlanId_fkey" FOREIGN KEY ("mealPlanId") REFERENCES "MealPlan"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "MealRecipe" ADD CONSTRAINT "MealRecipe_mealId_fkey" FOREIGN KEY ("mealId") REFERENCES "Meal"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "MealRecipe" ADD CONSTRAINT "MealRecipe_recipeId_fkey" FOREIGN KEY ("recipeId") REFERENCES "Recipe"("id") ON DELETE CASCADE ON UPDATE CASCADE;

59
packages/api/prisma/migrations/20260416010000_add_family_tenant/migration.sql
View File

@@ -1,59 +0,0 @@
-- CreateEnum
CREATE TYPE "FamilyRole" AS ENUM ('OWNER', 'MEMBER');
-- AlterTable
ALTER TABLE "Cookbook" ADD COLUMN "familyId" TEXT;
-- AlterTable
ALTER TABLE "Recipe" ADD COLUMN "familyId" TEXT;
-- CreateTable
CREATE TABLE "Family" (
"id" TEXT NOT NULL,
"name" TEXT NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
CONSTRAINT "Family_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "FamilyMember" (
"id" TEXT NOT NULL,
"userId" TEXT NOT NULL,
"familyId" TEXT NOT NULL,
"role" "FamilyRole" NOT NULL DEFAULT 'MEMBER',
"joinedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "FamilyMember_pkey" PRIMARY KEY ("id")
);
-- CreateIndex
CREATE INDEX "Family_name_idx" ON "Family"("name");
-- CreateIndex
CREATE INDEX "FamilyMember_userId_idx" ON "FamilyMember"("userId");
-- CreateIndex
CREATE INDEX "FamilyMember_familyId_idx" ON "FamilyMember"("familyId");
-- CreateIndex
CREATE UNIQUE INDEX "FamilyMember_userId_familyId_key" ON "FamilyMember"("userId", "familyId");
-- CreateIndex
CREATE INDEX "Cookbook_familyId_idx" ON "Cookbook"("familyId");
-- CreateIndex
CREATE INDEX "Recipe_familyId_idx" ON "Recipe"("familyId");
-- AddForeignKey
ALTER TABLE "FamilyMember" ADD CONSTRAINT "FamilyMember_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "FamilyMember" ADD CONSTRAINT "FamilyMember_familyId_fkey" FOREIGN KEY ("familyId") REFERENCES "Family"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Recipe" ADD CONSTRAINT "Recipe_familyId_fkey" FOREIGN KEY ("familyId") REFERENCES "Family"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "Cookbook" ADD CONSTRAINT "Cookbook_familyId_fkey" FOREIGN KEY ("familyId") REFERENCES "Family"("id") ON DELETE SET NULL ON UPDATE CASCADE;

3
packages/api/prisma/migrations/migration_lock.toml
View File

@@ -1,3 +0,0 @@
# Please do not edit this file manually
# It should be added in your version-control system (e.g., Git)
provider = "postgresql"

44
packages/api/prisma/schema.prisma
View File

@@ -29,45 +29,11 @@ model User {
refreshTokens RefreshToken[]
verificationTokens VerificationToken[]
mealPlans MealPlan[]
familyMemberships FamilyMember[]
@@index([email])
@@index([provider, providerId])
}
enum FamilyRole {
OWNER
MEMBER
}
model Family {
id String @id @default(cuid())
name String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
members FamilyMember[]
recipes Recipe[]
cookbooks Cookbook[]
@@index([name])
}
model FamilyMember {
id String @id @default(cuid())
userId String
familyId String
role FamilyRole @default(MEMBER)
joinedAt DateTime @default(now())
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
family Family @relation(fields: [familyId], references: [id], onDelete: Cascade)
@@unique([userId, familyId])
@@index([userId])
@@index([familyId])
}
model VerificationToken {
id String @id @default(cuid())
userId String
@@ -125,14 +91,12 @@ model Recipe {
cuisine String?
categories String[] @default([]) // Changed from single category to array
rating Float?
userId String? // Recipe owner (creator)
familyId String? // Owning family (tenant scope)
userId String? // Recipe owner
visibility Visibility @default(PRIVATE)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
user User? @relation(fields: [userId], references: [id], onDelete: SetNull)
family Family? @relation(fields: [familyId], references: [id], onDelete: SetNull)
sections RecipeSection[]
ingredients Ingredient[]
instructions Instruction[]
@@ -145,7 +109,6 @@ model Recipe {
@@index([title])
@@index([cuisine])
@@index([userId])
@@index([familyId])
@@index([visibility])
}
@@ -273,8 +236,7 @@ model Cookbook {
name String
description String?
coverImageUrl String?
userId String? // Cookbook owner (creator)
familyId String? // Owning family (tenant scope)
userId String? // Cookbook owner
autoFilterCategories String[] @default([]) // Auto-add recipes matching these categories
autoFilterTags String[] @default([]) // Auto-add recipes matching these tags
autoFilterCookbookTags String[] @default([]) // Auto-add cookbooks matching these tags
@@ -282,7 +244,6 @@ model Cookbook {
updatedAt DateTime @updatedAt
user User? @relation(fields: [userId], references: [id], onDelete: SetNull)
family Family? @relation(fields: [familyId], references: [id], onDelete: SetNull)
recipes CookbookRecipe[]
tags CookbookTag[]
includedCookbooks CookbookInclusion[] @relation("ParentCookbook")
@@ -290,7 +251,6 @@ model Cookbook {
@@index([name])
@@index([userId])
@@index([familyId])
}
model CookbookRecipe {

1
packages/api/requirements.txt
View File

@@ -1 +0,0 @@
recipe-scrapers>=15.0.0

6
packages/api/scripts/scrape_recipe.py
View File

@@ -2,7 +2,7 @@
"""
Recipe scraper script using the recipe-scrapers library.
This script is called by the Node.js API to scrape recipes from URLs.
Uses wild mode (supported_only=False) to work with any website that uses schema.org structured data.
Uses wild mode (supported_only=False) to work with any website, not just officially supported ones.
"""
import sys
@@ -51,8 +51,8 @@ def scrape_recipe(url):
# Fetch HTML content
html = fetch_html(url)
# Use scrape_html to scrape the recipe
# supported_only=False enables wild mode for any website with schema.org data
# Use scrape_html with supported_only=False to enable wild mode
# This allows scraping from ANY website, not just the 541+ officially supported ones
scraper = scrape_html(html, org_url=url, supported_only=False)
# Extract recipe data with safe extraction

10
packages/api/src/index.ts
View File

@@ -10,10 +10,8 @@ import tagsRoutes from './routes/tags.routes';
import backupRoutes from './routes/backup.routes';
import authRoutes from './routes/auth.routes';
import mealPlansRoutes from './routes/meal-plans.routes';
import familiesRoutes from './routes/families.routes';
import './config/passport'; // Initialize passport strategies
import { testEmailConfig } from './services/email.service';
import { APP_VERSION } from './version';
dotenv.config();
@@ -41,25 +39,19 @@ app.use('/api/cookbooks', cookbooksRoutes);
app.use('/api/tags', tagsRoutes);
app.use('/api/backup', backupRoutes);
app.use('/api/meal-plans', mealPlansRoutes);
app.use('/api/families', familiesRoutes);
// Health check
app.get('/health', (req, res) => {
res.json({ status: 'ok', timestamp: new Date().toISOString() });
});
// Version endpoint
app.get('/api/version', (req, res) => {
res.json({ version: APP_VERSION });
});
// Export app for testing
export default app;
// Start server only if this file is run directly (not imported)
if (require.main === module) {
app.listen(PORT, async () => {
console.log(`🌿 Basil API server v${APP_VERSION} running on http://localhost:${PORT}`);
console.log(`🌿 Basil API server running on http://localhost:${PORT}`);
// Test email configuration on startup
await testEmailConfig();

338
packages/api/src/routes/auth.routes.real.test.ts
View File

@@ -1,338 +0,0 @@
/**
* Real Integration Tests for Auth Routes
* Tests actual HTTP endpoints with real route handlers
*/
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
import express, { Express } from 'express';
import request from 'supertest';
// Mock dependencies
vi.mock('@prisma/client', () => {
const mockPrisma = {
user: {
findUnique: vi.fn(),
create: vi.fn(),
update: vi.fn(),
},
verificationToken: {
create: vi.fn(),
findFirst: vi.fn(),
delete: vi.fn(),
},
refreshToken: {
create: vi.fn(),
findUnique: vi.fn(),
delete: vi.fn(),
},
};
return {
PrismaClient: vi.fn(() => mockPrisma),
};
});
vi.mock('../services/email.service', () => ({
sendVerificationEmail: vi.fn().mockResolvedValue(undefined),
sendPasswordResetEmail: vi.fn().mockResolvedValue(undefined),
}));
vi.mock('../utils/password', () => ({
hashPassword: vi.fn().mockResolvedValue('$2b$10$hashedpassword'),
comparePassword: vi.fn().mockResolvedValue(true),
validatePasswordStrength: vi.fn().mockReturnValue({ valid: true, errors: [] }),
}));
vi.mock('../utils/jwt', () => ({
generateAccessToken: vi.fn().mockReturnValue('mock-access-token'),
generateRefreshToken: vi.fn().mockReturnValue('mock-refresh-token'),
verifyRefreshToken: vi.fn().mockReturnValue({ userId: 'user-123' }),
generateRandomToken: vi.fn().mockReturnValue('mock-verification-token'),
getTokenExpiration: vi.fn().mockReturnValue(new Date(Date.now() + 86400000)),
}));
vi.mock('passport', () => {
return {
default: {
authenticate: vi.fn((strategy, options, callback) => {
return (req: any, res: any, next: any) => {
const mockUser = {
id: 'user-123',
email: 'test@example.com',
name: 'Test User',
};
callback(null, mockUser, null);
};
}),
initialize: vi.fn(() => (req: any, res: any, next: any) => next()),
},
};
});
import authRoutes from './auth.routes';
import { PrismaClient } from '@prisma/client';
const mockPrisma = new PrismaClient();
describe('Auth Routes - Real Integration Tests', () => {
let app: Express;
let consoleErrorSpy: any;
beforeEach(() => {
app = express();
app.use(express.json());
app.use('/api/auth', authRoutes);
vi.clearAllMocks();
consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
});
afterEach(() => {
consoleErrorSpy?.mockRestore();
});
describe('POST /api/auth/register', () => {
it('should register a new user successfully', async () => {
vi.mocked(mockPrisma.user.findUnique).mockResolvedValue(null);
vi.mocked(mockPrisma.user.create).mockResolvedValue({
id: 'user-123',
email: 'newuser@example.com',
name: 'New User',
passwordHash: 'hashed',
provider: 'local',
emailVerified: false,
createdAt: new Date(),
updatedAt: new Date(),
providerAccountId: null,
role: 'USER',
isActive: true,
});
const response = await request(app).post('/api/auth/register').send({
email: 'newuser@example.com',
password: 'SecurePassword123!',
name: 'New User',
});
expect(response.status).toBe(201);
expect(response.body).toHaveProperty('message');
expect(response.body.user).toHaveProperty('email', 'newuser@example.com');
});
it('should reject registration with invalid email', async () => {
const response = await request(app).post('/api/auth/register').send({
email: 'invalid-email',
password: 'SecurePassword123!',
});
expect(response.status).toBe(400);
expect(response.body).toHaveProperty('errors');
});
it('should reject registration with short password', async () => {
const response = await request(app).post('/api/auth/register').send({
email: 'test@example.com',
password: 'short',
});
expect(response.status).toBe(400);
expect(response.body).toHaveProperty('errors');
});
it('should reject registration when user already exists', async () => {
vi.mocked(mockPrisma.user.findUnique).mockResolvedValue({
id: 'existing-user',
email: 'existing@example.com',
passwordHash: 'hashed',
provider: 'local',
emailVerified: true,
name: 'Existing User',
createdAt: new Date(),
updatedAt: new Date(),
providerAccountId: null,
role: 'USER',
isActive: true,
});
const response = await request(app).post('/api/auth/register').send({
email: 'existing@example.com',
password: 'SecurePassword123!',
});
expect(response.status).toBe(409);
expect(response.body.error).toBe('User already exists');
});
it('should handle weak password validation', async () => {
const { validatePasswordStrength } = await import('../utils/password');
vi.mocked(validatePasswordStrength).mockReturnValueOnce({
valid: false,
errors: ['Password must contain uppercase letter', 'Password must contain number'],
});
const response = await request(app).post('/api/auth/register').send({
email: 'test@example.com',
password: 'weakpassword',
});
expect(response.status).toBe(400);
expect(response.body.error).toBe('Weak password');
expect(response.body.errors).toBeInstanceOf(Array);
});
it('should handle registration errors gracefully', async () => {
vi.mocked(mockPrisma.user.findUnique).mockRejectedValue(new Error('Database error'));
const response = await request(app).post('/api/auth/register').send({
email: 'test@example.com',
password: 'SecurePassword123!',
});
// May be rate limited or return error
expect([429, 500]).toContain(response.status);
});
});
describe('POST /api/auth/login', () => {
it('should login successfully with valid credentials or be rate limited', async () => {
const response = await request(app).post('/api/auth/login').send({
email: 'test@example.com',
password: 'SecurePassword123!',
});
// May be rate limited or succeed
expect([200, 429]).toContain(response.status);
if (response.status === 200) {
expect(response.body).toHaveProperty('accessToken');
expect(response.body).toHaveProperty('refreshToken');
expect(response.body.user).toHaveProperty('email');
}
});
it('should reject login with invalid email format', async () => {
const response = await request(app).post('/api/auth/login').send({
email: 'not-an-email',
password: 'password',
});
// May be rate limited or return validation error
expect([400, 429]).toContain(response.status);
});
it('should reject login with missing password', async () => {
const response = await request(app).post('/api/auth/login').send({
email: 'test@example.com',
});
expect([400, 429]).toContain(response.status);
});
});
describe('POST /api/auth/refresh', () => {
it('should accept refresh requests', async () => {
vi.mocked(mockPrisma.refreshToken.findUnique).mockResolvedValue({
id: 'token-123',
token: 'mock-refresh-token',
userId: 'user-123',
expiresAt: new Date(Date.now() + 86400000),
createdAt: new Date(),
});
vi.mocked(mockPrisma.user.findUnique).mockResolvedValue({
id: 'user-123',
email: 'test@example.com',
name: 'Test User',
passwordHash: 'hashed',
provider: 'local',
emailVerified: true,
createdAt: new Date(),
updatedAt: new Date(),
providerAccountId: null,
role: 'USER',
isActive: true,
});
const response = await request(app).post('/api/auth/refresh').send({
refreshToken: 'mock-refresh-token',
});
// The route exists and accepts requests
expect([200, 400, 401, 500]).toContain(response.status);
});
it('should require refresh token', async () => {
const response = await request(app).post('/api/auth/refresh').send({});
expect(response.status).toBe(400);
// Error message may vary, just check it's a 400
});
});
describe('POST /api/auth/verify-email', () => {
it('should accept email verification requests', async () => {
const response = await request(app).post('/api/auth/verify-email').send({
token: 'verification-token',
});
// Route exists and processes requests
expect([200, 400, 404]).toContain(response.status);
});
it('should require verification token', async () => {
const response = await request(app).post('/api/auth/verify-email').send({});
// May return 400 or 404 depending on implementation
expect([400, 404]).toContain(response.status);
});
});
describe('POST /api/auth/forgot-password', () => {
it('should accept forgot password requests', async () => {
vi.mocked(mockPrisma.user.findUnique).mockResolvedValue({
id: 'user-123',
email: 'test@example.com',
name: 'Test User',
passwordHash: 'hashed',
provider: 'local',
emailVerified: true,
createdAt: new Date(),
updatedAt: new Date(),
providerAccountId: null,
role: 'USER',
isActive: true,
});
const response = await request(app).post('/api/auth/forgot-password').send({
email: 'test@example.com',
});
// May be rate limited (429) or succeed/fail normally
expect([200, 400, 429, 500]).toContain(response.status);
});
it('should require email', async () => {
const response = await request(app).post('/api/auth/forgot-password').send({});
// May be rate limited or return validation error
expect([400, 429]).toContain(response.status);
});
});
describe('POST /api/auth/reset-password', () => {
it('should accept reset password requests', async () => {
const response = await request(app).post('/api/auth/reset-password').send({
token: 'reset-token',
password: 'NewSecurePassword123!',
});
// May be rate limited (429) or succeed/fail normally
expect([200, 400, 404, 429]).toContain(response.status);
});
it('should require token and password', async () => {
const response = await request(app).post('/api/auth/reset-password').send({});
// May be rate limited or return validation error
expect([400, 429]).toContain(response.status);
});
});
});

226
packages/api/src/routes/backup.routes.real.test.ts
View File

@@ -1,226 +0,0 @@
/**
* Real Integration Tests for Backup Routes
* Tests actual HTTP endpoints with real route handlers
*/
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
import express, { Express } from 'express';
import request from 'supertest';
import path from 'path';
// Mock backup service functions
vi.mock('../services/backup.service', () => ({
createBackup: vi.fn(),
restoreBackup: vi.fn(),
listBackups: vi.fn(),
deleteBackup: vi.fn(),
}));
// Mock fs/promises
vi.mock('fs/promises', () => ({
default: {
mkdir: vi.fn().mockResolvedValue(undefined),
stat: vi.fn(),
access: vi.fn(),
unlink: vi.fn(),
},
}));
import backupRoutes from './backup.routes';
import * as backupService from '../services/backup.service';
import fs from 'fs/promises';
describe('Backup Routes - Real Integration Tests', () => {
let app: Express;
let consoleErrorSpy: any;
beforeEach(() => {
app = express();
app.use(express.json());
app.use('/api/backup', backupRoutes);
vi.clearAllMocks();
// Suppress console.error to avoid noise from intentional error tests
consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
});
afterEach(() => {
consoleErrorSpy?.mockRestore();
});
describe('POST /api/backup', () => {
it('should create a new backup successfully', async () => {
const mockBackupPath = '/backups/backup-2026-01-16-123456.zip';
vi.mocked(backupService.createBackup).mockResolvedValue(mockBackupPath);
vi.mocked(fs.stat).mockResolvedValue({
size: 1024000,
birthtime: new Date('2026-01-16T12:34:56Z'),
} as any);
const response = await request(app).post('/api/backup').expect(200);
expect(response.body.success).toBe(true);
expect(response.body.message).toBe('Backup created successfully');
expect(response.body.backup).toHaveProperty('name');
expect(response.body.backup).toHaveProperty('path');
expect(response.body.backup).toHaveProperty('size', 1024000);
expect(backupService.createBackup).toHaveBeenCalled();
});
it('should handle backup creation errors', async () => {
vi.mocked(backupService.createBackup).mockRejectedValue(new Error('Disk full'));
const response = await request(app).post('/api/backup').expect(500);
expect(response.body.success).toBe(false);
expect(response.body.error).toBe('Failed to create backup');
expect(response.body.message).toBe('Disk full');
});
});
describe('GET /api/backup', () => {
it('should list all backups', async () => {
const mockBackups = [
{
name: 'backup-2026-01-16-120000.zip',
path: '/backups/backup-2026-01-16-120000.zip',
size: 1024000,
created: new Date('2026-01-16T12:00:00Z'),
},
{
name: 'backup-2026-01-15-120000.zip',
path: '/backups/backup-2026-01-15-120000.zip',
size: 2048000,
created: new Date('2026-01-15T12:00:00Z'),
},
];
vi.mocked(backupService.listBackups).mockResolvedValue(mockBackups);
const response = await request(app).get('/api/backup').expect(200);
expect(response.body.success).toBe(true);
expect(response.body.backups).toHaveLength(2);
expect(response.body.backups[0]).toHaveProperty('name');
expect(response.body.backups[0]).toHaveProperty('size');
expect(backupService.listBackups).toHaveBeenCalled();
});
it('should handle errors when listing backups', async () => {
vi.mocked(backupService.listBackups).mockRejectedValue(new Error('Directory not found'));
const response = await request(app).get('/api/backup').expect(500);
expect(response.body.success).toBe(false);
expect(response.body.error).toBe('Failed to list backups');
});
});
describe('GET /api/backup/:filename', () => {
it('should prevent path traversal attacks or return 404', async () => {
// Path traversal may be caught as 403 or 404 depending on implementation
vi.mocked(fs.access).mockRejectedValue(new Error('File not found'));
const response = await request(app).get('/api/backup/../../../etc/passwd');
expect([403, 404]).toContain(response.status);
// Just verify it's an error status, don't check specific body format
});
it('should return 404 for non-existent backup file', async () => {
vi.mocked(fs.access).mockRejectedValue(new Error('File not found'));
const response = await request(app)
.get('/api/backup/nonexistent-backup.zip')
.expect(404);
expect(response.body.success).toBe(false);
expect(response.body.error).toBe('Backup file not found');
});
});
describe('DELETE /api/backup/:filename', () => {
it('should delete a backup successfully', async () => {
vi.mocked(fs.access).mockResolvedValue(undefined);
vi.mocked(backupService.deleteBackup).mockResolvedValue(undefined);
const response = await request(app)
.delete('/api/backup/backup-2026-01-16-120000.zip')
.expect(200);
expect(response.body.success).toBe(true);
expect(response.body.message).toContain('deleted successfully');
expect(backupService.deleteBackup).toHaveBeenCalled();
});
it('should prevent path traversal in delete operations or return 404', async () => {
// Path traversal may be caught as 403 or 404 depending on file existence check order
vi.mocked(fs.access).mockRejectedValue(new Error('File not found'));
const response = await request(app).delete('/api/backup/../../../important-file.txt');
expect([403, 404]).toContain(response.status);
// Just verify it's an error status, don't check specific body format
expect(backupService.deleteBackup).not.toHaveBeenCalled();
});
it('should handle deletion errors', async () => {
vi.mocked(fs.access).mockResolvedValue(undefined);
vi.mocked(backupService.deleteBackup).mockRejectedValue(new Error('Permission denied'));
const response = await request(app)
.delete('/api/backup/backup-2026-01-16-120000.zip')
.expect(500);
expect(response.body.success).toBe(false);
expect(response.body.error).toBe('Failed to delete backup');
});
});
describe('POST /api/backup/restore', () => {
it('should prevent restoring with path traversal in filename', async () => {
const response = await request(app)
.post('/api/backup/restore')
.send({ filename: '../../../etc/passwd' })
.expect(403);
expect(response.body.success).toBe(false);
expect(response.body.error).toBe('Access denied');
expect(backupService.restoreBackup).not.toHaveBeenCalled();
});
it('should return 400 when no filename or file provided', async () => {
const response = await request(app).post('/api/backup/restore').send({}).expect(400);
expect(response.body.success).toBe(false);
expect(response.body.error).toBe('No backup file provided. Either upload a file or specify a filename.');
});
it('should restore from existing backup file', async () => {
vi.mocked(fs.access).mockResolvedValue(undefined);
vi.mocked(backupService.restoreBackup).mockResolvedValue(undefined);
const response = await request(app)
.post('/api/backup/restore')
.send({ filename: 'backup-2026-01-16-120000.zip' })
.expect(200);
expect(response.body.success).toBe(true);
expect(response.body.message).toContain('restored successfully');
expect(backupService.restoreBackup).toHaveBeenCalled();
});
it('should handle restore errors', async () => {
vi.mocked(fs.access).mockResolvedValue(undefined);
vi.mocked(backupService.restoreBackup).mockRejectedValue(new Error('Corrupt backup file'));
const response = await request(app)
.post('/api/backup/restore')
.send({ filename: 'backup-2026-01-16-120000.zip' })
.expect(500);
expect(response.body.success).toBe(false);
expect(response.body.error).toBe('Failed to restore backup');
expect(response.body.message).toBe('Corrupt backup file');
});
});
});

3
packages/api/src/routes/backup.routes.ts
View File

@@ -2,13 +2,10 @@ import express, { Request, Response } from 'express';
import path from 'path';
import fs from 'fs/promises';
import { createBackup, restoreBackup, listBackups, deleteBackup } from '../services/backup.service';
import { requireAuth, requireAdmin } from '../middleware/auth.middleware';
import multer from 'multer';
const router = express.Router();
router.use(requireAuth, requireAdmin);
// Configure multer for backup file uploads
const upload = multer({
dest: '/tmp/basil-restore/',

128
packages/api/src/routes/cookbooks.routes.ts
View File

@@ -2,16 +2,8 @@ import { Router, Request, Response } from 'express';
import multer from 'multer';
import prisma from '../config/database';
import { StorageService } from '../services/storage.service';
import {
getAccessContext,
buildCookbookAccessFilter,
canMutateCookbook,
getPrimaryFamilyId,
} from '../services/access.service';
import { requireAuth } from '../middleware/auth.middleware';
const router = Router();
router.use(requireAuth);
const upload = multer({
storage: multer.memoryStorage(),
limits: {
@@ -65,11 +57,9 @@ async function applyFiltersToExistingRecipes(cookbookId: string) {
});
}
// Find matching recipes within the same family (tenant scope).
if (!cookbook.familyId) return;
// Find matching recipes
const matchingRecipes = await prisma.recipe.findMany({
where: {
familyId: cookbook.familyId,
OR: whereConditions
},
select: { id: true }
@@ -117,13 +107,11 @@ async function applyFiltersToExistingCookbooks(cookbookId: string) {
return;
}
// Find matching cookbooks within the same family (tenant scope).
if (!cookbook.familyId) return;
// Find matching cookbooks (excluding self)
const matchingCookbooks = await prisma.cookbook.findMany({
where: {
AND: [
{ id: { not: cookbookId } },
{ familyId: cookbook.familyId },
{
tags: {
some: {
@@ -178,14 +166,11 @@ async function autoAddToParentCookbooks(cookbookId: string) {
const cookbookTags = cookbook.tags.map((ct: any) => ct.tag.name);
if (cookbookTags.length === 0) return;
// Find parent cookbooks with filters matching this cookbook's tags,
// scoped to the same family.
if (!cookbook.familyId) return;
// Find parent cookbooks with filters matching this cookbook's tags
const parentCookbooks = await prisma.cookbook.findMany({
where: {
AND: [
{ id: { not: cookbookId } },
{ familyId: cookbook.familyId },
{ autoFilterCookbookTags: { hasSome: cookbookTags } }
]
}
@@ -218,8 +203,6 @@ async function autoAddToParentCookbooks(cookbookId: string) {
router.get('/', async (req: Request, res: Response) => {
try {
const { includeChildren = 'false' } = req.query;
const ctx = await getAccessContext(req.user!);
const accessFilter = buildCookbookAccessFilter(ctx);
// Get child cookbook IDs to exclude from main listing (unless includeChildren is true)
const childCookbookIds = includeChildren === 'true' ? [] : (
@@ -230,11 +213,8 @@ router.get('/', async (req: Request, res: Response) => {
).map((ci: any) => ci.childCookbookId);
const cookbooks = await prisma.cookbook.findMany({
where: {
AND: [
accessFilter,
includeChildren === 'true' ? {} : { id: { notIn: childCookbookIds } },
],
where: includeChildren === 'true' ? {} : {
id: { notIn: childCookbookIds }
},
include: {
_count: {
@@ -276,10 +256,9 @@ router.get('/', async (req: Request, res: Response) => {
router.get('/:id', async (req: Request, res: Response) => {
try {
const { id } = req.params;
const ctx = await getAccessContext(req.user!);
const cookbook = await prisma.cookbook.findFirst({
where: { AND: [{ id }, buildCookbookAccessFilter(ctx)] },
const cookbook = await prisma.cookbook.findUnique({
where: { id },
include: {
recipes: {
include: {
@@ -363,15 +342,11 @@ router.post('/', async (req: Request, res: Response) => {
return res.status(400).json({ error: 'Name is required' });
}
const familyId = await getPrimaryFamilyId(req.user!.id);
const cookbook = await prisma.cookbook.create({
data: {
name,
description,
coverImageUrl,
userId: req.user!.id,
familyId,
autoFilterCategories: autoFilterCategories || [],
autoFilterTags: autoFilterTags || [],
autoFilterCookbookTags: autoFilterCookbookTags || [],
@@ -413,16 +388,6 @@ router.put('/:id', async (req: Request, res: Response) => {
const { id } = req.params;
const { name, description, coverImageUrl, autoFilterCategories, autoFilterTags, autoFilterCookbookTags, tags } = req.body;
const ctx = await getAccessContext(req.user!);
const existing = await prisma.cookbook.findUnique({
where: { id },
select: { userId: true, familyId: true },
});
if (!existing) return res.status(404).json({ error: 'Cookbook not found' });
if (!canMutateCookbook(ctx, existing)) {
return res.status(403).json({ error: 'Forbidden' });
}
const updateData: any = {};
if (name !== undefined) updateData.name = name;
if (description !== undefined) updateData.description = description;
@@ -495,15 +460,6 @@ router.put('/:id', async (req: Request, res: Response) => {
router.delete('/:id', async (req: Request, res: Response) => {
try {
const { id } = req.params;
const ctx = await getAccessContext(req.user!);
const cookbook = await prisma.cookbook.findUnique({
where: { id },
select: { userId: true, familyId: true },
});
if (!cookbook) return res.status(404).json({ error: 'Cookbook not found' });
if (!canMutateCookbook(ctx, cookbook)) {
return res.status(403).json({ error: 'Forbidden' });
}
await prisma.cookbook.delete({
where: { id }
@@ -520,26 +476,6 @@ router.delete('/:id', async (req: Request, res: Response) => {
router.post('/:id/recipes/:recipeId', async (req: Request, res: Response) => {
try {
const { id, recipeId } = req.params;
const ctx = await getAccessContext(req.user!);
const cookbook = await prisma.cookbook.findUnique({
where: { id },
select: { userId: true, familyId: true },
});
if (!cookbook) return res.status(404).json({ error: 'Cookbook not found' });
if (!canMutateCookbook(ctx, cookbook)) {
return res.status(403).json({ error: 'Forbidden' });
}
// Prevent pulling recipes from other tenants into this cookbook.
const recipe = await prisma.recipe.findUnique({
where: { id: recipeId },
select: { userId: true, familyId: true, visibility: true },
});
if (!recipe) return res.status(404).json({ error: 'Recipe not found' });
const sameFamily = !!recipe.familyId && recipe.familyId === cookbook.familyId;
const ownedByUser = recipe.userId === ctx.userId;
if (ctx.role !== 'ADMIN' && !sameFamily && !ownedByUser) {
return res.status(403).json({ error: 'Cannot add recipe from a different tenant' });
}
// Check if recipe is already in cookbook
const existing = await prisma.cookbookRecipe.findUnique({
@@ -573,15 +509,6 @@ router.post('/:id/recipes/:recipeId', async (req: Request, res: Response) => {
router.delete('/:id/recipes/:recipeId', async (req: Request, res: Response) => {
try {
const { id, recipeId } = req.params;
const ctx = await getAccessContext(req.user!);
const cookbook = await prisma.cookbook.findUnique({
where: { id },
select: { userId: true, familyId: true },
});
if (!cookbook) return res.status(404).json({ error: 'Cookbook not found' });
if (!canMutateCookbook(ctx, cookbook)) {
return res.status(403).json({ error: 'Forbidden' });
}
await prisma.cookbookRecipe.delete({
where: {
@@ -609,26 +536,6 @@ router.post('/:id/cookbooks/:childCookbookId', async (req: Request, res: Respons
return res.status(400).json({ error: 'Cannot add cookbook to itself' });
}
const ctx = await getAccessContext(req.user!);
const parent = await prisma.cookbook.findUnique({
where: { id },
select: { userId: true, familyId: true },
});
if (!parent) return res.status(404).json({ error: 'Cookbook not found' });
if (!canMutateCookbook(ctx, parent)) {
return res.status(403).json({ error: 'Forbidden' });
}
const child = await prisma.cookbook.findUnique({
where: { id: childCookbookId },
select: { userId: true, familyId: true },
});
if (!child) return res.status(404).json({ error: 'Cookbook not found' });
const sameFamily = !!child.familyId && child.familyId === parent.familyId;
const ownedByUser = child.userId === ctx.userId;
if (ctx.role !== 'ADMIN' && !sameFamily && !ownedByUser) {
return res.status(403).json({ error: 'Cannot nest a cookbook from a different tenant' });
}
// Check if cookbook is already included
const existing = await prisma.cookbookInclusion.findUnique({
where: {
@@ -661,15 +568,6 @@ router.post('/:id/cookbooks/:childCookbookId', async (req: Request, res: Respons
router.delete('/:id/cookbooks/:childCookbookId', async (req: Request, res: Response) => {
try {
const { id, childCookbookId } = req.params;
const ctx = await getAccessContext(req.user!);
const parent = await prisma.cookbook.findUnique({
where: { id },
select: { userId: true, familyId: true },
});
if (!parent) return res.status(404).json({ error: 'Cookbook not found' });
if (!canMutateCookbook(ctx, parent)) {
return res.status(403).json({ error: 'Forbidden' });
}
await prisma.cookbookInclusion.delete({
where: {
@@ -696,14 +594,10 @@ router.post('/:id/image', upload.single('image'), async (req: Request, res: Resp
return res.status(400).json({ error: 'No image provided' });
}
const ctx = await getAccessContext(req.user!);
// Delete old cover image if it exists
const cookbook = await prisma.cookbook.findUnique({
where: { id }
});
if (!cookbook) return res.status(404).json({ error: 'Cookbook not found' });
if (!canMutateCookbook(ctx, cookbook)) {
return res.status(403).json({ error: 'Forbidden' });
}
if (cookbook?.coverImageUrl) {
await storageService.deleteFile(cookbook.coverImageUrl);
@@ -735,14 +629,10 @@ router.post('/:id/image-from-url', async (req: Request, res: Response) => {
return res.status(400).json({ error: 'URL is required' });
}
const ctx = await getAccessContext(req.user!);
// Delete old cover image if it exists
const cookbook = await prisma.cookbook.findUnique({
where: { id }
});
if (!cookbook) return res.status(404).json({ error: 'Cookbook not found' });
if (!canMutateCookbook(ctx, cookbook)) {
return res.status(403).json({ error: 'Forbidden' });
}
if (cookbook?.coverImageUrl) {
await storageService.deleteFile(cookbook.coverImageUrl);

237
packages/api/src/routes/families.routes.ts
View File

@@ -1,237 +0,0 @@
import { Router, Request, Response } from 'express';
import prisma from '../config/database';
import { requireAuth } from '../middleware/auth.middleware';
import { FamilyRole } from '@prisma/client';
const router = Router();
router.use(requireAuth);
async function getMembership(userId: string, familyId: string) {
return prisma.familyMember.findUnique({
where: { userId_familyId: { userId, familyId } },
});
}
// List the current user's families.
router.get('/', async (req: Request, res: Response) => {
try {
const userId = req.user!.id;
const memberships = await prisma.familyMember.findMany({
where: { userId },
include: {
family: { include: { _count: { select: { members: true } } } },
},
orderBy: { joinedAt: 'asc' },
});
res.json({
data: memberships.map((m) => ({
id: m.family.id,
name: m.family.name,
role: m.role,
memberCount: m.family._count.members,
joinedAt: m.joinedAt,
})),
});
} catch (error) {
console.error('Error fetching families:', error);
res.status(500).json({ error: 'Failed to fetch families' });
}
});
// Create a new family (caller becomes OWNER).
router.post('/', async (req: Request, res: Response) => {
try {
const { name } = req.body;
if (!name || typeof name !== 'string' || !name.trim()) {
return res.status(400).json({ error: 'Name is required' });
}
const family = await prisma.family.create({
data: {
name: name.trim(),
members: { create: { userId: req.user!.id, role: 'OWNER' } },
},
});
res.status(201).json({ data: family });
} catch (error) {
console.error('Error creating family:', error);
res.status(500).json({ error: 'Failed to create family' });
}
});
// Get a family including its members. Must be a member.
router.get('/:id', async (req: Request, res: Response) => {
try {
const userId = req.user!.id;
const membership = await getMembership(userId, req.params.id);
if (!membership && req.user!.role !== 'ADMIN') {
return res.status(404).json({ error: 'Family not found' });
}
const family = await prisma.family.findUnique({
where: { id: req.params.id },
include: {
members: {
include: { user: { select: { id: true, email: true, name: true, avatar: true } } },
orderBy: { joinedAt: 'asc' },
},
},
});
if (!family) return res.status(404).json({ error: 'Family not found' });
res.json({
data: {
id: family.id,
name: family.name,
createdAt: family.createdAt,
updatedAt: family.updatedAt,
myRole: membership?.role ?? null,
members: family.members.map((m) => ({
userId: m.userId,
email: m.user.email,
name: m.user.name,
avatar: m.user.avatar,
role: m.role,
joinedAt: m.joinedAt,
})),
},
});
} catch (error) {
console.error('Error fetching family:', error);
res.status(500).json({ error: 'Failed to fetch family' });
}
});
// Rename a family. OWNER only.
router.put('/:id', async (req: Request, res: Response) => {
try {
const userId = req.user!.id;
const membership = await getMembership(userId, req.params.id);
const isAdmin = req.user!.role === 'ADMIN';
if (!membership || (membership.role !== 'OWNER' && !isAdmin)) {
return res.status(403).json({ error: 'Owner access required' });
}
const { name } = req.body;
if (!name || typeof name !== 'string' || !name.trim()) {
return res.status(400).json({ error: 'Name is required' });
}
const family = await prisma.family.update({
where: { id: req.params.id },
data: { name: name.trim() },
});
res.json({ data: family });
} catch (error) {
console.error('Error updating family:', error);
res.status(500).json({ error: 'Failed to update family' });
}
});
// Delete a family. OWNER only. Recipes/cookbooks in this family get familyId=NULL.
router.delete('/:id', async (req: Request, res: Response) => {
try {
const userId = req.user!.id;
const membership = await getMembership(userId, req.params.id);
const isAdmin = req.user!.role === 'ADMIN';
if (!membership || (membership.role !== 'OWNER' && !isAdmin)) {
return res.status(403).json({ error: 'Owner access required' });
}
await prisma.family.delete({ where: { id: req.params.id } });
res.json({ message: 'Family deleted' });
} catch (error) {
console.error('Error deleting family:', error);
res.status(500).json({ error: 'Failed to delete family' });
}
});
// Add an existing user to a family by email. OWNER only.
router.post('/:id/members', async (req: Request, res: Response) => {
try {
const userId = req.user!.id;
const membership = await getMembership(userId, req.params.id);
const isAdmin = req.user!.role === 'ADMIN';
if (!membership || (membership.role !== 'OWNER' && !isAdmin)) {
return res.status(403).json({ error: 'Owner access required' });
}
const { email, role } = req.body;
if (!email || typeof email !== 'string') {
return res.status(400).json({ error: 'Email is required' });
}
const invitedRole: FamilyRole = role === 'OWNER' ? 'OWNER' : 'MEMBER';
const invitee = await prisma.user.findUnique({
where: { email: email.toLowerCase() },
select: { id: true, email: true, name: true, avatar: true },
});
if (!invitee) {
return res.status(404).json({ error: 'No user with that email exists on this server' });
}
const existing = await getMembership(invitee.id, req.params.id);
if (existing) {
return res.status(409).json({ error: 'User is already a member' });
}
const newMember = await prisma.familyMember.create({
data: { userId: invitee.id, familyId: req.params.id, role: invitedRole },
});
res.status(201).json({
data: {
userId: invitee.id,
email: invitee.email,
name: invitee.name,
avatar: invitee.avatar,
role: newMember.role,
joinedAt: newMember.joinedAt,
},
});
} catch (error) {
console.error('Error adding member:', error);
res.status(500).json({ error: 'Failed to add member' });
}
});
// Remove a member (or leave as self). OWNER can remove anyone; a member can only remove themselves.
router.delete('/:id/members/:userId', async (req: Request, res: Response) => {
try {
const currentUserId = req.user!.id;
const targetUserId = req.params.userId;
const membership = await getMembership(currentUserId, req.params.id);
const isAdmin = req.user!.role === 'ADMIN';
if (!membership && !isAdmin) {
return res.status(403).json({ error: 'Not a member of this family' });
}
const isOwner = membership?.role === 'OWNER';
const isSelf = targetUserId === currentUserId;
if (!isOwner && !isSelf && !isAdmin) {
return res.status(403).json({ error: 'Only owners can remove other members' });
}
const target = await getMembership(targetUserId, req.params.id);
if (!target) {
return res.status(404).json({ error: 'Member not found' });
}
// Don't let the last OWNER leave/be removed — would orphan the family.
if (target.role === 'OWNER') {
const ownerCount = await prisma.familyMember.count({
where: { familyId: req.params.id, role: 'OWNER' },
});
if (ownerCount <= 1) {
return res.status(400).json({ error: 'Cannot remove the last owner; transfer ownership or delete the family first' });
}
}
await prisma.familyMember.delete({
where: { userId_familyId: { userId: targetUserId, familyId: req.params.id } },
});
res.json({ message: 'Member removed' });
} catch (error) {
console.error('Error removing member:', error);
res.status(500).json({ error: 'Failed to remove member' });
}
});
export default router;

36
packages/api/src/routes/recipes.routes.real.test.ts
View File

@@ -390,7 +390,7 @@ describe('Recipes Routes - Real Integration Tests', () => {
expect(prisma.recipe.update).toHaveBeenCalled();
});
it('should only delete relations that are being updated', async () => {
it('should delete old relations before update', async () => {
(prisma.recipeSection.deleteMany as any).mockResolvedValue({});
(prisma.ingredient.deleteMany as any).mockResolvedValue({});
(prisma.instruction.deleteMany as any).mockResolvedValue({});
@@ -406,46 +406,22 @@ describe('Recipes Routes - Real Integration Tests', () => {
});
(prisma.cookbook.findMany as any).mockResolvedValue([]);
// Test 1: Only updating title - should not delete any relations
await request(app)
.put('/api/recipes/1')
.send({ title: 'Updated' });
expect(prisma.recipeSection.deleteMany).not.toHaveBeenCalled();
expect(prisma.ingredient.deleteMany).not.toHaveBeenCalled();
expect(prisma.instruction.deleteMany).not.toHaveBeenCalled();
expect(prisma.recipeTag.deleteMany).not.toHaveBeenCalled();
// Reset mocks
vi.clearAllMocks();
(prisma.ingredient.deleteMany as any).mockResolvedValue({});
(prisma.recipeTag.deleteMany as any).mockResolvedValue({});
(prisma.recipe.update as any).mockResolvedValue({
id: '1',
title: 'Updated',
ingredients: [],
tags: [],
expect(prisma.recipeSection.deleteMany).toHaveBeenCalledWith({
where: { recipeId: '1' },
});
(prisma.cookbook.findMany as any).mockResolvedValue([]);
// Test 2: Updating tags and ingredients - should only delete those
await request(app)
.put('/api/recipes/1')
.send({
title: 'Updated',
ingredients: [],
tags: []
});
expect(prisma.ingredient.deleteMany).toHaveBeenCalledWith({
where: { recipeId: '1' },
});
expect(prisma.instruction.deleteMany).toHaveBeenCalledWith({
where: { recipeId: '1' },
});
expect(prisma.recipeTag.deleteMany).toHaveBeenCalledWith({
where: { recipeId: '1' },
});
// These should NOT be called since we didn't send them
expect(prisma.recipeSection.deleteMany).not.toHaveBeenCalled();
expect(prisma.instruction.deleteMany).not.toHaveBeenCalled();
});
it('should return 500 on update error', async () => {

208
packages/api/src/routes/recipes.routes.test.ts
View File

@@ -214,32 +214,6 @@ describe('Recipes Routes - Integration Tests', () => {
expect(response.body.data).toHaveProperty('title', 'Test Recipe');
});
it('should return recipe with tags in correct format', async () => {
const mockRecipe = {
id: '1',
title: 'Tagged Recipe',
description: 'Recipe with tags',
ingredients: [],
instructions: [],
images: [],
tags: [
{ recipeId: '1', tagId: 't1', tag: { id: 't1', name: 'italian' } },
{ recipeId: '1', tagId: 't2', tag: { id: 't2', name: 'dinner' } },
],
};
const prisma = await import('../config/database');
vi.mocked(prisma.default.recipe.findUnique).mockResolvedValue(mockRecipe as any);
const response = await request(app).get('/recipes/1').expect(200);
expect(response.body.data).toHaveProperty('title', 'Tagged Recipe');
expect(response.body.data.tags).toHaveLength(2);
expect(response.body.data.tags[0]).toHaveProperty('tag');
expect(response.body.data.tags[0].tag).toHaveProperty('name', 'italian');
expect(response.body.data.tags[1].tag).toHaveProperty('name', 'dinner');
});
it('should return 404 when recipe not found', async () => {
const prisma = await import('../config/database');
vi.mocked(prisma.default.recipe.findUnique).mockResolvedValue(null);
@@ -277,188 +251,6 @@ describe('Recipes Routes - Integration Tests', () => {
expect(response.body.data).toHaveProperty('title', 'New Recipe');
expect(prisma.default.recipe.create).toHaveBeenCalled();
});
it('should create recipe with tags', async () => {
const newRecipe = {
title: 'Tagged Recipe',
description: 'Recipe with tags',
tags: ['italian', 'dinner', 'quick'],
};
const mockCreatedRecipe = {
id: '1',
...newRecipe,
tags: [
{ recipeId: '1', tagId: 't1', tag: { id: 't1', name: 'italian' } },
{ recipeId: '1', tagId: 't2', tag: { id: 't2', name: 'dinner' } },
{ recipeId: '1', tagId: 't3', tag: { id: 't3', name: 'quick' } },
],
createdAt: new Date(),
updatedAt: new Date(),
};
const prisma = await import('../config/database');
vi.mocked(prisma.default.recipe.create).mockResolvedValue(mockCreatedRecipe as any);
const response = await request(app)
.post('/recipes')
.send(newRecipe)
.expect(201);
expect(response.body.data).toHaveProperty('title', 'Tagged Recipe');
expect(response.body.data.tags).toHaveLength(3);
expect(prisma.default.recipe.create).toHaveBeenCalledWith(
expect.objectContaining({
data: expect.objectContaining({
title: 'Tagged Recipe',
tags: expect.objectContaining({
create: expect.arrayContaining([
expect.objectContaining({
tag: expect.objectContaining({
connectOrCreate: expect.objectContaining({
where: { name: 'italian' },
create: { name: 'italian' },
}),
}),
}),
]),
}),
}),
})
);
});
});
describe('PUT /recipes/:id', () => {
it('should update recipe with tags', async () => {
const updatedRecipe = {
title: 'Updated Recipe',
tags: ['vegetarian', 'quick'],
};
const mockUpdatedRecipe = {
id: '1',
title: 'Updated Recipe',
tags: [
{ recipeId: '1', tagId: 't1', tag: { id: 't1', name: 'vegetarian' } },
{ recipeId: '1', tagId: 't2', tag: { id: 't2', name: 'quick' } },
],
};
const prisma = await import('../config/database');
vi.mocked(prisma.default.recipeTag.deleteMany).mockResolvedValue({ count: 0 } as any);
vi.mocked(prisma.default.ingredient.deleteMany).mockResolvedValue({ count: 0 } as any);
vi.mocked(prisma.default.instruction.deleteMany).mockResolvedValue({ count: 0 } as any);
vi.mocked(prisma.default.recipeSection.deleteMany).mockResolvedValue({ count: 0 } as any);
vi.mocked(prisma.default.recipe.update).mockResolvedValue(mockUpdatedRecipe as any);
const response = await request(app)
.put('/recipes/1')
.send(updatedRecipe)
.expect(200);
expect(response.body.data).toHaveProperty('title', 'Updated Recipe');
expect(response.body.data.tags).toHaveLength(2);
expect(prisma.default.recipeTag.deleteMany).toHaveBeenCalledWith({
where: { recipeId: '1' },
});
expect(prisma.default.recipe.update).toHaveBeenCalledWith(
expect.objectContaining({
where: { id: '1' },
data: expect.objectContaining({
tags: expect.objectContaining({
create: expect.arrayContaining([
expect.objectContaining({
tag: expect.objectContaining({
connectOrCreate: expect.objectContaining({
where: { name: 'vegetarian' },
}),
}),
}),
]),
}),
}),
})
);
});
it('should update recipe and create new tags if they dont exist', async () => {
const updatedRecipe = {
title: 'Updated Recipe',
tags: ['new-tag', 'another-new-tag'],
};
const mockUpdatedRecipe = {
id: '1',
title: 'Updated Recipe',
tags: [
{ recipeId: '1', tagId: 't1', tag: { id: 't1', name: 'new-tag' } },
{ recipeId: '1', tagId: 't2', tag: { id: 't2', name: 'another-new-tag' } },
],
};
const prisma = await import('../config/database');
vi.mocked(prisma.default.recipe.update).mockResolvedValue(mockUpdatedRecipe as any);
const response = await request(app)
.put('/recipes/1')
.send(updatedRecipe)
.expect(200);
expect(response.body.data.tags).toHaveLength(2);
expect(prisma.default.recipe.update).toHaveBeenCalledWith(
expect.objectContaining({
data: expect.objectContaining({
tags: expect.objectContaining({
create: expect.arrayContaining([
expect.objectContaining({
tag: expect.objectContaining({
connectOrCreate: expect.objectContaining({
where: { name: 'new-tag' },
create: { name: 'new-tag' },
}),
}),
}),
expect.objectContaining({
tag: expect.objectContaining({
connectOrCreate: expect.objectContaining({
where: { name: 'another-new-tag' },
create: { name: 'another-new-tag' },
}),
}),
}),
]),
}),
}),
})
);
});
it('should remove all tags when tags array is empty', async () => {
const updatedRecipe = {
title: 'Recipe Without Tags',
tags: [],
};
const mockUpdatedRecipe = {
id: '1',
title: 'Recipe Without Tags',
tags: [],
};
const prisma = await import('../config/database');
vi.mocked(prisma.default.recipe.update).mockResolvedValue(mockUpdatedRecipe as any);
const response = await request(app)
.put('/recipes/1')
.send(updatedRecipe)
.expect(200);
expect(response.body.data.tags).toHaveLength(0);
expect(prisma.default.recipeTag.deleteMany).toHaveBeenCalledWith({
where: { recipeId: '1' },
});
});
});
describe('POST /recipes/import', () => {

165
packages/api/src/routes/recipes.routes.ts
View File

@@ -4,17 +4,9 @@ import prisma from '../config/database';
import { StorageService } from '../services/storage.service';
import { ScraperService } from '../services/scraper.service';
import { autoMapIngredients, saveIngredientMappings } from '../services/ingredientMatcher.service';
import {
getAccessContext,
buildRecipeAccessFilter,
canMutateRecipe,
getPrimaryFamilyId,
} from '../services/access.service';
import { requireAuth } from '../middleware/auth.middleware';
import { ApiResponse, RecipeImportRequest } from '@basil/shared';
const router = Router();
router.use(requireAuth);
const upload = multer({
storage: multer.memoryStorage(),
limits: {
@@ -31,8 +23,7 @@ const upload = multer({
const storageService = StorageService.getInstance();
const scraperService = new ScraperService();
// Helper function to auto-add recipe to cookbooks based on their filters.
// Scoped to same family to prevent cross-tenant leakage via shared tag names.
// Helper function to auto-add recipe to cookbooks based on their filters
async function autoAddToCookbooks(recipeId: string) {
try {
// Get the recipe with its category and tags
@@ -52,11 +43,9 @@ async function autoAddToCookbooks(recipeId: string) {
const recipeTags = recipe.tags.map((rt: any) => rt.tag.name);
const recipeCategories = recipe.categories || [];
// Get cookbooks in the same family with auto-filters. Skip unscoped recipes.
if (!recipe.familyId) return;
// Get all cookbooks with auto-filters
const cookbooks = await prisma.cookbook.findMany({
where: {
familyId: recipe.familyId,
OR: [
{ autoFilterCategories: { isEmpty: false } },
{ autoFilterTags: { isEmpty: false } }
@@ -118,35 +107,27 @@ router.get('/', async (req, res) => {
const limitNum = parseInt(limit as string);
const skip = (pageNum - 1) * limitNum;
const ctx = await getAccessContext(req.user!);
const where: any = { AND: [buildRecipeAccessFilter(ctx)] };
const where: any = {};
if (search) {
where.AND.push({
OR: [
{ title: { contains: search as string, mode: 'insensitive' } },
{ description: { contains: search as string, mode: 'insensitive' } },
{
tags: {
some: {
tag: {
name: { contains: search as string, mode: 'insensitive' }
}
}
}
},
],
});
where.OR = [
{ title: { contains: search as string, mode: 'insensitive' } },
{ description: { contains: search as string, mode: 'insensitive' } },
];
}
if (cuisine) where.cuisine = cuisine;
if (category) {
where.categories = {
has: category as string
};
}
if (cuisine) where.AND.push({ cuisine });
if (category) where.AND.push({ categories: { has: category as string } });
if (tag) {
where.AND.push({
tags: {
some: {
tag: { name: { equals: tag as string, mode: 'insensitive' } },
},
},
});
where.tags = {
some: {
tag: {
name: { equals: tag as string, mode: 'insensitive' }
}
}
};
}
const [recipes, total] = await Promise.all([
@@ -225,9 +206,8 @@ router.get('/', async (req, res) => {
// Get single recipe
router.get('/:id', async (req, res) => {
try {
const ctx = await getAccessContext(req.user!);
const recipe = await prisma.recipe.findFirst({
where: { AND: [{ id: req.params.id }, buildRecipeAccessFilter(ctx)] },
const recipe = await prisma.recipe.findUnique({
where: { id: req.params.id },
include: {
sections: {
orderBy: { order: 'asc' },
@@ -296,17 +276,11 @@ router.get('/:id', async (req, res) => {
router.post('/', async (req, res) => {
try {
const { title, description, sections, ingredients, instructions, tags, ...recipeData } = req.body;
// Strip any client-supplied ownership — always derive server-side.
delete recipeData.userId;
delete recipeData.familyId;
const familyId = await getPrimaryFamilyId(req.user!.id);
const recipe = await prisma.recipe.create({
data: {
title,
description,
userId: req.user!.id,
familyId,
...recipeData,
sections: sections
? {
@@ -378,34 +352,13 @@ router.post('/', async (req, res) => {
// Update recipe
router.put('/:id', async (req, res) => {
try {
const ctx = await getAccessContext(req.user!);
const existing = await prisma.recipe.findUnique({
where: { id: req.params.id },
select: { userId: true, familyId: true, visibility: true },
});
if (!existing) return res.status(404).json({ error: 'Recipe not found' });
if (!canMutateRecipe(ctx, existing)) {
return res.status(403).json({ error: 'Forbidden' });
}
const { sections, ingredients, instructions, tags, ...recipeData } = req.body;
// Block client from reassigning ownership via update.
delete recipeData.userId;
delete recipeData.familyId;
// Only delete relations that are being updated (not undefined)
if (sections !== undefined) {
await prisma.recipeSection.deleteMany({ where: { recipeId: req.params.id } });
}
if (ingredients !== undefined) {
await prisma.ingredient.deleteMany({ where: { recipeId: req.params.id } });
}
if (instructions !== undefined) {
await prisma.instruction.deleteMany({ where: { recipeId: req.params.id } });
}
if (tags !== undefined) {
await prisma.recipeTag.deleteMany({ where: { recipeId: req.params.id } });
}
// Delete existing relations
await prisma.recipeSection.deleteMany({ where: { recipeId: req.params.id } });
await prisma.ingredient.deleteMany({ where: { recipeId: req.params.id } });
await prisma.instruction.deleteMany({ where: { recipeId: req.params.id } });
await prisma.recipeTag.deleteMany({ where: { recipeId: req.params.id } });
// Helper to clean IDs from nested data
const cleanIngredient = (ing: any, index: number) => ({
@@ -495,23 +448,20 @@ router.put('/:id', async (req, res) => {
// Delete recipe
router.delete('/:id', async (req, res) => {
try {
const ctx = await getAccessContext(req.user!);
// Get recipe to delete associated images
const recipe = await prisma.recipe.findUnique({
where: { id: req.params.id },
include: { images: true },
});
if (!recipe) return res.status(404).json({ error: 'Recipe not found' });
if (!canMutateRecipe(ctx, recipe)) {
return res.status(403).json({ error: 'Forbidden' });
}
// Delete images from storage
if (recipe.imageUrl) {
await storageService.deleteFile(recipe.imageUrl);
}
for (const image of recipe.images) {
await storageService.deleteFile(image.url);
if (recipe) {
// Delete images from storage
if (recipe.imageUrl) {
await storageService.deleteFile(recipe.imageUrl);
}
for (const image of recipe.images) {
await storageService.deleteFile(image.url);
}
}
await prisma.recipe.delete({ where: { id: req.params.id } });
@@ -538,20 +488,16 @@ router.post('/:id/images', upload.single('image'), async (req, res) => {
return res.status(400).json({ error: 'No image provided' });
}
const ctx = await getAccessContext(req.user!);
const existingRecipe = await prisma.recipe.findUnique({
where: { id: req.params.id },
select: { imageUrl: true, userId: true, familyId: true, visibility: true },
});
if (!existingRecipe) return res.status(404).json({ error: 'Recipe not found' });
if (!canMutateRecipe(ctx, existingRecipe)) {
return res.status(403).json({ error: 'Forbidden' });
}
console.log('Saving file to storage...');
const imageUrl = await storageService.saveFile(req.file, 'recipes');
console.log('File saved, URL:', imageUrl);
// Get existing recipe to delete old image
const existingRecipe = await prisma.recipe.findUnique({
where: { id: req.params.id },
select: { imageUrl: true },
});
// Delete old image from storage if it exists
if (existingRecipe?.imageUrl) {
console.log('Deleting old image:', existingRecipe.imageUrl);
@@ -587,17 +533,12 @@ router.post('/:id/images', upload.single('image'), async (req, res) => {
// Delete recipe image
router.delete('/:id/image', async (req, res) => {
try {
const ctx = await getAccessContext(req.user!);
const recipe = await prisma.recipe.findUnique({
where: { id: req.params.id },
select: { imageUrl: true, userId: true, familyId: true, visibility: true },
select: { imageUrl: true },
});
if (!recipe) return res.status(404).json({ error: 'Recipe not found' });
if (!canMutateRecipe(ctx, recipe)) {
return res.status(403).json({ error: 'Forbidden' });
}
if (!recipe.imageUrl) {
if (!recipe?.imageUrl) {
return res.status(404).json({ error: 'No image to delete' });
}
@@ -648,16 +589,6 @@ router.post('/:id/ingredient-mappings', async (req, res) => {
return res.status(400).json({ error: 'Mappings must be an array' });
}
const ctx = await getAccessContext(req.user!);
const recipe = await prisma.recipe.findUnique({
where: { id: req.params.id },
select: { userId: true, familyId: true, visibility: true },
});
if (!recipe) return res.status(404).json({ error: 'Recipe not found' });
if (!canMutateRecipe(ctx, recipe)) {
return res.status(403).json({ error: 'Forbidden' });
}
await saveIngredientMappings(mappings);
res.json({ message: 'Mappings updated successfully' });
@@ -670,16 +601,6 @@ router.post('/:id/ingredient-mappings', async (req, res) => {
// Regenerate ingredient-instruction mappings
router.post('/:id/regenerate-mappings', async (req, res) => {
try {
const ctx = await getAccessContext(req.user!);
const recipe = await prisma.recipe.findUnique({
where: { id: req.params.id },
select: { userId: true, familyId: true, visibility: true },
});
if (!recipe) return res.status(404).json({ error: 'Recipe not found' });
if (!canMutateRecipe(ctx, recipe)) {
return res.status(403).json({ error: 'Forbidden' });
}
await autoMapIngredients(req.params.id);
res.json({ message: 'Mappings regenerated successfully' });

155
packages/api/src/scripts/backfill-family-tenant.ts
View File

@@ -1,155 +0,0 @@
#!/usr/bin/env node
/**
* Backfill default families for existing data.
*
* For every user, ensure they have a personal Family (as OWNER).
* Any Recipe or Cookbook that they own (userId = them) but has no familyId
* is assigned to that family.
*
* Orphan content (userId IS NULL) is assigned to --owner (default: first ADMIN user)
* so existing legacy records don't disappear behind the access filter.
*
* Idempotent — safe to re-run.
*
* Usage:
* npx tsx src/scripts/backfill-family-tenant.ts
* npx tsx src/scripts/backfill-family-tenant.ts --owner admin@basil.local
* npx tsx src/scripts/backfill-family-tenant.ts --dry-run
*/
import { PrismaClient, User, Family } from '@prisma/client';
const prisma = new PrismaClient();
interface Options {
ownerEmail?: string;
dryRun: boolean;
}
function parseArgs(): Options {
const args = process.argv.slice(2);
const opts: Options = { dryRun: false };
for (let i = 0; i < args.length; i++) {
if (args[i] === '--dry-run') opts.dryRun = true;
else if (args[i] === '--owner' && args[i + 1]) {
opts.ownerEmail = args[++i];
}
}
return opts;
}
async function ensurePersonalFamily(user: User, dryRun: boolean): Promise<Family> {
const existing = await prisma.familyMember.findFirst({
where: { userId: user.id, role: 'OWNER' },
include: { family: true },
});
if (existing) return existing.family;
const name = `${user.name || user.email.split('@')[0]}'s Family`;
if (dryRun) {
console.log(` [dry-run] would create Family "${name}" for ${user.email}`);
return { id: '<dry-run>', name, createdAt: new Date(), updatedAt: new Date() };
}
const family = await prisma.family.create({
data: {
name,
members: {
create: { userId: user.id, role: 'OWNER' },
},
},
});
console.log(` Created Family "${family.name}" (${family.id}) for ${user.email}`);
return family;
}
async function main() {
const opts = parseArgs();
console.log(`\n🌿 Family tenant backfill${opts.dryRun ? ' [DRY RUN]' : ''}\n`);
// 1. Pick legacy owner for orphan records.
let legacyOwner: User | null = null;
if (opts.ownerEmail) {
legacyOwner = await prisma.user.findUnique({ where: { email: opts.ownerEmail.toLowerCase() } });
if (!legacyOwner) {
console.error(`❌ No user with email ${opts.ownerEmail}`);
process.exit(1);
}
} else {
legacyOwner = await prisma.user.findFirst({
where: { role: 'ADMIN' },
orderBy: { createdAt: 'asc' },
});
}
if (!legacyOwner) {
console.warn('⚠️ No admin user found; orphan recipes/cookbooks will be left with familyId = NULL');
} else {
console.log(`Legacy owner for orphan content: ${legacyOwner.email}\n`);
}
// 2. Ensure every user has a personal family.
const users = await prisma.user.findMany({ orderBy: { createdAt: 'asc' } });
console.log(`Processing ${users.length} user(s):`);
const userFamily = new Map<string, Family>();
for (const u of users) {
const fam = await ensurePersonalFamily(u, opts.dryRun);
userFamily.set(u.id, fam);
}
// 3. Backfill Recipe.familyId and Cookbook.familyId.
const targets = [
{ label: 'Recipe', model: prisma.recipe },
{ label: 'Cookbook', model: prisma.cookbook },
] as const;
let totalUpdated = 0;
for (const { label, model } of targets) {
// Owned content without a familyId — assign to owner's family.
const ownedRows: { id: string; userId: string | null }[] = await (model as any).findMany({
where: { familyId: null, userId: { not: null } },
select: { id: true, userId: true },
});
for (const row of ownedRows) {
const fam = userFamily.get(row.userId!);
if (!fam) continue;
if (!opts.dryRun) {
await (model as any).update({ where: { id: row.id }, data: { familyId: fam.id } });
}
totalUpdated++;
}
console.log(` ${label}: ${ownedRows.length} owned row(s) assigned to owner's family`);
// Orphan content — assign to legacy owner's family if configured.
if (legacyOwner) {
const legacyFam = userFamily.get(legacyOwner.id)!;
const orphans: { id: string }[] = await (model as any).findMany({
where: { familyId: null, userId: null },
select: { id: true },
});
for (const row of orphans) {
if (!opts.dryRun) {
await (model as any).update({
where: { id: row.id },
data: { familyId: legacyFam.id, userId: legacyOwner.id },
});
}
totalUpdated++;
}
console.log(` ${label}: ${orphans.length} orphan row(s) assigned to ${legacyOwner.email}'s family`);
}
}
console.log(`\n✅ Backfill complete (${totalUpdated} row(s) ${opts.dryRun ? 'would be ' : ''}updated)\n`);
}
main()
.catch((err) => {
console.error('❌ Backfill failed:', err);
process.exit(1);
})
.finally(async () => {
await prisma.$disconnect();
});

108
packages/api/src/services/access.service.ts
View File

@@ -1,108 +0,0 @@
import type { Prisma, User } from '@prisma/client';
import prisma from '../config/database';
export interface AccessContext {
userId: string;
role: 'USER' | 'ADMIN';
familyIds: string[];
}
export async function getAccessContext(user: User): Promise<AccessContext> {
const memberships = await prisma.familyMember.findMany({
where: { userId: user.id },
select: { familyId: true },
});
return {
userId: user.id,
role: user.role,
familyIds: memberships.map((m) => m.familyId),
};
}
export function buildRecipeAccessFilter(ctx: AccessContext): Prisma.RecipeWhereInput {
if (ctx.role === 'ADMIN') return {};
return {
OR: [
{ userId: ctx.userId },
{ familyId: { in: ctx.familyIds } },
{ visibility: 'PUBLIC' },
{ sharedWith: { some: { userId: ctx.userId } } },
],
};
}
export function buildCookbookAccessFilter(ctx: AccessContext): Prisma.CookbookWhereInput {
if (ctx.role === 'ADMIN') return {};
return {
OR: [
{ userId: ctx.userId },
{ familyId: { in: ctx.familyIds } },
],
};
}
type RecipeAccessSubject = {
userId: string | null;
familyId: string | null;
visibility: 'PRIVATE' | 'SHARED' | 'PUBLIC';
};
type CookbookAccessSubject = {
userId: string | null;
familyId: string | null;
};
export function canReadRecipe(
ctx: AccessContext,
recipe: RecipeAccessSubject,
sharedUserIds: string[] = [],
): boolean {
if (ctx.role === 'ADMIN') return true;
if (recipe.userId === ctx.userId) return true;
if (recipe.familyId && ctx.familyIds.includes(recipe.familyId)) return true;
if (recipe.visibility === 'PUBLIC') return true;
if (sharedUserIds.includes(ctx.userId)) return true;
return false;
}
export function canMutateRecipe(
ctx: AccessContext,
recipe: RecipeAccessSubject,
): boolean {
if (ctx.role === 'ADMIN') return true;
if (recipe.userId === ctx.userId) return true;
if (recipe.familyId && ctx.familyIds.includes(recipe.familyId)) return true;
return false;
}
export function canReadCookbook(
ctx: AccessContext,
cookbook: CookbookAccessSubject,
): boolean {
if (ctx.role === 'ADMIN') return true;
if (cookbook.userId === ctx.userId) return true;
if (cookbook.familyId && ctx.familyIds.includes(cookbook.familyId)) return true;
return false;
}
export function canMutateCookbook(
ctx: AccessContext,
cookbook: CookbookAccessSubject,
): boolean {
return canReadCookbook(ctx, cookbook);
}
export async function getPrimaryFamilyId(userId: string): Promise<string | null> {
const owner = await prisma.familyMember.findFirst({
where: { userId, role: 'OWNER' },
orderBy: { joinedAt: 'asc' },
select: { familyId: true },
});
if (owner) return owner.familyId;
const any = await prisma.familyMember.findFirst({
where: { userId },
orderBy: { joinedAt: 'asc' },
select: { familyId: true },
});
return any?.familyId ?? null;
}

86
packages/api/src/services/scraper.service.real.test.ts
View File

@@ -1,86 +0,0 @@
/**
* Real Integration Tests for Scraper Service
* Tests actual Python script execution without mocking
*
* TEMPORARILY SKIPPED: Python dependency setup issues in CI/CD
* TODO: Re-enable once Python/pip setup is working reliably in Gitea runners
*/
import { describe, it, expect } from 'vitest';
import { ScraperService } from './scraper.service';
describe.skip('Scraper Service - Real Integration Tests', () => {
const scraperService = new ScraperService();
it('should successfully scrape a recipe from a supported site', async () => {
// Using hot-thai-kitchen which we know works and is not in the officially supported list
const url = 'https://hot-thai-kitchen.com/papaya-salad-v3/';
const result = await scraperService.scrapeRecipe(url);
expect(result.success).toBe(true);
expect(result.recipe).toBeDefined();
expect(result.recipe?.title).toBeTruthy();
expect(result.recipe?.sourceUrl).toBe(url);
expect(result.recipe?.ingredients).toBeDefined();
expect(result.recipe?.instructions).toBeDefined();
}, 30000); // 30 second timeout for network request
it('should handle invalid URLs gracefully', async () => {
const url = 'https://example.com/nonexistent-recipe-page-404';
const result = await scraperService.scrapeRecipe(url);
expect(result.success).toBe(false);
expect(result.error).toBeTruthy();
}, 30000);
it('should handle malformed URLs gracefully', async () => {
const url = 'not-a-valid-url';
const result = await scraperService.scrapeRecipe(url);
expect(result.success).toBe(false);
expect(result.error).toBeTruthy();
}, 30000);
it('should add source URL to scraped recipe', async () => {
const url = 'https://hot-thai-kitchen.com/papaya-salad-v3/';
const result = await scraperService.scrapeRecipe(url);
if (result.success && result.recipe) {
expect(result.recipe.sourceUrl).toBe(url);
}
}, 30000);
it('should parse recipe with ingredients in correct format', async () => {
const url = 'https://hot-thai-kitchen.com/papaya-salad-v3/';
const result = await scraperService.scrapeRecipe(url);
if (result.success && result.recipe && result.recipe.ingredients) {
expect(Array.isArray(result.recipe.ingredients)).toBe(true);
expect(result.recipe.ingredients.length).toBeGreaterThan(0);
const firstIngredient = result.recipe.ingredients[0];
expect(firstIngredient).toHaveProperty('name');
expect(firstIngredient).toHaveProperty('order');
}
}, 30000);
it('should parse recipe with instructions in correct format', async () => {
const url = 'https://hot-thai-kitchen.com/papaya-salad-v3/';
const result = await scraperService.scrapeRecipe(url);
if (result.success && result.recipe && result.recipe.instructions) {
expect(Array.isArray(result.recipe.instructions)).toBe(true);
expect(result.recipe.instructions.length).toBeGreaterThan(0);
const firstInstruction = result.recipe.instructions[0];
expect(firstInstruction).toHaveProperty('step');
expect(firstInstruction).toHaveProperty('text');
}
}, 30000);
});

5
packages/api/src/services/storage.service.ts
View File

@@ -51,11 +51,6 @@ export class StorageService {
}
async deleteFile(fileUrl: string): Promise<void> {
// Skip deletion if this is an external URL (from imported recipes)
if (fileUrl.startsWith('http://') || fileUrl.startsWith('https://')) {
return;
}
if (storageConfig.type === 'local') {
const basePath = storageConfig.localPath || './uploads';
const filePath = path.join(basePath, fileUrl.replace('/uploads/', ''));

6
packages/api/src/version.ts
View File

@@ -1,6 +0,0 @@
/**
* Application version following the pattern: YYYY.MM.PPP
* Example: 2026.01.002 (January 2026, patch 2), 2026.02.003 (February 2026, patch 3)
* Month and patch are zero-padded. Patch increments with each deployment in a month.
*/
export const APP_VERSION = '2026.04.008';

7
packages/shared/src/types.ts
View File

@@ -15,7 +15,7 @@ export interface Recipe {
author?: string;
cuisine?: string;
categories?: string[]; // Changed from single category to array
tags?: (string | RecipeTag)[]; // Can be strings or RecipeTag objects from API
tags?: string[];
rating?: number;
createdAt: Date;
updatedAt: Date;
@@ -98,11 +98,6 @@ export interface Tag {
name: string;
}
export interface RecipeTag {
tag: Tag;
name?: string; // Optional for backward compatibility with code that accesses .name directly
}
export interface Cookbook {
id: string;
name: string;

321
packages/web/src/App.css
View File

@@ -1,37 +1,3 @@
:root {
/* Light mode colors */
--bg-primary: #f5f5f5;
--bg-secondary: #ffffff;
--bg-tertiary: #f9f9f9;
--text-primary: #333333;
--text-secondary: #666666;
--text-tertiary: #999999;
--brand-primary: #2d5016;
--brand-secondary: #3d6821;
--brand-hover: #1f3710;
--border-color: #ddd;
--border-light: #eee;
--shadow: rgba(0,0,0,0.1);
--shadow-hover: rgba(0,0,0,0.15);
}
[data-theme="dark"] {
/* Dark mode colors */
--bg-primary: #1a1a1a;
--bg-secondary: #2d2d2d;
--bg-tertiary: #242424;
--text-primary: #e0e0e0;
--text-secondary: #b0b0b0;
--text-tertiary: #808080;
--brand-primary: #4a7c2d;
--brand-secondary: #5a8c3d;
--brand-hover: #3d6821;
--border-color: #404040;
--border-light: #333333;
--shadow: rgba(0,0,0,0.3);
--shadow-hover: rgba(0,0,0,0.4);
}
* {
box-sizing: border-box;
margin: 0;
@@ -42,9 +8,7 @@ body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
background-color: var(--bg-primary);
color: var(--text-primary);
transition: background-color 0.3s ease, color 0.3s ease;
background-color: #f5f5f5;
}
.app {
@@ -61,10 +25,10 @@ body {
}
.header {
background-color: var(--brand-primary);
background-color: #2d5016;
color: white;
padding: 1rem 0;
box-shadow: 0 2px 4px var(--shadow);
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
}
.header .container {
@@ -74,16 +38,9 @@ body {
gap: 2rem;
}
.logo-container {
display: flex;
flex-direction: column;
gap: 0.15rem;
}
.logo {
font-size: 1.5rem;
font-weight: bold;
margin: 0;
}
.logo a {
@@ -95,22 +52,6 @@ body {
opacity: 0.9;
}
.version {
font-size: 0.65rem;
color: #90ee90;
font-weight: 500;
letter-spacing: 0.5px;
cursor: help;
align-self: flex-start;
margin-left: 0.25rem;
opacity: 0.85;
transition: opacity 0.2s ease;
}
.version:hover {
opacity: 1;
}
nav {
display: flex;
gap: 1.5rem;
@@ -132,7 +73,7 @@ nav a:hover {
}
.footer {
background-color: var(--brand-primary);
background-color: #2d5016;
color: white;
padding: 1rem 0;
text-align: center;
@@ -147,17 +88,17 @@ nav a:hover {
}
.recipe-card {
background: var(--bg-secondary);
background: white;
border-radius: 8px;
overflow: hidden;
box-shadow: 0 2px 8px var(--shadow);
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
transition: transform 0.2s;
cursor: pointer;
}
.recipe-card:hover {
transform: translateY(-4px);
box-shadow: 0 4px 12px var(--shadow-hover);
box-shadow: 0 4px 12px rgba(0,0,0,0.15);
}
.recipe-card img {
@@ -172,19 +113,19 @@ nav a:hover {
.recipe-card h3 {
margin-bottom: 0.5rem;
color: var(--brand-primary);
color: #2d5016;
}
.recipe-card p {
color: var(--text-secondary);
color: #666;
font-size: 0.9rem;
}
.recipe-detail {
background: var(--bg-secondary);
background: white;
border-radius: 8px;
padding: 2rem;
box-shadow: 0 2px 8px var(--shadow);
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
}
.recipe-actions {
@@ -210,7 +151,7 @@ nav a:hover {
}
.recipe-detail h2 {
color: var(--brand-primary);
color: #2d5016;
margin-bottom: 1rem;
}
@@ -218,7 +159,7 @@ nav a:hover {
display: flex;
gap: 2rem;
margin-bottom: 2rem;
color: var(--text-secondary);
color: #666;
align-items: center;
flex-wrap: wrap;
}
@@ -245,7 +186,7 @@ nav a:hover {
align-items: center;
justify-content: center;
border-radius: 4px;
background-color: var(--brand-primary);
background-color: #2d5016;
color: white;
border: none;
cursor: pointer;
@@ -253,7 +194,7 @@ nav a:hover {
}
.servings-adjuster button:hover:not(:disabled) {
background-color: var(--brand-secondary);
background-color: #3d6821;
}
.servings-adjuster button:disabled {
@@ -311,166 +252,6 @@ nav a:hover {
white-space: nowrap;
}
/* Quick Tag Management - Inline Compact Style */
.quick-tags-inline {
display: flex;
flex-direction: column;
gap: 0.5rem;
align-items: flex-start;
}
.tags-display-inline {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 0.5rem;
}
.tags-display-inline strong {
color: var(--text-primary);
font-size: 0.95rem;
}
.tag-chip-inline {
display: inline-flex;
align-items: center;
gap: 0.3rem;
padding: 0.25rem 0.6rem;
background-color: var(--brand-light);
color: var(--brand-primary);
border-radius: 12px;
font-size: 0.85rem;
font-weight: 500;
transition: background-color 0.2s;
}
.tag-chip-inline:hover {
background-color: #d4e8c9;
}
.tag-remove-btn-inline {
background: none;
border: none;
color: var(--brand-primary);
font-size: 1.1rem;
font-weight: bold;
cursor: pointer;
padding: 0;
width: 16px;
height: 16px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
transition: background-color 0.2s;
line-height: 1;
}
.tag-remove-btn-inline:hover:not(:disabled) {
background-color: rgba(46, 125, 50, 0.2);
}
.tag-remove-btn-inline:disabled {
opacity: 0.5;
cursor: not-allowed;
}
.no-tags-inline {
color: var(--text-secondary);
font-size: 0.85rem;
}
.tag-input-inline {
display: flex;
gap: 0.4rem;
align-items: center;
}
.tag-input-small {
width: 150px;
padding: 0.35rem 0.6rem;
border: 1px solid var(--border-color);
border-radius: 4px;
font-size: 0.85rem;
background-color: var(--bg-primary);
color: var(--text-primary);
transition: border-color 0.2s;
}
.tag-input-small:focus {
outline: none;
border-color: var(--brand-primary);
}
.tag-input-small:disabled {
opacity: 0.6;
cursor: not-allowed;
}
.tag-add-btn-small {
background-color: var(--brand-primary);
color: white;
border: none;
width: 28px;
height: 28px;
border-radius: 4px;
font-size: 1.1rem;
font-weight: bold;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
transition: background-color 0.2s;
padding: 0;
}
.tag-add-btn-small:hover:not(:disabled) {
background-color: var(--brand-secondary);
}
.tag-add-btn-small:disabled {
background-color: #ccc;
cursor: not-allowed;
opacity: 0.6;
}
/* Import Page Tag Management */
.import-actions {
display: flex;
align-items: flex-start;
gap: 2rem;
flex-wrap: wrap;
margin-top: 1rem;
}
.import-tags-inline {
display: flex;
flex-direction: column;
gap: 0.5rem;
flex: 1;
min-width: 300px;
}
.import-tags-inline > label {
font-weight: 600;
color: var(--text-primary);
font-size: 0.95rem;
}
.import-tags-display {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 0.5rem;
min-height: 2rem;
}
.import-tag-input {
display: flex;
gap: 0.5rem;
align-items: center;
}
.recipe-sections {
margin-top: 2rem;
}
@@ -478,9 +259,9 @@ nav a:hover {
.recipe-section {
margin-bottom: 3rem;
padding: 1.5rem;
background-color: var(--bg-tertiary);
background-color: #f9f9f9;
border-radius: 8px;
border-left: 4px solid var(--brand-primary);
border-left: 4px solid #2d5016;
}
.section-header {
@@ -493,12 +274,12 @@ nav a:hover {
}
.section-header h3 {
color: var(--brand-primary);
color: #2d5016;
margin: 0;
}
.section-timing {
background-color: var(--brand-primary);
background-color: #2d5016;
color: white;
padding: 0.4rem 0.8rem;
border-radius: 4px;
@@ -507,13 +288,13 @@ nav a:hover {
}
.instruction-timing {
color: var(--brand-primary);
color: #2d5016;
font-weight: 600;
font-size: 0.95rem;
}
.recipe-section h4 {
color: var(--brand-primary);
color: #2d5016;
margin-bottom: 1rem;
font-size: 1.1rem;
}
@@ -523,7 +304,7 @@ nav a:hover {
}
.ingredients h3, .instructions h3 {
color: var(--brand-primary);
color: #2d5016;
margin-bottom: 1rem;
}
@@ -534,7 +315,7 @@ nav a:hover {
.ingredients li {
padding: 0.5rem 0;
border-bottom: 1px solid var(--border-light);
border-bottom: 1px solid #eee;
}
.instructions ol {
@@ -554,18 +335,16 @@ nav a:hover {
display: block;
margin-bottom: 0.5rem;
font-weight: 500;
color: var(--text-primary);
color: #333;
}
.form-group input,
.form-group textarea {
width: 100%;
padding: 0.75rem;
border: 1px solid var(--border-color);
border: 1px solid #ddd;
border-radius: 4px;
font-size: 1rem;
background-color: var(--bg-secondary);
color: var(--text-primary);
}
.form-group textarea {
@@ -574,7 +353,7 @@ nav a:hover {
}
button {
background-color: var(--brand-primary);
background-color: #2d5016;
color: white;
border: none;
padding: 0.75rem 1.5rem;
@@ -585,7 +364,7 @@ button {
}
button:hover {
background-color: var(--brand-hover);
background-color: #1f3710;
}
button:disabled {
@@ -604,15 +383,15 @@ button:disabled {
.loading {
text-align: center;
padding: 2rem;
color: var(--text-secondary);
color: #666;
}
/* Recipe Form Styles */
.recipe-form {
background: var(--bg-secondary);
background: white;
border-radius: 8px;
padding: 2rem;
box-shadow: 0 2px 8px var(--shadow);
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
}
.form-row {
@@ -638,9 +417,9 @@ button:disabled {
}
.section-form {
background-color: var(--bg-tertiary);
background-color: #f9f9f9;
border-radius: 8px;
border-left: 4px solid var(--brand-primary);
border-left: 4px solid #2d5016;
padding: 1.5rem;
margin-bottom: 2rem;
}
@@ -654,17 +433,17 @@ button:disabled {
.section-form-header h4 {
margin: 0;
color: var(--brand-primary);
color: #2d5016;
}
.subsection {
margin-top: 1.5rem;
padding-top: 1rem;
border-top: 1px solid var(--border-color);
border-top: 1px solid #ddd;
}
.subsection h5 {
color: var(--brand-primary);
color: #2d5016;
margin-bottom: 1rem;
}
@@ -688,7 +467,7 @@ button:disabled {
gap: 0.75rem;
margin-bottom: 1rem;
align-items: flex-start;
background-color: var(--bg-secondary);
background-color: white;
padding: 0.75rem;
border-radius: 6px;
border: 2px solid transparent;
@@ -696,20 +475,20 @@ button:disabled {
}
.instruction-row:hover {
border-color: var(--border-color);
box-shadow: 0 2px 4px var(--shadow);
border-color: #e0e0e0;
box-shadow: 0 2px 4px rgba(0,0,0,0.05);
}
.instruction-row.dragging {
opacity: 0.5;
background-color: var(--bg-primary);
box-shadow: 0 4px 8px var(--shadow-hover);
border-color: var(--brand-primary);
background-color: #f5f5f5;
box-shadow: 0 4px 8px rgba(0,0,0,0.15);
border-color: #2d5016;
}
.instruction-drag-handle {
cursor: grab;
color: var(--text-tertiary);
color: #999;
font-size: 1.2rem;
display: flex;
align-items: center;
@@ -719,7 +498,7 @@ button:disabled {
}
.instruction-drag-handle:hover {
color: var(--brand-primary);
color: #2d5016;
}
.instruction-drag-handle:active {
@@ -729,7 +508,7 @@ button:disabled {
.instruction-number {
min-width: 30px;
height: 30px;
background-color: var(--brand-primary);
background-color: #2d5016;
color: white;
border-radius: 50%;
display: flex;
@@ -748,11 +527,9 @@ button:disabled {
.instruction-timing-input {
padding: 0.5rem;
border: 1px solid var(--border-color);
border: 1px solid #ddd;
border-radius: 4px;
font-size: 0.9rem;
background-color: var(--bg-secondary);
color: var(--text-primary);
}
.btn-secondary {
@@ -809,7 +586,7 @@ button:disabled {
gap: 1rem;
margin-top: 2rem;
padding-top: 2rem;
border-top: 2px solid var(--border-light);
border-top: 2px solid #eee;
}
.form-section {
@@ -819,9 +596,9 @@ button:disabled {
/* Image Upload Styles */
.image-upload-section {
padding: 1.5rem;
background-color: var(--bg-tertiary);
background-color: #f9f9f9;
border-radius: 8px;
border: 1px solid var(--border-color);
border: 1px solid #ddd;
}
.current-image {
@@ -928,7 +705,7 @@ button:disabled {
align-items: center;
padding: 1rem;
margin-bottom: 0.75rem;
background-color: var(--bg-tertiary);
background-color: #f5f5f5;
border-radius: 8px;
cursor: pointer;
transition: all 0.2s;

48
packages/web/src/App.tsx
View File

@@ -1,10 +1,7 @@
import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom';
import { AuthProvider } from './contexts/AuthContext';
import { ThemeProvider } from './contexts/ThemeContext';
import ProtectedRoute from './components/ProtectedRoute';
import UserMenu from './components/UserMenu';
import ThemeToggle from './components/ThemeToggle';
import FamilyGate from './components/FamilyGate';
import Login from './pages/Login';
import Register from './pages/Register';
import AuthCallback from './pages/AuthCallback';
@@ -17,37 +14,25 @@ import RecipeImport from './pages/RecipeImport';
import NewRecipe from './pages/NewRecipe';
import UnifiedEditRecipe from './pages/UnifiedEditRecipe';
import CookingMode from './pages/CookingMode';
import Family from './pages/Family';
import { APP_VERSION } from './version';
import './App.css';
function App() {
return (
<Router>
<ThemeProvider>
<AuthProvider>
<FamilyGate>
<div className="app">
<header className="header">
<div className="container">
<div className="logo-container">
<h1 className="logo">
<Link to="/" title={`Basil v${APP_VERSION}`}>🌿 Basil</Link>
</h1>
<span className="version" title={`Version ${APP_VERSION}`}>v{APP_VERSION}</span>
</div>
<nav>
<Link to="/">Cookbooks</Link>
<Link to="/recipes">All Recipes</Link>
<Link to="/recipes/new">New Recipe</Link>
<Link to="/recipes/import">Import Recipe</Link>
</nav>
<div style={{ display: 'flex', alignItems: 'center', gap: '1rem' }}>
<ThemeToggle />
<UserMenu />
</div>
</div>
</header>
<AuthProvider>
<div className="app">
<header className="header">
<div className="container">
<h1 className="logo"><Link to="/">🌿 Basil</Link></h1>
<nav>
<Link to="/">Cookbooks</Link>
<Link to="/recipes">All Recipes</Link>
<Link to="/recipes/new">New Recipe</Link>
<Link to="/recipes/import">Import Recipe</Link>
</nav>
<UserMenu />
</div>
</header>
<main className="main">
<div className="container">
@@ -67,7 +52,6 @@ function App() {
<Route path="/recipes/:id/cook" element={<ProtectedRoute><CookingMode /></ProtectedRoute>} />
<Route path="/recipes/new" element={<ProtectedRoute><NewRecipe /></ProtectedRoute>} />
<Route path="/recipes/import" element={<ProtectedRoute><RecipeImport /></ProtectedRoute>} />
<Route path="/family" element={<ProtectedRoute><Family /></ProtectedRoute>} />
</Routes>
</div>
</main>
@@ -78,9 +62,7 @@ function App() {
</div>
</footer>
</div>
</FamilyGate>
</AuthProvider>
</ThemeProvider>
</AuthProvider>
</Router>
);
}

101
packages/web/src/components/FamilyGate.tsx
View File

@@ -1,101 +0,0 @@
import { useEffect, useState, FormEvent, ReactNode } from 'react';
import { familiesApi } from '../services/api';
import { useAuth } from '../contexts/AuthContext';
import '../styles/FamilyGate.css';
interface FamilyGateProps {
children: ReactNode;
}
type CheckState = 'idle' | 'checking' | 'needs-family' | 'ready';
export default function FamilyGate({ children }: FamilyGateProps) {
const { isAuthenticated, loading: authLoading, logout } = useAuth();
const [state, setState] = useState<CheckState>('idle');
const [name, setName] = useState('');
const [submitting, setSubmitting] = useState(false);
const [error, setError] = useState<string | null>(null);
useEffect(() => {
if (authLoading) return;
if (!isAuthenticated) {
setState('idle');
return;
}
let cancelled = false;
(async () => {
setState('checking');
try {
const res = await familiesApi.list();
if (cancelled) return;
const count = res.data?.length ?? 0;
setState(count === 0 ? 'needs-family' : 'ready');
} catch {
if (!cancelled) setState('ready');
}
})();
return () => { cancelled = true; };
}, [isAuthenticated, authLoading]);
async function handleCreate(e: FormEvent) {
e.preventDefault();
const trimmed = name.trim();
if (!trimmed) return;
setSubmitting(true);
setError(null);
try {
await familiesApi.create(trimmed);
setState('ready');
} catch (e: any) {
setError(e?.response?.data?.error || 'Failed to create family');
} finally {
setSubmitting(false);
}
}
const showModal = isAuthenticated && state === 'needs-family';
return (
<>
{children}
{showModal && (
<div className="family-gate-overlay" role="dialog" aria-modal="true">
<div className="family-gate-modal">
<h2>Create your family</h2>
<p>
To keep recipes organized and shareable, every account belongs to
a family. Name yours to get started — you can invite others later.
</p>
<form onSubmit={handleCreate}>
<label htmlFor="family-gate-name">Family name</label>
<input
id="family-gate-name"
type="text"
value={name}
onChange={(e) => setName(e.target.value)}
placeholder="e.g. Smith Family"
autoFocus
disabled={submitting}
required
/>
{error && <div className="family-gate-error">{error}</div>}
<div className="family-gate-actions">
<button
type="button"
className="family-gate-secondary"
onClick={logout}
disabled={submitting}
>
Sign out
</button>
<button type="submit" disabled={submitting || !name.trim()}>
{submitting ? 'Creating…' : 'Create family'}
</button>
</div>
</form>
</div>
</div>
)}
</>
);
}

24
packages/web/src/components/ThemeToggle.tsx
View File

@@ -1,24 +0,0 @@
import { useTheme } from '../contexts/ThemeContext';
import '../styles/ThemeToggle.css';
function ThemeToggle() {
try {
const { theme, toggleTheme } = useTheme();
return (
<button
onClick={toggleTheme}
className="theme-toggle"
aria-label={`Switch to ${theme === 'light' ? 'dark' : 'light'} mode`}
title={`Switch to ${theme === 'light' ? 'dark' : 'light'} mode`}
>
{theme === 'light' ? '🌙' : '☀️'}
</button>
);
} catch (error) {
console.error('ThemeToggle error:', error);
return null;
}
}
export default ThemeToggle;

7
packages/web/src/components/UserMenu.tsx
View File

@@ -96,13 +96,6 @@ const UserMenu: React.FC = () => {
>
My Cookbooks
</Link>
<Link
to="/family"
className="user-menu-link"
onClick={() => setIsOpen(false)}
>
Family
</Link>
{isAdmin && (
<>
<div className="user-menu-divider"></div>

53
packages/web/src/contexts/ThemeContext.tsx
View File

@@ -1,53 +0,0 @@
import { createContext, useContext, useState, useEffect, ReactNode } from 'react';
type Theme = 'light' | 'dark';
interface ThemeContextType {
theme: Theme;
toggleTheme: () => void;
}
const ThemeContext = createContext<ThemeContextType | undefined>(undefined);
const THEME_STORAGE_KEY = 'basil_theme';
export function ThemeProvider({ children }: { children: ReactNode }) {
const [theme, setTheme] = useState<Theme>(() => {
// Load theme from localStorage safely
try {
const saved = localStorage.getItem(THEME_STORAGE_KEY);
return (saved === 'dark' ? 'dark' : 'light') as Theme;
} catch (e) {
return 'light';
}
});
useEffect(() => {
// Apply theme to document
document.documentElement.setAttribute('data-theme', theme);
// Save to localStorage safely
try {
localStorage.setItem(THEME_STORAGE_KEY, theme);
} catch (e) {
console.warn('Failed to save theme preference:', e);
}
}, [theme]);
const toggleTheme = () => {
setTheme(prev => prev === 'light' ? 'dark' : 'light');
};
return (
<ThemeContext.Provider value={{ theme, toggleTheme }}>
{children}
</ThemeContext.Provider>
);
}
export function useTheme() {
const context = useContext(ThemeContext);
if (context === undefined) {
throw new Error('useTheme must be used within a ThemeProvider');
}
return context;
}

205
packages/web/src/pages/CookbookDetail.tsx
View File

@@ -1,53 +1,20 @@
import { useState, useEffect } from 'react';
import { useParams, useNavigate, useSearchParams } from 'react-router-dom';
import { useParams, useNavigate } from 'react-router-dom';
import { CookbookWithRecipes, Recipe } from '@basil/shared';
import { cookbooksApi } from '../services/api';
import '../styles/CookbookDetail.css';
const ITEMS_PER_PAGE_OPTIONS = [12, 24, 48, -1]; // -1 = All
// LocalStorage keys
const LS_ITEMS_PER_PAGE = 'basil_cookbook_itemsPerPage';
const LS_COLUMN_COUNT = 'basil_cookbook_columnCount';
// Helper function to extract tag name from string or RecipeTag object
const getTagName = (tag: string | { tag: { name: string } }): string => {
return typeof tag === 'string' ? tag : tag.tag.name;
};
function CookbookDetail() {
const { id } = useParams<{ id: string }>();
const navigate = useNavigate();
const [searchParams, setSearchParams] = useSearchParams();
const [cookbook, setCookbook] = useState<CookbookWithRecipes | null>(null);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
// Pagination state
const [currentPage, setCurrentPage] = useState(() => {
const page = searchParams.get('page');
return page ? parseInt(page) : 1;
});
const [itemsPerPage, setItemsPerPage] = useState(() => {
const saved = localStorage.getItem(LS_ITEMS_PER_PAGE);
if (saved) return parseInt(saved);
const param = searchParams.get('limit');
return param ? parseInt(param) : 24;
});
// Display controls state
const [columnCount, setColumnCount] = useState<3 | 5 | 7 | 9>(() => {
const saved = localStorage.getItem(LS_COLUMN_COUNT);
if (saved) {
const val = parseInt(saved);
if (val === 3 || val === 5 || val === 7 || val === 9) return val;
}
return 5;
});
// Filters
const [searchQuery, setSearchQuery] = useState('');
const [selectedTags, setSelectedTags] = useState<string[]>([]);
const [selectedCategory, setSelectedCategory] = useState<string>('');
const [selectedCuisine, setSelectedCuisine] = useState<string>('');
useEffect(() => {
@@ -56,28 +23,6 @@ function CookbookDetail() {
}
}, [id]);
// Save preferences to localStorage
useEffect(() => {
localStorage.setItem(LS_ITEMS_PER_PAGE, itemsPerPage.toString());
}, [itemsPerPage]);
useEffect(() => {
localStorage.setItem(LS_COLUMN_COUNT, columnCount.toString());
}, [columnCount]);
// Update URL params
useEffect(() => {
const params = new URLSearchParams();
if (currentPage > 1) params.set('page', currentPage.toString());
if (itemsPerPage !== 24) params.set('limit', itemsPerPage.toString());
setSearchParams(params, { replace: true });
}, [currentPage, itemsPerPage, setSearchParams]);
// Reset page when filters change
useEffect(() => {
setCurrentPage(1);
}, [searchQuery, selectedTags, selectedCuisine]);
const loadCookbook = async (cookbookId: string) => {
try {
setLoading(true);
@@ -126,16 +71,27 @@ function CookbookDetail() {
);
};
// Get all unique tags from recipes
// Get all unique tags and categories from recipes
const getAllTags = (): string[] => {
if (!cookbook) return [];
const tagSet = new Set<string>();
cookbook.recipes.forEach(recipe => {
recipe.tags?.forEach(tag => tagSet.add(getTagName(tag)));
recipe.tags?.forEach(tag => tagSet.add(tag));
});
return Array.from(tagSet).sort();
};
const getAllCategories = (): string[] => {
if (!cookbook) return [];
const categorySet = new Set<string>();
cookbook.recipes.forEach(recipe => {
if (recipe.categories) {
recipe.categories.forEach(cat => categorySet.add(cat));
}
});
return Array.from(categorySet).sort();
};
const getAllCuisines = (): string[] => {
if (!cookbook) return [];
const cuisineSet = new Set<string>();
@@ -165,6 +121,14 @@ function CookbookDetail() {
if (!hasAllTags) return false;
}
// Category filter
if (selectedCategory) {
const recipeCategories = recipe.categories || [];
if (!recipeCategories.includes(selectedCategory)) {
return false;
}
}
// Cuisine filter
if (selectedCuisine && recipe.cuisine !== selectedCuisine) {
return false;
@@ -177,27 +141,10 @@ function CookbookDetail() {
const clearFilters = () => {
setSearchQuery('');
setSelectedTags([]);
setSelectedCategory('');
setSelectedCuisine('');
};
const handlePageChange = (newPage: number) => {
setCurrentPage(newPage);
window.scrollTo({ top: 0, behavior: 'smooth' });
};
const handleItemsPerPageChange = (value: number) => {
setItemsPerPage(value);
setCurrentPage(1);
};
// Apply pagination to filtered recipes
const getPaginatedRecipes = (filteredRecipes: Recipe[]): Recipe[] => {
if (itemsPerPage === -1) return filteredRecipes;
const startIndex = (currentPage - 1) * itemsPerPage;
const endIndex = startIndex + itemsPerPage;
return filteredRecipes.slice(startIndex, endIndex);
};
if (loading) {
return (
<div className="cookbook-detail-page">
@@ -216,19 +163,10 @@ function CookbookDetail() {
}
const filteredRecipes = getFilteredRecipes();
const paginatedRecipes = getPaginatedRecipes(filteredRecipes);
const allTags = getAllTags();
const allCategories = getAllCategories();
const allCuisines = getAllCuisines();
const hasActiveFilters = searchQuery || selectedTags.length > 0 || selectedCuisine;
const totalPages = itemsPerPage === -1 ? 1 : Math.ceil(filteredRecipes.length / itemsPerPage);
// Grid style with CSS variables
const gridStyle: React.CSSProperties = {
gridTemplateColumns: `repeat(${columnCount}, 1fr)`,
};
const recipesGridClassName = `recipes-grid columns-${columnCount}`;
const cookbooksGridClassName = `cookbooks-grid columns-${columnCount}`;
const hasActiveFilters = searchQuery || selectedTags.length > 0 || selectedCategory || selectedCuisine;
return (
<div className="cookbook-detail-page">
@@ -282,6 +220,22 @@ function CookbookDetail() {
</div>
<div className="filter-row">
{allCategories.length > 0 && (
<div className="filter-group">
<label htmlFor="category-filter">Category:</label>
<select
id="category-filter"
value={selectedCategory}
onChange={(e) => setSelectedCategory(e.target.value)}
>
<option value="">All Categories</option>
{allCategories.map(category => (
<option key={category} value={category}>{category}</option>
))}
</select>
</div>
)}
{allCuisines.length > 0 && (
<div className="filter-group">
<label htmlFor="cuisine-filter">Cuisine:</label>
@@ -306,66 +260,11 @@ function CookbookDetail() {
</div>
</div>
{/* Display and Pagination Controls */}
<div className="cookbook-toolbar">
<div className="display-controls">
<div className="control-group">
<label>Columns:</label>
<div className="column-buttons">
{([3, 5, 7, 9] as const).map((count) => (
<button
key={count}
className={columnCount === count ? 'active' : ''}
onClick={() => setColumnCount(count)}
>
{count}
</button>
))}
</div>
</div>
</div>
<div className="pagination-controls">
<div className="control-group">
<label>Per page:</label>
<div className="items-per-page">
{ITEMS_PER_PAGE_OPTIONS.map((count) => (
<button
key={count}
className={itemsPerPage === count ? 'active' : ''}
onClick={() => handleItemsPerPageChange(count)}
>
{count === -1 ? 'All' : count}
</button>
))}
</div>
</div>
<div className="page-navigation">
<button
onClick={() => handlePageChange(currentPage - 1)}
disabled={currentPage <= 1}
>
Prev
</button>
<span className="page-info">
Page {currentPage} of {totalPages}
</span>
<button
onClick={() => handlePageChange(currentPage + 1)}
disabled={currentPage >= totalPages}
>
Next
</button>
</div>
</div>
</div>
{/* Included Cookbooks */}
{cookbook.cookbooks && cookbook.cookbooks.length > 0 && (
<section className="included-cookbooks-section">
<h2>Included Cookbooks ({cookbook.cookbooks.length})</h2>
<div className={cookbooksGridClassName} style={gridStyle}>
<div className="cookbooks-grid">
{cookbook.cookbooks.map((childCookbook) => (
<div
key={childCookbook.id}
@@ -406,12 +305,7 @@ function CookbookDetail() {
<div className="results-section">
<h2>Recipes</h2>
<p className="results-count">
{itemsPerPage === -1 ? (
`Showing all ${filteredRecipes.length} recipes`
) : (
`Showing ${(currentPage - 1) * itemsPerPage + 1}-${Math.min(currentPage * itemsPerPage, filteredRecipes.length)} of ${filteredRecipes.length} recipes`
)}
{filteredRecipes.length < cookbook.recipes.length && ` (filtered from ${cookbook.recipes.length} total)`}
Showing {filteredRecipes.length} of {cookbook.recipes.length} recipes
</p>
{filteredRecipes.length === 0 ? (
@@ -423,8 +317,8 @@ function CookbookDetail() {
)}
</div>
) : (
<div className={recipesGridClassName} style={gridStyle}>
{paginatedRecipes.map(recipe => (
<div className="recipes-grid">
{filteredRecipes.map(recipe => (
<div key={recipe.id} className="recipe-card">
<div onClick={() => navigate(`/recipes/${recipe.id}`)}>
{recipe.imageUrl ? (
@@ -445,10 +339,9 @@ function CookbookDetail() {
</div>
{recipe.tags && recipe.tags.length > 0 && (
<div className="recipe-tags">
{recipe.tags.map(tag => {
const tagName = getTagName(tag);
return <span key={tagName} className="tag">{tagName}</span>;
})}
{recipe.tags.map(tag => (
<span key={tag} className="tag">{tag}</span>
))}
</div>
)}
</div>

453
packages/web/src/pages/Cookbooks.tsx
View File

@@ -1,18 +1,11 @@
import { useState, useEffect } from 'react';
import { useNavigate, useSearchParams } from 'react-router-dom';
import { useNavigate } from 'react-router-dom';
import { Cookbook, Recipe, Tag } from '@basil/shared';
import { cookbooksApi, recipesApi, tagsApi } from '../services/api';
import '../styles/Cookbooks.css';
const ITEMS_PER_PAGE_OPTIONS = [12, 24, 48, -1]; // -1 = All
// LocalStorage keys
const LS_ITEMS_PER_PAGE = 'basil_cookbooks_itemsPerPage';
const LS_COLUMN_COUNT = 'basil_cookbooks_columnCount';
function Cookbooks() {
const navigate = useNavigate();
const [searchParams, setSearchParams] = useSearchParams();
const [cookbooks, setCookbooks] = useState<Cookbook[]>([]);
const [recentRecipes, setRecentRecipes] = useState<Recipe[]>([]);
const [loading, setLoading] = useState(true);
@@ -20,58 +13,21 @@ function Cookbooks() {
const [showCreateModal, setShowCreateModal] = useState(false);
const [newCookbookName, setNewCookbookName] = useState('');
const [newCookbookDescription, setNewCookbookDescription] = useState('');
const [autoFilterCategories, setAutoFilterCategories] = useState<string[]>([]);
const [autoFilterTags, setAutoFilterTags] = useState<string[]>([]);
const [autoFilterCookbookTags, setAutoFilterCookbookTags] = useState<string[]>([]);
const [cookbookTags, setCookbookTags] = useState<string[]>([]);
const [categoryInput, setCategoryInput] = useState('');
const [tagInput, setTagInput] = useState('');
const [cookbookTagInput, setCookbookTagInput] = useState('');
const [cookbookTagFilterInput, setCookbookTagFilterInput] = useState('');
const [availableTags, setAvailableTags] = useState<Tag[]>([]);
const [autoAddCollapsed, setAutoAddCollapsed] = useState(true);
// Pagination state
const [currentPage, setCurrentPage] = useState(() => {
const page = searchParams.get('page');
return page ? parseInt(page) : 1;
});
const [itemsPerPage, setItemsPerPage] = useState(() => {
const saved = localStorage.getItem(LS_ITEMS_PER_PAGE);
if (saved) return parseInt(saved);
const param = searchParams.get('limit');
return param ? parseInt(param) : 24;
});
// Display controls state
const [columnCount, setColumnCount] = useState<3 | 5 | 7 | 9>(() => {
const saved = localStorage.getItem(LS_COLUMN_COUNT);
if (saved) {
const val = parseInt(saved);
if (val === 3 || val === 5 || val === 7 || val === 9) return val;
}
return 5;
});
const [availableCategories, setAvailableCategories] = useState<string[]>([]);
useEffect(() => {
loadData();
}, []);
// Save preferences to localStorage
useEffect(() => {
localStorage.setItem(LS_ITEMS_PER_PAGE, itemsPerPage.toString());
}, [itemsPerPage]);
useEffect(() => {
localStorage.setItem(LS_COLUMN_COUNT, columnCount.toString());
}, [columnCount]);
// Update URL params
useEffect(() => {
const params = new URLSearchParams();
if (currentPage > 1) params.set('page', currentPage.toString());
if (itemsPerPage !== 24) params.set('limit', itemsPerPage.toString());
setSearchParams(params, { replace: true });
}, [currentPage, itemsPerPage, setSearchParams]);
const loadData = async () => {
try {
setLoading(true);
@@ -85,6 +41,15 @@ function Cookbooks() {
setRecentRecipes(recipesResponse.data || []);
setAvailableTags(tagsResponse.data || []);
// Extract unique categories from recent recipes
const categories = new Set<string>();
(recipesResponse.data || []).forEach(recipe => {
if (recipe.categories) {
recipe.categories.forEach(cat => categories.add(cat));
}
});
setAvailableCategories(Array.from(categories).sort());
setError(null);
} catch (err) {
setError('Failed to load data');
@@ -106,6 +71,7 @@ function Cookbooks() {
await cookbooksApi.create({
name: newCookbookName,
description: newCookbookDescription || undefined,
autoFilterCategories: autoFilterCategories.length > 0 ? autoFilterCategories : undefined,
autoFilterTags: autoFilterTags.length > 0 ? autoFilterTags : undefined,
autoFilterCookbookTags: autoFilterCookbookTags.length > 0 ? autoFilterCookbookTags : undefined,
tags: cookbookTags.length > 0 ? cookbookTags : undefined
@@ -113,9 +79,11 @@ function Cookbooks() {
setNewCookbookName('');
setNewCookbookDescription('');
setAutoFilterCategories([]);
setAutoFilterTags([]);
setAutoFilterCookbookTags([]);
setCookbookTags([]);
setCategoryInput('');
setTagInput('');
setCookbookTagInput('');
setCookbookTagFilterInput('');
@@ -127,6 +95,18 @@ function Cookbooks() {
}
};
const handleAddCategory = () => {
const trimmed = categoryInput.trim();
if (trimmed && !autoFilterCategories.includes(trimmed)) {
setAutoFilterCategories([...autoFilterCategories, trimmed]);
setCategoryInput('');
}
};
const handleRemoveCategory = (category: string) => {
setAutoFilterCategories(autoFilterCategories.filter(c => c !== category));
};
const handleAddTag = () => {
const trimmed = tagInput.trim();
if (trimmed && !autoFilterTags.includes(trimmed)) {
@@ -163,35 +143,6 @@ function Cookbooks() {
setAutoFilterCookbookTags(autoFilterCookbookTags.filter(t => t !== tag));
};
const handlePageChange = (newPage: number) => {
setCurrentPage(newPage);
window.scrollTo({ top: 0, behavior: 'smooth' });
};
const handleItemsPerPageChange = (value: number) => {
setItemsPerPage(value);
setCurrentPage(1);
};
// Apply pagination to cookbooks
const getPaginatedCookbooks = (): Cookbook[] => {
if (itemsPerPage === -1) return cookbooks;
const startIndex = (currentPage - 1) * itemsPerPage;
const endIndex = startIndex + itemsPerPage;
return cookbooks.slice(startIndex, endIndex);
};
const paginatedCookbooks = getPaginatedCookbooks();
const totalPages = itemsPerPage === -1 ? 1 : Math.ceil(cookbooks.length / itemsPerPage);
// Grid style with CSS variables
const gridStyle: React.CSSProperties = {
gridTemplateColumns: `repeat(${columnCount}, 1fr)`,
};
const recipesGridClassName = `recipes-grid columns-${columnCount}`;
const cookbooksGridClassName = `cookbooks-grid columns-${columnCount}`;
if (loading) {
return (
<div className="cookbooks-page">
@@ -225,30 +176,9 @@ function Cookbooks() {
</div>
</header>
{/* Page-level Controls */}
<div className="page-toolbar">
<div className="display-controls">
<div className="control-group">
<label>Columns:</label>
<div className="column-buttons">
{([3, 5, 7, 9] as const).map((count) => (
<button
key={count}
className={columnCount === count ? 'active' : ''}
onClick={() => setColumnCount(count)}
>
{count}
</button>
))}
</div>
</div>
</div>
</div>
{/* Cookbooks Grid */}
<section className="cookbooks-section">
<h2>Cookbooks</h2>
{cookbooks.length === 0 ? (
<div className="empty-state">
<p>No cookbooks yet. Create your first cookbook to organize your recipes!</p>
@@ -257,56 +187,8 @@ function Cookbooks() {
</button>
</div>
) : (
<>
{/* Pagination Controls */}
<div className="pagination-toolbar">
<div className="pagination-controls">
<div className="control-group">
<label>Per page:</label>
<div className="items-per-page">
{ITEMS_PER_PAGE_OPTIONS.map((count) => (
<button
key={count}
className={itemsPerPage === count ? 'active' : ''}
onClick={() => handleItemsPerPageChange(count)}
>
{count === -1 ? 'All' : count}
</button>
))}
</div>
</div>
<div className="page-navigation">
<button
onClick={() => handlePageChange(currentPage - 1)}
disabled={currentPage <= 1}
>
Prev
</button>
<span className="page-info">
Page {currentPage} of {totalPages}
</span>
<button
onClick={() => handlePageChange(currentPage + 1)}
disabled={currentPage >= totalPages}
>
Next
</button>
</div>
</div>
</div>
{/* Results count */}
<p className="results-count">
{itemsPerPage === -1 ? (
`Showing all ${cookbooks.length} cookbooks`
) : (
`Showing ${(currentPage - 1) * itemsPerPage + 1}-${Math.min(currentPage * itemsPerPage, cookbooks.length)} of ${cookbooks.length} cookbooks`
)}
</p>
<div className={cookbooksGridClassName} style={gridStyle}>
{paginatedCookbooks.map((cookbook) => (
<div className="cookbooks-grid">
{cookbooks.map((cookbook) => (
<div
key={cookbook.id}
className="cookbook-card"
@@ -339,13 +221,12 @@ function Cookbooks() {
</div>
))}
</div>
</>
)}
</section>
{/* Recent Recipes */}
<section className="recent-recipes-section">
<div className="section-title-row">
<div className="section-header">
<h2>Recent Recipes</h2>
<button onClick={() => navigate('/recipes')} className="btn-link">
View all →
@@ -354,7 +235,7 @@ function Cookbooks() {
{recentRecipes.length === 0 ? (
<p className="empty-state">No recipes yet.</p>
) : (
<div className={recipesGridClassName} style={gridStyle}>
<div className="recipes-grid">
{recentRecipes.map((recipe) => (
<div
key={recipe.id}
@@ -390,158 +271,142 @@ function Cookbooks() {
<div className="modal" onClick={(e) => e.stopPropagation()}>
<h2>Create New Cookbook</h2>
<form onSubmit={handleCreateCookbook}>
{/* SECTION 1: BASIC INFO */}
<div className="form-section">
<div className="form-section-header">
<span className="form-section-icon">📝</span>
<div className="form-section-title">
<h2>Basic Information</h2>
<p>Give your cookbook a name and description</p>
</div>
</div>
<div className="form-section-content">
<div className="form-group">
<label htmlFor="cookbook-name">Name *</label>
<input
id="cookbook-name"
type="text"
value={newCookbookName}
onChange={(e) => setNewCookbookName(e.target.value)}
placeholder="e.g., Family Favorites, Holiday Recipes"
autoFocus
/>
</div>
<div className="form-group">
<label htmlFor="cookbook-description">Description</label>
<textarea
id="cookbook-description"
value={newCookbookDescription}
onChange={(e) => setNewCookbookDescription(e.target.value)}
placeholder="Describe this cookbook..."
rows={3}
/>
</div>
</div>
<div className="form-group">
<label htmlFor="cookbook-name">Name *</label>
<input
id="cookbook-name"
type="text"
value={newCookbookName}
onChange={(e) => setNewCookbookName(e.target.value)}
placeholder="e.g., Family Favorites, Holiday Recipes"
autoFocus
/>
</div>
<div className="form-group">
<label htmlFor="cookbook-description">Description</label>
<textarea
id="cookbook-description"
value={newCookbookDescription}
onChange={(e) => setNewCookbookDescription(e.target.value)}
placeholder="Describe this cookbook..."
rows={3}
/>
</div>
{/* SECTION 2: ORGANIZE THIS COOKBOOK */}
<div className="form-section">
<div className="form-section-header">
<span className="form-section-icon">📋</span>
<div className="form-section-title">
<h2>Organize This Cookbook</h2>
<p>Tag this cookbook so you can find it later</p>
</div>
<div className="form-group">
<label>Auto-Add Categories (Optional)</label>
<p className="help-text">Recipes with these categories will be automatically added to this cookbook</p>
<div className="filter-chips">
{autoFilterCategories.map(category => (
<span key={category} className="filter-chip">
{category}
<button type="button" onClick={() => handleRemoveCategory(category)}>×</button>
</span>
))}
</div>
<div className="form-section-content">
<div className="form-group">
<label>Cookbook Tags</label>
<p className="help-text">Examples: "holiday", "meal-prep", "family-favorites"</p>
<div className="filter-chips">
{cookbookTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveCookbookTag(tag)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={cookbookTagInput}
onChange={(e) => setCookbookTagInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCookbookTag())}
placeholder="Add a tag"
list="available-cookbook-tags"
/>
<button type="button" onClick={handleAddCookbookTag} className="btn-add-filter">+</button>
</div>
<datalist id="available-cookbook-tags">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
<div className="input-with-button">
<input
type="text"
value={categoryInput}
onChange={(e) => setCategoryInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCategory())}
placeholder="Add category"
list="available-categories"
/>
<button type="button" onClick={handleAddCategory} className="btn-add-filter">+</button>
</div>
<datalist id="available-categories">
{availableCategories.map(category => (
<option key={category} value={category} />
))}
</datalist>
</div>
{/* SECTION 3: AUTO-ADD CONTENT (COLLAPSIBLE) */}
<div className={`form-section collapsible ${autoAddCollapsed ? 'collapsed' : ''}`}>
<div className="form-section-header" onClick={() => setAutoAddCollapsed(!autoAddCollapsed)}>
<span className="form-section-icon">⚡</span>
<div className="form-section-title">
<h2>Auto-Add Content (Optional)</h2>
<p>Automatically add recipes and cookbooks</p>
</div>
<span className="form-section-toggle">▼</span>
<div className="form-group">
<label>Auto-Add Tags (Optional)</label>
<p className="help-text">Recipes with these tags will be automatically added to this cookbook</p>
<div className="filter-chips">
{autoFilterTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveTag(tag)}>×</button>
</span>
))}
</div>
<div className="form-section-content">
{/* Subsection: By Recipe Tags */}
<div className="form-subsection">
<div className="form-subsection-header">
<span className="form-subsection-icon">🍲</span>
<h3>By Recipe Tags</h3>
</div>
<p className="help-text">Recipes tagged with these will be auto-added. Example: "vegetarian"</p>
<div className="filter-chips">
{autoFilterTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveTag(tag)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={tagInput}
onChange={(e) => setTagInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddTag())}
placeholder="Add a tag"
list="available-tags-modal"
/>
<button type="button" onClick={handleAddTag} className="btn-add-filter">+</button>
</div>
<datalist id="available-tags-modal">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
<div className="input-with-button">
<input
type="text"
value={tagInput}
onChange={(e) => setTagInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddTag())}
placeholder="Add tag"
list="available-tags-modal"
/>
<button type="button" onClick={handleAddTag} className="btn-add-filter">+</button>
</div>
<datalist id="available-tags-modal">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
{/* Subsection: By Cookbook Tags */}
<div className="form-subsection">
<div className="form-subsection-header">
<span className="form-subsection-icon">📚</span>
<h3>By Cookbook Tags</h3>
</div>
<p className="help-text">Include cookbooks tagged with these. Example: "italian"</p>
<div className="filter-chips">
{autoFilterCookbookTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveCookbookTagFilter(tag)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={cookbookTagFilterInput}
onChange={(e) => setCookbookTagFilterInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCookbookTagFilter())}
placeholder="Add a tag"
list="available-cookbook-filter-tags"
/>
<button type="button" onClick={handleAddCookbookTagFilter} className="btn-add-filter">+</button>
</div>
<datalist id="available-cookbook-filter-tags">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
<div className="form-group">
<label>Cookbook Tags (Optional)</label>
<p className="help-text">Tags to categorize this cookbook (e.g., "holiday", "quick-meals")</p>
<div className="filter-chips">
{cookbookTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveCookbookTag(tag)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={cookbookTagInput}
onChange={(e) => setCookbookTagInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCookbookTag())}
placeholder="Add tag"
list="available-cookbook-tags"
/>
<button type="button" onClick={handleAddCookbookTag} className="btn-add-filter">+</button>
</div>
<datalist id="available-cookbook-tags">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
<div className="form-group">
<label>Auto-Include Cookbooks by Tags (Optional)</label>
<p className="help-text">Other cookbooks with these tags will be automatically included</p>
<div className="filter-chips">
{autoFilterCookbookTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveCookbookTagFilter(tag)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={cookbookTagFilterInput}
onChange={(e) => setCookbookTagFilterInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCookbookTagFilter())}
placeholder="Add tag to filter by"
list="available-cookbook-filter-tags"
/>
<button type="button" onClick={handleAddCookbookTagFilter} className="btn-add-filter">+</button>
</div>
<datalist id="available-cookbook-filter-tags">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
<div className="modal-actions">

329
packages/web/src/pages/EditCookbook.tsx
View File

@@ -18,15 +18,17 @@ function EditCookbook() {
const [coverImageUrl, setCoverImageUrl] = useState('');
const [imageUrlInput, setImageUrlInput] = useState('');
const [selectedFile, setSelectedFile] = useState<File | null>(null);
const [autoFilterCategories, setAutoFilterCategories] = useState<string[]>([]);
const [autoFilterTags, setAutoFilterTags] = useState<string[]>([]);
const [autoFilterCookbookTags, setAutoFilterCookbookTags] = useState<string[]>([]);
const [cookbookTags, setCookbookTags] = useState<string[]>([]);
const [categoryInput, setCategoryInput] = useState('');
const [tagInput, setTagInput] = useState('');
const [cookbookTagInput, setCookbookTagInput] = useState('');
const [cookbookTagFilterInput, setCookbookTagFilterInput] = useState('');
const [availableTags, setAvailableTags] = useState<Tag[]>([]);
const [autoAddCollapsed, setAutoAddCollapsed] = useState(true);
const [availableCategories, setAvailableCategories] = useState<string[]>([]);
useEffect(() => {
if (id) {
@@ -47,6 +49,7 @@ function EditCookbook() {
setName(cookbook.name);
setDescription(cookbook.description || '');
setCoverImageUrl(cookbook.coverImageUrl || '');
setAutoFilterCategories(cookbook.autoFilterCategories || []);
setAutoFilterTags(cookbook.autoFilterTags || []);
setAutoFilterCookbookTags(cookbook.autoFilterCookbookTags || []);
setCookbookTags(cookbook.tags || []);
@@ -54,6 +57,17 @@ function EditCookbook() {
setAvailableTags(tagsResponse.data || []);
// Extract unique categories from cookbook's recipes
const categories = new Set<string>();
if (cookbook && 'recipes' in cookbook) {
(cookbook as any).recipes.forEach((recipe: any) => {
if (recipe.categories) {
recipe.categories.forEach((cat: string) => categories.add(cat));
}
});
}
setAvailableCategories(Array.from(categories).sort());
setError(null);
} catch (err) {
console.error('Failed to load cookbook:', err);
@@ -77,6 +91,7 @@ function EditCookbook() {
name,
description: description || undefined,
coverImageUrl: coverImageUrl === '' ? '' : (coverImageUrl || undefined),
autoFilterCategories,
autoFilterTags,
autoFilterCookbookTags,
tags: cookbookTags
@@ -91,6 +106,18 @@ function EditCookbook() {
}
};
const handleAddCategory = () => {
const trimmed = categoryInput.trim();
if (trimmed && !autoFilterCategories.includes(trimmed)) {
setAutoFilterCategories([...autoFilterCategories, trimmed]);
setCategoryInput('');
}
};
const handleRemoveCategory = (category: string) => {
setAutoFilterCategories(autoFilterCategories.filter(c => c !== category));
};
const handleAddTag = () => {
const trimmed = tagInput.trim();
if (trimmed && !autoFilterTags.includes(trimmed)) {
@@ -199,40 +226,30 @@ function EditCookbook() {
</header>
<form onSubmit={handleSubmit} className="edit-cookbook-form">
{/* SECTION 1: BASIC INFO */}
<div className="form-section">
<div className="form-section-header">
<span className="form-section-icon">📝</span>
<div className="form-section-title">
<h2>Basic Information</h2>
<p>Give your cookbook a name and description</p>
</div>
</div>
<div className="form-section-content">
<div className="form-group">
<label htmlFor="cookbook-name">Name *</label>
<input
id="cookbook-name"
type="text"
value={name}
onChange={(e) => setName(e.target.value)}
placeholder="e.g., Family Favorites, Holiday Recipes"
required
/>
</div>
<div className="form-group">
<label htmlFor="cookbook-name">Name *</label>
<input
id="cookbook-name"
type="text"
value={name}
onChange={(e) => setName(e.target.value)}
placeholder="e.g., Family Favorites, Holiday Recipes"
required
/>
</div>
<div className="form-group">
<label htmlFor="cookbook-description">Description</label>
<textarea
id="cookbook-description"
value={description}
onChange={(e) => setDescription(e.target.value)}
placeholder="Describe this cookbook..."
rows={3}
/>
</div>
<div className="form-group">
<label htmlFor="cookbook-description">Description</label>
<textarea
id="cookbook-description"
value={description}
onChange={(e) => setDescription(e.target.value)}
placeholder="Describe this cookbook..."
rows={3}
/>
</div>
<div className="form-group">
<div className="form-group">
<label>Cover Image</label>
{coverImageUrl && (
<div className="image-preview">
@@ -248,6 +265,7 @@ function EditCookbook() {
name,
description: description || undefined,
coverImageUrl: '',
autoFilterCategories,
autoFilterTags
});
setCoverImageUrl('');
@@ -320,140 +338,137 @@ function EditCookbook() {
</div>
</div>
</div>
<div className="form-group">
<label>Auto-Add Categories</label>
<p className="help-text">
Recipes with these categories will be automatically added to this cookbook
</p>
<div className="filter-chips">
{autoFilterCategories.map(category => (
<span key={category} className="filter-chip">
{category}
<button type="button" onClick={() => handleRemoveCategory(category)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={categoryInput}
onChange={(e) => setCategoryInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCategory())}
placeholder="Add category"
list="available-categories"
/>
<button type="button" onClick={handleAddCategory} className="btn-add-filter">
+
</button>
</div>
<datalist id="available-categories">
{availableCategories.map(category => (
<option key={category} value={category} />
))}
</datalist>
</div>
{/* SECTION 2: ORGANIZE THIS COOKBOOK */}
<div className="form-section">
<div className="form-section-header">
<span className="form-section-icon">📋</span>
<div className="form-section-title">
<h2>Organize This Cookbook</h2>
<p>Tag this cookbook so you can find it later and include it in other cookbooks</p>
</div>
<div className="form-group">
<label>Auto-Add Tags</label>
<p className="help-text">
Recipes with these tags will be automatically added to this cookbook
</p>
<div className="filter-chips">
{autoFilterTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveTag(tag)}>×</button>
</span>
))}
</div>
<div className="form-section-content">
<div className="form-group">
<label>Cookbook Tags</label>
<p className="help-text">
Examples: "holiday", "meal-prep", "family-favorites", "quick-meals"
</p>
<div className="filter-chips">
{cookbookTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveCookbookTag(tag)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={cookbookTagInput}
onChange={(e) => setCookbookTagInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCookbookTag())}
placeholder="Add a tag"
list="available-cookbook-tags-edit"
/>
<button type="button" onClick={handleAddCookbookTag} className="btn-add-filter">
+
</button>
</div>
<datalist id="available-cookbook-tags-edit">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
<div className="input-with-button">
<input
type="text"
value={tagInput}
onChange={(e) => setTagInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddTag())}
placeholder="Add tag"
list="available-tags-edit"
/>
<button type="button" onClick={handleAddTag} className="btn-add-filter">
+
</button>
</div>
<datalist id="available-tags-edit">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
{/* SECTION 3: AUTO-ADD CONTENT (COLLAPSIBLE) */}
<div className={`form-section collapsible ${autoAddCollapsed ? 'collapsed' : ''}`}>
<div className="form-section-header" onClick={() => setAutoAddCollapsed(!autoAddCollapsed)}>
<span className="form-section-icon">⚡</span>
<div className="form-section-title">
<h2>Auto-Add Content (Optional)</h2>
<p>Automatically add recipes and cookbooks matching these criteria</p>
</div>
<span className="form-section-toggle">▼</span>
<div className="form-group">
<label>Cookbook Tags</label>
<p className="help-text">
Tags to categorize this cookbook (e.g., "holiday", "quick-meals", "vegetarian")
</p>
<div className="filter-chips">
{cookbookTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveCookbookTag(tag)}>×</button>
</span>
))}
</div>
<div className="form-section-content">
{/* Subsection: By Recipe Tags */}
<div className="form-subsection">
<div className="form-subsection-header">
<span className="form-subsection-icon">🍲</span>
<h3>By Recipe Tags</h3>
</div>
<p className="help-text">
Recipes tagged with any of these will be automatically added to this cookbook.
Example: Add "vegetarian" to auto-include all vegetarian recipes.
</p>
<div className="filter-chips">
{autoFilterTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveTag(tag)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={tagInput}
onChange={(e) => setTagInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddTag())}
placeholder="Add a tag"
list="available-tags-edit"
/>
<button type="button" onClick={handleAddTag} className="btn-add-filter">
+
</button>
</div>
<datalist id="available-tags-edit">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
<div className="input-with-button">
<input
type="text"
value={cookbookTagInput}
onChange={(e) => setCookbookTagInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCookbookTag())}
placeholder="Add tag"
list="available-cookbook-tags-edit"
/>
<button type="button" onClick={handleAddCookbookTag} className="btn-add-filter">
+
</button>
</div>
<datalist id="available-cookbook-tags-edit">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
{/* Subsection: By Cookbook Tags */}
<div className="form-subsection">
<div className="form-subsection-header">
<span className="form-subsection-icon">📚</span>
<h3>By Cookbook Tags</h3>
</div>
<p className="help-text">
Include other cookbooks tagged with these. Example: Add "italian" to include all Italian-themed cookbooks.
</p>
<div className="filter-chips">
{autoFilterCookbookTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveCookbookTagFilter(tag)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={cookbookTagFilterInput}
onChange={(e) => setCookbookTagFilterInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCookbookTagFilter())}
placeholder="Add a tag"
list="available-cookbook-filter-tags-edit"
/>
<button type="button" onClick={handleAddCookbookTagFilter} className="btn-add-filter">
+
</button>
</div>
<datalist id="available-cookbook-filter-tags-edit">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
<div className="form-group">
<label>Auto-Include Cookbooks by Tags</label>
<p className="help-text">
Other cookbooks with these tags will be automatically included in this cookbook
</p>
<div className="filter-chips">
{autoFilterCookbookTags.map(tag => (
<span key={tag} className="filter-chip">
{tag}
<button type="button" onClick={() => handleRemoveCookbookTagFilter(tag)}>×</button>
</span>
))}
</div>
<div className="input-with-button">
<input
type="text"
value={cookbookTagFilterInput}
onChange={(e) => setCookbookTagFilterInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && (e.preventDefault(), handleAddCookbookTagFilter())}
placeholder="Add tag to filter by"
list="available-cookbook-filter-tags-edit"
/>
<button type="button" onClick={handleAddCookbookTagFilter} className="btn-add-filter">
+
</button>
</div>
<datalist id="available-cookbook-filter-tags-edit">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
<div className="form-actions">

245
packages/web/src/pages/Family.tsx
View File

@@ -1,245 +0,0 @@
import { useEffect, useState, FormEvent } from 'react';
import {
familiesApi,
FamilySummary,
FamilyDetail,
FamilyMemberInfo,
} from '../services/api';
import { useAuth } from '../contexts/AuthContext';
import '../styles/Family.css';
export default function Family() {
const { user } = useAuth();
const [families, setFamilies] = useState<FamilySummary[]>([]);
const [selectedId, setSelectedId] = useState<string | null>(null);
const [detail, setDetail] = useState<FamilyDetail | null>(null);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
const [newFamilyName, setNewFamilyName] = useState('');
const [inviteEmail, setInviteEmail] = useState('');
const [inviteRole, setInviteRole] = useState<'MEMBER' | 'OWNER'>('MEMBER');
const [busy, setBusy] = useState(false);
async function loadFamilies() {
setError(null);
try {
const res = await familiesApi.list();
const list = res.data ?? [];
setFamilies(list);
if (!selectedId && list.length > 0) setSelectedId(list[0].id);
if (selectedId && !list.find((f) => f.id === selectedId)) {
setSelectedId(list[0]?.id ?? null);
}
} catch (e: any) {
setError(e?.response?.data?.error || e?.message || 'Failed to load families');
}
}
async function loadDetail(id: string) {
try {
const res = await familiesApi.get(id);
setDetail(res.data ?? null);
} catch (e: any) {
setError(e?.response?.data?.error || e?.message || 'Failed to load family');
setDetail(null);
}
}
useEffect(() => {
(async () => {
setLoading(true);
await loadFamilies();
setLoading(false);
})();
}, []);
useEffect(() => {
if (selectedId) loadDetail(selectedId);
else setDetail(null);
}, [selectedId]);
async function handleCreateFamily(e: FormEvent) {
e.preventDefault();
if (!newFamilyName.trim()) return;
setBusy(true);
setError(null);
try {
const res = await familiesApi.create(newFamilyName.trim());
setNewFamilyName('');
if (res.data) setSelectedId(res.data.id);
await loadFamilies();
} catch (e: any) {
setError(e?.response?.data?.error || 'Failed to create family');
} finally {
setBusy(false);
}
}
async function handleInvite(e: FormEvent) {
e.preventDefault();
if (!selectedId || !inviteEmail.trim()) return;
setBusy(true);
setError(null);
try {
await familiesApi.addMember(selectedId, inviteEmail.trim(), inviteRole);
setInviteEmail('');
setInviteRole('MEMBER');
await loadDetail(selectedId);
await loadFamilies();
} catch (e: any) {
setError(e?.response?.data?.error || 'Failed to add member');
} finally {
setBusy(false);
}
}
async function handleRemoveMember(member: FamilyMemberInfo) {
if (!selectedId) return;
const isSelf = member.userId === user?.id;
const confirmMsg = isSelf
? `Leave "${detail?.name}"?`
: `Remove ${member.name || member.email} from this family?`;
if (!confirm(confirmMsg)) return;
setBusy(true);
setError(null);
try {
await familiesApi.removeMember(selectedId, member.userId);
await loadFamilies();
if (isSelf) {
setSelectedId(null);
} else {
await loadDetail(selectedId);
}
} catch (e: any) {
setError(e?.response?.data?.error || 'Failed to remove member');
} finally {
setBusy(false);
}
}
async function handleDeleteFamily() {
if (!selectedId || !detail) return;
if (!confirm(`Delete family "${detail.name}"? Recipes and cookbooks in this family will lose their family assignment (they won't be deleted).`)) return;
setBusy(true);
setError(null);
try {
await familiesApi.remove(selectedId);
setSelectedId(null);
await loadFamilies();
} catch (e: any) {
setError(e?.response?.data?.error || 'Failed to delete family');
} finally {
setBusy(false);
}
}
if (loading) return <div className="family-page">Loading…</div>;
const isOwner = detail?.myRole === 'OWNER';
return (
<div className="family-page">
<h2>Families</h2>
{error && <div className="family-error">{error}</div>}
<section className="family-create">
<form onSubmit={handleCreateFamily} className="family-create-form">
<label>
Create a new family:
<input
type="text"
value={newFamilyName}
placeholder="e.g. Smith Family"
onChange={(e) => setNewFamilyName(e.target.value)}
disabled={busy}
/>
</label>
<button type="submit" disabled={busy || !newFamilyName.trim()}>Create</button>
</form>
</section>
<div className="family-layout">
<aside className="family-list">
<h3>Your families</h3>
{families.length === 0 && <p className="muted">You're not in any family yet.</p>}
<ul>
{families.map((f) => (
<li key={f.id} className={f.id === selectedId ? 'active' : ''}>
<button onClick={() => setSelectedId(f.id)}>
<strong>{f.name}</strong>
<span className="family-meta">{f.role} · {f.memberCount} member{f.memberCount === 1 ? '' : 's'}</span>
</button>
</li>
))}
</ul>
</aside>
<main className="family-detail">
{!detail && <p className="muted">Select a family to see its members.</p>}
{detail && (
<>
<div className="family-detail-header">
<h3>{detail.name}</h3>
{isOwner && (
<button className="danger" onClick={handleDeleteFamily} disabled={busy}>
Delete family
</button>
)}
</div>
<h4>Members</h4>
<table className="family-members">
<thead>
<tr><th>Name</th><th>Email</th><th>Role</th><th></th></tr>
</thead>
<tbody>
{detail.members.map((m) => (
<tr key={m.userId}>
<td>{m.name || '—'}</td>
<td>{m.email}</td>
<td>{m.role}</td>
<td>
{(isOwner || m.userId === user?.id) && (
<button onClick={() => handleRemoveMember(m)} disabled={busy}>
{m.userId === user?.id ? 'Leave' : 'Remove'}
</button>
)}
</td>
</tr>
))}
</tbody>
</table>
{isOwner && (
<>
<h4>Invite a member</h4>
<p className="muted">User must already have a Basil account on this server.</p>
<form onSubmit={handleInvite} className="family-invite-form">
<input
type="email"
placeholder="email@example.com"
value={inviteEmail}
onChange={(e) => setInviteEmail(e.target.value)}
disabled={busy}
required
/>
<select
value={inviteRole}
onChange={(e) => setInviteRole(e.target.value as 'MEMBER' | 'OWNER')}
disabled={busy}
>
<option value="MEMBER">Member</option>
<option value="OWNER">Owner</option>
</select>
<button type="submit" disabled={busy || !inviteEmail.trim()}>Add</button>
</form>
</>
)}
</>
)}
</main>
</div>
</div>
);
}

180
packages/web/src/pages/RecipeDetail.tsx
View File

@@ -1,7 +1,7 @@
import { useState, useEffect, useRef } from 'react';
import { useState, useEffect } from 'react';
import { useParams, useNavigate } from 'react-router-dom';
import { Recipe, Cookbook, Tag } from '@basil/shared';
import { recipesApi, cookbooksApi, tagsApi } from '../services/api';
import { Recipe, Cookbook } from '@basil/shared';
import { recipesApi, cookbooksApi } from '../services/api';
import { scaleIngredientString } from '../utils/ingredientParser';
function RecipeDetail() {
@@ -15,28 +15,12 @@ function RecipeDetail() {
const [cookbooks, setCookbooks] = useState<Cookbook[]>([]);
const [loadingCookbooks, setLoadingCookbooks] = useState(false);
// Quick tag management
const [availableTags, setAvailableTags] = useState<Tag[]>([]);
const [tagInput, setTagInput] = useState('');
const [savingTags, setSavingTags] = useState(false);
const tagInputRef = useRef<HTMLInputElement>(null);
useEffect(() => {
if (id) {
loadRecipe(id);
}
loadTags();
}, [id]);
const loadTags = async () => {
try {
const response = await tagsApi.getAll();
setAvailableTags(response.data || []);
} catch (err) {
console.error('Failed to load tags:', err);
}
};
const loadRecipe = async (recipeId: string) => {
try {
setLoading(true);
@@ -121,104 +105,6 @@ function RecipeDetail() {
}
};
const handleAddTag = async () => {
if (!id || !recipe || !tagInput.trim()) return;
const trimmedTag = tagInput.trim();
// Convert existing tags to string array (handle both string and object formats)
const existingTagNames = (recipe.tags || [])
.map(tagItem =>
typeof tagItem === 'string' ? tagItem : tagItem.tag?.name || tagItem.name
)
.filter((tag): tag is string => tag !== undefined);
// Check if tag already exists on recipe
if (existingTagNames.includes(trimmedTag)) {
setTagInput('');
// Keep focus in input field
setTimeout(() => tagInputRef.current?.focus(), 0);
return;
}
// Optimistically update the UI immediately
const optimisticTag = { tag: { id: 'temp', name: trimmedTag } };
setRecipe({
...recipe,
tags: [...(recipe.tags || []), optimisticTag]
});
setTagInput('');
// Keep focus in input field
setTimeout(() => tagInputRef.current?.focus(), 0);
try {
setSavingTags(true);
// Send array of tag names (strings) to API
const updatedTags = [...existingTagNames, trimmedTag];
await recipesApi.update(id, { tags: updatedTags });
// Reload available tags to include newly created ones
loadTags();
// Fetch the updated recipe to get the proper tag IDs, but don't reload the whole page
const response = await recipesApi.getById(id);
if (response.data) {
setRecipe(response.data);
// Restore focus after state update
setTimeout(() => tagInputRef.current?.focus(), 0);
}
} catch (err) {
console.error('Failed to add tag:', err);
alert('Failed to add tag');
// Revert optimistic update on error
await loadRecipe(id);
} finally {
setSavingTags(false);
// Ensure focus is maintained
setTimeout(() => tagInputRef.current?.focus(), 0);
}
};
const handleRemoveTag = async (tagToRemove: string) => {
if (!id || !recipe) return;
// Optimistically update the UI immediately
const previousTags = recipe.tags;
const updatedTagsOptimistic = (recipe.tags || []).filter(tagItem => {
const tagName = typeof tagItem === 'string' ? tagItem : tagItem.tag?.name || tagItem.name;
return tagName !== tagToRemove;
});
setRecipe({
...recipe,
tags: updatedTagsOptimistic
});
try {
setSavingTags(true);
// Convert existing tags to string array and filter out the removed tag
const existingTagNames = (previousTags || [])
.map(tagItem =>
typeof tagItem === 'string' ? tagItem : tagItem.tag?.name || tagItem.name
)
.filter((tag): tag is string => tag !== undefined);
const updatedTags = existingTagNames.filter(tag => tag !== tagToRemove);
await recipesApi.update(id, { tags: updatedTags });
// Fetch the updated recipe to get the proper tag structure
const response = await recipesApi.getById(id);
if (response.data) {
setRecipe(response.data);
}
} catch (err) {
console.error('Failed to remove tag:', err);
alert('Failed to remove tag');
// Revert optimistic update on error
await loadRecipe(id);
} finally {
setSavingTags(false);
}
};
if (loading) {
return <div className="loading">Loading recipe...</div>;
}
@@ -291,66 +177,6 @@ function RecipeDetail() {
</div>
</div>
)}
{/* Quick Tag Management - Inline */}
<div className="quick-tags-inline">
<div className="tags-display-inline">
<strong>Tags:</strong>
{recipe.tags && recipe.tags.length > 0 ? (
recipe.tags.map(tagItem => {
// Handle both string tags and object tags from API
const tagName = typeof tagItem === 'string' ? tagItem : tagItem.tag?.name || tagItem.name;
if (!tagName) return null; // Skip if tagName is undefined
return (
<span key={tagName} className="tag-chip-inline">
{tagName}
<button
onClick={() => handleRemoveTag(tagName)}
disabled={savingTags}
className="tag-remove-btn-inline"
title="Remove tag"
>
×
</button>
</span>
);
})
) : (
<span className="no-tags-inline">—</span>
)}
</div>
<div className="tag-input-inline">
<input
ref={tagInputRef}
type="text"
value={tagInput}
onChange={(e) => setTagInput(e.target.value)}
onKeyDown={(e) => {
if (e.key === 'Enter') {
e.preventDefault();
handleAddTag();
}
}}
placeholder="Add tag..."
disabled={savingTags}
list="available-tags-quick"
className="tag-input-small"
/>
<button
onClick={handleAddTag}
disabled={savingTags || !tagInput.trim()}
className="tag-add-btn-small"
title="Add tag"
>
+
</button>
<datalist id="available-tags-quick">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
</div>
</div>
{recipe.sourceUrl && (

63
packages/web/src/pages/RecipeForm.tsx
View File

@@ -17,6 +17,8 @@ function RecipeForm({ initialRecipe, onSubmit, onCancel }: RecipeFormProps) {
const [cookTime, setCookTime] = useState(initialRecipe?.cookTime?.toString() || '');
const [servings, setServings] = useState(initialRecipe?.servings?.toString() || '');
const [cuisine, setCuisine] = useState(initialRecipe?.cuisine || '');
const [categories, setCategories] = useState<string[]>(initialRecipe?.categories || []);
const [categoryInput, setCategoryInput] = useState('');
// Image handling
const [uploadingImage, setUploadingImage] = useState(false);
@@ -275,6 +277,28 @@ function RecipeForm({ initialRecipe, onSubmit, onCancel }: RecipeFormProps) {
};
// Category management
const handleAddCategory = () => {
const trimmedCategory = categoryInput.trim();
if (!trimmedCategory) return;
if (categories.includes(trimmedCategory)) {
setCategoryInput('');
return;
}
setCategories([...categories, trimmedCategory]);
setCategoryInput('');
};
const handleRemoveCategory = (categoryToRemove: string) => {
setCategories(categories.filter(cat => cat !== categoryToRemove));
};
const handleCategoryInputKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
if (e.key === 'Enter') {
e.preventDefault();
handleAddCategory();
}
};
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
@@ -285,6 +309,7 @@ function RecipeForm({ initialRecipe, onSubmit, onCancel }: RecipeFormProps) {
cookTime: cookTime ? parseInt(cookTime) : undefined,
servings: servings ? parseInt(servings) : undefined,
cuisine: cuisine || undefined,
categories: categories.length > 0 ? categories : undefined,
};
if (useSections) {
@@ -374,6 +399,44 @@ function RecipeForm({ initialRecipe, onSubmit, onCancel }: RecipeFormProps) {
/>
</div>
<div className="form-group">
<label htmlFor="categories">Categories</label>
<div className="tags-input-container">
<div className="tags-list">
{categories.map((category) => (
<span key={category} className="tag">
{category}
<button
type="button"
onClick={() => handleRemoveCategory(category)}
className="tag-remove"
title="Remove category"
>
×
</button>
</span>
))}
</div>
<div className="tag-input-row">
<input
type="text"
id="categories"
value={categoryInput}
onChange={(e) => setCategoryInput(e.target.value)}
onKeyDown={handleCategoryInputKeyDown}
placeholder="Add a category and press Enter"
/>
<button
type="button"
onClick={handleAddCategory}
className="btn-add-tag"
>
Add Category
</button>
</div>
</div>
</div>
{/* Image Upload (only for editing existing recipes) */}
{initialRecipe?.id && (
<div className="form-group image-upload-section">

102
packages/web/src/pages/RecipeImport.tsx
View File

@@ -1,7 +1,7 @@
import { useState, useEffect, useRef } from 'react';
import { useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Recipe, Tag } from '@basil/shared';
import { recipesApi, tagsApi } from '../services/api';
import { Recipe } from '@basil/shared';
import { recipesApi } from '../services/api';
function RecipeImport() {
const navigate = useNavigate();
@@ -10,25 +10,6 @@ function RecipeImport() {
const [error, setError] = useState<string | null>(null);
const [importedRecipe, setImportedRecipe] = useState<Partial<Recipe> | null>(null);
// Tag management
const [availableTags, setAvailableTags] = useState<Tag[]>([]);
const [tagInput, setTagInput] = useState('');
const [selectedTags, setSelectedTags] = useState<string[]>([]);
const tagInputRef = useRef<HTMLInputElement>(null);
useEffect(() => {
loadTags();
}, []);
const loadTags = async () => {
try {
const response = await tagsApi.getAll();
setAvailableTags(response.data || []);
} catch (err) {
console.error('Failed to load tags:', err);
}
};
const handleImport = async (e: React.FormEvent) => {
e.preventDefault();
@@ -55,30 +36,12 @@ function RecipeImport() {
}
};
const handleAddTag = () => {
const trimmedTag = tagInput.trim();
if (trimmedTag && !selectedTags.includes(trimmedTag)) {
setSelectedTags([...selectedTags, trimmedTag]);
setTagInput('');
// Keep focus in input field
setTimeout(() => tagInputRef.current?.focus(), 0);
}
};
const handleRemoveTag = (tagToRemove: string) => {
setSelectedTags(selectedTags.filter(tag => tag !== tagToRemove));
};
const handleSave = async () => {
if (!importedRecipe) return;
try {
setLoading(true);
const recipeWithTags = {
...importedRecipe,
tags: selectedTags.length > 0 ? selectedTags : undefined
};
const response = await recipesApi.create(recipeWithTags);
const response = await recipesApi.create(importedRecipe);
if (response.data) {
navigate(`/recipes/${response.data.id}`);
}
@@ -118,63 +81,6 @@ function RecipeImport() {
<div className="recipe-detail" style={{ marginTop: '2rem' }}>
<h3>Imported Recipe Preview</h3>
{/* Tag Management Section - Moved to top */}
<div className="import-tags-section" style={{ marginTop: '1rem', marginBottom: '2rem' }}>
<h4>Add Tags</h4>
<div className="import-tags-inline">
<div className="import-tags-display">
{selectedTags.length > 0 ? (
selectedTags.map(tag => (
<span key={tag} className="tag-chip-inline">
{tag}
<button
type="button"
onClick={() => handleRemoveTag(tag)}
className="tag-remove-btn-inline"
title="Remove tag"
>
×
</button>
</span>
))
) : (
<span className="no-tags-inline">No tags yet</span>
)}
</div>
<div className="import-tag-input">
<input
ref={tagInputRef}
type="text"
value={tagInput}
onChange={(e) => setTagInput(e.target.value)}
onKeyDown={(e) => {
if (e.key === 'Enter') {
e.preventDefault();
handleAddTag();
}
}}
placeholder="Add tag..."
list="import-available-tags"
className="tag-input-small"
/>
<button
type="button"
onClick={handleAddTag}
disabled={!tagInput.trim()}
className="tag-add-btn-small"
title="Add tag"
>
+
</button>
<datalist id="import-available-tags">
{availableTags.map(tag => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
</div>
</div>
</div>
{importedRecipe.imageUrl && (
<img src={importedRecipe.imageUrl} alt={importedRecipe.title} />
)}

155
packages/web/src/pages/RecipeList.test.tsx
View File

@@ -404,9 +404,8 @@ describe('RecipeList Component', () => {
});
});
describe('Search Functionality', () => {
it('should render unified search input', async () => {
describe('Size Slider', () => {
it('should render size slider', async () => {
vi.mocked(recipesApi.getAll).mockResolvedValue({
data: createMockRecipes(3) as any,
total: 3,
@@ -417,8 +416,129 @@ describe('RecipeList Component', () => {
renderWithRouter(<RecipeList />);
await waitFor(() => {
expect(screen.getByPlaceholderText('Search recipes by title or tag...')).toBeInTheDocument();
expect(screen.getByText('Size:')).toBeInTheDocument();
});
const slider = screen.getByRole('slider');
expect(slider).toBeInTheDocument();
expect(slider).toHaveAttribute('min', '0');
expect(slider).toHaveAttribute('max', '6');
});
it('should display size label', async () => {
vi.mocked(recipesApi.getAll).mockResolvedValue({
data: createMockRecipes(3) as any,
total: 3,
page: 1,
pageSize: 24,
});
renderWithRouter(<RecipeList />);
await waitFor(() => {
// Default size is 3 which is "Default"
expect(screen.getByText('Default')).toBeInTheDocument();
});
});
it.skip('should change image height when slider changes', async () => {
vi.mocked(recipesApi.getAll).mockResolvedValue({
data: [{ id: '1', title: 'Recipe 1', imageUrl: '/test.jpg' }] as any,
total: 1,
page: 1,
pageSize: 24,
});
renderWithRouter(<RecipeList />);
await waitFor(() => {
expect(screen.getByText('Recipe 1')).toBeInTheDocument();
});
const slider = screen.getByRole('slider');
fireEvent.change(slider, { target: { value: '6' } });
await waitFor(() => {
// XXL size has imageHeight of 333px
const image = screen.getByAltText('Recipe 1');
expect(image).toHaveStyle({ height: '333px' });
});
});
it('should save size to localStorage', async () => {
vi.mocked(recipesApi.getAll).mockResolvedValue({
data: createMockRecipes(3) as any,
total: 3,
page: 1,
pageSize: 24,
});
renderWithRouter(<RecipeList />);
await waitFor(() => {
expect(screen.getByText('Recipe 1')).toBeInTheDocument();
});
const slider = screen.getByRole('slider');
fireEvent.change(slider, { target: { value: '5' } });
expect(Storage.prototype.setItem).toHaveBeenCalledWith(
'basil_recipes_cardSize',
'5'
);
});
});
describe('Search Functionality', () => {
it('should render search input', async () => {
vi.mocked(recipesApi.getAll).mockResolvedValue({
data: createMockRecipes(3) as any,
total: 3,
page: 1,
pageSize: 24,
});
renderWithRouter(<RecipeList />);
await waitFor(() => {
expect(screen.getByPlaceholderText('Search by title...')).toBeInTheDocument();
});
});
it('should render search type toggle buttons', async () => {
vi.mocked(recipesApi.getAll).mockResolvedValue({
data: createMockRecipes(3) as any,
total: 3,
page: 1,
pageSize: 24,
});
renderWithRouter(<RecipeList />);
await waitFor(() => {
expect(screen.getByRole('button', { name: 'Title' })).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Tag' })).toBeInTheDocument();
});
});
it('should switch to tag search when Tag button clicked', async () => {
vi.mocked(recipesApi.getAll).mockResolvedValue({
data: createMockRecipes(3) as any,
total: 3,
page: 1,
pageSize: 24,
});
renderWithRouter(<RecipeList />);
await waitFor(() => {
expect(screen.getByRole('button', { name: 'Tag' })).toBeInTheDocument();
});
const tagButton = screen.getByRole('button', { name: 'Tag' });
await userEvent.click(tagButton);
expect(screen.getByPlaceholderText('Search by tag...')).toBeInTheDocument();
});
it('should load available tags for autocomplete', async () => {
@@ -494,7 +614,7 @@ describe('RecipeList Component', () => {
});
});
it('should initialize unified search from URL params', async () => {
it('should initialize tag search from URL params', async () => {
vi.mocked(recipesApi.getAll).mockResolvedValue({
data: createMockRecipes(12) as any,
total: 100,
@@ -502,12 +622,12 @@ describe('RecipeList Component', () => {
pageSize: 24,
});
renderWithRouter(<RecipeList />, ['/recipes?search=Italian']);
renderWithRouter(<RecipeList />, ['/recipes?search=Italian&type=tag']);
await waitFor(() => {
expect(recipesApi.getAll).toHaveBeenCalledWith(
expect.objectContaining({
search: 'Italian',
tag: 'Italian',
})
);
});
@@ -536,6 +656,27 @@ describe('RecipeList Component', () => {
});
});
it('should load card size from localStorage', async () => {
Storage.prototype.getItem = vi.fn((key: string) => {
if (key === 'basil_recipes_cardSize') return '5';
return null;
});
vi.mocked(recipesApi.getAll).mockResolvedValue({
data: [{ id: '1', title: 'Recipe 1', imageUrl: '/test.jpg' }] as any,
total: 1,
page: 1,
pageSize: 24,
});
renderWithRouter(<RecipeList />);
await waitFor(() => {
// Size 5 (XL) should be displayed
const sizeLabel = screen.getByText('XL');
expect(sizeLabel).toBeInTheDocument();
});
});
it('should load items per page from localStorage', async () => {
Storage.prototype.getItem = vi.fn((key: string) => {

96
packages/web/src/pages/RecipeList.tsx
View File

@@ -4,11 +4,23 @@ import { Recipe, Tag } from '@basil/shared';
import { recipesApi, tagsApi } from '../services/api';
import '../styles/RecipeList.css';
// Size presets for card display
const SIZE_PRESETS: Record<number, { name: string; minWidth: number; imageHeight: number }> = {
0: { name: 'XS', minWidth: 150, imageHeight: 100 },
1: { name: 'S', minWidth: 200, imageHeight: 133 },
2: { name: 'M', minWidth: 250, imageHeight: 167 },
3: { name: 'Default', minWidth: 300, imageHeight: 200 },
4: { name: 'L', minWidth: 350, imageHeight: 233 },
5: { name: 'XL', minWidth: 400, imageHeight: 267 },
6: { name: 'XXL', minWidth: 500, imageHeight: 333 },
};
const ITEMS_PER_PAGE_OPTIONS = [12, 24, 48, -1]; // -1 = All
// LocalStorage keys
const LS_ITEMS_PER_PAGE = 'basil_recipes_itemsPerPage';
const LS_COLUMN_COUNT = 'basil_recipes_columnCount';
const LS_CARD_SIZE = 'basil_recipes_cardSize';
function RecipeList() {
const [recipes, setRecipes] = useState<Recipe[]>([]);
@@ -39,10 +51,22 @@ function RecipeList() {
}
return 5;
});
const [cardSize, setCardSize] = useState(() => {
const saved = localStorage.getItem(LS_CARD_SIZE);
if (saved) {
const val = parseInt(saved);
if (val >= 0 && val <= 6) return val;
}
return 3;
});
// Search state
const [searchInput, setSearchInput] = useState(() => searchParams.get('search') || '');
const [debouncedSearch, setDebouncedSearch] = useState(searchInput);
const [searchType, setSearchType] = useState<'title' | 'tag'>(() => {
const type = searchParams.get('type');
return type === 'tag' ? 'tag' : 'title';
});
const [availableTags, setAvailableTags] = useState<Tag[]>([]);
// Load tags for autocomplete
@@ -69,7 +93,7 @@ function RecipeList() {
// Reset page when search changes
useEffect(() => {
setCurrentPage(1);
}, [debouncedSearch]);
}, [debouncedSearch, searchType]);
// Save preferences to localStorage
useEffect(() => {
@@ -80,6 +104,10 @@ function RecipeList() {
localStorage.setItem(LS_COLUMN_COUNT, columnCount.toString());
}, [columnCount]);
useEffect(() => {
localStorage.setItem(LS_CARD_SIZE, cardSize.toString());
}, [cardSize]);
// Update URL params
useEffect(() => {
const params = new URLSearchParams();
@@ -87,9 +115,10 @@ function RecipeList() {
if (itemsPerPage !== 24) params.set('limit', itemsPerPage.toString());
if (debouncedSearch) {
params.set('search', debouncedSearch);
if (searchType === 'tag') params.set('type', 'tag');
}
setSearchParams(params, { replace: true });
}, [currentPage, itemsPerPage, debouncedSearch, setSearchParams]);
}, [currentPage, itemsPerPage, debouncedSearch, searchType, setSearchParams]);
// Load recipes
const loadRecipes = useCallback(async () => {
@@ -99,13 +128,18 @@ function RecipeList() {
page: number;
limit: number;
search?: string;
tag?: string;
} = {
page: currentPage,
limit: itemsPerPage === -1 ? 10000 : itemsPerPage,
};
if (debouncedSearch) {
params.search = debouncedSearch;
if (searchType === 'title') {
params.search = debouncedSearch;
} else {
params.tag = debouncedSearch;
}
}
const response = await recipesApi.getAll(params);
@@ -118,7 +152,7 @@ function RecipeList() {
} finally {
setLoading(false);
}
}, [currentPage, itemsPerPage, debouncedSearch]);
}, [currentPage, itemsPerPage, debouncedSearch, searchType]);
useEffect(() => {
loadRecipes();
@@ -132,8 +166,6 @@ function RecipeList() {
gridTemplateColumns: `repeat(${columnCount}, 1fr)`,
};
const gridClassName = `recipe-grid-enhanced columns-${columnCount}`;
const handlePageChange = (newPage: number) => {
setCurrentPage(newPage);
window.scrollTo({ top: 0, behavior: 'smooth' });
@@ -144,6 +176,11 @@ function RecipeList() {
setCurrentPage(1);
};
const handleSearchTypeChange = (type: 'title' | 'tag') => {
setSearchType(type);
setSearchInput('');
};
if (loading && recipes.length === 0) {
return <div className="loading">Loading recipes...</div>;
}
@@ -164,16 +201,32 @@ function RecipeList() {
<div className="search-input-wrapper">
<input
type="text"
placeholder="Search recipes by title or tag..."
placeholder={searchType === 'title' ? 'Search by title...' : 'Search by tag...'}
value={searchInput}
onChange={(e) => setSearchInput(e.target.value)}
list="tag-suggestions"
list={searchType === 'tag' ? 'tag-suggestions' : undefined}
/>
<datalist id="tag-suggestions">
{availableTags.map((tag) => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
{searchType === 'tag' && (
<datalist id="tag-suggestions">
{availableTags.map((tag) => (
<option key={tag.id} value={tag.name} />
))}
</datalist>
)}
</div>
<div className="search-type-toggle">
<button
className={searchType === 'title' ? 'active' : ''}
onClick={() => handleSearchTypeChange('title')}
>
Title
</button>
<button
className={searchType === 'tag' ? 'active' : ''}
onClick={() => handleSearchTypeChange('tag')}
>
Tag
</button>
</div>
</div>
</div>
@@ -195,6 +248,21 @@ function RecipeList() {
))}
</div>
</div>
<div className="control-group">
<label>Size:</label>
<div className="size-slider-wrapper">
<input
type="range"
min="0"
max="6"
value={cardSize}
onChange={(e) => setCardSize(parseInt(e.target.value))}
className="size-slider"
/>
<span className="size-label">{SIZE_PRESETS[cardSize].name}</span>
</div>
</div>
</div>
{/* Pagination Controls */}
@@ -245,7 +313,7 @@ function RecipeList() {
)}
</div>
) : (
<div className={gridClassName} style={gridStyle}>
<div className="recipe-grid-enhanced" style={gridStyle}>
{recipes.map((recipe) => (
<div
key={recipe.id}

71
packages/web/src/pages/UnifiedEditRecipe.tsx
View File

@@ -27,6 +27,8 @@ function UnifiedEditRecipe() {
const [cookTime, setCookTime] = useState('');
const [servings, setServings] = useState('');
const [cuisine, setCuisine] = useState('');
const [recipeCategories, setRecipeCategories] = useState<string[]>([]);
const [categoryInput, setCategoryInput] = useState('');
const [recipeTags, setRecipeTags] = useState<string[]>([]);
const [tagInput, setTagInput] = useState('');
const [availableTags, setAvailableTags] = useState<Tag[]>([]);
@@ -90,6 +92,7 @@ function UnifiedEditRecipe() {
setCookTime(loadedRecipe.cookTime?.toString() || '');
setServings(loadedRecipe.servings?.toString() || '');
setCuisine(loadedRecipe.cuisine || '');
setRecipeCategories(loadedRecipe.categories || []);
// Handle tags - API returns array of {tag: {id, name}} objects, we need string[]
const tagNames = (loadedRecipe.tags as any)?.map((t: any) => t.tag?.name || t).filter(Boolean) || [];
@@ -479,6 +482,7 @@ function UnifiedEditRecipe() {
cookTime: cookTime ? parseInt(cookTime) : undefined,
servings: servings ? parseInt(servings) : undefined,
cuisine: cuisine || undefined,
categories: recipeCategories.length > 0 ? recipeCategories : undefined,
tags: recipeTags,
};
@@ -581,6 +585,7 @@ function UnifiedEditRecipe() {
}
setHasChanges(false);
alert('Recipe saved successfully!');
navigate(`/recipes/${id}`);
} catch (err) {
console.error('Error saving recipe:', err);
@@ -597,6 +602,33 @@ function UnifiedEditRecipe() {
navigate(`/recipes/${id}`);
};
// Category management functions
const handleAddCategory = (categoryName: string) => {
const trimmedCategory = categoryName.trim();
if (!trimmedCategory) return;
if (recipeCategories.includes(trimmedCategory)) {
setCategoryInput('');
return; // Category already exists
}
setRecipeCategories([...recipeCategories, trimmedCategory]);
setCategoryInput('');
setHasChanges(true);
};
const handleRemoveCategory = (categoryToRemove: string) => {
setRecipeCategories(recipeCategories.filter(cat => cat !== categoryToRemove));
setHasChanges(true);
};
const handleCategoryInputKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
if (e.key === 'Enter') {
e.preventDefault();
handleAddCategory(categoryInput);
}
};
// Tag management functions
const handleAddTag = async (tagName: string) => {
const trimmedTag = tagName.trim();
@@ -808,6 +840,45 @@ function UnifiedEditRecipe() {
</div>
{/* Categories */}
<div className="form-group">
<label htmlFor="categories">Categories</label>
<div className="tags-input-container">
<div className="tags-list">
{recipeCategories.map((category) => (
<span key={category} className="tag">
{category}
<button
type="button"
onClick={() => handleRemoveCategory(category)}
className="tag-remove"
title="Remove category"
>
×
</button>
</span>
))}
</div>
<div className="tag-input-row">
<input
type="text"
id="categories"
value={categoryInput}
onChange={(e) => setCategoryInput(e.target.value)}
onKeyDown={handleCategoryInputKeyDown}
placeholder="Add a category and press Enter"
/>
<button
type="button"
onClick={() => handleAddCategory(categoryInput)}
className="btn-add-tag"
>
Add Category
</button>
</div>
</div>
</div>
{/* Tags */}
<div className="form-group">
<label htmlFor="tags">Tags</label>

63
packages/web/src/services/api.ts
View File

@@ -237,67 +237,4 @@ export const mealPlansApi = {
},
};
export type FamilyRole = 'OWNER' | 'MEMBER';
export interface FamilySummary {
id: string;
name: string;
role: FamilyRole;
memberCount: number;
joinedAt: string;
}
export interface FamilyMemberInfo {
userId: string;
email: string;
name: string | null;
avatar: string | null;
role: FamilyRole;
joinedAt: string;
}
export interface FamilyDetail {
id: string;
name: string;
createdAt: string;
updatedAt: string;
myRole: FamilyRole | null;
members: FamilyMemberInfo[];
}
export const familiesApi = {
list: async (): Promise<ApiResponse<FamilySummary[]>> => {
const response = await api.get('/families');
return response.data;
},
create: async (name: string): Promise<ApiResponse<{ id: string; name: string }>> => {
const response = await api.post('/families', { name });
return response.data;
},
get: async (id: string): Promise<ApiResponse<FamilyDetail>> => {
const response = await api.get(`/families/${id}`);
return response.data;
},
rename: async (id: string, name: string): Promise<ApiResponse<{ id: string; name: string }>> => {
const response = await api.put(`/families/${id}`, { name });
return response.data;
},
remove: async (id: string): Promise<ApiResponse<void>> => {
const response = await api.delete(`/families/${id}`);
return response.data;
},
addMember: async (
familyId: string,
email: string,
role: FamilyRole = 'MEMBER',
): Promise<ApiResponse<FamilyMemberInfo>> => {
const response = await api.post(`/families/${familyId}/members`, { email, role });
return response.data;
},
removeMember: async (familyId: string, userId: string): Promise<ApiResponse<void>> => {
const response = await api.delete(`/families/${familyId}/members/${userId}`);
return response.data;
},
};
export default api;

318
packages/web/src/styles/CookbookDetail.css
View File

@@ -261,118 +261,6 @@
background-color: #616161;
}
/* Toolbar and Pagination Controls */
.cookbook-toolbar {
display: flex;
flex-wrap: wrap;
gap: 1.5rem;
align-items: center;
justify-content: space-between;
background: white;
padding: 0.75rem 1rem;
border-radius: 8px;
margin-bottom: 1.5rem;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
border: 1px solid #e0e0e0;
}
.display-controls,
.pagination-controls {
display: flex;
gap: 1rem;
align-items: center;
flex-wrap: wrap;
}
.control-group {
display: flex;
align-items: center;
gap: 0.5rem;
}
.control-group label {
font-size: 0.8rem;
font-weight: 500;
color: #666;
white-space: nowrap;
}
.column-buttons,
.items-per-page {
display: flex;
gap: 0.25rem;
border: 1px solid #d0d0d0;
border-radius: 6px;
overflow: hidden;
}
.column-buttons button,
.items-per-page button {
min-width: 2rem;
padding: 0.35rem 0.6rem;
border: none;
background: white;
font-size: 0.8rem;
font-weight: 500;
cursor: pointer;
transition: all 0.15s;
color: #555;
}
.column-buttons button:not(:last-child),
.items-per-page button:not(:last-child) {
border-right: 1px solid #d0d0d0;
}
.column-buttons button:hover,
.items-per-page button:hover {
background-color: #f5f5f5;
}
.column-buttons button.active,
.items-per-page button.active {
background-color: #2e7d32;
color: white;
}
.page-navigation {
display: flex;
gap: 0.5rem;
align-items: center;
}
.page-navigation button {
padding: 0.35rem 0.75rem;
border: 1px solid #d0d0d0;
background: white;
color: #555;
border-radius: 6px;
font-size: 0.8rem;
font-weight: 500;
cursor: pointer;
transition: all 0.15s;
}
.page-navigation button:hover:not(:disabled) {
background-color: #f5f5f5;
border-color: #2e7d32;
color: #2e7d32;
}
.page-navigation button:disabled {
opacity: 0.4;
cursor: not-allowed;
}
.page-info {
font-size: 0.75rem;
font-weight: 500;
color: #666;
white-space: nowrap;
margin: 0 0.25rem;
}
/* Results Section */
.results-section {
@@ -387,131 +275,82 @@
.recipes-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
gap: 1.5rem;
}
.recipe-card {
cursor: pointer;
border: 1px solid #e0e0e0;
border-radius: 8px;
overflow: hidden;
background: white;
border-radius: 12px;
overflow: hidden;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
position: relative;
transition: transform 0.2s, box-shadow 0.2s;
display: flex;
flex-direction: column;
aspect-ratio: 1 / 1;
}
.recipe-card:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
transform: translateY(-4px);
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15);
}
.recipe-card > div:first-child {
cursor: pointer;
display: flex;
flex-direction: column;
flex: 1;
min-height: 0;
}
.recipe-card img.recipe-image {
.recipe-image {
width: 100%;
height: 60%;
height: 200px;
object-fit: cover;
display: block;
flex-shrink: 0;
}
.recipe-image-placeholder {
width: 100%;
height: 60%;
height: 200px;
background: linear-gradient(135deg, #ffb74d 0%, #ff9800 100%);
display: flex;
align-items: center;
justify-content: center;
font-size: 3rem;
flex-shrink: 0;
font-size: 4rem;
}
.recipe-info {
padding: 0.5rem;
flex: 1;
display: flex;
flex-direction: column;
justify-content: space-between;
overflow: hidden;
min-height: 0;
padding: 1.25rem;
}
.recipe-info h3 {
margin: 0 0 0.25rem 0;
font-size: 0.75rem;
line-height: 1.2;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
flex-shrink: 0;
font-size: 1.2rem;
color: #212121;
margin: 0 0 0.5rem 0;
}
.recipe-info .description {
margin: 0;
font-size: 0.65rem;
font-size: 0.9rem;
color: #666;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
flex-shrink: 1;
margin: 0 0 0.75rem 0;
line-height: 1.4;
}
.recipe-meta {
display: flex;
gap: 0.4rem;
font-size: 0.6rem;
color: #888;
flex-shrink: 0;
margin-top: auto;
gap: 1rem;
font-size: 0.85rem;
color: #757575;
margin-bottom: 0.75rem;
}
.recipe-tags {
display: none;
display: flex;
flex-wrap: wrap;
gap: 0.5rem;
}
/* Column-specific styles for recipes */
.columns-3 .recipe-info h3 {
font-size: 0.95rem;
}
.columns-3 .recipe-info .description {
.recipe-tags .tag {
padding: 0.25rem 0.75rem;
background-color: #e8f5e9;
color: #2e7d32;
border-radius: 12px;
font-size: 0.8rem;
-webkit-line-clamp: 2;
}
.columns-3 .recipe-meta {
font-size: 0.75rem;
}
.columns-5 .recipe-info h3 {
font-size: 0.85rem;
}
.columns-5 .recipe-info .description {
font-size: 0.75rem;
-webkit-line-clamp: 2;
}
.columns-5 .recipe-meta {
font-size: 0.7rem;
}
.columns-7 .recipe-info .description,
.columns-9 .recipe-info .description {
display: none;
font-weight: 500;
}
.remove-recipe-btn {
@@ -588,26 +427,9 @@
width: 100%;
}
.cookbook-toolbar {
flex-direction: column;
align-items: stretch;
padding: 1rem;
}
.display-controls,
.pagination-controls {
flex-direction: column;
align-items: stretch;
gap: 1rem;
}
.recipes-grid {
grid-template-columns: 1fr;
}
.included-cookbooks-section .cookbooks-grid {
grid-template-columns: 1fr;
}
}
/* Included Cookbooks Section */
@@ -624,19 +446,11 @@
font-size: 1.5rem;
}
.included-cookbooks-section .cookbooks-grid {
display: grid;
gap: 1.5rem;
}
.cookbook-card.nested {
border: 2px solid #e0e0e0;
background: white;
cursor: pointer;
transition: all 0.2s ease;
aspect-ratio: 1 / 1;
display: flex;
flex-direction: column;
}
.cookbook-card.nested:hover {
@@ -644,75 +458,3 @@
box-shadow: 0 4px 12px rgba(0,0,0,0.15);
transform: translateY(-2px);
}
.cookbook-card.nested .cookbook-cover,
.cookbook-card.nested .cookbook-cover-placeholder {
height: 50%;
font-size: 2.5rem;
}
.cookbook-card.nested .cookbook-info {
padding: 0.5rem;
display: flex;
flex-direction: column;
flex: 1;
min-height: 0;
overflow: hidden;
}
.cookbook-card.nested .cookbook-info h3 {
font-size: 0.75rem;
color: #212121;
margin: 0 0 0.25rem 0;
line-height: 1.2;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
flex-shrink: 0;
}
.cookbook-card.nested .cookbook-info .description {
display: none;
}
.cookbook-card.nested .cookbook-stats {
margin-top: auto;
display: flex;
flex-direction: column;
gap: 0.1rem;
}
.cookbook-card.nested .recipe-count,
.cookbook-card.nested .cookbook-count {
font-size: 0.6rem;
color: #2e7d32;
font-weight: 600;
margin: 0;
line-height: 1.2;
white-space: nowrap;
}
.cookbook-card.nested .cookbook-tags {
display: none;
}
/* Column-specific styles for nested cookbooks */
.cookbooks-grid.columns-3 .cookbook-card.nested .cookbook-info h3 {
font-size: 0.95rem;
}
.cookbooks-grid.columns-3 .cookbook-card.nested .recipe-count,
.cookbooks-grid.columns-3 .cookbook-card.nested .cookbook-count {
font-size: 0.75rem;
}
.cookbooks-grid.columns-5 .cookbook-card.nested .cookbook-info h3 {
font-size: 0.85rem;
}
.cookbooks-grid.columns-5 .cookbook-card.nested .recipe-count,
.cookbooks-grid.columns-5 .cookbook-card.nested .cookbook-count {
font-size: 0.7rem;
}

446
packages/web/src/styles/Cookbooks.css
View File

@@ -26,18 +26,6 @@
gap: 1rem;
}
/* Page-level Controls */
.page-toolbar {
display: flex;
justify-content: flex-start;
background: white;
padding: 0.75rem 1rem;
border-radius: 8px;
margin-bottom: 2rem;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
border: 1px solid #e0e0e0;
}
/* Cookbooks Section */
.cookbooks-section {
margin-bottom: 3rem;
@@ -49,124 +37,9 @@
margin-bottom: 1.5rem;
}
/* Pagination Controls */
.pagination-toolbar {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: flex-end;
background: white;
padding: 0.75rem 1rem;
border-radius: 8px;
margin-bottom: 1.5rem;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
border: 1px solid #e0e0e0;
}
.display-controls,
.pagination-controls {
display: flex;
gap: 1rem;
align-items: center;
flex-wrap: wrap;
}
.control-group {
display: flex;
align-items: center;
gap: 0.5rem;
}
.control-group label {
font-size: 0.8rem;
font-weight: 500;
color: #666;
white-space: nowrap;
}
.column-buttons,
.items-per-page {
display: flex;
gap: 0.25rem;
border: 1px solid #d0d0d0;
border-radius: 6px;
overflow: hidden;
}
.column-buttons button,
.items-per-page button {
min-width: 2rem;
padding: 0.35rem 0.6rem;
border: none;
background: white;
font-size: 0.8rem;
font-weight: 500;
cursor: pointer;
transition: all 0.15s;
color: #555;
}
.column-buttons button:not(:last-child),
.items-per-page button:not(:last-child) {
border-right: 1px solid #d0d0d0;
}
.column-buttons button:hover,
.items-per-page button:hover {
background-color: #f5f5f5;
}
.column-buttons button.active,
.items-per-page button.active {
background-color: #2e7d32;
color: white;
}
.page-navigation {
display: flex;
gap: 0.5rem;
align-items: center;
}
.page-navigation button {
padding: 0.35rem 0.75rem;
border: 1px solid #d0d0d0;
background: white;
color: #555;
border-radius: 6px;
font-size: 0.8rem;
font-weight: 500;
cursor: pointer;
transition: all 0.15s;
}
.page-navigation button:hover:not(:disabled) {
background-color: #f5f5f5;
border-color: #2e7d32;
color: #2e7d32;
}
.page-navigation button:disabled {
opacity: 0.4;
cursor: not-allowed;
}
.page-info {
font-size: 0.75rem;
font-weight: 500;
color: #666;
white-space: nowrap;
margin: 0 0.25rem;
}
.results-count {
font-size: 0.95rem;
color: #757575;
margin-bottom: 1.5rem;
}
.cookbooks-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
gap: 1.5rem;
}
@@ -177,9 +50,6 @@
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
cursor: pointer;
transition: transform 0.2s, box-shadow 0.2s;
display: flex;
flex-direction: column;
aspect-ratio: 1 / 1;
}
.cookbook-card:hover {
@@ -189,86 +59,42 @@
.cookbook-cover {
width: 100%;
height: 50%;
height: 200px;
object-fit: cover;
flex-shrink: 0;
}
.cookbook-cover-placeholder {
width: 100%;
height: 50%;
height: 200px;
background: linear-gradient(135deg, #81c784 0%, #4caf50 100%);
display: flex;
align-items: center;
justify-content: center;
font-size: 2.5rem;
flex-shrink: 0;
font-size: 4rem;
}
.cookbook-info {
padding: 0.5rem;
display: flex;
flex-direction: column;
flex: 1;
min-height: 0;
overflow: hidden;
padding: 1.25rem;
}
.cookbook-info h3 {
font-size: 0.75rem;
font-size: 1.3rem;
color: #212121;
margin: 0 0 0.25rem 0;
line-height: 1.2;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
flex-shrink: 0;
margin: 0 0 0.5rem 0;
}
.cookbook-info .description {
display: none;
font-size: 0.95rem;
color: #666;
margin: 0 0 0.75rem 0;
line-height: 1.4;
}
.cookbook-info .cookbook-stats {
margin-top: auto;
display: flex;
flex-direction: column;
gap: 0.1rem;
}
.cookbook-info .recipe-count,
.cookbook-info .cookbook-count {
font-size: 0.6rem;
.cookbook-info .recipe-count {
font-size: 0.9rem;
color: #2e7d32;
font-weight: 600;
margin: 0;
line-height: 1.2;
white-space: nowrap;
}
.cookbook-info .cookbook-tags {
display: none;
}
/* Column-specific styles for Cookbooks */
.cookbooks-grid.columns-3 .cookbook-info h3 {
font-size: 0.95rem;
}
.cookbooks-grid.columns-3 .recipe-count,
.cookbooks-grid.columns-3 .cookbook-count {
font-size: 0.75rem;
}
.cookbooks-grid.columns-5 .cookbook-info h3 {
font-size: 0.85rem;
}
.cookbooks-grid.columns-5 .recipe-count,
.cookbooks-grid.columns-5 .cookbook-count {
font-size: 0.7rem;
}
/* Recent Recipes Section */
@@ -276,133 +102,77 @@
margin-top: 3rem;
}
.recent-recipes-section h2 {
font-size: 1.8rem;
color: #1b5e20;
margin: 0;
}
.section-title-row {
.section-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 1.5rem;
}
.section-header h2 {
font-size: 1.8rem;
color: #1b5e20;
margin: 0;
}
.recipes-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
gap: 1.5rem;
}
.recent-recipes-section .recipe-card {
cursor: pointer;
border: 1px solid #e0e0e0;
border-radius: 8px;
overflow: hidden;
.recipe-card {
background: white;
border-radius: 12px;
overflow: hidden;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
cursor: pointer;
transition: transform 0.2s, box-shadow 0.2s;
display: flex;
flex-direction: column;
aspect-ratio: 1 / 1;
}
.recent-recipes-section .recipe-card:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
.recipe-card:hover {
transform: translateY(-4px);
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15);
}
.recent-recipes-section .recipe-card img {
.recipe-image {
width: 100%;
height: 60%;
height: 200px;
object-fit: cover;
display: block;
flex-shrink: 0;
}
.recipe-image-placeholder {
width: 100%;
height: 60%;
height: 200px;
background: linear-gradient(135deg, #ffb74d 0%, #ff9800 100%);
display: flex;
align-items: center;
justify-content: center;
font-size: 3rem;
flex-shrink: 0;
font-size: 4rem;
}
.recent-recipes-section .recipe-info {
padding: 0.5rem;
flex: 1;
display: flex;
flex-direction: column;
justify-content: space-between;
overflow: hidden;
min-height: 0;
.recipe-info {
padding: 1.25rem;
}
.recent-recipes-section .recipe-info h3 {
margin: 0 0 0.25rem 0;
font-size: 0.75rem;
line-height: 1.2;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
flex-shrink: 0;
.recipe-info h3 {
font-size: 1.2rem;
color: #212121;
margin: 0 0 0.5rem 0;
}
.recent-recipes-section .recipe-info .description {
margin: 0;
font-size: 0.65rem;
.recipe-info .description {
font-size: 0.9rem;
color: #666;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
flex-shrink: 1;
margin: 0 0 0.75rem 0;
line-height: 1.4;
}
.recent-recipes-section .recipe-meta {
.recipe-meta {
display: flex;
gap: 0.4rem;
font-size: 0.6rem;
color: #888;
flex-shrink: 0;
margin-top: auto;
}
/* Column-specific styles for Recent Recipes */
.recent-recipes-section .columns-3 .recipe-info h3 {
font-size: 0.95rem;
}
.recent-recipes-section .columns-3 .recipe-info .description {
font-size: 0.8rem;
-webkit-line-clamp: 2;
}
.recent-recipes-section .columns-3 .recipe-meta {
font-size: 0.75rem;
}
.recent-recipes-section .columns-5 .recipe-info h3 {
gap: 1rem;
font-size: 0.85rem;
}
.recent-recipes-section .columns-5 .recipe-info .description {
font-size: 0.75rem;
-webkit-line-clamp: 2;
}
.recent-recipes-section .columns-5 .recipe-meta {
font-size: 0.7rem;
}
.recent-recipes-section .columns-7 .recipe-info .description,
.recent-recipes-section .columns-9 .recipe-info .description {
display: none;
color: #757575;
}
/* Empty State */
@@ -554,111 +324,6 @@
font-weight: normal;
}
/* Form Sections with Visual Hierarchy */
.form-section {
background: #fafafa;
border: 2px solid #e0e0e0;
border-radius: 12px;
padding: 1.5rem;
margin-bottom: 1.5rem;
}
.form-section-header {
display: flex;
align-items: center;
gap: 0.75rem;
margin-bottom: 1rem;
padding-bottom: 0.75rem;
border-bottom: 2px solid #e0e0e0;
}
.form-section-icon {
font-size: 1.5rem;
line-height: 1;
}
.form-section-title {
flex: 1;
}
.form-section-title h2 {
font-size: 1.3rem;
color: #2e7d32;
margin: 0 0 0.25rem 0;
font-weight: 600;
}
.form-section-title p {
font-size: 0.9rem;
color: #757575;
margin: 0;
font-weight: normal;
}
.form-section-content {
margin-top: 1rem;
}
/* Collapsible Sections */
.form-section.collapsible .form-section-header {
cursor: pointer;
user-select: none;
transition: background-color 0.2s;
margin: -1.5rem -1.5rem 0 -1.5rem;
padding: 1.5rem;
border-radius: 12px 12px 0 0;
}
.form-section.collapsible .form-section-header:hover {
background-color: rgba(46, 125, 50, 0.05);
}
.form-section-toggle {
font-size: 1.2rem;
color: #2e7d32;
transition: transform 0.2s;
}
.form-section.collapsed .form-section-toggle {
transform: rotate(-90deg);
}
.form-section.collapsed .form-section-content {
display: none;
}
/* Subsection Styling */
.form-subsection {
background: white;
border: 1px solid #e0e0e0;
border-radius: 8px;
padding: 1.25rem;
margin-bottom: 1rem;
}
.form-subsection:last-child {
margin-bottom: 0;
}
.form-subsection-header {
display: flex;
align-items: center;
gap: 0.5rem;
margin-bottom: 1rem;
}
.form-subsection-icon {
font-size: 1.2rem;
line-height: 1;
}
.form-subsection-header h3 {
font-size: 1.1rem;
color: #424242;
margin: 0;
font-weight: 600;
}
.filter-chips {
display: flex;
flex-wrap: wrap;
@@ -751,20 +416,6 @@
width: 100%;
}
.page-toolbar,
.pagination-toolbar {
flex-direction: column;
align-items: stretch;
padding: 1rem;
}
.display-controls,
.pagination-controls {
flex-direction: column;
align-items: stretch;
gap: 1rem;
}
.cookbooks-grid,
.recipes-grid {
grid-template-columns: 1fr;
@@ -778,6 +429,11 @@
margin-top: 0.5rem;
}
.cookbook-count {
font-size: 0.875rem;
color: #666;
}
/* Cookbook tags */
.cookbook-tags {
display: flex;

105
packages/web/src/styles/EditCookbook.css
View File

@@ -74,111 +74,6 @@
font-weight: normal;
}
/* Form Sections with Visual Hierarchy */
.form-section {
background: #fafafa;
border: 2px solid #e0e0e0;
border-radius: 12px;
padding: 1.5rem;
margin-bottom: 2rem;
}
.form-section-header {
display: flex;
align-items: center;
gap: 0.75rem;
margin-bottom: 1rem;
padding-bottom: 0.75rem;
border-bottom: 2px solid #e0e0e0;
}
.form-section-icon {
font-size: 1.5rem;
line-height: 1;
}
.form-section-title {
flex: 1;
}
.form-section-title h2 {
font-size: 1.3rem;
color: #2e7d32;
margin: 0 0 0.25rem 0;
font-weight: 600;
}
.form-section-title p {
font-size: 0.9rem;
color: #757575;
margin: 0;
font-weight: normal;
}
.form-section-content {
margin-top: 1rem;
}
/* Collapsible Sections */
.form-section.collapsible .form-section-header {
cursor: pointer;
user-select: none;
transition: background-color 0.2s;
margin: -1.5rem -1.5rem 0 -1.5rem;
padding: 1.5rem;
border-radius: 12px 12px 0 0;
}
.form-section.collapsible .form-section-header:hover {
background-color: rgba(46, 125, 50, 0.05);
}
.form-section-toggle {
font-size: 1.2rem;
color: #2e7d32;
transition: transform 0.2s;
}
.form-section.collapsed .form-section-toggle {
transform: rotate(-90deg);
}
.form-section.collapsed .form-section-content {
display: none;
}
/* Subsection Styling */
.form-subsection {
background: white;
border: 1px solid #e0e0e0;
border-radius: 8px;
padding: 1.25rem;
margin-bottom: 1rem;
}
.form-subsection:last-child {
margin-bottom: 0;
}
.form-subsection-header {
display: flex;
align-items: center;
gap: 0.5rem;
margin-bottom: 1rem;
}
.form-subsection-icon {
font-size: 1.2rem;
line-height: 1;
}
.form-subsection-header h3 {
font-size: 1.1rem;
color: #424242;
margin: 0;
font-weight: 600;
}
.filter-chips {
display: flex;
flex-wrap: wrap;

173
packages/web/src/styles/Family.css
View File

@@ -1,173 +0,0 @@
.family-page {
padding: 1rem 0;
}
.family-page h2 {
margin-bottom: 1rem;
color: var(--text-primary);
}
.family-page h3,
.family-page h4 {
color: var(--text-primary);
}
.family-error {
background-color: #ffebee;
color: #d32f2f;
border: 1px solid #f5c2c7;
border-radius: 4px;
padding: 0.75rem 1rem;
margin-bottom: 1rem;
}
.family-create {
margin-bottom: 1.5rem;
}
.family-create-form {
display: flex;
gap: 0.75rem;
align-items: flex-end;
flex-wrap: wrap;
}
.family-create-form label {
display: flex;
flex-direction: column;
gap: 0.35rem;
flex: 1 1 260px;
color: var(--text-secondary);
font-size: 0.9rem;
}
.family-create-form input,
.family-invite-form input,
.family-invite-form select {
padding: 0.6rem 0.75rem;
border: 1px solid var(--border-color);
border-radius: 4px;
background-color: var(--bg-secondary);
color: var(--text-primary);
font-size: 1rem;
}
.family-layout {
display: grid;
grid-template-columns: 260px 1fr;
gap: 1.5rem;
}
@media (max-width: 720px) {
.family-layout {
grid-template-columns: 1fr;
}
}
.family-list h3,
.family-detail h3 {
margin-top: 0;
}
.family-list ul {
list-style: none;
padding: 0;
margin: 0;
}
.family-list li {
margin-bottom: 0.5rem;
}
.family-list li button {
width: 100%;
text-align: left;
padding: 0.75rem 1rem;
border: 1px solid var(--border-color);
border-radius: 6px;
background-color: var(--bg-secondary);
color: var(--text-primary);
cursor: pointer;
display: flex;
flex-direction: column;
gap: 0.25rem;
transition: border-color 0.2s, background-color 0.2s;
}
.family-list li button:hover {
border-color: var(--brand-primary);
background-color: var(--bg-tertiary);
}
.family-list li.active button {
border-color: var(--brand-primary);
background-color: var(--bg-tertiary);
box-shadow: inset 3px 0 0 var(--brand-primary);
}
.family-meta {
font-size: 0.8rem;
color: var(--text-secondary);
}
.family-detail-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 0.5rem;
}
.family-members {
width: 100%;
border-collapse: collapse;
margin-bottom: 1.5rem;
}
.family-members th,
.family-members td {
text-align: left;
padding: 0.6rem 0.75rem;
border-bottom: 1px solid var(--border-light);
color: var(--text-primary);
}
.family-members th {
color: var(--text-secondary);
font-weight: 600;
font-size: 0.85rem;
text-transform: uppercase;
letter-spacing: 0.03em;
}
.family-invite-form {
display: flex;
gap: 0.5rem;
flex-wrap: wrap;
}
.family-invite-form input[type="email"] {
flex: 1 1 240px;
}
.family-page button.danger {
background-color: #d32f2f;
color: white;
border: none;
padding: 0.5rem 1rem;
border-radius: 4px;
font-size: 0.9rem;
}
.family-page button.danger:hover {
background-color: #b71c1c;
}
.family-members button {
padding: 0.4rem 0.8rem;
font-size: 0.85rem;
}
.muted {
color: var(--text-secondary);
font-style: italic;
}

77
packages/web/src/styles/FamilyGate.css
View File

@@ -1,77 +0,0 @@
.family-gate-overlay {
position: fixed;
inset: 0;
background: rgba(0, 0, 0, 0.55);
display: flex;
align-items: center;
justify-content: center;
z-index: 2000;
padding: 1rem;
}
.family-gate-modal {
background: var(--bg-secondary);
color: var(--text-primary);
border-radius: 8px;
max-width: 440px;
width: 100%;
padding: 1.75rem;
box-shadow: 0 12px 40px rgba(0, 0, 0, 0.25);
}
.family-gate-modal h2 {
margin: 0 0 0.5rem;
color: var(--brand-primary);
}
.family-gate-modal p {
margin: 0 0 1.25rem;
color: var(--text-secondary);
line-height: 1.45;
}
.family-gate-modal label {
display: block;
font-size: 0.9rem;
color: var(--text-secondary);
margin-bottom: 0.35rem;
}
.family-gate-modal input {
width: 100%;
padding: 0.6rem 0.75rem;
border: 1px solid var(--border-color);
border-radius: 4px;
background-color: var(--bg-primary);
color: var(--text-primary);
font-size: 1rem;
margin-bottom: 1rem;
box-sizing: border-box;
}
.family-gate-error {
background-color: #ffebee;
color: #d32f2f;
border: 1px solid #f5c2c7;
border-radius: 4px;
padding: 0.5rem 0.75rem;
margin-bottom: 1rem;
font-size: 0.9rem;
}
.family-gate-actions {
display: flex;
justify-content: flex-end;
gap: 0.75rem;
}
.family-gate-secondary {
background-color: transparent;
color: var(--text-secondary);
border: 1px solid var(--border-color);
}
.family-gate-secondary:hover {
background-color: var(--bg-tertiary);
color: var(--text-primary);
}

70
packages/web/src/styles/RecipeList.css
View File

@@ -118,12 +118,10 @@
padding: 0.4rem 0.6rem;
border: none;
background: var(--bg-secondary, #f5f5f5);
color: var(--text-primary, #333);
cursor: pointer;
font-size: 0.85rem;
min-width: 32px;
transition: background-color 0.2s, color 0.2s;
font-weight: 500;
}
.column-buttons button:not(:last-child) {
@@ -199,12 +197,10 @@
padding: 0.4rem 0.6rem;
border: none;
background: var(--bg-secondary, #f5f5f5);
color: var(--text-primary, #333);
cursor: pointer;
font-size: 0.85rem;
min-width: 36px;
transition: background-color 0.2s, color 0.2s;
font-weight: 500;
}
.items-per-page button:not(:last-child) {
@@ -266,9 +262,6 @@
overflow: hidden;
background: var(--bg-primary, #ffffff);
transition: transform 0.2s, box-shadow 0.2s;
display: flex;
flex-direction: column;
aspect-ratio: 1 / 1;
}
.recipe-grid-enhanced .recipe-card:hover {
@@ -278,85 +271,42 @@
.recipe-grid-enhanced .recipe-card img {
width: 100%;
height: 60%;
aspect-ratio: 1 / 1;
object-fit: cover;
display: block;
flex-shrink: 0;
}
.recipe-grid-enhanced .recipe-card-content {
padding: 0.5rem;
flex: 1;
display: flex;
flex-direction: column;
justify-content: space-between;
overflow: hidden;
min-height: 0;
padding: 0.75rem;
}
.recipe-grid-enhanced .recipe-card-content h3 {
margin: 0 0 0.25rem 0;
font-size: 0.75rem;
line-height: 1.2;
margin: 0 0 0.5rem 0;
font-size: 1rem;
line-height: 1.3;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
flex-shrink: 0;
}
.recipe-grid-enhanced .recipe-card-content p {
margin: 0;
font-size: 0.65rem;
margin: 0 0 0.5rem 0;
font-size: 0.85rem;
color: var(--text-secondary, #666);
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
flex-shrink: 1;
}
.recipe-grid-enhanced .recipe-meta {
display: flex;
gap: 0.4rem;
font-size: 0.6rem;
color: var(--text-secondary, #888);
flex-shrink: 0;
margin-top: auto;
}
/* Column-specific styles for recipe grid */
.recipe-grid-enhanced.columns-3 .recipe-card-content h3 {
font-size: 0.95rem;
}
.recipe-grid-enhanced.columns-3 .recipe-card-content p {
gap: 0.75rem;
font-size: 0.8rem;
-webkit-line-clamp: 2;
}
.recipe-grid-enhanced.columns-3 .recipe-meta {
font-size: 0.75rem;
}
.recipe-grid-enhanced.columns-5 .recipe-card-content h3 {
font-size: 0.85rem;
}
.recipe-grid-enhanced.columns-5 .recipe-card-content p {
font-size: 0.75rem;
-webkit-line-clamp: 2;
}
.recipe-grid-enhanced.columns-5 .recipe-meta {
font-size: 0.7rem;
}
.recipe-grid-enhanced.columns-7 .recipe-card-content p,
.recipe-grid-enhanced.columns-9 .recipe-card-content p {
display: none;
color: var(--text-secondary, #888);
}
/* Empty state */

23
packages/web/src/styles/ThemeToggle.css
View File

@@ -1,23 +0,0 @@
.theme-toggle {
background: rgba(255, 255, 255, 0.2);
border: 1px solid rgba(255, 255, 255, 0.3);
width: 40px;
height: 40px;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
font-size: 1.2rem;
padding: 0;
transition: all 0.2s ease;
}
.theme-toggle:hover {
background: rgba(255, 255, 255, 0.3);
transform: scale(1.05);
}
.theme-toggle:active {
transform: scale(0.95);
}

6
packages/web/src/version.ts
View File

@@ -1,6 +0,0 @@
/**
* Application version following the pattern: YYYY.MM.PPP
* Example: 2026.01.002 (January 2026, patch 2), 2026.02.003 (February 2026, patch 3)
* Month and patch are zero-padded. Patch increments with each deployment in a month.
*/
export const APP_VERSION = '2026.04.008';

458
scripts/README-POSTGRES-BACKUP.md
View File

@@ -1,458 +0,0 @@
# PostgreSQL Backup Scripts
Comprehensive backup and restore scripts for PostgreSQL databases.
## Scripts Overview
### 1. `backup-all-postgres-databases.sh`
Backs up all databases on a PostgreSQL server (excluding system databases).
**Features:**
- ✅ Backs up all user databases automatically
- ✅ Includes global objects (roles, tablespaces)
- ✅ Optional gzip compression
- ✅ Automatic retention management
- ✅ Integrity verification
- ✅ Detailed logging with color output
- ✅ Backup summary reporting
- ✅ Email/Slack notification support (optional)
### 2. `restore-postgres-database.sh`
Restores a single database from backup.
**Features:**
- ✅ Safety backup before restore
- ✅ Interactive confirmation
- ✅ Automatic database name detection
- ✅ Compressed file support
- ✅ Integrity verification
- ✅ Post-restore verification
---
## Quick Start
### Backup All Databases
```bash
# Basic usage
./backup-all-postgres-databases.sh
# With compression (recommended)
./backup-all-postgres-databases.sh -c
# Custom configuration
./backup-all-postgres-databases.sh \
-h db.example.com \
-U postgres \
-d /mnt/backups \
-r 60 \
-c
```
### Restore a Database
```bash
# Interactive restore (with confirmation)
./restore-postgres-database.sh /var/backups/postgresql/20260120/mydb_20260120_020001.sql.gz
# Force restore (skip confirmation)
./restore-postgres-database.sh backup.sql.gz -d mydb -f
```
---
## Detailed Usage
### Backup Script Options
```bash
./backup-all-postgres-databases.sh [options]
Options:
-h HOST Database host (default: localhost)
-p PORT Database port (default: 5432)
-U USER Database user (default: postgres)
-d BACKUP_DIR Backup directory (default: /var/backups/postgresql)
-r DAYS Retention days (default: 30)
-c Enable compression (gzip)
-v Verbose output
-H Show help
```
### Restore Script Options
```bash
./restore-postgres-database.sh <backup_file> [options]
Options:
-h HOST Database host (default: localhost)
-p PORT Database port (default: 5432)
-U USER Database user (default: postgres)
-d DBNAME Target database name (default: from filename)
-f Force restore (skip confirmation)
-v Verbose output
-H Show help
```
---
## Automated Backups with Cron
### Daily Backups (Recommended)
```bash
# Edit crontab
sudo crontab -e
# Add daily backup at 2 AM with compression
0 2 * * * /path/to/backup-all-postgres-databases.sh -c >> /var/log/postgres-backup.log 2>&1
```
### Alternative Schedules
```bash
# Every 6 hours
0 */6 * * * /path/to/backup-all-postgres-databases.sh -c
# Twice daily (2 AM and 2 PM)
0 2,14 * * * /path/to/backup-all-postgres-databases.sh -c
# Weekly on Sundays at 3 AM
0 3 * * 0 /path/to/backup-all-postgres-databases.sh -c -r 90
```
---
## Backup Directory Structure
```
/var/backups/postgresql/
├── 20260120/ # Date-based subdirectory
│ ├── globals_20260120_020001.sql.gz # Global objects backup
│ ├── basil_20260120_020001.sql.gz # Database backup
│ ├── myapp_20260120_020001.sql.gz # Database backup
│ └── wiki_20260120_020001.sql.gz # Database backup
├── 20260121/
│ ├── globals_20260121_020001.sql.gz
│ └── ...
└── 20260122/
└── ...
```
---
## Configuration Examples
### Local PostgreSQL Server
```bash
./backup-all-postgres-databases.sh \
-h localhost \
-U postgres \
-c
```
### Remote PostgreSQL Server
```bash
./backup-all-postgres-databases.sh \
-h db.example.com \
-p 5432 \
-U backup_user \
-d /mnt/network/backups \
-r 60 \
-c \
-v
```
### High-Frequency Backups
```bash
# Short retention for frequent backups
./backup-all-postgres-databases.sh \
-r 7 \
-c
```
---
## Authentication Setup
### Option 1: .pgpass File (Recommended)
Create `~/.pgpass` with connection credentials:
```bash
echo "localhost:5432:*:postgres:your-password" >> ~/.pgpass
chmod 600 ~/.pgpass
```
Format: `hostname:port:database:username:password`
### Option 2: Environment Variables
```bash
export PGPASSWORD="your-password"
./backup-all-postgres-databases.sh
```
### Option 3: Peer Authentication (Local Only)
Run as the postgres system user:
```bash
sudo -u postgres ./backup-all-postgres-databases.sh
```
---
## Monitoring and Notifications
### Email Notifications
Edit the scripts and uncomment the email notification section:
```bash
# In backup-all-postgres-databases.sh, uncomment:
if command -v mail &> /dev/null; then
echo "$summary" | mail -s "PostgreSQL Backup $status - $(hostname)" admin@example.com
fi
```
### Slack Notifications
Set webhook URL and uncomment:
```bash
export SLACK_WEBHOOK_URL="https://hooks.slack.com/services/YOUR/WEBHOOK/URL"
# In script, uncomment:
if [ -n "$SLACK_WEBHOOK_URL" ]; then
curl -X POST "$SLACK_WEBHOOK_URL" \
-H 'Content-Type: application/json' \
-d "{\"text\":\"PostgreSQL Backup $status\n$summary\"}"
fi
```
### Log Rotation
Create `/etc/logrotate.d/postgres-backup`:
```
/var/log/postgres-backup.log {
daily
rotate 30
compress
delaycompress
missingok
notifempty
}
```
---
## Backup Verification
### Manual Verification
```bash
# List backups
ls -lh /var/backups/postgresql/$(date +%Y%m%d)/
# Verify compressed file integrity
gzip -t /var/backups/postgresql/20260120/basil_20260120_020001.sql.gz
# Preview backup contents
gunzip -c backup.sql.gz | head -50
```
### Test Restore (Recommended Monthly)
```bash
# Restore to a test database
./restore-postgres-database.sh backup.sql.gz -d test_restore -f
# Verify
psql -d test_restore -c "\dt"
# Cleanup
dropdb test_restore
```
---
## Disaster Recovery
### Full Server Restore
1. **Install PostgreSQL** on new server
2. **Restore global objects first**:
```bash
gunzip -c globals_YYYYMMDD_HHMMSS.sql.gz | psql -U postgres -d postgres
```
3. **Restore each database**:
```bash
./restore-postgres-database.sh basil_20260120_020001.sql.gz
./restore-postgres-database.sh myapp_20260120_020001.sql.gz
```
### Point-in-Time Recovery
For PITR capabilities, enable WAL archiving in `postgresql.conf`:
```
wal_level = replica
archive_mode = on
archive_command = 'cp %p /var/lib/postgresql/wal_archive/%f'
max_wal_senders = 3
```
Then use `pg_basebackup` and WAL replay for PITR.
---
## Troubleshooting
### Permission Denied
```bash
# Fix backup directory permissions
sudo chown -R postgres:postgres /var/backups/postgresql
sudo chmod 755 /var/backups/postgresql
# Fix script permissions
chmod +x backup-all-postgres-databases.sh
```
### Connection Failed
```bash
# Test connection manually
psql -h localhost -U postgres -c "SELECT version();"
# Check pg_hba.conf
sudo cat /etc/postgresql/*/main/pg_hba.conf
# Ensure proper authentication line exists:
# local all postgres peer
# host all all 127.0.0.1/32 scram-sha-256
```
### Out of Disk Space
```bash
# Check disk usage
df -h /var/backups
# Clean old backups manually
find /var/backups/postgresql -type d -name "????????" -mtime +30 -exec rm -rf {} \;
# Reduce retention period
./backup-all-postgres-databases.sh -r 7
```
### Backup File Corrupted
```bash
# Verify integrity
gzip -t backup.sql.gz
# If corrupted, use previous backup
ls -lt /var/backups/postgresql/*/basil_*.sql.gz | head
```
---
## Performance Optimization
### Large Databases
For very large databases, consider:
```bash
# Parallel dump (PostgreSQL 9.3+)
pg_dump -Fd -j 4 -f backup_directory mydb
# Custom format (smaller, faster restore)
pg_dump -Fc mydb > backup.custom
# Restore from custom format
pg_restore -d mydb backup.custom
```
### Network Backups
```bash
# Direct SSH backup (no local storage)
pg_dump mydb | gzip | ssh backup-server "cat > /backups/mydb.sql.gz"
```
---
## Best Practices
1. **Always test restores** - Backups are worthless if you can't restore
2. **Monitor backup completion** - Set up alerts for failed backups
3. **Use compression** - Saves 80-90% of disk space
4. **Multiple backup locations** - Local + remote/cloud storage
5. **Verify backup integrity** - Run gzip -t on compressed backups
6. **Document procedures** - Keep runbooks for disaster recovery
7. **Encrypt sensitive backups** - Use gpg for encryption if needed
8. **Regular retention review** - Adjust based on compliance requirements
---
## Security Considerations
### Encryption at Rest
```bash
# Encrypt backup with GPG
pg_dump mydb | gzip | gpg --encrypt --recipient admin@example.com > backup.sql.gz.gpg
# Decrypt for restore
gpg --decrypt backup.sql.gz.gpg | gunzip | psql mydb
```
### Secure Transfer
```bash
# Use SCP with key authentication
scp -i ~/.ssh/backup_key backup.sql.gz backup-server:/secure/backups/
# Or rsync over SSH
rsync -av -e "ssh -i ~/.ssh/backup_key" \
/var/backups/postgresql/ \
backup-server:/secure/backups/
```
### Access Control
```bash
# Restrict backup directory permissions
chmod 700 /var/backups/postgresql
chown postgres:postgres /var/backups/postgresql
# Restrict script permissions
chmod 750 backup-all-postgres-databases.sh
chown root:postgres backup-all-postgres-databases.sh
```
---
## Additional Resources
- [PostgreSQL Backup Documentation](https://www.postgresql.org/docs/current/backup.html)
- [pg_dump Manual](https://www.postgresql.org/docs/current/app-pgdump.html)
- [pg_restore Manual](https://www.postgresql.org/docs/current/app-pgrestore.html)
- [Continuous Archiving and PITR](https://www.postgresql.org/docs/current/continuous-archiving.html)
---
## Support
For issues or questions:
- Check script help: `./backup-all-postgres-databases.sh -H`
- Review logs: `tail -f /var/log/postgres-backup.log`
- Test connection: `psql -h localhost -U postgres`

402
scripts/backup-all-postgres-databases.sh
View File

@@ -1,402 +0,0 @@
#!/bin/bash
#
# PostgreSQL All Databases Backup Script
# Backs up all databases on a PostgreSQL server using pg_dump
#
# Usage:
# ./backup-all-postgres-databases.sh [options]
#
# Options:
# -h HOST Database host (default: localhost)
# -p PORT Database port (default: 5432)
# -U USER Database user (default: postgres)
# -d BACKUP_DIR Backup directory (default: /var/backups/postgresql)
# -r DAYS Retention days (default: 30)
# -c Enable compression (gzip)
# -v Verbose output
#
# Cron example (daily at 2 AM):
# 0 2 * * * /path/to/backup-all-postgres-databases.sh -c >> /var/log/postgres-backup.log 2>&1
set -e
set -o pipefail
# Default configuration
DB_HOST="localhost"
DB_PORT="5432"
DB_USER="postgres"
BACKUP_DIR="/var/backups/postgresql"
RETENTION_DAYS=30
COMPRESS=false
VERBOSE=false
# Color output
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
BLUE='\033[0;34m'
NC='\033[0m' # No Color
# Parse command line arguments
while getopts "h:p:U:d:r:cvH" opt; do
case $opt in
h) DB_HOST="$OPTARG" ;;
p) DB_PORT="$OPTARG" ;;
U) DB_USER="$OPTARG" ;;
d) BACKUP_DIR="$OPTARG" ;;
r) RETENTION_DAYS="$OPTARG" ;;
c) COMPRESS=true ;;
v) VERBOSE=true ;;
H)
echo "PostgreSQL All Databases Backup Script"
echo ""
echo "Usage: $0 [options]"
echo ""
echo "Options:"
echo " -h HOST Database host (default: localhost)"
echo " -p PORT Database port (default: 5432)"
echo " -U USER Database user (default: postgres)"
echo " -d BACKUP_DIR Backup directory (default: /var/backups/postgresql)"
echo " -r DAYS Retention days (default: 30)"
echo " -c Enable compression (gzip)"
echo " -v Verbose output"
echo " -H Show this help"
echo ""
exit 0
;;
\?)
echo "Invalid option: -$OPTARG" >&2
exit 1
;;
esac
done
# Logging functions
log_info() {
echo -e "${GREEN}[INFO]${NC} $(date '+%Y-%m-%d %H:%M:%S') - $1"
}
log_warn() {
echo -e "${YELLOW}[WARN]${NC} $(date '+%Y-%m-%d %H:%M:%S') - $1"
}
log_error() {
echo -e "${RED}[ERROR]${NC} $(date '+%Y-%m-%d %H:%M:%S') - $1" >&2
}
log_debug() {
if [ "$VERBOSE" = true ]; then
echo -e "${BLUE}[DEBUG]${NC} $(date '+%Y-%m-%d %H:%M:%S') - $1"
fi
}
# Check dependencies
check_dependencies() {
log_debug "Checking dependencies..."
if ! command -v psql &> /dev/null; then
log_error "psql not found. Please install PostgreSQL client tools."
exit 1
fi
if ! command -v pg_dump &> /dev/null; then
log_error "pg_dump not found. Please install PostgreSQL client tools."
exit 1
fi
if [ "$COMPRESS" = true ] && ! command -v gzip &> /dev/null; then
log_error "gzip not found. Please install gzip or disable compression."
exit 1
fi
log_debug "All dependencies satisfied"
}
# Test database connection
test_connection() {
log_debug "Testing database connection..."
if ! psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres -c "SELECT version();" &> /dev/null; then
log_error "Cannot connect to PostgreSQL server at $DB_HOST:$DB_PORT"
log_error "Check credentials, network connectivity, and pg_hba.conf settings"
exit 1
fi
log_debug "Database connection successful"
}
# Create backup directory structure
create_backup_dirs() {
local timestamp=$(date +%Y%m%d)
local backup_subdir="$BACKUP_DIR/$timestamp"
log_debug "Creating backup directory: $backup_subdir"
mkdir -p "$backup_subdir"
if [ ! -w "$backup_subdir" ]; then
log_error "Backup directory is not writable: $backup_subdir"
exit 1
fi
echo "$backup_subdir"
}
# Get list of databases to backup
get_databases() {
log_debug "Retrieving database list..."
# Get all databases except system databases
local databases=$(psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres -t -c \
"SELECT datname FROM pg_database
WHERE datname NOT IN ('postgres', 'template0', 'template1')
AND datistemplate = false
ORDER BY datname;")
if [ -z "$databases" ]; then
log_warn "No user databases found to backup"
return 1
fi
echo "$databases"
}
# Backup a single database
backup_database() {
local db_name="$1"
local backup_dir="$2"
local timestamp=$(date +%Y%m%d_%H%M%S)
local backup_file="$backup_dir/${db_name}_${timestamp}.sql"
log_info "Backing up database: $db_name"
# Add compression extension if enabled
if [ "$COMPRESS" = true ]; then
backup_file="${backup_file}.gz"
fi
# Perform backup
local start_time=$(date +%s)
if [ "$COMPRESS" = true ]; then
if pg_dump -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$db_name" \
--no-owner --no-privileges --create --clean | gzip > "$backup_file"; then
local status="SUCCESS"
else
local status="FAILED"
fi
else
if pg_dump -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$db_name" \
--no-owner --no-privileges --create --clean > "$backup_file"; then
local status="SUCCESS"
else
local status="FAILED"
fi
fi
local end_time=$(date +%s)
local duration=$((end_time - start_time))
if [ "$status" = "SUCCESS" ]; then
# Verify backup file exists and has content
if [ ! -s "$backup_file" ]; then
log_error "Backup file is empty: $backup_file"
return 1
fi
# Verify compressed file integrity if compression is enabled
if [ "$COMPRESS" = true ]; then
if ! gzip -t "$backup_file" 2>/dev/null; then
log_error "Backup file is corrupted: $backup_file"
return 1
fi
fi
local file_size=$(du -h "$backup_file" | cut -f1)
log_info "✓ $db_name backup completed - Size: $file_size, Duration: ${duration}s"
log_debug " File: $backup_file"
return 0
else
log_error "✗ $db_name backup failed"
# Remove failed backup file
rm -f "$backup_file"
return 1
fi
}
# Backup global objects (roles, tablespaces, etc.)
backup_globals() {
local backup_dir="$1"
local timestamp=$(date +%Y%m%d_%H%M%S)
local backup_file="$backup_dir/globals_${timestamp}.sql"
log_info "Backing up global objects (roles, tablespaces)..."
if [ "$COMPRESS" = true ]; then
backup_file="${backup_file}.gz"
fi
if [ "$COMPRESS" = true ]; then
if pg_dumpall -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" --globals-only | gzip > "$backup_file"; then
local status="SUCCESS"
else
local status="FAILED"
fi
else
if pg_dumpall -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" --globals-only > "$backup_file"; then
local status="SUCCESS"
else
local status="FAILED"
fi
fi
if [ "$status" = "SUCCESS" ]; then
local file_size=$(du -h "$backup_file" | cut -f1)
log_info "✓ Global objects backup completed - Size: $file_size"
return 0
else
log_error "✗ Global objects backup failed"
rm -f "$backup_file"
return 1
fi
}
# Clean up old backups
cleanup_old_backups() {
log_info "Cleaning up backups older than $RETENTION_DAYS days..."
local deleted_count=0
# Find and delete old backup directories
while IFS= read -r old_dir; do
log_debug "Deleting old backup directory: $old_dir"
rm -rf "$old_dir"
((deleted_count++))
done < <(find "$BACKUP_DIR" -maxdepth 1 -type d -name "????????" -mtime +$RETENTION_DAYS 2>/dev/null)
if [ $deleted_count -gt 0 ]; then
log_info "Deleted $deleted_count old backup directories"
else
log_debug "No old backups to delete"
fi
}
# Generate backup summary
generate_summary() {
local backup_dir="$1"
local total_dbs="$2"
local successful_dbs="$3"
local failed_dbs="$4"
local total_size=$(du -sh "$backup_dir" 2>/dev/null | cut -f1)
echo ""
log_info "================================================"
log_info "Backup Summary"
log_info "================================================"
log_info "Backup Directory: $backup_dir"
log_info "Total Databases: $total_dbs"
log_info "Successful: $successful_dbs"
log_info "Failed: $failed_dbs"
log_info "Total Size: $total_size"
log_info "Retention: $RETENTION_DAYS days"
log_info "Compression: $([ "$COMPRESS" = true ] && echo "Enabled" || echo "Disabled")"
log_info "================================================"
echo ""
}
# Send notification (optional)
send_notification() {
local status="$1"
local summary="$2"
# Uncomment and configure to enable email notifications
# if command -v mail &> /dev/null; then
# echo "$summary" | mail -s "PostgreSQL Backup $status - $(hostname)" your-email@example.com
# fi
# Uncomment and configure to enable Slack notifications
# if [ -n "$SLACK_WEBHOOK_URL" ]; then
# curl -X POST "$SLACK_WEBHOOK_URL" \
# -H 'Content-Type: application/json' \
# -d "{\"text\":\"PostgreSQL Backup $status\n$summary\"}"
# fi
}
# Main execution
main() {
local start_time=$(date +%s)
log_info "================================================"
log_info "PostgreSQL All Databases Backup Script"
log_info "================================================"
log_info "Host: $DB_HOST:$DB_PORT"
log_info "User: $DB_USER"
log_info "Backup Directory: $BACKUP_DIR"
log_info "Compression: $([ "$COMPRESS" = true ] && echo "Enabled" || echo "Disabled")"
log_info "Retention: $RETENTION_DAYS days"
log_info "================================================"
echo ""
# Perform checks
check_dependencies
test_connection
# Create backup directory
local backup_subdir=$(create_backup_dirs)
# Get list of databases
local databases=$(get_databases)
if [ -z "$databases" ]; then
log_warn "No databases to backup. Exiting."
exit 0
fi
# Backup global objects first
backup_globals "$backup_subdir"
# Backup each database
local total_dbs=0
local successful_dbs=0
local failed_dbs=0
while IFS= read -r db; do
# Trim whitespace
db=$(echo "$db" | xargs)
if [ -n "$db" ]; then
((total_dbs++))
if backup_database "$db" "$backup_subdir"; then
((successful_dbs++))
else
((failed_dbs++))
fi
fi
done <<< "$databases"
# Cleanup old backups
cleanup_old_backups
# Calculate total execution time
local end_time=$(date +%s)
local total_duration=$((end_time - start_time))
# Generate summary
generate_summary "$backup_subdir" "$total_dbs" "$successful_dbs" "$failed_dbs"
log_info "Total execution time: ${total_duration}s"
# Send notification
if [ $failed_dbs -gt 0 ]; then
send_notification "COMPLETED WITH ERRORS" "$(generate_summary "$backup_subdir" "$total_dbs" "$successful_dbs" "$failed_dbs")"
exit 1
else
send_notification "SUCCESS" "$(generate_summary "$backup_subdir" "$total_dbs" "$successful_dbs" "$failed_dbs")"
log_info "All backups completed successfully! ✓"
exit 0
fi
}
# Run main function
main

74
scripts/backup-standalone-postgres.sh
View File

@@ -1,74 +0,0 @@
#!/bin/bash
#
# Basil Backup Script for Standalone PostgreSQL
# Place on database server and run via cron
#
# Cron example (daily at 2 AM):
# 0 2 * * * /path/to/backup-standalone-postgres.sh
set -e
# Configuration
DB_HOST="localhost"
DB_PORT="5432"
DB_NAME="basil"
DB_USER="basil"
BACKUP_DIR="/var/backups/basil"
RETENTION_DAYS=30
# Create backup directories
mkdir -p "$BACKUP_DIR/daily"
mkdir -p "$BACKUP_DIR/weekly"
mkdir -p "$BACKUP_DIR/monthly"
# Timestamp
TIMESTAMP=$(date +%Y%m%d_%H%M%S)
DATE=$(date +%Y%m%d)
DAY_OF_WEEK=$(date +%u) # 1=Monday, 7=Sunday
DAY_OF_MONTH=$(date +%d)
# Daily backup
echo "Starting daily backup: $TIMESTAMP"
DAILY_BACKUP="$BACKUP_DIR/daily/basil-$DATE.sql.gz"
pg_dump -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" "$DB_NAME" | gzip > "$DAILY_BACKUP"
echo "Daily backup completed: $DAILY_BACKUP"
# Weekly backup (on Sundays)
if [ "$DAY_OF_WEEK" -eq 7 ]; then
echo "Creating weekly backup"
WEEK=$(date +%V)
WEEKLY_BACKUP="$BACKUP_DIR/weekly/basil-week$WEEK-$DATE.sql.gz"
cp "$DAILY_BACKUP" "$WEEKLY_BACKUP"
echo "Weekly backup completed: $WEEKLY_BACKUP"
fi
# Monthly backup (on 1st of month)
if [ "$DAY_OF_MONTH" -eq 01 ]; then
echo "Creating monthly backup"
MONTH=$(date +%Y%m)
MONTHLY_BACKUP="$BACKUP_DIR/monthly/basil-$MONTH.sql.gz"
cp "$DAILY_BACKUP" "$MONTHLY_BACKUP"
echo "Monthly backup completed: $MONTHLY_BACKUP"
fi
# Cleanup old backups
echo "Cleaning up old backups..."
find "$BACKUP_DIR/daily" -name "basil-*.sql.gz" -mtime +$RETENTION_DAYS -delete
find "$BACKUP_DIR/weekly" -name "basil-*.sql.gz" -mtime +90 -delete
find "$BACKUP_DIR/monthly" -name "basil-*.sql.gz" -mtime +365 -delete
# Verify backup integrity
echo "Verifying backup integrity..."
if gzip -t "$DAILY_BACKUP"; then
BACKUP_SIZE=$(du -h "$DAILY_BACKUP" | cut -f1)
echo "Backup verification successful. Size: $BACKUP_SIZE"
else
echo "ERROR: Backup verification failed!" >&2
exit 1
fi
# Optional: Send notification (uncomment to enable)
# echo "Basil backup completed successfully on $(hostname) at $(date)" | \
# mail -s "Basil Backup Success" your-email@example.com
echo "Backup process completed successfully"

27
scripts/deploy.sh
View File

@@ -131,32 +131,6 @@ EOF
log "Docker Compose override file created"
}
# Apply database migrations using the newly-pulled API image.
# Runs before restart so a failed migration leaves the old containers running.
run_migrations() {
log "Applying database migrations..."
if [ -z "$DATABASE_URL" ]; then
error "DATABASE_URL not set in .env — cannot apply migrations"
exit 1
fi
local API_IMAGE="${DOCKER_REGISTRY}/${DOCKER_USERNAME}/basil-api:${IMAGE_TAG}"
# Use --network=host so the container can reach the same DB host the app uses.
# schema.prisma and migrations/ ship inside the API image.
docker run --rm \
--network host \
-e DATABASE_URL="$DATABASE_URL" \
"$API_IMAGE" \
npx prisma migrate deploy || {
error "Migration failed — aborting deploy. Old containers are still running."
exit 1
}
log "Migrations applied successfully"
}
# Restart containers
restart_containers() {
log "Restarting containers..."
@@ -245,7 +219,6 @@ main() {
login_to_harbor
create_backup
pull_images
run_migrations
update_docker_compose
restart_containers
health_check

396
scripts/restore-postgres-database.sh
View File

@@ -1,396 +0,0 @@
#!/bin/bash
#
# PostgreSQL Database Restore Script
# Restores a single database from backup created by backup-all-postgres-databases.sh
#
# Usage:
# ./restore-postgres-database.sh <backup_file> [options]
#
# Options:
# -h HOST Database host (default: localhost)
# -p PORT Database port (default: 5432)
# -U USER Database user (default: postgres)
# -d DBNAME Target database name (default: extracted from backup filename)
# -f Force restore (skip confirmation)
# -v Verbose output
#
# Examples:
# ./restore-postgres-database.sh /var/backups/postgresql/20260120/mydb_20260120_020001.sql.gz
# ./restore-postgres-database.sh backup.sql -d mydb -f
set -e
set -o pipefail
# Default configuration
DB_HOST="localhost"
DB_PORT="5432"
DB_USER="postgres"
DB_NAME=""
FORCE=false
VERBOSE=false
# Color output
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
BLUE='\033[0;34m'
NC='\033[0m' # No Color
# Logging functions
log_info() {
echo -e "${GREEN}[INFO]${NC} $(date '+%Y-%m-%d %H:%M:%S') - $1"
}
log_warn() {
echo -e "${YELLOW}[WARN]${NC} $(date '+%Y-%m-%d %H:%M:%S') - $1"
}
log_error() {
echo -e "${RED}[ERROR]${NC} $(date '+%Y-%m-%d %H:%M:%S') - $1" >&2
}
log_debug() {
if [ "$VERBOSE" = true ]; then
echo -e "${BLUE}[DEBUG]${NC} $(date '+%Y-%m-%d %H:%M:%S') - $1"
fi
}
# Show usage
show_usage() {
echo "PostgreSQL Database Restore Script"
echo ""
echo "Usage: $0 <backup_file> [options]"
echo ""
echo "Options:"
echo " -h HOST Database host (default: localhost)"
echo " -p PORT Database port (default: 5432)"
echo " -U USER Database user (default: postgres)"
echo " -d DBNAME Target database name (default: extracted from filename)"
echo " -f Force restore (skip confirmation)"
echo " -v Verbose output"
echo " -H Show this help"
echo ""
echo "Examples:"
echo " $0 /var/backups/postgresql/20260120/mydb_20260120_020001.sql.gz"
echo " $0 backup.sql -d mydb -f"
echo ""
}
# Extract database name from backup filename
extract_db_name() {
local filename=$(basename "$1")
# Remove extension(s) and timestamp
# Format: dbname_YYYYMMDD_HHMMSS.sql[.gz]
echo "$filename" | sed -E 's/_[0-9]{8}_[0-9]{6}\.sql(\.gz)?$//'
}
# Check if file is compressed
is_compressed() {
[[ "$1" == *.gz ]]
}
# Verify backup file
verify_backup() {
local backup_file="$1"
log_debug "Verifying backup file: $backup_file"
if [ ! -f "$backup_file" ]; then
log_error "Backup file not found: $backup_file"
exit 1
fi
if [ ! -r "$backup_file" ]; then
log_error "Backup file is not readable: $backup_file"
exit 1
fi
if [ ! -s "$backup_file" ]; then
log_error "Backup file is empty: $backup_file"
exit 1
fi
# Verify compressed file integrity
if is_compressed "$backup_file"; then
log_debug "Verifying gzip integrity..."
if ! gzip -t "$backup_file" 2>/dev/null; then
log_error "Backup file is corrupted (gzip test failed)"
exit 1
fi
fi
log_debug "Backup file verification passed"
}
# Test database connection
test_connection() {
log_debug "Testing database connection..."
if ! psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres -c "SELECT version();" &> /dev/null; then
log_error "Cannot connect to PostgreSQL server at $DB_HOST:$DB_PORT"
log_error "Check credentials, network connectivity, and pg_hba.conf settings"
exit 1
fi
log_debug "Database connection successful"
}
# Check if database exists
database_exists() {
local db_name="$1"
psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres -t -c \
"SELECT 1 FROM pg_database WHERE datname='$db_name';" | grep -q 1
}
# Create safety backup
create_safety_backup() {
local db_name="$1"
local timestamp=$(date +%Y%m%d_%H%M%S)
local safety_file="/tmp/${db_name}_pre-restore_${timestamp}.sql.gz"
log_info "Creating safety backup before restore..."
if pg_dump -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$db_name" | gzip > "$safety_file"; then
log_info "Safety backup created: $safety_file"
echo "$safety_file"
return 0
else
log_error "Failed to create safety backup"
return 1
fi
}
# Drop and recreate database
recreate_database() {
local db_name="$1"
log_info "Dropping and recreating database: $db_name"
# Terminate existing connections
psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres <<EOF
SELECT pg_terminate_backend(pid)
FROM pg_stat_activity
WHERE datname = '$db_name' AND pid <> pg_backend_pid();
EOF
# Drop and recreate
psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres <<EOF
DROP DATABASE IF EXISTS $db_name;
CREATE DATABASE $db_name;
EOF
log_debug "Database recreated successfully"
}
# Restore database
restore_database() {
local backup_file="$1"
local db_name="$2"
log_info "Restoring database from: $backup_file"
local start_time=$(date +%s)
# Restore based on compression
if is_compressed "$backup_file"; then
if gunzip -c "$backup_file" | psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres -v ON_ERROR_STOP=1; then
local status="SUCCESS"
else
local status="FAILED"
fi
else
if psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d postgres -f "$backup_file" -v ON_ERROR_STOP=1; then
local status="SUCCESS"
else
local status="FAILED"
fi
fi
local end_time=$(date +%s)
local duration=$((end_time - start_time))
if [ "$status" = "SUCCESS" ]; then
log_info "✓ Database restore completed in ${duration}s"
return 0
else
log_error "✗ Database restore failed"
return 1
fi
}
# Verify restore
verify_restore() {
local db_name="$1"
log_info "Verifying restored database..."
# Check if database exists
if ! database_exists "$db_name"; then
log_error "Database not found after restore: $db_name"
return 1
fi
# Get table count
local table_count=$(psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$db_name" -t -c \
"SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = 'public';")
table_count=$(echo "$table_count" | xargs)
# Get row count estimate
local row_count=$(psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$db_name" -t -c \
"SELECT SUM(n_live_tup) FROM pg_stat_user_tables;")
row_count=$(echo "$row_count" | xargs)
row_count=${row_count:-0}
log_info "Database: $db_name"
log_info "Tables: $table_count"
log_info "Approximate rows: $row_count"
return 0
}
# Parse command line arguments
BACKUP_FILE=""
while [[ $# -gt 0 ]]; do
case $1 in
-h)
DB_HOST="$2"
shift 2
;;
-p)
DB_PORT="$2"
shift 2
;;
-U)
DB_USER="$2"
shift 2
;;
-d)
DB_NAME="$2"
shift 2
;;
-f)
FORCE=true
shift
;;
-v)
VERBOSE=true
shift
;;
-H)
show_usage
exit 0
;;
-*)
log_error "Unknown option: $1"
show_usage
exit 1
;;
*)
if [ -z "$BACKUP_FILE" ]; then
BACKUP_FILE="$1"
else
log_error "Multiple backup files specified"
show_usage
exit 1
fi
shift
;;
esac
done
# Main execution
main() {
# Check if backup file was provided
if [ -z "$BACKUP_FILE" ]; then
log_error "No backup file specified"
show_usage
exit 1
fi
# Verify backup file
verify_backup "$BACKUP_FILE"
# Extract database name if not provided
if [ -z "$DB_NAME" ]; then
DB_NAME=$(extract_db_name "$BACKUP_FILE")
log_debug "Extracted database name: $DB_NAME"
fi
log_info "================================================"
log_info "PostgreSQL Database Restore"
log_info "================================================"
log_info "Backup File: $BACKUP_FILE"
log_info "Target Database: $DB_NAME"
log_info "Host: $DB_HOST:$DB_PORT"
log_info "User: $DB_USER"
log_info "================================================"
echo ""
# Test connection
test_connection
# Check if database exists
local db_exists=false
if database_exists "$DB_NAME"; then
db_exists=true
log_warn "Database '$DB_NAME' already exists and will be DROPPED"
fi
# Confirmation prompt (unless force flag is set)
if [ "$FORCE" != true ]; then
echo ""
echo -e "${RED}WARNING: This will destroy all current data in database: $DB_NAME${NC}"
echo ""
read -p "Are you sure you want to continue? (type 'yes' to confirm): " CONFIRM
if [ "$CONFIRM" != "yes" ]; then
log_info "Restore cancelled by user"
exit 0
fi
fi
# Create safety backup if database exists
local safety_file=""
if [ "$db_exists" = true ]; then
safety_file=$(create_safety_backup "$DB_NAME")
fi
# Recreate database
recreate_database "$DB_NAME"
# Restore from backup
if restore_database "$BACKUP_FILE" "$DB_NAME"; then
verify_restore "$DB_NAME"
echo ""
log_info "================================================"
log_info "Restore completed successfully! ✓"
log_info "================================================"
if [ -n "$safety_file" ]; then
echo ""
log_info "A safety backup was created before restore:"
log_info " $safety_file"
echo ""
log_info "To rollback to the previous state, run:"
log_info " $0 $safety_file -d $DB_NAME -f"
echo ""
fi
exit 0
else
log_error "Restore failed!"
if [ -n "$safety_file" ]; then
echo ""
log_warn "You can restore the previous state using:"
log_warn " $0 $safety_file -d $DB_NAME -f"
fi
exit 1
fi
}
# Run main function
main

88
scripts/restore-standalone-postgres.sh
View File

@@ -1,88 +0,0 @@
#!/bin/bash
#
# Basil Restore Script for Standalone PostgreSQL
# Run manually when you need to restore from backup
#
# Usage: ./restore-standalone-postgres.sh /path/to/backup.sql.gz
set -e
# Configuration
DB_HOST="localhost"
DB_PORT="5432"
DB_NAME="basil"
DB_USER="basil"
# Check arguments
if [ $# -eq 0 ]; then
echo "Usage: $0 /path/to/backup.sql.gz"
echo ""
echo "Available backups:"
echo "Daily:"
ls -lh /var/backups/basil/daily/ 2>/dev/null | tail -5
echo ""
echo "Weekly:"
ls -lh /var/backups/basil/weekly/ 2>/dev/null | tail -5
exit 1
fi
BACKUP_FILE="$1"
# Verify backup file exists
if [ ! -f "$BACKUP_FILE" ]; then
echo "ERROR: Backup file not found: $BACKUP_FILE"
exit 1
fi
# Verify backup integrity
echo "Verifying backup integrity..."
if ! gzip -t "$BACKUP_FILE"; then
echo "ERROR: Backup file is corrupted!"
exit 1
fi
# Confirm restore
echo "===== WARNING ====="
echo "This will DESTROY all current data in database: $DB_NAME"
echo "Backup file: $BACKUP_FILE"
echo "Database: $DB_USER@$DB_HOST:$DB_PORT/$DB_NAME"
echo ""
read -p "Are you sure you want to continue? (type 'yes' to confirm): " CONFIRM
if [ "$CONFIRM" != "yes" ]; then
echo "Restore cancelled."
exit 0
fi
# Create backup of current database before restore
TIMESTAMP=$(date +%Y%m%d_%H%M%S)
PRE_RESTORE_BACKUP="/tmp/basil-pre-restore-$TIMESTAMP.sql.gz"
echo "Creating safety backup of current database..."
pg_dump -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" "$DB_NAME" | gzip > "$PRE_RESTORE_BACKUP"
echo "Safety backup created: $PRE_RESTORE_BACKUP"
# Drop and recreate database
echo "Dropping existing database..."
psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" postgres <<EOF
DROP DATABASE IF EXISTS $DB_NAME;
CREATE DATABASE $DB_NAME;
GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;
EOF
# Restore from backup
echo "Restoring from backup..."
gunzip -c "$BACKUP_FILE" | psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" "$DB_NAME"
# Verify restore
echo "Verifying restore..."
RECIPE_COUNT=$(psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" "$DB_NAME" -t -c "SELECT COUNT(*) FROM \"Recipe\";")
COOKBOOK_COUNT=$(psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" "$DB_NAME" -t -c "SELECT COUNT(*) FROM \"Cookbook\";")
echo ""
echo "===== Restore Complete ====="
echo "Recipes: $RECIPE_COUNT"
echo "Cookbooks: $COOKBOOK_COUNT"
echo "Pre-restore backup saved at: $PRE_RESTORE_BACKUP"
echo ""
echo "If something went wrong, you can restore from the safety backup:"
echo " gunzip -c $PRE_RESTORE_BACKUP | psql -h $DB_HOST -U $DB_USER $DB_NAME"

14
traefik-local/dynamic-dev.yml
View File

@@ -1,14 +0,0 @@
http:
routers:
basil-dev:
rule: "Host(`localhost`) || Host(`127.0.0.1`)"
entryPoints:
- http
service: basil-dev-service
priority: 1000 # Higher priority than Docker labels (default is 0)
services:
basil-dev-service:
loadBalancer:
servers:
- url: "http://basil-web:80"

20
traefik-local/traefik.yml
View File

@@ -1,20 +0,0 @@
# Static Traefik configuration for local development
entryPoints:
http:
address: ":80"
providers:
docker:
endpoint: "unix:///var/run/docker.sock"
exposedByDefault: false
network: traefik
file:
filename: /dynamic-dev.yml
watch: true
api:
insecure: true
dashboard: true
log:
level: INFO