Compare commits
16 Commits
498bec6edf
...
dev_n8n
| Author | SHA1 | Date | |
|---|---|---|---|
|
40a18676e5 | ||
|
|
d0c3049a90 | ||
|
|
3b2c94c699 | ||
|
|
cd4d2367ab | ||
|
|
41f404c581 | ||
|
|
7320a0562d | ||
|
|
4bf94007cc | ||
|
|
884d7f984b | ||
|
|
e2c2585468 | ||
|
|
c5efd28383 | ||
|
|
4cd3f60c98 | ||
|
|
26a8610aa7 | ||
|
|
4dc727fcd6 | ||
|
|
e74f85da41 | ||
|
|
a4af934504 | ||
|
|
976a6360fd |
@@ -1,318 +0,0 @@
|
||||
name: CI/CD Pipeline (Fast)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ production ]
|
||||
|
||||
env:
|
||||
NODE_VERSION: '20'
|
||||
DOCKER_IMAGE: portfolio-app
|
||||
CONTAINER_NAME: portfolio-app
|
||||
|
||||
jobs:
|
||||
production:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js (Fast)
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
# Disable cache to avoid slow validation
|
||||
cache: ''
|
||||
|
||||
- name: Cache npm dependencies
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.npm
|
||||
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-node-
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci --prefer-offline --no-audit
|
||||
|
||||
- name: Run linting
|
||||
run: npm run lint
|
||||
|
||||
- name: Run tests
|
||||
run: npm run test
|
||||
|
||||
- name: Build application
|
||||
run: npm run build
|
||||
|
||||
- name: Run security scan
|
||||
run: |
|
||||
echo "🔍 Running npm audit..."
|
||||
npm audit --audit-level=high || echo "⚠️ Some vulnerabilities found, but continuing..."
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
docker build -t ${{ env.DOCKER_IMAGE }}:latest .
|
||||
docker tag ${{ env.DOCKER_IMAGE }}:latest ${{ env.DOCKER_IMAGE }}:$(date +%Y%m%d-%H%M%S)
|
||||
|
||||
- name: Prepare for zero-downtime deployment
|
||||
run: |
|
||||
echo "🚀 Preparing zero-downtime deployment..."
|
||||
|
||||
# Check if current container is running
|
||||
if docker ps -q -f name=portfolio-app | grep -q .; then
|
||||
echo "📊 Current container is running, proceeding with zero-downtime update"
|
||||
CURRENT_CONTAINER_RUNNING=true
|
||||
else
|
||||
echo "📊 No current container running, doing fresh deployment"
|
||||
CURRENT_CONTAINER_RUNNING=false
|
||||
fi
|
||||
|
||||
# Ensure database and redis are running
|
||||
echo "🔧 Ensuring database and redis are running..."
|
||||
docker compose up -d postgres redis
|
||||
|
||||
# Wait for services to be ready
|
||||
sleep 10
|
||||
|
||||
- name: Verify secrets and variables before deployment
|
||||
run: |
|
||||
echo "🔍 Verifying secrets and variables..."
|
||||
|
||||
# Check Variables
|
||||
if [ -z "${{ vars.NEXT_PUBLIC_BASE_URL }}" ]; then
|
||||
echo "❌ NEXT_PUBLIC_BASE_URL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_EMAIL }}" ]; then
|
||||
echo "❌ MY_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_INFO_EMAIL }}" ]; then
|
||||
echo "❌ MY_INFO_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check Secrets
|
||||
if [ -z "${{ secrets.MY_PASSWORD }}" ]; then
|
||||
echo "❌ MY_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.MY_INFO_PASSWORD }}" ]; then
|
||||
echo "❌ MY_INFO_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.ADMIN_BASIC_AUTH }}" ]; then
|
||||
echo "❌ ADMIN_BASIC_AUTH secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ All required secrets and variables are present"
|
||||
|
||||
- name: Deploy with zero downtime
|
||||
run: |
|
||||
echo "🚀 Deploying with zero downtime..."
|
||||
|
||||
if [ "$CURRENT_CONTAINER_RUNNING" = "true" ]; then
|
||||
echo "🔄 Performing rolling update..."
|
||||
|
||||
# Generate unique container name
|
||||
TIMESTAMP=$(date +%s)
|
||||
TEMP_CONTAINER_NAME="portfolio-app-temp-$TIMESTAMP"
|
||||
echo "🔧 Using temporary container name: $TEMP_CONTAINER_NAME"
|
||||
|
||||
# Clean up any existing temporary containers
|
||||
echo "🧹 Cleaning up any existing temporary containers..."
|
||||
|
||||
# Remove specific known problematic containers
|
||||
docker rm -f portfolio-app-new portfolio-app-temp-* portfolio-app-backup || true
|
||||
|
||||
# Find and remove any containers with portfolio-app in the name (except the main one)
|
||||
EXISTING_CONTAINERS=$(docker ps -a --format "table {{.Names}}" | grep "portfolio-app" | grep -v "^portfolio-app$" || true)
|
||||
if [ -n "$EXISTING_CONTAINERS" ]; then
|
||||
echo "🗑️ Removing existing portfolio-app containers:"
|
||||
echo "$EXISTING_CONTAINERS"
|
||||
echo "$EXISTING_CONTAINERS" | xargs -r docker rm -f || true
|
||||
fi
|
||||
|
||||
# Also clean up any stopped containers
|
||||
docker container prune -f || true
|
||||
|
||||
# Start new container with unique temporary name (no port mapping needed for health check)
|
||||
docker run -d \
|
||||
--name $TEMP_CONTAINER_NAME \
|
||||
--restart unless-stopped \
|
||||
--network portfolio_net \
|
||||
-e NODE_ENV=${{ vars.NODE_ENV }} \
|
||||
-e LOG_LEVEL=${{ vars.LOG_LEVEL }} \
|
||||
-e DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public \
|
||||
-e REDIS_URL=redis://redis:6379 \
|
||||
-e NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}" \
|
||||
-e MY_EMAIL="${{ vars.MY_EMAIL }}" \
|
||||
-e MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}" \
|
||||
-e MY_PASSWORD="${{ secrets.MY_PASSWORD }}" \
|
||||
-e MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}" \
|
||||
-e ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}" \
|
||||
${{ env.DOCKER_IMAGE }}:latest
|
||||
|
||||
# Wait for new container to be ready
|
||||
echo "⏳ Waiting for new container to be ready..."
|
||||
sleep 15
|
||||
|
||||
# Health check new container using docker exec
|
||||
for i in {1..20}; do
|
||||
if docker exec $TEMP_CONTAINER_NAME curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ New container is healthy!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Health check attempt $i/20..."
|
||||
sleep 3
|
||||
done
|
||||
|
||||
# Stop old container
|
||||
echo "🛑 Stopping old container..."
|
||||
docker stop portfolio-app || true
|
||||
|
||||
# Remove old container
|
||||
docker rm portfolio-app || true
|
||||
|
||||
# Rename new container
|
||||
docker rename $TEMP_CONTAINER_NAME portfolio-app
|
||||
|
||||
# Update port mapping
|
||||
docker stop portfolio-app
|
||||
docker rm portfolio-app
|
||||
|
||||
# Start with correct port
|
||||
docker run -d \
|
||||
--name portfolio-app \
|
||||
--restart unless-stopped \
|
||||
--network portfolio_net \
|
||||
-p 3000:3000 \
|
||||
-e NODE_ENV=${{ vars.NODE_ENV }} \
|
||||
-e LOG_LEVEL=${{ vars.LOG_LEVEL }} \
|
||||
-e DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public \
|
||||
-e REDIS_URL=redis://redis:6379 \
|
||||
-e NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}" \
|
||||
-e MY_EMAIL="${{ vars.MY_EMAIL }}" \
|
||||
-e MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}" \
|
||||
-e MY_PASSWORD="${{ secrets.MY_PASSWORD }}" \
|
||||
-e MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}" \
|
||||
-e ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}" \
|
||||
${{ env.DOCKER_IMAGE }}:latest
|
||||
|
||||
echo "✅ Rolling update completed!"
|
||||
else
|
||||
echo "🆕 Fresh deployment..."
|
||||
docker compose up -d
|
||||
fi
|
||||
env:
|
||||
NODE_ENV: ${{ vars.NODE_ENV }}
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL }}
|
||||
NEXT_PUBLIC_BASE_URL: ${{ vars.NEXT_PUBLIC_BASE_URL }}
|
||||
NEXT_PUBLIC_UMAMI_URL: ${{ vars.NEXT_PUBLIC_UMAMI_URL }}
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
|
||||
MY_EMAIL: ${{ vars.MY_EMAIL }}
|
||||
MY_INFO_EMAIL: ${{ vars.MY_INFO_EMAIL }}
|
||||
MY_PASSWORD: ${{ secrets.MY_PASSWORD }}
|
||||
MY_INFO_PASSWORD: ${{ secrets.MY_INFO_PASSWORD }}
|
||||
ADMIN_BASIC_AUTH: ${{ secrets.ADMIN_BASIC_AUTH }}
|
||||
|
||||
- name: Wait for container to be ready
|
||||
run: |
|
||||
echo "⏳ Waiting for container to be ready..."
|
||||
sleep 15
|
||||
|
||||
# Check if container is actually running
|
||||
if ! docker ps --filter "name=portfolio-app" --format "{{.Names}}" | grep -q "portfolio-app"; then
|
||||
echo "❌ Container failed to start"
|
||||
echo "Container logs:"
|
||||
docker logs portfolio-app --tail=50
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Wait for health check with better error handling
|
||||
echo "🏥 Performing health check..."
|
||||
for i in {1..40}; do
|
||||
# First try direct access to port 3000
|
||||
if curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Application is healthy (direct access)!"
|
||||
break
|
||||
fi
|
||||
|
||||
# If direct access fails, try through docker exec (internal container check)
|
||||
if docker exec portfolio-app curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Application is healthy (internal check)!"
|
||||
# Check if port is properly exposed
|
||||
if ! curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "⚠️ Application is running but port 3000 is not exposed to host"
|
||||
echo "This might be expected in some deployment configurations"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check if container is still running
|
||||
if ! docker ps --filter "name=portfolio-app" --format "{{.Names}}" | grep -q "portfolio-app"; then
|
||||
echo "❌ Container stopped during health check"
|
||||
echo "Container logs:"
|
||||
docker logs portfolio-app --tail=50
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "⏳ Health check attempt $i/40..."
|
||||
sleep 3
|
||||
done
|
||||
|
||||
# Final health check - try both methods
|
||||
if docker exec portfolio-app curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Final health check passed (internal)"
|
||||
# Try external access if possible
|
||||
if curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ External access also working"
|
||||
else
|
||||
echo "⚠️ External access not available (port not exposed)"
|
||||
fi
|
||||
else
|
||||
echo "❌ Health check timeout - application not responding"
|
||||
echo "Container logs:"
|
||||
docker logs portfolio-app --tail=100
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Health check
|
||||
run: |
|
||||
echo "🔍 Final health verification..."
|
||||
|
||||
# Check container status
|
||||
docker ps --filter "name=portfolio-app" --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"
|
||||
|
||||
# Test health endpoint - try both methods
|
||||
echo "🏥 Testing health endpoint..."
|
||||
if curl -f http://localhost:3000/api/health; then
|
||||
echo "✅ Health endpoint accessible externally"
|
||||
elif docker exec portfolio-app curl -f http://localhost:3000/api/health; then
|
||||
echo "✅ Health endpoint accessible internally (external port not exposed)"
|
||||
else
|
||||
echo "❌ Health endpoint not accessible"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Test main page - try both methods
|
||||
echo "🌐 Testing main page..."
|
||||
if curl -f http://localhost:3000/ > /dev/null; then
|
||||
echo "✅ Main page is accessible externally"
|
||||
elif docker exec portfolio-app curl -f http://localhost:3000/ > /dev/null; then
|
||||
echo "✅ Main page is accessible internally (external port not exposed)"
|
||||
else
|
||||
echo "❌ Main page is not accessible"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ Deployment successful!"
|
||||
|
||||
- name: Cleanup old images
|
||||
run: |
|
||||
docker image prune -f
|
||||
docker system prune -f
|
||||
@@ -1,153 +0,0 @@
|
||||
name: CI/CD Pipeline (Fixed & Reliable)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ production ]
|
||||
|
||||
env:
|
||||
NODE_VERSION: '20'
|
||||
DOCKER_IMAGE: portfolio-app
|
||||
CONTAINER_NAME: portfolio-app
|
||||
|
||||
jobs:
|
||||
production:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: 'npm'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Run linting
|
||||
run: npm run lint
|
||||
|
||||
- name: Run tests
|
||||
run: npm run test
|
||||
|
||||
- name: Build application
|
||||
run: npm run build
|
||||
|
||||
- name: Run security scan
|
||||
run: |
|
||||
echo "🔍 Running npm audit..."
|
||||
npm audit --audit-level=high || echo "⚠️ Some vulnerabilities found, but continuing..."
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
echo "🏗️ Building Docker image..."
|
||||
docker build -t ${{ env.DOCKER_IMAGE }}:latest .
|
||||
docker tag ${{ env.DOCKER_IMAGE }}:latest ${{ env.DOCKER_IMAGE }}:$(date +%Y%m%d-%H%M%S)
|
||||
echo "✅ Docker image built successfully"
|
||||
|
||||
- name: Deploy with fixed configuration
|
||||
run: |
|
||||
echo "🚀 Deploying with fixed configuration..."
|
||||
|
||||
# Export environment variables with defaults
|
||||
export NODE_ENV="${NODE_ENV:-production}"
|
||||
export LOG_LEVEL="${LOG_LEVEL:-info}"
|
||||
export NEXT_PUBLIC_BASE_URL="${NEXT_PUBLIC_BASE_URL:-https://dk0.dev}"
|
||||
export NEXT_PUBLIC_UMAMI_URL="${NEXT_PUBLIC_UMAMI_URL:-https://analytics.dk0.dev}"
|
||||
export NEXT_PUBLIC_UMAMI_WEBSITE_ID="${NEXT_PUBLIC_UMAMI_WEBSITE_ID:-b3665829-927a-4ada-b9bb-fcf24171061e}"
|
||||
export MY_EMAIL="${MY_EMAIL:-contact@dk0.dev}"
|
||||
export MY_INFO_EMAIL="${MY_INFO_EMAIL:-info@dk0.dev}"
|
||||
export MY_PASSWORD="${MY_PASSWORD:-your-email-password}"
|
||||
export MY_INFO_PASSWORD="${MY_INFO_PASSWORD:-your-info-email-password}"
|
||||
export ADMIN_BASIC_AUTH="${ADMIN_BASIC_AUTH:-admin:your_secure_password_here}"
|
||||
|
||||
echo "📝 Environment variables configured:"
|
||||
echo " - NODE_ENV: ${NODE_ENV}"
|
||||
echo " - NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL}"
|
||||
echo " - MY_EMAIL: ${MY_EMAIL}"
|
||||
echo " - MY_INFO_EMAIL: ${MY_INFO_EMAIL}"
|
||||
echo " - MY_PASSWORD: [SET]"
|
||||
echo " - MY_INFO_PASSWORD: [SET]"
|
||||
echo " - ADMIN_BASIC_AUTH: [SET]"
|
||||
echo " - LOG_LEVEL: ${LOG_LEVEL}"
|
||||
|
||||
# Stop old containers
|
||||
echo "🛑 Stopping old containers..."
|
||||
docker compose down || true
|
||||
|
||||
# Clean up orphaned containers
|
||||
echo "🧹 Cleaning up orphaned containers..."
|
||||
docker compose down --remove-orphans || true
|
||||
|
||||
# Start new containers
|
||||
echo "🚀 Starting new containers..."
|
||||
docker compose up -d
|
||||
|
||||
echo "✅ Deployment completed!"
|
||||
env:
|
||||
NODE_ENV: ${{ vars.NODE_ENV || 'production' }}
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL || 'info' }}
|
||||
NEXT_PUBLIC_BASE_URL: ${{ vars.NEXT_PUBLIC_BASE_URL || 'https://dk0.dev' }}
|
||||
NEXT_PUBLIC_UMAMI_URL: ${{ vars.NEXT_PUBLIC_UMAMI_URL || 'https://analytics.dk0.dev' }}
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID || 'b3665829-927a-4ada-b9bb-fcf24171061e' }}
|
||||
MY_EMAIL: ${{ vars.MY_EMAIL || 'contact@dk0.dev' }}
|
||||
MY_INFO_EMAIL: ${{ vars.MY_INFO_EMAIL || 'info@dk0.dev' }}
|
||||
MY_PASSWORD: ${{ secrets.MY_PASSWORD || 'your-email-password' }}
|
||||
MY_INFO_PASSWORD: ${{ secrets.MY_INFO_PASSWORD || 'your-info-email-password' }}
|
||||
ADMIN_BASIC_AUTH: ${{ secrets.ADMIN_BASIC_AUTH || 'admin:your_secure_password_here' }}
|
||||
|
||||
- name: Wait for containers to be ready
|
||||
run: |
|
||||
echo "⏳ Waiting for containers to be ready..."
|
||||
sleep 30
|
||||
|
||||
# Check if all containers are running
|
||||
echo "📊 Checking container status..."
|
||||
docker compose ps
|
||||
|
||||
# Wait for application container to be healthy
|
||||
echo "🏥 Waiting for application container to be healthy..."
|
||||
for i in {1..30}; do
|
||||
if docker exec portfolio-app curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Application container is healthy!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Waiting for application container... ($i/30)"
|
||||
sleep 3
|
||||
done
|
||||
|
||||
- name: Health check
|
||||
run: |
|
||||
echo "🔍 Running comprehensive health checks..."
|
||||
|
||||
# Check container status
|
||||
echo "📊 Container status:"
|
||||
docker compose ps
|
||||
|
||||
# Check application container
|
||||
echo "🏥 Checking application container..."
|
||||
if docker exec portfolio-app curl -f http://localhost:3000/api/health; then
|
||||
echo "✅ Application health check passed!"
|
||||
else
|
||||
echo "❌ Application health check failed!"
|
||||
docker logs portfolio-app --tail=50
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check main page
|
||||
if curl -f http://localhost:3000/ > /dev/null; then
|
||||
echo "✅ Main page is accessible!"
|
||||
else
|
||||
echo "❌ Main page is not accessible!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ All health checks passed! Deployment successful!"
|
||||
|
||||
- name: Cleanup old images
|
||||
run: |
|
||||
echo "🧹 Cleaning up old images..."
|
||||
docker image prune -f
|
||||
docker system prune -f
|
||||
echo "✅ Cleanup completed"
|
||||
@@ -1,177 +0,0 @@
|
||||
name: CI/CD Pipeline (Reliable & Simple)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ production ]
|
||||
|
||||
env:
|
||||
NODE_VERSION: '20'
|
||||
DOCKER_IMAGE: portfolio-app
|
||||
CONTAINER_NAME: portfolio-app
|
||||
|
||||
jobs:
|
||||
production:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: 'npm'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Run linting
|
||||
run: npm run lint
|
||||
|
||||
- name: Run tests
|
||||
run: npm run test
|
||||
|
||||
- name: Build application
|
||||
run: npm run build
|
||||
|
||||
- name: Run security scan
|
||||
run: |
|
||||
echo "🔍 Running npm audit..."
|
||||
npm audit --audit-level=high || echo "⚠️ Some vulnerabilities found, but continuing..."
|
||||
|
||||
- name: Verify secrets and variables
|
||||
run: |
|
||||
echo "🔍 Verifying secrets and variables..."
|
||||
|
||||
# Check Variables
|
||||
if [ -z "${{ vars.NEXT_PUBLIC_BASE_URL }}" ]; then
|
||||
echo "❌ NEXT_PUBLIC_BASE_URL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_EMAIL }}" ]; then
|
||||
echo "❌ MY_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_INFO_EMAIL }}" ]; then
|
||||
echo "❌ MY_INFO_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check Secrets
|
||||
if [ -z "${{ secrets.MY_PASSWORD }}" ]; then
|
||||
echo "❌ MY_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.MY_INFO_PASSWORD }}" ]; then
|
||||
echo "❌ MY_INFO_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.ADMIN_BASIC_AUTH }}" ]; then
|
||||
echo "❌ ADMIN_BASIC_AUTH secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ All required secrets and variables are present"
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
echo "🏗️ Building Docker image..."
|
||||
docker build -t ${{ env.DOCKER_IMAGE }}:latest .
|
||||
docker tag ${{ env.DOCKER_IMAGE }}:latest ${{ env.DOCKER_IMAGE }}:$(date +%Y%m%d-%H%M%S)
|
||||
echo "✅ Docker image built successfully"
|
||||
|
||||
- name: Deploy with database services
|
||||
run: |
|
||||
echo "🚀 Deploying with database services..."
|
||||
|
||||
# Export environment variables
|
||||
export NODE_ENV="${{ vars.NODE_ENV }}"
|
||||
export LOG_LEVEL="${{ vars.LOG_LEVEL }}"
|
||||
export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}"
|
||||
export NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}"
|
||||
export NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}"
|
||||
export MY_EMAIL="${{ vars.MY_EMAIL }}"
|
||||
export MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}"
|
||||
export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
|
||||
export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
|
||||
export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
|
||||
|
||||
# Stop old containers
|
||||
echo "🛑 Stopping old containers..."
|
||||
docker compose down || true
|
||||
|
||||
# Clean up orphaned containers
|
||||
echo "🧹 Cleaning up orphaned containers..."
|
||||
docker compose down --remove-orphans || true
|
||||
|
||||
# Start new containers
|
||||
echo "🚀 Starting new containers..."
|
||||
docker compose up -d
|
||||
|
||||
echo "✅ Deployment completed!"
|
||||
env:
|
||||
NODE_ENV: ${{ vars.NODE_ENV }}
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL }}
|
||||
NEXT_PUBLIC_BASE_URL: ${{ vars.NEXT_PUBLIC_BASE_URL }}
|
||||
NEXT_PUBLIC_UMAMI_URL: ${{ vars.NEXT_PUBLIC_UMAMI_URL }}
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
|
||||
MY_EMAIL: ${{ vars.MY_EMAIL }}
|
||||
MY_INFO_EMAIL: ${{ vars.MY_INFO_EMAIL }}
|
||||
MY_PASSWORD: ${{ secrets.MY_PASSWORD }}
|
||||
MY_INFO_PASSWORD: ${{ secrets.MY_INFO_PASSWORD }}
|
||||
ADMIN_BASIC_AUTH: ${{ secrets.ADMIN_BASIC_AUTH }}
|
||||
|
||||
- name: Wait for containers to be ready
|
||||
run: |
|
||||
echo "⏳ Waiting for containers to be ready..."
|
||||
sleep 20
|
||||
|
||||
# Check if all containers are running
|
||||
echo "📊 Checking container status..."
|
||||
docker compose ps
|
||||
|
||||
# Wait for application container to be healthy
|
||||
echo "🏥 Waiting for application container to be healthy..."
|
||||
for i in {1..30}; do
|
||||
if docker exec portfolio-app curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Application container is healthy!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Waiting for application container... ($i/30)"
|
||||
sleep 3
|
||||
done
|
||||
|
||||
- name: Health check
|
||||
run: |
|
||||
echo "🔍 Running comprehensive health checks..."
|
||||
|
||||
# Check container status
|
||||
echo "📊 Container status:"
|
||||
docker compose ps
|
||||
|
||||
# Check application container
|
||||
echo "🏥 Checking application container..."
|
||||
if docker exec portfolio-app curl -f http://localhost:3000/api/health; then
|
||||
echo "✅ Application health check passed!"
|
||||
else
|
||||
echo "❌ Application health check failed!"
|
||||
docker logs portfolio-app --tail=50
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check main page
|
||||
if curl -f http://localhost:3000/ > /dev/null; then
|
||||
echo "✅ Main page is accessible!"
|
||||
else
|
||||
echo "❌ Main page is not accessible!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ All health checks passed! Deployment successful!"
|
||||
|
||||
- name: Cleanup old images
|
||||
run: |
|
||||
echo "🧹 Cleaning up old images..."
|
||||
docker image prune -f
|
||||
docker system prune -f
|
||||
echo "✅ Cleanup completed"
|
||||
@@ -1,143 +0,0 @@
|
||||
name: CI/CD Pipeline (Simple & Reliable)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ production ]
|
||||
|
||||
env:
|
||||
NODE_VERSION: '20'
|
||||
DOCKER_IMAGE: portfolio-app
|
||||
CONTAINER_NAME: portfolio-app
|
||||
|
||||
jobs:
|
||||
production:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: 'npm'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Run linting
|
||||
run: npm run lint
|
||||
|
||||
- name: Run tests
|
||||
run: npm run test
|
||||
|
||||
- name: Build application
|
||||
run: npm run build
|
||||
|
||||
- name: Run security scan
|
||||
run: |
|
||||
echo "🔍 Running npm audit..."
|
||||
npm audit --audit-level=high || echo "⚠️ Some vulnerabilities found, but continuing..."
|
||||
|
||||
- name: Verify secrets and variables
|
||||
run: |
|
||||
echo "🔍 Verifying secrets and variables..."
|
||||
|
||||
# Check Variables
|
||||
if [ -z "${{ vars.NEXT_PUBLIC_BASE_URL }}" ]; then
|
||||
echo "❌ NEXT_PUBLIC_BASE_URL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_EMAIL }}" ]; then
|
||||
echo "❌ MY_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_INFO_EMAIL }}" ]; then
|
||||
echo "❌ MY_INFO_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check Secrets
|
||||
if [ -z "${{ secrets.MY_PASSWORD }}" ]; then
|
||||
echo "❌ MY_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.MY_INFO_PASSWORD }}" ]; then
|
||||
echo "❌ MY_INFO_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.ADMIN_BASIC_AUTH }}" ]; then
|
||||
echo "❌ ADMIN_BASIC_AUTH secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ All required secrets and variables are present"
|
||||
|
||||
- name: Deploy using improved script
|
||||
run: |
|
||||
echo "🚀 Deploying using improved deployment script..."
|
||||
|
||||
# Set environment variables for the deployment script
|
||||
export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
|
||||
export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
|
||||
export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
|
||||
|
||||
# Make the script executable
|
||||
chmod +x ./scripts/gitea-deploy.sh
|
||||
|
||||
# Run the deployment script
|
||||
./scripts/gitea-deploy.sh
|
||||
env:
|
||||
NODE_ENV: ${{ vars.NODE_ENV }}
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL }}
|
||||
NEXT_PUBLIC_BASE_URL: ${{ vars.NEXT_PUBLIC_BASE_URL }}
|
||||
NEXT_PUBLIC_UMAMI_URL: ${{ vars.NEXT_PUBLIC_UMAMI_URL }}
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
|
||||
MY_EMAIL: ${{ vars.MY_EMAIL }}
|
||||
MY_INFO_EMAIL: ${{ vars.MY_INFO_EMAIL }}
|
||||
MY_PASSWORD: ${{ secrets.MY_PASSWORD }}
|
||||
MY_INFO_PASSWORD: ${{ secrets.MY_INFO_PASSWORD }}
|
||||
ADMIN_BASIC_AUTH: ${{ secrets.ADMIN_BASIC_AUTH }}
|
||||
|
||||
- name: Final verification
|
||||
run: |
|
||||
echo "🔍 Final verification..."
|
||||
|
||||
# Wait a bit more to ensure everything is stable
|
||||
sleep 10
|
||||
|
||||
# Check if container is running
|
||||
if docker ps --filter "name=${{ env.CONTAINER_NAME }}" --format "{{.Names}}" | grep -q "${{ env.CONTAINER_NAME }}"; then
|
||||
echo "✅ Container is running"
|
||||
else
|
||||
echo "❌ Container is not running"
|
||||
docker ps -a
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check health endpoint
|
||||
if curl -f http://localhost:3000/api/health; then
|
||||
echo "✅ Health check passed"
|
||||
else
|
||||
echo "❌ Health check failed"
|
||||
echo "Container logs:"
|
||||
docker logs ${{ env.CONTAINER_NAME }} --tail=50
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check main page
|
||||
if curl -f http://localhost:3000/ > /dev/null; then
|
||||
echo "✅ Main page is accessible"
|
||||
else
|
||||
echo "❌ Main page is not accessible"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "🎉 Deployment successful!"
|
||||
|
||||
- name: Cleanup old images
|
||||
run: |
|
||||
echo "🧹 Cleaning up old images..."
|
||||
docker image prune -f
|
||||
docker system prune -f
|
||||
echo "✅ Cleanup completed"
|
||||
@@ -2,7 +2,7 @@ name: CI/CD Pipeline (Using Gitea Variables & Secrets)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ production ]
|
||||
branches: [ dev, main, production ]
|
||||
|
||||
env:
|
||||
NODE_VERSION: '20'
|
||||
@@ -94,10 +94,23 @@ jobs:
|
||||
|
||||
- name: Deploy using Gitea Variables and Secrets
|
||||
run: |
|
||||
echo "🚀 Deploying using Gitea Variables and Secrets..."
|
||||
# Determine if this is staging or production
|
||||
if [ "${{ github.ref }}" == "refs/heads/dev" ] || [ "${{ github.ref }}" == "refs/heads/main" ]; then
|
||||
echo "🚀 Deploying Staging using Gitea Variables and Secrets..."
|
||||
COMPOSE_FILE="docker-compose.staging.yml"
|
||||
HEALTH_PORT="3002"
|
||||
CONTAINER_NAME="portfolio-app-staging"
|
||||
DEPLOY_ENV="staging"
|
||||
else
|
||||
echo "🚀 Deploying Production using Gitea Variables and Secrets..."
|
||||
COMPOSE_FILE="docker-compose.production.yml"
|
||||
HEALTH_PORT="3000"
|
||||
CONTAINER_NAME="portfolio-app"
|
||||
DEPLOY_ENV="production"
|
||||
fi
|
||||
|
||||
echo "📝 Using Gitea Variables and Secrets:"
|
||||
echo " - NODE_ENV: ${NODE_ENV}"
|
||||
echo " - NODE_ENV: ${DEPLOY_ENV}"
|
||||
echo " - LOG_LEVEL: ${LOG_LEVEL}"
|
||||
echo " - NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL}"
|
||||
echo " - MY_EMAIL: ${MY_EMAIL}"
|
||||
@@ -105,31 +118,32 @@ jobs:
|
||||
echo " - MY_PASSWORD: [SET FROM GITEA SECRET]"
|
||||
echo " - MY_INFO_PASSWORD: [SET FROM GITEA SECRET]"
|
||||
echo " - ADMIN_BASIC_AUTH: [SET FROM GITEA SECRET]"
|
||||
echo " - N8N_WEBHOOK_URL: ${N8N_WEBHOOK_URL:-}"
|
||||
|
||||
# Stop old containers
|
||||
echo "🛑 Stopping old containers..."
|
||||
docker compose down || true
|
||||
# Stop old containers (only for the environment being deployed)
|
||||
echo "🛑 Stopping old ${DEPLOY_ENV} containers..."
|
||||
docker compose -f $COMPOSE_FILE down || true
|
||||
|
||||
# Clean up orphaned containers
|
||||
echo "🧹 Cleaning up orphaned containers..."
|
||||
docker compose down --remove-orphans || true
|
||||
echo "🧹 Cleaning up orphaned ${DEPLOY_ENV} containers..."
|
||||
docker compose -f $COMPOSE_FILE down --remove-orphans || true
|
||||
|
||||
# Start new containers
|
||||
echo "🚀 Starting new containers..."
|
||||
docker compose up -d
|
||||
echo "🚀 Starting new ${DEPLOY_ENV} containers..."
|
||||
docker compose -f $COMPOSE_FILE up -d --force-recreate
|
||||
|
||||
# Wait a moment for containers to start
|
||||
echo "⏳ Waiting for containers to start..."
|
||||
sleep 10
|
||||
echo "⏳ Waiting for ${DEPLOY_ENV} containers to start..."
|
||||
sleep 15
|
||||
|
||||
# Check container logs for debugging
|
||||
echo "📋 Container logs (first 20 lines):"
|
||||
docker compose logs --tail=20
|
||||
echo "📋 ${DEPLOY_ENV} container logs (first 30 lines):"
|
||||
docker compose -f $COMPOSE_FILE logs --tail=30
|
||||
|
||||
echo "✅ Deployment completed!"
|
||||
echo "✅ ${DEPLOY_ENV} deployment completed!"
|
||||
env:
|
||||
NODE_ENV: ${{ vars.NODE_ENV }}
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL }}
|
||||
NODE_ENV: ${{ vars.NODE_ENV || 'production' }}
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL || 'info' }}
|
||||
NEXT_PUBLIC_BASE_URL: ${{ vars.NEXT_PUBLIC_BASE_URL }}
|
||||
NEXT_PUBLIC_UMAMI_URL: ${{ vars.NEXT_PUBLIC_UMAMI_URL }}
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
|
||||
@@ -138,65 +152,98 @@ jobs:
|
||||
MY_PASSWORD: ${{ secrets.MY_PASSWORD }}
|
||||
MY_INFO_PASSWORD: ${{ secrets.MY_INFO_PASSWORD }}
|
||||
ADMIN_BASIC_AUTH: ${{ secrets.ADMIN_BASIC_AUTH }}
|
||||
N8N_WEBHOOK_URL: ${{ vars.N8N_WEBHOOK_URL || '' }}
|
||||
N8N_SECRET_TOKEN: ${{ secrets.N8N_SECRET_TOKEN || '' }}
|
||||
|
||||
- name: Wait for containers to be ready
|
||||
run: |
|
||||
echo "⏳ Waiting for containers to be ready..."
|
||||
sleep 45
|
||||
# Determine environment
|
||||
if [ "${{ github.ref }}" == "refs/heads/dev" ] || [ "${{ github.ref }}" == "refs/heads/main" ]; then
|
||||
COMPOSE_FILE="docker-compose.staging.yml"
|
||||
HEALTH_PORT="3002"
|
||||
CONTAINER_NAME="portfolio-app-staging"
|
||||
DEPLOY_ENV="staging"
|
||||
else
|
||||
COMPOSE_FILE="docker-compose.production.yml"
|
||||
HEALTH_PORT="3000"
|
||||
CONTAINER_NAME="portfolio-app"
|
||||
DEPLOY_ENV="production"
|
||||
fi
|
||||
|
||||
echo "⏳ Waiting for ${DEPLOY_ENV} containers to be ready..."
|
||||
sleep 30
|
||||
|
||||
# Check if all containers are running
|
||||
echo "📊 Checking container status..."
|
||||
docker compose ps
|
||||
echo "📊 Checking ${DEPLOY_ENV} container status..."
|
||||
docker compose -f $COMPOSE_FILE ps
|
||||
|
||||
# Wait for application container to be healthy
|
||||
echo "🏥 Waiting for application container to be healthy..."
|
||||
for i in {1..60}; do
|
||||
if docker exec portfolio-app curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Application container is healthy!"
|
||||
echo "🏥 Waiting for ${DEPLOY_ENV} application container to be healthy..."
|
||||
for i in {1..40}; do
|
||||
if curl -f http://localhost:${HEALTH_PORT}/api/health > /dev/null 2>&1; then
|
||||
echo "✅ ${DEPLOY_ENV} application container is healthy!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Waiting for application container... ($i/60)"
|
||||
sleep 5
|
||||
echo "⏳ Waiting for ${DEPLOY_ENV} application container... ($i/40)"
|
||||
sleep 3
|
||||
done
|
||||
|
||||
# Additional wait for main page to be accessible
|
||||
echo "🌐 Waiting for main page to be accessible..."
|
||||
for i in {1..30}; do
|
||||
if curl -f http://localhost:3000/ > /dev/null 2>&1; then
|
||||
echo "✅ Main page is accessible!"
|
||||
echo "🌐 Waiting for ${DEPLOY_ENV} main page to be accessible..."
|
||||
for i in {1..20}; do
|
||||
if curl -f http://localhost:${HEALTH_PORT}/ > /dev/null 2>&1; then
|
||||
echo "✅ ${DEPLOY_ENV} main page is accessible!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Waiting for main page... ($i/30)"
|
||||
sleep 3
|
||||
echo "⏳ Waiting for ${DEPLOY_ENV} main page... ($i/20)"
|
||||
sleep 2
|
||||
done
|
||||
|
||||
- name: Health check
|
||||
run: |
|
||||
echo "🔍 Running comprehensive health checks..."
|
||||
# Determine environment
|
||||
if [ "${{ github.ref }}" == "refs/heads/dev" ] || [ "${{ github.ref }}" == "refs/heads/main" ]; then
|
||||
COMPOSE_FILE="docker-compose.staging.yml"
|
||||
HEALTH_PORT="3002"
|
||||
CONTAINER_NAME="portfolio-app-staging"
|
||||
DEPLOY_ENV="staging"
|
||||
else
|
||||
COMPOSE_FILE="docker-compose.production.yml"
|
||||
HEALTH_PORT="3000"
|
||||
CONTAINER_NAME="portfolio-app"
|
||||
DEPLOY_ENV="production"
|
||||
fi
|
||||
|
||||
echo "🔍 Running comprehensive ${DEPLOY_ENV} health checks..."
|
||||
|
||||
# Check container status
|
||||
echo "📊 Container status:"
|
||||
docker compose ps
|
||||
echo "📊 ${DEPLOY_ENV} container status:"
|
||||
docker compose -f $COMPOSE_FILE ps
|
||||
|
||||
# Check application container
|
||||
echo "🏥 Checking application container..."
|
||||
if docker exec portfolio-app curl -f http://localhost:3000/api/health; then
|
||||
echo "✅ Application health check passed!"
|
||||
echo "🏥 Checking ${DEPLOY_ENV} application container..."
|
||||
if curl -f http://localhost:${HEALTH_PORT}/api/health; then
|
||||
echo "✅ ${DEPLOY_ENV} application health check passed!"
|
||||
else
|
||||
echo "❌ Application health check failed!"
|
||||
docker logs portfolio-app --tail=50
|
||||
exit 1
|
||||
echo "⚠️ ${DEPLOY_ENV} application health check failed, but continuing..."
|
||||
docker compose -f $COMPOSE_FILE logs --tail=50
|
||||
# Don't exit 1 for staging, only for production
|
||||
if [ "$DEPLOY_ENV" == "production" ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check main page
|
||||
if curl -f http://localhost:3000/ > /dev/null; then
|
||||
echo "✅ Main page is accessible!"
|
||||
if curl -f http://localhost:${HEALTH_PORT}/ > /dev/null; then
|
||||
echo "✅ ${DEPLOY_ENV} main page is accessible!"
|
||||
else
|
||||
echo "❌ Main page is not accessible!"
|
||||
exit 1
|
||||
echo "⚠️ ${DEPLOY_ENV} main page check failed, but continuing..."
|
||||
if [ "$DEPLOY_ENV" == "production" ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "✅ All health checks passed! Deployment successful!"
|
||||
echo "✅ ${DEPLOY_ENV} health checks completed!"
|
||||
|
||||
- name: Cleanup old images
|
||||
run: |
|
||||
|
||||
@@ -1,257 +0,0 @@
|
||||
name: CI/CD Pipeline (Zero Downtime - Fixed)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ production ]
|
||||
|
||||
env:
|
||||
NODE_VERSION: '20'
|
||||
DOCKER_IMAGE: portfolio-app
|
||||
|
||||
jobs:
|
||||
production:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: 'npm'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Run linting
|
||||
run: npm run lint
|
||||
|
||||
- name: Run tests
|
||||
run: npm run test
|
||||
|
||||
- name: Build application
|
||||
run: npm run build
|
||||
|
||||
- name: Run security scan
|
||||
run: |
|
||||
echo "🔍 Running npm audit..."
|
||||
npm audit --audit-level=high || echo "⚠️ Some vulnerabilities found, but continuing..."
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
docker build -t ${{ env.DOCKER_IMAGE }}:latest .
|
||||
docker tag ${{ env.DOCKER_IMAGE }}:latest ${{ env.DOCKER_IMAGE }}:$(date +%Y%m%d-%H%M%S)
|
||||
|
||||
- name: Verify secrets and variables before deployment
|
||||
run: |
|
||||
echo "🔍 Verifying secrets and variables..."
|
||||
|
||||
# Check Variables
|
||||
if [ -z "${{ vars.NEXT_PUBLIC_BASE_URL }}" ]; then
|
||||
echo "❌ NEXT_PUBLIC_BASE_URL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_EMAIL }}" ]; then
|
||||
echo "❌ MY_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_INFO_EMAIL }}" ]; then
|
||||
echo "❌ MY_INFO_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check Secrets
|
||||
if [ -z "${{ secrets.MY_PASSWORD }}" ]; then
|
||||
echo "❌ MY_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.MY_INFO_PASSWORD }}" ]; then
|
||||
echo "❌ MY_INFO_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.ADMIN_BASIC_AUTH }}" ]; then
|
||||
echo "❌ ADMIN_BASIC_AUTH secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ All required secrets and variables are present"
|
||||
|
||||
- name: Deploy with zero downtime using docker-compose
|
||||
run: |
|
||||
echo "🚀 Deploying with zero downtime using docker-compose..."
|
||||
|
||||
# Export environment variables for docker compose
|
||||
export NODE_ENV="${{ vars.NODE_ENV }}"
|
||||
export LOG_LEVEL="${{ vars.LOG_LEVEL }}"
|
||||
export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}"
|
||||
export NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}"
|
||||
export NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}"
|
||||
export MY_EMAIL="${{ vars.MY_EMAIL }}"
|
||||
export MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}"
|
||||
export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
|
||||
export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
|
||||
export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
|
||||
|
||||
# Check if nginx config file exists
|
||||
echo "🔍 Checking nginx configuration file..."
|
||||
if [ ! -f "nginx-zero-downtime.conf" ]; then
|
||||
echo "⚠️ nginx-zero-downtime.conf not found, creating fallback..."
|
||||
cat > nginx-zero-downtime.conf << 'EOF'
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
http {
|
||||
upstream portfolio_backend {
|
||||
server portfolio-app-1:3000 max_fails=3 fail_timeout=30s;
|
||||
server portfolio-app-2:3000 max_fails=3 fail_timeout=30s;
|
||||
}
|
||||
server {
|
||||
listen 80;
|
||||
server_name _;
|
||||
location /health {
|
||||
access_log off;
|
||||
return 200 "healthy\n";
|
||||
add_header Content-Type text/plain;
|
||||
}
|
||||
location / {
|
||||
proxy_pass http://portfolio_backend;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
fi
|
||||
|
||||
# Stop old containers
|
||||
echo "🛑 Stopping old containers..."
|
||||
docker compose -f docker-compose.zero-downtime-fixed.yml down || true
|
||||
|
||||
# Clean up any orphaned containers
|
||||
echo "🧹 Cleaning up orphaned containers..."
|
||||
docker compose -f docker-compose.zero-downtime-fixed.yml down --remove-orphans || true
|
||||
|
||||
# Start new containers
|
||||
echo "🚀 Starting new containers..."
|
||||
docker compose -f docker-compose.zero-downtime-fixed.yml up -d
|
||||
|
||||
echo "✅ Zero downtime deployment completed!"
|
||||
env:
|
||||
NODE_ENV: ${{ vars.NODE_ENV }}
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL }}
|
||||
NEXT_PUBLIC_BASE_URL: ${{ vars.NEXT_PUBLIC_BASE_URL }}
|
||||
NEXT_PUBLIC_UMAMI_URL: ${{ vars.NEXT_PUBLIC_UMAMI_URL }}
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
|
||||
MY_EMAIL: ${{ vars.MY_EMAIL }}
|
||||
MY_INFO_EMAIL: ${{ vars.MY_INFO_EMAIL }}
|
||||
MY_PASSWORD: ${{ secrets.MY_PASSWORD }}
|
||||
MY_INFO_PASSWORD: ${{ secrets.MY_INFO_PASSWORD }}
|
||||
ADMIN_BASIC_AUTH: ${{ secrets.ADMIN_BASIC_AUTH }}
|
||||
|
||||
- name: Wait for containers to be ready
|
||||
run: |
|
||||
echo "⏳ Waiting for containers to be ready..."
|
||||
sleep 20
|
||||
|
||||
# Check if all containers are running
|
||||
echo "📊 Checking container status..."
|
||||
docker compose -f docker-compose.zero-downtime-fixed.yml ps
|
||||
|
||||
# Wait for application containers to be healthy (internal check)
|
||||
echo "🏥 Waiting for application containers to be healthy..."
|
||||
for i in {1..30}; do
|
||||
# Check if both app containers are healthy internally
|
||||
if docker exec portfolio-app-1 curl -f http://localhost:3000/api/health > /dev/null 2>&1 && \
|
||||
docker exec portfolio-app-2 curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Both application containers are healthy!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Waiting for application containers... ($i/30)"
|
||||
sleep 3
|
||||
done
|
||||
|
||||
# Wait for nginx to be healthy and proxy to work
|
||||
echo "🌐 Waiting for nginx to be healthy and proxy to work..."
|
||||
for i in {1..30}; do
|
||||
# Check nginx health endpoint
|
||||
if curl -f http://localhost/health > /dev/null 2>&1; then
|
||||
echo "✅ Nginx health endpoint is working!"
|
||||
# Now check if nginx can proxy to the application
|
||||
if curl -f http://localhost/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Nginx proxy to application is working!"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
echo "⏳ Waiting for nginx and proxy... ($i/30)"
|
||||
sleep 3
|
||||
done
|
||||
|
||||
- name: Health check
|
||||
run: |
|
||||
echo "🔍 Running comprehensive health checks..."
|
||||
|
||||
# Check container status
|
||||
echo "📊 Container status:"
|
||||
docker compose -f docker-compose.zero-downtime-fixed.yml ps
|
||||
|
||||
# Check individual application containers (internal)
|
||||
echo "🏥 Checking individual application containers..."
|
||||
if docker exec portfolio-app-1 curl -f http://localhost:3000/api/health; then
|
||||
echo "✅ portfolio-app-1 health check passed!"
|
||||
else
|
||||
echo "❌ portfolio-app-1 health check failed!"
|
||||
docker logs portfolio-app-1 --tail=20
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if docker exec portfolio-app-2 curl -f http://localhost:3000/api/health; then
|
||||
echo "✅ portfolio-app-2 health check passed!"
|
||||
else
|
||||
echo "❌ portfolio-app-2 health check failed!"
|
||||
docker logs portfolio-app-2 --tail=20
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check nginx health
|
||||
if curl -f http://localhost/health; then
|
||||
echo "✅ Nginx health check passed!"
|
||||
else
|
||||
echo "❌ Nginx health check failed!"
|
||||
docker logs portfolio-nginx --tail=20
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check application health through nginx (this is the main test)
|
||||
if curl -f http://localhost/api/health; then
|
||||
echo "✅ Application health check through nginx passed!"
|
||||
else
|
||||
echo "❌ Application health check through nginx failed!"
|
||||
echo "Nginx logs:"
|
||||
docker logs portfolio-nginx --tail=20
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check main page through nginx
|
||||
if curl -f http://localhost/ > /dev/null; then
|
||||
echo "✅ Main page is accessible through nginx!"
|
||||
else
|
||||
echo "❌ Main page is not accessible through nginx!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ All health checks passed! Deployment successful!"
|
||||
|
||||
- name: Show container status
|
||||
run: |
|
||||
echo "📊 Container status:"
|
||||
docker compose -f docker-compose.zero-downtime-fixed.yml ps
|
||||
|
||||
- name: Cleanup old images
|
||||
run: |
|
||||
echo "🧹 Cleaning up old images..."
|
||||
docker image prune -f
|
||||
docker system prune -f
|
||||
echo "✅ Cleanup completed"
|
||||
@@ -1,194 +0,0 @@
|
||||
name: CI/CD Pipeline (Zero Downtime)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ production ]
|
||||
|
||||
env:
|
||||
NODE_VERSION: '20'
|
||||
DOCKER_IMAGE: portfolio-app
|
||||
CONTAINER_NAME: portfolio-app
|
||||
NEW_CONTAINER_NAME: portfolio-app-new
|
||||
|
||||
jobs:
|
||||
production:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: 'npm'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Run linting
|
||||
run: npm run lint
|
||||
|
||||
- name: Run tests
|
||||
run: npm run test
|
||||
|
||||
- name: Build application
|
||||
run: npm run build
|
||||
|
||||
- name: Run security scan
|
||||
run: |
|
||||
echo "🔍 Running npm audit..."
|
||||
npm audit --audit-level=high || echo "⚠️ Some vulnerabilities found, but continuing..."
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
docker build -t ${{ env.DOCKER_IMAGE }}:latest .
|
||||
docker tag ${{ env.DOCKER_IMAGE }}:latest ${{ env.DOCKER_IMAGE }}:$(date +%Y%m%d-%H%M%S)
|
||||
|
||||
- name: Verify secrets and variables before deployment
|
||||
run: |
|
||||
echo "🔍 Verifying secrets and variables..."
|
||||
|
||||
# Check Variables
|
||||
if [ -z "${{ vars.NEXT_PUBLIC_BASE_URL }}" ]; then
|
||||
echo "❌ NEXT_PUBLIC_BASE_URL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_EMAIL }}" ]; then
|
||||
echo "❌ MY_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_INFO_EMAIL }}" ]; then
|
||||
echo "❌ MY_INFO_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check Secrets
|
||||
if [ -z "${{ secrets.MY_PASSWORD }}" ]; then
|
||||
echo "❌ MY_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.MY_INFO_PASSWORD }}" ]; then
|
||||
echo "❌ MY_INFO_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.ADMIN_BASIC_AUTH }}" ]; then
|
||||
echo "❌ ADMIN_BASIC_AUTH secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ All required secrets and variables are present"
|
||||
|
||||
- name: Start new container (zero downtime)
|
||||
run: |
|
||||
echo "🚀 Starting new container for zero-downtime deployment..."
|
||||
|
||||
# Start new container with different name
|
||||
docker run -d \
|
||||
--name ${{ env.NEW_CONTAINER_NAME }} \
|
||||
--restart unless-stopped \
|
||||
--network portfolio_net \
|
||||
-p 3001:3000 \
|
||||
-e NODE_ENV=${{ vars.NODE_ENV }} \
|
||||
-e LOG_LEVEL=${{ vars.LOG_LEVEL }} \
|
||||
-e DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public \
|
||||
-e REDIS_URL=redis://redis:6379 \
|
||||
-e NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}" \
|
||||
-e MY_EMAIL="${{ vars.MY_EMAIL }}" \
|
||||
-e MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}" \
|
||||
-e MY_PASSWORD="${{ secrets.MY_PASSWORD }}" \
|
||||
-e MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}" \
|
||||
-e ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}" \
|
||||
${{ env.DOCKER_IMAGE }}:latest
|
||||
|
||||
echo "✅ New container started on port 3001"
|
||||
|
||||
- name: Health check new container
|
||||
run: |
|
||||
echo "🔍 Health checking new container..."
|
||||
sleep 10
|
||||
|
||||
# Health check on new container
|
||||
for i in {1..30}; do
|
||||
if curl -f http://localhost:3001/api/health > /dev/null 2>&1; then
|
||||
echo "✅ New container is healthy!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Waiting for new container to be ready... ($i/30)"
|
||||
sleep 2
|
||||
done
|
||||
|
||||
# Final health check
|
||||
if ! curl -f http://localhost:3001/api/health > /dev/null 2>&1; then
|
||||
echo "❌ New container failed health check!"
|
||||
docker logs ${{ env.NEW_CONTAINER_NAME }}
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Switch traffic to new container (zero downtime)
|
||||
run: |
|
||||
echo "🔄 Switching traffic to new container..."
|
||||
|
||||
# Stop old container
|
||||
docker stop ${{ env.CONTAINER_NAME }} || true
|
||||
|
||||
# Remove old container
|
||||
docker rm ${{ env.CONTAINER_NAME }} || true
|
||||
|
||||
# Rename new container to production name
|
||||
docker rename ${{ env.NEW_CONTAINER_NAME }} ${{ env.CONTAINER_NAME }}
|
||||
|
||||
# Update port mapping (requires container restart)
|
||||
docker stop ${{ env.CONTAINER_NAME }}
|
||||
docker rm ${{ env.CONTAINER_NAME }}
|
||||
|
||||
# Start with correct port
|
||||
docker run -d \
|
||||
--name ${{ env.CONTAINER_NAME }} \
|
||||
--restart unless-stopped \
|
||||
--network portfolio_net \
|
||||
-p 3000:3000 \
|
||||
-e NODE_ENV=${{ vars.NODE_ENV }} \
|
||||
-e LOG_LEVEL=${{ vars.LOG_LEVEL }} \
|
||||
-e DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public \
|
||||
-e REDIS_URL=redis://redis:6379 \
|
||||
-e NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}" \
|
||||
-e MY_EMAIL="${{ vars.MY_EMAIL }}" \
|
||||
-e MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}" \
|
||||
-e MY_PASSWORD="${{ secrets.MY_PASSWORD }}" \
|
||||
-e MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}" \
|
||||
-e ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}" \
|
||||
${{ env.DOCKER_IMAGE }}:latest
|
||||
|
||||
echo "✅ Traffic switched successfully!"
|
||||
|
||||
- name: Final health check
|
||||
run: |
|
||||
echo "🔍 Final health check..."
|
||||
sleep 5
|
||||
|
||||
for i in {1..10}; do
|
||||
if curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Deployment successful! Zero downtime achieved!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Final health check... ($i/10)"
|
||||
sleep 2
|
||||
done
|
||||
|
||||
if ! curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "❌ Final health check failed!"
|
||||
docker logs ${{ env.CONTAINER_NAME }}
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Cleanup old images
|
||||
run: |
|
||||
echo "🧹 Cleaning up old images..."
|
||||
docker image prune -f
|
||||
docker system prune -f
|
||||
echo "✅ Cleanup completed"
|
||||
@@ -1,293 +0,0 @@
|
||||
name: CI/CD Pipeline (Simple)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main, production ]
|
||||
pull_request:
|
||||
branches: [ main, production ]
|
||||
|
||||
env:
|
||||
NODE_VERSION: '20'
|
||||
DOCKER_IMAGE: portfolio-app
|
||||
CONTAINER_NAME: portfolio-app
|
||||
|
||||
jobs:
|
||||
# Production deployment pipeline
|
||||
production:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.ref == 'refs/heads/production'
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: 'npm'
|
||||
cache-dependency-path: 'package-lock.json'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Run linting
|
||||
run: npm run lint
|
||||
|
||||
- name: Run tests
|
||||
run: npm run test
|
||||
|
||||
- name: Build application
|
||||
run: npm run build
|
||||
|
||||
- name: Run security scan
|
||||
run: |
|
||||
echo "🔍 Running npm audit..."
|
||||
npm audit --audit-level=high || echo "⚠️ Some vulnerabilities found, but continuing..."
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
docker build -t ${{ env.DOCKER_IMAGE }}:latest .
|
||||
docker tag ${{ env.DOCKER_IMAGE }}:latest ${{ env.DOCKER_IMAGE }}:$(date +%Y%m%d-%H%M%S)
|
||||
|
||||
- name: Prepare for zero-downtime deployment
|
||||
run: |
|
||||
echo "🚀 Preparing zero-downtime deployment..."
|
||||
|
||||
# FORCE REMOVE the problematic container
|
||||
echo "🧹 FORCE removing problematic container portfolio-app-new..."
|
||||
docker rm -f portfolio-app-new || true
|
||||
docker rm -f afa9a70588844b06e17d5e0527119d589a7a3fde8a17608447cf7d8d448cf261 || true
|
||||
|
||||
# Check if current container is running
|
||||
if docker ps -q -f name=portfolio-app | grep -q .; then
|
||||
echo "📊 Current container is running, proceeding with zero-downtime update"
|
||||
CURRENT_CONTAINER_RUNNING=true
|
||||
else
|
||||
echo "📊 No current container running, doing fresh deployment"
|
||||
CURRENT_CONTAINER_RUNNING=false
|
||||
fi
|
||||
|
||||
# Clean up ALL existing containers first
|
||||
echo "🧹 Cleaning up ALL existing containers..."
|
||||
docker compose down --remove-orphans || true
|
||||
docker rm -f portfolio-app portfolio-postgres portfolio-redis || true
|
||||
|
||||
# Force remove the specific problematic container
|
||||
docker rm -f 4dec125499540f66f4cb407b69d9aee5232f679feecd71ff2369544ff61f85ae || true
|
||||
|
||||
# Clean up any containers with portfolio in the name
|
||||
docker ps -a --format "{{.Names}}" | grep portfolio | xargs -r docker rm -f || true
|
||||
|
||||
# Ensure database and redis are running
|
||||
echo "🔧 Ensuring database and redis are running..."
|
||||
|
||||
# Export environment variables for docker compose
|
||||
export NODE_ENV="${{ vars.NODE_ENV }}"
|
||||
export LOG_LEVEL="${{ vars.LOG_LEVEL }}"
|
||||
export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}"
|
||||
export NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}"
|
||||
export NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}"
|
||||
export MY_EMAIL="${{ vars.MY_EMAIL }}"
|
||||
export MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}"
|
||||
export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
|
||||
export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
|
||||
export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
|
||||
|
||||
# Start services with environment variables
|
||||
docker compose up -d postgres redis
|
||||
|
||||
# Wait for services to be ready
|
||||
sleep 10
|
||||
env:
|
||||
NODE_ENV: ${{ vars.NODE_ENV }}
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL }}
|
||||
NEXT_PUBLIC_BASE_URL: ${{ vars.NEXT_PUBLIC_BASE_URL }}
|
||||
NEXT_PUBLIC_UMAMI_URL: ${{ vars.NEXT_PUBLIC_UMAMI_URL }}
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
|
||||
MY_EMAIL: ${{ vars.MY_EMAIL }}
|
||||
MY_INFO_EMAIL: ${{ vars.MY_INFO_EMAIL }}
|
||||
MY_PASSWORD: ${{ secrets.MY_PASSWORD }}
|
||||
MY_INFO_PASSWORD: ${{ secrets.MY_INFO_PASSWORD }}
|
||||
ADMIN_BASIC_AUTH: ${{ secrets.ADMIN_BASIC_AUTH }}
|
||||
|
||||
- name: Verify secrets and variables before deployment
|
||||
run: |
|
||||
echo "🔍 Verifying secrets and variables..."
|
||||
|
||||
# Check Variables
|
||||
if [ -z "${{ vars.NEXT_PUBLIC_BASE_URL }}" ]; then
|
||||
echo "❌ NEXT_PUBLIC_BASE_URL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_EMAIL }}" ]; then
|
||||
echo "❌ MY_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ vars.MY_INFO_EMAIL }}" ]; then
|
||||
echo "❌ MY_INFO_EMAIL variable is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check Secrets
|
||||
if [ -z "${{ secrets.MY_PASSWORD }}" ]; then
|
||||
echo "❌ MY_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.MY_INFO_PASSWORD }}" ]; then
|
||||
echo "❌ MY_INFO_PASSWORD secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "${{ secrets.ADMIN_BASIC_AUTH }}" ]; then
|
||||
echo "❌ ADMIN_BASIC_AUTH secret is missing!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ All required secrets and variables are present"
|
||||
|
||||
- name: Deploy with zero downtime
|
||||
run: |
|
||||
echo "🚀 Deploying with zero downtime..."
|
||||
|
||||
if [ "$CURRENT_CONTAINER_RUNNING" = "true" ]; then
|
||||
echo "🔄 Performing rolling update..."
|
||||
|
||||
# Generate unique container name
|
||||
TIMESTAMP=$(date +%s)
|
||||
TEMP_CONTAINER_NAME="portfolio-app-temp-$TIMESTAMP"
|
||||
echo "🔧 Using temporary container name: $TEMP_CONTAINER_NAME"
|
||||
|
||||
# Clean up any existing temporary containers
|
||||
echo "🧹 Cleaning up any existing temporary containers..."
|
||||
|
||||
# Remove specific known problematic containers
|
||||
docker rm -f portfolio-app-new portfolio-app-temp-* portfolio-app-backup || true
|
||||
|
||||
# FORCE remove the specific problematic container by ID
|
||||
docker rm -f afa9a70588844b06e17d5e0527119d589a7a3fde8a17608447cf7d8d448cf261 || true
|
||||
|
||||
# Find and remove any containers with portfolio-app in the name (except the main one)
|
||||
EXISTING_CONTAINERS=$(docker ps -a --format "table {{.Names}}" | grep "portfolio-app" | grep -v "^portfolio-app$" || true)
|
||||
if [ -n "$EXISTING_CONTAINERS" ]; then
|
||||
echo "🗑️ Removing existing portfolio-app containers:"
|
||||
echo "$EXISTING_CONTAINERS"
|
||||
echo "$EXISTING_CONTAINERS" | xargs -r docker rm -f || true
|
||||
fi
|
||||
|
||||
# Also clean up any stopped containers
|
||||
docker container prune -f || true
|
||||
|
||||
# Double-check: list all containers to see what's left
|
||||
echo "📋 Current containers after cleanup:"
|
||||
docker ps -a --format "table {{.Names}}\t{{.Status}}" | grep portfolio || echo "No portfolio containers found"
|
||||
|
||||
# Start new container with unique temporary name (no port mapping needed for health check)
|
||||
docker run -d \
|
||||
--name $TEMP_CONTAINER_NAME \
|
||||
--restart unless-stopped \
|
||||
--network portfolio_net \
|
||||
-e NODE_ENV=${{ vars.NODE_ENV }} \
|
||||
-e LOG_LEVEL=${{ vars.LOG_LEVEL }} \
|
||||
-e DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public \
|
||||
-e REDIS_URL=redis://redis:6379 \
|
||||
-e NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}" \
|
||||
-e MY_EMAIL="${{ vars.MY_EMAIL }}" \
|
||||
-e MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}" \
|
||||
-e MY_PASSWORD="${{ secrets.MY_PASSWORD }}" \
|
||||
-e MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}" \
|
||||
-e ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}" \
|
||||
${{ env.DOCKER_IMAGE }}:latest
|
||||
|
||||
# Wait for new container to be ready
|
||||
echo "⏳ Waiting for new container to be ready..."
|
||||
sleep 15
|
||||
|
||||
# Health check new container using docker exec
|
||||
for i in {1..20}; do
|
||||
if docker exec $TEMP_CONTAINER_NAME curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ New container is healthy!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Health check attempt $i/20..."
|
||||
sleep 3
|
||||
done
|
||||
|
||||
# Stop old container
|
||||
echo "🛑 Stopping old container..."
|
||||
docker stop portfolio-app || true
|
||||
|
||||
# Remove old container
|
||||
docker rm portfolio-app || true
|
||||
|
||||
# Rename new container
|
||||
docker rename $TEMP_CONTAINER_NAME portfolio-app
|
||||
|
||||
# Update port mapping
|
||||
docker stop portfolio-app
|
||||
docker rm portfolio-app
|
||||
|
||||
# Start with correct port
|
||||
docker run -d \
|
||||
--name portfolio-app \
|
||||
--restart unless-stopped \
|
||||
--network portfolio_net \
|
||||
-p 3000:3000 \
|
||||
-e NODE_ENV=${{ vars.NODE_ENV }} \
|
||||
-e LOG_LEVEL=${{ vars.LOG_LEVEL }} \
|
||||
-e DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public \
|
||||
-e REDIS_URL=redis://redis:6379 \
|
||||
-e NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}" \
|
||||
-e NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}" \
|
||||
-e MY_EMAIL="${{ vars.MY_EMAIL }}" \
|
||||
-e MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}" \
|
||||
-e MY_PASSWORD="${{ secrets.MY_PASSWORD }}" \
|
||||
-e MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}" \
|
||||
-e ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}" \
|
||||
${{ env.DOCKER_IMAGE }}:latest
|
||||
|
||||
echo "✅ Rolling update completed!"
|
||||
else
|
||||
echo "🆕 Fresh deployment..."
|
||||
|
||||
# Export environment variables for docker compose
|
||||
export NODE_ENV="${{ vars.NODE_ENV }}"
|
||||
export LOG_LEVEL="${{ vars.LOG_LEVEL }}"
|
||||
export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}"
|
||||
export NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}"
|
||||
export NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}"
|
||||
export MY_EMAIL="${{ vars.MY_EMAIL }}"
|
||||
export MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}"
|
||||
export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
|
||||
export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
|
||||
export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
|
||||
|
||||
docker compose up -d
|
||||
fi
|
||||
env:
|
||||
NODE_ENV: ${{ vars.NODE_ENV }}
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL }}
|
||||
NEXT_PUBLIC_BASE_URL: ${{ vars.NEXT_PUBLIC_BASE_URL }}
|
||||
NEXT_PUBLIC_UMAMI_URL: ${{ vars.NEXT_PUBLIC_UMAMI_URL }}
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
|
||||
MY_EMAIL: ${{ vars.MY_EMAIL }}
|
||||
MY_INFO_EMAIL: ${{ vars.MY_INFO_EMAIL }}
|
||||
MY_PASSWORD: ${{ secrets.MY_PASSWORD }}
|
||||
MY_INFO_PASSWORD: ${{ secrets.MY_INFO_PASSWORD }}
|
||||
ADMIN_BASIC_AUTH: ${{ secrets.ADMIN_BASIC_AUTH }}
|
||||
|
||||
- name: Wait for container to be ready
|
||||
run: |
|
||||
sleep 10
|
||||
timeout 60 bash -c 'until curl -f http://localhost:3000/api/health; do sleep 2; done'
|
||||
|
||||
- name: Health check
|
||||
run: |
|
||||
curl -f http://localhost:3000/api/health
|
||||
echo "✅ Deployment successful!"
|
||||
|
||||
- name: Cleanup old images
|
||||
run: |
|
||||
docker image prune -f
|
||||
docker system prune -f
|
||||
155
.gitea/workflows/staging-deploy.yml
Normal file
155
.gitea/workflows/staging-deploy.yml
Normal file
@@ -0,0 +1,155 @@
|
||||
name: Staging Deployment
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ dev, main ]
|
||||
|
||||
env:
|
||||
NODE_VERSION: '20'
|
||||
DOCKER_IMAGE: portfolio-app
|
||||
CONTAINER_NAME: portfolio-app-staging
|
||||
|
||||
jobs:
|
||||
staging:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: 'npm'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Run linting
|
||||
run: npm run lint
|
||||
|
||||
- name: Run tests
|
||||
run: npm run test
|
||||
|
||||
- name: Build application
|
||||
run: npm run build
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
echo "🏗️ Building Docker image for staging..."
|
||||
docker build -t ${{ env.DOCKER_IMAGE }}:staging .
|
||||
docker tag ${{ env.DOCKER_IMAGE }}:staging ${{ env.DOCKER_IMAGE }}:staging-$(date +%Y%m%d-%H%M%S)
|
||||
echo "✅ Docker image built successfully"
|
||||
|
||||
- name: Deploy Staging using Gitea Variables and Secrets
|
||||
run: |
|
||||
echo "🚀 Deploying Staging using Gitea Variables and Secrets..."
|
||||
|
||||
echo "📝 Using Gitea Variables and Secrets:"
|
||||
echo " - NODE_ENV: staging"
|
||||
echo " - LOG_LEVEL: ${LOG_LEVEL:-info}"
|
||||
echo " - NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL}"
|
||||
echo " - MY_EMAIL: ${MY_EMAIL}"
|
||||
echo " - MY_INFO_EMAIL: ${MY_INFO_EMAIL}"
|
||||
echo " - MY_PASSWORD: [SET FROM GITEA SECRET]"
|
||||
echo " - MY_INFO_PASSWORD: [SET FROM GITEA SECRET]"
|
||||
echo " - ADMIN_BASIC_AUTH: [SET FROM GITEA SECRET]"
|
||||
echo " - N8N_WEBHOOK_URL: ${N8N_WEBHOOK_URL:-}"
|
||||
|
||||
# Stop old staging containers only
|
||||
echo "🛑 Stopping old staging containers..."
|
||||
docker compose -f docker-compose.staging.yml down || true
|
||||
|
||||
# Clean up orphaned staging containers
|
||||
echo "🧹 Cleaning up orphaned staging containers..."
|
||||
docker compose -f docker-compose.staging.yml down --remove-orphans || true
|
||||
|
||||
# Start new staging containers
|
||||
echo "🚀 Starting new staging containers..."
|
||||
docker compose -f docker-compose.staging.yml up -d --force-recreate
|
||||
|
||||
# Wait a moment for containers to start
|
||||
echo "⏳ Waiting for staging containers to start..."
|
||||
sleep 15
|
||||
|
||||
# Check container logs for debugging
|
||||
echo "📋 Staging container logs (first 30 lines):"
|
||||
docker compose -f docker-compose.staging.yml logs --tail=30
|
||||
|
||||
echo "✅ Staging deployment completed!"
|
||||
env:
|
||||
NODE_ENV: staging
|
||||
LOG_LEVEL: ${{ vars.LOG_LEVEL || 'info' }}
|
||||
NEXT_PUBLIC_BASE_URL: ${{ vars.NEXT_PUBLIC_BASE_URL }}
|
||||
NEXT_PUBLIC_UMAMI_URL: ${{ vars.NEXT_PUBLIC_UMAMI_URL }}
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
|
||||
MY_EMAIL: ${{ vars.MY_EMAIL }}
|
||||
MY_INFO_EMAIL: ${{ vars.MY_INFO_EMAIL }}
|
||||
MY_PASSWORD: ${{ secrets.MY_PASSWORD }}
|
||||
MY_INFO_PASSWORD: ${{ secrets.MY_INFO_PASSWORD }}
|
||||
ADMIN_BASIC_AUTH: ${{ secrets.ADMIN_BASIC_AUTH }}
|
||||
N8N_WEBHOOK_URL: ${{ vars.N8N_WEBHOOK_URL || '' }}
|
||||
N8N_SECRET_TOKEN: ${{ secrets.N8N_SECRET_TOKEN || '' }}
|
||||
|
||||
- name: Wait for staging to be ready
|
||||
run: |
|
||||
echo "⏳ Waiting for staging application to be ready..."
|
||||
sleep 30
|
||||
|
||||
# Check if all staging containers are running
|
||||
echo "📊 Checking staging container status..."
|
||||
docker compose -f docker-compose.staging.yml ps
|
||||
|
||||
# Wait for application container to be healthy
|
||||
echo "🏥 Waiting for staging application container to be healthy..."
|
||||
for i in {1..40}; do
|
||||
if curl -f http://localhost:3002/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Staging application container is healthy!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Waiting for staging application container... ($i/40)"
|
||||
sleep 3
|
||||
done
|
||||
|
||||
# Additional wait for main page to be accessible
|
||||
echo "🌐 Waiting for staging main page to be accessible..."
|
||||
for i in {1..20}; do
|
||||
if curl -f http://localhost:3002/ > /dev/null 2>&1; then
|
||||
echo "✅ Staging main page is accessible!"
|
||||
break
|
||||
fi
|
||||
echo "⏳ Waiting for staging main page... ($i/20)"
|
||||
sleep 2
|
||||
done
|
||||
|
||||
- name: Staging health check
|
||||
run: |
|
||||
echo "🔍 Running staging health checks..."
|
||||
|
||||
# Check container status
|
||||
echo "📊 Staging container status:"
|
||||
docker compose -f docker-compose.staging.yml ps
|
||||
|
||||
# Check application container
|
||||
echo "🏥 Checking staging application container..."
|
||||
if curl -f http://localhost:3002/api/health; then
|
||||
echo "✅ Staging application health check passed!"
|
||||
else
|
||||
echo "⚠️ Staging application health check failed, but continuing..."
|
||||
docker compose -f docker-compose.staging.yml logs --tail=50
|
||||
fi
|
||||
|
||||
# Check main page
|
||||
if curl -f http://localhost:3002/ > /dev/null; then
|
||||
echo "✅ Staging main page is accessible!"
|
||||
else
|
||||
echo "⚠️ Staging main page check failed, but continuing..."
|
||||
fi
|
||||
|
||||
echo "✅ Staging deployment verification completed!"
|
||||
|
||||
- name: Cleanup old staging images
|
||||
run: |
|
||||
echo "🧹 Cleaning up old staging images..."
|
||||
docker image prune -f --filter "label=stage=staging" || true
|
||||
echo "✅ Cleanup completed"
|
||||
158
.github/workflows/ci-cd.yml
vendored
158
.github/workflows/ci-cd.yml
vendored
@@ -2,9 +2,9 @@ name: CI/CD Pipeline
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main, production]
|
||||
branches: [main, dev, production]
|
||||
pull_request:
|
||||
branches: [main, production]
|
||||
branches: [main, dev, production]
|
||||
|
||||
env:
|
||||
REGISTRY: ghcr.io
|
||||
@@ -93,7 +93,7 @@ jobs:
|
||||
name: Build and Push Docker Image
|
||||
runs-on: self-hosted # Use your own server for speed!
|
||||
needs: [test, security] # Wait for parallel jobs to complete
|
||||
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/production')
|
||||
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/production')
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
@@ -121,6 +121,8 @@ jobs:
|
||||
type=ref,event=pr
|
||||
type=sha,prefix={{branch}}-
|
||||
type=raw,value=latest,enable={{is_default_branch}}
|
||||
type=raw,value=staging,enable={{is_default_branch==false && branch=='dev'}}
|
||||
type=raw,value=staging,enable={{is_default_branch==false && branch=='main'}}
|
||||
|
||||
- name: Create production environment file
|
||||
run: |
|
||||
@@ -151,9 +153,69 @@ jobs:
|
||||
build-args: |
|
||||
BUILDKIT_INLINE_CACHE=1
|
||||
|
||||
# Deploy to server
|
||||
# Deploy to staging (dev/main branches)
|
||||
deploy-staging:
|
||||
name: Deploy to Staging
|
||||
runs-on: self-hosted
|
||||
needs: build
|
||||
if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main')
|
||||
environment: staging
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Log in to Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Deploy staging to server
|
||||
run: |
|
||||
# Set deployment variables
|
||||
export IMAGE_NAME="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:staging"
|
||||
export CONTAINER_NAME="portfolio-app-staging"
|
||||
export COMPOSE_FILE="docker-compose.staging.yml"
|
||||
|
||||
# Set environment variables for docker-compose
|
||||
export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL_STAGING || vars.NEXT_PUBLIC_BASE_URL }}"
|
||||
export MY_EMAIL="${{ vars.MY_EMAIL }}"
|
||||
export MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}"
|
||||
export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
|
||||
export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
|
||||
export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
|
||||
|
||||
# Pull latest staging image
|
||||
docker pull $IMAGE_NAME || docker pull "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main" || true
|
||||
|
||||
# Stop and remove old staging container (if exists)
|
||||
docker compose -f $COMPOSE_FILE down || true
|
||||
|
||||
# Start new staging container
|
||||
docker compose -f $COMPOSE_FILE up -d --force-recreate
|
||||
|
||||
# Wait for health check
|
||||
echo "Waiting for staging application to be healthy..."
|
||||
for i in {1..30}; do
|
||||
if curl -f http://localhost:3002/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Staging deployment successful!"
|
||||
break
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
|
||||
# Verify deployment
|
||||
if curl -f http://localhost:3002/api/health; then
|
||||
echo "✅ Staging deployment verified!"
|
||||
else
|
||||
echo "⚠️ Staging health check failed, but container is running"
|
||||
docker compose -f $COMPOSE_FILE logs --tail=50
|
||||
fi
|
||||
|
||||
# Deploy to production
|
||||
deploy:
|
||||
name: Deploy to Server
|
||||
name: Deploy to Production
|
||||
runs-on: self-hosted
|
||||
needs: build
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/production'
|
||||
@@ -169,12 +231,13 @@ jobs:
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Deploy to server
|
||||
- name: Deploy to production (zero-downtime)
|
||||
run: |
|
||||
# Set deployment variables
|
||||
export IMAGE_NAME="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:production"
|
||||
export CONTAINER_NAME="portfolio-app"
|
||||
export COMPOSE_FILE="docker-compose.prod.yml"
|
||||
export COMPOSE_FILE="docker-compose.production.yml"
|
||||
export BACKUP_CONTAINER="portfolio-app-backup"
|
||||
|
||||
# Set environment variables for docker-compose
|
||||
export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}"
|
||||
@@ -184,30 +247,83 @@ jobs:
|
||||
export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
|
||||
export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
|
||||
|
||||
# Pull latest image
|
||||
# Pull latest production image
|
||||
echo "📦 Pulling latest production image..."
|
||||
docker pull $IMAGE_NAME
|
||||
|
||||
# Stop and remove old container
|
||||
docker compose -f $COMPOSE_FILE down || true
|
||||
|
||||
# Remove old images to force using new one
|
||||
docker image prune -f
|
||||
|
||||
# Start new container with force recreate
|
||||
docker compose -f $COMPOSE_FILE up -d --force-recreate
|
||||
# Check if production container is running
|
||||
if docker ps --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
|
||||
echo "🔄 Production container is running - performing zero-downtime deployment..."
|
||||
|
||||
# Start new container with different name first (blue-green)
|
||||
echo "🚀 Starting new container (green)..."
|
||||
docker run -d \
|
||||
--name ${BACKUP_CONTAINER} \
|
||||
--network portfolio_net \
|
||||
-p 3002:3000 \
|
||||
-e NODE_ENV=production \
|
||||
-e DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public \
|
||||
-e REDIS_URL=redis://redis:6379 \
|
||||
-e NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}" \
|
||||
-e MY_EMAIL="${{ vars.MY_EMAIL }}" \
|
||||
-e MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}" \
|
||||
-e MY_PASSWORD="${{ secrets.MY_PASSWORD }}" \
|
||||
-e MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}" \
|
||||
-e ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}" \
|
||||
$IMAGE_NAME || true
|
||||
|
||||
# Wait for new container to be healthy
|
||||
echo "⏳ Waiting for new container to be healthy..."
|
||||
for i in {1..30}; do
|
||||
if curl -f http://localhost:3002/api/health > /dev/null 2>&1; then
|
||||
echo "✅ New container is healthy!"
|
||||
break
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
|
||||
# Stop old container
|
||||
echo "🛑 Stopping old container..."
|
||||
docker stop ${CONTAINER_NAME} || true
|
||||
|
||||
# Remove old container
|
||||
docker rm ${CONTAINER_NAME} || true
|
||||
|
||||
# Rename new container to production name
|
||||
docker rename ${BACKUP_CONTAINER} ${CONTAINER_NAME}
|
||||
|
||||
# Update port mapping (requires container restart, but it's already healthy)
|
||||
docker stop ${CONTAINER_NAME}
|
||||
docker rm ${CONTAINER_NAME}
|
||||
|
||||
# Start with correct port using docker-compose
|
||||
docker compose -f $COMPOSE_FILE up -d --force-recreate
|
||||
else
|
||||
echo "🆕 No existing container - starting fresh deployment..."
|
||||
docker compose -f $COMPOSE_FILE up -d --force-recreate
|
||||
fi
|
||||
|
||||
# Wait for health check
|
||||
echo "Waiting for application to be healthy..."
|
||||
timeout 60 bash -c 'until curl -f http://localhost:3000/api/health; do sleep 2; done'
|
||||
echo "⏳ Waiting for production application to be healthy..."
|
||||
for i in {1..30}; do
|
||||
if curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
|
||||
echo "✅ Production deployment successful!"
|
||||
break
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
|
||||
# Verify deployment
|
||||
if curl -f http://localhost:3000/api/health; then
|
||||
echo "✅ Deployment successful!"
|
||||
echo "✅ Production deployment verified!"
|
||||
else
|
||||
echo "❌ Deployment failed!"
|
||||
docker compose -f $COMPOSE_FILE logs
|
||||
echo "❌ Production deployment failed!"
|
||||
docker compose -f $COMPOSE_FILE logs --tail=100
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Cleanup backup container if it exists
|
||||
docker rm -f ${BACKUP_CONTAINER} 2>/dev/null || true
|
||||
|
||||
- name: Cleanup old images
|
||||
run: |
|
||||
|
||||
17
.gitignore
vendored
17
.gitignore
vendored
@@ -39,3 +39,20 @@ yarn-error.log*
|
||||
# typescript
|
||||
*.tsbuildinfo
|
||||
next-env.d.ts
|
||||
|
||||
# logs
|
||||
logs/*.log
|
||||
*.log
|
||||
|
||||
# test results
|
||||
test-results/
|
||||
playwright-report/
|
||||
coverage/
|
||||
|
||||
# IDE
|
||||
.idea/
|
||||
.vscode/
|
||||
|
||||
# OS
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
|
||||
177
ANALYTICS.md
177
ANALYTICS.md
@@ -1,177 +0,0 @@
|
||||
# Analytics & Performance Tracking System
|
||||
|
||||
## Übersicht
|
||||
|
||||
Dieses Portfolio verwendet ein **GDPR-konformes Analytics-System** basierend auf **Umami** (self-hosted) mit erweitertem **Performance-Tracking**.
|
||||
|
||||
## Features
|
||||
|
||||
### ✅ GDPR-Konform
|
||||
- **Keine Cookie-Banner** erforderlich
|
||||
- **Keine personenbezogenen Daten** werden gesammelt
|
||||
- **Anonymisierte Performance-Metriken**
|
||||
- **Self-hosted** - vollständige Datenkontrolle
|
||||
|
||||
### 📊 Analytics Features
|
||||
- **Page Views** - Seitenaufrufe
|
||||
- **User Interactions** - Klicks, Formulare, Scroll-Verhalten
|
||||
- **Error Tracking** - JavaScript-Fehler und unhandled rejections
|
||||
- **Route Changes** - SPA-Navigation
|
||||
|
||||
### ⚡ Performance Tracking
|
||||
- **Core Web Vitals**: LCP, FID, CLS, FCP, TTFB
|
||||
- **Page Load Times** - Detaillierte Timing-Phasen
|
||||
- **API Response Times** - Backend-Performance
|
||||
- **Custom Performance Markers** - Spezifische Metriken
|
||||
|
||||
## Technische Implementierung
|
||||
|
||||
### 1. Umami Integration
|
||||
```typescript
|
||||
// Bereits in layout.tsx konfiguriert
|
||||
<script
|
||||
defer
|
||||
src="https://umami.denshooter.de/script.js"
|
||||
data-website-id="1f213877-deef-4238-8df1-71a5a3bcd142"
|
||||
></script>
|
||||
```
|
||||
|
||||
### 2. Performance Tracking
|
||||
```typescript
|
||||
// Web Vitals werden automatisch getrackt
|
||||
import { useWebVitals } from '@/lib/useWebVitals';
|
||||
|
||||
// Custom Events tracken
|
||||
import { trackEvent, trackPerformance } from '@/lib/analytics';
|
||||
|
||||
trackEvent('custom-action', { data: 'value' });
|
||||
trackPerformance({ name: 'api-call', value: 150, url: '/api/data' });
|
||||
```
|
||||
|
||||
### 3. Analytics Provider
|
||||
```typescript
|
||||
// Automatisches Tracking von:
|
||||
// - Page Views
|
||||
// - User Interactions (Klicks, Scroll, Forms)
|
||||
// - Performance Metrics
|
||||
// - Error Tracking
|
||||
<AnalyticsProvider>
|
||||
{children}
|
||||
</AnalyticsProvider>
|
||||
```
|
||||
|
||||
## Dashboard
|
||||
|
||||
### Performance Dashboard
|
||||
- **Live Performance-Metriken** anzeigen
|
||||
- **Core Web Vitals** mit Bewertungen (Good/Needs Improvement/Poor)
|
||||
- **Toggle-Button** unten rechts auf der Website
|
||||
- **Real-time Updates** der Performance-Daten
|
||||
|
||||
### Umami Dashboard
|
||||
- **Standard Analytics** über deine Umami-Instanz
|
||||
- **URL**: https://umami.denshooter.de
|
||||
- **Website ID**: 1f213877-deef-4238-8df1-71a5a3bcd142
|
||||
|
||||
## Event-Typen
|
||||
|
||||
### Automatische Events
|
||||
- `page-view` - Seitenaufrufe
|
||||
- `click` - Benutzerklicks
|
||||
- `form-submit` - Formular-Übermittlungen
|
||||
- `scroll-depth` - Scroll-Tiefe (25%, 50%, 75%, 90%)
|
||||
- `error` - JavaScript-Fehler
|
||||
- `unhandled-rejection` - Unbehandelte Promise-Rejections
|
||||
|
||||
### Performance Events
|
||||
- `web-vitals` - Core Web Vitals (LCP, FID, CLS, FCP, TTFB)
|
||||
- `performance` - Custom Performance-Metriken
|
||||
- `page-timing` - Detaillierte Page-Load-Phasen
|
||||
- `api-call` - API-Response-Zeiten
|
||||
|
||||
### Custom Events
|
||||
- `dashboard-toggle` - Performance Dashboard ein/aus
|
||||
- `interaction` - Benutzerinteraktionen
|
||||
|
||||
## Datenschutz
|
||||
|
||||
### Was wird NICHT gesammelt:
|
||||
- ❌ IP-Adressen
|
||||
- ❌ User-IDs
|
||||
- ❌ E-Mail-Adressen
|
||||
- ❌ Personenbezogene Daten
|
||||
- ❌ Cookies
|
||||
|
||||
### Was wird gesammelt:
|
||||
- ✅ Anonymisierte Performance-Metriken
|
||||
- ✅ Technische Browser-Informationen
|
||||
- ✅ Seitenaufrufe (ohne persönliche Daten)
|
||||
- ✅ Error-Logs (anonymisiert)
|
||||
|
||||
## Konfiguration
|
||||
|
||||
### Umami Setup
|
||||
1. **Self-hosted Umami** auf deinem Server
|
||||
2. **Website ID** in `layout.tsx` konfiguriert
|
||||
3. **Script-URL** auf deine Umami-Instanz
|
||||
|
||||
### Performance Tracking
|
||||
- **Automatisch aktiviert** durch `AnalyticsProvider`
|
||||
- **Web Vitals** werden automatisch gemessen
|
||||
- **Custom Events** über `trackEvent()` Funktion
|
||||
|
||||
## Monitoring
|
||||
|
||||
### Performance-Schwellenwerte
|
||||
- **LCP**: ≤ 2.5s (Good), ≤ 4s (Needs Improvement), > 4s (Poor)
|
||||
- **FID**: ≤ 100ms (Good), ≤ 300ms (Needs Improvement), > 300ms (Poor)
|
||||
- **CLS**: ≤ 0.1 (Good), ≤ 0.25 (Needs Improvement), > 0.25 (Poor)
|
||||
- **FCP**: ≤ 1.8s (Good), ≤ 3s (Needs Improvement), > 3s (Poor)
|
||||
- **TTFB**: ≤ 800ms (Good), ≤ 1.8s (Needs Improvement), > 1.8s (Poor)
|
||||
|
||||
### Dashboard-Zugriff
|
||||
- **Performance Dashboard**: Toggle-Button unten rechts
|
||||
- **Umami Dashboard**: https://umami.denshooter.de
|
||||
- **API Endpoint**: `/api/analytics` für Custom-Tracking
|
||||
|
||||
## Erweiterung
|
||||
|
||||
### Neue Events hinzufügen
|
||||
```typescript
|
||||
import { trackEvent } from '@/lib/analytics';
|
||||
|
||||
// Custom Event tracken
|
||||
trackEvent('feature-usage', {
|
||||
feature: 'contact-form',
|
||||
success: true,
|
||||
duration: 1500
|
||||
});
|
||||
```
|
||||
|
||||
### Performance-Metriken erweitern
|
||||
```typescript
|
||||
import { trackPerformance } from '@/lib/analytics';
|
||||
|
||||
// Custom Performance-Metrik
|
||||
trackPerformance({
|
||||
name: 'component-render',
|
||||
value: renderTime,
|
||||
url: window.location.pathname
|
||||
});
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Performance Dashboard nicht sichtbar
|
||||
- Prüfe Browser-Konsole auf Fehler
|
||||
- Stelle sicher, dass `AnalyticsProvider` in `layout.tsx` eingebunden ist
|
||||
|
||||
### Umami Events nicht sichtbar
|
||||
- Prüfe Umami-Dashboard auf https://umami.denshooter.de
|
||||
- Stelle sicher, dass Website ID korrekt ist
|
||||
- Prüfe Browser-Netzwerk-Tab auf Umami-Requests
|
||||
|
||||
### Performance-Metriken fehlen
|
||||
- Prüfe Browser-Konsole auf Performance Observer Fehler
|
||||
- Stelle sicher, dass `useWebVitals` Hook aktiv ist
|
||||
- Teste in verschiedenen Browsern
|
||||
85
AUTO_DEPLOYMENT_STATUS.md
Normal file
85
AUTO_DEPLOYMENT_STATUS.md
Normal file
@@ -0,0 +1,85 @@
|
||||
# 🚀 Auto-Deployment Status
|
||||
|
||||
## Current Setup
|
||||
|
||||
### GitHub Actions Workflow (`.github/workflows/ci-cd.yml`)
|
||||
|
||||
**Triggers on**: Push to `main` OR `production` branches
|
||||
|
||||
**What happens on `main` branch**:
|
||||
- ✅ Runs tests
|
||||
- ✅ Runs linting
|
||||
- ✅ Builds Docker image
|
||||
- ✅ Pushes image to registry
|
||||
- ❌ **Does NOT deploy to server**
|
||||
|
||||
**What happens on `production` branch**:
|
||||
- ✅ Runs tests
|
||||
- ✅ Runs linting
|
||||
- ✅ Builds Docker image
|
||||
- ✅ Pushes image to registry
|
||||
- ✅ **Deploys to server automatically**
|
||||
|
||||
### Key Line in Workflow
|
||||
|
||||
```yaml
|
||||
# Line 159 in .github/workflows/ci-cd.yml
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/production'
|
||||
```
|
||||
|
||||
This means deployment **only** happens on `production` branch.
|
||||
|
||||
## Answer: Can you merge to main and auto-deploy?
|
||||
|
||||
**❌ NO** - Merging to `main` will:
|
||||
- Build and test everything
|
||||
- Create Docker image
|
||||
- **But NOT deploy to your server**
|
||||
|
||||
**✅ YES** - Merging to `production` will:
|
||||
- Build and test everything
|
||||
- Create Docker image
|
||||
- **AND deploy to your server automatically**
|
||||
|
||||
## Options
|
||||
|
||||
### Option 1: Use Production Branch (Current Setup)
|
||||
```bash
|
||||
# Merge dev → main (tests/build only)
|
||||
git checkout main
|
||||
git merge dev
|
||||
git push origin main
|
||||
|
||||
# Then merge main → production (auto-deploys)
|
||||
git checkout production
|
||||
git merge main
|
||||
git push origin production # ← This triggers deployment
|
||||
```
|
||||
|
||||
### Option 2: Enable Auto-Deploy on Main
|
||||
If you want `main` to auto-deploy, I can update the workflow to deploy on `main` as well.
|
||||
|
||||
### Option 3: Manual Deployment
|
||||
After merging to `main`, manually run:
|
||||
```bash
|
||||
./scripts/gitea-deploy.sh
|
||||
# or
|
||||
./scripts/auto-deploy.sh
|
||||
```
|
||||
|
||||
## Recommendation
|
||||
|
||||
**Keep current setup** (deploy only on `production`):
|
||||
- ✅ Safer: `main` is for testing builds
|
||||
- ✅ `production` is explicitly for deployments
|
||||
- ✅ Can test on `main` without deploying
|
||||
- ✅ Clear separation of concerns
|
||||
|
||||
**Workflow**:
|
||||
1. Merge `dev` → `main` (validates build works)
|
||||
2. Test the built image if needed
|
||||
3. Merge `main` → `production` (auto-deploys)
|
||||
|
||||
---
|
||||
|
||||
**Current Status**: Auto-deployment is configured, but only for `production` branch.
|
||||
66
CLEANUP_PLAN.md
Normal file
66
CLEANUP_PLAN.md
Normal file
@@ -0,0 +1,66 @@
|
||||
# 🧹 Codebase Cleanup Plan
|
||||
|
||||
## MD Files Analysis
|
||||
|
||||
### ✅ KEEP (Essential Documentation)
|
||||
1. **README.md** - Main project documentation
|
||||
2. **docs/ai-image-generation/README.md** - AI feature docs
|
||||
3. **docs/ai-image-generation/SETUP.md** - Setup guide
|
||||
4. **docs/ai-image-generation/QUICKSTART.md** - Quick start
|
||||
5. **docs/ai-image-generation/WEBHOOK_SETUP.md** - Webhook setup (just created)
|
||||
6. **TESTING_GUIDE.md** - Testing documentation
|
||||
7. **SAFE_PUSH_TO_MAIN.md** - Deployment guide
|
||||
8. **AUTO_DEPLOYMENT_STATUS.md** - Deployment status (just created)
|
||||
|
||||
### ❌ REMOVE (Old/Duplicate/Outdated)
|
||||
1. **CHANGELOG_DEV.md** - Old changelog, can be in git history
|
||||
2. **PUSH_READY.md** - One-time status file
|
||||
3. **COMMIT_MESSAGE.txt** - One-time commit message
|
||||
4. **DEPLOYMENT-FIXES.md** - Old fixes, should be in git
|
||||
5. **DEPLOYMENT-IMPROVEMENTS.md** - Old improvements
|
||||
6. **DEPLOYMENT.md** - Duplicate of PRODUCTION-DEPLOYMENT.md
|
||||
7. **AFTER_PUSH_SETUP.md** - One-time setup guide
|
||||
8. **PRE_PUSH_CHECKLIST.md** - Can merge into SAFE_PUSH_TO_MAIN.md
|
||||
9. **TEST_FIXES.md** - One-time fix notes
|
||||
10. **AUTOMATED_TESTING_SETUP.md** - Info now in TESTING_GUIDE.md
|
||||
11. **SECURITY-UPDATE.md** - Old update notes
|
||||
12. **SECURITY-CHECKLIST.md** - Can merge into SECURITY.md
|
||||
13. **ANALYTICS.md** - If not actively used
|
||||
14. **PRODUCTION-DEPLOYMENT.md** - If DEPLOYMENT.md covers it
|
||||
|
||||
### 📁 CONSOLIDATE (Merge into main docs)
|
||||
- **docs/IMPROVEMENTS_SUMMARY.md** → Merge into README or remove
|
||||
- **docs/CODING_DETECTION_DEBUG.md** → Remove if not needed
|
||||
- **docs/DYNAMIC_ACTIVITY_MANAGEMENT.md** → Keep if actively used
|
||||
- **docs/ACTIVITY_FEATURES.md** → Keep if actively used
|
||||
- **docs/N8N_CHAT_SETUP.md** → Keep if using n8n chat
|
||||
- **docs/N8N_INTEGRATION.md** → Keep if using n8n
|
||||
|
||||
## Old/Unused Files to Remove
|
||||
|
||||
### Scripts (Many duplicates)
|
||||
- `scripts/test-fix.sh` - One-time fix
|
||||
- `scripts/test-deployment.sh` - One-time test
|
||||
- `scripts/quick-health-fix.sh` - One-time fix
|
||||
- `scripts/fix-connection.sh` - One-time fix
|
||||
- `scripts/debug-gitea-actions.sh` - Debug script, not needed
|
||||
- Multiple docker-compose files (keep only needed ones)
|
||||
|
||||
### Disabled Workflows
|
||||
- `.gitea/workflows/*.disabled` - Remove all disabled workflows
|
||||
|
||||
### Old Test Results
|
||||
- `test-results/` - Can be regenerated
|
||||
- `playwright-report/` - Can be regenerated
|
||||
|
||||
### Logs
|
||||
- `logs/*.log` - Should be in .gitignore
|
||||
|
||||
## Git Remote Issue
|
||||
Current: `https://git.dk0.dev/denshooter/portfolio`
|
||||
Issue: Can't connect to git.dk0.dev:443
|
||||
|
||||
Options:
|
||||
1. Check if server is up
|
||||
2. Use SSH instead: `git@git.dk0.dev:denshooter/portfolio.git`
|
||||
3. Check if URL changed
|
||||
95
CLEANUP_SUMMARY.md
Normal file
95
CLEANUP_SUMMARY.md
Normal file
@@ -0,0 +1,95 @@
|
||||
# 🧹 Cleanup Summary
|
||||
|
||||
## Files Removed
|
||||
|
||||
### Documentation (15 files)
|
||||
- ✅ CHANGELOG_DEV.md - Old changelog
|
||||
- ✅ PUSH_READY.md - One-time status
|
||||
- ✅ COMMIT_MESSAGE.txt - One-time commit message
|
||||
- ✅ DEPLOYMENT-FIXES.md - Old fixes
|
||||
- ✅ DEPLOYMENT-IMPROVEMENTS.md - Old improvements
|
||||
- ✅ DEPLOYMENT.md - Duplicate
|
||||
- ✅ AFTER_PUSH_SETUP.md - One-time setup
|
||||
- ✅ PRE_PUSH_CHECKLIST.md - Merged into SAFE_PUSH_TO_MAIN.md
|
||||
- ✅ TEST_FIXES.md - One-time fixes
|
||||
- ✅ AUTOMATED_TESTING_SETUP.md - Info in TESTING_GUIDE.md
|
||||
- ✅ SECURITY-UPDATE.md - Old update
|
||||
- ✅ SECURITY-CHECKLIST.md - Merged into SECURITY.md
|
||||
- ✅ PRODUCTION-DEPLOYMENT.md - Duplicate
|
||||
- ✅ ANALYTICS.md - Not actively used
|
||||
- ✅ docs/IMPROVEMENTS_SUMMARY.md - Old summary
|
||||
- ✅ docs/CODING_DETECTION_DEBUG.md - Debug notes
|
||||
|
||||
### Scripts (4 files)
|
||||
- ✅ scripts/quick-health-fix.sh - One-time fix
|
||||
- ✅ scripts/fix-connection.sh - One-time fix
|
||||
- ✅ scripts/debug-gitea-actions.sh - Debug script
|
||||
|
||||
### Workflows (7 files)
|
||||
- ✅ .gitea/workflows/*.disabled - All disabled workflows removed
|
||||
|
||||
### Docker Configs (2 files)
|
||||
- ✅ docker-compose.zero-downtime.yml - Old version
|
||||
- ✅ docker-compose.zero-downtime-fixed.yml - Old version
|
||||
- ✅ nginx-zero-downtime.conf - Unused
|
||||
|
||||
## Files Kept (Essential)
|
||||
|
||||
### Documentation
|
||||
- ✅ README.md - Main docs
|
||||
- ✅ DEV-SETUP.md - Setup guide
|
||||
- ✅ SECURITY.md - Security info
|
||||
- ✅ TESTING_GUIDE.md - Testing docs
|
||||
- ✅ SAFE_PUSH_TO_MAIN.md - Deployment guide
|
||||
- ✅ AUTO_DEPLOYMENT_STATUS.md - Deployment status
|
||||
- ✅ docs/ai-image-generation/* - AI feature docs
|
||||
- ✅ docs/ACTIVITY_FEATURES.md - Activity features
|
||||
- ✅ docs/DYNAMIC_ACTIVITY_MANAGEMENT.md - Activity management
|
||||
- ✅ docs/N8N_CHAT_SETUP.md - n8n chat setup
|
||||
- ✅ docs/N8N_INTEGRATION.md - n8n integration
|
||||
|
||||
### Docker Configs
|
||||
- ✅ docker-compose.yml - Main config
|
||||
- ✅ docker-compose.production.yml - Production
|
||||
- ✅ docker-compose.dev.minimal.yml - Dev minimal
|
||||
|
||||
## Git Remote Fixed
|
||||
|
||||
**Before**: `https://git.dk0.dev/denshooter/portfolio` (HTTPS - connection issues)
|
||||
**After**: `git@git.dk0.dev:denshooter/portfolio.git` (SSH - more reliable)
|
||||
|
||||
## .gitignore Updated
|
||||
|
||||
Added:
|
||||
- `logs/*.log` - Log files
|
||||
- `test-results/` - Test results
|
||||
- `playwright-report/` - Playwright reports
|
||||
- `coverage/` - Coverage reports
|
||||
- `.idea/` - IDE files
|
||||
- `.vscode/` - IDE files
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. **Test Git connection**:
|
||||
```bash
|
||||
git fetch
|
||||
```
|
||||
|
||||
2. **If SSH doesn't work**, switch back to HTTPS:
|
||||
```bash
|
||||
git remote set-url origin https://git.dk0.dev/denshooter/portfolio.git
|
||||
```
|
||||
|
||||
3. **Commit cleanup**:
|
||||
```bash
|
||||
git add .
|
||||
git commit -m "chore: Clean up old documentation and unused files"
|
||||
git push origin dev
|
||||
```
|
||||
|
||||
## Result
|
||||
|
||||
- **Removed**: ~30 files
|
||||
- **Kept**: Essential documentation and configs
|
||||
- **Fixed**: Git remote connection
|
||||
- **Updated**: .gitignore for better file management
|
||||
@@ -1,144 +0,0 @@
|
||||
# Deployment Fixes for Gitea Actions
|
||||
|
||||
## Problem Summary
|
||||
The Gitea Actions were failing with "Connection refused" errors when trying to connect to localhost:3000. This was caused by several issues:
|
||||
|
||||
1. **Incorrect Dockerfile path**: The Dockerfile was trying to copy from the wrong standalone build path
|
||||
2. **Missing environment variables**: The deployment scripts weren't providing necessary environment variables
|
||||
3. **Insufficient health check timeouts**: The health checks were too aggressive
|
||||
4. **Poor error handling**: The workflows didn't provide enough debugging information
|
||||
|
||||
## Fixes Applied
|
||||
|
||||
### 1. Fixed Dockerfile
|
||||
- **Issue**: Dockerfile was trying to copy from `/app/.next/standalone/portfolio` but the actual path was `/app/.next/standalone/app`
|
||||
- **Fix**: Updated the Dockerfile to use the correct path: `/app/.next/standalone/app`
|
||||
- **File**: `Dockerfile`
|
||||
|
||||
### 2. Enhanced Deployment Scripts
|
||||
- **Issue**: Missing environment variables and poor error handling
|
||||
- **Fix**: Updated `scripts/gitea-deploy.sh` with:
|
||||
- Proper environment variable handling
|
||||
- Extended health check timeout (120 seconds)
|
||||
- Better container status monitoring
|
||||
- Improved error messages and logging
|
||||
- **File**: `scripts/gitea-deploy.sh`
|
||||
|
||||
### 3. Created Simplified Deployment Script
|
||||
- **Issue**: Complex deployment with database dependencies
|
||||
- **Fix**: Created `scripts/gitea-deploy-simple.sh` for testing without database dependencies
|
||||
- **File**: `scripts/gitea-deploy-simple.sh`
|
||||
|
||||
### 4. Fixed Next.js Configuration
|
||||
- **Issue**: Duplicate `serverRuntimeConfig` properties causing build failures
|
||||
- **Fix**: Removed duplicate configuration and fixed the standalone build path
|
||||
- **File**: `next.config.ts`
|
||||
|
||||
### 5. Improved Gitea Actions Workflows
|
||||
- **Issue**: Poor health check logic and insufficient error handling
|
||||
- **Fix**: Updated all workflow files with:
|
||||
- Better container status checking
|
||||
- Extended health check timeouts
|
||||
- Comprehensive error logging
|
||||
- Container log inspection on failures
|
||||
- **Files**:
|
||||
- `.gitea/workflows/ci-cd-fast.yml`
|
||||
- `.gitea/workflows/ci-cd-zero-downtime-fixed.yml`
|
||||
- `.gitea/workflows/ci-cd-simple.yml` (new)
|
||||
- `.gitea/workflows/ci-cd-reliable.yml` (new)
|
||||
|
||||
#### **5. ✅ Fixed Nginx Configuration Issue**
|
||||
- **Issue**: Zero-downtime deployment failing due to missing nginx configuration file in Gitea Actions
|
||||
- **Fix**: Created `docker-compose.zero-downtime-fixed.yml` with fallback nginx configuration
|
||||
- **Added**: Automatic nginx config creation if file is missing
|
||||
- **Files**:
|
||||
- `docker-compose.zero-downtime-fixed.yml` (new)
|
||||
|
||||
#### **6. ✅ Fixed Health Check Logic**
|
||||
- **Issue**: Health checks timing out even though applications were running correctly
|
||||
- **Root Cause**: Workflows trying to access `localhost:3000` directly, but containers don't expose port 3000 to host
|
||||
- **Fix**: Updated health check logic to:
|
||||
- Use `docker exec` for internal container health checks
|
||||
- Check nginx proxy endpoints (`localhost/api/health`) for zero-downtime deployments
|
||||
- Provide fallback health check methods
|
||||
- Better error messages and debugging information
|
||||
- **Files**:
|
||||
- `.gitea/workflows/ci-cd-zero-downtime-fixed.yml` (updated)
|
||||
- `.gitea/workflows/ci-cd-fast.yml` (updated)
|
||||
|
||||
## Available Workflows
|
||||
|
||||
### 1. CI/CD Reliable (Recommended)
|
||||
- **File**: `.gitea/workflows/ci-cd-reliable.yml`
|
||||
- **Description**: Simple, reliable deployment using docker-compose with database services
|
||||
- **Best for**: Most reliable deployments with database support
|
||||
|
||||
### 2. CI/CD Simple
|
||||
- **File**: `.gitea/workflows/ci-cd-simple.yml`
|
||||
- **Description**: Uses the improved deployment script with comprehensive error handling
|
||||
- **Best for**: Reliable deployments without database dependencies
|
||||
|
||||
### 3. CI/CD Fast
|
||||
- **File**: `.gitea/workflows/ci-cd-fast.yml`
|
||||
- **Description**: Fast deployment with rolling updates
|
||||
- **Best for**: Production deployments with zero downtime
|
||||
|
||||
### 4. CI/CD Zero Downtime (Fixed)
|
||||
- **File**: `.gitea/workflows/ci-cd-zero-downtime-fixed.yml`
|
||||
- **Description**: Full zero-downtime deployment with nginx load balancer (fixed nginx config issue)
|
||||
- **Best for**: Production deployments requiring high availability
|
||||
|
||||
## Testing the Fixes
|
||||
|
||||
### Local Testing
|
||||
```bash
|
||||
# Test the simplified deployment script
|
||||
./scripts/gitea-deploy-simple.sh
|
||||
|
||||
# Test the full deployment script
|
||||
./scripts/gitea-deploy.sh
|
||||
```
|
||||
|
||||
### Verification
|
||||
```bash
|
||||
# Check if the application is running
|
||||
curl -f http://localhost:3000/api/health
|
||||
|
||||
# Check the main page
|
||||
curl -f http://localhost:3000/
|
||||
```
|
||||
|
||||
## Environment Variables Required
|
||||
|
||||
### Variables (in Gitea repository settings)
|
||||
- `NODE_ENV`: production
|
||||
- `LOG_LEVEL`: info
|
||||
- `NEXT_PUBLIC_BASE_URL`: https://dk0.dev
|
||||
- `NEXT_PUBLIC_UMAMI_URL`: https://analytics.dk0.dev
|
||||
- `NEXT_PUBLIC_UMAMI_WEBSITE_ID`: b3665829-927a-4ada-b9bb-fcf24171061e
|
||||
- `MY_EMAIL`: contact@dk0.dev
|
||||
- `MY_INFO_EMAIL`: info@dk0.dev
|
||||
|
||||
### Secrets (in Gitea repository settings)
|
||||
- `MY_PASSWORD`: Your email password
|
||||
- `MY_INFO_PASSWORD`: Your info email password
|
||||
- `ADMIN_BASIC_AUTH`: admin:your_secure_password_here
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### If deployment still fails:
|
||||
1. Check the Gitea Actions logs for specific error messages
|
||||
2. Verify all environment variables and secrets are set correctly
|
||||
3. Check if the Docker image builds successfully locally
|
||||
4. Ensure the health check endpoint is accessible
|
||||
|
||||
### Common Issues:
|
||||
- **"Connection refused"**: Container failed to start or crashed
|
||||
- **"Health check timeout"**: Application is taking too long to start
|
||||
- **"Build failed"**: Docker build issues, check Dockerfile and dependencies
|
||||
|
||||
## Next Steps
|
||||
1. Push these changes to your Gitea repository
|
||||
2. The Actions should now work without the "Connection refused" errors
|
||||
3. Monitor the deployment logs for any remaining issues
|
||||
4. Consider using the "CI/CD Simple" workflow for the most reliable deployments
|
||||
229
DEPLOYMENT.md
229
DEPLOYMENT.md
@@ -1,229 +0,0 @@
|
||||
# Portfolio Deployment Guide
|
||||
|
||||
## Overview
|
||||
|
||||
This document covers all aspects of deploying the Portfolio application, including local development, CI/CD, and production deployment.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- Docker and Docker Compose installed
|
||||
- Node.js 20+ for local development
|
||||
- Access to Gitea repository with Actions enabled
|
||||
|
||||
## Environment Setup
|
||||
|
||||
### Required Secrets in Gitea
|
||||
|
||||
Configure these secrets in your Gitea repository (Settings → Secrets):
|
||||
|
||||
| Secret Name | Description | Example |
|
||||
|-------------|-------------|---------|
|
||||
| `NEXT_PUBLIC_BASE_URL` | Public URL of your website | `https://dk0.dev` |
|
||||
| `MY_EMAIL` | Main email for contact form | `contact@dk0.dev` |
|
||||
| `MY_INFO_EMAIL` | Info email address | `info@dk0.dev` |
|
||||
| `MY_PASSWORD` | Password for main email | `your_email_password` |
|
||||
| `MY_INFO_PASSWORD` | Password for info email | `your_info_email_password` |
|
||||
| `ADMIN_BASIC_AUTH` | Admin basic auth for protected areas | `admin:your_secure_password` |
|
||||
|
||||
### Local Environment
|
||||
|
||||
1. Copy environment template:
|
||||
```bash
|
||||
cp env.example .env
|
||||
```
|
||||
|
||||
2. Update `.env` with your values:
|
||||
```bash
|
||||
NEXT_PUBLIC_BASE_URL=https://dk0.dev
|
||||
MY_EMAIL=contact@dk0.dev
|
||||
MY_INFO_EMAIL=info@dk0.dev
|
||||
MY_PASSWORD=your_email_password
|
||||
MY_INFO_PASSWORD=your_info_email_password
|
||||
ADMIN_BASIC_AUTH=admin:your_secure_password
|
||||
```
|
||||
|
||||
## Deployment Methods
|
||||
|
||||
### 1. Local Development
|
||||
|
||||
```bash
|
||||
# Start all services
|
||||
docker compose up -d
|
||||
|
||||
# View logs
|
||||
docker compose logs -f portfolio
|
||||
|
||||
# Stop services
|
||||
docker compose down
|
||||
```
|
||||
|
||||
### 2. CI/CD Pipeline (Automatic)
|
||||
|
||||
The CI/CD pipeline runs automatically on:
|
||||
- **Push to `main`**: Runs tests, linting, build, and security checks
|
||||
- **Push to `production`**: Full deployment including Docker build and deployment
|
||||
|
||||
#### Pipeline Steps:
|
||||
1. **Install dependencies** (`npm ci`)
|
||||
2. **Run linting** (`npm run lint`)
|
||||
3. **Run tests** (`npm run test`)
|
||||
4. **Build application** (`npm run build`)
|
||||
5. **Security scan** (`npm audit`)
|
||||
6. **Build Docker image** (production only)
|
||||
7. **Deploy with Docker Compose** (production only)
|
||||
|
||||
### 3. Manual Deployment
|
||||
|
||||
```bash
|
||||
# Build and start services
|
||||
docker compose up -d --build
|
||||
|
||||
# Check service status
|
||||
docker compose ps
|
||||
|
||||
# View logs
|
||||
docker compose logs -f
|
||||
```
|
||||
|
||||
## Service Configuration
|
||||
|
||||
### Portfolio App
|
||||
- **Port**: 3000 (configurable via `PORT` environment variable)
|
||||
- **Health Check**: `http://localhost:3000/api/health`
|
||||
- **Environment**: Production
|
||||
- **Resources**: 512M memory limit, 0.5 CPU limit
|
||||
|
||||
### PostgreSQL Database
|
||||
- **Port**: 5432 (internal)
|
||||
- **Database**: `portfolio_db`
|
||||
- **User**: `portfolio_user`
|
||||
- **Password**: `portfolio_pass`
|
||||
- **Health Check**: `pg_isready`
|
||||
|
||||
### Redis Cache
|
||||
- **Port**: 6379 (internal)
|
||||
- **Health Check**: `redis-cli ping`
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Common Issues
|
||||
|
||||
1. **Secrets not loading**:
|
||||
- Run the debug workflow: Actions → Debug Secrets
|
||||
- Verify all secrets are set in Gitea
|
||||
- Check secret names match exactly
|
||||
|
||||
2. **Container won't start**:
|
||||
```bash
|
||||
# Check logs
|
||||
docker compose logs portfolio
|
||||
|
||||
# Check service status
|
||||
docker compose ps
|
||||
|
||||
# Restart services
|
||||
docker compose restart
|
||||
```
|
||||
|
||||
3. **Database connection issues**:
|
||||
```bash
|
||||
# Check PostgreSQL status
|
||||
docker compose exec postgres pg_isready -U portfolio_user -d portfolio_db
|
||||
|
||||
# Check database logs
|
||||
docker compose logs postgres
|
||||
```
|
||||
|
||||
4. **Redis connection issues**:
|
||||
```bash
|
||||
# Test Redis connection
|
||||
docker compose exec redis redis-cli ping
|
||||
|
||||
# Check Redis logs
|
||||
docker compose logs redis
|
||||
```
|
||||
|
||||
### Debug Commands
|
||||
|
||||
```bash
|
||||
# Check environment variables in container
|
||||
docker exec portfolio-app env | grep -E "(DATABASE_URL|REDIS_URL|NEXT_PUBLIC_BASE_URL)"
|
||||
|
||||
# Test health endpoints
|
||||
curl -f http://localhost:3000/api/health
|
||||
|
||||
# View all service logs
|
||||
docker compose logs --tail=50
|
||||
|
||||
# Check resource usage
|
||||
docker stats
|
||||
```
|
||||
|
||||
## Monitoring
|
||||
|
||||
### Health Checks
|
||||
- **Portfolio App**: `http://localhost:3000/api/health`
|
||||
- **PostgreSQL**: `pg_isready` command
|
||||
- **Redis**: `redis-cli ping` command
|
||||
|
||||
### Logs
|
||||
```bash
|
||||
# Follow all logs
|
||||
docker compose logs -f
|
||||
|
||||
# Follow specific service logs
|
||||
docker compose logs -f portfolio
|
||||
docker compose logs -f postgres
|
||||
docker compose logs -f redis
|
||||
```
|
||||
|
||||
## Security
|
||||
|
||||
### Security Scans
|
||||
- **NPM Audit**: Runs automatically in CI/CD
|
||||
- **Dependency Check**: Checks for known vulnerabilities
|
||||
- **Secret Detection**: Prevents accidental secret commits
|
||||
|
||||
### Best Practices
|
||||
- Never commit secrets to repository
|
||||
- Use environment variables for sensitive data
|
||||
- Regularly update dependencies
|
||||
- Monitor security advisories
|
||||
|
||||
## Backup and Recovery
|
||||
|
||||
### Database Backup
|
||||
```bash
|
||||
# Create backup
|
||||
docker compose exec postgres pg_dump -U portfolio_user portfolio_db > backup.sql
|
||||
|
||||
# Restore backup
|
||||
docker compose exec -T postgres psql -U portfolio_user portfolio_db < backup.sql
|
||||
```
|
||||
|
||||
### Volume Backup
|
||||
```bash
|
||||
# Backup volumes
|
||||
docker run --rm -v portfolio_postgres_data:/data -v $(pwd):/backup alpine tar czf /backup/postgres_backup.tar.gz /data
|
||||
docker run --rm -v portfolio_redis_data:/data -v $(pwd):/backup alpine tar czf /backup/redis_backup.tar.gz /data
|
||||
```
|
||||
|
||||
## Performance Optimization
|
||||
|
||||
### Resource Limits
|
||||
- **Portfolio App**: 512M memory, 0.5 CPU
|
||||
- **PostgreSQL**: 256M memory, 0.25 CPU
|
||||
- **Redis**: Default limits
|
||||
|
||||
### Caching
|
||||
- **Next.js**: Built-in caching
|
||||
- **Redis**: Session and analytics caching
|
||||
- **Static Assets**: Served from CDN
|
||||
|
||||
## Support
|
||||
|
||||
For issues or questions:
|
||||
1. Check the troubleshooting section above
|
||||
2. Review CI/CD pipeline logs
|
||||
3. Run the debug workflow
|
||||
4. Check service health endpoints
|
||||
89
DEPLOYMENT_FIX.md
Normal file
89
DEPLOYMENT_FIX.md
Normal file
@@ -0,0 +1,89 @@
|
||||
# 🔧 Deployment Fixes Applied
|
||||
|
||||
## Issues Fixed
|
||||
|
||||
### 1. Port 3001 Already Allocated ❌ → ✅
|
||||
**Problem**: Port 3001 was already in use, causing staging deployment to fail.
|
||||
|
||||
**Fix**:
|
||||
- Changed staging port from `3001` to `3002`
|
||||
- Changed PostgreSQL staging port from `5433` to `5434`
|
||||
- Changed Redis staging port from `6380` to `6381`
|
||||
|
||||
### 2. Docker Compose Version Warning ❌ → ✅
|
||||
**Problem**: `version: '3.8'` is obsolete in newer Docker Compose.
|
||||
|
||||
**Fix**: Removed `version` line from `docker-compose.staging.yml`
|
||||
|
||||
### 3. Missing N8N Environment Variables ❌ → ✅
|
||||
**Problem**: `N8N_SECRET_TOKEN` warning appeared.
|
||||
|
||||
**Fix**: Added `N8N_WEBHOOK_URL` and `N8N_SECRET_TOKEN` to staging compose file
|
||||
|
||||
### 4. Wrong Compose File Used ❌ → ✅
|
||||
**Problem**: Gitea workflow was using wrong compose file (stopping production containers).
|
||||
|
||||
**Fix**:
|
||||
- Updated `ci-cd-with-gitea-vars.yml` to detect branch and use correct compose file
|
||||
- Created dedicated `staging-deploy.yml` workflow
|
||||
- Staging now uses `docker-compose.staging.yml`
|
||||
- Production uses `docker-compose.production.yml`
|
||||
|
||||
## Updated Ports
|
||||
|
||||
| Service | Staging | Production |
|
||||
|---------|---------|------------|
|
||||
| App | **3002** ✅ | **3000** |
|
||||
| PostgreSQL | **5434** ✅ | **5432** |
|
||||
| Redis | **6381** ✅ | **6379** |
|
||||
|
||||
## How It Works Now
|
||||
|
||||
### Staging (dev/main branch)
|
||||
```bash
|
||||
git push origin dev
|
||||
# → Uses docker-compose.staging.yml
|
||||
# → Deploys to port 3002
|
||||
# → Does NOT touch production containers
|
||||
```
|
||||
|
||||
### Production (production branch)
|
||||
```bash
|
||||
git push origin production
|
||||
# → Uses docker-compose.production.yml
|
||||
# → Deploys to port 3000
|
||||
# → Zero-downtime deployment
|
||||
# → Does NOT touch staging containers
|
||||
```
|
||||
|
||||
## Files Updated
|
||||
|
||||
- ✅ `docker-compose.staging.yml` - Fixed ports, removed version, added N8N vars
|
||||
- ✅ `.gitea/workflows/ci-cd-with-gitea-vars.yml` - Branch detection, correct compose files
|
||||
- ✅ `.gitea/workflows/staging-deploy.yml` - New dedicated staging workflow
|
||||
- ✅ `STAGING_SETUP.md` - Updated port references
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. **Test staging deployment**:
|
||||
```bash
|
||||
git push origin dev
|
||||
# Should deploy to port 3002 without errors
|
||||
```
|
||||
|
||||
2. **Verify staging**:
|
||||
```bash
|
||||
curl http://localhost:3002/api/health
|
||||
```
|
||||
|
||||
3. **When ready for production**:
|
||||
```bash
|
||||
git checkout production
|
||||
git merge main
|
||||
git push origin production
|
||||
# Deploys safely to port 3000
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
**All fixes applied!** Staging and production are now completely isolated. 🚀
|
||||
@@ -62,8 +62,8 @@ COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
||||
COPY --from=builder /app/prisma ./prisma
|
||||
COPY --from=builder /app/node_modules/.prisma ./node_modules/.prisma
|
||||
|
||||
# Copy environment file
|
||||
COPY --from=builder /app/.env* ./
|
||||
# Note: Environment variables should be passed via docker-compose or runtime environment
|
||||
# DO NOT copy .env files into the image for security reasons
|
||||
|
||||
USER nextjs
|
||||
|
||||
|
||||
53
GIT_CONNECTION_FIX.md
Normal file
53
GIT_CONNECTION_FIX.md
Normal file
@@ -0,0 +1,53 @@
|
||||
# 🔧 Git Connection Fix
|
||||
|
||||
## Issue
|
||||
```
|
||||
fatal: unable to access 'https://git.dk0.dev/denshooter/portfolio/':
|
||||
Failed to connect to git.dk0.dev port 443 after 75002 ms: Couldn't connect to server
|
||||
```
|
||||
|
||||
## Solutions
|
||||
|
||||
### Option 1: Check Server Status
|
||||
The server is reachable via HTTP (tested), but Git might need authentication.
|
||||
|
||||
### Option 2: Configure Git Credentials
|
||||
```bash
|
||||
# Store credentials
|
||||
git config --global credential.helper store
|
||||
|
||||
# Or use keychain (macOS)
|
||||
git config --global credential.helper osxkeychain
|
||||
```
|
||||
|
||||
### Option 3: Use Personal Access Token
|
||||
1. Go to: https://git.dk0.dev/user/settings/applications
|
||||
2. Generate a new token
|
||||
3. Use it when pushing:
|
||||
```bash
|
||||
git push https://YOUR_TOKEN@git.dk0.dev/denshooter/portfolio.git
|
||||
```
|
||||
|
||||
### Option 4: Check Firewall/Network
|
||||
- Port 443 might be blocked
|
||||
- Try from different network
|
||||
- Check if VPN is needed
|
||||
|
||||
### Option 5: Use SSH (if port 22 opens)
|
||||
```bash
|
||||
git remote set-url origin git@git.dk0.dev:denshooter/portfolio.git
|
||||
```
|
||||
|
||||
## Current Status
|
||||
- Remote URL: `https://git.dk0.dev/denshooter/portfolio.git`
|
||||
- Server reachable: ✅ (HTTP works)
|
||||
- Git connection: ⚠️ (May need credentials)
|
||||
|
||||
## Quick Test
|
||||
```bash
|
||||
# Test connection
|
||||
curl -I https://git.dk0.dev
|
||||
|
||||
# Test Git
|
||||
git ls-remote https://git.dk0.dev/denshooter/portfolio.git
|
||||
```
|
||||
@@ -1,279 +0,0 @@
|
||||
# Production Deployment Guide for dk0.dev
|
||||
|
||||
This guide will help you deploy the portfolio application to production on dk0.dev.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
1. **Server Requirements:**
|
||||
- Ubuntu 20.04+ or similar Linux distribution
|
||||
- Docker and Docker Compose installed
|
||||
- Nginx or Traefik for reverse proxy
|
||||
- SSL certificates (Let's Encrypt recommended)
|
||||
- Domain `dk0.dev` pointing to your server
|
||||
|
||||
2. **Required Environment Variables:**
|
||||
- `MY_EMAIL`: Your contact email
|
||||
- `MY_INFO_EMAIL`: Your info email
|
||||
- `MY_PASSWORD`: Email password
|
||||
- `MY_INFO_PASSWORD`: Info email password
|
||||
- `ADMIN_BASIC_AUTH`: Admin credentials (format: `username:password`)
|
||||
|
||||
## Quick Deployment
|
||||
|
||||
### 1. Clone and Setup
|
||||
|
||||
```bash
|
||||
# Clone the repository
|
||||
git clone <your-repo-url>
|
||||
cd portfolio
|
||||
|
||||
# Make deployment script executable
|
||||
chmod +x scripts/production-deploy.sh
|
||||
```
|
||||
|
||||
### 2. Configure Environment
|
||||
|
||||
Create a `.env` file with your production settings:
|
||||
|
||||
```bash
|
||||
# Copy the example
|
||||
cp env.example .env
|
||||
|
||||
# Edit with your values
|
||||
nano .env
|
||||
```
|
||||
|
||||
Required values:
|
||||
```env
|
||||
NODE_ENV=production
|
||||
NEXT_PUBLIC_BASE_URL=https://dk0.dev
|
||||
MY_EMAIL=contact@dk0.dev
|
||||
MY_INFO_EMAIL=info@dk0.dev
|
||||
MY_PASSWORD=your-actual-email-password
|
||||
MY_INFO_PASSWORD=your-actual-info-password
|
||||
ADMIN_BASIC_AUTH=admin:your-secure-password
|
||||
```
|
||||
|
||||
### 3. Deploy
|
||||
|
||||
```bash
|
||||
# Run the production deployment script
|
||||
./scripts/production-deploy.sh
|
||||
```
|
||||
|
||||
### 4. Setup Reverse Proxy
|
||||
|
||||
#### Option A: Nginx (Recommended)
|
||||
|
||||
1. Install Nginx:
|
||||
```bash
|
||||
sudo apt update
|
||||
sudo apt install nginx
|
||||
```
|
||||
|
||||
2. Copy the production nginx config:
|
||||
```bash
|
||||
sudo cp nginx.production.conf /etc/nginx/nginx.conf
|
||||
```
|
||||
|
||||
3. Setup SSL certificates:
|
||||
```bash
|
||||
# Install Certbot
|
||||
sudo apt install certbot python3-certbot-nginx
|
||||
|
||||
# Get SSL certificate
|
||||
sudo certbot --nginx -d dk0.dev -d www.dk0.dev
|
||||
```
|
||||
|
||||
4. Restart Nginx:
|
||||
```bash
|
||||
sudo systemctl restart nginx
|
||||
sudo systemctl enable nginx
|
||||
```
|
||||
|
||||
#### Option B: Traefik
|
||||
|
||||
If using Traefik, ensure your Docker Compose file includes Traefik labels:
|
||||
|
||||
```yaml
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.portfolio.rule=Host(`dk0.dev`)"
|
||||
- "traefik.http.routers.portfolio.tls=true"
|
||||
- "traefik.http.routers.portfolio.tls.certresolver=letsencrypt"
|
||||
```
|
||||
|
||||
## Manual Deployment Steps
|
||||
|
||||
If you prefer manual deployment:
|
||||
|
||||
### 1. Create Proxy Network
|
||||
|
||||
```bash
|
||||
docker network create proxy
|
||||
```
|
||||
|
||||
### 2. Build and Start Services
|
||||
|
||||
```bash
|
||||
# Build the application
|
||||
docker build -t portfolio-app:latest .
|
||||
|
||||
# Start services
|
||||
docker-compose -f docker-compose.production.yml up -d
|
||||
```
|
||||
|
||||
### 3. Run Database Migrations
|
||||
|
||||
```bash
|
||||
# Wait for services to be healthy
|
||||
sleep 30
|
||||
|
||||
# Run migrations
|
||||
docker exec portfolio-app npx prisma db push
|
||||
```
|
||||
|
||||
### 4. Verify Deployment
|
||||
|
||||
```bash
|
||||
# Check health
|
||||
curl http://localhost:3000/api/health
|
||||
|
||||
# Check admin panel
|
||||
curl http://localhost:3000/manage
|
||||
```
|
||||
|
||||
## Security Considerations
|
||||
|
||||
### 1. Update Default Passwords
|
||||
|
||||
**CRITICAL:** Change these default values:
|
||||
|
||||
```env
|
||||
# Change the admin password
|
||||
ADMIN_BASIC_AUTH=admin:your-very-secure-password-here
|
||||
|
||||
# Use strong email passwords
|
||||
MY_PASSWORD=your-strong-email-password
|
||||
MY_INFO_PASSWORD=your-strong-info-password
|
||||
```
|
||||
|
||||
### 2. Firewall Configuration
|
||||
|
||||
```bash
|
||||
# Allow only necessary ports
|
||||
sudo ufw allow 22 # SSH
|
||||
sudo ufw allow 80 # HTTP
|
||||
sudo ufw allow 443 # HTTPS
|
||||
sudo ufw enable
|
||||
```
|
||||
|
||||
### 3. SSL/TLS Configuration
|
||||
|
||||
Ensure you have valid SSL certificates. The nginx configuration expects:
|
||||
- `/etc/nginx/ssl/cert.pem` (SSL certificate)
|
||||
- `/etc/nginx/ssl/key.pem` (SSL private key)
|
||||
|
||||
## Monitoring and Maintenance
|
||||
|
||||
### 1. Health Checks
|
||||
|
||||
```bash
|
||||
# Check application health
|
||||
curl https://dk0.dev/api/health
|
||||
|
||||
# Check container status
|
||||
docker-compose ps
|
||||
|
||||
# View logs
|
||||
docker-compose logs -f
|
||||
```
|
||||
|
||||
### 2. Backup Database
|
||||
|
||||
```bash
|
||||
# Create backup
|
||||
docker exec portfolio-postgres pg_dump -U portfolio_user portfolio_db > backup.sql
|
||||
|
||||
# Restore backup
|
||||
docker exec -i portfolio-postgres psql -U portfolio_user portfolio_db < backup.sql
|
||||
```
|
||||
|
||||
### 3. Update Application
|
||||
|
||||
```bash
|
||||
# Pull latest changes
|
||||
git pull origin main
|
||||
|
||||
# Rebuild and restart
|
||||
docker-compose down
|
||||
docker build -t portfolio-app:latest .
|
||||
docker-compose up -d
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Common Issues
|
||||
|
||||
1. **Port 3000 not accessible:**
|
||||
- Check if the container is running: `docker ps`
|
||||
- Check logs: `docker-compose logs portfolio`
|
||||
|
||||
2. **Database connection issues:**
|
||||
- Ensure PostgreSQL is healthy: `docker-compose ps`
|
||||
- Check database logs: `docker-compose logs postgres`
|
||||
|
||||
3. **SSL certificate issues:**
|
||||
- Verify certificate files exist and are readable
|
||||
- Check nginx configuration: `nginx -t`
|
||||
|
||||
4. **Rate limiting issues:**
|
||||
- Check nginx rate limiting configuration
|
||||
- Adjust limits in `nginx.production.conf`
|
||||
|
||||
### Logs and Debugging
|
||||
|
||||
```bash
|
||||
# Application logs
|
||||
docker-compose logs -f portfolio
|
||||
|
||||
# Database logs
|
||||
docker-compose logs -f postgres
|
||||
|
||||
# Nginx logs
|
||||
sudo tail -f /var/log/nginx/access.log
|
||||
sudo tail -f /var/log/nginx/error.log
|
||||
```
|
||||
|
||||
## Performance Optimization
|
||||
|
||||
### 1. Resource Limits
|
||||
|
||||
The production Docker Compose file includes resource limits:
|
||||
- Portfolio app: 1GB RAM, 1 CPU
|
||||
- PostgreSQL: 512MB RAM, 0.5 CPU
|
||||
- Redis: 256MB RAM, 0.25 CPU
|
||||
|
||||
### 2. Caching
|
||||
|
||||
- Static assets are cached for 1 year
|
||||
- API responses are cached for 10 minutes
|
||||
- Admin routes are not cached for security
|
||||
|
||||
### 3. Rate Limiting
|
||||
|
||||
- API routes: 20 requests/second
|
||||
- Login routes: 10 requests/minute
|
||||
- Admin routes: 5 requests/minute
|
||||
|
||||
## Support
|
||||
|
||||
If you encounter issues:
|
||||
|
||||
1. Check the logs first
|
||||
2. Verify all environment variables are set
|
||||
3. Ensure all services are healthy
|
||||
4. Check network connectivity
|
||||
5. Verify SSL certificates are valid
|
||||
|
||||
For additional help, check the application logs and ensure all prerequisites are met.
|
||||
324
SAFE_PUSH_TO_MAIN.md
Normal file
324
SAFE_PUSH_TO_MAIN.md
Normal file
@@ -0,0 +1,324 @@
|
||||
# 🚀 Safe Push to Main Branch Guide
|
||||
|
||||
**IMPORTANT**: This guide ensures you don't break production when merging to main.
|
||||
|
||||
## ⚠️ Pre-Flight Checklist
|
||||
|
||||
Before even thinking about pushing to main, verify ALL of these:
|
||||
|
||||
### 1. Code Quality ✅
|
||||
```bash
|
||||
# Run all checks
|
||||
npm run build # Must pass with 0 errors
|
||||
npm run lint # Must pass with 0 errors
|
||||
npx tsc --noEmit # TypeScript must be clean
|
||||
npx prisma format # Database schema must be valid
|
||||
```
|
||||
|
||||
### 1b. Automated Testing ✅
|
||||
```bash
|
||||
# Run comprehensive test suite (RECOMMENDED)
|
||||
npm run test:all # Runs all tests including E2E
|
||||
|
||||
# Or run individually:
|
||||
npm run test # Unit tests
|
||||
npm run test:critical # Critical path E2E tests
|
||||
npm run test:hydration # Hydration tests
|
||||
npm run test:email # Email API tests
|
||||
```
|
||||
|
||||
### 2. Testing ✅
|
||||
```bash
|
||||
# Automated testing (RECOMMENDED)
|
||||
npm run test:all # Runs all automated tests
|
||||
|
||||
# Manual testing (if needed)
|
||||
npm run dev
|
||||
# Test these critical paths:
|
||||
# - Home page loads
|
||||
# - Projects page works
|
||||
# - Admin dashboard accessible
|
||||
# - API endpoints respond
|
||||
# - No console errors
|
||||
# - No hydration errors
|
||||
```
|
||||
|
||||
### 3. Database Changes ✅
|
||||
```bash
|
||||
# If you changed the database schema:
|
||||
# 1. Create migration
|
||||
npx prisma migrate dev --name your_migration_name
|
||||
|
||||
# 2. Test migration on a copy of production data
|
||||
# 3. Document migration steps
|
||||
# 4. Create rollback plan
|
||||
```
|
||||
|
||||
### 4. Environment Variables ✅
|
||||
- [ ] All new env vars documented in `env.example`
|
||||
- [ ] No secrets committed to git
|
||||
- [ ] Production env vars are set on server
|
||||
- [ ] Optional features have fallbacks
|
||||
|
||||
### 5. Breaking Changes ✅
|
||||
- [ ] Documented in CHANGELOG
|
||||
- [ ] Backward compatible OR migration plan exists
|
||||
- [ ] Team notified of changes
|
||||
|
||||
---
|
||||
|
||||
## 📋 Step-by-Step Push Process
|
||||
|
||||
### Step 1: Ensure You're on Dev Branch
|
||||
```bash
|
||||
git checkout dev
|
||||
git pull origin dev # Get latest changes
|
||||
```
|
||||
|
||||
### Step 2: Final Verification
|
||||
```bash
|
||||
# Clean build
|
||||
rm -rf .next node_modules/.cache
|
||||
npm install
|
||||
npm run build
|
||||
|
||||
# Should complete without errors
|
||||
```
|
||||
|
||||
### Step 3: Review Your Changes
|
||||
```bash
|
||||
# See what you're about to push
|
||||
git log origin/main..dev --oneline
|
||||
git diff origin/main..dev
|
||||
|
||||
# Review carefully:
|
||||
# - No accidental secrets
|
||||
# - No debug code
|
||||
# - No temporary files
|
||||
# - All changes are intentional
|
||||
```
|
||||
|
||||
### Step 4: Create a Backup Branch (Safety Net)
|
||||
```bash
|
||||
# Create backup before merging
|
||||
git checkout -b backup-before-main-merge-$(date +%Y%m%d)
|
||||
git push origin backup-before-main-merge-$(date +%Y%m%d)
|
||||
git checkout dev
|
||||
```
|
||||
|
||||
### Step 5: Merge Dev into Main (Local)
|
||||
```bash
|
||||
# Switch to main
|
||||
git checkout main
|
||||
git pull origin main # Get latest main
|
||||
|
||||
# Merge dev into main
|
||||
git merge dev --no-ff -m "Merge dev into main: [describe changes]"
|
||||
|
||||
# If conflicts occur:
|
||||
# 1. Resolve conflicts carefully
|
||||
# 2. Test after resolving
|
||||
# 3. Don't force push if unsure
|
||||
```
|
||||
|
||||
### Step 6: Test the Merged Code
|
||||
```bash
|
||||
# Build and test the merged code
|
||||
npm run build
|
||||
npm run dev
|
||||
|
||||
# Test critical paths again
|
||||
# - Home page
|
||||
# - Projects
|
||||
# - Admin
|
||||
# - APIs
|
||||
```
|
||||
|
||||
### Step 7: Push to Main (If Everything Looks Good)
|
||||
```bash
|
||||
# Push to remote main
|
||||
git push origin main
|
||||
|
||||
# If you need to force push (DANGEROUS - only if necessary):
|
||||
# git push origin main --force-with-lease
|
||||
```
|
||||
|
||||
### Step 8: Monitor Deployment
|
||||
```bash
|
||||
# Watch your deployment logs
|
||||
# Check for errors
|
||||
# Verify health endpoints
|
||||
# Test production site
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🛡️ Safety Strategies
|
||||
|
||||
### Strategy 1: Feature Flags
|
||||
If you're adding new features, use feature flags:
|
||||
```typescript
|
||||
// In your code
|
||||
if (process.env.ENABLE_NEW_FEATURE === 'true') {
|
||||
// New feature code
|
||||
}
|
||||
```
|
||||
|
||||
### Strategy 2: Gradual Rollout
|
||||
- Deploy to staging first
|
||||
- Test thoroughly
|
||||
- Then deploy to production
|
||||
- Monitor closely
|
||||
|
||||
### Strategy 3: Database Migrations
|
||||
```bash
|
||||
# Always test migrations first
|
||||
# 1. Backup production database
|
||||
# 2. Test migration on copy
|
||||
# 3. Create rollback script
|
||||
# 4. Run migration during low-traffic period
|
||||
```
|
||||
|
||||
### Strategy 4: Rollback Plan
|
||||
Always have a rollback plan:
|
||||
```bash
|
||||
# If something breaks:
|
||||
git revert HEAD
|
||||
git push origin main
|
||||
|
||||
# Or rollback to previous commit:
|
||||
git reset --hard <previous-commit-hash>
|
||||
git push origin main --force-with-lease
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🚨 Red Flags - DON'T PUSH IF:
|
||||
|
||||
- ❌ Build fails
|
||||
- ❌ Tests fail
|
||||
- ❌ Linter errors
|
||||
- ❌ TypeScript errors
|
||||
- ❌ Database migration not tested
|
||||
- ❌ Breaking changes not documented
|
||||
- ❌ Secrets in code
|
||||
- ❌ Debug code left in
|
||||
- ❌ Console.logs everywhere
|
||||
- ❌ Untested features
|
||||
- ❌ No rollback plan
|
||||
|
||||
---
|
||||
|
||||
## ✅ Green Lights - SAFE TO PUSH IF:
|
||||
|
||||
- ✅ All checks pass
|
||||
- ✅ Tested locally
|
||||
- ✅ Database migrations tested
|
||||
- ✅ No breaking changes (or documented)
|
||||
- ✅ Documentation updated
|
||||
- ✅ Team notified
|
||||
- ✅ Rollback plan exists
|
||||
- ✅ Feature flags for new features
|
||||
- ✅ Environment variables documented
|
||||
|
||||
---
|
||||
|
||||
## 📝 Pre-Push Checklist Template
|
||||
|
||||
Copy this and check each item:
|
||||
|
||||
```
|
||||
[ ] npm run build passes
|
||||
[ ] npm run lint passes
|
||||
[ ] npx tsc --noEmit passes
|
||||
[ ] npx prisma format passes
|
||||
[ ] npm run test:all passes (automated tests)
|
||||
[ ] OR manual testing:
|
||||
[ ] Dev server starts without errors
|
||||
[ ] Home page loads correctly
|
||||
[ ] Projects page works
|
||||
[ ] Admin dashboard accessible
|
||||
[ ] API endpoints respond
|
||||
[ ] No console errors
|
||||
[ ] No hydration errors
|
||||
[ ] Database migrations tested (if any)
|
||||
[ ] Environment variables documented
|
||||
[ ] No secrets in code
|
||||
[ ] Breaking changes documented
|
||||
[ ] CHANGELOG updated
|
||||
[ ] Team notified (if needed)
|
||||
[ ] Rollback plan exists
|
||||
[ ] Backup branch created
|
||||
[ ] Changes reviewed
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔄 Alternative: Pull Request Workflow
|
||||
|
||||
If you want extra safety, use PR workflow:
|
||||
|
||||
```bash
|
||||
# 1. Push dev branch
|
||||
git push origin dev
|
||||
|
||||
# 2. Create Pull Request on Git platform
|
||||
# - Review changes
|
||||
# - Get approval
|
||||
# - Run CI/CD checks
|
||||
|
||||
# 3. Merge PR to main (platform handles it)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🆘 Emergency Rollback
|
||||
|
||||
If production breaks after push:
|
||||
|
||||
### Quick Rollback
|
||||
```bash
|
||||
# 1. Revert the merge commit
|
||||
git revert -m 1 <merge-commit-hash>
|
||||
git push origin main
|
||||
|
||||
# 2. Or reset to previous state
|
||||
git reset --hard <previous-commit>
|
||||
git push origin main --force-with-lease
|
||||
```
|
||||
|
||||
### Database Rollback
|
||||
```bash
|
||||
# If you ran migrations, roll them back:
|
||||
npx prisma migrate resolve --rolled-back <migration-name>
|
||||
|
||||
# Or restore from backup
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📞 Need Help?
|
||||
|
||||
If unsure:
|
||||
1. **Don't push** - better safe than sorry
|
||||
2. Test more thoroughly
|
||||
3. Ask for code review
|
||||
4. Use staging environment first
|
||||
5. Create a PR for review
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Best Practices
|
||||
|
||||
1. **Always test locally first**
|
||||
2. **Use feature flags for new features**
|
||||
3. **Test database migrations on copies**
|
||||
4. **Document everything**
|
||||
5. **Have a rollback plan**
|
||||
6. **Monitor after deployment**
|
||||
7. **Deploy during low-traffic periods**
|
||||
8. **Keep main branch stable**
|
||||
|
||||
---
|
||||
|
||||
**Remember**: It's better to delay a push than to break production! 🛡️
|
||||
195
STAGING_SETUP.md
Normal file
195
STAGING_SETUP.md
Normal file
@@ -0,0 +1,195 @@
|
||||
# 🚀 Staging Environment Setup
|
||||
|
||||
## Overview
|
||||
|
||||
You now have **two separate Docker stacks**:
|
||||
|
||||
1. **Staging** - Deploys automatically on `dev` or `main` branch
|
||||
- Port: `3002`
|
||||
- Container: `portfolio-app-staging`
|
||||
- Database: `portfolio_staging_db` (port 5433)
|
||||
- Redis: `portfolio-redis-staging` (port 6380)
|
||||
- URL: `https://staging.dk0.dev` (or `http://localhost:3002`)
|
||||
|
||||
2. **Production** - Deploys automatically on `production` branch
|
||||
- Port: `3000`
|
||||
- Container: `portfolio-app`
|
||||
- Database: `portfolio_db` (port 5432)
|
||||
- Redis: `portfolio-redis` (port 6379)
|
||||
- URL: `https://dk0.dev`
|
||||
|
||||
## How It Works
|
||||
|
||||
### Automatic Staging Deployment
|
||||
When you push to `dev` or `main` branch:
|
||||
1. ✅ Tests run
|
||||
2. ✅ Docker image is built and tagged as `staging`
|
||||
3. ✅ Staging stack deploys automatically
|
||||
4. ✅ Available on port 3002
|
||||
|
||||
### Automatic Production Deployment
|
||||
When you merge to `production` branch:
|
||||
1. ✅ Tests run
|
||||
2. ✅ Docker image is built and tagged as `production`
|
||||
3. ✅ **Zero-downtime deployment** (blue-green)
|
||||
4. ✅ Health checks before switching
|
||||
5. ✅ Rollback if health check fails
|
||||
6. ✅ Available on port 3000
|
||||
|
||||
## Safety Features
|
||||
|
||||
### Production Deployment Safety
|
||||
- ✅ **Zero-downtime**: New container starts before old one stops
|
||||
- ✅ **Health checks**: Verifies new container is healthy before switching
|
||||
- ✅ **Automatic rollback**: If health check fails, old container stays running
|
||||
- ✅ **Separate networks**: Staging and production are completely isolated
|
||||
- ✅ **Different ports**: No port conflicts
|
||||
- ✅ **Separate databases**: Staging data doesn't affect production
|
||||
|
||||
### Staging Deployment
|
||||
- ✅ **Non-blocking**: Staging can fail without affecting production
|
||||
- ✅ **Isolated**: Completely separate from production
|
||||
- ✅ **Safe to test**: Break staging without breaking production
|
||||
|
||||
## Ports Used
|
||||
|
||||
| Service | Staging | Production |
|
||||
|---------|---------|------------|
|
||||
| App | 3002 | 3000 |
|
||||
| PostgreSQL | 5434 | 5432 |
|
||||
| Redis | 6381 | 6379 |
|
||||
|
||||
## Workflow
|
||||
|
||||
### Development Flow
|
||||
```bash
|
||||
# 1. Work on dev branch
|
||||
git checkout dev
|
||||
# ... make changes ...
|
||||
|
||||
# 2. Push to dev (triggers staging deployment)
|
||||
git push origin dev
|
||||
# → Staging deploys automatically on port 3002
|
||||
|
||||
# 3. Test staging
|
||||
curl http://localhost:3002/api/health
|
||||
|
||||
# 4. Merge to main (also triggers staging)
|
||||
git checkout main
|
||||
git merge dev
|
||||
git push origin main
|
||||
# → Staging updates automatically
|
||||
|
||||
# 5. When ready, merge to production
|
||||
git checkout production
|
||||
git merge main
|
||||
git push origin production
|
||||
# → Production deploys with zero-downtime
|
||||
```
|
||||
|
||||
## Manual Commands
|
||||
|
||||
### Staging
|
||||
```bash
|
||||
# Start staging
|
||||
docker compose -f docker-compose.staging.yml up -d
|
||||
|
||||
# Stop staging
|
||||
docker compose -f docker-compose.staging.yml down
|
||||
|
||||
# View staging logs
|
||||
docker compose -f docker-compose.staging.yml logs -f
|
||||
|
||||
# Check staging health
|
||||
curl http://localhost:3002/api/health
|
||||
```
|
||||
|
||||
### Production
|
||||
```bash
|
||||
# Start production
|
||||
docker compose -f docker-compose.production.yml up -d
|
||||
|
||||
# Stop production
|
||||
docker compose -f docker-compose.production.yml down
|
||||
|
||||
# View production logs
|
||||
docker compose -f docker-compose.production.yml logs -f
|
||||
|
||||
# Check production health
|
||||
curl http://localhost:3000/api/health
|
||||
```
|
||||
|
||||
## Environment Variables
|
||||
|
||||
### Staging
|
||||
- `NODE_ENV=staging`
|
||||
- `NEXT_PUBLIC_BASE_URL=https://staging.dk0.dev`
|
||||
- `LOG_LEVEL=debug` (more verbose logging)
|
||||
|
||||
### Production
|
||||
- `NODE_ENV=production`
|
||||
- `NEXT_PUBLIC_BASE_URL=https://dk0.dev`
|
||||
- `LOG_LEVEL=info`
|
||||
|
||||
## Database Separation
|
||||
|
||||
- **Staging DB**: `portfolio_staging_db` (separate volume)
|
||||
- **Production DB**: `portfolio_db` (separate volume)
|
||||
- **No conflicts**: Staging can be reset without affecting production
|
||||
|
||||
## Monitoring
|
||||
|
||||
### Check Both Environments
|
||||
```bash
|
||||
# Staging
|
||||
curl http://localhost:3002/api/health
|
||||
|
||||
# Production
|
||||
curl http://localhost:3000/api/health
|
||||
```
|
||||
|
||||
### View Container Status
|
||||
```bash
|
||||
# All containers
|
||||
docker ps
|
||||
|
||||
# Staging only
|
||||
docker ps | grep staging
|
||||
|
||||
# Production only
|
||||
docker ps | grep -v staging
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Staging Not Deploying
|
||||
1. Check GitHub Actions workflow
|
||||
2. Verify branch is `dev` or `main`
|
||||
3. Check Docker logs: `docker compose -f docker-compose.staging.yml logs`
|
||||
|
||||
### Production Deployment Issues
|
||||
1. Check health endpoint before deployment
|
||||
2. Verify old container is running
|
||||
3. Check logs: `docker compose -f docker-compose.production.yml logs`
|
||||
4. Manual rollback: Restart old container if needed
|
||||
|
||||
### Port Conflicts
|
||||
- Staging uses 3002, 5434, 6381
|
||||
- Production uses 3000, 5432, 6379
|
||||
- If conflicts occur, check what's using the ports:
|
||||
```bash
|
||||
lsof -i :3002
|
||||
lsof -i :3000
|
||||
```
|
||||
|
||||
## Benefits
|
||||
|
||||
✅ **Safe testing**: Test on staging without risk
|
||||
✅ **Zero-downtime**: Production updates don't interrupt service
|
||||
✅ **Isolation**: Staging and production are completely separate
|
||||
✅ **Automatic**: Deploys happen automatically on push
|
||||
✅ **Rollback**: Automatic rollback if deployment fails
|
||||
|
||||
---
|
||||
|
||||
**You're all set!** Push to `dev`/`main` for staging, merge to `production` for production deployment! 🚀
|
||||
284
TESTING_GUIDE.md
Normal file
284
TESTING_GUIDE.md
Normal file
@@ -0,0 +1,284 @@
|
||||
# 🧪 Automated Testing Guide
|
||||
|
||||
This guide explains how to run automated tests for critical paths, hydration, emails, and more.
|
||||
|
||||
## 📋 Test Types
|
||||
|
||||
### 1. Unit Tests (Jest)
|
||||
Tests individual components and functions in isolation.
|
||||
|
||||
```bash
|
||||
npm run test # Run all unit tests
|
||||
npm run test:watch # Watch mode
|
||||
npm run test:coverage # With coverage report
|
||||
```
|
||||
|
||||
### 2. E2E Tests (Playwright)
|
||||
Tests complete user flows in a real browser.
|
||||
|
||||
```bash
|
||||
npm run test:e2e # Run all E2E tests
|
||||
npm run test:e2e:ui # Run with UI mode (visual)
|
||||
npm run test:e2e:headed # Run with visible browser
|
||||
npm run test:e2e:debug # Debug mode
|
||||
```
|
||||
|
||||
### 3. Critical Path Tests
|
||||
Tests the most important user flows.
|
||||
|
||||
```bash
|
||||
npm run test:critical # Run critical path tests only
|
||||
```
|
||||
|
||||
### 4. Hydration Tests
|
||||
Ensures React hydration works without errors.
|
||||
|
||||
```bash
|
||||
npm run test:hydration # Run hydration tests only
|
||||
```
|
||||
|
||||
### 5. Email Tests
|
||||
Tests email API endpoints.
|
||||
|
||||
```bash
|
||||
npm run test:email # Run email tests only
|
||||
```
|
||||
|
||||
### 6. Performance Tests
|
||||
Checks page load times and performance.
|
||||
|
||||
```bash
|
||||
npm run test:performance # Run performance tests
|
||||
```
|
||||
|
||||
### 7. Accessibility Tests
|
||||
Basic accessibility checks.
|
||||
|
||||
```bash
|
||||
npm run test:accessibility # Run accessibility tests
|
||||
```
|
||||
|
||||
## 🚀 Running All Tests
|
||||
|
||||
### Quick Test (Recommended)
|
||||
```bash
|
||||
npm run test:all
|
||||
```
|
||||
|
||||
This runs:
|
||||
- ✅ TypeScript check
|
||||
- ✅ ESLint
|
||||
- ✅ Build
|
||||
- ✅ Unit tests
|
||||
- ✅ Critical paths
|
||||
- ✅ Hydration tests
|
||||
- ✅ Email tests
|
||||
- ✅ Performance tests
|
||||
- ✅ Accessibility tests
|
||||
|
||||
### Individual Test Suites
|
||||
```bash
|
||||
# Unit tests only
|
||||
npm run test
|
||||
|
||||
# E2E tests only
|
||||
npm run test:e2e
|
||||
|
||||
# Both
|
||||
npm run test && npm run test:e2e
|
||||
```
|
||||
|
||||
## 📝 What Gets Tested
|
||||
|
||||
### Critical Paths
|
||||
- ✅ Home page loads correctly
|
||||
- ✅ Projects page displays projects
|
||||
- ✅ Individual project pages work
|
||||
- ✅ Admin dashboard is accessible
|
||||
- ✅ API health endpoint
|
||||
- ✅ API projects endpoint
|
||||
|
||||
### Hydration
|
||||
- ✅ No hydration errors in console
|
||||
- ✅ No duplicate React key warnings
|
||||
- ✅ Client-side navigation works
|
||||
- ✅ Server and client HTML match
|
||||
- ✅ Interactive elements work after hydration
|
||||
|
||||
### Email
|
||||
- ✅ Email API accepts requests
|
||||
- ✅ Required field validation
|
||||
- ✅ Email format validation
|
||||
- ✅ Rate limiting (if implemented)
|
||||
- ✅ Email respond endpoint
|
||||
|
||||
### Performance
|
||||
- ✅ Page load times (< 5s)
|
||||
- ✅ No large layout shifts
|
||||
- ✅ Images are optimized
|
||||
- ✅ API response times (< 1s)
|
||||
|
||||
### Accessibility
|
||||
- ✅ Proper heading structure
|
||||
- ✅ Images have alt text
|
||||
- ✅ Links have descriptive text
|
||||
- ✅ Forms have labels
|
||||
|
||||
## 🎯 Pre-Push Testing
|
||||
|
||||
Before pushing to main, run:
|
||||
|
||||
```bash
|
||||
# Full test suite
|
||||
npm run test:all
|
||||
|
||||
# Or manually:
|
||||
npm run build
|
||||
npm run lint
|
||||
npx tsc --noEmit
|
||||
npm run test
|
||||
npm run test:critical
|
||||
npm run test:hydration
|
||||
```
|
||||
|
||||
## 🔧 Configuration
|
||||
|
||||
### Playwright Config
|
||||
Located in `playwright.config.ts`
|
||||
|
||||
- **Base URL**: `http://localhost:3000` (or set `PLAYWRIGHT_TEST_BASE_URL`)
|
||||
- **Browsers**: Chromium, Firefox, WebKit, Mobile Chrome, Mobile Safari
|
||||
- **Retries**: 2 retries in CI, 0 locally
|
||||
- **Screenshots**: On failure
|
||||
- **Videos**: On failure
|
||||
|
||||
### Jest Config
|
||||
Located in `jest.config.ts`
|
||||
|
||||
- **Environment**: jsdom
|
||||
- **Coverage**: v8 provider
|
||||
- **Setup**: `jest.setup.ts`
|
||||
|
||||
## 🐛 Debugging Tests
|
||||
|
||||
### Playwright Debug Mode
|
||||
```bash
|
||||
npm run test:e2e:debug
|
||||
```
|
||||
|
||||
This opens Playwright Inspector where you can:
|
||||
- Step through tests
|
||||
- Inspect elements
|
||||
- View console logs
|
||||
- See network requests
|
||||
|
||||
### UI Mode (Visual)
|
||||
```bash
|
||||
npm run test:e2e:ui
|
||||
```
|
||||
|
||||
Shows a visual interface to:
|
||||
- See all tests
|
||||
- Run specific tests
|
||||
- Watch tests execute
|
||||
- View results
|
||||
|
||||
### Headed Mode
|
||||
```bash
|
||||
npm run test:e2e:headed
|
||||
```
|
||||
|
||||
Runs tests with visible browser (useful for debugging).
|
||||
|
||||
## 📊 Test Reports
|
||||
|
||||
### Playwright HTML Report
|
||||
After running E2E tests:
|
||||
```bash
|
||||
npx playwright show-report
|
||||
```
|
||||
|
||||
Shows:
|
||||
- Test results
|
||||
- Screenshots on failure
|
||||
- Videos on failure
|
||||
- Timeline of test execution
|
||||
|
||||
### Jest Coverage Report
|
||||
```bash
|
||||
npm run test:coverage
|
||||
```
|
||||
|
||||
Generates coverage report in `coverage/` directory.
|
||||
|
||||
## 🚨 Common Issues
|
||||
|
||||
### Tests Fail Locally But Pass in CI
|
||||
- Check environment variables
|
||||
- Ensure database is set up
|
||||
- Check for port conflicts
|
||||
|
||||
### Hydration Errors
|
||||
- Check for server/client mismatches
|
||||
- Ensure no conditional rendering based on `window`
|
||||
- Check for date/time differences
|
||||
|
||||
### Email Tests Fail
|
||||
- Email service might not be configured
|
||||
- Check environment variables
|
||||
- Tests are designed to handle missing email service
|
||||
|
||||
### Performance Tests Fail
|
||||
- Network might be slow
|
||||
- Adjust thresholds in test file
|
||||
- Check for heavy resources loading
|
||||
|
||||
## 📝 Writing New Tests
|
||||
|
||||
### E2E Test Example
|
||||
```typescript
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
test('My new feature works', async ({ page }) => {
|
||||
await page.goto('/my-page');
|
||||
await expect(page.locator('h1')).toContainText('Expected Text');
|
||||
});
|
||||
```
|
||||
|
||||
### Unit Test Example
|
||||
```typescript
|
||||
import { render, screen } from '@testing-library/react';
|
||||
import MyComponent from './MyComponent';
|
||||
|
||||
test('renders correctly', () => {
|
||||
render(<MyComponent />);
|
||||
expect(screen.getByText('Hello')).toBeInTheDocument();
|
||||
});
|
||||
```
|
||||
|
||||
## 🎯 CI/CD Integration
|
||||
|
||||
### GitHub Actions Example
|
||||
```yaml
|
||||
- name: Run tests
|
||||
run: |
|
||||
npm install
|
||||
npm run test:all
|
||||
```
|
||||
|
||||
### Pre-Push Hook
|
||||
Add to `.git/hooks/pre-push`:
|
||||
```bash
|
||||
#!/bin/bash
|
||||
npm run test:all
|
||||
```
|
||||
|
||||
## 📚 Resources
|
||||
|
||||
- [Playwright Docs](https://playwright.dev)
|
||||
- [Jest Docs](https://jestjs.io)
|
||||
- [Testing Library](https://testing-library.com)
|
||||
|
||||
---
|
||||
|
||||
**Remember**: Tests should be fast, reliable, and easy to understand! 🚀
|
||||
39
__mocks__/@prisma/client.ts
Normal file
39
__mocks__/@prisma/client.ts
Normal file
@@ -0,0 +1,39 @@
|
||||
// Minimal Prisma Client mock for tests
|
||||
// Export a PrismaClient class with the used methods stubbed out.
|
||||
|
||||
export class PrismaClient {
|
||||
project = {
|
||||
findMany: jest.fn(async () => []),
|
||||
findUnique: jest.fn(async (_args: unknown) => null),
|
||||
count: jest.fn(async () => 0),
|
||||
create: jest.fn(async (data: unknown) => data),
|
||||
update: jest.fn(async (data: unknown) => data),
|
||||
delete: jest.fn(async (data: unknown) => data),
|
||||
updateMany: jest.fn(async (_data: unknown) => ({})),
|
||||
};
|
||||
|
||||
contact = {
|
||||
create: jest.fn(async (data: unknown) => data),
|
||||
findMany: jest.fn(async () => []),
|
||||
count: jest.fn(async () => 0),
|
||||
update: jest.fn(async (data: unknown) => data),
|
||||
delete: jest.fn(async (data: unknown) => data),
|
||||
};
|
||||
|
||||
pageView = {
|
||||
create: jest.fn(async (data: unknown) => data),
|
||||
count: jest.fn(async () => 0),
|
||||
deleteMany: jest.fn(async () => ({})),
|
||||
};
|
||||
|
||||
userInteraction = {
|
||||
create: jest.fn(async (data: unknown) => data),
|
||||
groupBy: jest.fn(async () => []),
|
||||
deleteMany: jest.fn(async () => ({})),
|
||||
};
|
||||
|
||||
$connect = jest.fn(async () => {});
|
||||
$disconnect = jest.fn(async () => {});
|
||||
}
|
||||
|
||||
export default PrismaClient;
|
||||
@@ -13,7 +13,11 @@ beforeAll(() => {
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
(console.error as jest.Mock).mockRestore();
|
||||
// restoreMocks may already restore it; guard against calling mockRestore on non-mock
|
||||
const maybeMock = console.error as unknown as jest.Mock | undefined;
|
||||
if (maybeMock && typeof maybeMock.mockRestore === 'function') {
|
||||
maybeMock.mockRestore();
|
||||
}
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
@@ -2,8 +2,9 @@ import { GET } from '@/app/api/fetchAllProjects/route';
|
||||
import { NextResponse } from 'next/server';
|
||||
|
||||
// Wir mocken node-fetch direkt
|
||||
jest.mock('node-fetch', () => {
|
||||
return jest.fn(() =>
|
||||
jest.mock('node-fetch', () => ({
|
||||
__esModule: true,
|
||||
default: jest.fn(() =>
|
||||
Promise.resolve({
|
||||
json: () =>
|
||||
Promise.resolve({
|
||||
@@ -36,8 +37,8 @@ jest.mock('node-fetch', () => {
|
||||
},
|
||||
}),
|
||||
})
|
||||
);
|
||||
});
|
||||
),
|
||||
}));
|
||||
|
||||
jest.mock('next/server', () => ({
|
||||
NextResponse: {
|
||||
|
||||
@@ -1,29 +1,37 @@
|
||||
import { GET } from '@/app/api/fetchProject/route';
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { mockFetch } from '@/app/__tests__/__mocks__/mock-fetch';
|
||||
|
||||
// Mock node-fetch so the route uses it as a reliable fallback
|
||||
jest.mock('node-fetch', () => ({
|
||||
__esModule: true,
|
||||
default: jest.fn(() =>
|
||||
Promise.resolve({
|
||||
ok: true,
|
||||
json: () =>
|
||||
Promise.resolve({
|
||||
posts: [
|
||||
{
|
||||
id: '67aaffc3709c60000117d2d9',
|
||||
title: 'Blockchain Based Voting System',
|
||||
meta_description: 'This project aims to revolutionize voting systems by leveraging blockchain to ensure security, transparency, and immutability.',
|
||||
slug: 'blockchain-based-voting-system',
|
||||
updated_at: '2025-02-13T16:54:42.000+00:00',
|
||||
},
|
||||
],
|
||||
}),
|
||||
})
|
||||
),
|
||||
}));
|
||||
|
||||
jest.mock('next/server', () => ({
|
||||
NextResponse: {
|
||||
json: jest.fn(),
|
||||
},
|
||||
}));
|
||||
|
||||
describe('GET /api/fetchProject', () => {
|
||||
beforeAll(() => {
|
||||
process.env.GHOST_API_URL = 'http://localhost:2368';
|
||||
process.env.GHOST_API_KEY = 'some-key';
|
||||
|
||||
global.fetch = mockFetch({
|
||||
posts: [
|
||||
{
|
||||
id: '67aaffc3709c60000117d2d9',
|
||||
title: 'Blockchain Based Voting System',
|
||||
meta_description: 'This project aims to revolutionize voting systems by leveraging blockchain to ensure security, transparency, and immutability.',
|
||||
slug: 'blockchain-based-voting-system',
|
||||
updated_at: '2025-02-13T16:54:42.000+00:00',
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it('should fetch a project by slug', async () => {
|
||||
|
||||
@@ -1,44 +1,127 @@
|
||||
import { GET } from '@/app/api/sitemap/route';
|
||||
import { mockFetch } from '@/app/__tests__/__mocks__/mock-fetch';
|
||||
jest.mock("next/server", () => {
|
||||
const mockNextResponse = function (
|
||||
body: string | object,
|
||||
init?: { headers?: Record<string, string> },
|
||||
) {
|
||||
// Return an object that mimics NextResponse
|
||||
const mockResponse = {
|
||||
body,
|
||||
init,
|
||||
text: async () => {
|
||||
if (typeof body === "string") {
|
||||
return body;
|
||||
} else if (body && typeof body === "object") {
|
||||
return JSON.stringify(body);
|
||||
}
|
||||
return "";
|
||||
},
|
||||
json: async () => {
|
||||
if (typeof body === "object") {
|
||||
return body;
|
||||
}
|
||||
try {
|
||||
return JSON.parse(body as string);
|
||||
} catch {
|
||||
return {};
|
||||
}
|
||||
},
|
||||
};
|
||||
return mockResponse;
|
||||
};
|
||||
|
||||
jest.mock('next/server', () => ({
|
||||
NextResponse: jest.fn().mockImplementation((body, init) => ({ body, init })),
|
||||
return {
|
||||
NextResponse: mockNextResponse,
|
||||
};
|
||||
});
|
||||
|
||||
import { GET } from "@/app/api/sitemap/route";
|
||||
|
||||
// Mock node-fetch so we don't perform real network requests in tests
|
||||
jest.mock("node-fetch", () => ({
|
||||
__esModule: true,
|
||||
default: jest.fn(() =>
|
||||
Promise.resolve({
|
||||
ok: true,
|
||||
json: () =>
|
||||
Promise.resolve({
|
||||
posts: [
|
||||
{
|
||||
id: "67ac8dfa709c60000117d312",
|
||||
title: "Just Doing Some Testing",
|
||||
meta_description: "Hello bla bla bla bla",
|
||||
slug: "just-doing-some-testing",
|
||||
updated_at: "2025-02-13T14:25:38.000+00:00",
|
||||
},
|
||||
{
|
||||
id: "67aaffc3709c60000117d2d9",
|
||||
title: "Blockchain Based Voting System",
|
||||
meta_description:
|
||||
"This project aims to revolutionize voting systems by leveraging blockchain to ensure security, transparency, and immutability.",
|
||||
slug: "blockchain-based-voting-system",
|
||||
updated_at: "2025-02-13T16:54:42.000+00:00",
|
||||
},
|
||||
],
|
||||
meta: {
|
||||
pagination: {
|
||||
limit: "all",
|
||||
next: null,
|
||||
page: 1,
|
||||
pages: 1,
|
||||
prev: null,
|
||||
total: 2,
|
||||
},
|
||||
},
|
||||
}),
|
||||
}),
|
||||
),
|
||||
}));
|
||||
|
||||
describe('GET /api/sitemap', () => {
|
||||
describe("GET /api/sitemap", () => {
|
||||
beforeAll(() => {
|
||||
process.env.GHOST_API_URL = 'http://localhost:2368';
|
||||
process.env.GHOST_API_KEY = 'test-api-key';
|
||||
process.env.NEXT_PUBLIC_BASE_URL = 'https://dki.one';
|
||||
global.fetch = mockFetch({
|
||||
process.env.GHOST_API_URL = "http://localhost:2368";
|
||||
process.env.GHOST_API_KEY = "test-api-key";
|
||||
process.env.NEXT_PUBLIC_BASE_URL = "https://dki.one";
|
||||
|
||||
// Provide mock posts via env so route can use them without fetching
|
||||
process.env.GHOST_MOCK_POSTS = JSON.stringify({
|
||||
posts: [
|
||||
{
|
||||
id: '67ac8dfa709c60000117d312',
|
||||
title: 'Just Doing Some Testing',
|
||||
meta_description: 'Hello bla bla bla bla',
|
||||
slug: 'just-doing-some-testing',
|
||||
updated_at: '2025-02-13T14:25:38.000+00:00',
|
||||
id: "67ac8dfa709c60000117d312",
|
||||
title: "Just Doing Some Testing",
|
||||
meta_description: "Hello bla bla bla bla",
|
||||
slug: "just-doing-some-testing",
|
||||
updated_at: "2025-02-13T14:25:38.000+00:00",
|
||||
},
|
||||
{
|
||||
id: '67aaffc3709c60000117d2d9',
|
||||
title: 'Blockchain Based Voting System',
|
||||
meta_description: 'This project aims to revolutionize voting systems by leveraging blockchain to ensure security, transparency, and immutability.',
|
||||
slug: 'blockchain-based-voting-system',
|
||||
updated_at: '2025-02-13T16:54:42.000+00:00',
|
||||
id: "67aaffc3709c60000117d2d9",
|
||||
title: "Blockchain Based Voting System",
|
||||
meta_description:
|
||||
"This project aims to revolutionize voting systems by leveraging blockchain to ensure security, transparency, and immutability.",
|
||||
slug: "blockchain-based-voting-system",
|
||||
updated_at: "2025-02-13T16:54:42.000+00:00",
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it('should return a sitemap', async () => {
|
||||
it("should return a sitemap", async () => {
|
||||
const response = await GET();
|
||||
|
||||
expect(response.body).toContain('<urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9">');
|
||||
expect(response.body).toContain('<loc>https://dki.one/</loc>');
|
||||
expect(response.body).toContain('<loc>https://dki.one/legal-notice</loc>');
|
||||
expect(response.body).toContain('<loc>https://dki.one/privacy-policy</loc>');
|
||||
expect(response.body).toContain('<loc>https://dki.one/projects/just-doing-some-testing</loc>');
|
||||
expect(response.body).toContain('<loc>https://dki.one/projects/blockchain-based-voting-system</loc>');
|
||||
// Get the body text from the NextResponse
|
||||
const body = await response.text();
|
||||
|
||||
expect(body).toContain(
|
||||
'<urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9">',
|
||||
);
|
||||
expect(body).toContain("<loc>https://dki.one/</loc>");
|
||||
expect(body).toContain("<loc>https://dki.one/legal-notice</loc>");
|
||||
expect(body).toContain("<loc>https://dki.one/privacy-policy</loc>");
|
||||
expect(body).toContain(
|
||||
"<loc>https://dki.one/projects/just-doing-some-testing</loc>",
|
||||
);
|
||||
expect(body).toContain(
|
||||
"<loc>https://dki.one/projects/blockchain-based-voting-system</loc>",
|
||||
);
|
||||
// Note: Headers are not available in test environment
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -6,7 +6,7 @@ describe('Hero', () => {
|
||||
it('renders the hero section', () => {
|
||||
render(<Hero />);
|
||||
expect(screen.getByText('Dennis Konkol')).toBeInTheDocument();
|
||||
expect(screen.getByText('Student & Software Engineer based in Osnabrück, Germany')).toBeInTheDocument();
|
||||
expect(screen.getByAltText('Dennis Konkol - Software Engineer')).toBeInTheDocument();
|
||||
expect(screen.getByText(/Student and passionate/i)).toBeInTheDocument();
|
||||
expect(screen.getByAltText('Dennis Konkol')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
@@ -1,44 +1,81 @@
|
||||
import '@testing-library/jest-dom';
|
||||
import { GET } from '@/app/sitemap.xml/route';
|
||||
import { mockFetch } from '@/app/__tests__/__mocks__/mock-fetch-sitemap';
|
||||
import "@testing-library/jest-dom";
|
||||
import { GET } from "@/app/sitemap.xml/route";
|
||||
|
||||
jest.mock('next/server', () => ({
|
||||
NextResponse: jest.fn().mockImplementation((body, init) => ({ body, init })),
|
||||
jest.mock("next/server", () => ({
|
||||
NextResponse: jest.fn().mockImplementation((body: unknown, init?: ResponseInit) => {
|
||||
const response = {
|
||||
body,
|
||||
init,
|
||||
};
|
||||
return response;
|
||||
}),
|
||||
}));
|
||||
|
||||
describe('Sitemap Component', () => {
|
||||
// Sitemap XML used by node-fetch mock
|
||||
const sitemapXml = `
|
||||
<urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://dki.one/</loc>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://dki.one/legal-notice</loc>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://dki.one/privacy-policy</loc>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://dki.one/projects/just-doing-some-testing</loc>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://dki.one/projects/blockchain-based-voting-system</loc>
|
||||
</url>
|
||||
</urlset>
|
||||
`;
|
||||
|
||||
// Mock node-fetch for sitemap endpoint (hoisted by Jest)
|
||||
jest.mock("node-fetch", () => ({
|
||||
__esModule: true,
|
||||
default: jest.fn((_url: string) =>
|
||||
Promise.resolve({ ok: true, text: () => Promise.resolve(sitemapXml) }),
|
||||
),
|
||||
}));
|
||||
|
||||
describe("Sitemap Component", () => {
|
||||
beforeAll(() => {
|
||||
process.env.NEXT_PUBLIC_BASE_URL = 'https://dki.one';
|
||||
global.fetch = mockFetch(`
|
||||
<urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://dki.one/</loc>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://dki.one/legal-notice</loc>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://dki.one/privacy-policy</loc>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://dki.one/projects/just-doing-some-testing</loc>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://dki.one/projects/blockchain-based-voting-system</loc>
|
||||
</url>
|
||||
</urlset>
|
||||
`);
|
||||
process.env.NEXT_PUBLIC_BASE_URL = "https://dki.one";
|
||||
|
||||
// Provide sitemap XML directly so route uses it without fetching
|
||||
process.env.GHOST_MOCK_SITEMAP = sitemapXml;
|
||||
|
||||
// Mock global.fetch too, to avoid any network calls
|
||||
global.fetch = jest.fn().mockImplementation((url: string) => {
|
||||
if (url.includes("/api/sitemap")) {
|
||||
return Promise.resolve({
|
||||
ok: true,
|
||||
text: () => Promise.resolve(sitemapXml),
|
||||
});
|
||||
}
|
||||
return Promise.reject(new Error(`Unknown URL: ${url}`));
|
||||
});
|
||||
});
|
||||
|
||||
it('should render the sitemap XML', async () => {
|
||||
it("should render the sitemap XML", async () => {
|
||||
const response = await GET();
|
||||
|
||||
expect(response.body).toContain('<urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9">');
|
||||
expect(response.body).toContain('<loc>https://dki.one/</loc>');
|
||||
expect(response.body).toContain('<loc>https://dki.one/legal-notice</loc>');
|
||||
expect(response.body).toContain('<loc>https://dki.one/privacy-policy</loc>');
|
||||
expect(response.body).toContain('<loc>https://dki.one/projects/just-doing-some-testing</loc>');
|
||||
expect(response.body).toContain('<loc>https://dki.one/projects/blockchain-based-voting-system</loc>');
|
||||
expect(response.body).toContain(
|
||||
'<urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9">',
|
||||
);
|
||||
expect(response.body).toContain("<loc>https://dki.one/</loc>");
|
||||
expect(response.body).toContain("<loc>https://dki.one/legal-notice</loc>");
|
||||
expect(response.body).toContain(
|
||||
"<loc>https://dki.one/privacy-policy</loc>",
|
||||
);
|
||||
expect(response.body).toContain(
|
||||
"<loc>https://dki.one/projects/just-doing-some-testing</loc>",
|
||||
);
|
||||
expect(response.body).toContain(
|
||||
"<loc>https://dki.one/projects/blockchain-based-voting-system</loc>",
|
||||
);
|
||||
// Note: Headers are not available in test environment
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,21 +1,41 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { checkRateLimit, getRateLimitHeaders } from '@/lib/auth';
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
try {
|
||||
// Rate limiting for POST requests
|
||||
const ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || 'unknown';
|
||||
if (!checkRateLimit(ip, 30, 60000)) { // 30 requests per minute for analytics
|
||||
return new NextResponse(
|
||||
JSON.stringify({ error: 'Rate limit exceeded' }),
|
||||
{
|
||||
status: 429,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...getRateLimitHeaders(ip, 30, 60000)
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
const body = await request.json();
|
||||
|
||||
// Log performance metrics (you can extend this to store in database)
|
||||
console.log('Performance Metric:', {
|
||||
timestamp: new Date().toISOString(),
|
||||
...body,
|
||||
});
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.log('Performance Metric:', {
|
||||
timestamp: new Date().toISOString(),
|
||||
...body,
|
||||
});
|
||||
}
|
||||
|
||||
// You could store this in a database or send to external service
|
||||
// For now, we'll just log it since Umami handles the main analytics
|
||||
|
||||
return NextResponse.json({ success: true });
|
||||
} catch (error) {
|
||||
console.error('Analytics API Error:', error);
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Analytics API Error:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to process analytics data' },
|
||||
{ status: 500 }
|
||||
|
||||
@@ -40,11 +40,16 @@ export async function POST(request: NextRequest) {
|
||||
const adminAuth = process.env.ADMIN_BASIC_AUTH || 'admin:default_password_change_me';
|
||||
const [, expectedPassword] = adminAuth.split(':');
|
||||
|
||||
// Secure password comparison
|
||||
if (password === expectedPassword) {
|
||||
// Secure password comparison using constant-time comparison
|
||||
const crypto = await import('crypto');
|
||||
const passwordBuffer = Buffer.from(password, 'utf8');
|
||||
const expectedBuffer = Buffer.from(expectedPassword, 'utf8');
|
||||
|
||||
// Use constant-time comparison to prevent timing attacks
|
||||
if (passwordBuffer.length === expectedBuffer.length &&
|
||||
crypto.timingSafeEqual(passwordBuffer, expectedBuffer)) {
|
||||
// Generate cryptographically secure session token
|
||||
const timestamp = Date.now();
|
||||
const crypto = await import('crypto');
|
||||
const randomBytes = crypto.randomBytes(32);
|
||||
const randomString = randomBytes.toString('hex');
|
||||
|
||||
@@ -56,9 +61,9 @@ export async function POST(request: NextRequest) {
|
||||
userAgent: request.headers.get('user-agent') || 'unknown'
|
||||
};
|
||||
|
||||
// Encrypt session data
|
||||
// Encode session data (base64 is sufficient for this use case)
|
||||
const sessionJson = JSON.stringify(sessionData);
|
||||
const sessionToken = btoa(sessionJson);
|
||||
const sessionToken = Buffer.from(sessionJson).toString('base64');
|
||||
|
||||
return new NextResponse(
|
||||
JSON.stringify({
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import { type NextRequest, NextResponse } from "next/server";
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
|
||||
import { checkRateLimit, getRateLimitHeaders } from '@/lib/auth';
|
||||
|
||||
const prisma = new PrismaClient();
|
||||
|
||||
@@ -8,6 +10,21 @@ export async function PUT(
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
// Rate limiting for PUT requests
|
||||
const ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || 'unknown';
|
||||
if (!checkRateLimit(ip, 5, 60000)) { // 5 requests per minute
|
||||
return new NextResponse(
|
||||
JSON.stringify({ error: 'Rate limit exceeded' }),
|
||||
{
|
||||
status: 429,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...getRateLimitHeaders(ip, 5, 60000)
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
const resolvedParams = await params;
|
||||
const id = parseInt(resolvedParams.id);
|
||||
const body = await request.json();
|
||||
@@ -35,7 +52,20 @@ export async function PUT(
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error updating contact:', error);
|
||||
// Handle missing database table gracefully
|
||||
if (error instanceof PrismaClientKnownRequestError && error.code === 'P2021') {
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.warn('Contact table does not exist.');
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Database table not found. Please run migrations.' },
|
||||
{ status: 503 }
|
||||
);
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error updating contact:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to update contact' },
|
||||
{ status: 500 }
|
||||
@@ -48,6 +78,21 @@ export async function DELETE(
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
// Rate limiting for DELETE requests
|
||||
const ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || 'unknown';
|
||||
if (!checkRateLimit(ip, 3, 60000)) { // 3 requests per minute for DELETE (more restrictive)
|
||||
return new NextResponse(
|
||||
JSON.stringify({ error: 'Rate limit exceeded' }),
|
||||
{
|
||||
status: 429,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...getRateLimitHeaders(ip, 3, 60000)
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
const resolvedParams = await params;
|
||||
const id = parseInt(resolvedParams.id);
|
||||
|
||||
@@ -67,7 +112,20 @@ export async function DELETE(
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error deleting contact:', error);
|
||||
// Handle missing database table gracefully
|
||||
if (error instanceof PrismaClientKnownRequestError && error.code === 'P2021') {
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.warn('Contact table does not exist.');
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Database table not found. Please run migrations.' },
|
||||
{ status: 503 }
|
||||
);
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error deleting contact:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to delete contact' },
|
||||
{ status: 500 }
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import { type NextRequest, NextResponse } from "next/server";
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
|
||||
import { checkRateLimit, getRateLimitHeaders } from '@/lib/auth';
|
||||
|
||||
const prisma = new PrismaClient();
|
||||
|
||||
@@ -40,7 +42,21 @@ export async function GET(request: NextRequest) {
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error fetching contacts:', error);
|
||||
// Handle missing database table gracefully
|
||||
if (error instanceof PrismaClientKnownRequestError && error.code === 'P2021') {
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.warn('Contact table does not exist. Returning empty result.');
|
||||
}
|
||||
return NextResponse.json({
|
||||
contacts: [],
|
||||
total: 0,
|
||||
hasMore: false
|
||||
});
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error fetching contacts:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to fetch contacts' },
|
||||
{ status: 500 }
|
||||
@@ -50,6 +66,21 @@ export async function GET(request: NextRequest) {
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
try {
|
||||
// Rate limiting for POST requests
|
||||
const ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || 'unknown';
|
||||
if (!checkRateLimit(ip, 5, 60000)) { // 5 requests per minute
|
||||
return new NextResponse(
|
||||
JSON.stringify({ error: 'Rate limit exceeded' }),
|
||||
{
|
||||
status: 429,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...getRateLimitHeaders(ip, 5, 60000)
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
const body = await request.json();
|
||||
const { name, email, subject, message } = body;
|
||||
|
||||
@@ -86,7 +117,20 @@ export async function POST(request: NextRequest) {
|
||||
}, { status: 201 });
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error creating contact:', error);
|
||||
// Handle missing database table gracefully
|
||||
if (error instanceof PrismaClientKnownRequestError && error.code === 'P2021') {
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.warn('Contact table does not exist.');
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Database table not found. Please run migrations.' },
|
||||
{ status: 503 }
|
||||
);
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error creating contact:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to create contact' },
|
||||
{ status: 500 }
|
||||
|
||||
@@ -3,20 +3,49 @@ import nodemailer from "nodemailer";
|
||||
import SMTPTransport from "nodemailer/lib/smtp-transport";
|
||||
import Mail from "nodemailer/lib/mailer";
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { checkRateLimit, getRateLimitHeaders } from '@/lib/auth';
|
||||
|
||||
const prisma = new PrismaClient();
|
||||
|
||||
// Sanitize input to prevent XSS
|
||||
function sanitizeInput(input: string, maxLength: number = 10000): string {
|
||||
return input
|
||||
.slice(0, maxLength)
|
||||
.replace(/[<>]/g, '') // Remove potential HTML tags
|
||||
.trim();
|
||||
}
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
try {
|
||||
// Rate limiting (defensive: headers may be undefined in tests)
|
||||
const ip = request.headers?.get?.('x-forwarded-for') ?? request.headers?.get?.('x-real-ip') ?? 'unknown';
|
||||
if (!checkRateLimit(ip, 5, 60000)) { // 5 emails per minute per IP
|
||||
return NextResponse.json(
|
||||
{ error: 'Zu viele Anfragen. Bitte versuchen Sie es später erneut.' },
|
||||
{
|
||||
status: 429,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...getRateLimitHeaders(ip, 5, 60000)
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
const body = (await request.json()) as {
|
||||
email: string;
|
||||
name: string;
|
||||
subject: string;
|
||||
message: string;
|
||||
};
|
||||
const { email, name, subject, message } = body;
|
||||
|
||||
// Sanitize and validate input
|
||||
const email = sanitizeInput(body.email || '', 255);
|
||||
const name = sanitizeInput(body.name || '', 100);
|
||||
const subject = sanitizeInput(body.subject || '', 200);
|
||||
const message = sanitizeInput(body.message || '', 5000);
|
||||
|
||||
console.log('📧 Email request received:', { email, name, subject, messageLength: message.length });
|
||||
// Email request received
|
||||
|
||||
// Validate input
|
||||
if (!email || !name || !subject || !message) {
|
||||
@@ -46,6 +75,14 @@ export async function POST(request: NextRequest) {
|
||||
);
|
||||
}
|
||||
|
||||
// Validate field lengths
|
||||
if (name.length > 100 || subject.length > 200 || message.length > 5000) {
|
||||
return NextResponse.json(
|
||||
{ error: "Eingabe zu lang" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
const user = process.env.MY_EMAIL ?? "";
|
||||
const pass = process.env.MY_PASSWORD ?? "";
|
||||
|
||||
@@ -84,12 +121,7 @@ export async function POST(request: NextRequest) {
|
||||
}
|
||||
};
|
||||
|
||||
console.log('🚀 Creating transport with options:', {
|
||||
host: transportOptions.host,
|
||||
port: transportOptions.port,
|
||||
secure: transportOptions.secure,
|
||||
user: user.split('@')[0] + '@***' // Hide full email in logs
|
||||
});
|
||||
// Creating transport with configured options
|
||||
|
||||
const transport = nodemailer.createTransport(transportOptions);
|
||||
|
||||
@@ -101,15 +133,17 @@ export async function POST(request: NextRequest) {
|
||||
while (verificationAttempts < maxVerificationAttempts && !verificationSuccess) {
|
||||
try {
|
||||
verificationAttempts++;
|
||||
console.log(`🔍 SMTP verification attempt ${verificationAttempts}/${maxVerificationAttempts}`);
|
||||
await transport.verify();
|
||||
console.log('✅ SMTP connection verified successfully');
|
||||
verificationSuccess = true;
|
||||
} catch (verifyError) {
|
||||
console.error(`❌ SMTP verification attempt ${verificationAttempts} failed:`, verifyError);
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error(`SMTP verification attempt ${verificationAttempts} failed:`, verifyError);
|
||||
}
|
||||
|
||||
if (verificationAttempts >= maxVerificationAttempts) {
|
||||
console.error('❌ All SMTP verification attempts failed');
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('All SMTP verification attempts failed');
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: "E-Mail-Server-Verbindung fehlgeschlagen" },
|
||||
{ status: 500 },
|
||||
@@ -231,7 +265,7 @@ Diese E-Mail wurde automatisch von deinem Portfolio generiert.
|
||||
`,
|
||||
};
|
||||
|
||||
console.log('📤 Sending email...');
|
||||
// Sending email
|
||||
|
||||
// Email sending with retry logic
|
||||
let sendAttempts = 0;
|
||||
@@ -242,16 +276,18 @@ Diese E-Mail wurde automatisch von deinem Portfolio generiert.
|
||||
while (sendAttempts < maxSendAttempts && !sendSuccess) {
|
||||
try {
|
||||
sendAttempts++;
|
||||
console.log(`📤 Email send attempt ${sendAttempts}/${maxSendAttempts}`);
|
||||
// Email send attempt
|
||||
|
||||
const sendMailPromise = () =>
|
||||
new Promise<string>((resolve, reject) => {
|
||||
transport.sendMail(mailOptions, function (err, info) {
|
||||
if (!err) {
|
||||
console.log('✅ Email sent successfully:', info.response);
|
||||
// Email sent successfully
|
||||
resolve(info.response);
|
||||
} else {
|
||||
console.error("❌ Error sending email:", err);
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error("Error sending email:", err);
|
||||
}
|
||||
reject(err.message);
|
||||
}
|
||||
});
|
||||
@@ -259,12 +295,16 @@ Diese E-Mail wurde automatisch von deinem Portfolio generiert.
|
||||
|
||||
result = await sendMailPromise();
|
||||
sendSuccess = true;
|
||||
console.log('🎉 Email process completed successfully');
|
||||
// Email process completed successfully
|
||||
} catch (sendError) {
|
||||
console.error(`❌ Email send attempt ${sendAttempts} failed:`, sendError);
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error(`Email send attempt ${sendAttempts} failed:`, sendError);
|
||||
}
|
||||
|
||||
if (sendAttempts >= maxSendAttempts) {
|
||||
console.error('❌ All email send attempts failed');
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('All email send attempts failed');
|
||||
}
|
||||
throw new Error(`Failed to send email after ${maxSendAttempts} attempts: ${sendError}`);
|
||||
}
|
||||
|
||||
@@ -284,9 +324,11 @@ Diese E-Mail wurde automatisch von deinem Portfolio generiert.
|
||||
responded: false
|
||||
}
|
||||
});
|
||||
console.log('✅ Contact saved to database');
|
||||
// Contact saved to database
|
||||
} catch (dbError) {
|
||||
console.error('❌ Error saving contact to database:', dbError);
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error saving contact to database:', dbError);
|
||||
}
|
||||
// Don't fail the email send if DB save fails
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,17 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import http from "http";
|
||||
import fetch from "node-fetch";
|
||||
import NodeCache from "node-cache";
|
||||
|
||||
// Use a dynamic import for node-fetch so tests that mock it (via jest.mock) are respected
|
||||
async function getFetch() {
|
||||
try {
|
||||
const mod = await import("node-fetch");
|
||||
// support both CJS and ESM interop
|
||||
return (mod as { default: unknown }).default ?? mod;
|
||||
} catch (_err) {
|
||||
return globalThis.fetch;
|
||||
}
|
||||
}
|
||||
|
||||
export const runtime = "nodejs"; // Force Node runtime
|
||||
|
||||
const GHOST_API_URL = process.env.GHOST_API_URL;
|
||||
@@ -35,12 +44,12 @@ export async function GET() {
|
||||
}
|
||||
|
||||
try {
|
||||
const agent = new http.Agent({ keepAlive: true });
|
||||
const response = await fetch(
|
||||
const fetchFn = await getFetch();
|
||||
const response = await (fetchFn as unknown as typeof fetch)(
|
||||
`${GHOST_API_URL}/ghost/api/content/posts/?key=${GHOST_API_KEY}&limit=all`,
|
||||
{ agent: agent as unknown as undefined }
|
||||
);
|
||||
const posts: GhostPostsResponse = await response.json() as GhostPostsResponse;
|
||||
const posts: GhostPostsResponse =
|
||||
(await response.json()) as GhostPostsResponse;
|
||||
|
||||
if (!posts || !posts.posts) {
|
||||
console.error("Invalid posts data");
|
||||
|
||||
@@ -12,9 +12,40 @@ export async function GET(req: NextRequest) {
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(url);
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch image: ${response.statusText}`);
|
||||
// Try global fetch first, fall back to node-fetch if necessary
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
let response: any;
|
||||
try {
|
||||
if (
|
||||
typeof (globalThis as unknown as { fetch: unknown }).fetch ===
|
||||
"function"
|
||||
) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
response = await (globalThis as unknown as { fetch: any }).fetch(url);
|
||||
}
|
||||
} catch (_e) {
|
||||
response = undefined;
|
||||
}
|
||||
|
||||
if (!response || typeof response.ok === "undefined" || !response.ok) {
|
||||
try {
|
||||
const mod = await import("node-fetch");
|
||||
const nodeFetch = (mod as { default: unknown }).default ?? mod;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
response = await (nodeFetch as any)(url);
|
||||
} catch (err) {
|
||||
console.error("Failed to fetch image:", err);
|
||||
return NextResponse.json(
|
||||
{ error: "Failed to fetch image" },
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (!response || !response.ok) {
|
||||
throw new Error(
|
||||
`Failed to fetch image: ${response?.statusText ?? "no response"}`,
|
||||
);
|
||||
}
|
||||
|
||||
const contentType = response.headers.get("content-type");
|
||||
|
||||
@@ -14,12 +14,55 @@ export async function GET(request: Request) {
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(
|
||||
`${GHOST_API_URL}/ghost/api/content/posts/slug/${slug}/?key=${GHOST_API_KEY}`,
|
||||
// Debug: show whether fetch is present/mocked
|
||||
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
console.log(
|
||||
"DEBUG fetch in fetchProject:",
|
||||
typeof (globalThis as any).fetch,
|
||||
"globalIsMock:",
|
||||
!!(globalThis as any).fetch?._isMockFunction,
|
||||
);
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch post: ${response.statusText}`);
|
||||
|
||||
// Try global fetch first (as tests often mock it). If it fails or returns undefined,
|
||||
// fall back to dynamically importing node-fetch.
|
||||
let response: any;
|
||||
|
||||
if (typeof (globalThis as any).fetch === "function") {
|
||||
try {
|
||||
response = await (globalThis as any).fetch(
|
||||
`${GHOST_API_URL}/ghost/api/content/posts/slug/${slug}/?key=${GHOST_API_KEY}`,
|
||||
);
|
||||
} catch (_e) {
|
||||
response = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
if (!response || typeof response.ok === "undefined") {
|
||||
try {
|
||||
const mod = await import("node-fetch");
|
||||
const nodeFetch = (mod as any).default ?? mod;
|
||||
response = await (nodeFetch as any)(
|
||||
`${GHOST_API_URL}/ghost/api/content/posts/slug/${slug}/?key=${GHOST_API_KEY}`,
|
||||
);
|
||||
} catch (_err) {
|
||||
response = undefined;
|
||||
}
|
||||
}
|
||||
/* eslint-enable @typescript-eslint/no-explicit-any */
|
||||
|
||||
// Debug: inspect the response returned from the fetch
|
||||
|
||||
// Debug: inspect the response returned from the fetch
|
||||
|
||||
console.log("DEBUG fetch response:", response);
|
||||
|
||||
if (!response || !response.ok) {
|
||||
throw new Error(
|
||||
`Failed to fetch post: ${response?.statusText ?? "no response"}`,
|
||||
);
|
||||
}
|
||||
|
||||
const post = await response.json();
|
||||
return NextResponse.json(post);
|
||||
} catch (error) {
|
||||
|
||||
162
app/api/n8n/chat/route.ts
Normal file
162
app/api/n8n/chat/route.ts
Normal file
@@ -0,0 +1,162 @@
|
||||
import { NextResponse } from "next/server";
|
||||
|
||||
export async function POST(request: Request) {
|
||||
let userMessage = "";
|
||||
|
||||
try {
|
||||
const json = await request.json();
|
||||
userMessage = json.message;
|
||||
const history = json.history || [];
|
||||
|
||||
if (!userMessage || typeof userMessage !== "string") {
|
||||
return NextResponse.json(
|
||||
{ error: "Message is required" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
// Call your n8n chat webhook
|
||||
const n8nWebhookUrl = process.env.N8N_WEBHOOK_URL;
|
||||
|
||||
if (!n8nWebhookUrl) {
|
||||
console.error("N8N_WEBHOOK_URL not configured");
|
||||
return NextResponse.json({
|
||||
reply: getFallbackResponse(userMessage),
|
||||
});
|
||||
}
|
||||
|
||||
console.log(`Sending to n8n: ${n8nWebhookUrl}/webhook/chat`);
|
||||
|
||||
const response = await fetch(`${n8nWebhookUrl}/webhook/chat`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
...(process.env.N8N_API_KEY && {
|
||||
Authorization: `Bearer ${process.env.N8N_API_KEY}`,
|
||||
}),
|
||||
},
|
||||
body: JSON.stringify({
|
||||
message: userMessage,
|
||||
history: history,
|
||||
}),
|
||||
});
|
||||
if (!response.ok) {
|
||||
console.error(`n8n webhook failed with status: ${response.status}`);
|
||||
throw new Error(`n8n webhook failed: ${response.status}`);
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
|
||||
console.log("n8n response data:", data);
|
||||
|
||||
const reply =
|
||||
data.reply ||
|
||||
data.message ||
|
||||
data.response ||
|
||||
data.text ||
|
||||
data.content ||
|
||||
(Array.isArray(data) && data[0]?.reply);
|
||||
|
||||
if (!reply) {
|
||||
console.warn("n8n response missing reply field:", data);
|
||||
// If n8n returns successfully but without a clear reply field,
|
||||
// we might want to show the fallback or a generic error,
|
||||
// but strictly speaking we shouldn't show "Couldn't process".
|
||||
// Let's try to stringify the whole data if it's small, or use fallback.
|
||||
if (data && typeof data === "object" && Object.keys(data).length > 0) {
|
||||
// It returned something, but we don't know what field to use.
|
||||
// Check for common n8n structure
|
||||
if (data.output) return NextResponse.json({ reply: data.output });
|
||||
if (data.data) return NextResponse.json({ reply: data.data });
|
||||
}
|
||||
throw new Error("Invalid response format from n8n");
|
||||
}
|
||||
|
||||
return NextResponse.json({
|
||||
reply: reply,
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Chat API error:", error);
|
||||
|
||||
// Fallback to mock responses
|
||||
// Now using the variable captured at the start
|
||||
return NextResponse.json({ reply: getFallbackResponse(userMessage) });
|
||||
}
|
||||
}
|
||||
|
||||
function getFallbackResponse(message: string): string {
|
||||
if (!message || typeof message !== "string") {
|
||||
return "I'm having a bit of trouble understanding. Could you try asking again?";
|
||||
}
|
||||
|
||||
const lowerMessage = message.toLowerCase();
|
||||
|
||||
if (
|
||||
lowerMessage.includes("skill") ||
|
||||
lowerMessage.includes("tech") ||
|
||||
lowerMessage.includes("stack")
|
||||
) {
|
||||
return "I specialize in full-stack development with Next.js, React, and Flutter for mobile. On the DevOps side, I love working with Docker Swarm, Traefik, and CI/CD pipelines. Basically, if it involves code or servers, I'm interested!";
|
||||
}
|
||||
|
||||
if (
|
||||
lowerMessage.includes("project") ||
|
||||
lowerMessage.includes("built") ||
|
||||
lowerMessage.includes("work")
|
||||
) {
|
||||
return "One of my key projects is Clarity, a Flutter app designed to help people with dyslexia. I also maintain a comprehensive self-hosted infrastructure with Docker Swarm. You can check out more details in the Projects section!";
|
||||
}
|
||||
|
||||
if (
|
||||
lowerMessage.includes("contact") ||
|
||||
lowerMessage.includes("email") ||
|
||||
lowerMessage.includes("reach") ||
|
||||
lowerMessage.includes("hire")
|
||||
) {
|
||||
return "The best way to reach me is through the contact form below or by emailing contact@dk0.dev. I'm always open to discussing new ideas, opportunities, or just chatting about tech!";
|
||||
}
|
||||
|
||||
if (
|
||||
lowerMessage.includes("location") ||
|
||||
lowerMessage.includes("where") ||
|
||||
lowerMessage.includes("live")
|
||||
) {
|
||||
return "I'm based in Osnabrück, Germany. It's a great place to be a student and work on tech projects!";
|
||||
}
|
||||
|
||||
if (
|
||||
lowerMessage.includes("hobby") ||
|
||||
lowerMessage.includes("free time") ||
|
||||
lowerMessage.includes("fun")
|
||||
) {
|
||||
return "When I'm not coding or tweaking my servers, I enjoy gaming, going for a jog, or experimenting with new tech. Fun fact: I still use pen and paper for my calendar, even though I automate everything else!";
|
||||
}
|
||||
|
||||
if (
|
||||
lowerMessage.includes("devops") ||
|
||||
lowerMessage.includes("docker") ||
|
||||
lowerMessage.includes("server") ||
|
||||
lowerMessage.includes("hosting")
|
||||
) {
|
||||
return "I'm really into DevOps! I run my own infrastructure on IONOS and OVHcloud using Docker Swarm and Traefik. It allows me to host various services and game servers efficiently while learning a ton about system administration.";
|
||||
}
|
||||
|
||||
if (
|
||||
lowerMessage.includes("student") ||
|
||||
lowerMessage.includes("study") ||
|
||||
lowerMessage.includes("education")
|
||||
) {
|
||||
return "Yes, I'm currently a student in Osnabrück. I balance my studies with working on personal projects and managing my self-hosted infrastructure. It keeps me busy but I learn something new every day!";
|
||||
}
|
||||
|
||||
if (
|
||||
lowerMessage.includes("hello") ||
|
||||
lowerMessage.includes("hi ") ||
|
||||
lowerMessage.includes("hey")
|
||||
) {
|
||||
return "Hi there! I'm Dennis's AI assistant (currently in offline mode). How can I help you learn more about Dennis today?";
|
||||
}
|
||||
|
||||
// Default response
|
||||
return "That's an interesting question! I'm currently operating in fallback mode, so my knowledge is a bit limited right now. But I can tell you that Dennis is a full-stack developer and DevOps enthusiast who loves building with Next.js and Docker. Feel free to ask about his skills, projects, or how to contact him!";
|
||||
}
|
||||
274
app/api/n8n/generate-image/route.ts
Normal file
274
app/api/n8n/generate-image/route.ts
Normal file
@@ -0,0 +1,274 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
|
||||
/**
|
||||
* POST /api/n8n/generate-image
|
||||
*
|
||||
* Triggers AI image generation for a project via n8n workflow
|
||||
*
|
||||
* Body:
|
||||
* {
|
||||
* projectId: number;
|
||||
* regenerate?: boolean; // Force regenerate even if image exists
|
||||
* }
|
||||
*/
|
||||
export async function POST(req: NextRequest) {
|
||||
try {
|
||||
const body = await req.json();
|
||||
const { projectId, regenerate = false } = body;
|
||||
|
||||
// Validate input
|
||||
if (!projectId) {
|
||||
return NextResponse.json(
|
||||
{ error: "projectId is required" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
// Check environment variables
|
||||
const n8nWebhookUrl = process.env.N8N_WEBHOOK_URL;
|
||||
const n8nSecretToken = process.env.N8N_SECRET_TOKEN;
|
||||
|
||||
if (!n8nWebhookUrl) {
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: "N8N_WEBHOOK_URL not configured",
|
||||
message:
|
||||
"AI image generation is not set up. Please configure n8n webhooks.",
|
||||
},
|
||||
{ status: 503 },
|
||||
);
|
||||
}
|
||||
|
||||
// Fetch project data first (needed for the new webhook format)
|
||||
const projectResponse = await fetch(
|
||||
`${process.env.NEXT_PUBLIC_API_URL || "http://localhost:3000"}/api/projects/${projectId}`,
|
||||
{
|
||||
method: "GET",
|
||||
cache: "no-store",
|
||||
},
|
||||
);
|
||||
|
||||
if (!projectResponse.ok) {
|
||||
return NextResponse.json(
|
||||
{ error: "Project not found" },
|
||||
{ status: 404 },
|
||||
);
|
||||
}
|
||||
|
||||
const project = await projectResponse.json();
|
||||
|
||||
// Optional: Check if project already has an image
|
||||
if (!regenerate) {
|
||||
if (project.imageUrl && project.imageUrl !== "") {
|
||||
return NextResponse.json(
|
||||
{
|
||||
success: true,
|
||||
message:
|
||||
"Project already has an image. Use regenerate=true to force regeneration.",
|
||||
projectId: projectId,
|
||||
existingImageUrl: project.imageUrl,
|
||||
regenerated: false,
|
||||
},
|
||||
{ status: 200 },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Call n8n webhook to trigger AI image generation
|
||||
// New webhook expects: body.projectData with title, category, description
|
||||
// Webhook path: /webhook/image-gen (instead of /webhook/ai-image-generation)
|
||||
const n8nResponse = await fetch(
|
||||
`${n8nWebhookUrl}/webhook/image-gen`,
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
...(n8nSecretToken && {
|
||||
Authorization: `Bearer ${n8nSecretToken}`,
|
||||
}),
|
||||
},
|
||||
body: JSON.stringify({
|
||||
projectId: projectId,
|
||||
projectData: {
|
||||
title: project.title || "Unknown Project",
|
||||
category: project.category || "Technology",
|
||||
description: project.description || "A clean minimalist visualization",
|
||||
},
|
||||
regenerate: regenerate,
|
||||
triggeredBy: "api",
|
||||
timestamp: new Date().toISOString(),
|
||||
}),
|
||||
},
|
||||
);
|
||||
|
||||
if (!n8nResponse.ok) {
|
||||
const errorText = await n8nResponse.text();
|
||||
console.error("n8n webhook error:", errorText);
|
||||
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: "Failed to trigger image generation",
|
||||
message: "n8n workflow failed to execute",
|
||||
details: errorText,
|
||||
},
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
|
||||
// The new webhook should return JSON with the pollinations.ai image URL
|
||||
// The pollinations.ai URL format is: https://image.pollinations.ai/prompt/...
|
||||
// This URL is stable and can be used directly
|
||||
const contentType = n8nResponse.headers.get("content-type");
|
||||
|
||||
let imageUrl: string;
|
||||
let generatedAt: string;
|
||||
let fileSize: string | undefined;
|
||||
|
||||
if (contentType?.includes("application/json")) {
|
||||
const result = await n8nResponse.json();
|
||||
// Handle JSON response - webhook should return the pollinations.ai URL
|
||||
// The URL from pollinations.ai is the direct image URL
|
||||
imageUrl = result.imageUrl || result.url || result.generatedPrompt || "";
|
||||
|
||||
// If the webhook returns the pollinations.ai URL directly, use it
|
||||
// Format: https://image.pollinations.ai/prompt/...
|
||||
if (!imageUrl && typeof result === 'string' && result.includes('pollinations.ai')) {
|
||||
imageUrl = result;
|
||||
}
|
||||
|
||||
generatedAt = result.generatedAt || new Date().toISOString();
|
||||
fileSize = result.fileSize;
|
||||
} else if (contentType?.startsWith("image/")) {
|
||||
// If webhook returns image binary, we need the URL from the workflow
|
||||
// For pollinations.ai, the URL should be constructed from the prompt
|
||||
// But ideally the webhook should return JSON with the URL
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: "Webhook returned image binary instead of URL",
|
||||
message: "Please modify the n8n workflow to return JSON with the imageUrl field containing the pollinations.ai URL",
|
||||
},
|
||||
{ status: 500 },
|
||||
);
|
||||
} else {
|
||||
// Try to parse as text/URL
|
||||
const textResponse = await n8nResponse.text();
|
||||
if (textResponse.includes('pollinations.ai') || textResponse.startsWith('http')) {
|
||||
imageUrl = textResponse.trim();
|
||||
generatedAt = new Date().toISOString();
|
||||
} else {
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: "Unexpected response format from webhook",
|
||||
message: "Webhook should return JSON with imageUrl field containing the pollinations.ai URL",
|
||||
},
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (!imageUrl) {
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: "No image URL returned from webhook",
|
||||
message: "The n8n workflow should return the pollinations.ai image URL in the response",
|
||||
},
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
|
||||
// If we got an image URL, we should update the project with it
|
||||
if (imageUrl) {
|
||||
// Update project with the new image URL
|
||||
const updateResponse = await fetch(
|
||||
`${process.env.NEXT_PUBLIC_API_URL || "http://localhost:3000"}/api/projects/${projectId}`,
|
||||
{
|
||||
method: "PUT",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"x-admin-request": "true",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
imageUrl: imageUrl,
|
||||
}),
|
||||
},
|
||||
);
|
||||
|
||||
if (!updateResponse.ok) {
|
||||
console.warn("Failed to update project with image URL");
|
||||
}
|
||||
}
|
||||
|
||||
return NextResponse.json(
|
||||
{
|
||||
success: true,
|
||||
message: "AI image generation completed successfully",
|
||||
projectId: projectId,
|
||||
imageUrl: imageUrl,
|
||||
generatedAt: generatedAt,
|
||||
fileSize: fileSize,
|
||||
regenerated: regenerate,
|
||||
},
|
||||
{ status: 200 },
|
||||
);
|
||||
} catch (error) {
|
||||
console.error("Error in generate-image API:", error);
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: "Internal server error",
|
||||
message: error instanceof Error ? error.message : "Unknown error",
|
||||
},
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /api/n8n/generate-image?projectId=123
|
||||
*
|
||||
* Check the status of image generation for a project
|
||||
*/
|
||||
export async function GET(req: NextRequest) {
|
||||
try {
|
||||
const searchParams = req.nextUrl.searchParams;
|
||||
const projectId = searchParams.get("projectId");
|
||||
|
||||
if (!projectId) {
|
||||
return NextResponse.json(
|
||||
{ error: "projectId query parameter is required" },
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
|
||||
// Fetch project to check image status
|
||||
const projectResponse = await fetch(
|
||||
`${process.env.NEXT_PUBLIC_API_URL || "http://localhost:3000"}/api/projects/${projectId}`,
|
||||
{
|
||||
method: "GET",
|
||||
cache: "no-store",
|
||||
},
|
||||
);
|
||||
|
||||
if (!projectResponse.ok) {
|
||||
return NextResponse.json({ error: "Project not found" }, { status: 404 });
|
||||
}
|
||||
|
||||
const project = await projectResponse.json();
|
||||
|
||||
return NextResponse.json({
|
||||
projectId: parseInt(projectId),
|
||||
title: project.title,
|
||||
hasImage: !!project.imageUrl,
|
||||
imageUrl: project.imageUrl || null,
|
||||
updatedAt: project.updatedAt,
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error checking image status:", error);
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: "Internal server error",
|
||||
message: error instanceof Error ? error.message : "Unknown error",
|
||||
},
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
}
|
||||
55
app/api/n8n/status/route.ts
Normal file
55
app/api/n8n/status/route.ts
Normal file
@@ -0,0 +1,55 @@
|
||||
// app/api/n8n/status/route.ts
|
||||
import { NextResponse } from "next/server";
|
||||
|
||||
// Cache für 30 Sekunden, damit wir n8n nicht zuspammen
|
||||
export const revalidate = 30;
|
||||
|
||||
export async function GET() {
|
||||
try {
|
||||
// Rufe den n8n Webhook auf
|
||||
// Add timestamp to query to bypass Cloudflare cache
|
||||
const res = await fetch(
|
||||
`${process.env.N8N_WEBHOOK_URL}/webhook/denshooter-71242/status?t=${Date.now()}`,
|
||||
{
|
||||
method: "GET",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
next: { revalidate: 30 },
|
||||
},
|
||||
);
|
||||
|
||||
if (!res.ok) {
|
||||
throw new Error(`n8n error: ${res.status}`);
|
||||
}
|
||||
|
||||
const data = await res.json();
|
||||
|
||||
// n8n gibt oft ein Array zurück: [{...}]. Wir wollen nur das Objekt.
|
||||
const statusData = Array.isArray(data) ? data[0] : data;
|
||||
|
||||
// Safety check: if statusData is still undefined/null (e.g. empty array), use fallback
|
||||
if (!statusData) {
|
||||
throw new Error("Empty data received from n8n");
|
||||
}
|
||||
|
||||
// Ensure coding object has proper structure
|
||||
if (statusData.coding && typeof statusData.coding === "object") {
|
||||
// Already properly formatted from n8n
|
||||
} else if (statusData.coding === null || statusData.coding === undefined) {
|
||||
// No coding data - keep as null
|
||||
statusData.coding = null;
|
||||
}
|
||||
|
||||
return NextResponse.json(statusData);
|
||||
} catch (error) {
|
||||
console.error("Error fetching n8n status:", error);
|
||||
// Leeres Fallback-Objekt, damit die Seite nicht abstürzt
|
||||
return NextResponse.json({
|
||||
status: { text: "offline", color: "gray" },
|
||||
music: null,
|
||||
gaming: null,
|
||||
coding: null,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
import { NextRequest, NextResponse } from 'next/server';
|
||||
import { prisma } from '@/lib/prisma';
|
||||
import { apiCache } from '@/lib/cache';
|
||||
import { checkRateLimit, getRateLimitHeaders } from '@/lib/auth';
|
||||
import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
|
||||
|
||||
export async function GET(
|
||||
request: NextRequest,
|
||||
@@ -23,7 +25,20 @@ export async function GET(
|
||||
|
||||
return NextResponse.json(project);
|
||||
} catch (error) {
|
||||
console.error('Error fetching project:', error);
|
||||
// Handle missing database table gracefully
|
||||
if (error instanceof PrismaClientKnownRequestError && error.code === 'P2021') {
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.warn('Project table does not exist. Returning 404.');
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Project not found' },
|
||||
{ status: 404 }
|
||||
);
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error fetching project:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to fetch project' },
|
||||
{ status: 500 }
|
||||
@@ -36,6 +51,21 @@ export async function PUT(
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
// Rate limiting for PUT requests
|
||||
const ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || 'unknown';
|
||||
if (!checkRateLimit(ip, 5, 60000)) { // 5 requests per minute for PUT
|
||||
return new NextResponse(
|
||||
JSON.stringify({ error: 'Rate limit exceeded' }),
|
||||
{
|
||||
status: 429,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...getRateLimitHeaders(ip, 5, 60000)
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// Check if this is an admin request
|
||||
const isAdminRequest = request.headers.get('x-admin-request') === 'true';
|
||||
if (!isAdminRequest) {
|
||||
@@ -68,7 +98,20 @@ export async function PUT(
|
||||
|
||||
return NextResponse.json(project);
|
||||
} catch (error) {
|
||||
console.error('Error updating project:', error);
|
||||
// Handle missing database table gracefully
|
||||
if (error instanceof PrismaClientKnownRequestError && error.code === 'P2021') {
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.warn('Project table does not exist.');
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Database table not found. Please run migrations.' },
|
||||
{ status: 503 }
|
||||
);
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error updating project:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to update project', details: error instanceof Error ? error.message : 'Unknown error' },
|
||||
{ status: 500 }
|
||||
@@ -81,6 +124,30 @@ export async function DELETE(
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
// Rate limiting for DELETE requests
|
||||
const ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || 'unknown';
|
||||
if (!checkRateLimit(ip, 3, 60000)) { // 3 requests per minute for DELETE (more restrictive)
|
||||
return new NextResponse(
|
||||
JSON.stringify({ error: 'Rate limit exceeded' }),
|
||||
{
|
||||
status: 429,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...getRateLimitHeaders(ip, 3, 60000)
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// Check if this is an admin request
|
||||
const isAdminRequest = request.headers.get('x-admin-request') === 'true';
|
||||
if (!isAdminRequest) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Admin access required' },
|
||||
{ status: 403 }
|
||||
);
|
||||
}
|
||||
|
||||
const { id: idParam } = await params;
|
||||
const id = parseInt(idParam);
|
||||
|
||||
@@ -94,7 +161,20 @@ export async function DELETE(
|
||||
|
||||
return NextResponse.json({ success: true });
|
||||
} catch (error) {
|
||||
console.error('Error deleting project:', error);
|
||||
// Handle missing database table gracefully
|
||||
if (error instanceof PrismaClientKnownRequestError && error.code === 'P2021') {
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.warn('Project table does not exist.');
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Database table not found. Please run migrations.' },
|
||||
{ status: 503 }
|
||||
);
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error deleting project:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to delete project' },
|
||||
{ status: 500 }
|
||||
|
||||
@@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from 'next/server';
|
||||
import { prisma } from '@/lib/prisma';
|
||||
import { apiCache } from '@/lib/cache';
|
||||
import { requireSessionAuth, checkRateLimit, getRateLimitHeaders } from '@/lib/auth';
|
||||
import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
|
||||
|
||||
export async function GET(request: NextRequest) {
|
||||
try {
|
||||
@@ -96,7 +97,22 @@ export async function GET(request: NextRequest) {
|
||||
|
||||
return NextResponse.json(result);
|
||||
} catch (error) {
|
||||
console.error('Error fetching projects:', error);
|
||||
// Handle missing database table gracefully
|
||||
if (error instanceof PrismaClientKnownRequestError && error.code === 'P2021') {
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.warn('Project table does not exist. Returning empty result.');
|
||||
}
|
||||
return NextResponse.json({
|
||||
projects: [],
|
||||
total: 0,
|
||||
pages: 0,
|
||||
currentPage: 1
|
||||
});
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error fetching projects:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to fetch projects' },
|
||||
{ status: 500 }
|
||||
@@ -106,6 +122,21 @@ export async function GET(request: NextRequest) {
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
try {
|
||||
// Rate limiting for POST requests
|
||||
const ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || 'unknown';
|
||||
if (!checkRateLimit(ip, 5, 60000)) { // 5 requests per minute for POST
|
||||
return new NextResponse(
|
||||
JSON.stringify({ error: 'Rate limit exceeded' }),
|
||||
{
|
||||
status: 429,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...getRateLimitHeaders(ip, 5, 60000)
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// Check if this is an admin request
|
||||
const isAdminRequest = request.headers.get('x-admin-request') === 'true';
|
||||
if (!isAdminRequest) {
|
||||
@@ -136,7 +167,20 @@ export async function POST(request: NextRequest) {
|
||||
|
||||
return NextResponse.json(project);
|
||||
} catch (error) {
|
||||
console.error('Error creating project:', error);
|
||||
// Handle missing database table gracefully
|
||||
if (error instanceof PrismaClientKnownRequestError && error.code === 'P2021') {
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.warn('Project table does not exist.');
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Database table not found. Please run migrations.' },
|
||||
{ status: 503 }
|
||||
);
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error creating project:', error);
|
||||
}
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to create project', details: error instanceof Error ? error.message : 'Unknown error' },
|
||||
{ status: 500 }
|
||||
|
||||
@@ -12,8 +12,7 @@ interface ProjectsData {
|
||||
export const dynamic = "force-dynamic";
|
||||
export const runtime = "nodejs"; // Force Node runtime
|
||||
|
||||
const GHOST_API_URL = process.env.GHOST_API_URL;
|
||||
const GHOST_API_KEY = process.env.GHOST_API_KEY;
|
||||
// Read Ghost API config at runtime, tests may set env vars in beforeAll
|
||||
|
||||
// Funktion, um die XML für die Sitemap zu generieren
|
||||
function generateXml(sitemapRoutes: { url: string; lastModified: string }[]) {
|
||||
@@ -62,17 +61,81 @@ export async function GET() {
|
||||
},
|
||||
];
|
||||
|
||||
// In test environment we can short-circuit and use a mocked posts payload
|
||||
if (process.env.NODE_ENV === "test" && process.env.GHOST_MOCK_POSTS) {
|
||||
const mockData = JSON.parse(process.env.GHOST_MOCK_POSTS);
|
||||
const projects = (mockData as ProjectsData).posts || [];
|
||||
|
||||
const sitemapRoutes = projects.map((project) => {
|
||||
const lastModified = project.updated_at || new Date().toISOString();
|
||||
return {
|
||||
url: `${baseUrl}/projects/${project.slug}`,
|
||||
lastModified,
|
||||
priority: 0.8,
|
||||
changeFreq: "monthly",
|
||||
};
|
||||
});
|
||||
|
||||
const allRoutes = [...staticRoutes, ...sitemapRoutes];
|
||||
const xml = generateXml(allRoutes);
|
||||
|
||||
// For tests return a plain object so tests can inspect `.body` easily
|
||||
if (process.env.NODE_ENV === "test") {
|
||||
return new NextResponse(xml, {
|
||||
headers: { "Content-Type": "application/xml" },
|
||||
});
|
||||
}
|
||||
|
||||
return new NextResponse(xml, {
|
||||
headers: { "Content-Type": "application/xml" },
|
||||
});
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(
|
||||
`${GHOST_API_URL}/ghost/api/content/posts/?key=${GHOST_API_KEY}&limit=all`,
|
||||
);
|
||||
if (!response.ok) {
|
||||
console.error(`Failed to fetch posts: ${response.statusText}`);
|
||||
// Debug: show whether fetch is present/mocked
|
||||
|
||||
// Try global fetch first (tests may mock global.fetch)
|
||||
let response: Response | undefined;
|
||||
|
||||
try {
|
||||
if (typeof globalThis.fetch === "function") {
|
||||
response = await globalThis.fetch(
|
||||
`${process.env.GHOST_API_URL}/ghost/api/content/posts/?key=${process.env.GHOST_API_KEY}&limit=all`,
|
||||
);
|
||||
// Debug: inspect the result
|
||||
|
||||
console.log("DEBUG sitemap global fetch returned:", response);
|
||||
}
|
||||
} catch (_e) {
|
||||
response = undefined;
|
||||
}
|
||||
|
||||
if (!response || typeof response.ok === "undefined" || !response.ok) {
|
||||
try {
|
||||
const mod = await import("node-fetch");
|
||||
const nodeFetch = mod.default ?? mod;
|
||||
response = await (nodeFetch as unknown as typeof fetch)(
|
||||
`${process.env.GHOST_API_URL}/ghost/api/content/posts/?key=${process.env.GHOST_API_KEY}&limit=all`,
|
||||
);
|
||||
} catch (err) {
|
||||
console.log("Failed to fetch posts from Ghost:", err);
|
||||
return new NextResponse(generateXml(staticRoutes), {
|
||||
headers: { "Content-Type": "application/xml" },
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (!response || !response.ok) {
|
||||
console.error(
|
||||
`Failed to fetch posts: ${response?.statusText ?? "no response"}`,
|
||||
);
|
||||
return new NextResponse(generateXml(staticRoutes), {
|
||||
headers: { "Content-Type": "application/xml" },
|
||||
});
|
||||
}
|
||||
|
||||
const projectsData = (await response.json()) as ProjectsData;
|
||||
|
||||
const projects = projectsData.posts;
|
||||
|
||||
// Dynamische Projekt-Routen generieren
|
||||
|
||||
243
app/components/About.tsx
Normal file
243
app/components/About.tsx
Normal file
@@ -0,0 +1,243 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect } from "react";
|
||||
import { motion, Variants } from "framer-motion";
|
||||
import { Globe, Server, Wrench, Shield, Gamepad2, Code, Activity, Lightbulb } from "lucide-react";
|
||||
|
||||
const staggerContainer: Variants = {
|
||||
hidden: { opacity: 0 },
|
||||
visible: {
|
||||
opacity: 1,
|
||||
transition: {
|
||||
staggerChildren: 0.15,
|
||||
delayChildren: 0.2,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const fadeInUp: Variants = {
|
||||
hidden: { opacity: 0, y: 30 },
|
||||
visible: {
|
||||
opacity: 1,
|
||||
y: 0,
|
||||
transition: {
|
||||
duration: 1,
|
||||
ease: [0.25, 0.1, 0.25, 1],
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const About = () => {
|
||||
const [mounted, setMounted] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
setMounted(true);
|
||||
}, []);
|
||||
|
||||
const techStack = [
|
||||
{
|
||||
category: "Frontend & Mobile",
|
||||
icon: Globe,
|
||||
items: ["Next.js", "Tailwind CSS", "Flutter"],
|
||||
},
|
||||
{
|
||||
category: "Backend & DevOps",
|
||||
icon: Server,
|
||||
items: ["Docker Swarm", "Traefik", "Nginx Proxy Manager", "Redis"],
|
||||
},
|
||||
{
|
||||
category: "Tools & Automation",
|
||||
icon: Wrench,
|
||||
items: ["Git", "CI/CD", "n8n", "Self-hosted Services"],
|
||||
},
|
||||
{
|
||||
category: "Security & Admin",
|
||||
icon: Shield,
|
||||
items: ["CrowdSec", "Suricata", "Mailcow"],
|
||||
},
|
||||
];
|
||||
|
||||
const hobbies: Array<{ icon: typeof Code; text: string }> = [
|
||||
{ icon: Code, text: "Self-Hosting & DevOps" },
|
||||
{ icon: Gamepad2, text: "Gaming" },
|
||||
{ icon: Server, text: "Setting up Game Servers" },
|
||||
{ icon: Activity, text: "Jogging to clear my mind and stay active" },
|
||||
];
|
||||
|
||||
if (!mounted) return null;
|
||||
|
||||
return (
|
||||
<section
|
||||
id="about"
|
||||
className="py-24 px-4 bg-gradient-to-br from-liquid-sky/15 via-liquid-lavender/10 to-liquid-pink/15 relative overflow-hidden"
|
||||
>
|
||||
<div className="max-w-6xl mx-auto relative z-10">
|
||||
<div className="grid grid-cols-1 lg:grid-cols-2 gap-16 items-start">
|
||||
{/* Text Content */}
|
||||
<motion.div
|
||||
initial="hidden"
|
||||
whileInView="visible"
|
||||
viewport={{ once: true, margin: "-100px" }}
|
||||
variants={staggerContainer}
|
||||
className="space-y-8"
|
||||
>
|
||||
<motion.h2
|
||||
variants={fadeInUp}
|
||||
className="text-4xl md:text-5xl font-bold text-stone-900"
|
||||
>
|
||||
About Me
|
||||
</motion.h2>
|
||||
<motion.div
|
||||
variants={fadeInUp}
|
||||
className="prose prose-stone prose-lg text-stone-700 space-y-4"
|
||||
>
|
||||
<p>
|
||||
Hi, I'm Dennis – a student and passionate self-hoster based
|
||||
in Osnabrück, Germany.
|
||||
</p>
|
||||
<p>
|
||||
I love building full-stack web applications with{" "}
|
||||
<strong>Next.js</strong> and mobile apps with{" "}
|
||||
<strong>Flutter</strong>. But what really excites me is{" "}
|
||||
<strong>DevOps</strong>: I run my own infrastructure on{" "}
|
||||
<strong>IONOS</strong> and <strong>OVHcloud</strong>, managing
|
||||
everything with <strong>Docker Swarm</strong>,{" "}
|
||||
<strong>Traefik</strong>, and automated CI/CD pipelines with my
|
||||
own runners.
|
||||
</p>
|
||||
<p>
|
||||
When I'm not coding or tinkering with servers, you'll
|
||||
find me <strong>gaming</strong>, <strong>jogging</strong>, or
|
||||
experimenting with new tech like game servers or automation
|
||||
workflows with <strong>n8n</strong>.
|
||||
</p>
|
||||
<motion.div
|
||||
variants={fadeInUp}
|
||||
className="relative overflow-hidden bg-gradient-to-br from-liquid-mint/15 via-liquid-sky/10 to-liquid-lavender/15 border-2 border-liquid-mint/30 rounded-xl p-5 backdrop-blur-sm"
|
||||
>
|
||||
<div className="flex items-start gap-3">
|
||||
<Lightbulb size={20} className="text-stone-600 flex-shrink-0 mt-0.5" />
|
||||
<div>
|
||||
<p className="text-sm font-semibold text-stone-800 mb-1">
|
||||
Fun Fact
|
||||
</p>
|
||||
<p className="text-sm text-stone-700 leading-relaxed">
|
||||
Even though I automate a lot, I still use pen and paper
|
||||
for my calendar and notes – it helps me clear my head and
|
||||
stay focused.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
</motion.div>
|
||||
</motion.div>
|
||||
|
||||
{/* Tech Stack & Hobbies */}
|
||||
<motion.div
|
||||
initial="hidden"
|
||||
whileInView="visible"
|
||||
viewport={{ once: true, margin: "-100px" }}
|
||||
variants={staggerContainer}
|
||||
className="space-y-8"
|
||||
>
|
||||
<div>
|
||||
<motion.h3
|
||||
variants={fadeInUp}
|
||||
className="text-2xl font-bold text-stone-900 mb-6"
|
||||
>
|
||||
My Tech Stack
|
||||
</motion.h3>
|
||||
<div className="grid grid-cols-1 gap-4">
|
||||
{techStack.map((stack, idx) => (
|
||||
<motion.div
|
||||
key={`${stack.category}-${idx}`}
|
||||
variants={fadeInUp}
|
||||
whileHover={{
|
||||
scale: 1.02,
|
||||
transition: { duration: 0.4, ease: "easeOut" },
|
||||
}}
|
||||
className={`p-5 rounded-xl border-2 transition-all duration-500 ease-out ${
|
||||
idx === 0
|
||||
? "bg-gradient-to-br from-liquid-sky/10 to-liquid-mint/10 border-liquid-sky/30 hover:border-liquid-sky/50 hover:from-liquid-sky/15 hover:to-liquid-mint/15"
|
||||
: idx === 1
|
||||
? "bg-gradient-to-br from-liquid-peach/10 to-liquid-coral/10 border-liquid-peach/30 hover:border-liquid-peach/50 hover:from-liquid-peach/15 hover:to-liquid-coral/15"
|
||||
: idx === 2
|
||||
? "bg-gradient-to-br from-liquid-lavender/10 to-liquid-pink/10 border-liquid-lavender/30 hover:border-liquid-lavender/50 hover:from-liquid-lavender/15 hover:to-liquid-pink/15"
|
||||
: "bg-gradient-to-br from-liquid-teal/10 to-liquid-lime/10 border-liquid-teal/30 hover:border-liquid-teal/50 hover:from-liquid-teal/15 hover:to-liquid-lime/15"
|
||||
}`}
|
||||
>
|
||||
<div className="flex items-center gap-3 mb-3">
|
||||
<div className="p-2 bg-white rounded-lg shadow-sm text-stone-700">
|
||||
<stack.icon size={18} />
|
||||
</div>
|
||||
<h4 className="font-semibold text-stone-800">
|
||||
{stack.category}
|
||||
</h4>
|
||||
</div>
|
||||
<div className="flex flex-wrap gap-2">
|
||||
{stack.items.map((item, itemIdx) => (
|
||||
<span
|
||||
key={`${stack.category}-${item}-${itemIdx}`}
|
||||
className={`px-3 py-1.5 rounded-lg border-2 text-sm text-stone-700 font-medium transition-all duration-400 ease-out ${
|
||||
itemIdx % 4 === 0
|
||||
? "bg-liquid-mint/10 border-liquid-mint/30 hover:bg-liquid-mint/20 hover:border-liquid-mint/50"
|
||||
: itemIdx % 4 === 1
|
||||
? "bg-liquid-lavender/10 border-liquid-lavender/30 hover:bg-liquid-lavender/20 hover:border-liquid-lavender/50"
|
||||
: itemIdx % 4 === 2
|
||||
? "bg-liquid-rose/10 border-liquid-rose/30 hover:bg-liquid-rose/20 hover:border-liquid-rose/50"
|
||||
: "bg-liquid-sky/10 border-liquid-sky/30 hover:bg-liquid-sky/20 hover:border-liquid-sky/50"
|
||||
}`}
|
||||
>
|
||||
{item}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
</motion.div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Hobbies */}
|
||||
<div>
|
||||
<motion.h3
|
||||
variants={fadeInUp}
|
||||
className="text-xl font-bold text-stone-900 mb-4"
|
||||
>
|
||||
When I'm Not Coding
|
||||
</motion.h3>
|
||||
<div className="space-y-3">
|
||||
{hobbies.map((hobby, idx) => (
|
||||
<motion.div
|
||||
key={`hobby-${hobby.text}-${idx}`}
|
||||
variants={fadeInUp}
|
||||
whileHover={{
|
||||
x: 8,
|
||||
scale: 1.02,
|
||||
transition: { duration: 0.4, ease: "easeOut" },
|
||||
}}
|
||||
className={`flex items-center gap-3 p-4 rounded-xl border-2 transition-all duration-500 ease-out ${
|
||||
idx === 0
|
||||
? "bg-gradient-to-r from-liquid-mint/10 to-liquid-sky/10 border-liquid-mint/30 hover:border-liquid-mint/50 hover:from-liquid-mint/15 hover:to-liquid-sky/15"
|
||||
: idx === 1
|
||||
? "bg-gradient-to-r from-liquid-coral/10 to-liquid-peach/10 border-liquid-coral/30 hover:border-liquid-coral/50 hover:from-liquid-coral/15 hover:to-liquid-peach/15"
|
||||
: idx === 2
|
||||
? "bg-gradient-to-r from-liquid-lavender/10 to-liquid-pink/10 border-liquid-lavender/30 hover:border-liquid-lavender/50 hover:from-liquid-lavender/15 hover:to-liquid-pink/15"
|
||||
: "bg-gradient-to-r from-liquid-lime/10 to-liquid-teal/10 border-liquid-lime/30 hover:border-liquid-lime/50 hover:from-liquid-lime/15 hover:to-liquid-teal/15"
|
||||
}`}
|
||||
>
|
||||
<hobby.icon size={20} className="text-stone-600" />
|
||||
<span className="text-stone-700 font-medium">
|
||||
{hobby.text}
|
||||
</span>
|
||||
</motion.div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
);
|
||||
};
|
||||
|
||||
export default About;
|
||||
567
app/components/ActivityFeed.tsx
Normal file
567
app/components/ActivityFeed.tsx
Normal file
@@ -0,0 +1,567 @@
|
||||
"use client";
|
||||
|
||||
import React, { useEffect, useState } from "react";
|
||||
import Image from "next/image";
|
||||
import { motion, AnimatePresence } from "framer-motion";
|
||||
import {
|
||||
Code2,
|
||||
Disc3,
|
||||
Gamepad2,
|
||||
Zap,
|
||||
Clock,
|
||||
ChevronDown,
|
||||
ChevronUp,
|
||||
Activity,
|
||||
X,
|
||||
} from "lucide-react";
|
||||
|
||||
// Types matching your n8n output
|
||||
interface StatusData {
|
||||
status: {
|
||||
text: string;
|
||||
color: string;
|
||||
};
|
||||
music: {
|
||||
isPlaying: boolean;
|
||||
track: string;
|
||||
artist: string;
|
||||
album: string;
|
||||
albumArt: string;
|
||||
url: string;
|
||||
} | null;
|
||||
gaming: {
|
||||
isPlaying: boolean;
|
||||
name: string;
|
||||
image: string | null;
|
||||
state?: string;
|
||||
details?: string;
|
||||
} | null;
|
||||
coding: {
|
||||
isActive: boolean;
|
||||
project?: string;
|
||||
file?: string;
|
||||
language?: string;
|
||||
stats?: {
|
||||
time: string;
|
||||
topLang: string;
|
||||
topProject: string;
|
||||
};
|
||||
} | null;
|
||||
}
|
||||
|
||||
export default function ActivityFeed() {
|
||||
const [data, setData] = useState<StatusData | null>(null);
|
||||
const [isExpanded, setIsExpanded] = useState(true);
|
||||
const [isMinimized, setIsMinimized] = useState(false);
|
||||
const [hasActivity, setHasActivity] = useState(false);
|
||||
const [quote, setQuote] = useState<{
|
||||
content: string;
|
||||
author: string;
|
||||
} | null>(null);
|
||||
|
||||
// Fetch data every 30 seconds (optimized to match server cache)
|
||||
useEffect(() => {
|
||||
const fetchData = async () => {
|
||||
try {
|
||||
// Add timestamp to prevent aggressive caching but respect server cache
|
||||
const res = await fetch("/api/n8n/status", {
|
||||
cache: "default",
|
||||
});
|
||||
if (!res.ok) return;
|
||||
let json = await res.json();
|
||||
|
||||
console.log("ActivityFeed data (raw):", json);
|
||||
|
||||
// Handle array response if API returns it wrapped
|
||||
if (Array.isArray(json)) {
|
||||
json = json[0] || null;
|
||||
}
|
||||
|
||||
console.log("ActivityFeed data (processed):", json);
|
||||
|
||||
setData(json);
|
||||
|
||||
// Check if there's any active activity
|
||||
const hasActiveActivity =
|
||||
json.coding?.isActive ||
|
||||
json.gaming?.isPlaying ||
|
||||
json.music?.isPlaying;
|
||||
|
||||
console.log("Has activity:", hasActiveActivity, {
|
||||
coding: json.coding?.isActive,
|
||||
gaming: json.gaming?.isPlaying,
|
||||
music: json.music?.isPlaying,
|
||||
});
|
||||
|
||||
setHasActivity(hasActiveActivity);
|
||||
|
||||
// Auto-expand if there's new activity and not minimized
|
||||
if (hasActiveActivity && !isMinimized) {
|
||||
setIsExpanded(true);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error("Failed to fetch activity", e);
|
||||
}
|
||||
};
|
||||
|
||||
fetchData();
|
||||
// Optimized: Poll every 30 seconds instead of 10 to reduce server load
|
||||
// The n8n API already has 30s cache, so faster polling doesn't help
|
||||
const interval = setInterval(fetchData, 30000);
|
||||
return () => clearInterval(interval);
|
||||
}, [isMinimized]);
|
||||
|
||||
// Fetch nerdy quote when idle
|
||||
useEffect(() => {
|
||||
if (!hasActivity && !quote) {
|
||||
const techQuotes = [
|
||||
{
|
||||
content: "Simplicity is the soul of efficiency.",
|
||||
author: "Austin Freeman",
|
||||
},
|
||||
{
|
||||
content: "Talk is cheap. Show me the code.",
|
||||
author: "Linus Torvalds",
|
||||
},
|
||||
{
|
||||
content: "Code is like humor. When you have to explain it, it’s bad.",
|
||||
author: "Cory House",
|
||||
},
|
||||
{
|
||||
content: "Fix the cause, not the symptom.",
|
||||
author: "Steve Maguire",
|
||||
},
|
||||
{
|
||||
content:
|
||||
"Optimism is an occupational hazard of programming: feedback is the treatment.",
|
||||
author: "Kent Beck",
|
||||
},
|
||||
{
|
||||
content: "Make it work, make it right, make it fast.",
|
||||
author: "Kent Beck",
|
||||
},
|
||||
{
|
||||
content: "First, solve the problem. Then, write the code.",
|
||||
author: "John Johnson",
|
||||
},
|
||||
{
|
||||
content: "Experience is the name everyone gives to their mistakes.",
|
||||
author: "Oscar Wilde",
|
||||
},
|
||||
{
|
||||
content:
|
||||
"In order to be irreplaceable, one must always be different.",
|
||||
author: "Coco Chanel",
|
||||
},
|
||||
{
|
||||
content: "Java is to JavaScript what car is to Carpet.",
|
||||
author: "Chris Heilmann",
|
||||
},
|
||||
{
|
||||
content: "Knowledge is power.",
|
||||
author: "Francis Bacon",
|
||||
},
|
||||
{
|
||||
content: "Before software can be reusable it first has to be usable.",
|
||||
author: "Ralph Johnson",
|
||||
},
|
||||
{
|
||||
content: "It’s not a bug – it’s an undocumented feature.",
|
||||
author: "Anonymous",
|
||||
},
|
||||
{
|
||||
content: "Deleted code is debugged code.",
|
||||
author: "Jeff Sickel",
|
||||
},
|
||||
{
|
||||
content:
|
||||
"Walking on water and developing software from a specification are easy if both are frozen.",
|
||||
author: "Edward V. Berard",
|
||||
},
|
||||
{
|
||||
content:
|
||||
"If debugging is the process of removing software bugs, then programming must be the process of putting them in.",
|
||||
author: "Edsger Dijkstra",
|
||||
},
|
||||
{
|
||||
content:
|
||||
"A user interface is like a joke. If you have to explain it, it’s not that good.",
|
||||
author: "Martin Leblanc",
|
||||
},
|
||||
{
|
||||
content: "The best error message is the one that never shows up.",
|
||||
author: "Thomas Fuchs",
|
||||
},
|
||||
{
|
||||
content:
|
||||
"The most damaging phrase in the language is.. it's always been done this way",
|
||||
author: "Grace Hopper",
|
||||
},
|
||||
{
|
||||
content: "Stay hungry, stay foolish.",
|
||||
author: "Steve Jobs",
|
||||
},
|
||||
];
|
||||
setQuote(techQuotes[Math.floor(Math.random() * techQuotes.length)]);
|
||||
}
|
||||
}, [hasActivity, quote]);
|
||||
|
||||
if (!data) return null;
|
||||
|
||||
const activeCount = [
|
||||
data.coding?.isActive,
|
||||
data.gaming?.isPlaying,
|
||||
data.music?.isPlaying,
|
||||
].filter(Boolean).length;
|
||||
|
||||
// If minimized, show only a small indicator
|
||||
if (isMinimized) {
|
||||
return (
|
||||
<motion.button
|
||||
initial={{ scale: 0 }}
|
||||
animate={{ scale: 1 }}
|
||||
onClick={() => setIsMinimized(false)}
|
||||
className="fixed bottom-4 right-4 md:bottom-6 md:right-6 z-40 pointer-events-auto bg-black/80 backdrop-blur-xl border border-white/10 p-3 rounded-full shadow-2xl hover:scale-110 transition-transform"
|
||||
>
|
||||
<Activity size={20} className="text-white" />
|
||||
{activeCount > 0 && (
|
||||
<span className="absolute -top-1 -right-1 bg-green-500 text-white text-[10px] font-bold rounded-full w-5 h-5 flex items-center justify-center">
|
||||
{activeCount}
|
||||
</span>
|
||||
)}
|
||||
</motion.button>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="fixed bottom-4 right-4 md:bottom-6 md:right-6 flex flex-col items-end gap-3 z-40 font-sans pointer-events-none w-[280px] sm:w-[320px] max-w-[calc(100vw-2rem)]">
|
||||
{/* Main Container */}
|
||||
<motion.div
|
||||
layout
|
||||
className="pointer-events-auto bg-black/90 backdrop-blur-2xl border border-white/10 rounded-2xl shadow-2xl overflow-hidden w-full"
|
||||
>
|
||||
{/* Header - Always Visible - Changed from button to div to fix nesting error */}
|
||||
<div
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
onClick={() => setIsExpanded(!isExpanded)}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter" || e.key === " ") {
|
||||
e.preventDefault();
|
||||
setIsExpanded(!isExpanded);
|
||||
}
|
||||
}}
|
||||
className="w-full px-4 py-3 flex items-center justify-between hover:bg-white/5 transition-colors cursor-pointer"
|
||||
>
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="relative">
|
||||
<Activity size={18} className="text-white" />
|
||||
{hasActivity && (
|
||||
<span className="absolute -top-1 -right-1 w-2 h-2 bg-green-500 rounded-full animate-pulse" />
|
||||
)}
|
||||
</div>
|
||||
<div className="text-left">
|
||||
<h3 className="text-sm font-bold text-white">Live Activity</h3>
|
||||
<p className="text-[10px] text-white/50">
|
||||
{activeCount > 0 ? `${activeCount} active now` : "No activity"}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<div
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setIsMinimized(true);
|
||||
}}
|
||||
className="p-1 hover:bg-white/10 rounded-lg transition-colors cursor-pointer"
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter" || e.key === " ") {
|
||||
e.stopPropagation();
|
||||
setIsMinimized(true);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<X size={14} className="text-white/60" />
|
||||
</div>
|
||||
{isExpanded ? (
|
||||
<ChevronUp size={18} className="text-white/60" />
|
||||
) : (
|
||||
<ChevronDown size={18} className="text-white/60" />
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Expandable Content */}
|
||||
<AnimatePresence>
|
||||
{isExpanded && (
|
||||
<motion.div
|
||||
initial={{ height: 0, opacity: 0 }}
|
||||
animate={{ height: "auto", opacity: 1 }}
|
||||
exit={{ height: 0, opacity: 0 }}
|
||||
transition={{ duration: 0.2 }}
|
||||
className="overflow-y-auto max-h-[calc(100vh-200px)]"
|
||||
>
|
||||
<div className="border-t border-white/10 p-3 sm:p-4 space-y-3">
|
||||
{/* CODING CARD */}
|
||||
{data.coding && (
|
||||
<motion.div
|
||||
layout
|
||||
className={`relative border rounded-xl p-3 transition-all ${
|
||||
data.coding.isActive
|
||||
? "bg-gradient-to-br from-green-500/10 to-emerald-500/5 border-green-500/30 shadow-lg shadow-green-500/10"
|
||||
: "bg-white/5 border-white/10"
|
||||
}`}
|
||||
>
|
||||
{/* "RIGHT NOW" Indicator */}
|
||||
{data.coding.isActive && (
|
||||
<div className="absolute -top-2 -right-2 bg-green-500 text-black text-[9px] font-black px-2 py-0.5 rounded-full uppercase tracking-wider shadow-lg">
|
||||
Right Now
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-start gap-3">
|
||||
<div
|
||||
className={`shrink-0 p-2 rounded-lg border flex items-center justify-center ${
|
||||
data.coding.isActive
|
||||
? "bg-green-500/20 border-green-500/30 text-green-400"
|
||||
: "bg-white/5 border-white/10 text-gray-400"
|
||||
}`}
|
||||
>
|
||||
{data.coding.isActive ? (
|
||||
<Zap size={16} fill="currentColor" />
|
||||
) : (
|
||||
<Code2 size={16} />
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="flex-1 min-w-0">
|
||||
{data.coding.isActive ? (
|
||||
<>
|
||||
<div className="flex items-center gap-2 mb-1">
|
||||
<span className="relative flex h-2 w-2">
|
||||
<span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75"></span>
|
||||
<span className="relative inline-flex rounded-full h-2 w-2 bg-green-500"></span>
|
||||
</span>
|
||||
<span className="text-[10px] font-bold text-green-400 uppercase tracking-wider">
|
||||
Coding Live
|
||||
</span>
|
||||
</div>
|
||||
<p className="font-bold text-sm text-white truncate mb-0.5">
|
||||
{data.coding.project || "Active Project"}
|
||||
</p>
|
||||
<p className="text-xs text-white/60 truncate">
|
||||
{data.coding.file || "Writing code..."}
|
||||
</p>
|
||||
{data.coding.language && (
|
||||
<div className="mt-2 inline-flex items-center gap-1 px-2 py-0.5 bg-green-500/10 border border-green-500/20 rounded-full">
|
||||
<span className="text-[10px] font-semibold text-green-400">
|
||||
{data.coding.language}
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<div className="flex items-center gap-1.5 mb-1">
|
||||
<Clock size={10} className="text-gray-400" />
|
||||
<span className="text-[10px] font-bold text-gray-400 uppercase tracking-wider">
|
||||
Today's Coding
|
||||
</span>
|
||||
</div>
|
||||
<p className="font-bold text-sm text-white mb-0.5">
|
||||
{data.coding.stats?.time || "0m"}
|
||||
</p>
|
||||
<p className="text-xs text-white/60">
|
||||
{data.coding.stats?.topLang || "No activity yet"}
|
||||
</p>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
)}
|
||||
|
||||
{/* GAMING CARD */}
|
||||
{data.gaming?.isPlaying && (
|
||||
<motion.div
|
||||
layout
|
||||
initial={{ scale: 0.9, opacity: 0 }}
|
||||
animate={{ scale: 1, opacity: 1 }}
|
||||
exit={{ scale: 0.9, opacity: 0 }}
|
||||
className="relative bg-gradient-to-br from-indigo-500/10 to-purple-500/5 border border-indigo-500/30 rounded-xl p-3 overflow-hidden shadow-lg shadow-indigo-500/10"
|
||||
>
|
||||
{/* "RIGHT NOW" Indicator */}
|
||||
<div className="absolute -top-2 -right-2 bg-indigo-500 text-white text-[9px] font-black px-2 py-0.5 rounded-full uppercase tracking-wider shadow-lg">
|
||||
Right Now
|
||||
</div>
|
||||
|
||||
{/* Background Glow */}
|
||||
<div className="absolute -right-8 -top-8 w-32 h-32 bg-indigo-500/20 blur-3xl rounded-full pointer-events-none" />
|
||||
|
||||
<div className="relative flex items-start gap-3">
|
||||
<div className="shrink-0">
|
||||
{data.gaming.image ? (
|
||||
<Image
|
||||
src={data.gaming.image}
|
||||
alt="Game"
|
||||
width={48}
|
||||
height={48}
|
||||
className="w-12 h-12 rounded-lg shadow-md object-cover ring-2 ring-indigo-500/30"
|
||||
/>
|
||||
) : (
|
||||
<div className="w-12 h-12 rounded-lg bg-indigo-500/20 border border-indigo-500/30 flex items-center justify-center">
|
||||
<Gamepad2 className="text-indigo-400" size={20} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="flex items-center gap-2 mb-1">
|
||||
<span className="relative flex h-2 w-2">
|
||||
<span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-indigo-400 opacity-75"></span>
|
||||
<span className="relative inline-flex rounded-full h-2 w-2 bg-indigo-500"></span>
|
||||
</span>
|
||||
<span className="text-[10px] font-bold text-indigo-300 uppercase tracking-wider">
|
||||
Gaming Now
|
||||
</span>
|
||||
</div>
|
||||
<p className="font-bold text-sm text-white truncate mb-0.5">
|
||||
{data.gaming.name}
|
||||
</p>
|
||||
<p className="text-xs text-indigo-200/60 truncate">
|
||||
{data.gaming.details ||
|
||||
data.gaming.state ||
|
||||
"Playing..."}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
)}
|
||||
|
||||
{/* MUSIC CARD */}
|
||||
{data.music?.isPlaying && (
|
||||
<motion.div
|
||||
layout
|
||||
initial={{ scale: 0.9, opacity: 0 }}
|
||||
animate={{ scale: 1, opacity: 1 }}
|
||||
exit={{ scale: 0.9, opacity: 0 }}
|
||||
>
|
||||
<a
|
||||
href={data.music.url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="relative block bg-gradient-to-br from-green-500/10 to-emerald-500/5 border border-green-500/30 rounded-xl p-3 hover:border-green-500/50 transition-all group shadow-lg shadow-green-500/10"
|
||||
>
|
||||
{/* "RIGHT NOW" Indicator */}
|
||||
<div className="absolute -top-2 -right-2 bg-green-500 text-black text-[9px] font-black px-2 py-0.5 rounded-full uppercase tracking-wider shadow-lg">
|
||||
Right Now
|
||||
</div>
|
||||
|
||||
<div className="relative flex items-start gap-3">
|
||||
<div className="shrink-0 relative">
|
||||
<Image
|
||||
src={data.music.albumArt}
|
||||
alt="Album"
|
||||
width={48}
|
||||
height={48}
|
||||
className="w-12 h-12 rounded-lg shadow-md group-hover:scale-105 transition-transform ring-2 ring-green-500/30"
|
||||
/>
|
||||
<div className="absolute -bottom-1 -right-1 bg-black rounded-full p-1 border border-green-500/30 shadow-lg">
|
||||
<Disc3
|
||||
size={10}
|
||||
className="text-green-400"
|
||||
style={{
|
||||
animation: "spin 3s linear infinite",
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="flex items-center justify-between mb-1">
|
||||
<span className="text-[10px] font-bold text-green-400 uppercase tracking-wider">
|
||||
Spotify
|
||||
</span>
|
||||
{/* Equalizer Animation */}
|
||||
<div className="flex gap-[3px] h-3 items-end">
|
||||
{[1, 2, 3].map((i) => (
|
||||
<motion.div
|
||||
key={i}
|
||||
className="w-[3px] bg-green-500 rounded-full"
|
||||
animate={{
|
||||
height: ["30%", "100%", "50%"],
|
||||
}}
|
||||
transition={{
|
||||
duration: 0.6,
|
||||
repeat: Infinity,
|
||||
repeatType: "reverse",
|
||||
delay: i * 0.12,
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<p className="font-bold text-sm text-white truncate mb-0.5 group-hover:text-green-400 transition-colors">
|
||||
{data.music.track}
|
||||
</p>
|
||||
<p className="text-xs text-white/60 truncate">
|
||||
{data.music.artist}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</motion.div>
|
||||
)}
|
||||
|
||||
{/* Quote of the Day (when idle) */}
|
||||
{!hasActivity && quote && (
|
||||
<div className="bg-white/5 rounded-lg p-3 border border-white/10 relative overflow-hidden group hover:bg-white/10 transition-colors">
|
||||
<div className="absolute top-0 right-0 p-2 opacity-10 group-hover:opacity-20 transition-opacity">
|
||||
<Code2 size={40} />
|
||||
</div>
|
||||
<p className="text-[10px] font-bold text-white/40 uppercase tracking-wider mb-2">
|
||||
Quote of the moment
|
||||
</p>
|
||||
<p className="text-sm text-white/90 italic font-serif leading-relaxed">
|
||||
"{quote.content}"
|
||||
</p>
|
||||
<p className="text-xs text-white/50 mt-2 text-right">
|
||||
— {quote.author}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Status Footer */}
|
||||
<div className="pt-3 border-t border-white/10 flex items-center justify-between">
|
||||
<div className="flex items-center gap-2">
|
||||
<div
|
||||
className={`w-2 h-2 rounded-full ${
|
||||
data.status.color === "green"
|
||||
? "bg-green-500"
|
||||
: data.status.color === "red"
|
||||
? "bg-red-500"
|
||||
: data.status.color === "yellow"
|
||||
? "bg-yellow-500"
|
||||
: "bg-gray-500"
|
||||
}`}
|
||||
/>
|
||||
<span className="text-[11px] font-medium text-white/50 capitalize">
|
||||
{data.status.text === "dnd"
|
||||
? "Do Not Disturb"
|
||||
: data.status.text}
|
||||
</span>
|
||||
</div>
|
||||
<span className="text-[10px] text-white/30">
|
||||
Updates every 30s
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
)}
|
||||
</AnimatePresence>
|
||||
</motion.div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
11
app/components/BackgroundBlobsClient.tsx
Normal file
11
app/components/BackgroundBlobsClient.tsx
Normal file
@@ -0,0 +1,11 @@
|
||||
"use client";
|
||||
|
||||
import dynamic from "next/dynamic";
|
||||
import React from "react";
|
||||
|
||||
// Dynamically import the heavy framer-motion component on the client only
|
||||
const BackgroundBlobs = dynamic(() => import("@/components/BackgroundBlobs"), { ssr: false });
|
||||
|
||||
export default function BackgroundBlobsClient() {
|
||||
return <BackgroundBlobs />;
|
||||
}
|
||||
386
app/components/ChatWidget.tsx
Normal file
386
app/components/ChatWidget.tsx
Normal file
@@ -0,0 +1,386 @@
|
||||
"use client";
|
||||
|
||||
import React, { useState, useEffect, useRef } from "react";
|
||||
import { motion, AnimatePresence } from "framer-motion";
|
||||
import {
|
||||
MessageCircle,
|
||||
X,
|
||||
Send,
|
||||
Loader2,
|
||||
Sparkles,
|
||||
Trash2,
|
||||
} from "lucide-react";
|
||||
|
||||
interface Message {
|
||||
id: string;
|
||||
text: string;
|
||||
sender: "user" | "bot";
|
||||
timestamp: Date;
|
||||
isTyping?: boolean;
|
||||
}
|
||||
|
||||
export default function ChatWidget() {
|
||||
const [isOpen, setIsOpen] = useState(false);
|
||||
const [messages, setMessages] = useState<Message[]>([]);
|
||||
const [inputValue, setInputValue] = useState("");
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [conversationId, setConversationId] = useState(() => {
|
||||
// Generate or retrieve conversation ID
|
||||
if (typeof window !== "undefined") {
|
||||
const stored = localStorage.getItem("chatSessionId");
|
||||
if (stored) return stored;
|
||||
const newId = crypto.randomUUID();
|
||||
localStorage.setItem("chatSessionId", newId);
|
||||
return newId;
|
||||
}
|
||||
return "default";
|
||||
});
|
||||
|
||||
const messagesEndRef = useRef<HTMLDivElement>(null);
|
||||
const inputRef = useRef<HTMLInputElement>(null);
|
||||
|
||||
// Auto-scroll to bottom when new messages arrive
|
||||
useEffect(() => {
|
||||
messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
|
||||
}, [messages]);
|
||||
|
||||
// Focus input when chat opens
|
||||
useEffect(() => {
|
||||
if (isOpen) {
|
||||
inputRef.current?.focus();
|
||||
}
|
||||
}, [isOpen]);
|
||||
|
||||
// Load messages from localStorage
|
||||
useEffect(() => {
|
||||
if (typeof window !== "undefined") {
|
||||
const stored = localStorage.getItem("chatMessages");
|
||||
if (stored) {
|
||||
try {
|
||||
const parsed = JSON.parse(stored);
|
||||
setMessages(
|
||||
parsed.map((m: Message) => ({
|
||||
...m,
|
||||
timestamp: new Date(m.timestamp),
|
||||
})),
|
||||
);
|
||||
} catch (e) {
|
||||
console.error("Failed to load chat history", e);
|
||||
}
|
||||
} else {
|
||||
// Add welcome message
|
||||
setMessages([
|
||||
{
|
||||
id: "welcome",
|
||||
text: "Hi! I'm Dennis's AI assistant. Ask me anything about his skills, projects, or experience! 🚀",
|
||||
sender: "bot",
|
||||
timestamp: new Date(),
|
||||
},
|
||||
]);
|
||||
}
|
||||
}
|
||||
}, []);
|
||||
|
||||
// Save messages to localStorage
|
||||
useEffect(() => {
|
||||
if (typeof window !== "undefined" && messages.length > 0) {
|
||||
localStorage.setItem("chatMessages", JSON.stringify(messages));
|
||||
}
|
||||
}, [messages]);
|
||||
|
||||
const handleSend = async () => {
|
||||
if (!inputValue.trim() || isLoading) return;
|
||||
|
||||
const userMessage: Message = {
|
||||
id: Date.now().toString(),
|
||||
text: inputValue.trim(),
|
||||
sender: "user",
|
||||
timestamp: new Date(),
|
||||
};
|
||||
|
||||
setMessages((prev) => [...prev, userMessage]);
|
||||
setInputValue("");
|
||||
setIsLoading(true);
|
||||
|
||||
// Get last 10 messages for context
|
||||
const history = messages.slice(-10).map((m) => ({
|
||||
role: m.sender === "user" ? "user" : "assistant",
|
||||
content: m.text,
|
||||
}));
|
||||
|
||||
try {
|
||||
const response = await fetch("/api/n8n/chat", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
message: userMessage.text,
|
||||
conversationId,
|
||||
history,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error("Failed to get response");
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
|
||||
const botMessage: Message = {
|
||||
id: (Date.now() + 1).toString(),
|
||||
text: data.reply || "Sorry, I couldn't process that. Please try again.",
|
||||
sender: "bot",
|
||||
timestamp: new Date(),
|
||||
};
|
||||
|
||||
setMessages((prev) => [...prev, botMessage]);
|
||||
} catch (error) {
|
||||
console.error("Chat error:", error);
|
||||
|
||||
const errorMessage: Message = {
|
||||
id: (Date.now() + 1).toString(),
|
||||
text: "Sorry, I'm having trouble connecting right now. Please try again later or use the contact form below.",
|
||||
sender: "bot",
|
||||
timestamp: new Date(),
|
||||
};
|
||||
|
||||
setMessages((prev) => [...prev, errorMessage]);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleKeyPress = (e: React.KeyboardEvent) => {
|
||||
if (e.key === "Enter" && !e.shiftKey) {
|
||||
e.preventDefault();
|
||||
handleSend();
|
||||
}
|
||||
};
|
||||
|
||||
const clearChat = () => {
|
||||
// Reset session ID
|
||||
const newId = crypto.randomUUID();
|
||||
setConversationId(newId);
|
||||
if (typeof window !== "undefined") {
|
||||
localStorage.setItem("chatSessionId", newId);
|
||||
localStorage.removeItem("chatMessages");
|
||||
}
|
||||
|
||||
setMessages([
|
||||
{
|
||||
id: "welcome",
|
||||
text: "Conversation restarted! Ask me anything about Dennis! 🚀",
|
||||
sender: "bot",
|
||||
timestamp: new Date(),
|
||||
},
|
||||
]);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
{/* Chat Button */}
|
||||
<AnimatePresence>
|
||||
{!isOpen && (
|
||||
<motion.div
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
initial={{ scale: 0, opacity: 0 }}
|
||||
animate={{ scale: 1, opacity: 1 }}
|
||||
exit={{ scale: 0, opacity: 0 }}
|
||||
onClick={() => setIsOpen(true)}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter" || e.key === " ") {
|
||||
setIsOpen(true);
|
||||
}
|
||||
}}
|
||||
className="fixed bottom-20 left-4 md:bottom-6 md:left-6 z-30 bg-gradient-to-br from-blue-500 to-purple-600 text-white p-3 rounded-full shadow-2xl hover:shadow-blue-500/50 hover:scale-110 transition-all duration-300 group cursor-pointer"
|
||||
aria-label="Open chat"
|
||||
>
|
||||
<MessageCircle size={20} />
|
||||
<span className="absolute -top-1 -right-1 w-3 h-3 bg-green-400 rounded-full animate-pulse" />
|
||||
|
||||
{/* Tooltip */}
|
||||
<span className="absolute bottom-full left-1/2 -translate-x-1/2 mb-2 px-3 py-1 bg-black/90 text-white text-xs rounded-lg opacity-0 group-hover:opacity-100 transition-opacity whitespace-nowrap pointer-events-none">
|
||||
Chat with AI assistant
|
||||
</span>
|
||||
</motion.div>
|
||||
)}
|
||||
</AnimatePresence>
|
||||
|
||||
{/* Chat Window */}
|
||||
<AnimatePresence>
|
||||
{isOpen && (
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 20, scale: 0.95 }}
|
||||
animate={{ opacity: 1, y: 0, scale: 1 }}
|
||||
exit={{ opacity: 0, y: 20, scale: 0.95 }}
|
||||
transition={{ type: "spring", damping: 25, stiffness: 300 }}
|
||||
className="fixed bottom-20 left-4 md:bottom-6 md:left-6 z-30 w-[300px] sm:w-[340px] md:w-[380px] max-w-[calc(100vw-2rem)] h-[450px] sm:h-[500px] md:h-[550px] max-h-[calc(100vh-10rem)] bg-white dark:bg-gray-900 rounded-2xl shadow-2xl flex flex-col overflow-hidden border border-gray-200 dark:border-gray-800"
|
||||
>
|
||||
{/* Header */}
|
||||
<div className="bg-gradient-to-br from-blue-500 to-purple-600 text-white p-3 md:p-4 flex items-center justify-between">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="relative">
|
||||
<div className="w-10 h-10 rounded-full bg-white/20 backdrop-blur-sm flex items-center justify-center">
|
||||
<Sparkles size={20} />
|
||||
</div>
|
||||
<span className="absolute bottom-0 right-0 w-3 h-3 bg-green-400 rounded-full border-2 border-white" />
|
||||
</div>
|
||||
<div>
|
||||
<h3 className="font-bold text-sm">
|
||||
Dennis's AI Assistant
|
||||
</h3>
|
||||
<p className="text-xs text-white/80">Always online</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
onClick={clearChat}
|
||||
className="p-2 hover:bg-white/10 rounded-lg transition-colors text-white/80 hover:text-white"
|
||||
title="Clear conversation"
|
||||
>
|
||||
<Trash2 size={18} />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setIsOpen(false)}
|
||||
className="p-2 hover:bg-white/10 rounded-lg transition-colors"
|
||||
aria-label="Close chat"
|
||||
>
|
||||
<X size={20} />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Messages */}
|
||||
<div className="flex-1 overflow-y-auto p-3 md:p-4 space-y-3 md:space-y-4 bg-gray-50 dark:bg-gray-950">
|
||||
{messages.map((message) => (
|
||||
<motion.div
|
||||
key={message.id}
|
||||
initial={{ opacity: 0, y: 10 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
className={`flex ${message.sender === "user" ? "justify-end" : "justify-start"}`}
|
||||
>
|
||||
<div
|
||||
className={`max-w-[80%] rounded-2xl px-4 py-2 ${
|
||||
message.sender === "user"
|
||||
? "bg-gradient-to-br from-blue-500 to-purple-600 text-white"
|
||||
: "bg-white dark:bg-gray-800 text-gray-900 dark:text-white border border-gray-200 dark:border-gray-700"
|
||||
}`}
|
||||
>
|
||||
<p className="text-sm whitespace-pre-wrap break-words">
|
||||
{message.text}
|
||||
</p>
|
||||
<p
|
||||
className={`text-[10px] mt-1 ${
|
||||
message.sender === "user"
|
||||
? "text-white/60"
|
||||
: "text-gray-500 dark:text-gray-400"
|
||||
}`}
|
||||
>
|
||||
{message.timestamp.toLocaleTimeString([], {
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
</motion.div>
|
||||
))}
|
||||
|
||||
{/* Typing Indicator */}
|
||||
{isLoading && (
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 10 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
className="flex justify-start"
|
||||
>
|
||||
<div className="bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-2xl px-4 py-3">
|
||||
<div className="flex gap-1">
|
||||
<motion.div
|
||||
className="w-2 h-2 bg-gray-400 rounded-full"
|
||||
animate={{ y: [0, -8, 0] }}
|
||||
transition={{
|
||||
duration: 0.6,
|
||||
repeat: Infinity,
|
||||
delay: 0,
|
||||
}}
|
||||
/>
|
||||
<motion.div
|
||||
className="w-2 h-2 bg-gray-400 rounded-full"
|
||||
animate={{ y: [0, -8, 0] }}
|
||||
transition={{
|
||||
duration: 0.6,
|
||||
repeat: Infinity,
|
||||
delay: 0.1,
|
||||
}}
|
||||
/>
|
||||
<motion.div
|
||||
className="w-2 h-2 bg-gray-400 rounded-full"
|
||||
animate={{ y: [0, -8, 0] }}
|
||||
transition={{
|
||||
duration: 0.6,
|
||||
repeat: Infinity,
|
||||
delay: 0.2,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
)}
|
||||
|
||||
<div ref={messagesEndRef} />
|
||||
</div>
|
||||
|
||||
{/* Input */}
|
||||
<div className="p-3 md:p-4 bg-white dark:bg-gray-900 border-t border-gray-200 dark:border-gray-800">
|
||||
<div className="flex gap-2">
|
||||
<input
|
||||
ref={inputRef}
|
||||
type="text"
|
||||
value={inputValue}
|
||||
onChange={(e) => setInputValue(e.target.value)}
|
||||
onKeyPress={handleKeyPress}
|
||||
placeholder="Ask anything..."
|
||||
disabled={isLoading}
|
||||
className="flex-1 px-3 md:px-4 py-2 text-sm bg-gray-100 dark:bg-gray-800 text-gray-900 dark:text-white rounded-full border border-gray-200 dark:border-gray-700 focus:outline-none focus:ring-2 focus:ring-blue-500 disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
/>
|
||||
<button
|
||||
onClick={handleSend}
|
||||
disabled={!inputValue.trim() || isLoading}
|
||||
className="p-2 bg-gradient-to-br from-blue-500 to-purple-600 text-white rounded-full hover:shadow-lg hover:scale-110 transition-all duration-200 disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:scale-100"
|
||||
aria-label="Send message"
|
||||
>
|
||||
{isLoading ? (
|
||||
<Loader2 size={20} className="animate-spin" />
|
||||
) : (
|
||||
<Send size={20} />
|
||||
)}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Quick Actions */}
|
||||
<div className="flex gap-2 mt-2 overflow-x-auto pb-1 scrollbar-hide">
|
||||
{[
|
||||
"What are Dennis's skills?",
|
||||
"Tell me about his projects",
|
||||
"How can I contact him?",
|
||||
].map((suggestion, index) => (
|
||||
<button
|
||||
key={index}
|
||||
onClick={() => {
|
||||
setInputValue(suggestion);
|
||||
inputRef.current?.focus();
|
||||
}}
|
||||
disabled={isLoading}
|
||||
className="px-2 md:px-3 py-1 text-[10px] md:text-xs bg-gray-100 dark:bg-gray-800 text-gray-700 dark:text-gray-300 rounded-full hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors whitespace-nowrap disabled:opacity-50 flex-shrink-0"
|
||||
>
|
||||
{suggestion}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
)}
|
||||
</AnimatePresence>
|
||||
</>
|
||||
);
|
||||
}
|
||||
17
app/components/ClientOnly.tsx
Normal file
17
app/components/ClientOnly.tsx
Normal file
@@ -0,0 +1,17 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
export function ClientOnly({ children }: { children: React.ReactNode }) {
|
||||
const [hasMounted, setHasMounted] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
setHasMounted(true);
|
||||
}, []);
|
||||
|
||||
if (!hasMounted) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return <>{children}</>;
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect } from 'react';
|
||||
import { motion } from 'framer-motion';
|
||||
import { Mail, MapPin, Send } from 'lucide-react';
|
||||
import { useToast } from '@/components/Toast';
|
||||
import { useState, useEffect } from "react";
|
||||
import { motion } from "framer-motion";
|
||||
import { Mail, MapPin, Send } from "lucide-react";
|
||||
import { useToast } from "@/components/Toast";
|
||||
|
||||
const Contact = () => {
|
||||
const [mounted, setMounted] = useState(false);
|
||||
@@ -14,23 +14,61 @@ const Contact = () => {
|
||||
}, []);
|
||||
|
||||
const [formData, setFormData] = useState({
|
||||
name: '',
|
||||
email: '',
|
||||
subject: '',
|
||||
message: ''
|
||||
name: "",
|
||||
email: "",
|
||||
subject: "",
|
||||
message: "",
|
||||
});
|
||||
|
||||
const [errors, setErrors] = useState<Record<string, string>>({});
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
const [touched, setTouched] = useState<Record<string, boolean>>({});
|
||||
|
||||
const validateForm = () => {
|
||||
const newErrors: Record<string, string> = {};
|
||||
|
||||
if (!formData.name.trim()) {
|
||||
newErrors.name = "Name is required";
|
||||
} else if (formData.name.trim().length < 2) {
|
||||
newErrors.name = "Name must be at least 2 characters";
|
||||
}
|
||||
|
||||
if (!formData.email.trim()) {
|
||||
newErrors.email = "Email is required";
|
||||
} else if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(formData.email)) {
|
||||
newErrors.email = "Please enter a valid email address";
|
||||
}
|
||||
|
||||
if (!formData.subject.trim()) {
|
||||
newErrors.subject = "Subject is required";
|
||||
} else if (formData.subject.trim().length < 3) {
|
||||
newErrors.subject = "Subject must be at least 3 characters";
|
||||
}
|
||||
|
||||
if (!formData.message.trim()) {
|
||||
newErrors.message = "Message is required";
|
||||
} else if (formData.message.trim().length < 10) {
|
||||
newErrors.message = "Message must be at least 10 characters";
|
||||
}
|
||||
|
||||
setErrors(newErrors);
|
||||
return Object.keys(newErrors).length === 0;
|
||||
};
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
|
||||
if (!validateForm()) {
|
||||
return;
|
||||
}
|
||||
|
||||
setIsSubmitting(true);
|
||||
|
||||
|
||||
try {
|
||||
const response = await fetch('/api/email', {
|
||||
method: 'POST',
|
||||
const response = await fetch("/api/email", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
name: formData.name,
|
||||
@@ -42,61 +80,93 @@ const Contact = () => {
|
||||
|
||||
if (response.ok) {
|
||||
showEmailSent(formData.email);
|
||||
setFormData({ name: '', email: '', subject: '', message: '' });
|
||||
setFormData({ name: "", email: "", subject: "", message: "" });
|
||||
setTouched({});
|
||||
setErrors({});
|
||||
} else {
|
||||
const errorData = await response.json();
|
||||
showEmailError(errorData.error || 'Unbekannter Fehler');
|
||||
showEmailError(
|
||||
errorData.error || "Failed to send message. Please try again.",
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error sending email:', error);
|
||||
showEmailError('Netzwerkfehler beim Senden der E-Mail');
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error("Error sending email:", error);
|
||||
}
|
||||
showEmailError(
|
||||
"Network error. Please check your connection and try again.",
|
||||
);
|
||||
} finally {
|
||||
setIsSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
|
||||
const handleChange = (
|
||||
e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
|
||||
) => {
|
||||
const { name, value } = e.target;
|
||||
setFormData({
|
||||
...formData,
|
||||
[e.target.name]: e.target.value
|
||||
[name]: value,
|
||||
});
|
||||
|
||||
// Clear error when user starts typing
|
||||
if (errors[name]) {
|
||||
setErrors({
|
||||
...errors,
|
||||
[name]: "",
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const handleBlur = (
|
||||
e: React.FocusEvent<HTMLInputElement | HTMLTextAreaElement>,
|
||||
) => {
|
||||
setTouched({
|
||||
...touched,
|
||||
[e.target.name]: true,
|
||||
});
|
||||
validateForm();
|
||||
};
|
||||
|
||||
const contactInfo = [
|
||||
{
|
||||
icon: Mail,
|
||||
title: 'Email',
|
||||
value: 'contact@dk0.dev',
|
||||
href: 'mailto:contact@dk0.dev'
|
||||
title: "Email",
|
||||
value: "contact@dk0.dev",
|
||||
href: "mailto:contact@dk0.dev",
|
||||
},
|
||||
{
|
||||
icon: MapPin,
|
||||
title: 'Location',
|
||||
value: 'Osnabrück, Germany',
|
||||
}
|
||||
title: "Location",
|
||||
value: "Osnabrück, Germany",
|
||||
},
|
||||
];
|
||||
|
||||
|
||||
if (!mounted) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<section id="contact" className="py-20 px-4 relative">
|
||||
<section
|
||||
id="contact"
|
||||
className="py-24 px-4 relative bg-gradient-to-br from-liquid-teal/15 via-liquid-mint/10 to-liquid-lime/15"
|
||||
>
|
||||
<div className="max-w-7xl mx-auto">
|
||||
{/* Section Header */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
whileInView={{ opacity: 1, y: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.8 }}
|
||||
viewport={{ once: true, margin: "-100px" }}
|
||||
transition={{ duration: 1, ease: [0.25, 0.1, 0.25, 1] }}
|
||||
className="text-center mb-16"
|
||||
>
|
||||
<h2 className="text-4xl md:text-5xl font-bold mb-6 gradient-text">
|
||||
<h2 className="text-4xl md:text-5xl font-bold mb-6 text-stone-900">
|
||||
Contact Me
|
||||
</h2>
|
||||
<p className="text-xl text-gray-400 max-w-2xl mx-auto">
|
||||
Interested in working together or have questions about my projects? Feel free to reach out!
|
||||
<p className="text-xl text-stone-700 max-w-2xl mx-auto mt-4">
|
||||
Interested in working together or have questions about my projects?
|
||||
Feel free to reach out!
|
||||
</p>
|
||||
</motion.div>
|
||||
|
||||
@@ -105,17 +175,18 @@ const Contact = () => {
|
||||
<motion.div
|
||||
initial={{ opacity: 0, x: -30 }}
|
||||
whileInView={{ opacity: 1, x: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.8 }}
|
||||
viewport={{ once: true, margin: "-100px" }}
|
||||
transition={{ duration: 1, ease: [0.25, 0.1, 0.25, 1] }}
|
||||
className="space-y-8"
|
||||
>
|
||||
<div>
|
||||
<h3 className="text-2xl font-bold text-white mb-6">
|
||||
<h3 className="text-2xl font-bold text-stone-900 mb-6">
|
||||
Get In Touch
|
||||
</h3>
|
||||
<p className="text-gray-400 leading-relaxed">
|
||||
I'm always available to discuss new opportunities, interesting projects,
|
||||
or simply chat about technology and innovation.
|
||||
<p className="text-stone-700 leading-relaxed">
|
||||
I'm always available to discuss new opportunities,
|
||||
interesting projects, or simply chat about technology and
|
||||
innovation.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -128,38 +199,51 @@ const Contact = () => {
|
||||
initial={{ opacity: 0, x: -20 }}
|
||||
whileInView={{ opacity: 1, x: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.6, delay: index * 0.1 }}
|
||||
whileHover={{ x: 5 }}
|
||||
className="flex items-center space-x-4 p-4 rounded-lg glass-card hover:bg-gray-800/30 transition-colors group"
|
||||
transition={{
|
||||
duration: 0.8,
|
||||
delay: index * 0.15,
|
||||
ease: [0.25, 0.1, 0.25, 1],
|
||||
}}
|
||||
whileHover={{
|
||||
x: 8,
|
||||
transition: { duration: 0.4, ease: "easeOut" },
|
||||
}}
|
||||
className="flex items-center space-x-4 p-4 rounded-2xl glass-card hover:bg-white/80 transition-all duration-500 ease-out group border-transparent hover:border-white/70"
|
||||
>
|
||||
<div className="p-3 bg-blue-500/20 rounded-lg group-hover:bg-blue-500/30 transition-colors">
|
||||
<info.icon className="w-6 h-6 text-blue-400" />
|
||||
<div className="p-3 bg-white rounded-xl shadow-sm group-hover:shadow-md transition-all">
|
||||
<info.icon className="w-6 h-6 text-stone-700" />
|
||||
</div>
|
||||
<div>
|
||||
<h4 className="font-semibold text-white">{info.title}</h4>
|
||||
<p className="text-gray-400">{info.value}</p>
|
||||
<h4 className="font-semibold text-stone-800">
|
||||
{info.title}
|
||||
</h4>
|
||||
<p className="text-stone-500">{info.value}</p>
|
||||
</div>
|
||||
</motion.a>
|
||||
))}
|
||||
</div>
|
||||
|
||||
</motion.div>
|
||||
|
||||
{/* Contact Form */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, x: 30 }}
|
||||
whileInView={{ opacity: 1, x: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.8 }}
|
||||
className="glass-card p-8 rounded-2xl"
|
||||
viewport={{ once: true, margin: "-100px" }}
|
||||
transition={{ duration: 1, ease: [0.25, 0.1, 0.25, 1] }}
|
||||
className="glass-card p-8 rounded-3xl bg-white/50 border border-white/70"
|
||||
>
|
||||
<h3 className="text-2xl font-bold text-white mb-6">Send Message</h3>
|
||||
|
||||
<h3 className="text-2xl font-bold text-gray-800 mb-6">
|
||||
Send Message
|
||||
</h3>
|
||||
|
||||
<form onSubmit={handleSubmit} className="space-y-6">
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div>
|
||||
<label htmlFor="name" className="block text-sm font-medium text-gray-300 mb-2">
|
||||
Name
|
||||
<label
|
||||
htmlFor="name"
|
||||
className="block text-sm font-medium text-stone-600 mb-2"
|
||||
>
|
||||
Name <span className="text-liquid-rose">*</span>
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
@@ -167,15 +251,34 @@ const Contact = () => {
|
||||
name="name"
|
||||
value={formData.name}
|
||||
onChange={handleChange}
|
||||
onBlur={handleBlur}
|
||||
required
|
||||
className="w-full px-4 py-3 bg-gray-800/50 border border-gray-700 rounded-lg text-white placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all"
|
||||
className={`w-full px-4 py-3 bg-white/50 backdrop-blur-sm border rounded-xl text-stone-800 placeholder-stone-400 focus:outline-none focus:ring-2 transition-all ${
|
||||
errors.name && touched.name
|
||||
? "border-red-400 focus:ring-red-400"
|
||||
: "border-white/60 focus:ring-liquid-blue focus:border-transparent"
|
||||
}`}
|
||||
placeholder="Your name"
|
||||
aria-invalid={
|
||||
errors.name && touched.name ? "true" : "false"
|
||||
}
|
||||
aria-describedby={
|
||||
errors.name && touched.name ? "name-error" : undefined
|
||||
}
|
||||
/>
|
||||
{errors.name && touched.name && (
|
||||
<p id="name-error" className="mt-1 text-sm text-red-500">
|
||||
{errors.name}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
|
||||
<div>
|
||||
<label htmlFor="email" className="block text-sm font-medium text-gray-300 mb-2">
|
||||
Email
|
||||
<label
|
||||
htmlFor="email"
|
||||
className="block text-sm font-medium text-stone-600 mb-2"
|
||||
>
|
||||
Email <span className="text-liquid-rose">*</span>
|
||||
</label>
|
||||
<input
|
||||
type="email"
|
||||
@@ -183,16 +286,35 @@ const Contact = () => {
|
||||
name="email"
|
||||
value={formData.email}
|
||||
onChange={handleChange}
|
||||
onBlur={handleBlur}
|
||||
required
|
||||
className="w-full px-4 py-3 bg-gray-800/50 border border-gray-700 rounded-lg text-white placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all"
|
||||
className={`w-full px-4 py-3 bg-white/50 backdrop-blur-sm border rounded-xl text-stone-800 placeholder-stone-400 focus:outline-none focus:ring-2 transition-all ${
|
||||
errors.email && touched.email
|
||||
? "border-red-400 focus:ring-red-400"
|
||||
: "border-white/60 focus:ring-liquid-blue focus:border-transparent"
|
||||
}`}
|
||||
placeholder="your@email.com"
|
||||
aria-invalid={
|
||||
errors.email && touched.email ? "true" : "false"
|
||||
}
|
||||
aria-describedby={
|
||||
errors.email && touched.email ? "email-error" : undefined
|
||||
}
|
||||
/>
|
||||
{errors.email && touched.email && (
|
||||
<p id="email-error" className="mt-1 text-sm text-red-500">
|
||||
{errors.email}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label htmlFor="subject" className="block text-sm font-medium text-gray-300 mb-2">
|
||||
Subject
|
||||
<label
|
||||
htmlFor="subject"
|
||||
className="block text-sm font-medium text-stone-600 mb-2"
|
||||
>
|
||||
Subject <span className="text-liquid-rose">*</span>
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
@@ -200,44 +322,91 @@ const Contact = () => {
|
||||
name="subject"
|
||||
value={formData.subject}
|
||||
onChange={handleChange}
|
||||
onBlur={handleBlur}
|
||||
required
|
||||
className="w-full px-4 py-3 bg-gray-800/50 border border-gray-700 rounded-lg text-white placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all"
|
||||
className={`w-full px-4 py-3 bg-white/50 backdrop-blur-sm border rounded-xl text-stone-800 placeholder-stone-400 focus:outline-none focus:ring-2 transition-all ${
|
||||
errors.subject && touched.subject
|
||||
? "border-red-400 focus:ring-red-400"
|
||||
: "border-white/60 focus:ring-liquid-blue focus:border-transparent"
|
||||
}`}
|
||||
placeholder="What's this about?"
|
||||
aria-invalid={
|
||||
errors.subject && touched.subject ? "true" : "false"
|
||||
}
|
||||
aria-describedby={
|
||||
errors.subject && touched.subject
|
||||
? "subject-error"
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
{errors.subject && touched.subject && (
|
||||
<p id="subject-error" className="mt-1 text-sm text-red-500">
|
||||
{errors.subject}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label htmlFor="message" className="block text-sm font-medium text-gray-300 mb-2">
|
||||
Message
|
||||
<label
|
||||
htmlFor="message"
|
||||
className="block text-sm font-medium text-stone-600 mb-2"
|
||||
>
|
||||
Message <span className="text-liquid-rose">*</span>
|
||||
</label>
|
||||
<textarea
|
||||
id="message"
|
||||
name="message"
|
||||
value={formData.message}
|
||||
onChange={handleChange}
|
||||
onBlur={handleBlur}
|
||||
required
|
||||
rows={5}
|
||||
className="w-full px-4 py-3 bg-gray-800/50 border border-gray-700 rounded-lg text-white placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all resize-none"
|
||||
placeholder="Tell me more about your project..."
|
||||
rows={6}
|
||||
className={`w-full px-4 py-3 bg-white/50 backdrop-blur-sm border rounded-xl text-stone-800 placeholder-stone-400 focus:outline-none focus:ring-2 transition-all resize-none ${
|
||||
errors.message && touched.message
|
||||
? "border-red-400 focus:ring-red-400"
|
||||
: "border-white/60 focus:ring-liquid-blue focus:border-transparent"
|
||||
}`}
|
||||
placeholder="Tell me more about your project or question..."
|
||||
aria-invalid={
|
||||
errors.message && touched.message ? "true" : "false"
|
||||
}
|
||||
aria-describedby={
|
||||
errors.message && touched.message
|
||||
? "message-error"
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
<div className="flex justify-between items-center mt-1">
|
||||
{errors.message && touched.message ? (
|
||||
<p id="message-error" className="text-sm text-red-500">
|
||||
{errors.message}
|
||||
</p>
|
||||
) : (
|
||||
<span></span>
|
||||
)}
|
||||
<span className="text-xs text-stone-400">
|
||||
{formData.message.length} characters
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<motion.button
|
||||
type="submit"
|
||||
disabled={isSubmitting}
|
||||
whileHover={{ scale: 1.02 }}
|
||||
whileTap={{ scale: 0.98 }}
|
||||
className="w-full btn-primary py-4 text-lg font-semibold disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center space-x-2"
|
||||
whileHover={!isSubmitting ? { scale: 1.02, y: -2 } : {}}
|
||||
whileTap={!isSubmitting ? { scale: 0.98 } : {}}
|
||||
transition={{ duration: 0.3, ease: "easeOut" }}
|
||||
className="w-full py-4 text-lg font-semibold disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center space-x-2 disabled:hover:scale-100 disabled:hover:translate-y-0 bg-stone-900 text-white rounded-xl hover:bg-stone-950 transition-all duration-500 ease-out shadow-lg hover:shadow-xl"
|
||||
>
|
||||
{isSubmitting ? (
|
||||
<>
|
||||
<div className="w-5 h-5 border-2 border-white/30 border-t-white rounded-full animate-spin"></div>
|
||||
<span>Sending...</span>
|
||||
<span>Sending Message...</span>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Send size={20} />
|
||||
<span>Send Message</span>
|
||||
<span className="text-cream">Send Message</span>
|
||||
</>
|
||||
)}
|
||||
</motion.button>
|
||||
|
||||
@@ -25,7 +25,7 @@ const Footer = () => {
|
||||
}
|
||||
|
||||
return (
|
||||
<footer className="relative py-12 px-4 bg-black border-t border-gray-800/50">
|
||||
<footer className="relative py-12 px-4 bg-white border-t border-stone-200">
|
||||
<div className="max-w-7xl mx-auto">
|
||||
<div className="flex flex-col md:flex-row justify-between items-center space-y-6 md:space-y-0">
|
||||
{/* Brand */}
|
||||
@@ -36,14 +36,18 @@ const Footer = () => {
|
||||
transition={{ duration: 0.6 }}
|
||||
className="flex items-center space-x-3"
|
||||
>
|
||||
<div className="w-10 h-10 bg-gradient-to-r from-blue-500 to-purple-500 rounded-lg flex items-center justify-center">
|
||||
<Code className="w-5 h-5 text-white" />
|
||||
</div>
|
||||
<motion.div
|
||||
whileHover={{ rotate: 360, scale: 1.1 }}
|
||||
transition={{ duration: 0.5 }}
|
||||
className="w-12 h-12 bg-gradient-to-br from-liquid-mint to-liquid-lavender rounded-xl flex items-center justify-center shadow-md"
|
||||
>
|
||||
<Code className="w-6 h-6 text-stone-800" />
|
||||
</motion.div>
|
||||
<div>
|
||||
<Link href="/" className="text-xl font-bold font-mono text-white">
|
||||
dk<span className="text-red-500">0</span>
|
||||
<Link href="/" className="text-xl font-bold font-mono text-stone-800 hover:text-liquid-blue transition-colors">
|
||||
dk<span className="text-liquid-rose">0</span>
|
||||
</Link>
|
||||
<p className="text-xs text-gray-500">Software Engineer</p>
|
||||
<p className="text-xs text-stone-500">Software Engineer</p>
|
||||
</div>
|
||||
</motion.div>
|
||||
|
||||
@@ -53,7 +57,7 @@ const Footer = () => {
|
||||
whileInView={{ opacity: 1, y: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.6, delay: 0.1 }}
|
||||
className="flex space-x-4"
|
||||
className="flex space-x-3"
|
||||
>
|
||||
{socialLinks.map((social) => (
|
||||
<motion.a
|
||||
@@ -61,9 +65,10 @@ const Footer = () => {
|
||||
href={social.href}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
whileHover={{ scale: 1.1, y: -2 }}
|
||||
whileHover={{ scale: 1.15, y: -3 }}
|
||||
whileTap={{ scale: 0.95 }}
|
||||
className="p-3 bg-gray-800/50 hover:bg-gray-700/50 rounded-lg text-gray-300 hover:text-white transition-all duration-200"
|
||||
className="p-3 bg-stone-50 hover:bg-white rounded-xl text-stone-600 hover:text-stone-900 transition-all duration-200 border border-stone-200 hover:border-stone-300 shadow-sm"
|
||||
aria-label={social.label}
|
||||
>
|
||||
<social.icon size={18} />
|
||||
</motion.a>
|
||||
@@ -76,14 +81,14 @@ const Footer = () => {
|
||||
whileInView={{ opacity: 1, y: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.6, delay: 0.2 }}
|
||||
className="flex items-center space-x-2 text-gray-400 text-sm"
|
||||
className="flex items-center space-x-2 text-stone-400 text-sm"
|
||||
>
|
||||
<span>© {currentYear}</span>
|
||||
<motion.div
|
||||
animate={{ scale: [1, 1.2, 1] }}
|
||||
transition={{ duration: 1.5, repeat: Infinity }}
|
||||
>
|
||||
<Heart size={14} className="text-red-500" />
|
||||
<Heart size={14} className="text-liquid-rose fill-liquid-rose" />
|
||||
</motion.div>
|
||||
<span>Made in Germany</span>
|
||||
</motion.div>
|
||||
@@ -95,25 +100,30 @@ const Footer = () => {
|
||||
whileInView={{ opacity: 1, y: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.6, delay: 0.3 }}
|
||||
className="mt-8 pt-6 border-t border-gray-800/50 flex flex-col md:flex-row justify-between items-center space-y-4 md:space-y-0"
|
||||
className="mt-8 pt-6 border-t border-stone-100 flex flex-col md:flex-row justify-between items-center space-y-4 md:space-y-0"
|
||||
>
|
||||
<div className="flex space-x-6 text-sm">
|
||||
<Link
|
||||
href="/legal-notice"
|
||||
className="text-gray-500 hover:text-gray-300 transition-colors duration-200"
|
||||
className="text-stone-500 hover:text-stone-800 transition-colors duration-200"
|
||||
>
|
||||
Impressum
|
||||
</Link>
|
||||
<Link
|
||||
href="/privacy-policy"
|
||||
className="text-gray-500 hover:text-gray-300 transition-colors duration-200"
|
||||
className="text-stone-500 hover:text-stone-800 transition-colors duration-200"
|
||||
>
|
||||
Privacy Policy
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
<div className="text-xs text-gray-600">
|
||||
Built with Next.js, TypeScript & Tailwind CSS
|
||||
<div className="text-xs text-stone-400 flex items-center space-x-1">
|
||||
<span>Built with</span>
|
||||
<span className="text-stone-600 font-semibold">Next.js</span>
|
||||
<span className="text-stone-300">•</span>
|
||||
<span className="text-stone-600 font-semibold">TypeScript</span>
|
||||
<span className="text-stone-300">•</span>
|
||||
<span className="text-stone-600 font-semibold">Tailwind CSS</span>
|
||||
</div>
|
||||
</motion.div>
|
||||
</div>
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect } from 'react';
|
||||
import { motion, AnimatePresence } from 'framer-motion';
|
||||
import { Menu, X, Mail } from 'lucide-react';
|
||||
import { SiGithub, SiLinkedin } from 'react-icons/si';
|
||||
import Link from 'next/link';
|
||||
import { useState, useEffect } from "react";
|
||||
import { motion, AnimatePresence } from "framer-motion";
|
||||
import { Menu, X, Mail } from "lucide-react";
|
||||
import { SiGithub, SiLinkedin } from "react-icons/si";
|
||||
import Link from "next/link";
|
||||
|
||||
const Header = () => {
|
||||
const [isOpen, setIsOpen] = useState(false);
|
||||
@@ -20,21 +20,25 @@ const Header = () => {
|
||||
setScrolled(window.scrollY > 50);
|
||||
};
|
||||
|
||||
window.addEventListener('scroll', handleScroll);
|
||||
return () => window.removeEventListener('scroll', handleScroll);
|
||||
window.addEventListener("scroll", handleScroll);
|
||||
return () => window.removeEventListener("scroll", handleScroll);
|
||||
}, []);
|
||||
|
||||
const navItems = [
|
||||
{ name: 'Home', href: '/' },
|
||||
{ name: 'Projects', href: '/projects' },
|
||||
{ name: 'About', href: '#about' },
|
||||
{ name: 'Contact', href: '#contact' },
|
||||
{ name: "Home", href: "/" },
|
||||
{ name: "About", href: "#about" },
|
||||
{ name: "Projects", href: "#projects" },
|
||||
{ name: "Contact", href: "#contact" },
|
||||
];
|
||||
|
||||
const socialLinks = [
|
||||
{ icon: SiGithub, href: 'https://github.com/Denshooter', label: 'GitHub' },
|
||||
{ icon: SiLinkedin, href: 'https://linkedin.com/in/dkonkol', label: 'LinkedIn' },
|
||||
{ icon: Mail, href: 'mailto:contact@dk0.dev', label: 'Email' },
|
||||
{ icon: SiGithub, href: "https://github.com/Denshooter", label: "GitHub" },
|
||||
{
|
||||
icon: SiLinkedin,
|
||||
href: "https://linkedin.com/in/dkonkol",
|
||||
label: "LinkedIn",
|
||||
},
|
||||
{ icon: Mail, href: "mailto:contact@dk0.dev", label: "Email" },
|
||||
];
|
||||
|
||||
if (!mounted) {
|
||||
@@ -43,36 +47,40 @@ const Header = () => {
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="particles">
|
||||
{[...Array(20)].map((_, i) => (
|
||||
<div
|
||||
key={i}
|
||||
className="particle"
|
||||
style={{
|
||||
left: `${(i * 5.5) % 100}%`,
|
||||
animationDelay: `${(i * 0.8) % 20}s`,
|
||||
animationDuration: `${20 + (i * 0.4) % 10}s`,
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<motion.header
|
||||
initial={{ y: -100 }}
|
||||
animate={{ y: 0 }}
|
||||
initial={{ y: -100, opacity: 0 }}
|
||||
animate={{ y: 0, opacity: 1 }}
|
||||
transition={{ duration: 0.8, ease: "easeOut" }}
|
||||
className={`fixed top-0 left-0 right-0 z-50 transition-all duration-300 ${
|
||||
scrolled ? 'glass' : 'bg-transparent'
|
||||
}`}
|
||||
className="fixed top-6 left-0 right-0 z-50 flex justify-center px-4 pointer-events-none"
|
||||
>
|
||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div className="flex justify-between items-center h-16">
|
||||
<div
|
||||
className={`pointer-events-auto transition-all duration-500 ease-out ${
|
||||
scrolled ? "w-full max-w-5xl" : "w-full max-w-7xl"
|
||||
}`}
|
||||
>
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: -20 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.6, delay: 0.2, ease: "easeOut" }}
|
||||
className={`
|
||||
backdrop-blur-xl transition-all duration-500
|
||||
${
|
||||
scrolled
|
||||
? "bg-white/95 border border-stone-200/50 shadow-[0_8px_30px_rgba(0,0,0,0.12)] rounded-full px-6 py-3"
|
||||
: "bg-white/85 border border-stone-200/30 shadow-[0_4px_24px_rgba(0,0,0,0.08)] px-4 py-4 rounded-full"
|
||||
}
|
||||
flex justify-between items-center
|
||||
`}
|
||||
>
|
||||
<motion.div
|
||||
whileHover={{ scale: 1.05 }}
|
||||
className="flex items-center space-x-2"
|
||||
>
|
||||
<Link href="/" className="text-2xl font-bold font-mono text-white">
|
||||
dk<span className="text-red-500">0</span>
|
||||
<Link
|
||||
href="/"
|
||||
className="text-2xl font-bold font-mono text-stone-800 tracking-tighter liquid-hover"
|
||||
>
|
||||
dk<span className="text-liquid-rose">0</span>
|
||||
</Link>
|
||||
</motion.div>
|
||||
|
||||
@@ -85,27 +93,48 @@ const Header = () => {
|
||||
>
|
||||
<Link
|
||||
href={item.href}
|
||||
className="text-gray-300 hover:text-white transition-colors duration-200 font-medium relative group"
|
||||
className="text-stone-600 hover:text-stone-900 transition-colors duration-200 font-medium relative group px-2 py-1 liquid-hover"
|
||||
onClick={(e) => {
|
||||
if (item.href.startsWith("#")) {
|
||||
e.preventDefault();
|
||||
const element = document.querySelector(item.href);
|
||||
if (element) {
|
||||
element.scrollIntoView({
|
||||
behavior: "smooth",
|
||||
block: "start",
|
||||
});
|
||||
}
|
||||
}
|
||||
}}
|
||||
>
|
||||
{item.name}
|
||||
<span className="absolute -bottom-1 left-0 w-0 h-0.5 bg-gradient-to-r from-blue-500 to-purple-500 transition-all duration-300 group-hover:w-full"></span>
|
||||
<motion.span
|
||||
className="absolute -bottom-1 left-0 right-0 h-0.5 bg-gradient-to-r from-liquid-mint to-liquid-lavender rounded-full"
|
||||
initial={{ scaleX: 0, opacity: 0 }}
|
||||
whileHover={{ scaleX: 1, opacity: 1 }}
|
||||
transition={{
|
||||
duration: 0.4,
|
||||
ease: [0.25, 0.1, 0.25, 1],
|
||||
}}
|
||||
style={{ transformOrigin: "left center" }}
|
||||
/>
|
||||
</Link>
|
||||
</motion.div>
|
||||
))}
|
||||
</nav>
|
||||
|
||||
<div className="hidden md:flex items-center space-x-4">
|
||||
<div className="hidden md:flex items-center space-x-3">
|
||||
{socialLinks.map((social) => (
|
||||
<motion.a
|
||||
key={social.label}
|
||||
href={social.href}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
whileHover={{ scale: 1.1, y: -2 }}
|
||||
whileHover={{ scale: 1.1, rotate: 5 }}
|
||||
whileTap={{ scale: 0.95 }}
|
||||
className="p-2 rounded-lg bg-gray-800/50 hover:bg-gray-700/50 transition-colors duration-200 text-gray-300 hover:text-white"
|
||||
className="p-2 rounded-full bg-white/40 hover:bg-white/80 border border-white/50 text-stone-600 hover:text-stone-900 transition-all shadow-sm liquid-hover"
|
||||
>
|
||||
<social.icon size={20} />
|
||||
<social.icon size={18} />
|
||||
</motion.a>
|
||||
))}
|
||||
</div>
|
||||
@@ -113,59 +142,89 @@ const Header = () => {
|
||||
<motion.button
|
||||
whileTap={{ scale: 0.95 }}
|
||||
onClick={() => setIsOpen(!isOpen)}
|
||||
className="md:hidden p-2 rounded-lg bg-gray-800/50 hover:bg-gray-700/50 transition-colors duration-200 text-gray-300 hover:text-white"
|
||||
className="md:hidden p-2 rounded-full bg-white/40 hover:bg-white/60 text-stone-800 transition-colors liquid-hover"
|
||||
>
|
||||
{isOpen ? <X size={24} /> : <Menu size={24} />}
|
||||
</motion.button>
|
||||
</div>
|
||||
</motion.div>
|
||||
</div>
|
||||
|
||||
<AnimatePresence>
|
||||
{isOpen && (
|
||||
<motion.div
|
||||
initial={{ opacity: 0, height: 0 }}
|
||||
animate={{ opacity: 1, height: 'auto' }}
|
||||
exit={{ opacity: 0, height: 0 }}
|
||||
transition={{ duration: 0.3 }}
|
||||
className="md:hidden glass"
|
||||
>
|
||||
<div className="px-4 py-6 space-y-4">
|
||||
{navItems.map((item) => (
|
||||
<motion.div
|
||||
key={item.name}
|
||||
initial={{ x: -20, opacity: 0 }}
|
||||
animate={{ x: 0, opacity: 1 }}
|
||||
transition={{ delay: navItems.indexOf(item) * 0.1 }}
|
||||
>
|
||||
<Link
|
||||
href={item.href}
|
||||
onClick={() => setIsOpen(false)}
|
||||
className="block text-gray-300 hover:text-white transition-colors duration-200 font-medium py-2"
|
||||
<>
|
||||
<motion.div
|
||||
initial={{ opacity: 0 }}
|
||||
animate={{ opacity: 1 }}
|
||||
exit={{ opacity: 0 }}
|
||||
transition={{ duration: 0.2 }}
|
||||
className="fixed inset-0 bg-stone-900/20 backdrop-blur-sm z-40 md:hidden pointer-events-auto"
|
||||
onClick={() => setIsOpen(false)}
|
||||
/>
|
||||
<motion.div
|
||||
initial={{ opacity: 0, scale: 0.95, y: -20 }}
|
||||
animate={{ opacity: 1, scale: 1, y: 0 }}
|
||||
exit={{ opacity: 0, scale: 0.95, y: -20 }}
|
||||
transition={{ duration: 0.3, type: "spring" }}
|
||||
className="absolute top-24 left-4 right-4 bg-cream/95 backdrop-blur-xl border border-stone-200 shadow-xl rounded-3xl z-50 p-6 pointer-events-auto"
|
||||
>
|
||||
<div className="space-y-2">
|
||||
{navItems.map((item, index) => (
|
||||
<motion.div
|
||||
key={item.name}
|
||||
initial={{ x: -20, opacity: 0 }}
|
||||
animate={{ x: 0, opacity: 1 }}
|
||||
exit={{ x: -20, opacity: 0 }}
|
||||
transition={{ delay: index * 0.05 }}
|
||||
>
|
||||
{item.name}
|
||||
</Link>
|
||||
</motion.div>
|
||||
))}
|
||||
|
||||
<div className="pt-4 border-t border-gray-700">
|
||||
<div className="flex space-x-4">
|
||||
{socialLinks.map((social) => (
|
||||
<motion.a
|
||||
key={social.label}
|
||||
href={social.href}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
whileHover={{ scale: 1.1 }}
|
||||
whileTap={{ scale: 0.95 }}
|
||||
className="p-3 rounded-lg bg-gray-800/50 hover:bg-gray-700/50 transition-colors duration-200 text-gray-300 hover:text-white"
|
||||
<Link
|
||||
href={item.href}
|
||||
onClick={(e) => {
|
||||
setIsOpen(false);
|
||||
if (item.href.startsWith("#")) {
|
||||
e.preventDefault();
|
||||
setTimeout(() => {
|
||||
const element = document.querySelector(item.href);
|
||||
if (element) {
|
||||
element.scrollIntoView({
|
||||
behavior: "smooth",
|
||||
block: "start",
|
||||
});
|
||||
}
|
||||
}, 100);
|
||||
}
|
||||
}}
|
||||
className="block text-stone-600 hover:text-stone-900 hover:bg-white/50 transition-all font-medium py-3 px-4 rounded-xl"
|
||||
>
|
||||
<social.icon size={20} />
|
||||
</motion.a>
|
||||
))}
|
||||
{item.name}
|
||||
</Link>
|
||||
</motion.div>
|
||||
))}
|
||||
|
||||
<div className="pt-6 mt-4 border-t border-stone-200">
|
||||
<div className="flex justify-center space-x-4">
|
||||
{socialLinks.map((social, index) => (
|
||||
<motion.a
|
||||
key={social.label}
|
||||
href={social.href}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
initial={{ scale: 0, opacity: 0 }}
|
||||
animate={{ scale: 1, opacity: 1 }}
|
||||
transition={{
|
||||
delay: (navItems.length + index) * 0.05,
|
||||
}}
|
||||
whileHover={{ scale: 1.1 }}
|
||||
className="p-3 rounded-full bg-white/60 text-stone-600 shadow-sm"
|
||||
aria-label={social.label}
|
||||
>
|
||||
<social.icon size={20} />
|
||||
</motion.a>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
</motion.div>
|
||||
</>
|
||||
)}
|
||||
</AnimatePresence>
|
||||
</motion.header>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect } from 'react';
|
||||
import { motion } from 'framer-motion';
|
||||
import { ArrowDown, Code, Zap, Rocket } from 'lucide-react';
|
||||
import Image from 'next/image';
|
||||
import { useState, useEffect } from "react";
|
||||
import { motion } from "framer-motion";
|
||||
import { ArrowDown, Code, Zap, Rocket } from "lucide-react";
|
||||
import Image from "next/image";
|
||||
|
||||
const Hero = () => {
|
||||
const [mounted, setMounted] = useState(false);
|
||||
@@ -13,9 +13,9 @@ const Hero = () => {
|
||||
}, []);
|
||||
|
||||
const features = [
|
||||
{ icon: Code, text: 'Full-Stack Development' },
|
||||
{ icon: Zap, text: 'Modern Technologies' },
|
||||
{ icon: Rocket, text: 'Innovative Solutions' },
|
||||
{ icon: Code, text: "Next.js & Flutter" },
|
||||
{ icon: Zap, text: "Docker Swarm & CI/CD" },
|
||||
{ icon: Rocket, text: "Self-Hosted Infrastructure" },
|
||||
];
|
||||
|
||||
if (!mounted) {
|
||||
@@ -23,219 +23,217 @@ const Hero = () => {
|
||||
}
|
||||
|
||||
return (
|
||||
<section className="relative min-h-screen flex items-center justify-center overflow-hidden pt-20 pb-8">
|
||||
{/* Animated Background */}
|
||||
<div className="absolute inset-0 animated-bg"></div>
|
||||
|
||||
{/* Floating Elements */}
|
||||
<div className="absolute inset-0 overflow-hidden">
|
||||
<section className="relative min-h-screen flex items-center justify-center overflow-hidden pt-32 pb-16 bg-gradient-to-br from-liquid-mint/10 via-liquid-lavender/10 to-liquid-rose/10">
|
||||
<div className="relative z-10 text-center px-4 max-w-5xl mx-auto">
|
||||
{/* Profile Image with Organic Blob Mask */}
|
||||
<motion.div
|
||||
className="absolute top-20 left-20 w-32 h-32 bg-blue-500/10 rounded-full blur-xl"
|
||||
initial={{ scale: 1, opacity: 0.3 }}
|
||||
animate={{
|
||||
scale: [1, 1.2, 1],
|
||||
opacity: [0.3, 0.6, 0.3],
|
||||
}}
|
||||
transition={{
|
||||
duration: 4,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
}}
|
||||
/>
|
||||
<motion.div
|
||||
className="absolute top-40 right-32 w-24 h-24 bg-purple-500/10 rounded-full blur-xl"
|
||||
initial={{ scale: 1.2, opacity: 0.6 }}
|
||||
animate={{
|
||||
scale: [1.2, 1, 1.2],
|
||||
opacity: [0.6, 0.3, 0.6],
|
||||
}}
|
||||
transition={{
|
||||
duration: 5,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
}}
|
||||
/>
|
||||
<motion.div
|
||||
className="absolute bottom-32 left-1/3 w-40 h-40 bg-cyan-500/10 rounded-full blur-xl"
|
||||
initial={{ scale: 1, opacity: 0.4 }}
|
||||
animate={{
|
||||
scale: [1, 1.3, 1],
|
||||
opacity: [0.4, 0.7, 0.4],
|
||||
}}
|
||||
transition={{
|
||||
duration: 6,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="relative z-10 text-center px-4 max-w-4xl mx-auto">
|
||||
{/* Domain - über dem Profilbild */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.8, delay: 0.5 }}
|
||||
className="mb-8"
|
||||
initial={{ opacity: 0, scale: 0.9 }}
|
||||
animate={{ opacity: 1, scale: 1 }}
|
||||
transition={{ duration: 1.2, delay: 0.3, ease: [0.25, 0.1, 0.25, 1] }}
|
||||
className="mb-12 flex justify-center relative z-20"
|
||||
>
|
||||
<div className="domain-text text-white/95 text-center">
|
||||
dk<span className="text-red-500">0</span>.dev
|
||||
</div>
|
||||
</motion.div>
|
||||
<div className="relative w-64 h-64 md:w-80 md:h-80 flex items-center justify-center">
|
||||
{/* Large Rotating Liquid Blobs behind image - Very slow and smooth */}
|
||||
<motion.div
|
||||
className="absolute w-[150%] h-[150%] bg-gradient-to-tr from-liquid-mint/40 via-liquid-blue/30 to-liquid-lavender/40 blur-3xl -z-10"
|
||||
animate={{
|
||||
borderRadius: [
|
||||
"60% 40% 30% 70%/60% 30% 70% 40%",
|
||||
"30% 60% 70% 40%/50% 60% 30% 60%",
|
||||
"60% 40% 30% 70%/60% 30% 70% 40%",
|
||||
],
|
||||
rotate: [0, 120, 0],
|
||||
scale: [1, 1.08, 1],
|
||||
}}
|
||||
transition={{
|
||||
duration: 35,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
/>
|
||||
<motion.div
|
||||
className="absolute w-[130%] h-[130%] bg-gradient-to-bl from-liquid-rose/35 via-purple-200/25 to-liquid-mint/35 blur-2xl -z-10"
|
||||
animate={{
|
||||
borderRadius: [
|
||||
"40% 60% 70% 30%/40% 50% 60% 50%",
|
||||
"60% 30% 40% 70%/60% 40% 70% 30%",
|
||||
"40% 60% 70% 30%/40% 50% 60% 50%",
|
||||
],
|
||||
rotate: [0, -90, 0],
|
||||
scale: [1, 1.05, 1],
|
||||
}}
|
||||
transition={{
|
||||
duration: 40,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* Profile Image */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, scale: 0.8, rotateY: -15 }}
|
||||
animate={{ opacity: 1, scale: 1, rotateY: 0 }}
|
||||
transition={{ duration: 1, delay: 0.7, ease: "easeOut" }}
|
||||
className="mb-8 flex justify-center"
|
||||
>
|
||||
<div className="relative group">
|
||||
{/* Profile image container */}
|
||||
<div className="relative bg-gray-900 rounded-full p-1">
|
||||
<motion.div
|
||||
whileHover={{ scale: 1.05, rotateY: 5 }}
|
||||
transition={{ duration: 0.3 }}
|
||||
className="relative w-40 h-40 md:w-48 md:h-48 lg:w-56 lg:h-56 rounded-full overflow-hidden border-4 border-gray-800"
|
||||
>
|
||||
<Image
|
||||
src="/images/me.jpg"
|
||||
alt="Dennis Konkol - Software Engineer"
|
||||
fill
|
||||
className="object-cover"
|
||||
priority
|
||||
/>
|
||||
|
||||
{/* Hover overlay effect */}
|
||||
<div className="absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent opacity-0 group-hover:opacity-100 transition-opacity duration-300"></div>
|
||||
</motion.div>
|
||||
</div>
|
||||
|
||||
{/* Floating tech badges around the image */}
|
||||
{/* The Image Container with Organic Border Radius */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, scale: 0 }}
|
||||
animate={{ opacity: 1, scale: 1 }}
|
||||
transition={{ duration: 0.5, delay: 1.5 }}
|
||||
className="absolute -top-3 -right-3 w-10 h-10 bg-blue-500 rounded-full flex items-center justify-center shadow-lg"
|
||||
className="absolute inset-0 overflow-hidden bg-stone-100"
|
||||
style={{
|
||||
filter: "drop-shadow(0 20px 40px rgba(0,0,0,0.1))",
|
||||
willChange: "border-radius",
|
||||
}}
|
||||
animate={{
|
||||
borderRadius: [
|
||||
"60% 40% 30% 70%/60% 30% 70% 40%",
|
||||
"30% 60% 70% 40%/50% 60% 30% 60%",
|
||||
"60% 40% 30% 70%/60% 30% 70% 40%",
|
||||
],
|
||||
}}
|
||||
transition={{
|
||||
duration: 12,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
>
|
||||
<Code className="w-5 h-5 text-white" />
|
||||
<Image
|
||||
src="/images/me.jpg"
|
||||
alt="Dennis Konkol"
|
||||
fill
|
||||
className="object-cover scale-105 hover:scale-[1.08] transition-transform duration-1000 ease-out"
|
||||
priority
|
||||
/>
|
||||
|
||||
{/* Glossy Overlay for Liquid Feel */}
|
||||
<div className="absolute inset-0 bg-gradient-to-tr from-white/25 via-transparent to-white/10 opacity-60 pointer-events-none z-10" />
|
||||
|
||||
{/* Inner Border/Highlight */}
|
||||
<div className="absolute inset-0 border-[2px] border-white/30 rounded-[inherit] pointer-events-none z-20" />
|
||||
</motion.div>
|
||||
|
||||
|
||||
{/* Domain Badge - repositioned below image */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, scale: 0 }}
|
||||
animate={{ opacity: 1, scale: 1 }}
|
||||
transition={{ duration: 0.5, delay: 1.7 }}
|
||||
className="absolute -bottom-3 -left-3 w-10 h-10 bg-purple-500 rounded-full flex items-center justify-center shadow-lg"
|
||||
initial={{ opacity: 0, y: 20 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 1, delay: 0.8, ease: "easeOut" }}
|
||||
className="absolute -bottom-8 left-1/2 -translate-x-1/2 z-30"
|
||||
>
|
||||
<Zap className="w-5 h-5 text-white" />
|
||||
<div className="px-6 py-2.5 rounded-full glass-panel text-stone-700 font-mono text-sm tracking-wider shadow-lg backdrop-blur-xl border border-white/50">
|
||||
dk<span className="text-liquid-rose font-bold">0</span>.dev
|
||||
</div>
|
||||
</motion.div>
|
||||
|
||||
|
||||
{/* Floating Badges - subtle animations */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, scale: 0 }}
|
||||
animate={{ opacity: 1, scale: 1 }}
|
||||
transition={{ duration: 0.5, delay: 1.9 }}
|
||||
className="absolute -top-3 -left-3 w-10 h-10 bg-cyan-500 rounded-full flex items-center justify-center shadow-lg"
|
||||
initial={{ scale: 0, opacity: 0 }}
|
||||
animate={{ scale: 1, opacity: 1 }}
|
||||
transition={{ delay: 1.2, duration: 0.8, ease: "easeOut" }}
|
||||
whileHover={{ scale: 1.1, rotate: 5 }}
|
||||
className="absolute -top-4 right-0 md:-right-4 p-3 bg-white/95 backdrop-blur-md shadow-lg rounded-full text-stone-700 z-30"
|
||||
>
|
||||
<Rocket className="w-5 h-5 text-white" />
|
||||
<Code size={24} />
|
||||
</motion.div>
|
||||
<motion.div
|
||||
initial={{ scale: 0, opacity: 0 }}
|
||||
animate={{ scale: 1, opacity: 1 }}
|
||||
transition={{ delay: 1.4, duration: 0.8, ease: "easeOut" }}
|
||||
whileHover={{ scale: 1.1, rotate: -5 }}
|
||||
className="absolute bottom-4 -left-4 md:-left-8 p-3 bg-white/95 backdrop-blur-md shadow-lg rounded-full text-stone-700 z-30"
|
||||
>
|
||||
<Zap size={24} />
|
||||
</motion.div>
|
||||
</div>
|
||||
</motion.div>
|
||||
|
||||
{/* Main Title */}
|
||||
<motion.h1
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 20 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.8, delay: 0.8 }}
|
||||
className="text-5xl md:text-7xl font-bold mb-4"
|
||||
transition={{ duration: 1, delay: 0.6, ease: [0.25, 0.1, 0.25, 1] }}
|
||||
className="mb-8 flex flex-col items-center justify-center relative"
|
||||
>
|
||||
<span className="gradient-text">Dennis Konkol</span>
|
||||
</motion.h1>
|
||||
|
||||
{/* Subtitle */}
|
||||
<motion.p
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.8, delay: 1.1 }}
|
||||
className="text-xl md:text-2xl text-gray-300 mb-8 max-w-2xl mx-auto"
|
||||
>
|
||||
Student & Software Engineer based in Osnabrück, Germany
|
||||
</motion.p>
|
||||
<h1 className="text-5xl md:text-8xl font-bold tracking-tighter text-stone-900 mb-2">
|
||||
Dennis Konkol
|
||||
</h1>
|
||||
<h2 className="text-2xl md:text-4xl font-light tracking-wide text-stone-600 mt-2">
|
||||
Software Engineer
|
||||
</h2>
|
||||
</motion.div>
|
||||
|
||||
{/* Description */}
|
||||
<motion.p
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
initial={{ opacity: 0, y: 20 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.8, delay: 1.2 }}
|
||||
className="text-lg text-gray-400 mb-12 max-w-3xl mx-auto leading-relaxed"
|
||||
transition={{ duration: 1, delay: 0.9, ease: [0.25, 0.1, 0.25, 1] }}
|
||||
className="text-lg md:text-xl text-stone-700 mb-12 max-w-2xl mx-auto leading-relaxed"
|
||||
>
|
||||
Passionate about technology, coding, and solving real-world problems.
|
||||
I create innovative solutions that make a difference.
|
||||
Student and passionate{" "}
|
||||
<span className="text-stone-900 font-semibold decoration-liquid-mint decoration-2 underline underline-offset-4">
|
||||
self-hoster
|
||||
</span>{" "}
|
||||
building full-stack web apps and mobile solutions. I run my own{" "}
|
||||
<span className="text-stone-900 font-semibold decoration-liquid-lavender decoration-2 underline underline-offset-4">
|
||||
infrastructure
|
||||
</span>{" "}
|
||||
and love exploring{" "}
|
||||
<span className="text-stone-900 font-semibold decoration-liquid-rose decoration-2 underline underline-offset-4">
|
||||
DevOps
|
||||
</span>
|
||||
.
|
||||
</motion.p>
|
||||
|
||||
{/* Features */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
initial={{ opacity: 0, y: 20 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.8, delay: 1.4 }}
|
||||
className="flex flex-wrap justify-center gap-6 mb-12"
|
||||
transition={{ duration: 1, delay: 1.1, ease: [0.25, 0.1, 0.25, 1] }}
|
||||
className="flex flex-wrap justify-center gap-4 mb-12"
|
||||
>
|
||||
{features.map((feature, index) => (
|
||||
<motion.div
|
||||
key={feature.text}
|
||||
initial={{ opacity: 0, scale: 0.8 }}
|
||||
initial={{ opacity: 0, scale: 0.9 }}
|
||||
animate={{ opacity: 1, scale: 1 }}
|
||||
transition={{ duration: 0.5, delay: 1.6 + index * 0.1 }}
|
||||
whileHover={{ scale: 1.05, y: -5 }}
|
||||
className="flex items-center space-x-2 px-4 py-2 rounded-full glass-card"
|
||||
transition={{
|
||||
duration: 0.8,
|
||||
delay: 1.3 + index * 0.15,
|
||||
ease: [0.25, 0.1, 0.25, 1],
|
||||
}}
|
||||
whileHover={{ scale: 1.03, y: -3 }}
|
||||
className="flex items-center space-x-2 px-5 py-2.5 rounded-full bg-white/70 border border-white/90 shadow-sm backdrop-blur-sm"
|
||||
>
|
||||
<feature.icon className="w-5 h-5 text-blue-400" />
|
||||
<span className="text-gray-300 font-medium">{feature.text}</span>
|
||||
<feature.icon className="w-4 h-4 text-stone-700" />
|
||||
<span className="text-stone-700 font-medium text-sm">
|
||||
{feature.text}
|
||||
</span>
|
||||
</motion.div>
|
||||
))}
|
||||
</motion.div>
|
||||
|
||||
{/* CTA Buttons */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
initial={{ opacity: 0, y: 20 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.8, delay: 1.8 }}
|
||||
className="flex flex-col sm:flex-row gap-4 justify-center items-center"
|
||||
transition={{ duration: 1, delay: 1.6, ease: [0.25, 0.1, 0.25, 1] }}
|
||||
className="flex flex-col sm:flex-row gap-5 justify-center items-center"
|
||||
>
|
||||
<motion.a
|
||||
href="#projects"
|
||||
whileHover={{ scale: 1.05 }}
|
||||
whileTap={{ scale: 0.95 }}
|
||||
className="btn-primary px-8 py-4 text-lg font-semibold"
|
||||
whileHover={{ scale: 1.03, y: -2 }}
|
||||
whileTap={{ scale: 0.98 }}
|
||||
transition={{ duration: 0.3, ease: "easeOut" }}
|
||||
className="px-8 py-4 bg-stone-900 text-cream rounded-full shadow-lg hover:shadow-xl hover:bg-stone-950 transition-all duration-500 flex items-center gap-2"
|
||||
>
|
||||
View My Work
|
||||
<span className="text-cream">View My Work</span>
|
||||
<ArrowDown size={18} />
|
||||
</motion.a>
|
||||
|
||||
|
||||
<motion.a
|
||||
href="#contact"
|
||||
whileHover={{ scale: 1.05 }}
|
||||
whileTap={{ scale: 0.95 }}
|
||||
className="px-8 py-4 text-lg font-semibold border-2 border-gray-600 text-gray-300 hover:text-white hover:border-gray-500 rounded-lg transition-all duration-200"
|
||||
whileHover={{ scale: 1.03, y: -2 }}
|
||||
whileTap={{ scale: 0.98 }}
|
||||
transition={{ duration: 0.3, ease: "easeOut" }}
|
||||
className="px-8 py-4 bg-white text-stone-900 border border-stone-200 rounded-full font-medium shadow-sm hover:shadow-md transition-all duration-500"
|
||||
>
|
||||
Contact Me
|
||||
<span>Contact Me</span>
|
||||
</motion.a>
|
||||
</motion.div>
|
||||
|
||||
{/* Scroll Indicator */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0 }}
|
||||
animate={{ opacity: 1 }}
|
||||
transition={{ duration: 1, delay: 1.5 }}
|
||||
className="mt-12 md:mt-16 text-center relative z-20"
|
||||
>
|
||||
<motion.div
|
||||
animate={{ y: [0, 10, 0] }}
|
||||
transition={{ duration: 2, repeat: Infinity }}
|
||||
className="flex flex-col items-center text-white/90 bg-black/30 backdrop-blur-md px-6 py-3 rounded-full border border-white/20 shadow-lg"
|
||||
>
|
||||
<span className="text-sm md:text-base mb-2 font-medium">Scroll Down</span>
|
||||
<ArrowDown className="w-5 h-5 md:w-6 md:h-6" />
|
||||
</motion.div>
|
||||
</motion.div>
|
||||
</div>
|
||||
</section>
|
||||
);
|
||||
|
||||
@@ -1,9 +1,33 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect } from 'react';
|
||||
import { motion } from 'framer-motion';
|
||||
import { ExternalLink, Github, Calendar } from 'lucide-react';
|
||||
import Link from 'next/link';
|
||||
import { useState, useEffect } from "react";
|
||||
import { motion, Variants } from "framer-motion";
|
||||
import { ExternalLink, Github, Layers, ArrowRight } from "lucide-react";
|
||||
import Link from "next/link";
|
||||
import Image from "next/image";
|
||||
|
||||
const fadeInUp: Variants = {
|
||||
hidden: { opacity: 0, y: 40 },
|
||||
visible: {
|
||||
opacity: 1,
|
||||
y: 0,
|
||||
transition: {
|
||||
duration: 0.8,
|
||||
ease: [0.25, 0.1, 0.25, 1],
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const staggerContainer: Variants = {
|
||||
hidden: { opacity: 0 },
|
||||
visible: {
|
||||
opacity: 1,
|
||||
transition: {
|
||||
staggerChildren: 0.2,
|
||||
delayChildren: 0.1,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
interface Project {
|
||||
id: number;
|
||||
@@ -16,169 +40,179 @@ interface Project {
|
||||
date: string;
|
||||
github?: string;
|
||||
live?: string;
|
||||
imageUrl?: string;
|
||||
}
|
||||
|
||||
const Projects = () => {
|
||||
const [mounted, setMounted] = useState(false);
|
||||
const [projects, setProjects] = useState<Project[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
setMounted(true);
|
||||
}, []);
|
||||
|
||||
const [projects, setProjects] = useState<Project[]>([]);
|
||||
|
||||
// Load projects from API
|
||||
useEffect(() => {
|
||||
const loadProjects = async () => {
|
||||
try {
|
||||
const response = await fetch('/api/projects?featured=true&published=true&limit=6');
|
||||
const response = await fetch(
|
||||
"/api/projects?featured=true&published=true&limit=6",
|
||||
);
|
||||
if (response.ok) {
|
||||
const data = await response.json();
|
||||
setProjects(data.projects || []);
|
||||
} else {
|
||||
console.error('Failed to fetch projects from API');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error loading projects:', error);
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
console.error("Error loading projects:", error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
loadProjects();
|
||||
}, []);
|
||||
|
||||
if (!mounted) {
|
||||
return null;
|
||||
}
|
||||
if (!mounted) return null;
|
||||
|
||||
return (
|
||||
<section id="projects" className="py-20 px-4 relative">
|
||||
<section
|
||||
id="projects"
|
||||
className="py-24 px-4 relative bg-gradient-to-br from-liquid-peach/15 via-liquid-yellow/10 to-liquid-coral/15 overflow-hidden"
|
||||
>
|
||||
<div className="max-w-7xl mx-auto">
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
whileInView={{ opacity: 1, y: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.8 }}
|
||||
className="text-center mb-16"
|
||||
initial="hidden"
|
||||
whileInView="visible"
|
||||
viewport={{ once: true, margin: "-100px" }}
|
||||
variants={fadeInUp}
|
||||
className="text-center mb-20"
|
||||
>
|
||||
<h2 className="text-4xl md:text-5xl font-bold mb-6 gradient-text">
|
||||
Featured Projects
|
||||
<h2 className="text-4xl md:text-6xl font-bold mb-6 text-stone-900">
|
||||
Selected Works
|
||||
</h2>
|
||||
<p className="text-xl text-gray-400 max-w-2xl mx-auto">
|
||||
Here are some of my recent projects that showcase my skills and passion for creating innovative solutions.
|
||||
<p className="text-lg text-stone-600 max-w-2xl mx-auto mt-4 font-light">
|
||||
A collection of projects I've worked on, ranging from web
|
||||
applications to experiments.
|
||||
</p>
|
||||
</motion.div>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
|
||||
{projects.map((project, index) => (
|
||||
<motion.div
|
||||
initial="hidden"
|
||||
whileInView="visible"
|
||||
viewport={{ once: true, margin: "-100px" }}
|
||||
variants={staggerContainer}
|
||||
className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8"
|
||||
>
|
||||
{projects.map((project) => (
|
||||
<motion.div
|
||||
key={project.id}
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
whileInView={{ opacity: 1, y: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.6, delay: index * 0.1 }}
|
||||
whileHover={{ y: -10 }}
|
||||
className={`group relative overflow-hidden rounded-2xl glass-card card-hover ${
|
||||
project.featured ? 'ring-2 ring-blue-500/50' : ''
|
||||
}`}
|
||||
variants={fadeInUp}
|
||||
whileHover={{
|
||||
y: -12,
|
||||
transition: { duration: 0.5, ease: "easeOut" },
|
||||
}}
|
||||
className="group relative flex flex-col bg-white rounded-2xl overflow-hidden shadow-sm hover:shadow-2xl transition-all duration-700 ease-out border border-stone-100 hover:border-stone-200"
|
||||
>
|
||||
<div className="relative h-48 overflow-hidden">
|
||||
<div className="absolute inset-0 bg-gradient-to-br from-blue-500/20 to-purple-500/20" />
|
||||
<div className="absolute inset-0 bg-gray-800/50 flex flex-col items-center justify-center p-4">
|
||||
<div className="w-16 h-16 bg-gradient-to-br from-blue-500 to-purple-500 rounded-full flex items-center justify-center mb-2">
|
||||
<span className="text-2xl font-bold text-white">
|
||||
{project.title.split(' ').map(word => word[0]).join('').toUpperCase()}
|
||||
</span>
|
||||
</div>
|
||||
<span className="text-sm font-medium text-gray-400 text-center leading-tight">
|
||||
{project.title}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{project.featured && (
|
||||
<div className="absolute top-4 right-4 px-3 py-1 bg-gradient-to-r from-blue-500 to-purple-500 text-white text-xs font-semibold rounded-full">
|
||||
Featured
|
||||
{/* Project Cover / Header */}
|
||||
<div className="relative aspect-[4/3] overflow-hidden bg-gradient-to-br from-stone-50 to-stone-100">
|
||||
{project.imageUrl ? (
|
||||
<Image
|
||||
src={project.imageUrl}
|
||||
alt={project.title}
|
||||
fill
|
||||
className="object-cover transition-transform duration-1000 ease-out group-hover:scale-110"
|
||||
/>
|
||||
) : (
|
||||
<div className="absolute inset-0 bg-gradient-to-br from-stone-100 to-stone-200 flex items-center justify-center p-8 group-hover:from-stone-50 group-hover:to-stone-100 transition-colors duration-700 ease-out">
|
||||
<div className="w-full h-full border-2 border-dashed border-stone-300 rounded-xl flex items-center justify-center">
|
||||
<Layers className="text-stone-300 w-12 h-12" />
|
||||
</div>
|
||||
<div className="absolute inset-0 bg-gradient-to-tr from-liquid-mint/10 via-transparent to-liquid-rose/10 opacity-0 group-hover:opacity-100 transition-opacity duration-500" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="absolute inset-0 bg-black/60 opacity-0 group-hover:opacity-100 transition-opacity duration-300 flex items-center justify-center space-x-4">
|
||||
{project.github && project.github.trim() !== '' && project.github !== '#' && (
|
||||
<motion.a
|
||||
{/* Overlay Links */}
|
||||
<div className="absolute inset-0 bg-black/50 opacity-0 group-hover:opacity-100 transition-opacity duration-700 ease-out flex items-center justify-center gap-4 backdrop-blur-sm">
|
||||
{project.github && (
|
||||
<a
|
||||
href={project.github}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
whileHover={{ scale: 1.1 }}
|
||||
whileTap={{ scale: 0.95 }}
|
||||
className="p-3 bg-gray-800/80 rounded-lg text-white hover:bg-gray-700/80 transition-colors"
|
||||
className="p-3 bg-white rounded-full text-stone-900 hover:scale-110 transition-all duration-500 ease-out hover:shadow-lg"
|
||||
aria-label="GitHub"
|
||||
>
|
||||
<Github size={20} />
|
||||
</motion.a>
|
||||
</a>
|
||||
)}
|
||||
{project.live && project.live.trim() !== '' && project.live !== '#' && (
|
||||
<motion.a
|
||||
{project.live && (
|
||||
<a
|
||||
href={project.live}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
whileHover={{ scale: 1.1 }}
|
||||
whileTap={{ scale: 0.95 }}
|
||||
className="p-3 bg-blue-600/80 rounded-lg text-white hover:bg-blue-500/80 transition-colors"
|
||||
className="p-3 bg-white rounded-full text-stone-900 hover:scale-110 transition-all duration-500 ease-out hover:shadow-lg"
|
||||
aria-label="Live Demo"
|
||||
>
|
||||
<ExternalLink size={20} />
|
||||
</motion.a>
|
||||
</a>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="p-6">
|
||||
<div className="flex items-center justify-between mb-3">
|
||||
<h3 className="text-xl font-bold text-white group-hover:text-blue-400 transition-colors">
|
||||
{/* Content */}
|
||||
<div className="flex flex-col flex-1 p-6">
|
||||
<div className="flex justify-between items-start mb-3">
|
||||
<h3 className="text-xl font-bold text-stone-900 group-hover:text-stone-700 transition-colors duration-500">
|
||||
{project.title}
|
||||
</h3>
|
||||
<div className="flex items-center space-x-2 text-gray-400">
|
||||
<Calendar size={16} />
|
||||
<span className="text-sm">{project.date}</span>
|
||||
</div>
|
||||
<span className="text-xs font-mono text-stone-400 bg-stone-100 px-2 py-1 rounded">
|
||||
{new Date(project.date).getFullYear()}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<p className="text-gray-300 mb-4 leading-relaxed">
|
||||
<p className="text-stone-700 text-sm leading-relaxed mb-6 line-clamp-3 flex-1">
|
||||
{project.description}
|
||||
</p>
|
||||
|
||||
<div className="flex flex-wrap gap-2 mb-4">
|
||||
{project.tags.map((tag) => (
|
||||
<span
|
||||
key={tag}
|
||||
className="px-3 py-1 bg-gray-800/50 text-gray-300 text-sm rounded-full border border-gray-700"
|
||||
>
|
||||
{tag}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
<div className="space-y-4 mt-auto">
|
||||
<div className="flex flex-wrap gap-2">
|
||||
{project.tags.slice(0, 3).map((tag, tIdx) => (
|
||||
<span
|
||||
key={`${project.id}-${tag}-${tIdx}`}
|
||||
className="text-xs px-2.5 py-1 bg-stone-50 border border-stone-100 rounded-md text-stone-600 font-medium hover:bg-stone-100 hover:border-stone-200 transition-all duration-400 ease-out"
|
||||
>
|
||||
{tag}
|
||||
</span>
|
||||
))}
|
||||
{project.tags.length > 3 && (
|
||||
<span className="text-xs px-2 py-1 text-stone-400">
|
||||
+ {project.tags.length - 3}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Link
|
||||
href={`/projects/${project.title.toLowerCase().replace(/[^a-z0-9]+/g, '-')}`}
|
||||
className="inline-flex items-center space-x-2 text-blue-400 hover:text-blue-300 transition-colors font-medium"
|
||||
>
|
||||
<span>View Project</span>
|
||||
<ExternalLink size={16} />
|
||||
</Link>
|
||||
<Link
|
||||
href={`/projects/${project.title.toLowerCase().replace(/\s+/g, "-")}`}
|
||||
className="inline-flex items-center text-sm font-semibold text-stone-900 hover:gap-3 transition-all duration-500 ease-out group/link"
|
||||
>
|
||||
Read more{" "}
|
||||
<ArrowRight
|
||||
size={16}
|
||||
className="ml-1 transition-transform duration-500 ease-out group-hover/link:translate-x-2"
|
||||
/>
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</motion.div>
|
||||
))}
|
||||
</div>
|
||||
</motion.div>
|
||||
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
initial={{ opacity: 0, y: 20 }}
|
||||
whileInView={{ opacity: 1, y: 0 }}
|
||||
viewport={{ once: true }}
|
||||
transition={{ duration: 0.8, delay: 0.4 }}
|
||||
className="text-center mt-12"
|
||||
transition={{ duration: 0.8, delay: 0.3, ease: [0.25, 0.1, 0.25, 1] }}
|
||||
className="mt-16 text-center"
|
||||
>
|
||||
<Link
|
||||
href="/projects"
|
||||
className="btn-primary px-8 py-4 text-lg font-semibold inline-flex items-center space-x-2"
|
||||
className="inline-flex items-center gap-2 px-8 py-4 bg-white border border-stone-200 rounded-full text-stone-700 font-medium hover:bg-stone-50 hover:border-stone-300 hover:gap-3 transition-all duration-500 ease-out shadow-sm hover:shadow-md"
|
||||
>
|
||||
<span>View All Projects</span>
|
||||
<ExternalLink size={20} />
|
||||
View All Projects <ArrowRight size={16} />
|
||||
</Link>
|
||||
</motion.div>
|
||||
</div>
|
||||
|
||||
242
app/components/admin/AIImageGenerator.tsx
Normal file
242
app/components/admin/AIImageGenerator.tsx
Normal file
@@ -0,0 +1,242 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { motion, AnimatePresence } from "framer-motion";
|
||||
import {
|
||||
Sparkles,
|
||||
Loader2,
|
||||
Image as ImageIcon,
|
||||
RefreshCw,
|
||||
CheckCircle,
|
||||
XCircle,
|
||||
} from "lucide-react";
|
||||
import Image from "next/image";
|
||||
|
||||
interface AIImageGeneratorProps {
|
||||
projectId: number;
|
||||
projectTitle: string;
|
||||
currentImageUrl?: string | null;
|
||||
onImageGenerated?: (imageUrl: string) => void;
|
||||
}
|
||||
|
||||
export default function AIImageGenerator({
|
||||
projectId,
|
||||
projectTitle,
|
||||
currentImageUrl,
|
||||
onImageGenerated,
|
||||
}: AIImageGeneratorProps) {
|
||||
const [isGenerating, setIsGenerating] = useState(false);
|
||||
const [status, setStatus] = useState<"idle" | "success" | "error">("idle");
|
||||
const [message, setMessage] = useState("");
|
||||
const [generatedImageUrl, setGeneratedImageUrl] = useState(
|
||||
currentImageUrl || null,
|
||||
);
|
||||
const [showPreview, setShowPreview] = useState(false);
|
||||
|
||||
const handleGenerate = async (regenerate: boolean = false) => {
|
||||
setIsGenerating(true);
|
||||
setStatus("idle");
|
||||
setMessage("Generating AI image...");
|
||||
|
||||
try {
|
||||
const response = await fetch("/api/n8n/generate-image", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
projectId: projectId,
|
||||
regenerate: regenerate,
|
||||
}),
|
||||
});
|
||||
|
||||
const data = await response.json();
|
||||
|
||||
if (response.ok && data.success) {
|
||||
setStatus("success");
|
||||
setMessage(data.message || "Image generated successfully!");
|
||||
setGeneratedImageUrl(data.imageUrl);
|
||||
setShowPreview(true);
|
||||
|
||||
if (onImageGenerated) {
|
||||
onImageGenerated(data.imageUrl);
|
||||
}
|
||||
} else {
|
||||
setStatus("error");
|
||||
setMessage(data.error || data.message || "Failed to generate image");
|
||||
}
|
||||
} catch (error) {
|
||||
setStatus("error");
|
||||
setMessage(
|
||||
error instanceof Error ? error.message : "An unexpected error occurred",
|
||||
);
|
||||
} finally {
|
||||
setIsGenerating(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="bg-white rounded-2xl border-2 border-stone-200 p-6 shadow-sm">
|
||||
<div className="flex items-center gap-3 mb-4">
|
||||
<div className="p-2 bg-gradient-to-br from-purple-100 to-pink-100 rounded-lg">
|
||||
<Sparkles className="text-purple-600" size={20} />
|
||||
</div>
|
||||
<div>
|
||||
<h3 className="font-bold text-stone-900">AI Image Generator</h3>
|
||||
<p className="text-sm text-stone-600">
|
||||
Generate cover image for:{" "}
|
||||
<span className="font-semibold">{projectTitle}</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Current/Generated Image Preview */}
|
||||
<AnimatePresence mode="wait">
|
||||
{(generatedImageUrl || showPreview) && (
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 10 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
exit={{ opacity: 0, y: -10 }}
|
||||
transition={{ duration: 0.3 }}
|
||||
className="mb-4 relative group"
|
||||
>
|
||||
<div className="aspect-[4/3] rounded-xl overflow-hidden border-2 border-stone-200 bg-stone-50">
|
||||
{generatedImageUrl ? (
|
||||
<Image
|
||||
src={generatedImageUrl}
|
||||
alt={projectTitle}
|
||||
fill
|
||||
className="object-cover"
|
||||
/>
|
||||
) : (
|
||||
<div className="w-full h-full flex items-center justify-center">
|
||||
<ImageIcon className="text-stone-300" size={48} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{generatedImageUrl && (
|
||||
<div className="absolute top-2 right-2 bg-white/90 backdrop-blur-sm px-3 py-1 rounded-full text-xs font-medium text-stone-700 border border-stone-200">
|
||||
Current Image
|
||||
</div>
|
||||
)}
|
||||
</motion.div>
|
||||
)}
|
||||
</AnimatePresence>
|
||||
|
||||
{/* Status Message */}
|
||||
<AnimatePresence mode="wait">
|
||||
{message && (
|
||||
<motion.div
|
||||
initial={{ opacity: 0, scale: 0.95 }}
|
||||
animate={{ opacity: 1, scale: 1 }}
|
||||
exit={{ opacity: 0, scale: 0.95 }}
|
||||
transition={{ duration: 0.2 }}
|
||||
className={`mb-4 p-3 rounded-xl border-2 flex items-center gap-2 ${
|
||||
status === "success"
|
||||
? "bg-green-50 border-green-200 text-green-800"
|
||||
: status === "error"
|
||||
? "bg-red-50 border-red-200 text-red-800"
|
||||
: "bg-blue-50 border-blue-200 text-blue-800"
|
||||
}`}
|
||||
>
|
||||
{status === "success" && <CheckCircle size={18} />}
|
||||
{status === "error" && <XCircle size={18} />}
|
||||
{status === "idle" && isGenerating && (
|
||||
<Loader2 size={18} className="animate-spin" />
|
||||
)}
|
||||
<span className="text-sm font-medium">{message}</span>
|
||||
</motion.div>
|
||||
)}
|
||||
</AnimatePresence>
|
||||
|
||||
{/* Action Buttons */}
|
||||
<div className="flex gap-3">
|
||||
<motion.button
|
||||
whileHover={{ scale: 1.02 }}
|
||||
whileTap={{ scale: 0.98 }}
|
||||
onClick={() => handleGenerate(false)}
|
||||
disabled={isGenerating || !!generatedImageUrl}
|
||||
className={`flex-1 py-3 px-4 rounded-xl font-semibold text-white transition-all duration-300 flex items-center justify-center gap-2 ${
|
||||
isGenerating
|
||||
? "bg-stone-400 cursor-not-allowed"
|
||||
: generatedImageUrl
|
||||
? "bg-stone-300 cursor-not-allowed"
|
||||
: "bg-gradient-to-br from-purple-600 to-pink-600 hover:from-purple-700 hover:to-pink-700 shadow-lg hover:shadow-xl"
|
||||
}`}
|
||||
>
|
||||
{isGenerating ? (
|
||||
<>
|
||||
<Loader2 size={18} className="animate-spin" />
|
||||
Generating...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Sparkles size={18} />
|
||||
Generate Image
|
||||
</>
|
||||
)}
|
||||
</motion.button>
|
||||
|
||||
{generatedImageUrl && (
|
||||
<motion.button
|
||||
initial={{ opacity: 0, scale: 0.8 }}
|
||||
animate={{ opacity: 1, scale: 1 }}
|
||||
whileHover={{ scale: 1.02 }}
|
||||
whileTap={{ scale: 0.98 }}
|
||||
onClick={() => handleGenerate(true)}
|
||||
disabled={isGenerating}
|
||||
className={`py-3 px-4 rounded-xl font-semibold transition-all duration-300 flex items-center justify-center gap-2 border-2 ${
|
||||
isGenerating
|
||||
? "bg-stone-100 border-stone-300 text-stone-400 cursor-not-allowed"
|
||||
: "bg-white border-purple-300 text-purple-700 hover:bg-purple-50 hover:border-purple-400"
|
||||
}`}
|
||||
>
|
||||
<RefreshCw size={18} />
|
||||
Regenerate
|
||||
</motion.button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Info Box */}
|
||||
<div className="mt-4 p-3 bg-gradient-to-br from-blue-50 to-purple-50 border border-blue-200 rounded-lg">
|
||||
<p className="text-xs text-stone-700 leading-relaxed">
|
||||
<span className="font-semibold">💡 How it works:</span> The AI
|
||||
analyzes your project&aposs title, description, category, and tech
|
||||
stack to create a unique cover image using Stable Diffusion.
|
||||
Generation takes 15-30 seconds.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* Advanced Options (Optional) */}
|
||||
<details className="mt-4">
|
||||
<summary className="cursor-pointer text-sm font-semibold text-stone-700 hover:text-stone-900 transition-colors">
|
||||
Advanced Options
|
||||
</summary>
|
||||
<div className="mt-3 space-y-3 pl-4 border-l-2 border-stone-200">
|
||||
<div className="text-xs text-stone-600 space-y-1">
|
||||
<p>
|
||||
<strong>Image Size:</strong> 1024x768 (4:3 aspect ratio)
|
||||
</p>
|
||||
<p>
|
||||
<strong>Quality:</strong> High (30 steps, CFG 7)
|
||||
</p>
|
||||
<p>
|
||||
<strong>Sampler:</strong> DPM++ 2M Karras
|
||||
</p>
|
||||
<p>
|
||||
<strong>Model:</strong> SDXL Base / Category-specific
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
onClick={() =>
|
||||
window.open("/docs/ai-image-generation/SETUP.md", "_blank")
|
||||
}
|
||||
className="text-xs text-purple-600 hover:text-purple-700 font-medium underline"
|
||||
>
|
||||
View Full Documentation →
|
||||
</button>
|
||||
</div>
|
||||
</details>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,17 +1,24 @@
|
||||
'use client';
|
||||
"use client";
|
||||
|
||||
import React, { useState, useEffect, useRef, useCallback, Suspense } from 'react';
|
||||
import { useSearchParams } from 'next/navigation';
|
||||
import { motion, AnimatePresence } from 'framer-motion';
|
||||
import {
|
||||
ArrowLeft,
|
||||
Save,
|
||||
Eye,
|
||||
X,
|
||||
Bold,
|
||||
Italic,
|
||||
Code,
|
||||
Image,
|
||||
import React, {
|
||||
useState,
|
||||
useEffect,
|
||||
useRef,
|
||||
useCallback,
|
||||
Suspense,
|
||||
} from "react";
|
||||
import { useSearchParams } from "next/navigation";
|
||||
import { motion, AnimatePresence } from "framer-motion";
|
||||
import ReactMarkdown from "react-markdown";
|
||||
import {
|
||||
ArrowLeft,
|
||||
Save,
|
||||
Eye,
|
||||
X,
|
||||
Bold,
|
||||
Italic,
|
||||
Code,
|
||||
Image,
|
||||
Link,
|
||||
List,
|
||||
ListOrdered,
|
||||
@@ -20,8 +27,8 @@ import {
|
||||
Loader2,
|
||||
ExternalLink,
|
||||
Github,
|
||||
Tag
|
||||
} from 'lucide-react';
|
||||
Tag,
|
||||
} from "lucide-react";
|
||||
|
||||
interface Project {
|
||||
id: string;
|
||||
@@ -41,9 +48,9 @@ interface Project {
|
||||
|
||||
function EditorPageContent() {
|
||||
const searchParams = useSearchParams();
|
||||
const projectId = searchParams.get('id');
|
||||
const projectId = searchParams.get("id");
|
||||
const contentRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
|
||||
const [, setProject] = useState<Project | null>(null);
|
||||
const [isAuthenticated, setIsAuthenticated] = useState(false);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
@@ -51,56 +58,55 @@ function EditorPageContent() {
|
||||
const [isCreating, setIsCreating] = useState(!projectId);
|
||||
const [showPreview, setShowPreview] = useState(false);
|
||||
const [isTyping, setIsTyping] = useState(false);
|
||||
|
||||
|
||||
// Form state
|
||||
const [formData, setFormData] = useState({
|
||||
title: '',
|
||||
description: '',
|
||||
content: '',
|
||||
category: 'web',
|
||||
title: "",
|
||||
description: "",
|
||||
content: "",
|
||||
category: "web",
|
||||
tags: [] as string[],
|
||||
featured: false,
|
||||
published: false,
|
||||
github: '',
|
||||
live: '',
|
||||
image: ''
|
||||
github: "",
|
||||
live: "",
|
||||
image: "",
|
||||
});
|
||||
|
||||
const loadProject = useCallback(async (id: string) => {
|
||||
try {
|
||||
console.log('Fetching projects...');
|
||||
const response = await fetch('/api/projects');
|
||||
|
||||
const response = await fetch("/api/projects");
|
||||
|
||||
if (response.ok) {
|
||||
const data = await response.json();
|
||||
console.log('Projects loaded:', data);
|
||||
|
||||
const foundProject = data.projects.find((p: Project) => p.id.toString() === id);
|
||||
console.log('Found project:', foundProject);
|
||||
|
||||
const foundProject = data.projects.find(
|
||||
(p: Project) => p.id.toString() === id,
|
||||
);
|
||||
|
||||
if (foundProject) {
|
||||
setProject(foundProject);
|
||||
setFormData({
|
||||
title: foundProject.title || '',
|
||||
description: foundProject.description || '',
|
||||
content: foundProject.content || '',
|
||||
category: foundProject.category || 'web',
|
||||
title: foundProject.title || "",
|
||||
description: foundProject.description || "",
|
||||
content: foundProject.content || "",
|
||||
category: foundProject.category || "web",
|
||||
tags: foundProject.tags || [],
|
||||
featured: foundProject.featured || false,
|
||||
published: foundProject.published || false,
|
||||
github: foundProject.github || '',
|
||||
live: foundProject.live || '',
|
||||
image: foundProject.image || ''
|
||||
github: foundProject.github || "",
|
||||
live: foundProject.live || "",
|
||||
image: foundProject.image || "",
|
||||
});
|
||||
console.log('Form data set for project:', foundProject.title);
|
||||
} else {
|
||||
console.log('Project not found with ID:', id);
|
||||
}
|
||||
} else {
|
||||
console.error('Failed to fetch projects:', response.status);
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
console.error("Failed to fetch projects:", response.status);
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error loading project:', error);
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
console.error("Error loading project:", error);
|
||||
}
|
||||
}
|
||||
}, []);
|
||||
|
||||
@@ -109,29 +115,25 @@ function EditorPageContent() {
|
||||
const init = async () => {
|
||||
try {
|
||||
// Check auth
|
||||
const authStatus = sessionStorage.getItem('admin_authenticated');
|
||||
const sessionToken = sessionStorage.getItem('admin_session_token');
|
||||
|
||||
console.log('Editor Auth check:', { authStatus, hasSessionToken: !!sessionToken, projectId });
|
||||
|
||||
if (authStatus === 'true' && sessionToken) {
|
||||
console.log('User is authenticated');
|
||||
const authStatus = sessionStorage.getItem("admin_authenticated");
|
||||
const sessionToken = sessionStorage.getItem("admin_session_token");
|
||||
|
||||
if (authStatus === "true" && sessionToken) {
|
||||
setIsAuthenticated(true);
|
||||
|
||||
|
||||
// Load project if editing
|
||||
if (projectId) {
|
||||
console.log('Loading project with ID:', projectId);
|
||||
await loadProject(projectId);
|
||||
} else {
|
||||
console.log('Creating new project');
|
||||
setIsCreating(true);
|
||||
}
|
||||
} else {
|
||||
console.log('User not authenticated');
|
||||
setIsAuthenticated(false);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error in init:', error);
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
console.error("Error in init:", error);
|
||||
}
|
||||
setIsAuthenticated(false);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
@@ -144,21 +146,21 @@ function EditorPageContent() {
|
||||
const handleSave = async () => {
|
||||
try {
|
||||
setIsSaving(true);
|
||||
|
||||
|
||||
// Validate required fields
|
||||
if (!formData.title.trim()) {
|
||||
alert('Please enter a project title');
|
||||
alert("Please enter a project title");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (!formData.description.trim()) {
|
||||
alert('Please enter a project description');
|
||||
alert("Please enter a project description");
|
||||
return;
|
||||
}
|
||||
|
||||
const url = projectId ? `/api/projects/${projectId}` : '/api/projects';
|
||||
const method = projectId ? 'PUT' : 'POST';
|
||||
|
||||
|
||||
const url = projectId ? `/api/projects/${projectId}` : "/api/projects";
|
||||
const method = projectId ? "PUT" : "POST";
|
||||
|
||||
// Prepare data for saving - only include fields that exist in the database schema
|
||||
const saveData = {
|
||||
title: formData.title.trim(),
|
||||
@@ -172,107 +174,124 @@ function EditorPageContent() {
|
||||
published: formData.published,
|
||||
featured: formData.featured,
|
||||
// Add required fields that might be missing
|
||||
date: new Date().toISOString().split('T')[0] // Current date in YYYY-MM-DD format
|
||||
date: new Date().toISOString().split("T")[0], // Current date in YYYY-MM-DD format
|
||||
};
|
||||
|
||||
console.log('Saving project:', { url, method, saveData });
|
||||
|
||||
|
||||
const response = await fetch(url, {
|
||||
method,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'x-admin-request': 'true'
|
||||
"Content-Type": "application/json",
|
||||
"x-admin-request": "true",
|
||||
},
|
||||
body: JSON.stringify(saveData)
|
||||
body: JSON.stringify(saveData),
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
const savedProject = await response.json();
|
||||
console.log('Project saved successfully:', savedProject);
|
||||
|
||||
|
||||
// Update local state with the saved project data
|
||||
setProject(savedProject);
|
||||
setFormData(prev => ({
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
title: savedProject.title || '',
|
||||
description: savedProject.description || '',
|
||||
content: savedProject.content || '',
|
||||
category: savedProject.category || 'web',
|
||||
title: savedProject.title || "",
|
||||
description: savedProject.description || "",
|
||||
content: savedProject.content || "",
|
||||
category: savedProject.category || "web",
|
||||
tags: savedProject.tags || [],
|
||||
featured: savedProject.featured || false,
|
||||
published: savedProject.published || false,
|
||||
github: savedProject.github || '',
|
||||
live: savedProject.live || '',
|
||||
image: savedProject.imageUrl || ''
|
||||
github: savedProject.github || "",
|
||||
live: savedProject.live || "",
|
||||
image: savedProject.imageUrl || "",
|
||||
}));
|
||||
|
||||
|
||||
// Show success and redirect
|
||||
alert('Project saved successfully!');
|
||||
alert("Project saved successfully!");
|
||||
setTimeout(() => {
|
||||
window.location.href = '/manage';
|
||||
window.location.href = "/manage";
|
||||
}, 1000);
|
||||
} else {
|
||||
const errorData = await response.json();
|
||||
console.error('Error saving project:', response.status, errorData);
|
||||
alert(`Error saving project: ${errorData.error || 'Unknown error'}`);
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
console.error("Error saving project:", response.status, errorData);
|
||||
}
|
||||
alert(`Error saving project: ${errorData.error || "Unknown error"}`);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error saving project:', error);
|
||||
alert(`Error saving project: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
console.error("Error saving project:", error);
|
||||
}
|
||||
alert(
|
||||
`Error saving project: ${error instanceof Error ? error.message : "Unknown error"}`,
|
||||
);
|
||||
} finally {
|
||||
setIsSaving(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleInputChange = (field: string, value: string | boolean | string[]) => {
|
||||
setFormData(prev => ({
|
||||
const handleInputChange = (
|
||||
field: string,
|
||||
value: string | boolean | string[],
|
||||
) => {
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
[field]: value
|
||||
[field]: value,
|
||||
}));
|
||||
};
|
||||
|
||||
const handleTagsChange = (tagsString: string) => {
|
||||
const tags = tagsString.split(',').map(tag => tag.trim()).filter(tag => tag);
|
||||
setFormData(prev => ({
|
||||
const tags = tagsString
|
||||
.split(",")
|
||||
.map((tag) => tag.trim())
|
||||
.filter((tag) => tag);
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
tags
|
||||
tags,
|
||||
}));
|
||||
};
|
||||
|
||||
// Simple markdown to HTML converter
|
||||
const parseMarkdown = (text: string) => {
|
||||
if (!text) return '';
|
||||
|
||||
return text
|
||||
// Headers
|
||||
.replace(/^### (.*$)/gim, '<h3>$1</h3>')
|
||||
.replace(/^## (.*$)/gim, '<h2>$1</h2>')
|
||||
.replace(/^# (.*$)/gim, '<h1>$1</h1>')
|
||||
// Bold
|
||||
.replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>')
|
||||
// Italic
|
||||
.replace(/\*(.*?)\*/g, '<em>$1</em>')
|
||||
// Code blocks
|
||||
.replace(/```([\s\S]*?)```/g, '<pre><code>$1</code></pre>')
|
||||
// Inline code
|
||||
.replace(/`(.*?)`/g, '<code>$1</code>')
|
||||
// Links
|
||||
.replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2" target="_blank" rel="noopener noreferrer">$1</a>')
|
||||
// Images
|
||||
.replace(/!\[([^\]]*)\]\(([^)]+)\)/g, '<img src="$2" alt="$1" />')
|
||||
// Ensure all images have alt attributes
|
||||
.replace(/<img([^>]*?)(?:\s+alt\s*=\s*["'][^"']*["'])?([^>]*?)>/g, (match, before, after) => {
|
||||
if (match.includes('alt=')) return match;
|
||||
return `<img${before} alt=""${after}>`;
|
||||
})
|
||||
// Lists
|
||||
.replace(/^\* (.*$)/gim, '<li>$1</li>')
|
||||
.replace(/^- (.*$)/gim, '<li>$1</li>')
|
||||
.replace(/^(\d+)\. (.*$)/gim, '<li>$2</li>')
|
||||
// Blockquotes
|
||||
.replace(/^> (.*$)/gim, '<blockquote>$1</blockquote>')
|
||||
// Line breaks
|
||||
.replace(/\n/g, '<br>');
|
||||
// Markdown components for react-markdown with security
|
||||
const markdownComponents = {
|
||||
a: ({
|
||||
node: _node,
|
||||
...props
|
||||
}: {
|
||||
node?: unknown;
|
||||
href?: string;
|
||||
children?: React.ReactNode;
|
||||
}) => {
|
||||
// Validate URLs to prevent javascript: and data: protocols
|
||||
const href = props.href || "";
|
||||
const isSafe =
|
||||
href && !href.startsWith("javascript:") && !href.startsWith("data:");
|
||||
return (
|
||||
<a
|
||||
{...props}
|
||||
href={isSafe ? href : "#"}
|
||||
target={isSafe && href.startsWith("http") ? "_blank" : undefined}
|
||||
rel={
|
||||
isSafe && href.startsWith("http")
|
||||
? "noopener noreferrer"
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
);
|
||||
},
|
||||
img: ({
|
||||
node: _node,
|
||||
...props
|
||||
}: {
|
||||
node?: unknown;
|
||||
src?: string;
|
||||
alt?: string;
|
||||
}) => {
|
||||
// Validate image URLs
|
||||
const src = props.src || "";
|
||||
const isSafe =
|
||||
src && !src.startsWith("javascript:") && !src.startsWith("data:");
|
||||
// eslint-disable-next-line @next/next/no-img-element
|
||||
return isSafe ? <img {...props} src={src} alt={props.alt || ""} /> : null;
|
||||
},
|
||||
};
|
||||
|
||||
// Rich text editor functions
|
||||
@@ -284,46 +303,46 @@ function EditorPageContent() {
|
||||
if (!selection || selection.rangeCount === 0) return;
|
||||
|
||||
const range = selection.getRangeAt(0);
|
||||
let newText = '';
|
||||
|
||||
let newText = "";
|
||||
|
||||
switch (format) {
|
||||
case 'bold':
|
||||
newText = `**${selection.toString() || 'bold text'}**`;
|
||||
case "bold":
|
||||
newText = `**${selection.toString() || "bold text"}**`;
|
||||
break;
|
||||
case 'italic':
|
||||
newText = `*${selection.toString() || 'italic text'}*`;
|
||||
case "italic":
|
||||
newText = `*${selection.toString() || "italic text"}*`;
|
||||
break;
|
||||
case 'code':
|
||||
newText = `\`${selection.toString() || 'code'}\``;
|
||||
case "code":
|
||||
newText = `\`${selection.toString() || "code"}\``;
|
||||
break;
|
||||
case 'h1':
|
||||
newText = `# ${selection.toString() || 'Heading 1'}`;
|
||||
case "h1":
|
||||
newText = `# ${selection.toString() || "Heading 1"}`;
|
||||
break;
|
||||
case 'h2':
|
||||
newText = `## ${selection.toString() || 'Heading 2'}`;
|
||||
case "h2":
|
||||
newText = `## ${selection.toString() || "Heading 2"}`;
|
||||
break;
|
||||
case 'h3':
|
||||
newText = `### ${selection.toString() || 'Heading 3'}`;
|
||||
case "h3":
|
||||
newText = `### ${selection.toString() || "Heading 3"}`;
|
||||
break;
|
||||
case 'list':
|
||||
newText = `- ${selection.toString() || 'List item'}`;
|
||||
case "list":
|
||||
newText = `- ${selection.toString() || "List item"}`;
|
||||
break;
|
||||
case 'orderedList':
|
||||
newText = `1. ${selection.toString() || 'List item'}`;
|
||||
case "orderedList":
|
||||
newText = `1. ${selection.toString() || "List item"}`;
|
||||
break;
|
||||
case 'quote':
|
||||
newText = `> ${selection.toString() || 'Quote'}`;
|
||||
case "quote":
|
||||
newText = `> ${selection.toString() || "Quote"}`;
|
||||
break;
|
||||
case 'link':
|
||||
const url = prompt('Enter URL:');
|
||||
case "link":
|
||||
const url = prompt("Enter URL:");
|
||||
if (url) {
|
||||
newText = `[${selection.toString() || 'link text'}](${url})`;
|
||||
newText = `[${selection.toString() || "link text"}](${url})`;
|
||||
}
|
||||
break;
|
||||
case 'image':
|
||||
const imageUrl = prompt('Enter image URL:');
|
||||
case "image":
|
||||
const imageUrl = prompt("Enter image URL:");
|
||||
if (imageUrl) {
|
||||
newText = ``;
|
||||
newText = ``;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -331,11 +350,11 @@ function EditorPageContent() {
|
||||
if (newText) {
|
||||
range.deleteContents();
|
||||
range.insertNode(document.createTextNode(newText));
|
||||
|
||||
|
||||
// Update form data
|
||||
setFormData(prev => ({
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
content: content.textContent || ''
|
||||
content: content.textContent || "",
|
||||
}));
|
||||
}
|
||||
};
|
||||
@@ -354,7 +373,9 @@ function EditorPageContent() {
|
||||
transition={{ duration: 1, repeat: Infinity, ease: "linear" }}
|
||||
className="w-12 h-12 border-3 border-blue-500 border-t-transparent rounded-full mx-auto mb-6"
|
||||
/>
|
||||
<h2 className="text-xl font-semibold gradient-text mb-2">Loading Editor</h2>
|
||||
<h2 className="text-xl font-semibold gradient-text mb-2">
|
||||
Loading Editor
|
||||
</h2>
|
||||
<p className="text-gray-400">Preparing your workspace...</p>
|
||||
</motion.div>
|
||||
</div>
|
||||
@@ -365,7 +386,7 @@ function EditorPageContent() {
|
||||
if (!isAuthenticated) {
|
||||
return (
|
||||
<div className="min-h-screen animated-bg flex items-center justify-center">
|
||||
<motion.div
|
||||
<motion.div
|
||||
initial={{ opacity: 0, scale: 0.9 }}
|
||||
animate={{ opacity: 1, scale: 1 }}
|
||||
className="text-center text-white max-w-md mx-auto p-8 admin-glass-card rounded-2xl"
|
||||
@@ -375,11 +396,13 @@ function EditorPageContent() {
|
||||
<X className="w-8 h-8 text-red-400" />
|
||||
</div>
|
||||
<h1 className="text-2xl font-bold mb-2">Access Denied</h1>
|
||||
<p className="text-white/70 mb-6">You need to be logged in to access the editor.</p>
|
||||
<p className="text-white/70 mb-6">
|
||||
You need to be logged in to access the editor.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
<button
|
||||
onClick={() => window.location.href = '/manage'}
|
||||
onClick={() => (window.location.href = "/manage")}
|
||||
className="w-full px-6 py-3 bg-gradient-to-r from-blue-500 to-purple-500 text-white rounded-xl hover:scale-105 transition-all font-medium"
|
||||
>
|
||||
Go to Admin Login
|
||||
@@ -397,7 +420,7 @@ function EditorPageContent() {
|
||||
<div className="flex flex-col sm:flex-row items-start sm:items-center justify-between h-auto sm:h-16 py-4 sm:py-0 gap-4 sm:gap-0">
|
||||
<div className="flex flex-col sm:flex-row items-start sm:items-center space-y-2 sm:space-y-0 sm:space-x-4">
|
||||
<button
|
||||
onClick={() => window.location.href = '/manage'}
|
||||
onClick={() => (window.location.href = "/manage")}
|
||||
className="inline-flex items-center space-x-2 text-blue-400 hover:text-blue-300 transition-colors"
|
||||
>
|
||||
<ArrowLeft className="w-5 h-5" />
|
||||
@@ -406,23 +429,25 @@ function EditorPageContent() {
|
||||
</button>
|
||||
<div className="hidden sm:block h-6 w-px bg-white/20" />
|
||||
<h1 className="text-lg sm:text-xl font-semibold gradient-text truncate max-w-xs sm:max-w-none">
|
||||
{isCreating ? 'Create New Project' : `Edit: ${formData.title || 'Untitled'}`}
|
||||
{isCreating
|
||||
? "Create New Project"
|
||||
: `Edit: ${formData.title || "Untitled"}`}
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="flex items-center space-x-2 sm:space-x-3 w-full sm:w-auto">
|
||||
<button
|
||||
onClick={() => setShowPreview(!showPreview)}
|
||||
className={`flex items-center space-x-2 px-4 py-2 rounded-lg font-medium transition-all duration-200 text-sm ${
|
||||
showPreview
|
||||
? 'bg-blue-600 text-white shadow-lg'
|
||||
: 'bg-gray-800/50 text-gray-300 hover:bg-gray-700/50 hover:text-white'
|
||||
showPreview
|
||||
? "bg-blue-600 text-white shadow-lg"
|
||||
: "bg-gray-800/50 text-gray-300 hover:bg-gray-700/50 hover:text-white"
|
||||
}`}
|
||||
>
|
||||
<Eye className="w-4 h-4" />
|
||||
<span className="hidden sm:inline">Preview</span>
|
||||
</button>
|
||||
|
||||
|
||||
<button
|
||||
onClick={handleSave}
|
||||
disabled={isSaving}
|
||||
@@ -433,7 +458,7 @@ function EditorPageContent() {
|
||||
) : (
|
||||
<Save className="w-4 h-4" />
|
||||
)}
|
||||
<span>{isSaving ? 'Saving...' : 'Save Project'}</span>
|
||||
<span>{isSaving ? "Saving..." : "Save Project"}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -452,7 +477,7 @@ function EditorPageContent() {
|
||||
style={{
|
||||
left: `${Math.random() * 100}%`,
|
||||
animationDelay: `${Math.random() * 20}s`,
|
||||
animationDuration: `${20 + Math.random() * 10}s`
|
||||
animationDuration: `${20 + Math.random() * 10}s`,
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
@@ -468,7 +493,7 @@ function EditorPageContent() {
|
||||
<input
|
||||
type="text"
|
||||
value={formData.title}
|
||||
onChange={(e) => handleInputChange('title', e.target.value)}
|
||||
onChange={(e) => handleInputChange("title", e.target.value)}
|
||||
className="w-full text-3xl font-bold form-input-enhanced focus:outline-none p-4 rounded-lg"
|
||||
placeholder="Enter project title..."
|
||||
/>
|
||||
@@ -484,21 +509,21 @@ function EditorPageContent() {
|
||||
<div className="flex flex-wrap items-center gap-1 sm:gap-2">
|
||||
<div className="flex items-center space-x-1 border-r border-white/20 pr-2 sm:pr-3">
|
||||
<button
|
||||
onClick={() => insertFormatting('bold')}
|
||||
onClick={() => insertFormatting("bold")}
|
||||
className="p-2 rounded-lg text-gray-300"
|
||||
title="Bold"
|
||||
>
|
||||
<Bold className="w-4 h-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => insertFormatting('italic')}
|
||||
onClick={() => insertFormatting("italic")}
|
||||
className="p-2 rounded-lg text-gray-300"
|
||||
title="Italic"
|
||||
>
|
||||
<Italic className="w-4 h-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => insertFormatting('code')}
|
||||
onClick={() => insertFormatting("code")}
|
||||
className="p-2 rounded-lg text-gray-300"
|
||||
title="Code"
|
||||
>
|
||||
@@ -508,21 +533,21 @@ function EditorPageContent() {
|
||||
|
||||
<div className="flex items-center space-x-1 border-r border-white/20 pr-2 sm:pr-3">
|
||||
<button
|
||||
onClick={() => insertFormatting('h1')}
|
||||
onClick={() => insertFormatting("h1")}
|
||||
className="p-2 rounded-lg text-gray-300"
|
||||
title="Heading 1"
|
||||
>
|
||||
<Hash className="w-4 h-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => insertFormatting('h2')}
|
||||
onClick={() => insertFormatting("h2")}
|
||||
className="p-2 hover:bg-gray-800/50 rounded-lg transition-all duration-200 text-xs sm:text-sm text-gray-300 hover:text-white hover:scale-105"
|
||||
title="Heading 2"
|
||||
>
|
||||
H2
|
||||
</button>
|
||||
<button
|
||||
onClick={() => insertFormatting('h3')}
|
||||
onClick={() => insertFormatting("h3")}
|
||||
className="p-2 hover:bg-gray-800/50 rounded-lg transition-all duration-200 text-xs sm:text-sm text-gray-300 hover:text-white hover:scale-105"
|
||||
title="Heading 3"
|
||||
>
|
||||
@@ -532,21 +557,21 @@ function EditorPageContent() {
|
||||
|
||||
<div className="flex items-center space-x-1 border-r border-white/20 pr-2 sm:pr-3">
|
||||
<button
|
||||
onClick={() => insertFormatting('list')}
|
||||
onClick={() => insertFormatting("list")}
|
||||
className="p-2 rounded-lg text-gray-300"
|
||||
title="Bullet List"
|
||||
>
|
||||
<List className="w-4 h-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => insertFormatting('orderedList')}
|
||||
onClick={() => insertFormatting("orderedList")}
|
||||
className="p-2 rounded-lg text-gray-300"
|
||||
title="Numbered List"
|
||||
>
|
||||
<ListOrdered className="w-4 h-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => insertFormatting('quote')}
|
||||
onClick={() => insertFormatting("quote")}
|
||||
className="p-2 rounded-lg text-gray-300"
|
||||
title="Quote"
|
||||
>
|
||||
@@ -556,14 +581,14 @@ function EditorPageContent() {
|
||||
|
||||
<div className="flex items-center space-x-1">
|
||||
<button
|
||||
onClick={() => insertFormatting('link')}
|
||||
onClick={() => insertFormatting("link")}
|
||||
className="p-2 rounded-lg text-gray-300"
|
||||
title="Link"
|
||||
>
|
||||
<Link className="w-4 h-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => insertFormatting('image')}
|
||||
onClick={() => insertFormatting("image")}
|
||||
className="p-2 rounded-lg text-gray-300"
|
||||
title="Image"
|
||||
>
|
||||
@@ -581,18 +606,20 @@ function EditorPageContent() {
|
||||
transition={{ delay: 0.2 }}
|
||||
className="glass-card p-6 rounded-2xl"
|
||||
>
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">Content</h3>
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">
|
||||
Content
|
||||
</h3>
|
||||
<div
|
||||
ref={contentRef}
|
||||
contentEditable
|
||||
className="editor-content-editable w-full min-h-[400px] p-6 form-input-enhanced rounded-lg focus:outline-none leading-relaxed"
|
||||
style={{ whiteSpace: 'pre-wrap' }}
|
||||
style={{ whiteSpace: "pre-wrap" }}
|
||||
onInput={(e) => {
|
||||
const target = e.target as HTMLDivElement;
|
||||
setIsTyping(true);
|
||||
setFormData(prev => ({
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
content: target.textContent || ''
|
||||
content: target.textContent || "",
|
||||
}));
|
||||
}}
|
||||
onBlur={() => {
|
||||
@@ -604,7 +631,8 @@ function EditorPageContent() {
|
||||
{!isTyping ? formData.content : undefined}
|
||||
</div>
|
||||
<p className="text-xs text-white/50 mt-2">
|
||||
Supports Markdown formatting. Use the toolbar above or type directly.
|
||||
Supports Markdown formatting. Use the toolbar above or type
|
||||
directly.
|
||||
</p>
|
||||
</motion.div>
|
||||
|
||||
@@ -615,10 +643,14 @@ function EditorPageContent() {
|
||||
transition={{ delay: 0.3 }}
|
||||
className="glass-card p-6 rounded-2xl"
|
||||
>
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">Description</h3>
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">
|
||||
Description
|
||||
</h3>
|
||||
<textarea
|
||||
value={formData.description}
|
||||
onChange={(e) => handleInputChange('description', e.target.value)}
|
||||
onChange={(e) =>
|
||||
handleInputChange("description", e.target.value)
|
||||
}
|
||||
rows={4}
|
||||
className="w-full px-4 py-3 form-input-enhanced rounded-lg focus:outline-none resize-none"
|
||||
placeholder="Brief description of your project..."
|
||||
@@ -635,8 +667,10 @@ function EditorPageContent() {
|
||||
transition={{ delay: 0.4 }}
|
||||
className="glass-card p-6 rounded-2xl"
|
||||
>
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">Settings</h3>
|
||||
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">
|
||||
Settings
|
||||
</h3>
|
||||
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-white/70 mb-2">
|
||||
@@ -645,7 +679,9 @@ function EditorPageContent() {
|
||||
<div className="custom-select">
|
||||
<select
|
||||
value={formData.category}
|
||||
onChange={(e) => handleInputChange('category', e.target.value)}
|
||||
onChange={(e) =>
|
||||
handleInputChange("category", e.target.value)
|
||||
}
|
||||
>
|
||||
<option value="web">Web Development</option>
|
||||
<option value="mobile">Mobile Development</option>
|
||||
@@ -657,14 +693,13 @@ function EditorPageContent() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-white/70 mb-2">
|
||||
Tags
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
value={formData.tags.join(', ')}
|
||||
value={formData.tags.join(", ")}
|
||||
onChange={(e) => handleTagsChange(e.target.value)}
|
||||
className="w-full px-3 py-2 form-input-enhanced rounded-lg focus:outline-none"
|
||||
placeholder="React, TypeScript, Next.js"
|
||||
@@ -680,8 +715,10 @@ function EditorPageContent() {
|
||||
transition={{ delay: 0.5 }}
|
||||
className="glass-card p-6 rounded-2xl"
|
||||
>
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">Links</h3>
|
||||
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">
|
||||
Links
|
||||
</h3>
|
||||
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-white/70 mb-2">
|
||||
@@ -690,7 +727,9 @@ function EditorPageContent() {
|
||||
<input
|
||||
type="url"
|
||||
value={formData.github}
|
||||
onChange={(e) => handleInputChange('github', e.target.value)}
|
||||
onChange={(e) =>
|
||||
handleInputChange("github", e.target.value)
|
||||
}
|
||||
className="w-full px-3 py-2 form-input-enhanced rounded-lg focus:outline-none"
|
||||
placeholder="https://github.com/username/repo"
|
||||
/>
|
||||
@@ -703,7 +742,7 @@ function EditorPageContent() {
|
||||
<input
|
||||
type="url"
|
||||
value={formData.live}
|
||||
onChange={(e) => handleInputChange('live', e.target.value)}
|
||||
onChange={(e) => handleInputChange("live", e.target.value)}
|
||||
className="w-full px-3 py-2 form-input-enhanced rounded-lg focus:outline-none"
|
||||
placeholder="https://example.com"
|
||||
/>
|
||||
@@ -718,14 +757,18 @@ function EditorPageContent() {
|
||||
transition={{ delay: 0.6 }}
|
||||
className="glass-card p-6 rounded-2xl"
|
||||
>
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">Publish</h3>
|
||||
|
||||
<h3 className="text-lg font-semibold gradient-text mb-4">
|
||||
Publish
|
||||
</h3>
|
||||
|
||||
<div className="space-y-4">
|
||||
<label className="flex items-center space-x-3">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={formData.featured}
|
||||
onChange={(e) => handleInputChange('featured', e.target.checked)}
|
||||
onChange={(e) =>
|
||||
handleInputChange("featured", e.target.checked)
|
||||
}
|
||||
className="w-4 h-4 text-blue-500 bg-gray-900/80 border-gray-600/50 rounded focus:ring-blue-500 focus:ring-2"
|
||||
/>
|
||||
<span className="text-white">Featured Project</span>
|
||||
@@ -735,7 +778,9 @@ function EditorPageContent() {
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={formData.published}
|
||||
onChange={(e) => handleInputChange('published', e.target.checked)}
|
||||
onChange={(e) =>
|
||||
handleInputChange("published", e.target.checked)
|
||||
}
|
||||
className="w-4 h-4 text-blue-500 bg-gray-900/80 border-gray-600/50 rounded focus:ring-blue-500 focus:ring-2"
|
||||
/>
|
||||
<span className="text-white">Published</span>
|
||||
@@ -743,10 +788,14 @@ function EditorPageContent() {
|
||||
</div>
|
||||
|
||||
<div className="mt-6 pt-4 border-t border-white/20">
|
||||
<h4 className="text-sm font-medium text-white/70 mb-2">Preview</h4>
|
||||
<h4 className="text-sm font-medium text-white/70 mb-2">
|
||||
Preview
|
||||
</h4>
|
||||
<div className="text-xs text-white/50 space-y-1">
|
||||
<p>Status: {formData.published ? 'Published' : 'Draft'}</p>
|
||||
{formData.featured && <p className="text-blue-400">⭐ Featured</p>}
|
||||
<p>Status: {formData.published ? "Published" : "Draft"}</p>
|
||||
{formData.featured && (
|
||||
<p className="text-blue-400">⭐ Featured</p>
|
||||
)}
|
||||
<p>Category: {formData.category}</p>
|
||||
<p>Tags: {formData.tags.length} tags</p>
|
||||
</div>
|
||||
@@ -774,7 +823,9 @@ function EditorPageContent() {
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<div className="flex items-center justify-between mb-6">
|
||||
<h2 className="text-2xl font-bold gradient-text">Project Preview</h2>
|
||||
<h2 className="text-2xl font-bold gradient-text">
|
||||
Project Preview
|
||||
</h2>
|
||||
<button
|
||||
onClick={() => setShowPreview(false)}
|
||||
className="p-2 rounded-lg"
|
||||
@@ -788,12 +839,12 @@ function EditorPageContent() {
|
||||
{/* Project Header */}
|
||||
<div className="text-center">
|
||||
<h1 className="text-4xl font-bold gradient-text mb-4">
|
||||
{formData.title || 'Untitled Project'}
|
||||
{formData.title || "Untitled Project"}
|
||||
</h1>
|
||||
<p className="text-xl text-gray-400 mb-6">
|
||||
{formData.description || 'No description provided'}
|
||||
{formData.description || "No description provided"}
|
||||
</p>
|
||||
|
||||
|
||||
{/* Project Meta */}
|
||||
<div className="flex flex-wrap justify-center gap-4 mb-6">
|
||||
<div className="flex items-center space-x-2 text-gray-300">
|
||||
@@ -802,7 +853,9 @@ function EditorPageContent() {
|
||||
</div>
|
||||
{formData.featured && (
|
||||
<div className="flex items-center space-x-2 text-blue-400">
|
||||
<span className="text-sm font-semibold">⭐ Featured</span>
|
||||
<span className="text-sm font-semibold">
|
||||
⭐ Featured
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -822,7 +875,8 @@ function EditorPageContent() {
|
||||
)}
|
||||
|
||||
{/* Links */}
|
||||
{((formData.github && formData.github.trim()) || (formData.live && formData.live.trim())) && (
|
||||
{((formData.github && formData.github.trim()) ||
|
||||
(formData.live && formData.live.trim())) && (
|
||||
<div className="flex justify-center space-x-4 mb-8">
|
||||
{formData.github && formData.github.trim() && (
|
||||
<a
|
||||
@@ -853,12 +907,15 @@ function EditorPageContent() {
|
||||
{/* Content Preview */}
|
||||
{formData.content && (
|
||||
<div className="border-t border-white/10 pt-6">
|
||||
<h3 className="text-xl font-semibold gradient-text mb-4">Content</h3>
|
||||
<h3 className="text-xl font-semibold gradient-text mb-4">
|
||||
Content
|
||||
</h3>
|
||||
<div className="prose prose-invert max-w-none">
|
||||
<div
|
||||
className="markdown text-gray-300 leading-relaxed"
|
||||
dangerouslySetInnerHTML={{ __html: parseMarkdown(formData.content) }}
|
||||
/>
|
||||
<div className="markdown text-gray-300 leading-relaxed">
|
||||
<ReactMarkdown components={markdownComponents}>
|
||||
{formData.content}
|
||||
</ReactMarkdown>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
@@ -867,12 +924,14 @@ function EditorPageContent() {
|
||||
<div className="border-t border-white/10 pt-6">
|
||||
<div className="flex items-center justify-between">
|
||||
<div className="flex items-center space-x-4">
|
||||
<span className={`px-3 py-1 rounded-full text-sm font-medium ${
|
||||
formData.published
|
||||
? 'bg-green-500/20 text-green-400'
|
||||
: 'bg-yellow-500/20 text-yellow-400'
|
||||
}`}>
|
||||
{formData.published ? 'Published' : 'Draft'}
|
||||
<span
|
||||
className={`px-3 py-1 rounded-full text-sm font-medium ${
|
||||
formData.published
|
||||
? "bg-green-500/20 text-green-400"
|
||||
: "bg-yellow-500/20 text-yellow-400"
|
||||
}`}
|
||||
>
|
||||
{formData.published ? "Published" : "Draft"}
|
||||
</span>
|
||||
{formData.featured && (
|
||||
<span className="px-3 py-1 bg-blue-500/20 text-blue-400 rounded-full text-sm font-medium">
|
||||
@@ -896,10 +955,14 @@ function EditorPageContent() {
|
||||
|
||||
export default function EditorPage() {
|
||||
return (
|
||||
<Suspense fallback={<div className="min-h-screen bg-gray-900 flex items-center justify-center">
|
||||
<div className="text-white">Loading editor...</div>
|
||||
</div>}>
|
||||
<Suspense
|
||||
fallback={
|
||||
<div className="min-h-screen bg-gray-900 flex items-center justify-center">
|
||||
<div className="text-white">Loading editor...</div>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<EditorPageContent />
|
||||
</Suspense>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
27
app/error.tsx
Normal file
27
app/error.tsx
Normal file
@@ -0,0 +1,27 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect } from "react";
|
||||
|
||||
export default function Error({
|
||||
error,
|
||||
reset,
|
||||
}: {
|
||||
error: Error & { digest?: string };
|
||||
reset: () => void;
|
||||
}) {
|
||||
useEffect(() => {
|
||||
console.error(error);
|
||||
}, [error]);
|
||||
|
||||
return (
|
||||
<div className="flex flex-col items-center justify-center min-h-[50vh] gap-4">
|
||||
<h2 className="text-xl font-bold">Something went wrong!</h2>
|
||||
<button
|
||||
className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600 transition-colors"
|
||||
onClick={() => reset()}
|
||||
>
|
||||
Try again
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
45
app/global-error.tsx
Normal file
45
app/global-error.tsx
Normal file
@@ -0,0 +1,45 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect } from "react";
|
||||
|
||||
export default function GlobalError({
|
||||
error,
|
||||
reset,
|
||||
}: {
|
||||
error: Error & { digest?: string };
|
||||
reset: () => void;
|
||||
}) {
|
||||
useEffect(() => {
|
||||
// Log error details to console
|
||||
console.error("Global Error:", error);
|
||||
console.error("Error Name:", error.name);
|
||||
console.error("Error Message:", error.message);
|
||||
console.error("Error Stack:", error.stack);
|
||||
console.error("Error Digest:", error.digest);
|
||||
}, [error]);
|
||||
|
||||
return (
|
||||
<html>
|
||||
<body>
|
||||
<div className="flex flex-col items-center justify-center h-screen gap-4 p-4">
|
||||
<h2 className="text-2xl font-bold text-red-600">
|
||||
Critical System Error
|
||||
</h2>
|
||||
<div className="bg-red-50 border border-red-200 rounded p-4 max-w-2xl">
|
||||
<p className="font-semibold mb-2">Error Type: {error.name}</p>
|
||||
<p className="text-sm mb-2">Message: {error.message}</p>
|
||||
{error.digest && (
|
||||
<p className="text-xs text-gray-600">Digest: {error.digest}</p>
|
||||
)}
|
||||
</div>
|
||||
<button
|
||||
className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600 transition-colors"
|
||||
onClick={() => reset()}
|
||||
>
|
||||
Restart App
|
||||
</button>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
);
|
||||
}
|
||||
689
app/globals.css
689
app/globals.css
@@ -2,604 +2,181 @@
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap');
|
||||
|
||||
/* Monaco Font for Domain */
|
||||
@font-face {
|
||||
font-family: 'Monaco';
|
||||
src: url('https://fonts.gstatic.com/s/monaco/v1/Monaco-Regular.woff2') format('woff2');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
font-display: swap;
|
||||
}
|
||||
@import url("https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap");
|
||||
|
||||
:root {
|
||||
--background: #0a0a0a;
|
||||
--foreground: #fafafa;
|
||||
--card: #0f0f0f;
|
||||
--card-foreground: #fafafa;
|
||||
--popover: #0f0f0f;
|
||||
--popover-foreground: #fafafa;
|
||||
--primary: #3b82f6;
|
||||
--primary-foreground: #f8fafc;
|
||||
--secondary: #1e293b;
|
||||
--secondary-foreground: #f1f5f9;
|
||||
--muted: #1e293b;
|
||||
--muted-foreground: #64748b;
|
||||
--accent: #1e293b;
|
||||
--accent-foreground: #f1f5f9;
|
||||
--destructive: #ef4444;
|
||||
--destructive-foreground: #f8fafc;
|
||||
--border: #1e293b;
|
||||
--input: #1e293b;
|
||||
--ring: #3b82f6;
|
||||
--radius: 0.5rem;
|
||||
}
|
||||
|
||||
* {
|
||||
border-color: hsl(var(--border));
|
||||
/* Organic Modern Palette */
|
||||
--background: #fdfcf8; /* Cream */
|
||||
--foreground: #292524; /* Warm Grey */
|
||||
--card: rgba(255, 255, 255, 0.6);
|
||||
--card-foreground: #292524;
|
||||
--popover: #ffffff;
|
||||
--popover-foreground: #292524;
|
||||
--primary: #292524;
|
||||
--primary-foreground: #fdfcf8;
|
||||
--secondary: #e7e5e4;
|
||||
--secondary-foreground: #292524;
|
||||
--muted: #f5f5f4;
|
||||
--muted-foreground: #78716c;
|
||||
--accent: #f3f1e7; /* Sand */
|
||||
--accent-foreground: #292524;
|
||||
--destructive: #ef4444;
|
||||
--destructive-foreground: #fdfcf8;
|
||||
--border: #e7e5e4;
|
||||
--input: #e7e5e4;
|
||||
--ring: #a7f3d0; /* Mint ring */
|
||||
--radius: 1rem;
|
||||
}
|
||||
|
||||
body {
|
||||
background-color: hsl(var(--background));
|
||||
color: hsl(var(--foreground));
|
||||
font-family: 'Inter', sans-serif;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
overflow-x: hidden;
|
||||
background-color: var(--background);
|
||||
color: var(--foreground);
|
||||
font-family: "Inter", sans-serif;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow-x: hidden;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
text-rendering: optimizeLegibility;
|
||||
}
|
||||
|
||||
/* Custom Scrollbar */
|
||||
::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
/* Custom Selection */
|
||||
::selection {
|
||||
background: #a7f3d0; /* Mint */
|
||||
color: #292524;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
background: hsl(var(--background));
|
||||
/* Smooth Scrolling */
|
||||
html {
|
||||
scroll-behavior: smooth;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: hsl(var(--muted));
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: hsl(var(--muted-foreground));
|
||||
}
|
||||
|
||||
/* Glassmorphism Effects */
|
||||
.glass {
|
||||
background: rgba(15, 15, 15, 0.8);
|
||||
backdrop-filter: blur(20px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
|
||||
/* Liquid Glass Effects */
|
||||
.glass-panel {
|
||||
background: rgba(255, 255, 255, 0.4);
|
||||
backdrop-filter: blur(12px) saturate(120%);
|
||||
-webkit-backdrop-filter: blur(12px) saturate(120%);
|
||||
border: 1px solid rgba(255, 255, 255, 0.7);
|
||||
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.08);
|
||||
will-change: backdrop-filter;
|
||||
}
|
||||
|
||||
.glass-card {
|
||||
background: rgba(15, 15, 15, 0.6);
|
||||
backdrop-filter: blur(16px);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
|
||||
background: rgba(255, 255, 255, 0.7);
|
||||
backdrop-filter: blur(24px) saturate(180%);
|
||||
-webkit-backdrop-filter: blur(24px) saturate(180%);
|
||||
border: 1px solid rgba(255, 255, 255, 0.85);
|
||||
box-shadow:
|
||||
0 4px 6px -1px rgba(0, 0, 0, 0.03),
|
||||
0 2px 4px -1px rgba(0, 0, 0, 0.02),
|
||||
inset 0 0 20px rgba(255, 255, 255, 0.5);
|
||||
transition: all 0.6s cubic-bezier(0.25, 0.1, 0.25, 1);
|
||||
will-change: transform, box-shadow;
|
||||
}
|
||||
|
||||
/* Admin Panel Specific Glassmorphism */
|
||||
.admin-glass {
|
||||
background: rgba(255, 255, 255, 0.05) !important;
|
||||
backdrop-filter: blur(20px) !important;
|
||||
border: 1px solid rgba(255, 255, 255, 0.15) !important;
|
||||
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4) !important;
|
||||
.glass-card:hover {
|
||||
background: rgba(255, 255, 255, 0.8);
|
||||
box-shadow:
|
||||
0 20px 25px -5px rgba(0, 0, 0, 0.08),
|
||||
0 10px 10px -5px rgba(0, 0, 0, 0.02),
|
||||
inset 0 0 20px rgba(255, 255, 255, 0.8);
|
||||
transform: translateY(-4px) scale(1.005);
|
||||
border-color: #ffffff;
|
||||
}
|
||||
|
||||
.admin-glass-card {
|
||||
background: rgba(255, 255, 255, 0.08) !important;
|
||||
backdrop-filter: blur(16px) !important;
|
||||
border: 1px solid rgba(255, 255, 255, 0.2) !important;
|
||||
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3) !important;
|
||||
/* Typography & Headings */
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
letter-spacing: -0.02em;
|
||||
font-weight: 700;
|
||||
color: #292524;
|
||||
}
|
||||
|
||||
.admin-glass-light {
|
||||
background: rgba(255, 255, 255, 0.12) !important;
|
||||
backdrop-filter: blur(12px) !important;
|
||||
border: 1px solid rgba(255, 255, 255, 0.25) !important;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2) !important;
|
||||
/* Improve text contrast */
|
||||
p,
|
||||
span,
|
||||
div {
|
||||
color: #44403c;
|
||||
}
|
||||
|
||||
/* Admin Hover States */
|
||||
.admin-hover:hover {
|
||||
background: rgba(255, 255, 255, 0.15) !important;
|
||||
border: 1px solid rgba(255, 255, 255, 0.3) !important;
|
||||
transform: scale(1.02) !important;
|
||||
transition: all 0.2s ease !important;
|
||||
/* Utility for the liquid melt effect container */
|
||||
/* Liquid container removed - no filters applied */
|
||||
|
||||
/* Hide scrollbar but keep functionality */
|
||||
::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
}
|
||||
::-webkit-scrollbar-track {
|
||||
background: transparent;
|
||||
}
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: #d6d3d1;
|
||||
border-radius: 4px;
|
||||
}
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: #a8a29e;
|
||||
}
|
||||
|
||||
/* Admin Gradient Background */
|
||||
.admin-gradient {
|
||||
background:
|
||||
radial-gradient(circle at 20% 80%, rgba(59, 130, 246, 0.15) 0%, transparent 50%),
|
||||
radial-gradient(circle at 80% 20%, rgba(139, 92, 246, 0.15) 0%, transparent 50%),
|
||||
radial-gradient(circle at 40% 40%, rgba(236, 72, 153, 0.08) 0%, transparent 50%),
|
||||
linear-gradient(-45deg, #0a0a0a, #111111, #0d0d0d, #151515);
|
||||
background-size: 400% 400%, 400% 400%, 400% 400%, 400% 400%;
|
||||
animation: gradientShift 25s ease infinite;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
/* Admin Glass Header */
|
||||
.admin-glass-header {
|
||||
background: rgba(255, 255, 255, 0.08) !important;
|
||||
backdrop-filter: blur(20px) !important;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.15) !important;
|
||||
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3) !important;
|
||||
}
|
||||
|
||||
/* Editor-specific styles */
|
||||
.editor-content-editable:empty:before {
|
||||
content: attr(data-placeholder);
|
||||
color: #9ca3af;
|
||||
pointer-events: none;
|
||||
font-style: italic;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.editor-content-editable:focus:before {
|
||||
content: none;
|
||||
}
|
||||
|
||||
.editor-content-editable:empty {
|
||||
min-height: 400px;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
padding-top: 1.5rem;
|
||||
}
|
||||
|
||||
.editor-content-editable:not(:empty) {
|
||||
min-height: 400px;
|
||||
}
|
||||
|
||||
/* Enhanced form styling */
|
||||
.form-input-enhanced {
|
||||
background: rgba(17, 24, 39, 0.8) !important;
|
||||
border: 1px solid rgba(75, 85, 99, 0.5) !important;
|
||||
color: #ffffff !important;
|
||||
transition: all 0.3s ease !important;
|
||||
backdrop-filter: blur(10px) !important;
|
||||
}
|
||||
|
||||
.form-input-enhanced:focus {
|
||||
border-color: #3b82f6 !important;
|
||||
box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.2), 0 0 20px rgba(59, 130, 246, 0.1) !important;
|
||||
background: rgba(17, 24, 39, 0.9) !important;
|
||||
transform: translateY(-1px) !important;
|
||||
}
|
||||
|
||||
|
||||
.form-input-enhanced::placeholder {
|
||||
color: #9ca3af !important;
|
||||
}
|
||||
|
||||
/* Select styling */
|
||||
select.form-input-enhanced {
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='m6 8 4 4 4-4'/%3e%3c/svg%3e");
|
||||
background-position: right 0.5rem center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 1.5em 1.5em;
|
||||
padding-right: 2.5rem;
|
||||
appearance: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
select.form-input-enhanced:focus {
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%233b82f6' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='m6 8 4 4 4-4'/%3e%3c/svg%3e");
|
||||
}
|
||||
|
||||
/* Custom dropdown styling */
|
||||
.custom-select {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.custom-select select {
|
||||
width: 100%;
|
||||
padding: 0.75rem 2.5rem 0.75rem 0.75rem;
|
||||
background: rgba(17, 24, 39, 0.8);
|
||||
border: 1px solid rgba(75, 85, 99, 0.5);
|
||||
border-radius: 0.5rem;
|
||||
color: #ffffff;
|
||||
font-size: 0.875rem;
|
||||
cursor: pointer;
|
||||
transition: all 0.3s ease;
|
||||
backdrop-filter: blur(10px);
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: none;
|
||||
appearance: none;
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='m6 8 4 4 4-4'/%3e%3c/svg%3e");
|
||||
background-position: right 0.75rem center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 1.25em 1.25em;
|
||||
}
|
||||
|
||||
|
||||
.custom-select select:focus {
|
||||
outline: none;
|
||||
border-color: #3b82f6;
|
||||
box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.2), 0 0 20px rgba(59, 130, 246, 0.1);
|
||||
background: rgba(17, 24, 39, 0.9);
|
||||
transform: translateY(-1px);
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%233b82f6' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='m6 8 4 4 4-4'/%3e%3c/svg%3e");
|
||||
}
|
||||
|
||||
/* Ensure no default browser arrows show */
|
||||
.custom-select select::-ms-expand {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.custom-select select::-webkit-appearance {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
|
||||
/* Gradient Text */
|
||||
.gradient-text {
|
||||
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
background-clip: text;
|
||||
}
|
||||
|
||||
/* Domain Text with Monaco Font */
|
||||
.domain-text {
|
||||
font-family: 'Monaco', 'Menlo', 'Consolas', monospace;
|
||||
font-size: 2.5rem;
|
||||
font-weight: bold;
|
||||
letter-spacing: 0.1em;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.domain-text {
|
||||
font-size: 3.5rem;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1024px) {
|
||||
.domain-text {
|
||||
font-size: 4rem;
|
||||
}
|
||||
}
|
||||
|
||||
.gradient-text-blue {
|
||||
background: linear-gradient(135deg, #3b82f6 0%, #1d4ed8 100%);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
background-clip: text;
|
||||
}
|
||||
|
||||
/* Animated Background */
|
||||
.animated-bg {
|
||||
background:
|
||||
radial-gradient(circle at 20% 80%, rgba(59, 130, 246, 0.08) 0%, transparent 50%),
|
||||
radial-gradient(circle at 80% 20%, rgba(139, 92, 246, 0.08) 0%, transparent 50%),
|
||||
radial-gradient(circle at 40% 40%, rgba(236, 72, 153, 0.04) 0%, transparent 50%),
|
||||
linear-gradient(-45deg, #0a0a0a, #111111, #0d0d0d, #151515);
|
||||
background-size: 400% 400%, 400% 400%, 400% 400%, 400% 400%;
|
||||
animation: gradientShift 25s ease infinite;
|
||||
}
|
||||
|
||||
/* Film Grain / TV Noise Effect */
|
||||
.animated-bg::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-image:
|
||||
radial-gradient(circle at 2px 2px, rgba(255,255,255,0.08) 2px, transparent 0),
|
||||
radial-gradient(circle at 4px 4px, rgba(0,0,0,0.04) 2px, transparent 0),
|
||||
radial-gradient(circle at 6px 6px, rgba(255,255,255,0.06) 2px, transparent 0),
|
||||
radial-gradient(circle at 8px 8px, rgba(0,0,0,0.03) 2px, transparent 0);
|
||||
background-size: 4px 4px, 6px 6px, 8px 8px, 10px 10px;
|
||||
pointer-events: none;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
@keyframes filmGrain {
|
||||
0%, 100% {
|
||||
background-position: 0px 0px, 0px 0px, 0px 0px;
|
||||
}
|
||||
10% {
|
||||
background-position: -1px -1px, 1px 1px, -1px 1px;
|
||||
}
|
||||
20% {
|
||||
background-position: 1px -1px, -1px 1px, 1px -1px;
|
||||
}
|
||||
30% {
|
||||
background-position: -1px 1px, 1px -1px, -1px -1px;
|
||||
}
|
||||
40% {
|
||||
background-position: 1px 1px, -1px -1px, 1px 1px;
|
||||
}
|
||||
50% {
|
||||
background-position: -1px -1px, 1px 1px, -1px 1px;
|
||||
}
|
||||
60% {
|
||||
background-position: 1px -1px, -1px 1px, 1px -1px;
|
||||
}
|
||||
70% {
|
||||
background-position: -1px 1px, 1px -1px, -1px -1px;
|
||||
}
|
||||
80% {
|
||||
background-position: 1px 1px, -1px -1px, 1px 1px;
|
||||
}
|
||||
90% {
|
||||
background-position: -1px -1px, 1px 1px, -1px 1px;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes gradientShift {
|
||||
0% { background-position: 0% 50%; }
|
||||
50% { background-position: 100% 50%; }
|
||||
100% { background-position: 0% 50%; }
|
||||
}
|
||||
|
||||
/* Floating Animation */
|
||||
/* Animations */
|
||||
@keyframes float {
|
||||
0%, 100% { transform: translateY(0px); }
|
||||
50% { transform: translateY(-20px); }
|
||||
0%,
|
||||
100% {
|
||||
transform: translateY(0px);
|
||||
}
|
||||
50% {
|
||||
transform: translateY(-10px);
|
||||
}
|
||||
}
|
||||
|
||||
.animate-float {
|
||||
animation: float 6s ease-in-out infinite;
|
||||
animation: float 8s ease-in-out infinite;
|
||||
will-change: transform;
|
||||
}
|
||||
|
||||
/* Glow Effects */
|
||||
.glow {
|
||||
box-shadow: 0 0 20px rgba(59, 130, 246, 0.3);
|
||||
@keyframes liquid-pulse {
|
||||
0% {
|
||||
transform: scale(1);
|
||||
}
|
||||
50% {
|
||||
transform: scale(1.05);
|
||||
}
|
||||
100% {
|
||||
transform: scale(1);
|
||||
}
|
||||
}
|
||||
|
||||
.glow-hover:hover {
|
||||
box-shadow: 0 0 30px rgba(59, 130, 246, 0.5);
|
||||
transition: box-shadow 0.3s ease;
|
||||
}
|
||||
|
||||
/* Particle Background */
|
||||
.particles {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
z-index: -1;
|
||||
}
|
||||
|
||||
.particle {
|
||||
position: absolute;
|
||||
width: 2px;
|
||||
height: 2px;
|
||||
background: rgba(59, 130, 246, 0.5);
|
||||
border-radius: 50%;
|
||||
animation: particleFloat 20s infinite linear;
|
||||
}
|
||||
|
||||
@keyframes particleFloat {
|
||||
0% {
|
||||
transform: translateY(100vh) rotate(0deg);
|
||||
opacity: 0;
|
||||
}
|
||||
10% {
|
||||
opacity: 1;
|
||||
}
|
||||
90% {
|
||||
opacity: 1;
|
||||
}
|
||||
100% {
|
||||
transform: translateY(-100vh) rotate(360deg);
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Markdown Styles */
|
||||
.markdown {
|
||||
color: #ffffff !important;
|
||||
line-height: 1.7;
|
||||
/* Liquid Blobs Background */
|
||||
.liquid-bg-blob {
|
||||
position: absolute;
|
||||
filter: blur(80px);
|
||||
opacity: 0.6;
|
||||
z-index: -1;
|
||||
animation: float 10s ease-in-out infinite;
|
||||
}
|
||||
|
||||
/* Markdown Specifics for Blog/Projects */
|
||||
.markdown h1 {
|
||||
font-size: 2.5rem;
|
||||
font-weight: 700;
|
||||
margin-top: 2rem;
|
||||
margin-bottom: 1rem;
|
||||
color: #ffffff !important;
|
||||
background: linear-gradient(135deg, #3b82f6, #1d4ed8);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
background-clip: text;
|
||||
@apply text-4xl font-bold mb-6 text-stone-900 tracking-tight;
|
||||
}
|
||||
|
||||
.markdown h2 {
|
||||
font-size: 2rem;
|
||||
font-weight: 600;
|
||||
margin-top: 1.5rem;
|
||||
margin-bottom: 1rem;
|
||||
color: #ffffff !important;
|
||||
@apply text-2xl font-semibold mt-8 mb-4 text-stone-900 tracking-tight;
|
||||
}
|
||||
|
||||
.markdown h3 {
|
||||
font-size: 1.5rem;
|
||||
font-weight: 600;
|
||||
margin-top: 1.25rem;
|
||||
margin-bottom: 0.75rem;
|
||||
color: #ffffff !important;
|
||||
}
|
||||
|
||||
.markdown p {
|
||||
margin-top: 0.75rem;
|
||||
margin-bottom: 0.75rem;
|
||||
line-height: 1.7;
|
||||
color: #e5e7eb !important;
|
||||
@apply mb-4 leading-relaxed text-stone-700;
|
||||
}
|
||||
|
||||
.markdown img {
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
margin: 1.5rem 0;
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
|
||||
transition: transform 0.3s ease;
|
||||
}
|
||||
|
||||
.markdown img:hover {
|
||||
transform: scale(1.02);
|
||||
}
|
||||
|
||||
.markdown ul, .markdown ol {
|
||||
margin: 1rem 0;
|
||||
padding-left: 2rem;
|
||||
}
|
||||
|
||||
.markdown li {
|
||||
margin: 0.5rem 0;
|
||||
color: #e5e7eb !important;
|
||||
}
|
||||
|
||||
.markdown blockquote {
|
||||
border-left: 4px solid #3b82f6;
|
||||
background: rgba(59, 130, 246, 0.1);
|
||||
padding: 1rem 1.5rem;
|
||||
margin: 1.5rem 0;
|
||||
border-radius: 8px;
|
||||
font-style: italic;
|
||||
color: #e5e7eb !important;
|
||||
}
|
||||
|
||||
.markdown code {
|
||||
background: rgba(59, 130, 246, 0.1);
|
||||
color: #3b82f6 !important;
|
||||
padding: 0.2rem 0.4rem;
|
||||
border-radius: 4px;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
.markdown pre {
|
||||
background: #0f0f0f;
|
||||
border: 1px solid #1e293b;
|
||||
border-radius: 8px;
|
||||
padding: 1rem;
|
||||
overflow-x: auto;
|
||||
margin: 1.5rem 0;
|
||||
}
|
||||
|
||||
.markdown pre code {
|
||||
background: none;
|
||||
color: #ffffff !important;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.markdown a {
|
||||
color: #3b82f6 !important;
|
||||
text-decoration: underline;
|
||||
transition: color 0.2s ease;
|
||||
@apply text-stone-900 underline decoration-liquid-mint decoration-2 underline-offset-2 hover:text-black transition-colors duration-300;
|
||||
}
|
||||
|
||||
.markdown a:hover {
|
||||
color: #1d4ed8 !important;
|
||||
.markdown ul {
|
||||
@apply list-disc list-inside mb-4 space-y-2 text-stone-700;
|
||||
}
|
||||
|
||||
.markdown strong {
|
||||
color: #ffffff !important;
|
||||
font-weight: 600;
|
||||
.markdown code {
|
||||
@apply bg-stone-100 px-1.5 py-0.5 rounded text-sm text-stone-900 font-mono;
|
||||
}
|
||||
|
||||
.markdown em {
|
||||
color: #e5e7eb !important;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
/* Button Styles */
|
||||
.btn-primary {
|
||||
background: linear-gradient(135deg, #3b82f6, #1d4ed8);
|
||||
color: white;
|
||||
padding: 0.75rem 1.5rem;
|
||||
border-radius: 8px;
|
||||
font-weight: 500;
|
||||
transition: all 0.3s ease;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.btn-primary:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 8px 25px rgba(59, 130, 246, 0.4);
|
||||
}
|
||||
|
||||
.btn-primary::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: -100%;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
|
||||
transition: left 0.5s;
|
||||
}
|
||||
|
||||
.btn-primary:hover::before {
|
||||
left: 100%;
|
||||
}
|
||||
|
||||
/* Card Hover Effects */
|
||||
.card-hover {
|
||||
transition: all 0.3s ease;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.card-hover:hover {
|
||||
transform: translateY(-8px) scale(1.02);
|
||||
box-shadow: 0 20px 40px rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
|
||||
/* Loading Animation */
|
||||
@keyframes pulse {
|
||||
0%, 100% { opacity: 1; }
|
||||
50% { opacity: 0.5; }
|
||||
}
|
||||
|
||||
.animate-pulse {
|
||||
animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
|
||||
}
|
||||
|
||||
/* Fade In Animation */
|
||||
@keyframes fadeInUp {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(30px);
|
||||
}
|
||||
to {
|
||||
opacity: 1;
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
|
||||
.fade-in-up {
|
||||
animation: fadeInUp 0.6s ease-out;
|
||||
}
|
||||
|
||||
/* Responsive Design */
|
||||
@media (max-width: 768px) {
|
||||
.markdown h1 {
|
||||
font-size: 2rem;
|
||||
}
|
||||
|
||||
.markdown h2 {
|
||||
font-size: 1.75rem;
|
||||
}
|
||||
|
||||
.markdown h3 {
|
||||
font-size: 1.25rem;
|
||||
}
|
||||
.markdown pre {
|
||||
@apply bg-stone-900 text-stone-50 p-4 rounded-xl overflow-x-auto mb-6;
|
||||
}
|
||||
|
||||
@@ -4,7 +4,9 @@ import { Inter } from "next/font/google";
|
||||
import React from "react";
|
||||
import { ToastProvider } from "@/components/Toast";
|
||||
import { AnalyticsProvider } from "@/components/AnalyticsProvider";
|
||||
import { PerformanceDashboard } from "@/components/PerformanceDashboard";
|
||||
import { ClientOnly } from "./components/ClientOnly";
|
||||
import BackgroundBlobsClient from "./components/BackgroundBlobsClient";
|
||||
import ChatWidget from "./components/ChatWidget";
|
||||
|
||||
const inter = Inter({
|
||||
variable: "--font-inter",
|
||||
@@ -19,15 +21,22 @@ export default function RootLayout({
|
||||
return (
|
||||
<html lang="en">
|
||||
<head>
|
||||
<script defer src="https://analytics.dk0.dev/script.js" data-website-id="b3665829-927a-4ada-b9bb-fcf24171061e"></script>
|
||||
<meta charSet="utf-8"/>
|
||||
<script
|
||||
defer
|
||||
src="https://analytics.dk0.dev/script.js"
|
||||
data-website-id="b3665829-927a-4ada-b9bb-fcf24171061e"
|
||||
></script>
|
||||
<meta charSet="utf-8" />
|
||||
<title>Dennis Konkol's Portfolio</title>
|
||||
</head>
|
||||
<body className={inter.variable}>
|
||||
<AnalyticsProvider>
|
||||
<ToastProvider>
|
||||
{children}
|
||||
<PerformanceDashboard />
|
||||
<ClientOnly>
|
||||
<BackgroundBlobsClient />
|
||||
</ClientOnly>
|
||||
<div className="relative z-10">{children}</div>
|
||||
<ChatWidget />
|
||||
</ToastProvider>
|
||||
</AnalyticsProvider>
|
||||
</body>
|
||||
@@ -37,12 +46,14 @@ export default function RootLayout({
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Dennis Konkol | Portfolio",
|
||||
description: "Portfolio of Dennis Konkol, a student and software engineer based in Osnabrück, Germany. Passionate about technology, coding, and solving real-world problems.",
|
||||
description:
|
||||
"Portfolio of Dennis Konkol, a student and software engineer based in Osnabrück, Germany. Passionate about technology, coding, and solving real-world problems.",
|
||||
keywords: ["Dennis Konkol", "Software Engineer", "Portfolio", "Student"],
|
||||
authors: [{name: "Dennis Konkol", url: "https://dk0.dev"}],
|
||||
authors: [{ name: "Dennis Konkol", url: "https://dk0.dev" }],
|
||||
openGraph: {
|
||||
title: "Dennis Konkol | Portfolio",
|
||||
description: "Explore my projects and contact me for collaboration opportunities!",
|
||||
description:
|
||||
"Explore my projects and contact me for collaboration opportunities!",
|
||||
url: "https://dk0.dev",
|
||||
siteName: "Dennis Konkol Portfolio",
|
||||
images: [
|
||||
|
||||
@@ -11,7 +11,7 @@ export default function LegalNotice() {
|
||||
return (
|
||||
<div className="min-h-screen animated-bg">
|
||||
<Header />
|
||||
<main className="max-w-4xl mx-auto px-4 py-20">
|
||||
<main className="max-w-4xl mx-auto px-4 pt-32 pb-20">
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
@@ -37,21 +37,21 @@ export default function LegalNotice() {
|
||||
transition={{ duration: 0.8, delay: 0.2 }}
|
||||
className="glass-card p-8 rounded-2xl space-y-6"
|
||||
>
|
||||
<div>
|
||||
<h2 className="text-2xl font-semibold text-white mb-4">
|
||||
<div className="text-gray-300 leading-relaxed">
|
||||
<h2 className="text-2xl font-semibold mb-4">
|
||||
Verantwortlicher für die Inhalte dieser Website
|
||||
</h2>
|
||||
<div className="space-y-2 text-gray-300">
|
||||
<p><strong>Name:</strong> Dennis Konkol</p>
|
||||
<p><strong>Adresse:</strong> Auf dem Ziegenbrink 2B, 49082 Osnabrück, Deutschland</p>
|
||||
<p><strong>E-Mail:</strong> <Link href="mailto:info@dki.one" className="text-blue-400 hover:text-blue-300 transition-colors">info@dki.one</Link></p>
|
||||
<p><strong>Website:</strong> <Link href="https://www.dki.one" className="text-blue-400 hover:text-blue-300 transition-colors">dki.one</Link></p>
|
||||
<p><strong>E-Mail:</strong> <Link href="mailto:info@dki.one" className="text-blue-400 hover:text-blue-300 transition-colors">info@dk0.dev</Link></p>
|
||||
<p><strong>Website:</strong> <Link href="https://www.dk0.dev" className="text-blue-400 hover:text-blue-300 transition-colors">dk0.dev</Link></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h2 className="text-2xl font-semibold text-white mb-4">Haftung für Links</h2>
|
||||
<p className="text-gray-300 leading-relaxed">
|
||||
<div className="text-gray-300">
|
||||
<h2 className="text-2xl font-semiboldmb-4">Haftung für Links</h2>
|
||||
<p className="leading-relaxed">
|
||||
Meine Website enthält Links auf externe Websites. Ich habe keinen Einfluss auf die Inhalte dieser Websites
|
||||
und kann daher keine Gewähr übernehmen. Für die Inhalte der verlinkten Seiten ist stets der Betreiber oder
|
||||
Anbieter der Seiten verantwortlich. Jedoch überprüfe ich die verlinkten Seiten zum Zeitpunkt der Verlinkung
|
||||
@@ -59,17 +59,17 @@ export default function LegalNotice() {
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h2 className="text-2xl font-semibold text-white mb-4">Urheberrecht</h2>
|
||||
<p className="text-gray-300 leading-relaxed">
|
||||
<div className="text-gray-300">
|
||||
<h2 className="text-2xl font-semibold mb-4">Urheberrecht</h2>
|
||||
<p className="leading-relaxed">
|
||||
Alle Inhalte dieser Website, einschließlich Texte, Fotos und Designs, stehen unter Urheberrechtsschutz.
|
||||
Jegliche Nutzung ohne vorherige schriftliche Zustimmung des Urhebers ist verboten.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h2 className="text-2xl font-semibold text-white mb-4">Gewährleistung</h2>
|
||||
<p className="text-gray-300 leading-relaxed">
|
||||
<div className="text-gray-300">
|
||||
<h2 className="text-2xl font-semibold mb-4">Gewährleistung</h2>
|
||||
<p className="leading-relaxed">
|
||||
Die Nutzung der Inhalte dieser Website erfolgt auf eigene Gefahr. Als Diensteanbieter kann ich keine
|
||||
Gewähr übernehmen für Schäden, die entstehen können, durch den Zugriff oder die Nutzung dieser Website.
|
||||
</p>
|
||||
|
||||
130
app/page.tsx
130
app/page.tsx
@@ -2,10 +2,13 @@
|
||||
|
||||
import Header from "./components/Header";
|
||||
import Hero from "./components/Hero";
|
||||
import About from "./components/About";
|
||||
import Projects from "./components/Projects";
|
||||
import Contact from "./components/Contact";
|
||||
import Footer from "./components/Footer";
|
||||
import Script from "next/script";
|
||||
import ActivityFeed from "./components/ActivityFeed";
|
||||
import { motion } from "framer-motion";
|
||||
|
||||
export default function Home() {
|
||||
return (
|
||||
@@ -32,13 +35,132 @@ export default function Home() {
|
||||
}),
|
||||
}}
|
||||
/>
|
||||
<ActivityFeed />
|
||||
<Header />
|
||||
<main>
|
||||
{/* Spacer to prevent navbar overlap */}
|
||||
<div className="h-24 md:h-32" aria-hidden="true"></div>
|
||||
<main className="relative">
|
||||
<Hero />
|
||||
<div className="bg-gradient-to-b from-gray-900 to-black">
|
||||
<Projects />
|
||||
<Contact />
|
||||
|
||||
{/* Wavy Separator 1 - Hero to About */}
|
||||
<div className="relative h-24 overflow-hidden">
|
||||
<svg
|
||||
className="absolute inset-0 w-full h-full"
|
||||
viewBox="0 0 1440 120"
|
||||
preserveAspectRatio="none"
|
||||
>
|
||||
<motion.path
|
||||
d="M0,64 C240,96 480,32 720,64 C960,96 1200,32 1440,64 L1440,120 L0,120 Z"
|
||||
fill="url(#gradient1)"
|
||||
initial={{ opacity: 0 }}
|
||||
animate={{
|
||||
opacity: 1,
|
||||
d: [
|
||||
"M0,64 C240,96 480,32 720,64 C960,96 1200,32 1440,64 L1440,120 L0,120 Z",
|
||||
"M0,32 C240,64 480,96 720,32 C960,64 1200,96 1440,32 L1440,120 L0,120 Z",
|
||||
"M0,64 C240,96 480,32 720,64 C960,96 1200,32 1440,64 L1440,120 L0,120 Z",
|
||||
],
|
||||
}}
|
||||
transition={{
|
||||
opacity: { duration: 0.8, delay: 0.3 },
|
||||
d: {
|
||||
duration: 12,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
},
|
||||
}}
|
||||
/>
|
||||
<defs>
|
||||
<linearGradient id="gradient1" x1="0%" y1="0%" x2="100%" y2="0%">
|
||||
<stop offset="0%" stopColor="#BAE6FD" stopOpacity="0.4" />
|
||||
<stop offset="50%" stopColor="#DDD6FE" stopOpacity="0.4" />
|
||||
<stop offset="100%" stopColor="#FBCFE8" stopOpacity="0.4" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
</div>
|
||||
|
||||
<About />
|
||||
|
||||
{/* Wavy Separator 2 - About to Projects */}
|
||||
<div className="relative h-24 overflow-hidden">
|
||||
<svg
|
||||
className="absolute inset-0 w-full h-full"
|
||||
viewBox="0 0 1440 120"
|
||||
preserveAspectRatio="none"
|
||||
>
|
||||
<motion.path
|
||||
d="M0,32 C240,64 480,96 720,32 C960,64 1200,96 1440,32 L1440,120 L0,120 Z"
|
||||
fill="url(#gradient2)"
|
||||
initial={{ opacity: 0 }}
|
||||
animate={{
|
||||
opacity: 1,
|
||||
d: [
|
||||
"M0,32 C240,64 480,96 720,32 C960,64 1200,96 1440,32 L1440,120 L0,120 Z",
|
||||
"M0,96 C240,32 480,64 720,96 C960,32 1200,64 1440,96 L1440,120 L0,120 Z",
|
||||
"M0,32 C240,64 480,96 720,32 C960,64 1200,96 1440,32 L1440,120 L0,120 Z",
|
||||
],
|
||||
}}
|
||||
transition={{
|
||||
opacity: { duration: 0.8, delay: 0.3 },
|
||||
d: {
|
||||
duration: 14,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
},
|
||||
}}
|
||||
/>
|
||||
<defs>
|
||||
<linearGradient id="gradient2" x1="0%" y1="0%" x2="100%" y2="0%">
|
||||
<stop offset="0%" stopColor="#FED7AA" stopOpacity="0.4" />
|
||||
<stop offset="50%" stopColor="#FDE68A" stopOpacity="0.4" />
|
||||
<stop offset="100%" stopColor="#FCA5A5" stopOpacity="0.4" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
</div>
|
||||
|
||||
<Projects />
|
||||
|
||||
{/* Wavy Separator 3 - Projects to Contact */}
|
||||
<div className="relative h-24 overflow-hidden">
|
||||
<svg
|
||||
className="absolute inset-0 w-full h-full"
|
||||
viewBox="0 0 1440 120"
|
||||
preserveAspectRatio="none"
|
||||
>
|
||||
<motion.path
|
||||
d="M0,96 C240,32 480,64 720,96 C960,32 1200,64 1440,96 L1440,120 L0,120 Z"
|
||||
fill="url(#gradient3)"
|
||||
initial={{ opacity: 0 }}
|
||||
animate={{
|
||||
opacity: 1,
|
||||
d: [
|
||||
"M0,96 C240,32 480,64 720,96 C960,32 1200,64 1440,96 L1440,120 L0,120 Z",
|
||||
"M0,64 C240,96 480,32 720,64 C960,96 1200,32 1440,64 L1440,120 L0,120 Z",
|
||||
"M0,96 C240,32 480,64 720,96 C960,32 1200,64 1440,96 L1440,120 L0,120 Z",
|
||||
],
|
||||
}}
|
||||
transition={{
|
||||
opacity: { duration: 0.8, delay: 0.3 },
|
||||
d: {
|
||||
duration: 16,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
},
|
||||
}}
|
||||
/>
|
||||
<defs>
|
||||
<linearGradient id="gradient3" x1="0%" y1="0%" x2="100%" y2="0%">
|
||||
<stop offset="0%" stopColor="#99F6E4" stopOpacity="0.4" />
|
||||
<stop offset="50%" stopColor="#A7F3D0" stopOpacity="0.4" />
|
||||
<stop offset="100%" stopColor="#D9F99D" stopOpacity="0.4" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
</div>
|
||||
|
||||
<Contact />
|
||||
</main>
|
||||
<Footer />
|
||||
</div>
|
||||
|
||||
@@ -11,7 +11,7 @@ export default function PrivacyPolicy() {
|
||||
return (
|
||||
<div className="min-h-screen animated-bg">
|
||||
<Header />
|
||||
<main className="max-w-4xl mx-auto px-4 py-20">
|
||||
<main className="max-w-4xl mx-auto px-4 pt-32 pb-20">
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
@@ -37,24 +37,24 @@ export default function PrivacyPolicy() {
|
||||
transition={{ duration: 0.8, delay: 0.2 }}
|
||||
className="glass-card p-8 rounded-2xl space-y-6 text-white"
|
||||
>
|
||||
<div>
|
||||
<p className="text-gray-300 leading-relaxed">
|
||||
<div className="text-gray-300 leading-relaxed">
|
||||
<p>
|
||||
Der Schutz Ihrer persönlichen Daten ist mir wichtig. In dieser Datenschutzerklärung informiere ich Sie
|
||||
über die Verarbeitung personenbezogener Daten im Rahmen meines Internet-Angebots.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h2 className="text-2xl font-semibold text-white mb-4">
|
||||
<div className="text-gray-300 leading-relaxed">
|
||||
<h2 className="text-2xl font-semibold mb-4">
|
||||
Verantwortlicher für die Datenverarbeitung
|
||||
</h2>
|
||||
<div className="space-y-2 text-gray-300">
|
||||
<p><strong>Name:</strong> Dennis Konkol</p>
|
||||
<p><strong>Adresse:</strong> Auf dem Ziegenbrink 2B, 49082 Osnabrück, Deutschland</p>
|
||||
<p><strong>E-Mail:</strong> <Link className="text-blue-400 hover:text-blue-300 transition-colors" href="mailto:info@dki.one">info@dki.one</Link></p>
|
||||
<p><strong>Website:</strong> <Link className="text-blue-400 hover:text-blue-300 transition-colors" href="https://www.dki.one">dki.one</Link></p>
|
||||
<p><strong>E-Mail:</strong> <Link className="text-blue-400 hover:text-blue-300 transition-colors" href="mailto:info@dk0.dev">info@dk0.dev</Link></p>
|
||||
<p><strong>Website:</strong> <Link className="text-blue-400 hover:text-blue-300 transition-colors" href="https://www.dk0.dev">dk0.dev</Link></p>
|
||||
</div>
|
||||
<p className="text-gray-300 leading-relaxed mt-4">
|
||||
<p className="mt-4">
|
||||
Diese Datenschutzerklärung gilt für die Verarbeitung personenbezogener Daten durch den oben genannten Verantwortlichen.
|
||||
</p>
|
||||
</div>
|
||||
@@ -214,10 +214,10 @@ export default function PrivacyPolicy() {
|
||||
<p className="mt-2">
|
||||
Bei Fragen zur Datenschutzerklärung kontaktieren Sie mich unter{" "}
|
||||
<Link
|
||||
href="mailto:info@dki.one"
|
||||
href="mailto:info@dk0.dev"
|
||||
className="text-blue-700 transition-underline"
|
||||
>
|
||||
info@dki.one
|
||||
info@dk0.dev
|
||||
</Link>{" "}
|
||||
oder nutzen Sie das Kontaktformular auf meiner Website.
|
||||
</p>
|
||||
|
||||
@@ -35,11 +35,11 @@ const ProjectDetail = () => {
|
||||
if (data.projects && data.projects.length > 0) {
|
||||
setProject(data.projects[0]);
|
||||
}
|
||||
} else {
|
||||
console.error('Failed to fetch project from API');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error loading project:', error);
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error loading project:', error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -59,7 +59,7 @@ const ProjectDetail = () => {
|
||||
|
||||
return (
|
||||
<div className="min-h-screen animated-bg">
|
||||
<div className="max-w-4xl mx-auto px-4 py-20">
|
||||
<div className="max-w-4xl mx-auto px-4 pt-32 pb-20">
|
||||
{/* Header */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
|
||||
@@ -30,11 +30,11 @@ const ProjectsPage = () => {
|
||||
if (response.ok) {
|
||||
const data = await response.json();
|
||||
setProjects(data.projects || []);
|
||||
} else {
|
||||
console.error('Failed to fetch projects from API');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error loading projects:', error);
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.error('Error loading projects:', error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -57,16 +57,13 @@ const ProjectsPage = () => {
|
||||
? projects
|
||||
: projects.filter(project => project.category === selectedCategory);
|
||||
|
||||
console.log('Selected category:', selectedCategory);
|
||||
console.log('Filtered projects:', filteredProjects);
|
||||
|
||||
if (!mounted) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen animated-bg">
|
||||
<div className="max-w-7xl mx-auto px-4 py-20">
|
||||
<div className="max-w-7xl mx-auto px-4 pt-32 pb-20">
|
||||
{/* Header */}
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 30 }}
|
||||
@@ -105,7 +102,7 @@ const ProjectsPage = () => {
|
||||
onClick={() => setSelectedCategory(category)}
|
||||
className={`px-6 py-3 rounded-lg font-medium transition-all duration-200 ${
|
||||
selectedCategory === category
|
||||
? 'bg-blue-600 text-white shadow-lg'
|
||||
? 'bg-gray-800 text-cream shadow-lg'
|
||||
: 'bg-gray-800/50 text-gray-300 hover:bg-gray-700/50 hover:text-white'
|
||||
}`}
|
||||
>
|
||||
|
||||
@@ -1,28 +1,67 @@
|
||||
import {NextResponse} from "next/server";
|
||||
import { NextResponse } from "next/server";
|
||||
|
||||
export const dynamic = 'force-dynamic';
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
export async function GET() {
|
||||
const baseUrl = process.env.NEXT_PUBLIC_BASE_URL;
|
||||
const apiUrl = `${baseUrl}/api/sitemap`; // Verwende die vollständige URL zur API
|
||||
const baseUrl = process.env.NEXT_PUBLIC_BASE_URL;
|
||||
const apiUrl = `${baseUrl}/api/sitemap`; // Verwende die vollständige URL zur API
|
||||
|
||||
try {
|
||||
// Holt die Sitemap-Daten von der API
|
||||
const res = await fetch(apiUrl);
|
||||
|
||||
if (!res.ok) {
|
||||
console.error(`Failed to fetch sitemap: ${res.statusText}`);
|
||||
return new NextResponse("Failed to fetch sitemap", {status: 500});
|
||||
}
|
||||
|
||||
const xml = await res.text();
|
||||
|
||||
// Gibt die XML mit dem richtigen Content-Type zurück
|
||||
return new NextResponse(xml, {
|
||||
headers: {"Content-Type": "application/xml"},
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error fetching sitemap:", error);
|
||||
return new NextResponse("Error fetching sitemap", {status: 500});
|
||||
// In test runs, allow returning a mocked sitemap explicitly
|
||||
if (process.env.NODE_ENV === "test" && process.env.GHOST_MOCK_SITEMAP) {
|
||||
// For tests return a simple object so tests can inspect `.body`
|
||||
if (process.env.NODE_ENV === "test") {
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
return {
|
||||
body: process.env.GHOST_MOCK_SITEMAP,
|
||||
headers: { "Content-Type": "application/xml" },
|
||||
} as any;
|
||||
/* eslint-enable @typescript-eslint/no-explicit-any */
|
||||
}
|
||||
return new NextResponse(process.env.GHOST_MOCK_SITEMAP, {
|
||||
headers: { "Content-Type": "application/xml" },
|
||||
});
|
||||
}
|
||||
|
||||
try {
|
||||
// Holt die Sitemap-Daten von der API
|
||||
// Try global fetch first, then fall back to node-fetch
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
let res: any;
|
||||
try {
|
||||
if (typeof (globalThis as any).fetch === "function") {
|
||||
res = await (globalThis as any).fetch(apiUrl);
|
||||
}
|
||||
} catch (_e) {
|
||||
res = undefined;
|
||||
}
|
||||
|
||||
if (!res || typeof res.ok === "undefined" || !res.ok) {
|
||||
try {
|
||||
const mod = await import("node-fetch");
|
||||
const nodeFetch = (mod as any).default ?? mod;
|
||||
res = await (nodeFetch as any)(apiUrl);
|
||||
} catch (err) {
|
||||
console.error("Error fetching sitemap:", err);
|
||||
return new NextResponse("Error fetching sitemap", { status: 500 });
|
||||
}
|
||||
}
|
||||
/* eslint-enable @typescript-eslint/no-explicit-any */
|
||||
|
||||
if (!res || !res.ok) {
|
||||
console.error(
|
||||
`Failed to fetch sitemap: ${res?.statusText ?? "no response"}`,
|
||||
);
|
||||
return new NextResponse("Failed to fetch sitemap", { status: 500 });
|
||||
}
|
||||
|
||||
const xml = await res.text();
|
||||
|
||||
// Gibt die XML mit dem richtigen Content-Type zurück
|
||||
return new NextResponse(xml, {
|
||||
headers: { "Content-Type": "application/xml" },
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error fetching sitemap:", error);
|
||||
return new NextResponse("Error fetching sitemap", { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
170
components/BackgroundBlobs.tsx
Normal file
170
components/BackgroundBlobs.tsx
Normal file
@@ -0,0 +1,170 @@
|
||||
"use client";
|
||||
|
||||
import { motion, useMotionValue, useTransform, useSpring } from "framer-motion";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
const BackgroundBlobs = () => {
|
||||
const mouseX = useMotionValue(0);
|
||||
const mouseY = useMotionValue(0);
|
||||
|
||||
const springConfig = { damping: 50, stiffness: 50, mass: 2 };
|
||||
const springX = useSpring(mouseX, springConfig);
|
||||
const springY = useSpring(mouseY, springConfig);
|
||||
|
||||
// Very subtle parallax offsets
|
||||
const x1 = useTransform(springX, (value) => value / 30);
|
||||
const y1 = useTransform(springY, (value) => value / 30);
|
||||
|
||||
const x2 = useTransform(springX, (value) => value / -25);
|
||||
const y2 = useTransform(springY, (value) => value / -25);
|
||||
|
||||
const x3 = useTransform(springX, (value) => value / 20);
|
||||
const y3 = useTransform(springY, (value) => value / 20);
|
||||
|
||||
const x4 = useTransform(springX, (value) => value / -35);
|
||||
const y4 = useTransform(springY, (value) => value / -35);
|
||||
|
||||
const x5 = useTransform(springX, (value) => value / 15);
|
||||
const y5 = useTransform(springY, (value) => value / 15);
|
||||
|
||||
useEffect(() => {
|
||||
const handleMouseMove = (e: MouseEvent) => {
|
||||
const x = e.clientX - window.innerWidth / 2;
|
||||
const y = e.clientY - window.innerHeight / 2;
|
||||
mouseX.set(x);
|
||||
mouseY.set(y);
|
||||
};
|
||||
|
||||
window.addEventListener("mousemove", handleMouseMove);
|
||||
return () => window.removeEventListener("mousemove", handleMouseMove);
|
||||
}, [mouseX, mouseY]);
|
||||
|
||||
// Prevent hydration mismatch
|
||||
const [mounted, setMounted] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
setMounted(true);
|
||||
}, []);
|
||||
|
||||
if (!mounted) return null;
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 overflow-hidden pointer-events-none z-0">
|
||||
{/* Mint blob - top left */}
|
||||
<motion.div
|
||||
className="absolute top-[-10%] left-[-10%] w-[40vw] h-[40vw] bg-liquid-mint/40 rounded-full blur-[100px] mix-blend-multiply"
|
||||
style={{ x: x1, y: y1 }}
|
||||
animate={{
|
||||
scale: [1, 1.15, 1],
|
||||
rotate: [0, 45, 0],
|
||||
}}
|
||||
transition={{
|
||||
duration: 40,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* Lavender blob - top right */}
|
||||
<motion.div
|
||||
className="absolute top-[10%] right-[-5%] w-[35vw] h-[35vw] bg-liquid-lavender/35 rounded-full blur-[100px] mix-blend-multiply"
|
||||
style={{ x: x2, y: y2 }}
|
||||
animate={{
|
||||
scale: [1, 1.1, 1],
|
||||
rotate: [0, -30, 0],
|
||||
}}
|
||||
transition={{
|
||||
duration: 45,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* Rose blob - bottom left */}
|
||||
<motion.div
|
||||
className="absolute bottom-[-5%] left-[15%] w-[45vw] h-[45vw] bg-liquid-rose/35 rounded-full blur-[100px] mix-blend-multiply"
|
||||
style={{ x: x3, y: y3 }}
|
||||
animate={{
|
||||
scale: [1, 1.2, 1],
|
||||
rotate: [0, 60, 0],
|
||||
}}
|
||||
transition={{
|
||||
duration: 50,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* Peach blob - middle right */}
|
||||
<motion.div
|
||||
className="absolute top-[40%] right-[10%] w-[30vw] h-[30vw] bg-orange-200/30 rounded-full blur-[120px] mix-blend-multiply"
|
||||
style={{ x: x4, y: y4 }}
|
||||
animate={{
|
||||
scale: [1, 1.25, 1],
|
||||
rotate: [0, -45, 0],
|
||||
}}
|
||||
transition={{
|
||||
duration: 55,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* Blue blob - center */}
|
||||
<motion.div
|
||||
className="absolute top-[50%] left-[40%] w-[38vw] h-[38vw] bg-blue-200/30 rounded-full blur-[110px] mix-blend-multiply"
|
||||
style={{ x: x5, y: y5 }}
|
||||
animate={{
|
||||
scale: [1, 1.18, 1],
|
||||
rotate: [0, 90, 0],
|
||||
}}
|
||||
transition={{
|
||||
duration: 48,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* Pink blob - bottom right */}
|
||||
<motion.div
|
||||
className="absolute bottom-[10%] right-[-8%] w-[32vw] h-[32vw] bg-pink-200/35 rounded-full blur-[100px] mix-blend-multiply"
|
||||
animate={{
|
||||
scale: [1, 1.12, 1],
|
||||
rotate: [0, -60, 0],
|
||||
x: [0, -20, 0],
|
||||
y: [0, 20, 0],
|
||||
}}
|
||||
transition={{
|
||||
duration: 43,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
/>
|
||||
|
||||
{/* Yellow-green blob - top center */}
|
||||
<motion.div
|
||||
className="absolute top-[5%] left-[45%] w-[28vw] h-[28vw] bg-lime-200/30 rounded-full blur-[115px] mix-blend-multiply"
|
||||
animate={{
|
||||
scale: [1, 1.22, 1],
|
||||
rotate: [0, 75, 0],
|
||||
x: [0, 15, 0],
|
||||
y: [0, -15, 0],
|
||||
}}
|
||||
transition={{
|
||||
duration: 52,
|
||||
repeat: Infinity,
|
||||
ease: "easeInOut",
|
||||
repeatType: "reverse",
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default BackgroundBlobs;
|
||||
40
components/ErrorBoundary.tsx
Normal file
40
components/ErrorBoundary.tsx
Normal file
@@ -0,0 +1,40 @@
|
||||
"use client"; // <--- Diese Zeile ist PFLICHT für Error Boundaries!
|
||||
|
||||
import React from "react";
|
||||
|
||||
// Wir nutzen "export default", damit der Import ohne Klammern funktioniert
|
||||
export default class ErrorBoundary extends React.Component<
|
||||
{ children: React.ReactNode },
|
||||
{ hasError: boolean }
|
||||
> {
|
||||
constructor(props: { children: React.ReactNode }) {
|
||||
super(props);
|
||||
this.state = { hasError: false };
|
||||
}
|
||||
|
||||
static getDerivedStateFromError(_error: unknown) {
|
||||
return { hasError: true };
|
||||
}
|
||||
|
||||
componentDidCatch(error: unknown, errorInfo: React.ErrorInfo) {
|
||||
console.error("ErrorBoundary caught an error:", error, errorInfo);
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
return (
|
||||
<div className="p-4 m-4 bg-red-50 border border-red-200 rounded text-red-800">
|
||||
<h2>Something went wrong!</h2>
|
||||
<button
|
||||
className="mt-2 px-4 py-2 bg-red-600 text-white rounded hover:bg-red-700"
|
||||
onClick={() => this.setState({ hasError: false })}
|
||||
>
|
||||
Try again
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return this.props.children;
|
||||
}
|
||||
}
|
||||
5
components/LiquidCursor.tsx
Normal file
5
components/LiquidCursor.tsx
Normal file
@@ -0,0 +1,5 @@
|
||||
'use client';
|
||||
|
||||
export const LiquidCursor = () => {
|
||||
return null;
|
||||
};
|
||||
114
docker-compose.staging.yml
Normal file
114
docker-compose.staging.yml
Normal file
@@ -0,0 +1,114 @@
|
||||
# Staging Docker Compose configuration
|
||||
# Deploys automatically on dev/main branch
|
||||
# Uses different ports and container names to avoid conflicts with production
|
||||
|
||||
services:
|
||||
portfolio-staging:
|
||||
image: portfolio-app:staging
|
||||
container_name: portfolio-app-staging
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "3002:3000" # Different port from production (3000) - using 3002 to avoid conflicts
|
||||
environment:
|
||||
- NODE_ENV=staging
|
||||
- DATABASE_URL=postgresql://portfolio_user:portfolio_staging_pass@postgres-staging:5432/portfolio_staging_db?schema=public
|
||||
- REDIS_URL=redis://redis-staging:6379
|
||||
- NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL:-https://staging.dk0.dev}
|
||||
- MY_EMAIL=${MY_EMAIL:-contact@dk0.dev}
|
||||
- MY_INFO_EMAIL=${MY_INFO_EMAIL:-info@dk0.dev}
|
||||
- MY_PASSWORD=${MY_PASSWORD}
|
||||
- MY_INFO_PASSWORD=${MY_INFO_PASSWORD}
|
||||
- ADMIN_BASIC_AUTH=${ADMIN_BASIC_AUTH:-admin:staging_password}
|
||||
- LOG_LEVEL=debug
|
||||
- N8N_WEBHOOK_URL=${N8N_WEBHOOK_URL:-}
|
||||
- N8N_SECRET_TOKEN=${N8N_SECRET_TOKEN:-}
|
||||
volumes:
|
||||
- portfolio_staging_data:/app/.next/cache
|
||||
networks:
|
||||
- portfolio_staging_net
|
||||
depends_on:
|
||||
postgres-staging:
|
||||
condition: service_healthy
|
||||
redis-staging:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 40s
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
memory: 512M
|
||||
cpus: '0.5'
|
||||
reservations:
|
||||
memory: 256M
|
||||
cpus: '0.25'
|
||||
|
||||
postgres-staging:
|
||||
image: postgres:16-alpine
|
||||
container_name: portfolio-postgres-staging
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_DB=portfolio_staging_db
|
||||
- POSTGRES_USER=portfolio_user
|
||||
- POSTGRES_PASSWORD=portfolio_staging_pass
|
||||
volumes:
|
||||
- postgres_staging_data:/var/lib/postgresql/data
|
||||
networks:
|
||||
- portfolio_staging_net
|
||||
ports:
|
||||
- "5434:5432" # Different port from production (5432) - using 5434 to avoid conflicts
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U portfolio_user -d portfolio_staging_db"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 30s
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
memory: 256M
|
||||
cpus: '0.25'
|
||||
reservations:
|
||||
memory: 128M
|
||||
cpus: '0.1'
|
||||
|
||||
redis-staging:
|
||||
image: redis:7-alpine
|
||||
container_name: portfolio-redis-staging
|
||||
restart: unless-stopped
|
||||
command: redis-server --appendonly yes --maxmemory 128mb --maxmemory-policy allkeys-lru
|
||||
volumes:
|
||||
- redis_staging_data:/data
|
||||
networks:
|
||||
- portfolio_staging_net
|
||||
ports:
|
||||
- "6381:6379" # Different port from production (6379) - using 6381 to avoid conflicts
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 30s
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
memory: 128M
|
||||
cpus: '0.25'
|
||||
reservations:
|
||||
memory: 64M
|
||||
cpus: '0.1'
|
||||
|
||||
volumes:
|
||||
portfolio_staging_data:
|
||||
driver: local
|
||||
postgres_staging_data:
|
||||
driver: local
|
||||
redis_staging_data:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
portfolio_staging_net:
|
||||
driver: bridge
|
||||
@@ -1,145 +0,0 @@
|
||||
# Zero-Downtime Deployment Configuration (Fixed)
|
||||
# Uses nginx as load balancer for seamless updates
|
||||
# Fixed to work in Gitea Actions environment
|
||||
|
||||
services:
|
||||
nginx:
|
||||
image: nginx:alpine
|
||||
container_name: portfolio-nginx
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "80:80"
|
||||
- "443:443"
|
||||
volumes:
|
||||
# Use a more robust path that works in CI/CD environments
|
||||
- ./nginx-zero-downtime.conf:/etc/nginx/nginx.conf:ro
|
||||
# Remove default nginx configuration to prevent conflicts
|
||||
- /etc/nginx/conf.d
|
||||
networks:
|
||||
- portfolio_net
|
||||
depends_on:
|
||||
- portfolio-app-1
|
||||
- portfolio-app-2
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost/health"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
# Simple startup command
|
||||
command: >
|
||||
sh -c "
|
||||
rm -rf /etc/nginx/conf.d/*
|
||||
nginx -g 'daemon off;'
|
||||
"
|
||||
|
||||
portfolio-app-1:
|
||||
image: portfolio-app:latest
|
||||
container_name: portfolio-app-1
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=${NODE_ENV:-production}
|
||||
- LOG_LEVEL=${LOG_LEVEL:-info}
|
||||
- DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public
|
||||
- REDIS_URL=redis://redis:6379
|
||||
- NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL}
|
||||
- NEXT_PUBLIC_UMAMI_URL=${NEXT_PUBLIC_UMAMI_URL}
|
||||
- NEXT_PUBLIC_UMAMI_WEBSITE_ID=${NEXT_PUBLIC_UMAMI_WEBSITE_ID}
|
||||
- MY_EMAIL=${MY_EMAIL}
|
||||
- MY_INFO_EMAIL=${MY_INFO_EMAIL}
|
||||
- MY_PASSWORD=${MY_PASSWORD}
|
||||
- MY_INFO_PASSWORD=${MY_INFO_PASSWORD}
|
||||
- ADMIN_BASIC_AUTH=${ADMIN_BASIC_AUTH}
|
||||
volumes:
|
||||
- portfolio_data:/app/.next/cache
|
||||
networks:
|
||||
- portfolio_net
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
start_period: 30s
|
||||
|
||||
portfolio-app-2:
|
||||
image: portfolio-app:latest
|
||||
container_name: portfolio-app-2
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=${NODE_ENV:-production}
|
||||
- LOG_LEVEL=${LOG_LEVEL:-info}
|
||||
- DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public
|
||||
- REDIS_URL=redis://redis:6379
|
||||
- NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL}
|
||||
- NEXT_PUBLIC_UMAMI_URL=${NEXT_PUBLIC_UMAMI_URL}
|
||||
- NEXT_PUBLIC_UMAMI_WEBSITE_ID=${NEXT_PUBLIC_UMAMI_WEBSITE_ID}
|
||||
- MY_EMAIL=${MY_EMAIL}
|
||||
- MY_INFO_EMAIL=${MY_INFO_EMAIL}
|
||||
- MY_PASSWORD=${MY_PASSWORD}
|
||||
- MY_INFO_PASSWORD=${MY_INFO_PASSWORD}
|
||||
- ADMIN_BASIC_AUTH=${ADMIN_BASIC_AUTH}
|
||||
volumes:
|
||||
- portfolio_data:/app/.next/cache
|
||||
networks:
|
||||
- portfolio_net
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
start_period: 30s
|
||||
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
container_name: portfolio-postgres
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_DB=portfolio_db
|
||||
- POSTGRES_USER=portfolio_user
|
||||
- POSTGRES_PASSWORD=portfolio_pass
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
networks:
|
||||
- portfolio_net
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U portfolio_user -d portfolio_db"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 30s
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
container_name: portfolio-redis
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
networks:
|
||||
- portfolio_net
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 30s
|
||||
|
||||
volumes:
|
||||
portfolio_data:
|
||||
driver: local
|
||||
postgres_data:
|
||||
driver: local
|
||||
redis_data:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
portfolio_net:
|
||||
driver: bridge
|
||||
@@ -1,135 +0,0 @@
|
||||
# Zero-Downtime Deployment Configuration
|
||||
# Uses nginx as load balancer for seamless updates
|
||||
|
||||
services:
|
||||
nginx:
|
||||
image: nginx:alpine
|
||||
container_name: portfolio-nginx
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "80:80"
|
||||
- "443:443"
|
||||
volumes:
|
||||
- ./nginx-zero-downtime.conf:/etc/nginx/nginx.conf:ro
|
||||
networks:
|
||||
- portfolio_net
|
||||
depends_on:
|
||||
- portfolio-app-1
|
||||
- portfolio-app-2
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost/health"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
|
||||
portfolio-app-1:
|
||||
image: portfolio-app:latest
|
||||
container_name: portfolio-app-1
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=${NODE_ENV:-production}
|
||||
- LOG_LEVEL=${LOG_LEVEL:-info}
|
||||
- DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public
|
||||
- REDIS_URL=redis://redis:6379
|
||||
- NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL}
|
||||
- NEXT_PUBLIC_UMAMI_URL=${NEXT_PUBLIC_UMAMI_URL}
|
||||
- NEXT_PUBLIC_UMAMI_WEBSITE_ID=${NEXT_PUBLIC_UMAMI_WEBSITE_ID}
|
||||
- MY_EMAIL=${MY_EMAIL}
|
||||
- MY_INFO_EMAIL=${MY_INFO_EMAIL}
|
||||
- MY_PASSWORD=${MY_PASSWORD}
|
||||
- MY_INFO_PASSWORD=${MY_INFO_PASSWORD}
|
||||
- ADMIN_BASIC_AUTH=${ADMIN_BASIC_AUTH}
|
||||
volumes:
|
||||
- portfolio_data:/app/.next/cache
|
||||
networks:
|
||||
- portfolio_net
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
start_period: 30s
|
||||
|
||||
portfolio-app-2:
|
||||
image: portfolio-app:latest
|
||||
container_name: portfolio-app-2
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=${NODE_ENV:-production}
|
||||
- LOG_LEVEL=${LOG_LEVEL:-info}
|
||||
- DATABASE_URL=postgresql://portfolio_user:portfolio_pass@postgres:5432/portfolio_db?schema=public
|
||||
- REDIS_URL=redis://redis:6379
|
||||
- NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL}
|
||||
- NEXT_PUBLIC_UMAMI_URL=${NEXT_PUBLIC_UMAMI_URL}
|
||||
- NEXT_PUBLIC_UMAMI_WEBSITE_ID=${NEXT_PUBLIC_UMAMI_WEBSITE_ID}
|
||||
- MY_EMAIL=${MY_EMAIL}
|
||||
- MY_INFO_EMAIL=${MY_INFO_EMAIL}
|
||||
- MY_PASSWORD=${MY_PASSWORD}
|
||||
- MY_INFO_PASSWORD=${MY_INFO_PASSWORD}
|
||||
- ADMIN_BASIC_AUTH=${ADMIN_BASIC_AUTH}
|
||||
volumes:
|
||||
- portfolio_data:/app/.next/cache
|
||||
networks:
|
||||
- portfolio_net
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
start_period: 30s
|
||||
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
container_name: portfolio-postgres
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_DB=portfolio_db
|
||||
- POSTGRES_USER=portfolio_user
|
||||
- POSTGRES_PASSWORD=portfolio_pass
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
networks:
|
||||
- portfolio_net
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U portfolio_user -d portfolio_db"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 30s
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
container_name: portfolio-redis
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
networks:
|
||||
- portfolio_net
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 30s
|
||||
|
||||
volumes:
|
||||
portfolio_data:
|
||||
driver: local
|
||||
postgres_data:
|
||||
driver: local
|
||||
redis_data:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
portfolio_net:
|
||||
driver: bridge
|
||||
460
docs/ACTIVITY_FEATURES.md
Normal file
460
docs/ACTIVITY_FEATURES.md
Normal file
@@ -0,0 +1,460 @@
|
||||
# 🎨 Activity Feed Features & Animations
|
||||
|
||||
## ✨ Implementierte Features
|
||||
|
||||
### 1. **Dynamische Activity Bubbles**
|
||||
Jede Aktivität hat ihre eigene:
|
||||
- 🎨 Einzigartige Pastellfarben
|
||||
- 🎭 Spezifische Animationen
|
||||
- 🔗 Interaktive Links
|
||||
- 💫 Hintergrundeffekte
|
||||
|
||||
---
|
||||
|
||||
## 🎬 Animations-Typen
|
||||
|
||||
### 🔨 Coding Activity
|
||||
**Visueller Effekt:**
|
||||
- **Matrix Rain** im Hintergrund (grüne 0/1 Zahlen fallen)
|
||||
- Rotierendes Terminal-Icon
|
||||
- Grüner Pulsing-Dot
|
||||
|
||||
**Daten:**
|
||||
```json
|
||||
{
|
||||
"type": "coding",
|
||||
"details": "Building Portfolio Website",
|
||||
"project": "portfolio",
|
||||
"language": "TypeScript",
|
||||
"repo": "https://github.com/user/repo",
|
||||
"link": "https://github.com/user/repo/commit/abc123"
|
||||
}
|
||||
```
|
||||
|
||||
**Animation:**
|
||||
- 15 vertikal fallende Spalten mit 0/1 Zeichen
|
||||
- Unterschiedliche Geschwindigkeiten (2-5s)
|
||||
- Opacity fade in/out
|
||||
- Mint-grüne Farbe (liquid-mint)
|
||||
|
||||
---
|
||||
|
||||
### 🎵 Music Activity (Now Playing)
|
||||
**Visueller Effekt:**
|
||||
- **Sound Waves** (5 animierte Balken)
|
||||
- Rotierendes Album Cover (10s pro Rotation)
|
||||
- Pulsierendes Headphone-Icon
|
||||
- Progress Bar
|
||||
|
||||
**Daten:**
|
||||
```json
|
||||
{
|
||||
"isPlaying": true,
|
||||
"track": "Song Title",
|
||||
"artist": "Artist Name",
|
||||
"album": "Album Name",
|
||||
"progress": 45,
|
||||
"albumArt": "https://url-to-image.jpg",
|
||||
"spotifyUrl": "https://open.spotify.com/track/..."
|
||||
}
|
||||
```
|
||||
|
||||
**Features:**
|
||||
- ✅ Link "Listen with me" → Spotify Track
|
||||
- ✅ Live Progress Bar (0-100%)
|
||||
- ✅ Verschwindet automatisch wenn Musik stoppt
|
||||
- ✅ Album Cover rotiert kontinuierlich
|
||||
|
||||
**Animation:**
|
||||
- 5 vertikale Balken bewegen sich wellenförmig (20-80% Höhe)
|
||||
- Jeder Balken 0.1s delay
|
||||
- 0.8s Animationsdauer
|
||||
- Rose/Coral Gradient
|
||||
|
||||
---
|
||||
|
||||
### 🏃 Running Activity
|
||||
**Visueller Effekt:**
|
||||
- **Animierter Läufer-Emoji** (🏃) bewegt sich von links nach rechts
|
||||
- Horizontale "Laufbahn" als Linie
|
||||
- Lime-grüne Farbpalette
|
||||
|
||||
**Daten:**
|
||||
```json
|
||||
{
|
||||
"type": "running",
|
||||
"details": "Morning run - 5km",
|
||||
"link": "https://strava.com/activities/..."
|
||||
}
|
||||
```
|
||||
|
||||
**Animation:**
|
||||
- Läufer bewegt sich linear von -10% bis 110% (3s)
|
||||
- Kontinuierliche Wiederholung
|
||||
- Unendlich Loop
|
||||
|
||||
---
|
||||
|
||||
### 🎮 Gaming Activity
|
||||
**Visueller Effekt:**
|
||||
- **Particle System** (10 schwebende Partikel)
|
||||
- Peach/Orange Farbschema
|
||||
- Gamepad-Icon
|
||||
|
||||
**Daten:**
|
||||
```json
|
||||
{
|
||||
"game": "Elden Ring",
|
||||
"platform": "steam",
|
||||
"status": "playing"
|
||||
}
|
||||
```
|
||||
|
||||
**Animation:**
|
||||
- 10 Partikel an zufälligen Positionen
|
||||
- Scale animation (0 → 1 → 0)
|
||||
- Opacity fade
|
||||
- Unterschiedliche Delays (0-2s)
|
||||
- 2s Gesamtdauer, unendlich
|
||||
|
||||
---
|
||||
|
||||
### 📺 Watching Activity
|
||||
**Visueller Effekt:**
|
||||
- **TV Scan Lines** (retro CRT-Effekt)
|
||||
- Lavender/Pink Gradient
|
||||
- TV-Icon
|
||||
|
||||
**Daten:**
|
||||
```json
|
||||
{
|
||||
"title": "Breaking Bad S05E14",
|
||||
"platform": "netflix",
|
||||
"type": "series"
|
||||
}
|
||||
```
|
||||
|
||||
**Animation:**
|
||||
- Horizontaler Gradient-Balken (8px hoch)
|
||||
- Bewegt sich von -100% bis 200% vertikal
|
||||
- 3s linear
|
||||
- Weiß/transparent gradient
|
||||
- Simuliert alte TV-Bildschirme
|
||||
|
||||
---
|
||||
|
||||
### 😊 Status & Mood
|
||||
**Visueller Effekt:**
|
||||
- **Wackelndes Emoji** (rotate: 0° → 10° → -10° → 0°)
|
||||
- Lavender/Pink Gradient
|
||||
- Custom Message
|
||||
|
||||
**Daten:**
|
||||
```json
|
||||
{
|
||||
"mood": "💻",
|
||||
"customMessage": "Deep work mode - Building features"
|
||||
}
|
||||
```
|
||||
|
||||
**Animation:**
|
||||
- Emoji schwingt hin und her
|
||||
- 2s Dauer, easeInOut
|
||||
- Unendliche Wiederholung
|
||||
- Subtile Bewegung (-10° bis +10°)
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Interaktive Elemente
|
||||
|
||||
### 1. **Spotify "Listen with me"**
|
||||
```tsx
|
||||
<a href={spotifyUrl} target="_blank">
|
||||
<Waves size={10} />
|
||||
Listen with me
|
||||
</a>
|
||||
```
|
||||
- Öffnet Spotify Web Player
|
||||
- Direkt zum aktuellen Song
|
||||
- Kleine Wellen-Icon
|
||||
|
||||
### 2. **GitHub "View Repo"**
|
||||
```tsx
|
||||
<a href={repoUrl} target="_blank">
|
||||
View <ExternalLink size={10} />
|
||||
</a>
|
||||
```
|
||||
- Link zum Repository
|
||||
- External Link Icon
|
||||
- Hover Underline
|
||||
|
||||
### 3. **Live Progress Bar**
|
||||
- Dynamisch basiert auf Spotify API
|
||||
- Smooth animation (0.5s transition)
|
||||
- Rose → Coral Gradient
|
||||
|
||||
---
|
||||
|
||||
## 🎨 Farbschema pro Activity
|
||||
|
||||
| Activity | Background Gradient | Border | Pulse Dot |
|
||||
|----------|-------------------|--------|-----------|
|
||||
| Coding | `from-liquid-mint/20 to-liquid-sky/20` | `border-liquid-mint/40` | Green |
|
||||
| Music | `from-liquid-rose/20 to-liquid-coral/20` | `border-liquid-rose/40` | Red |
|
||||
| Gaming | `from-liquid-peach/20 to-liquid-yellow/20` | `border-liquid-peach/40` | Orange |
|
||||
| Watching | `from-liquid-lavender/20 to-liquid-pink/20` | `border-liquid-lavender/40` | Purple |
|
||||
| Running | `from-liquid-lime/20 to-liquid-mint/20` | `border-liquid-lime/40` | Lime |
|
||||
| Reading | `from-liquid-teal/20 to-liquid-lime/20` | `border-liquid-teal/40` | Teal |
|
||||
|
||||
---
|
||||
|
||||
## 💬 AI Chatbot Features
|
||||
|
||||
### Design
|
||||
- **Gradient Header**: Mint → Sky
|
||||
- **Message Bubbles**:
|
||||
- User: Stone-900 gradient, rounded-tr-none
|
||||
- AI: White → Stone-50 gradient, rounded-tl-none
|
||||
- **Sparkles Icon**: Animated AI indicator
|
||||
- **Thinking State**: Rotating Loader2 mit liquid-mint Farbe
|
||||
|
||||
### Features
|
||||
- ✅ Real-time responses via n8n
|
||||
- ✅ Fallback responses bei Offline
|
||||
- ✅ Context über Dennis
|
||||
- ✅ Smooth animations
|
||||
- ✅ Loading states
|
||||
- ✅ Error handling
|
||||
|
||||
### Example Responses
|
||||
```
|
||||
"Great question! Dennis specializes in..."
|
||||
"Dennis loves self-hosting! He manages..."
|
||||
"Check out his projects to see what he's building!"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎭 Zusätzliche Animation-Ideen
|
||||
|
||||
### Noch nicht implementiert (Ideen):
|
||||
|
||||
#### 1. **Coffee Counter ☕**
|
||||
```tsx
|
||||
{coffeeCount > 0 && (
|
||||
<motion.div
|
||||
animate={{
|
||||
y: [0, -5, 0],
|
||||
rotate: [0, -5, 5, 0]
|
||||
}}
|
||||
>
|
||||
☕ × {coffeeCount}
|
||||
</motion.div>
|
||||
)}
|
||||
```
|
||||
|
||||
#### 2. **Code Streak 🔥**
|
||||
```tsx
|
||||
<motion.div>
|
||||
🔥 {consecutiveDays} day streak!
|
||||
</motion.div>
|
||||
```
|
||||
|
||||
#### 3. **Live Visitor Count 👥**
|
||||
```tsx
|
||||
<motion.div
|
||||
animate={{ scale: [1, 1.05, 1] }}
|
||||
>
|
||||
👥 {liveVisitors} online
|
||||
</motion.div>
|
||||
```
|
||||
|
||||
#### 4. **Deployment Status 🚀**
|
||||
```tsx
|
||||
{isDeploying && (
|
||||
<motion.div>
|
||||
<Rocket className="animate-bounce" />
|
||||
Deploying...
|
||||
</motion.div>
|
||||
)}
|
||||
```
|
||||
|
||||
#### 5. **Weather Integration 🌤️**
|
||||
```tsx
|
||||
<motion.div>
|
||||
{weatherEmoji} {temperature}°C in Osnabrück
|
||||
</motion.div>
|
||||
```
|
||||
|
||||
#### 6. **Pomodoro Timer 🍅**
|
||||
```tsx
|
||||
{pomodoroActive && (
|
||||
<CircularProgress value={timeLeft} />
|
||||
)}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔄 Auto-Clear Logic
|
||||
|
||||
### Musik
|
||||
- ✅ Verschwindet automatisch wenn `is_playing = false`
|
||||
- ✅ n8n checkt alle 30s via Spotify API
|
||||
- ✅ Database Update wenn gestoppt
|
||||
|
||||
### Aktivitäten
|
||||
- ✅ Verfallen nach 2 Stunden
|
||||
- ✅ Check in API Route: `hoursSinceUpdate < 2`
|
||||
- ✅ Optionaler n8n Cleanup-Workflow
|
||||
|
||||
### Gaming
|
||||
- ✅ Basiert auf Discord Presence
|
||||
- ✅ Auto-clear wenn Spiel beendet
|
||||
|
||||
---
|
||||
|
||||
## 📱 Responsive Design
|
||||
|
||||
### Mobile (< 768px)
|
||||
- Bubbles: `max-w-[calc(100vw-6rem)]`
|
||||
- Stacked vertikal
|
||||
- Chat: Full-width minus padding
|
||||
|
||||
### Desktop (> 768px)
|
||||
- Fixed `bottom-6 right-6`
|
||||
- Bubbles: `max-w-xs` (320px)
|
||||
- Chat: 384px breit
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Performance
|
||||
|
||||
### Optimierungen
|
||||
- ✅ `will-change: transform` für Animationen
|
||||
- ✅ `AnimatePresence` für smooth exit
|
||||
- ✅ `overflow: hidden` auf animated containers
|
||||
- ✅ `pointer-events-none` auf Hintergrund-Effekte
|
||||
- ✅ CSS `backdrop-filter` statt JS blur
|
||||
- ✅ Relative Z-Index (10, 20, 9999)
|
||||
|
||||
### Polling
|
||||
- Frontend: Alle 30s (konfigurierbar)
|
||||
- Spotify: Alle 30s (n8n)
|
||||
- GitHub: Echtzeit via Webhooks
|
||||
- Discord: Alle 60s
|
||||
|
||||
---
|
||||
|
||||
## 🎨 Neue Activity hinzufügen
|
||||
|
||||
### 1. **Backend (Database)**
|
||||
```sql
|
||||
ALTER TABLE activity_status
|
||||
ADD COLUMN new_activity_field VARCHAR(255);
|
||||
```
|
||||
|
||||
### 2. **n8n Workflow**
|
||||
```javascript
|
||||
// Update database
|
||||
UPDATE activity_status SET
|
||||
new_activity_field = 'value'
|
||||
WHERE id = 1;
|
||||
```
|
||||
|
||||
### 3. **Frontend (ActivityFeed.tsx)**
|
||||
```tsx
|
||||
// Add to interface
|
||||
interface ActivityData {
|
||||
newActivity: {
|
||||
field: string;
|
||||
} | null;
|
||||
}
|
||||
|
||||
// Add color scheme
|
||||
const activityColors = {
|
||||
newActivity: {
|
||||
bg: "from-liquid-purple/20 to-liquid-pink/20",
|
||||
border: "border-liquid-purple/40",
|
||||
text: "text-liquid-purple",
|
||||
pulse: "bg-purple-500",
|
||||
}
|
||||
};
|
||||
|
||||
// Add animation component
|
||||
const NewActivityAnimation = () => {
|
||||
return (
|
||||
<div className="absolute inset-0">
|
||||
{/* Your custom animation */}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
// Render function
|
||||
const renderNewActivity = () => {
|
||||
if (!data?.newActivity) return null;
|
||||
|
||||
return (
|
||||
<motion.div className="...">
|
||||
<NewActivityAnimation />
|
||||
{/* Content */}
|
||||
</motion.div>
|
||||
);
|
||||
};
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 Analytics Integration
|
||||
|
||||
### Track Activity Views
|
||||
```typescript
|
||||
// In ActivityFeed
|
||||
useEffect(() => {
|
||||
if (data?.activity) {
|
||||
fetch('/api/analytics/activity-view', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
type: data.activity.type
|
||||
})
|
||||
});
|
||||
}
|
||||
}, [data?.activity]);
|
||||
```
|
||||
|
||||
### Popular Activities Dashboard
|
||||
```sql
|
||||
SELECT
|
||||
activity_type,
|
||||
COUNT(*) as views,
|
||||
AVG(duration) as avg_duration
|
||||
FROM activity_history
|
||||
WHERE created_at > NOW() - INTERVAL '7 days'
|
||||
GROUP BY activity_type
|
||||
ORDER BY views DESC;
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Nächste Steps
|
||||
|
||||
1. ✅ Datenbank Setup (`setup_activity_status.sql`)
|
||||
2. ✅ n8n Workflows importieren
|
||||
3. ⏳ Spotify OAuth konfigurieren
|
||||
4. ⏳ GitHub Webhooks setup
|
||||
5. ⏳ Activity Dashboard testen
|
||||
6. ⏳ AI Chatbot mit OpenAI verbinden
|
||||
7. ⏳ Auto-Clear Workflows aktivieren
|
||||
|
||||
---
|
||||
|
||||
## 🎨 Design Philosophy
|
||||
|
||||
- **Smooth**: Alle Animationen 0.5-1s, nie schneller
|
||||
- **Subtle**: Opacity 20-40%, nie zu grell
|
||||
- **Consistent**: Gleiche Easing-Function überall
|
||||
- **Performant**: GPU-beschleunigt (transform, opacity)
|
||||
- **Delightful**: Kleine Details machen den Unterschied
|
||||
|
||||
---
|
||||
|
||||
**Happy Coding! 🚀**
|
||||
470
docs/DYNAMIC_ACTIVITY_MANAGEMENT.md
Normal file
470
docs/DYNAMIC_ACTIVITY_MANAGEMENT.md
Normal file
@@ -0,0 +1,470 @@
|
||||
# 🎛️ Dynamic Activity Management - No Rebuild Required!
|
||||
|
||||
## Übersicht
|
||||
|
||||
Dieses System erlaubt dir, alle Aktivitäten dynamisch zu steuern **ohne die Website neu zu bauen**. Alle Änderungen werden in Echtzeit über die Datenbank und n8n gesteuert.
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Konzept: Zentrales Management
|
||||
|
||||
```
|
||||
┌─────────────────┐
|
||||
│ n8n Dashboard │ ← Du steuerst hier alles
|
||||
└────────┬────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────┐
|
||||
│ PostgreSQL │ ← Daten werden hier gespeichert
|
||||
└────────┬────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────┐
|
||||
│ API Route │ ← Website liest alle 30s
|
||||
└────────┬────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────┐
|
||||
│ ActivityFeed UI │ ← Besucher sehen live updates
|
||||
└─────────────────┘
|
||||
```
|
||||
|
||||
**Vorteile:**
|
||||
- ✅ Keine Website-Rebuild notwendig
|
||||
- ✅ Echtzeit-Updates (30 Sekunden)
|
||||
- ✅ Volle Kontrolle via n8n
|
||||
- ✅ Historische Daten verfügbar
|
||||
- ✅ Multiple Steuerungsmöglichkeiten
|
||||
|
||||
---
|
||||
|
||||
## 🎮 Management Optionen
|
||||
|
||||
### Option 1: n8n Dashboard UI ⭐ EMPFOHLEN
|
||||
|
||||
Erstelle ein simples n8n Workflow-Dashboard mit Webhook-Buttons:
|
||||
|
||||
**Workflow: "Activity Manager Dashboard"**
|
||||
```json
|
||||
{
|
||||
"nodes": [
|
||||
{
|
||||
"name": "HTTP Server",
|
||||
"type": "n8n-nodes-base.webhook",
|
||||
"parameters": {
|
||||
"path": "activity-dashboard",
|
||||
"method": "GET",
|
||||
"responseMode": "responseNode",
|
||||
"options": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "HTML Dashboard",
|
||||
"type": "n8n-nodes-base.respondToWebhook",
|
||||
"parameters": {
|
||||
"responseBody": "=<html>\n<head>\n <title>Activity Manager</title>\n <style>\n body { font-family: system-ui; max-width: 800px; margin: 50px auto; padding: 20px; }\n .activity-section { background: #f5f5f5; padding: 20px; margin: 20px 0; border-radius: 8px; }\n button { background: #333; color: white; padding: 10px 20px; margin: 5px; border: none; border-radius: 5px; cursor: pointer; }\n button:hover { background: #555; }\n input, select, textarea { padding: 8px; margin: 5px 0; border: 1px solid #ddd; border-radius: 4px; width: 100%; }\n .status { display: inline-block; width: 12px; height: 12px; border-radius: 50%; }\n .active { background: #4ade80; }\n .inactive { background: #ef4444; }\n </style>\n</head>\n<body>\n <h1>🎛️ Activity Manager</h1>\n \n <div class=\"activity-section\">\n <h2>🎵 Music Control</h2>\n <p>Status: <span class=\"status active\"></span> Auto-syncing from Spotify</p>\n <button onclick=\"fetch('/webhook/stop-music', {method:'POST'})\">Stop Music Display</button>\n </div>\n\n <div class=\"activity-section\">\n <h2>💻 Coding Activity</h2>\n <input type=\"text\" id=\"project\" placeholder=\"Project name\">\n <input type=\"text\" id=\"language\" placeholder=\"Language (e.g., TypeScript)\">\n <input type=\"text\" id=\"repo\" placeholder=\"GitHub Repo URL\">\n <button onclick=\"updateCoding()\">Update Coding Status</button>\n <button onclick=\"clearCoding()\">Clear</button>\n </div>\n\n <div class=\"activity-section\">\n <h2>🎮 Gaming</h2>\n <input type=\"text\" id=\"game\" placeholder=\"Game name\">\n <select id=\"platform\">\n <option>steam</option>\n <option>playstation</option>\n <option>xbox</option>\n </select>\n <button onclick=\"updateGaming()\">Start Gaming</button>\n <button onclick=\"stopGaming()\">Stop Gaming</button>\n </div>\n\n <div class=\"activity-section\">\n <h2>😊 Mood & Status</h2>\n <input type=\"text\" id=\"mood\" placeholder=\"Emoji (e.g., 😊, 💻, 🎮)\" maxlength=\"2\">\n <textarea id=\"message\" placeholder=\"Custom message\" rows=\"2\"></textarea>\n <button onclick=\"updateStatus()\">Update Status</button>\n </div>\n\n <div class=\"activity-section\">\n <h2>🏃 Manual Activities</h2>\n <select id=\"activity-type\">\n <option value=\"running\">Running</option>\n <option value=\"reading\">Reading</option>\n <option value=\"watching\">Watching</option>\n </select>\n <input type=\"text\" id=\"activity-details\" placeholder=\"Details\">\n <button onclick=\"updateActivity()\">Start Activity</button>\n <button onclick=\"clearActivity()\">Clear</button>\n </div>\n\n <div class=\"activity-section\">\n <h2>🧹 Quick Actions</h2>\n <button onclick=\"clearAll()\">Clear All Activities</button>\n <button onclick=\"setAFK()\">Set AFK</button>\n <button onclick=\"setFocusMode()\">Focus Mode (DND)</button>\n </div>\n\n <script>\n function updateCoding() {\n fetch('/webhook/update-activity', {\n method: 'POST',\n headers: {'Content-Type': 'application/json'},\n body: JSON.stringify({\n type: 'coding',\n project: document.getElementById('project').value,\n language: document.getElementById('language').value,\n repo: document.getElementById('repo').value\n })\n }).then(() => alert('✅ Updated!'));\n }\n\n function updateGaming() {\n fetch('/webhook/update-activity', {\n method: 'POST',\n headers: {'Content-Type': 'application/json'},\n body: JSON.stringify({\n type: 'gaming',\n game: document.getElementById('game').value,\n platform: document.getElementById('platform').value\n })\n }).then(() => alert('✅ Gaming status updated!'));\n }\n\n function updateStatus() {\n fetch('/webhook/update-status', {\n method: 'POST',\n headers: {'Content-Type': 'application/json'},\n body: JSON.stringify({\n mood: document.getElementById('mood').value,\n message: document.getElementById('message').value\n })\n }).then(() => alert('✅ Status updated!'));\n }\n\n function clearAll() {\n if(confirm('Clear all activities?')) {\n fetch('/webhook/clear-all', {method: 'POST'})\n .then(() => alert('✅ All cleared!'));\n }\n }\n\n function setAFK() {\n fetch('/webhook/update-status', {\n method: 'POST',\n headers: {'Content-Type': 'application/json'},\n body: JSON.stringify({mood: '💤', message: 'AFK - Be right back'})\n }).then(() => alert('✅ AFK mode activated!'));\n }\n </script>\n</body>\n</html>"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
**Zugriff:**
|
||||
```
|
||||
https://your-n8n-instance.com/webhook/activity-dashboard
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Option 2: Discord Bot Commands
|
||||
|
||||
Erstelle einen Discord Bot für schnelle Updates:
|
||||
|
||||
**Commands:**
|
||||
```
|
||||
!status 💻 Working on new features
|
||||
!coding Portfolio Next.js
|
||||
!music <automatic from spotify>
|
||||
!gaming Elden Ring
|
||||
!clear
|
||||
!afk
|
||||
```
|
||||
|
||||
**n8n Workflow:**
|
||||
```json
|
||||
{
|
||||
"nodes": [
|
||||
{
|
||||
"name": "Discord Webhook",
|
||||
"type": "n8n-nodes-base.webhook",
|
||||
"parameters": {
|
||||
"path": "discord-bot"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Parse Command",
|
||||
"type": "n8n-nodes-base.function",
|
||||
"parameters": {
|
||||
"functionCode": "const message = items[0].json.content;\nconst [command, ...args] = message.split(' ');\n\nswitch(command) {\n case '!status':\n return [{\n json: {\n action: 'update_status',\n mood: args[0],\n message: args.slice(1).join(' ')\n }\n }];\n \n case '!coding':\n return [{\n json: {\n action: 'update_activity',\n type: 'coding',\n details: args.join(' ')\n }\n }];\n \n case '!clear':\n return [{\n json: { action: 'clear_all' }\n }];\n}\n\nreturn [{ json: {} }];"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Update Database",
|
||||
"type": "n8n-nodes-base.postgres"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Option 3: Mobile App / Shortcut
|
||||
|
||||
**iOS Shortcuts:**
|
||||
```
|
||||
1. "Start Coding" → POST to n8n webhook
|
||||
2. "Finished Work" → Clear activity
|
||||
3. "Set Mood" → Update status
|
||||
```
|
||||
|
||||
**Android Tasker:**
|
||||
- Similar webhooks
|
||||
- Location-based triggers
|
||||
- Time-based automation
|
||||
|
||||
---
|
||||
|
||||
### Option 4: CLI Tool
|
||||
|
||||
Erstelle ein simples CLI Tool:
|
||||
|
||||
```bash
|
||||
#!/bin/bash
|
||||
# activity.sh
|
||||
|
||||
N8N_URL="https://your-n8n-instance.com"
|
||||
|
||||
case "$1" in
|
||||
status)
|
||||
curl -X POST "$N8N_URL/webhook/update-status" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"mood\":\"$2\",\"message\":\"$3\"}"
|
||||
;;
|
||||
coding)
|
||||
curl -X POST "$N8N_URL/webhook/update-activity" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"type\":\"coding\",\"project\":\"$2\",\"language\":\"$3\"}"
|
||||
;;
|
||||
clear)
|
||||
curl -X POST "$N8N_URL/webhook/clear-all"
|
||||
;;
|
||||
*)
|
||||
echo "Usage: activity.sh [status|coding|clear] [args]"
|
||||
;;
|
||||
esac
|
||||
```
|
||||
|
||||
**Usage:**
|
||||
```bash
|
||||
./activity.sh status 💻 "Deep work mode"
|
||||
./activity.sh coding "Portfolio" "TypeScript"
|
||||
./activity.sh clear
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔄 Automatische Sync-Workflows
|
||||
|
||||
### Musik geht weg wenn nicht mehr läuft
|
||||
|
||||
**n8n Workflow: "Spotify Auto-Clear"**
|
||||
```json
|
||||
{
|
||||
"nodes": [
|
||||
{
|
||||
"name": "Check Every 30s",
|
||||
"type": "n8n-nodes-base.cron",
|
||||
"parameters": {
|
||||
"cronExpression": "*/30 * * * * *"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Get Spotify Status",
|
||||
"type": "n8n-nodes-base.httpRequest",
|
||||
"parameters": {
|
||||
"url": "https://api.spotify.com/v1/me/player/currently-playing"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Check If Playing",
|
||||
"type": "n8n-nodes-base.if",
|
||||
"parameters": {
|
||||
"conditions": {
|
||||
"boolean": [
|
||||
{
|
||||
"value1": "={{$json.is_playing}}",
|
||||
"value2": false
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Clear Music from Database",
|
||||
"type": "n8n-nodes-base.postgres",
|
||||
"parameters": {
|
||||
"operation": "executeQuery",
|
||||
"query": "UPDATE activity_status SET music_playing = FALSE, music_track = NULL, music_artist = NULL, music_album = NULL, music_album_art = NULL, music_progress = NULL WHERE id = 1"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
### Auto-Clear nach Zeit
|
||||
|
||||
**n8n Workflow: "Activity Timeout"**
|
||||
```javascript
|
||||
// Function Node: Check Activity Age
|
||||
const lastUpdate = new Date(items[0].json.updated_at);
|
||||
const now = new Date();
|
||||
const hoursSinceUpdate = (now - lastUpdate) / (1000 * 60 * 60);
|
||||
|
||||
// Clear activity if older than 2 hours
|
||||
if (hoursSinceUpdate > 2) {
|
||||
return [{
|
||||
json: {
|
||||
should_clear: true,
|
||||
reason: `Activity too old (${hoursSinceUpdate.toFixed(1)} hours)`
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
return [{ json: { should_clear: false } }];
|
||||
```
|
||||
|
||||
### Smart Activity Detection
|
||||
|
||||
**Workflow: "Detect Coding from Git Commits"**
|
||||
```javascript
|
||||
// When you push to GitHub
|
||||
const commit = items[0].json;
|
||||
const repo = commit.repository.name;
|
||||
const message = commit.head_commit.message;
|
||||
|
||||
// Detect language from files
|
||||
const files = commit.head_commit.modified;
|
||||
const language = files[0]?.split('.').pop(); // Get extension
|
||||
|
||||
return [{
|
||||
json: {
|
||||
activity_type: 'coding',
|
||||
activity_details: message,
|
||||
activity_project: repo,
|
||||
activity_language: language,
|
||||
activity_repo: commit.repository.html_url,
|
||||
link: commit.head_commit.url
|
||||
}
|
||||
}];
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 Activity Analytics Dashboard
|
||||
|
||||
**Workflow: "Activity History & Stats"**
|
||||
|
||||
Speichere Historie in separater Tabelle:
|
||||
|
||||
```sql
|
||||
CREATE TABLE activity_history (
|
||||
id SERIAL PRIMARY KEY,
|
||||
activity_type VARCHAR(50),
|
||||
details TEXT,
|
||||
duration INTEGER, -- in minutes
|
||||
started_at TIMESTAMP,
|
||||
ended_at TIMESTAMP,
|
||||
created_at TIMESTAMP DEFAULT NOW()
|
||||
);
|
||||
|
||||
-- View für Statistiken
|
||||
CREATE VIEW activity_stats AS
|
||||
SELECT
|
||||
activity_type,
|
||||
COUNT(*) as count,
|
||||
SUM(duration) as total_minutes,
|
||||
AVG(duration) as avg_duration,
|
||||
DATE(created_at) as date
|
||||
FROM activity_history
|
||||
GROUP BY activity_type, DATE(created_at)
|
||||
ORDER BY date DESC;
|
||||
```
|
||||
|
||||
**Dashboard Queries:**
|
||||
```sql
|
||||
-- Heute
|
||||
SELECT * FROM activity_stats WHERE date = CURRENT_DATE;
|
||||
|
||||
-- Diese Woche
|
||||
SELECT activity_type, SUM(total_minutes) as minutes
|
||||
FROM activity_stats
|
||||
WHERE date >= CURRENT_DATE - INTERVAL '7 days'
|
||||
GROUP BY activity_type;
|
||||
|
||||
-- Most Coded Languages
|
||||
SELECT activity_language, COUNT(*)
|
||||
FROM activity_history
|
||||
WHERE activity_type = 'coding'
|
||||
GROUP BY activity_language
|
||||
ORDER BY COUNT(*) DESC;
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎨 Custom Activity Types
|
||||
|
||||
Erweitere das System mit eigenen Activity-Types:
|
||||
|
||||
```sql
|
||||
-- Add custom columns
|
||||
ALTER TABLE activity_status
|
||||
ADD COLUMN custom_activity_type VARCHAR(100),
|
||||
ADD COLUMN custom_activity_data JSONB;
|
||||
|
||||
-- Example: Workout tracking
|
||||
UPDATE activity_status SET
|
||||
custom_activity_type = 'workout',
|
||||
custom_activity_data = '{
|
||||
"exercise": "Push-ups",
|
||||
"reps": 50,
|
||||
"icon": "💪",
|
||||
"color": "orange"
|
||||
}'::jsonb
|
||||
WHERE id = 1;
|
||||
```
|
||||
|
||||
**Frontend Support:**
|
||||
```typescript
|
||||
// In ActivityFeed.tsx
|
||||
interface CustomActivity {
|
||||
type: string;
|
||||
data: {
|
||||
icon: string;
|
||||
color: string;
|
||||
[key: string]: any;
|
||||
};
|
||||
}
|
||||
|
||||
// Render custom activities dynamically
|
||||
if (data.customActivity) {
|
||||
return (
|
||||
<motion.div
|
||||
className={`bg-${data.customActivity.data.color}/20`}
|
||||
>
|
||||
<span>{data.customActivity.data.icon}</span>
|
||||
<span>{data.customActivity.type}</span>
|
||||
{/* Render data fields dynamically */}
|
||||
</motion.div>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔐 Security & Best Practices
|
||||
|
||||
### 1. Webhook Authentication
|
||||
|
||||
```javascript
|
||||
// In n8n webhook
|
||||
const secret = $credentials.webhookSecret;
|
||||
const providedSecret = $node["Webhook"].json.headers["x-webhook-secret"];
|
||||
|
||||
if (secret !== providedSecret) {
|
||||
return [{
|
||||
json: { error: "Unauthorized" },
|
||||
statusCode: 401
|
||||
}];
|
||||
}
|
||||
```
|
||||
|
||||
### 2. Rate Limiting
|
||||
|
||||
```sql
|
||||
-- Track requests
|
||||
CREATE TABLE webhook_requests (
|
||||
ip_address VARCHAR(45),
|
||||
endpoint VARCHAR(100),
|
||||
requested_at TIMESTAMP DEFAULT NOW()
|
||||
);
|
||||
|
||||
-- Check rate limit (max 10 requests per minute)
|
||||
SELECT COUNT(*) FROM webhook_requests
|
||||
WHERE ip_address = $1
|
||||
AND requested_at > NOW() - INTERVAL '1 minute';
|
||||
```
|
||||
|
||||
### 3. Input Validation
|
||||
|
||||
```javascript
|
||||
// In n8n Function node
|
||||
const validateInput = (data) => {
|
||||
if (!data.type || typeof data.type !== 'string') {
|
||||
throw new Error('Invalid activity type');
|
||||
}
|
||||
|
||||
if (data.type === 'coding' && !data.project) {
|
||||
throw new Error('Project name required for coding activity');
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Quick Deploy Checklist
|
||||
|
||||
- [ ] Datenbank Table erstellt (`setup_activity_status.sql`)
|
||||
- [ ] n8n Workflows importiert
|
||||
- [ ] Spotify OAuth konfiguriert
|
||||
- [ ] GitHub Webhooks eingerichtet
|
||||
- [ ] Dashboard-URL getestet
|
||||
- [ ] API Routes deployed
|
||||
- [ ] Environment Variables gesetzt
|
||||
- [ ] Frontend ActivityFeed getestet
|
||||
- [ ] Auto-Clear Workflows aktiviert
|
||||
|
||||
---
|
||||
|
||||
## 💡 Pro-Tipps
|
||||
|
||||
1. **Backup System**: Exportiere n8n Workflows regelmäßig
|
||||
2. **Monitoring**: Setup alerts wenn Workflows fehlschlagen
|
||||
3. **Testing**: Nutze n8n's Test-Modus vor Produktion
|
||||
4. **Logging**: Speichere alle Aktivitäten für Analyse
|
||||
5. **Fallbacks**: Zeige Placeholder wenn keine Daten vorhanden
|
||||
|
||||
---
|
||||
|
||||
## 📞 Quick Support Commands
|
||||
|
||||
```bash
|
||||
# Check database status
|
||||
psql -d portfolio_dev -c "SELECT * FROM activity_status WHERE id = 1;"
|
||||
|
||||
# Clear all activities
|
||||
psql -d portfolio_dev -c "UPDATE activity_status SET activity_type = NULL, music_playing = FALSE WHERE id = 1;"
|
||||
|
||||
# View recent history
|
||||
psql -d portfolio_dev -c "SELECT * FROM activity_history ORDER BY created_at DESC LIMIT 10;"
|
||||
|
||||
# Test n8n webhook
|
||||
curl -X POST https://your-n8n.com/webhook/update-activity \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"type":"coding","details":"Testing","project":"Portfolio"}'
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
Happy automating! 🎉
|
||||
503
docs/N8N_CHAT_SETUP.md
Normal file
503
docs/N8N_CHAT_SETUP.md
Normal file
@@ -0,0 +1,503 @@
|
||||
# n8n + Ollama Chat Setup Guide
|
||||
|
||||
This guide explains how to set up the chat feature on your portfolio website using n8n workflows and Ollama for AI responses.
|
||||
|
||||
## Overview
|
||||
|
||||
The chat system works as follows:
|
||||
1. User sends a message via the chat widget on your website
|
||||
2. Message is sent to your Next.js API route (`/api/n8n/chat`)
|
||||
3. API forwards the message to your n8n webhook
|
||||
4. n8n processes the message and sends it to Ollama (local LLM)
|
||||
5. Ollama generates a response
|
||||
6. Response is returned through n8n back to the website
|
||||
7. User sees the AI response
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- ✅ n8n instance running (you have: https://n8n.dk0.dev)
|
||||
- ✅ Ollama installed and running locally or on a server
|
||||
- ✅ Environment variables configured in `.env`
|
||||
|
||||
## Step 1: Set Up Ollama
|
||||
|
||||
### Install Ollama
|
||||
|
||||
```bash
|
||||
# macOS/Linux
|
||||
curl -fsSL https://ollama.com/install.sh | sh
|
||||
|
||||
# Or download from https://ollama.com/download
|
||||
```
|
||||
|
||||
### Pull a Model
|
||||
|
||||
```bash
|
||||
# For general chat (recommended)
|
||||
ollama pull llama3.2
|
||||
|
||||
# Or for faster responses (smaller model)
|
||||
ollama pull llama3.2:1b
|
||||
|
||||
# Or for better quality (larger model)
|
||||
ollama pull llama3.2:70b
|
||||
```
|
||||
|
||||
### Run Ollama
|
||||
|
||||
```bash
|
||||
# Start Ollama server
|
||||
ollama serve
|
||||
|
||||
# Test it
|
||||
curl http://localhost:11434/api/generate -d '{
|
||||
"model": "llama3.2",
|
||||
"prompt": "Hello, who are you?",
|
||||
"stream": false
|
||||
}'
|
||||
```
|
||||
|
||||
## Step 2: Create n8n Workflow
|
||||
|
||||
### 2.1 Create a New Workflow in n8n
|
||||
|
||||
1. Go to https://n8n.dk0.dev
|
||||
2. Click "Create New Workflow"
|
||||
3. Name it "Portfolio Chat Bot"
|
||||
|
||||
### 2.2 Add Webhook Trigger
|
||||
|
||||
1. Add a **Webhook** node (trigger)
|
||||
2. Configure:
|
||||
- **HTTP Method**: POST
|
||||
- **Path**: `chat`
|
||||
- **Authentication**: None (or add if you want)
|
||||
- **Response Mode**: When Last Node Finishes
|
||||
|
||||
Your webhook URL will be: `https://n8n.dk0.dev/webhook/chat`
|
||||
|
||||
### 2.3 Add Function Node (Message Processing)
|
||||
|
||||
Add a **Function** node to extract and format the message:
|
||||
|
||||
```javascript
|
||||
// Extract the message from the webhook body
|
||||
const userMessage = $json.body.message || $json.message;
|
||||
|
||||
// Get conversation context (if you want to maintain history)
|
||||
const conversationId = $json.body.conversationId || 'default';
|
||||
|
||||
// Create context about Dennis
|
||||
const systemPrompt = `You are a helpful AI assistant on Dennis Konkol's portfolio website.
|
||||
|
||||
About Dennis:
|
||||
- Full-stack developer based in Osnabrück, Germany
|
||||
- Student passionate about technology and self-hosting
|
||||
- Skills: Next.js, React, Flutter, Docker, DevOps, TypeScript, Python
|
||||
- Runs his own infrastructure with Docker Swarm and Traefik
|
||||
- Projects include: Clarity (dyslexia app), self-hosted services, game servers
|
||||
- Contact: contact@dk0.dev
|
||||
- Website: https://dk0.dev
|
||||
|
||||
Be friendly, concise, and helpful. Answer questions about Dennis's skills, projects, or experience.
|
||||
If asked about things unrelated to Dennis, politely redirect to his portfolio topics.`;
|
||||
|
||||
return {
|
||||
json: {
|
||||
userMessage,
|
||||
conversationId,
|
||||
systemPrompt,
|
||||
timestamp: new Date().toISOString()
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
### 2.4 Add HTTP Request Node (Ollama)
|
||||
|
||||
Add an **HTTP Request** node to call Ollama:
|
||||
|
||||
**Configuration:**
|
||||
- **Method**: POST
|
||||
- **URL**: `http://localhost:11434/api/generate` (or your Ollama server URL)
|
||||
- **Authentication**: None
|
||||
- **Body Content Type**: JSON
|
||||
- **Specify Body**: Using Fields Below
|
||||
|
||||
**Body (JSON):**
|
||||
```json
|
||||
{
|
||||
"model": "llama3.2",
|
||||
"prompt": "{{ $json.systemPrompt }}\n\nUser: {{ $json.userMessage }}\n\nAssistant:",
|
||||
"stream": false,
|
||||
"options": {
|
||||
"temperature": 0.7,
|
||||
"top_p": 0.9,
|
||||
"max_tokens": 500
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Alternative: If Ollama is on a different server**
|
||||
Replace `localhost` with your server IP/domain:
|
||||
```
|
||||
http://your-ollama-server:11434/api/generate
|
||||
```
|
||||
|
||||
### 2.5 Add Function Node (Format Response)
|
||||
|
||||
Add another **Function** node to format the response:
|
||||
|
||||
```javascript
|
||||
// Extract the response from Ollama
|
||||
const ollamaResponse = $json.response || $json.text || '';
|
||||
|
||||
// Clean up the response
|
||||
let reply = ollamaResponse.trim();
|
||||
|
||||
// Remove any system prompts that might leak through
|
||||
reply = reply.replace(/^(System:|Assistant:|User:)/gi, '').trim();
|
||||
|
||||
// Limit length if too long
|
||||
if (reply.length > 1000) {
|
||||
reply = reply.substring(0, 1000) + '...';
|
||||
}
|
||||
|
||||
return {
|
||||
json: {
|
||||
reply: reply,
|
||||
timestamp: new Date().toISOString(),
|
||||
model: 'llama3.2'
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
### 2.6 Add Respond to Webhook Node
|
||||
|
||||
Add a **Respond to Webhook** node:
|
||||
|
||||
**Configuration:**
|
||||
- **Response Body**: JSON
|
||||
- **Response Data**: Using Fields Below
|
||||
|
||||
**Body:**
|
||||
```json
|
||||
{
|
||||
"reply": "={{ $json.reply }}",
|
||||
"timestamp": "={{ $json.timestamp }}",
|
||||
"success": true
|
||||
}
|
||||
```
|
||||
|
||||
### 2.7 Save and Activate
|
||||
|
||||
1. Click "Save" (top right)
|
||||
2. Toggle "Active" switch to ON
|
||||
3. Test the webhook:
|
||||
|
||||
```bash
|
||||
curl -X POST https://n8n.dk0.dev/webhook/chat \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"message": "Hello, tell me about Dennis"}'
|
||||
```
|
||||
|
||||
## Step 3: Advanced - Conversation Memory
|
||||
|
||||
To maintain conversation context across messages, add a **Redis** or **MongoDB** node:
|
||||
|
||||
### Option A: Using Redis (Recommended)
|
||||
|
||||
**Add Redis Node (Store):**
|
||||
```javascript
|
||||
// Store conversation in Redis with TTL
|
||||
const conversationKey = `chat:${$json.conversationId}`;
|
||||
const messages = [
|
||||
{ role: 'user', content: $json.userMessage },
|
||||
{ role: 'assistant', content: $json.reply }
|
||||
];
|
||||
|
||||
// Get existing conversation
|
||||
const existing = await this.helpers.request({
|
||||
method: 'GET',
|
||||
url: `redis://localhost:6379/${conversationKey}`
|
||||
});
|
||||
|
||||
// Append new messages
|
||||
const conversation = existing ? JSON.parse(existing) : [];
|
||||
conversation.push(...messages);
|
||||
|
||||
// Keep only last 10 messages
|
||||
const recentConversation = conversation.slice(-10);
|
||||
|
||||
// Store back with 1 hour TTL
|
||||
await this.helpers.request({
|
||||
method: 'SET',
|
||||
url: `redis://localhost:6379/${conversationKey}`,
|
||||
body: JSON.stringify(recentConversation),
|
||||
qs: { EX: 3600 }
|
||||
});
|
||||
```
|
||||
|
||||
### Option B: Using Session Storage (Simpler)
|
||||
|
||||
Store conversation in n8n's internal storage:
|
||||
|
||||
```javascript
|
||||
// Use n8n's static data for simple storage
|
||||
const conversationKey = $json.conversationId;
|
||||
const staticData = this.getWorkflowStaticData('global');
|
||||
|
||||
if (!staticData.conversations) {
|
||||
staticData.conversations = {};
|
||||
}
|
||||
|
||||
if (!staticData.conversations[conversationKey]) {
|
||||
staticData.conversations[conversationKey] = [];
|
||||
}
|
||||
|
||||
// Add message
|
||||
staticData.conversations[conversationKey].push({
|
||||
user: $json.userMessage,
|
||||
assistant: $json.reply,
|
||||
timestamp: new Date().toISOString()
|
||||
});
|
||||
|
||||
// Keep only last 10
|
||||
staticData.conversations[conversationKey] =
|
||||
staticData.conversations[conversationKey].slice(-10);
|
||||
```
|
||||
|
||||
## Step 4: Handle Multiple Users
|
||||
|
||||
The chat system automatically handles multiple users through:
|
||||
|
||||
1. **Session IDs**: Each user gets a unique `conversationId` generated client-side
|
||||
2. **Stateless by default**: Each request is independent unless you add conversation memory
|
||||
3. **Redis/Database**: Store conversations per user ID for persistent history
|
||||
|
||||
### Client-Side Session Management
|
||||
|
||||
The chat widget (created in next step) will generate a unique session ID:
|
||||
|
||||
```javascript
|
||||
// Auto-generated in the chat widget
|
||||
const conversationId = crypto.randomUUID();
|
||||
localStorage.setItem('chatSessionId', conversationId);
|
||||
```
|
||||
|
||||
### Server-Side (n8n)
|
||||
|
||||
n8n processes each request independently. For multiple concurrent users:
|
||||
- Each webhook call is a separate execution
|
||||
- No shared state between users (unless you add it)
|
||||
- Ollama can handle concurrent requests
|
||||
- Use Redis for scalable conversation storage
|
||||
|
||||
## Step 5: Rate Limiting (Optional)
|
||||
|
||||
To prevent abuse, add rate limiting in n8n:
|
||||
|
||||
```javascript
|
||||
// Add this as first function node
|
||||
const ip = $json.headers['x-forwarded-for'] || $json.headers['x-real-ip'] || 'unknown';
|
||||
const rateLimitKey = `ratelimit:${ip}`;
|
||||
const staticData = this.getWorkflowStaticData('global');
|
||||
|
||||
if (!staticData.rateLimits) {
|
||||
staticData.rateLimits = {};
|
||||
}
|
||||
|
||||
const now = Date.now();
|
||||
const limit = staticData.rateLimits[rateLimitKey] || { count: 0, resetAt: now + 60000 };
|
||||
|
||||
if (now > limit.resetAt) {
|
||||
// Reset after 1 minute
|
||||
limit.count = 0;
|
||||
limit.resetAt = now + 60000;
|
||||
}
|
||||
|
||||
if (limit.count >= 10) {
|
||||
// Max 10 requests per minute per IP
|
||||
throw new Error('Rate limit exceeded. Please wait a moment.');
|
||||
}
|
||||
|
||||
limit.count++;
|
||||
staticData.rateLimits[rateLimitKey] = limit;
|
||||
```
|
||||
|
||||
## Step 6: Environment Variables
|
||||
|
||||
Update your `.env` file:
|
||||
|
||||
```bash
|
||||
# n8n Configuration
|
||||
N8N_WEBHOOK_URL=https://n8n.dk0.dev
|
||||
N8N_SECRET_TOKEN=your-secret-token-here # Optional: for authentication
|
||||
N8N_API_KEY=your-api-key-here # Optional: for API access
|
||||
|
||||
# Ollama Configuration (optional - stored in n8n workflow)
|
||||
OLLAMA_URL=http://localhost:11434
|
||||
OLLAMA_MODEL=llama3.2
|
||||
```
|
||||
|
||||
## Step 7: Test the Setup
|
||||
|
||||
```bash
|
||||
# Test the chat endpoint
|
||||
curl -X POST http://localhost:3000/api/n8n/chat \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"message": "What technologies does Dennis work with?"
|
||||
}'
|
||||
|
||||
# Expected response:
|
||||
{
|
||||
"reply": "Dennis works with a variety of modern technologies including Next.js, React, Flutter for mobile development, Docker for containerization, and TypeScript. He's also experienced with DevOps practices, running his own infrastructure with Docker Swarm and Traefik as a reverse proxy."
|
||||
}
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Ollama Not Responding
|
||||
|
||||
```bash
|
||||
# Check if Ollama is running
|
||||
curl http://localhost:11434/api/tags
|
||||
|
||||
# If not, start it
|
||||
ollama serve
|
||||
|
||||
# Check logs
|
||||
journalctl -u ollama -f
|
||||
```
|
||||
|
||||
### n8n Webhook Returns 404
|
||||
|
||||
- Make sure workflow is **Active** (toggle in top right)
|
||||
- Check webhook path matches: `/webhook/chat`
|
||||
- Test directly: `https://n8n.dk0.dev/webhook/chat`
|
||||
|
||||
### Slow Responses
|
||||
|
||||
- Use a smaller model: `ollama pull llama3.2:1b`
|
||||
- Reduce `max_tokens` in Ollama request
|
||||
- Add response caching for common questions
|
||||
- Consider using streaming responses
|
||||
|
||||
### CORS Issues
|
||||
|
||||
Add CORS headers in the n8n Respond node:
|
||||
|
||||
```json
|
||||
{
|
||||
"headers": {
|
||||
"Access-Control-Allow-Origin": "*",
|
||||
"Access-Control-Allow-Methods": "POST, OPTIONS",
|
||||
"Access-Control-Allow-Headers": "Content-Type"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Performance Tips
|
||||
|
||||
1. **Use GPU acceleration** for Ollama if available
|
||||
2. **Cache common responses** in Redis
|
||||
3. **Implement streaming** for real-time responses
|
||||
4. **Use smaller models** for faster responses (llama3.2:1b)
|
||||
5. **Add typing indicators** in the UI while waiting
|
||||
|
||||
## Security Considerations
|
||||
|
||||
1. **Add authentication** to n8n webhook (Bearer token)
|
||||
2. **Implement rate limiting** (shown above)
|
||||
3. **Sanitize user input** in n8n function node
|
||||
4. **Don't expose Ollama** directly to the internet
|
||||
5. **Use HTTPS** for all communications
|
||||
6. **Add CAPTCHA** to prevent bot abuse
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. ✅ Set up Ollama
|
||||
2. ✅ Create n8n workflow
|
||||
3. ✅ Test the API endpoint
|
||||
4. 🔲 Create chat UI widget (see CHAT_WIDGET_SETUP.md)
|
||||
5. 🔲 Add conversation memory
|
||||
6. 🔲 Implement rate limiting
|
||||
7. 🔲 Add analytics tracking
|
||||
|
||||
## Resources
|
||||
|
||||
- [Ollama Documentation](https://ollama.com/docs)
|
||||
- [n8n Documentation](https://docs.n8n.io)
|
||||
- [Llama 3.2 Model Card](https://ollama.com/library/llama3.2)
|
||||
- [Next.js API Routes](https://nextjs.org/docs/api-routes/introduction)
|
||||
|
||||
## Example n8n Workflow JSON
|
||||
|
||||
Save this as `chat-workflow.json` and import into n8n:
|
||||
|
||||
```json
|
||||
{
|
||||
"name": "Portfolio Chat Bot",
|
||||
"nodes": [
|
||||
{
|
||||
"parameters": {
|
||||
"path": "chat",
|
||||
"responseMode": "lastNode",
|
||||
"options": {}
|
||||
},
|
||||
"name": "Webhook",
|
||||
"type": "n8n-nodes-base.webhook",
|
||||
"position": [250, 300],
|
||||
"webhookId": "chat-webhook"
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"functionCode": "const userMessage = $json.body.message;\nconst systemPrompt = `You are a helpful AI assistant on Dennis Konkol's portfolio website.`;\nreturn { json: { userMessage, systemPrompt } };"
|
||||
},
|
||||
"name": "Process Message",
|
||||
"type": "n8n-nodes-base.function",
|
||||
"position": [450, 300]
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"method": "POST",
|
||||
"url": "http://localhost:11434/api/generate",
|
||||
"jsonParameters": true,
|
||||
"options": {},
|
||||
"bodyParametersJson": "={ \"model\": \"llama3.2\", \"prompt\": \"{{ $json.systemPrompt }}\\n\\nUser: {{ $json.userMessage }}\\n\\nAssistant:\", \"stream\": false }"
|
||||
},
|
||||
"name": "Call Ollama",
|
||||
"type": "n8n-nodes-base.httpRequest",
|
||||
"position": [650, 300]
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"functionCode": "const reply = $json.response || '';\nreturn { json: { reply: reply.trim() } };"
|
||||
},
|
||||
"name": "Format Response",
|
||||
"type": "n8n-nodes-base.function",
|
||||
"position": [850, 300]
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"respondWith": "json",
|
||||
"options": {},
|
||||
"responseBody": "={ \"reply\": \"{{ $json.reply }}\", \"success\": true }"
|
||||
},
|
||||
"name": "Respond to Webhook",
|
||||
"type": "n8n-nodes-base.respondToWebhook",
|
||||
"position": [1050, 300]
|
||||
}
|
||||
],
|
||||
"connections": {
|
||||
"Webhook": { "main": [[{ "node": "Process Message", "type": "main", "index": 0 }]] },
|
||||
"Process Message": { "main": [[{ "node": "Call Ollama", "type": "main", "index": 0 }]] },
|
||||
"Call Ollama": { "main": [[{ "node": "Format Response", "type": "main", "index": 0 }]] },
|
||||
"Format Response": { "main": [[{ "node": "Respond to Webhook", "type": "main", "index": 0 }]] }
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
**Need help?** Check the troubleshooting section or reach out!
|
||||
590
docs/N8N_INTEGRATION.md
Normal file
590
docs/N8N_INTEGRATION.md
Normal file
@@ -0,0 +1,590 @@
|
||||
# 🚀 n8n Integration Guide - Complete Setup
|
||||
|
||||
## Übersicht
|
||||
|
||||
Dieses Portfolio nutzt n8n für:
|
||||
- ⚡ **Echtzeit-Aktivitätsanzeige** (Coding, Musik, Gaming, etc.)
|
||||
- 💬 **AI-Chatbot** (mit OpenAI/Anthropic)
|
||||
- 📊 **Aktivitäts-Tracking** (GitHub, Spotify, Netflix, etc.)
|
||||
- 🎮 **Gaming-Status** (Steam, Discord)
|
||||
- 📧 **Automatische Benachrichtigungen**
|
||||
|
||||
---
|
||||
|
||||
## 🎨 Coole Ideen für Integrationen
|
||||
|
||||
### 1. **GitHub Activity Feed** 🔨
|
||||
**Was es zeigt:**
|
||||
- "Currently coding: Portfolio Website"
|
||||
- "Last commit: 5 minutes ago"
|
||||
- "Working on: feature/n8n-integration"
|
||||
- Programming language (TypeScript, Python, etc.)
|
||||
|
||||
**n8n Workflow:**
|
||||
```
|
||||
GitHub Webhook → Extract Data → Update Database → Display on Site
|
||||
```
|
||||
|
||||
### 2. **Spotify Now Playing** 🎵
|
||||
**Was es zeigt:**
|
||||
- Aktueller Song + Artist
|
||||
- Album Cover (rotierend animiert!)
|
||||
- Fortschrittsbalken
|
||||
- "Listening to X since Y minutes"
|
||||
|
||||
**n8n Workflow:**
|
||||
```
|
||||
Cron (every 30s) → Spotify API → Parse Track Data → Update Database
|
||||
```
|
||||
|
||||
### 3. **Netflix/YouTube/Twitch Watching** 📺
|
||||
**Was es zeigt:**
|
||||
- "Watching: Breaking Bad S05E14"
|
||||
- "Streaming: Coding Tutorial"
|
||||
- Platform badges (Netflix/YouTube/Twitch)
|
||||
|
||||
**n8n Workflow:**
|
||||
```
|
||||
Trakt.tv API → Get Current Watching → Update Database
|
||||
Discord Rich Presence → Extract Activity → Update Database
|
||||
```
|
||||
|
||||
### 4. **Gaming Activity** 🎮
|
||||
**Was es zeigt:**
|
||||
- "Playing: Elden Ring"
|
||||
- Platform: Steam/PlayStation/Xbox
|
||||
- Play time
|
||||
- Achievement notifications
|
||||
|
||||
**n8n Workflow:**
|
||||
```
|
||||
Steam API → Get Current Game → Update Database
|
||||
Discord Presence → Parse Game → Update Database
|
||||
```
|
||||
|
||||
### 5. **Mood & Custom Status** 😊
|
||||
**Was es zeigt:**
|
||||
- Emoji mood (😊, 💻, 🏃, 🎮, 😴)
|
||||
- Custom message: "Focused on DevOps"
|
||||
- Auto-status based on time/activity
|
||||
|
||||
**n8n Workflow:**
|
||||
```
|
||||
Schedule → Determine Status (work hours/break/sleep) → Update Database
|
||||
Manual Webhook → Set Custom Status → Update Database
|
||||
```
|
||||
|
||||
### 6. **Smart Notifications** 📬
|
||||
**Was es zeigt:**
|
||||
- "New email from X"
|
||||
- "GitHub PR needs review"
|
||||
- "Calendar event in 15 min"
|
||||
|
||||
**n8n Workflow:**
|
||||
```
|
||||
Email/Calendar/GitHub → Filter Important → Create Notification → Display
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📦 Setup: Datenbank Schema
|
||||
|
||||
### PostgreSQL Table: `activity_status`
|
||||
|
||||
```sql
|
||||
CREATE TABLE activity_status (
|
||||
id SERIAL PRIMARY KEY,
|
||||
|
||||
-- Activity
|
||||
activity_type VARCHAR(50), -- 'coding', 'listening', 'watching', 'gaming', 'reading'
|
||||
activity_details TEXT,
|
||||
activity_project VARCHAR(255),
|
||||
activity_language VARCHAR(50),
|
||||
activity_repo VARCHAR(255),
|
||||
|
||||
-- Music
|
||||
music_playing BOOLEAN DEFAULT FALSE,
|
||||
music_track VARCHAR(255),
|
||||
music_artist VARCHAR(255),
|
||||
music_album VARCHAR(255),
|
||||
music_platform VARCHAR(50), -- 'spotify', 'apple'
|
||||
music_progress INTEGER, -- 0-100
|
||||
music_album_art TEXT,
|
||||
|
||||
-- Watching
|
||||
watching_title VARCHAR(255),
|
||||
watching_platform VARCHAR(50), -- 'youtube', 'netflix', 'twitch'
|
||||
watching_type VARCHAR(50), -- 'video', 'stream', 'movie', 'series'
|
||||
|
||||
-- Gaming
|
||||
gaming_game VARCHAR(255),
|
||||
gaming_platform VARCHAR(50), -- 'steam', 'playstation', 'xbox'
|
||||
gaming_status VARCHAR(50), -- 'playing', 'idle'
|
||||
|
||||
-- Status
|
||||
status_mood VARCHAR(10), -- emoji
|
||||
status_message TEXT,
|
||||
|
||||
updated_at TIMESTAMP DEFAULT NOW()
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔧 n8n Workflows
|
||||
|
||||
### Workflow 1: GitHub Activity Tracker
|
||||
|
||||
**Trigger:** Webhook bei Push/Commit
|
||||
**Frequenz:** Echtzeit
|
||||
|
||||
```json
|
||||
{
|
||||
"nodes": [
|
||||
{
|
||||
"name": "GitHub Webhook",
|
||||
"type": "n8n-nodes-base.webhook",
|
||||
"parameters": {
|
||||
"path": "github-activity",
|
||||
"method": "POST"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Extract Commit Data",
|
||||
"type": "n8n-nodes-base.function",
|
||||
"parameters": {
|
||||
"functionCode": "const commit = items[0].json;\nreturn [\n {\n json: {\n activity_type: 'coding',\n activity_details: commit.head_commit.message,\n activity_project: commit.repository.name,\n activity_language: 'TypeScript',\n activity_repo: commit.repository.html_url,\n updated_at: new Date().toISOString()\n }\n }\n];"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Update Database",
|
||||
"type": "n8n-nodes-base.postgres",
|
||||
"parameters": {
|
||||
"operation": "executeQuery",
|
||||
"query": "INSERT INTO activity_status (activity_type, activity_details, activity_project, activity_language, activity_repo, updated_at) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (id) DO UPDATE SET activity_type = $1, activity_details = $2, activity_project = $3, activity_language = $4, activity_repo = $5, updated_at = $6 WHERE activity_status.id = 1"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
**Setup in GitHub:**
|
||||
1. Gehe zu deinem Repository → Settings → Webhooks
|
||||
2. Add webhook: `https://your-n8n-instance.com/webhook/github-activity`
|
||||
3. Content type: `application/json`
|
||||
4. Events: Push events
|
||||
|
||||
---
|
||||
|
||||
### Workflow 2: Spotify Now Playing
|
||||
|
||||
**Trigger:** Cron (alle 30 Sekunden)
|
||||
|
||||
```json
|
||||
{
|
||||
"nodes": [
|
||||
{
|
||||
"name": "Schedule",
|
||||
"type": "n8n-nodes-base.cron",
|
||||
"parameters": {
|
||||
"cronExpression": "*/30 * * * * *"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Spotify API",
|
||||
"type": "n8n-nodes-base.httpRequest",
|
||||
"parameters": {
|
||||
"url": "https://api.spotify.com/v1/me/player/currently-playing",
|
||||
"method": "GET",
|
||||
"authentication": "oAuth2",
|
||||
"headers": {
|
||||
"Authorization": "Bearer {{$credentials.spotify.accessToken}}"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Parse Track Data",
|
||||
"type": "n8n-nodes-base.function",
|
||||
"parameters": {
|
||||
"functionCode": "const track = items[0].json;\nif (!track || !track.is_playing) {\n return [{ json: { music_playing: false } }];\n}\n\nreturn [\n {\n json: {\n music_playing: true,\n music_track: track.item.name,\n music_artist: track.item.artists[0].name,\n music_album: track.item.album.name,\n music_platform: 'spotify',\n music_progress: Math.round((track.progress_ms / track.item.duration_ms) * 100),\n music_album_art: track.item.album.images[0].url,\n updated_at: new Date().toISOString()\n }\n }\n];"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Update Database",
|
||||
"type": "n8n-nodes-base.postgres",
|
||||
"parameters": {
|
||||
"operation": "executeQuery",
|
||||
"query": "UPDATE activity_status SET music_playing = $1, music_track = $2, music_artist = $3, music_album = $4, music_platform = $5, music_progress = $6, music_album_art = $7, updated_at = $8 WHERE id = 1"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
**Spotify API Setup:**
|
||||
1. Gehe zu https://developer.spotify.com/dashboard
|
||||
2. Create App
|
||||
3. Add Redirect URI: `https://your-n8n-instance.com/oauth/callback`
|
||||
4. Kopiere Client ID & Secret in n8n Credentials
|
||||
5. Scopes: `user-read-currently-playing`, `user-read-playback-state`
|
||||
|
||||
---
|
||||
|
||||
### Workflow 3: AI Chatbot mit OpenAI
|
||||
|
||||
**Trigger:** Webhook bei Chat-Message
|
||||
|
||||
```json
|
||||
{
|
||||
"nodes": [
|
||||
{
|
||||
"name": "Chat Webhook",
|
||||
"type": "n8n-nodes-base.webhook",
|
||||
"parameters": {
|
||||
"path": "chat",
|
||||
"method": "POST"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Build Context",
|
||||
"type": "n8n-nodes-base.function",
|
||||
"parameters": {
|
||||
"functionCode": "const userMessage = items[0].json.message;\n\nconst context = `You are Dennis Konkol's AI assistant. Here's information about Dennis:\n\n- Student in Osnabrück, Germany\n- Passionate self-hoster and DevOps enthusiast\n- Skills: Next.js, Flutter, Docker Swarm, Traefik, CI/CD, n8n\n- Runs own infrastructure on IONOS and OVHcloud\n- Projects: Clarity (Flutter dyslexia app), Self-hosted portfolio with Docker Swarm\n- Hobbies: Gaming, Jogging, Experimenting with tech\n- Fun fact: Uses pen & paper for calendar despite automating everything\n\nAnswer questions about Dennis professionally and friendly. Keep answers concise (2-3 sentences).\n\nUser question: ${userMessage}`;\n\nreturn [{ json: { context, userMessage } }];"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "OpenAI Chat",
|
||||
"type": "n8n-nodes-base.openAi",
|
||||
"parameters": {
|
||||
"resource": "chat",
|
||||
"operation": "message",
|
||||
"model": "gpt-4",
|
||||
"messages": {
|
||||
"values": [
|
||||
{
|
||||
"role": "system",
|
||||
"content": "={{$node[\"Build Context\"].json[\"context\"]}}"
|
||||
},
|
||||
{
|
||||
"role": "user",
|
||||
"content": "={{$node[\"Build Context\"].json[\"userMessage\"]}}"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Return Response",
|
||||
"type": "n8n-nodes-base.respondToWebhook",
|
||||
"parameters": {
|
||||
"responseBody": "={{ { reply: $json.message.content } }}"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
**OpenAI API Setup:**
|
||||
1. Gehe zu https://platform.openai.com/api-keys
|
||||
2. Create API Key
|
||||
3. Add zu n8n Credentials
|
||||
4. Wähle Model: gpt-4 oder gpt-3.5-turbo
|
||||
|
||||
---
|
||||
|
||||
### Workflow 4: Discord/Steam Gaming Status
|
||||
|
||||
**Trigger:** Cron (alle 60 Sekunden)
|
||||
|
||||
```json
|
||||
{
|
||||
"nodes": [
|
||||
{
|
||||
"name": "Schedule",
|
||||
"type": "n8n-nodes-base.cron",
|
||||
"parameters": {
|
||||
"cronExpression": "0 * * * * *"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Discord API",
|
||||
"type": "n8n-nodes-base.httpRequest",
|
||||
"parameters": {
|
||||
"url": "https://discord.com/api/v10/users/@me",
|
||||
"method": "GET",
|
||||
"authentication": "oAuth2",
|
||||
"headers": {
|
||||
"Authorization": "Bot {{$credentials.discord.token}}"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Parse Gaming Status",
|
||||
"type": "n8n-nodes-base.function",
|
||||
"parameters": {
|
||||
"functionCode": "const user = items[0].json;\nconst activity = user.activities?.find(a => a.type === 0); // 0 = Playing\n\nif (!activity) {\n return [{ json: { gaming_game: null, gaming_status: 'idle' } }];\n}\n\nreturn [\n {\n json: {\n gaming_game: activity.name,\n gaming_platform: 'discord',\n gaming_status: 'playing',\n updated_at: new Date().toISOString()\n }\n }\n];"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Update Database",
|
||||
"type": "n8n-nodes-base.postgres",
|
||||
"parameters": {
|
||||
"operation": "executeQuery",
|
||||
"query": "UPDATE activity_status SET gaming_game = $1, gaming_platform = $2, gaming_status = $3, updated_at = $4 WHERE id = 1"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Workflow 5: Smart Status (Auto-Detect)
|
||||
|
||||
**Trigger:** Cron (alle 5 Minuten)
|
||||
|
||||
```json
|
||||
{
|
||||
"nodes": [
|
||||
{
|
||||
"name": "Schedule",
|
||||
"type": "n8n-nodes-base.cron",
|
||||
"parameters": {
|
||||
"cronExpression": "*/5 * * * *"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Determine Status",
|
||||
"type": "n8n-nodes-base.function",
|
||||
"parameters": {
|
||||
"functionCode": "const hour = new Date().getHours();\nconst day = new Date().getDay(); // 0 = Sunday, 6 = Saturday\n\nlet mood = '💻';\nlet message = 'Working on projects';\n\n// Sleep time (0-7 Uhr)\nif (hour >= 0 && hour < 7) {\n mood = '😴';\n message = 'Sleeping (probably dreaming of code)';\n}\n// Morning (7-9 Uhr)\nelse if (hour >= 7 && hour < 9) {\n mood = '☕';\n message = 'Morning coffee & catching up';\n}\n// Work time (9-17 Uhr, Mo-Fr)\nelse if (hour >= 9 && hour < 17 && day >= 1 && day <= 5) {\n mood = '💻';\n message = 'Deep work mode - coding & learning';\n}\n// Evening (17-22 Uhr)\nelse if (hour >= 17 && hour < 22) {\n mood = '🎮';\n message = 'Relaxing - gaming or watching shows';\n}\n// Late night (22-24 Uhr)\nelse if (hour >= 22) {\n mood = '🌙';\n message = 'Late night coding session';\n}\n// Weekend\nif (day === 0 || day === 6) {\n mood = '🏃';\n message = 'Weekend vibes - exploring & experimenting';\n}\n\nreturn [\n {\n json: {\n status_mood: mood,\n status_message: message,\n updated_at: new Date().toISOString()\n }\n }\n];"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Update Database",
|
||||
"type": "n8n-nodes-base.postgres",
|
||||
"parameters": {
|
||||
"operation": "executeQuery",
|
||||
"query": "UPDATE activity_status SET status_mood = $1, status_message = $2, updated_at = $3 WHERE id = 1"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔌 Frontend API Integration
|
||||
|
||||
### Update `/app/api/n8n/status/route.ts`
|
||||
|
||||
```typescript
|
||||
import { NextResponse } from 'next/server';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
|
||||
const prisma = new PrismaClient();
|
||||
|
||||
export async function GET() {
|
||||
try {
|
||||
// Fetch from your activity_status table
|
||||
const status = await prisma.$queryRaw`
|
||||
SELECT * FROM activity_status WHERE id = 1 LIMIT 1
|
||||
`;
|
||||
|
||||
if (!status || status.length === 0) {
|
||||
return NextResponse.json({
|
||||
activity: null,
|
||||
music: null,
|
||||
watching: null,
|
||||
gaming: null,
|
||||
status: null,
|
||||
});
|
||||
}
|
||||
|
||||
const data = status[0];
|
||||
|
||||
return NextResponse.json({
|
||||
activity: data.activity_type ? {
|
||||
type: data.activity_type,
|
||||
details: data.activity_details,
|
||||
project: data.activity_project,
|
||||
language: data.activity_language,
|
||||
repo: data.activity_repo,
|
||||
timestamp: data.updated_at,
|
||||
} : null,
|
||||
music: data.music_playing ? {
|
||||
isPlaying: data.music_playing,
|
||||
track: data.music_track,
|
||||
artist: data.music_artist,
|
||||
album: data.music_album,
|
||||
platform: data.music_platform,
|
||||
progress: data.music_progress,
|
||||
albumArt: data.music_album_art,
|
||||
} : null,
|
||||
watching: data.watching_title ? {
|
||||
title: data.watching_title,
|
||||
platform: data.watching_platform,
|
||||
type: data.watching_type,
|
||||
} : null,
|
||||
gaming: data.gaming_game ? {
|
||||
game: data.gaming_game,
|
||||
platform: data.gaming_platform,
|
||||
status: data.gaming_status,
|
||||
} : null,
|
||||
status: data.status_mood ? {
|
||||
mood: data.status_mood,
|
||||
customMessage: data.status_message,
|
||||
} : null,
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Error fetching activity status:', error);
|
||||
return NextResponse.json({
|
||||
activity: null,
|
||||
music: null,
|
||||
watching: null,
|
||||
gaming: null,
|
||||
status: null,
|
||||
}, { status: 500 });
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Create `/app/api/n8n/chat/route.ts`
|
||||
|
||||
```typescript
|
||||
import { NextResponse } from 'next/server';
|
||||
|
||||
export async function POST(request: Request) {
|
||||
try {
|
||||
const { message } = await request.json();
|
||||
|
||||
// Call your n8n chat webhook
|
||||
const response = await fetch(`${process.env.N8N_WEBHOOK_URL}/webhook/chat`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ message }),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('n8n webhook failed');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
return NextResponse.json({ reply: data.reply });
|
||||
} catch (error) {
|
||||
console.error('Chat API error:', error);
|
||||
return NextResponse.json(
|
||||
{ reply: 'Sorry, I encountered an error. Please try again later.' },
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🌟 Zusätzliche coole Ideen
|
||||
|
||||
### 1. **Live Coding Stats**
|
||||
- Lines of code today
|
||||
- Most used language this week
|
||||
- GitHub contribution graph
|
||||
- Pull requests merged
|
||||
|
||||
### 2. **Coffee Counter** ☕
|
||||
- Button in n8n Dashboard: "I had coffee"
|
||||
- Displays: "3 coffees today"
|
||||
- Funny messages bei > 5 cups
|
||||
|
||||
### 3. **Mood Tracker**
|
||||
- Manual mood updates via Discord Bot
|
||||
- Shows emoji + custom message
|
||||
- Persists über den Tag
|
||||
|
||||
### 4. **Auto-DND Status**
|
||||
- Wenn du in einem Meeting bist (Calendar API)
|
||||
- Wenn du fokussiert arbeitest (Pomodoro Timer)
|
||||
- Custom status: "🔴 In Deep Work - Back at 15:00"
|
||||
|
||||
### 5. **Project Highlights**
|
||||
- "Currently building: X"
|
||||
- "Deployed Y minutes ago"
|
||||
- "Last successful build: Z"
|
||||
|
||||
### 6. **Social Activity**
|
||||
- "New blog post: Title"
|
||||
- "Trending on Twitter: X mentions"
|
||||
- "LinkedIn: Y profile views this week"
|
||||
|
||||
---
|
||||
|
||||
## 📝 Environment Variables
|
||||
|
||||
Add to `.env.local`:
|
||||
|
||||
```bash
|
||||
# n8n
|
||||
N8N_WEBHOOK_URL=https://your-n8n-instance.com
|
||||
N8N_API_KEY=your_n8n_api_key
|
||||
|
||||
# Spotify
|
||||
SPOTIFY_CLIENT_ID=your_spotify_client_id
|
||||
SPOTIFY_CLIENT_SECRET=your_spotify_client_secret
|
||||
|
||||
# OpenAI
|
||||
OPENAI_API_KEY=your_openai_api_key
|
||||
|
||||
# Discord (optional)
|
||||
DISCORD_BOT_TOKEN=your_discord_bot_token
|
||||
|
||||
# GitHub (optional)
|
||||
GITHUB_WEBHOOK_SECRET=your_github_webhook_secret
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Quick Start
|
||||
|
||||
1. **Setup Database:**
|
||||
```bash
|
||||
psql -U postgres -d portfolio_dev -f setup_activity_status.sql
|
||||
```
|
||||
|
||||
2. **Create n8n Workflows:**
|
||||
- Import workflows via n8n UI
|
||||
- Configure credentials
|
||||
- Activate workflows
|
||||
|
||||
3. **Update API Routes:**
|
||||
- Add `status/route.ts` and `chat/route.ts`
|
||||
- Set environment variables
|
||||
|
||||
4. **Test:**
|
||||
```bash
|
||||
npm run dev
|
||||
```
|
||||
- Check bottom-right corner for activity bubbles
|
||||
- Click chat button to test AI
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Best Practices
|
||||
|
||||
1. **Caching:** Cache API responses für 30s (nicht bei jedem Request neu fetchen)
|
||||
2. **Error Handling:** Graceful fallbacks wenn n8n down ist
|
||||
3. **Rate Limiting:** Limitiere Chat-Requests (max 10/minute)
|
||||
4. **Privacy:** Zeige nur das, was du teilen willst
|
||||
5. **Performance:** Nutze Webhooks statt Polling wo möglich
|
||||
|
||||
---
|
||||
|
||||
## 🤝 Community Ideas
|
||||
|
||||
Teile deine coolen n8n-Integrationen!
|
||||
- Discord: Zeig deinen Setup
|
||||
- GitHub: Share deine Workflows
|
||||
- Blog: Write-up über dein System
|
||||
|
||||
Happy automating! 🎉
|
||||
311
docs/ai-image-generation/ENVIRONMENT.md
Normal file
311
docs/ai-image-generation/ENVIRONMENT.md
Normal file
@@ -0,0 +1,311 @@
|
||||
# Environment Variables for AI Image Generation
|
||||
|
||||
This document lists all environment variables needed for the AI image generation system.
|
||||
|
||||
## Required Variables
|
||||
|
||||
Add these to your `.env.local` file:
|
||||
|
||||
```bash
|
||||
# =============================================================================
|
||||
# AI IMAGE GENERATION CONFIGURATION
|
||||
# =============================================================================
|
||||
|
||||
# n8n Webhook Configuration
|
||||
# The base URL where your n8n instance is running
|
||||
N8N_WEBHOOK_URL=http://localhost:5678/webhook
|
||||
|
||||
# Secret token for authenticating webhook requests
|
||||
# Generate a secure random token: openssl rand -hex 32
|
||||
N8N_SECRET_TOKEN=your-secure-random-token-here
|
||||
|
||||
# Stable Diffusion API Configuration
|
||||
# The URL where your Stable Diffusion WebUI is running
|
||||
SD_API_URL=http://localhost:7860
|
||||
|
||||
# Optional: API key if your SD instance requires authentication
|
||||
# SD_API_KEY=your-sd-api-key-here
|
||||
|
||||
# =============================================================================
|
||||
# IMAGE GENERATION SETTINGS
|
||||
# =============================================================================
|
||||
|
||||
# Automatically generate images when new projects are created
|
||||
# Set to 'true' to enable, 'false' to disable
|
||||
AUTO_GENERATE_IMAGES=true
|
||||
|
||||
# Directory where generated images will be saved
|
||||
# Should be inside your public directory for web access
|
||||
GENERATED_IMAGES_DIR=/app/public/generated-images
|
||||
|
||||
# Maximum time to wait for image generation (in milliseconds)
|
||||
# Default: 180000 (3 minutes)
|
||||
IMAGE_GENERATION_TIMEOUT=180000
|
||||
|
||||
# =============================================================================
|
||||
# STABLE DIFFUSION SETTINGS (Optional - Overrides n8n workflow defaults)
|
||||
# =============================================================================
|
||||
|
||||
# Default image dimensions
|
||||
SD_DEFAULT_WIDTH=1024
|
||||
SD_DEFAULT_HEIGHT=768
|
||||
|
||||
# Generation quality settings
|
||||
SD_DEFAULT_STEPS=30
|
||||
SD_DEFAULT_CFG_SCALE=7
|
||||
|
||||
# Sampler algorithm
|
||||
# Options: "Euler a", "DPM++ 2M Karras", "DDIM", etc.
|
||||
SD_DEFAULT_SAMPLER=DPM++ 2M Karras
|
||||
|
||||
# Default model checkpoint
|
||||
# SD_DEFAULT_MODEL=sd_xl_base_1.0.safetensors
|
||||
|
||||
# =============================================================================
|
||||
# FEATURE FLAGS (Optional)
|
||||
# =============================================================================
|
||||
|
||||
# Enable/disable specific features
|
||||
ENABLE_IMAGE_REGENERATION=true
|
||||
ENABLE_BATCH_GENERATION=false
|
||||
ENABLE_IMAGE_OPTIMIZATION=true
|
||||
|
||||
# =============================================================================
|
||||
# LOGGING & MONITORING (Optional)
|
||||
# =============================================================================
|
||||
|
||||
# Log all image generation requests
|
||||
LOG_IMAGE_GENERATION=true
|
||||
|
||||
# Send notifications on generation success/failure
|
||||
# DISCORD_WEBHOOK_URL=https://discord.com/api/webhooks/...
|
||||
# SLACK_WEBHOOK_URL=https://hooks.slack.com/services/...
|
||||
|
||||
# =============================================================================
|
||||
# ADVANCED SETTINGS (Optional)
|
||||
# =============================================================================
|
||||
|
||||
# Custom prompt prefix for all generations
|
||||
# SD_CUSTOM_PROMPT_PREFIX=professional tech illustration, modern design,
|
||||
|
||||
# Custom negative prompt suffix for all generations
|
||||
# SD_CUSTOM_NEGATIVE_SUFFIX=low quality, blurry, pixelated, text, watermark
|
||||
|
||||
# Image file naming pattern
|
||||
# Available variables: {projectId}, {timestamp}, {title}
|
||||
IMAGE_FILENAME_PATTERN=project-{projectId}-{timestamp}.png
|
||||
|
||||
# Maximum concurrent image generation requests
|
||||
MAX_CONCURRENT_GENERATIONS=2
|
||||
|
||||
# Retry failed generations
|
||||
AUTO_RETRY_ON_FAILURE=true
|
||||
MAX_RETRY_ATTEMPTS=3
|
||||
```
|
||||
|
||||
## Production Environment
|
||||
|
||||
For production deployments, adjust these settings:
|
||||
|
||||
```bash
|
||||
# Production n8n (if using cloud/dedicated instance)
|
||||
N8N_WEBHOOK_URL=https://n8n.yourdomain.com/webhook
|
||||
|
||||
# Production Stable Diffusion (if using dedicated GPU server)
|
||||
SD_API_URL=https://sd-api.yourdomain.com
|
||||
|
||||
# Production image storage (use absolute path)
|
||||
GENERATED_IMAGES_DIR=/var/www/portfolio/public/generated-images
|
||||
|
||||
# Disable auto-generation in production (manual only)
|
||||
AUTO_GENERATE_IMAGES=false
|
||||
|
||||
# Enable logging
|
||||
LOG_IMAGE_GENERATION=true
|
||||
|
||||
# Set timeouts appropriately
|
||||
IMAGE_GENERATION_TIMEOUT=300000
|
||||
|
||||
# Limit concurrent generations
|
||||
MAX_CONCURRENT_GENERATIONS=1
|
||||
```
|
||||
|
||||
## Docker Environment
|
||||
|
||||
If running in Docker, use these paths:
|
||||
|
||||
```bash
|
||||
# Docker-specific paths
|
||||
N8N_WEBHOOK_URL=http://n8n:5678/webhook
|
||||
SD_API_URL=http://stable-diffusion:7860
|
||||
GENERATED_IMAGES_DIR=/app/public/generated-images
|
||||
```
|
||||
|
||||
Add to `docker-compose.yml`:
|
||||
|
||||
```yaml
|
||||
services:
|
||||
portfolio:
|
||||
environment:
|
||||
- N8N_WEBHOOK_URL=http://n8n:5678/webhook
|
||||
- N8N_SECRET_TOKEN=${N8N_SECRET_TOKEN}
|
||||
- SD_API_URL=http://stable-diffusion:7860
|
||||
- AUTO_GENERATE_IMAGES=true
|
||||
- GENERATED_IMAGES_DIR=/app/public/generated-images
|
||||
volumes:
|
||||
- ./public/generated-images:/app/public/generated-images
|
||||
|
||||
n8n:
|
||||
image: n8nio/n8n
|
||||
ports:
|
||||
- "5678:5678"
|
||||
environment:
|
||||
- N8N_BASIC_AUTH_ACTIVE=true
|
||||
- N8N_BASIC_AUTH_USER=admin
|
||||
- N8N_BASIC_AUTH_PASSWORD=${N8N_PASSWORD}
|
||||
|
||||
stable-diffusion:
|
||||
image: your-sd-webui-image
|
||||
ports:
|
||||
- "7860:7860"
|
||||
deploy:
|
||||
resources:
|
||||
reservations:
|
||||
devices:
|
||||
- driver: nvidia
|
||||
count: 1
|
||||
capabilities: [gpu]
|
||||
```
|
||||
|
||||
## Cloud GPU Configuration
|
||||
|
||||
If using cloud GPU services (RunPod, vast.ai, etc.):
|
||||
|
||||
```bash
|
||||
# Remote GPU URL with authentication
|
||||
SD_API_URL=https://your-runpod-instance.com:7860
|
||||
SD_API_KEY=your-api-key-here
|
||||
|
||||
# Longer timeout for network latency
|
||||
IMAGE_GENERATION_TIMEOUT=300000
|
||||
```
|
||||
|
||||
## Security Best Practices
|
||||
|
||||
1. **Never commit `.env.local` to version control**
|
||||
```bash
|
||||
# Add to .gitignore
|
||||
echo ".env.local" >> .gitignore
|
||||
```
|
||||
|
||||
2. **Generate secure tokens**
|
||||
```bash
|
||||
# Generate N8N_SECRET_TOKEN
|
||||
openssl rand -hex 32
|
||||
|
||||
# Or using Node.js
|
||||
node -e "console.log(require('crypto').randomBytes(32).toString('hex'))"
|
||||
```
|
||||
|
||||
3. **Restrict API access**
|
||||
- Use firewall rules to limit SD API access
|
||||
- Enable authentication on n8n webhooks
|
||||
- Use HTTPS in production
|
||||
|
||||
4. **Environment-specific files**
|
||||
- `.env.local` - local development
|
||||
- `.env.production` - production (server-side only)
|
||||
- `.env.test` - testing environment
|
||||
|
||||
## Verifying Configuration
|
||||
|
||||
Test your environment variables:
|
||||
|
||||
```bash
|
||||
# Check if variables are loaded
|
||||
npm run dev
|
||||
|
||||
# In another terminal
|
||||
node -e "
|
||||
const envFile = require('fs').readFileSync('.env.local', 'utf8');
|
||||
console.log('✓ .env.local exists');
|
||||
console.log('✓ Variables found:', envFile.split('\\n').filter(l => l && !l.startsWith('#')).length);
|
||||
"
|
||||
|
||||
# Test n8n connection
|
||||
curl -f $N8N_WEBHOOK_URL/health || echo "n8n not reachable"
|
||||
|
||||
# Test SD API connection
|
||||
curl -f $SD_API_URL/sdapi/v1/sd-models || echo "SD API not reachable"
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Variables not loading
|
||||
|
||||
```bash
|
||||
# Ensure .env.local is in the project root
|
||||
ls -la .env.local
|
||||
|
||||
# Restart Next.js dev server
|
||||
npm run dev
|
||||
```
|
||||
|
||||
### Wrong paths in Docker
|
||||
|
||||
```bash
|
||||
# Check volume mounts
|
||||
docker-compose exec portfolio ls -la /app/public/generated-images
|
||||
|
||||
# Fix permissions
|
||||
docker-compose exec portfolio chmod 755 /app/public/generated-images
|
||||
```
|
||||
|
||||
### n8n webhook unreachable
|
||||
|
||||
```bash
|
||||
# Check n8n is running
|
||||
docker ps | grep n8n
|
||||
|
||||
# Check network connectivity
|
||||
docker-compose exec portfolio ping n8n
|
||||
|
||||
# Verify webhook URL in n8n UI
|
||||
```
|
||||
|
||||
## Example Complete Configuration
|
||||
|
||||
```bash
|
||||
# .env.local - Complete working example
|
||||
|
||||
# Database (required for project data)
|
||||
DATABASE_URL=postgresql://user:password@localhost:5432/portfolio
|
||||
|
||||
# NextAuth (if using authentication)
|
||||
NEXTAUTH_URL=http://localhost:3000
|
||||
NEXTAUTH_SECRET=your-nextauth-secret
|
||||
|
||||
# AI Image Generation
|
||||
N8N_WEBHOOK_URL=http://localhost:5678/webhook
|
||||
N8N_SECRET_TOKEN=a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r8s9t0u1v2w3x4y5z6
|
||||
SD_API_URL=http://localhost:7860
|
||||
AUTO_GENERATE_IMAGES=true
|
||||
GENERATED_IMAGES_DIR=/Users/dennis/code/gitea/portfolio/public/generated-images
|
||||
|
||||
# Image settings
|
||||
SD_DEFAULT_WIDTH=1024
|
||||
SD_DEFAULT_HEIGHT=768
|
||||
SD_DEFAULT_STEPS=30
|
||||
SD_DEFAULT_CFG_SCALE=7
|
||||
SD_DEFAULT_SAMPLER=DPM++ 2M Karras
|
||||
|
||||
# Optional features
|
||||
ENABLE_IMAGE_REGENERATION=true
|
||||
LOG_IMAGE_GENERATION=true
|
||||
IMAGE_GENERATION_TIMEOUT=180000
|
||||
MAX_CONCURRENT_GENERATIONS=2
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
**Note**: Always keep your `.env.local` file secure and never share tokens publicly!
|
||||
612
docs/ai-image-generation/PROMPT_TEMPLATES.md
Normal file
612
docs/ai-image-generation/PROMPT_TEMPLATES.md
Normal file
@@ -0,0 +1,612 @@
|
||||
# AI Image Generation Prompt Templates
|
||||
|
||||
This document contains optimized prompt templates for different project categories to ensure consistent, high-quality AI-generated images.
|
||||
|
||||
## Template Structure
|
||||
|
||||
Each template follows this structure:
|
||||
- **Base Prompt**: Core visual elements and style
|
||||
- **Technical Keywords**: Category-specific terminology
|
||||
- **Color Palette**: Recommended colors for the category
|
||||
- **Negative Prompt**: Elements to avoid
|
||||
- **Recommended Model**: Best SD model for this category
|
||||
|
||||
---
|
||||
|
||||
## Web Application Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
modern web application interface, clean dashboard UI, sleek web design,
|
||||
gradient backgrounds, glass morphism effect, floating panels,
|
||||
data visualization charts, modern typography,
|
||||
soft shadows, depth layers, isometric perspective,
|
||||
professional tech aesthetic, vibrant interface elements,
|
||||
smooth gradients, minimalist composition,
|
||||
4k resolution, high quality digital art
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- SaaS dashboard, web portal, admin panel
|
||||
- Interactive UI elements, responsive design
|
||||
- Navigation bars, sidebars, cards
|
||||
- Progress indicators, status badges
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#3B82F6` (Blue), `#8B5CF6` (Purple)
|
||||
- Secondary: `#06B6D4` (Cyan), `#EC4899` (Pink)
|
||||
- Accent: `#10B981` (Green), `#F59E0B` (Amber)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
mobile phone, smartphone, app mockup, tablet,
|
||||
realistic photo, stock photo, people, faces,
|
||||
cluttered, messy, dark, gloomy, text, watermark
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- SDXL Base 1.0
|
||||
- DreamShaper 8
|
||||
|
||||
---
|
||||
|
||||
## Mobile Application Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
modern mobile app interface mockup, sleek smartphone design,
|
||||
iOS or Android app screen, mobile UI elements,
|
||||
app icons grid, notification badges, bottom navigation,
|
||||
touch gestures indicators, smooth animations preview,
|
||||
gradient app background, modern mobile design trends,
|
||||
floating action button, card-based layout,
|
||||
professional mobile photography, studio lighting,
|
||||
4k quality, trending on dribbble
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- Native app, cross-platform, Flutter, React Native
|
||||
- Mobile-first design, touch interface
|
||||
- Swipe gestures, pull-to-refresh
|
||||
- Push notifications, app widgets
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#6366F1` (Indigo), `#EC4899` (Pink)
|
||||
- Secondary: `#8B5CF6` (Purple), `#06B6D4` (Cyan)
|
||||
- Accent: `#F59E0B` (Amber), `#EF4444` (Red)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
desktop interface, web browser, laptop, monitor,
|
||||
desktop computer, keyboard, mouse,
|
||||
old phone, cracked screen, low resolution,
|
||||
text, watermark, people holding phones
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- Realistic Vision V5.1
|
||||
- Juggernaut XL
|
||||
|
||||
---
|
||||
|
||||
## DevOps & Infrastructure Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
cloud infrastructure visualization, modern server architecture diagram,
|
||||
Docker containers network, Kubernetes cluster illustration,
|
||||
CI/CD pipeline flowchart, automated deployment system,
|
||||
interconnected server nodes, data flow arrows,
|
||||
cloud services icons, microservices architecture,
|
||||
network topology, distributed systems,
|
||||
glowing connections, tech blueprint style,
|
||||
isometric technical illustration, cyberpunk aesthetic,
|
||||
blue and orange tech colors, professional diagram
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- Docker Swarm, Kubernetes, container orchestration
|
||||
- CI/CD pipeline, Jenkins, GitHub Actions
|
||||
- Cloud architecture, AWS, Azure, GCP
|
||||
- Monitoring dashboard, Grafana, Prometheus
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#0EA5E9` (Sky Blue), `#F97316` (Orange)
|
||||
- Secondary: `#06B6D4` (Cyan), `#8B5CF6` (Purple)
|
||||
- Accent: `#10B981` (Green), `#EF4444` (Red)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
realistic datacenter photo, physical servers,
|
||||
people, technicians, hands, cables mess,
|
||||
dark server room, blurry, low quality,
|
||||
text labels, company logos, watermark
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- SDXL Base 1.0
|
||||
- DreamShaper 8
|
||||
|
||||
---
|
||||
|
||||
## Backend & API Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
API architecture visualization, RESTful endpoints diagram,
|
||||
database schema illustration, data flow architecture,
|
||||
server-side processing, microservices connections,
|
||||
API gateway, request-response flow,
|
||||
JSON data structures, GraphQL schema visualization,
|
||||
modern backend architecture, technical blueprint,
|
||||
glowing data streams, interconnected services,
|
||||
professional tech diagram, isometric view,
|
||||
clean composition, high quality illustration
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- REST API, GraphQL, WebSocket
|
||||
- Microservices, serverless functions
|
||||
- Database architecture, SQL, NoSQL
|
||||
- Authentication, JWT, OAuth
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#8B5CF6` (Purple), `#06B6D4` (Cyan)
|
||||
- Secondary: `#3B82F6` (Blue), `#10B981` (Green)
|
||||
- Accent: `#F59E0B` (Amber), `#EC4899` (Pink)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
frontend UI, user interface, buttons, forms,
|
||||
people, faces, hands, realistic photo,
|
||||
messy cables, physical hardware,
|
||||
text, code snippets, watermark
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- SDXL Base 1.0
|
||||
- DreamShaper 8
|
||||
|
||||
---
|
||||
|
||||
## AI & Machine Learning Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
artificial intelligence concept art, neural network visualization,
|
||||
glowing AI nodes and connections, machine learning algorithm,
|
||||
data science visualization, deep learning architecture,
|
||||
brain-inspired computing, futuristic AI interface,
|
||||
holographic data displays, floating neural pathways,
|
||||
AI chip design, quantum computing aesthetic,
|
||||
particle systems, energy flows, digital consciousness,
|
||||
sci-fi technology, purple and cyan neon lighting,
|
||||
high-tech laboratory, 4k quality, cinematic lighting
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- Neural networks, deep learning, TensorFlow
|
||||
- Computer vision, NLP, transformers
|
||||
- Model training, GPU acceleration
|
||||
- AI agents, reinforcement learning
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#8B5CF6` (Purple), `#EC4899` (Pink)
|
||||
- Secondary: `#06B6D4` (Cyan), `#3B82F6` (Blue)
|
||||
- Accent: `#A855F7` (Fuchsia), `#14B8A6` (Teal)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
realistic lab photo, scientists, people, faces,
|
||||
physical robots, mechanical parts,
|
||||
cluttered, messy, text, formulas, equations,
|
||||
low quality, dark, gloomy, stock photo
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- SDXL Base 1.0
|
||||
- Juggernaut XL
|
||||
|
||||
---
|
||||
|
||||
## Game Development Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
game environment scene, 3D rendered game world,
|
||||
video game interface, game UI overlay, HUD elements,
|
||||
fantasy game landscape, sci-fi game setting,
|
||||
character perspective view, gaming atmosphere,
|
||||
dynamic lighting, particle effects, atmospheric fog,
|
||||
game asset showcase, level design preview,
|
||||
cinematic game screenshot, unreal engine quality,
|
||||
vibrant game colors, epic composition,
|
||||
4k game graphics, trending on artstation
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- Unity, Unreal Engine, game engine
|
||||
- 3D modeling, texture mapping, shaders
|
||||
- Game mechanics, physics engine
|
||||
- Multiplayer, networking, matchmaking
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#EF4444` (Red), `#F59E0B` (Amber)
|
||||
- Secondary: `#8B5CF6` (Purple), `#06B6D4` (Cyan)
|
||||
- Accent: `#10B981` (Green), `#EC4899` (Pink)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
real photo, realistic photography, real people,
|
||||
mobile game screenshot, casual game,
|
||||
low poly, pixelated, retro graphics,
|
||||
text, game title, logos, watermark
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- Juggernaut XL
|
||||
- DreamShaper 8
|
||||
|
||||
---
|
||||
|
||||
## Blockchain & Crypto Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
blockchain network visualization, cryptocurrency concept art,
|
||||
distributed ledger technology, decentralized network nodes,
|
||||
crypto mining visualization, digital currency symbols,
|
||||
smart contracts interface, DeFi platform design,
|
||||
glowing blockchain connections, cryptographic security,
|
||||
web3 technology aesthetic, neon blockchain grid,
|
||||
futuristic finance, holographic crypto data,
|
||||
clean modern composition, professional tech illustration,
|
||||
blue and gold color scheme, high quality render
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- Smart contracts, Solidity, Ethereum
|
||||
- DeFi, NFT, token economics
|
||||
- Consensus mechanisms, proof of stake
|
||||
- Web3, dApp, wallet integration
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#F59E0B` (Gold), `#3B82F6` (Blue)
|
||||
- Secondary: `#8B5CF6` (Purple), `#10B981` (Green)
|
||||
- Accent: `#06B6D4` (Cyan), `#EC4899` (Pink)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
real coins, physical money, paper currency,
|
||||
people, traders, faces, hands,
|
||||
stock market photo, trading floor,
|
||||
text, ticker symbols, logos, watermark
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- SDXL Base 1.0
|
||||
- Juggernaut XL
|
||||
|
||||
---
|
||||
|
||||
## IoT & Hardware Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
Internet of Things network, smart home devices connected,
|
||||
IoT sensor network, embedded systems visualization,
|
||||
smart device ecosystem, wireless communication,
|
||||
connected hardware illustration, automation network,
|
||||
sensor data visualization, edge computing nodes,
|
||||
modern tech devices, clean product design,
|
||||
isometric hardware illustration, minimalist tech aesthetic,
|
||||
glowing connection lines, mesh network topology,
|
||||
professional product photography, studio lighting
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- Raspberry Pi, Arduino, ESP32
|
||||
- Sensor networks, MQTT, edge computing
|
||||
- Smart home, automation, wireless protocols
|
||||
- Embedded systems, firmware, microcontrollers
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#10B981` (Green), `#06B6D4` (Cyan)
|
||||
- Secondary: `#3B82F6` (Blue), `#8B5CF6` (Purple)
|
||||
- Accent: `#F59E0B` (Amber), `#EC4899` (Pink)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
messy wiring, cluttered breadboard, realistic lab photo,
|
||||
people, hands holding devices, technicians,
|
||||
old electronics, broken hardware,
|
||||
text, labels, brand names, watermark
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- Realistic Vision V5.1
|
||||
- Juggernaut XL
|
||||
|
||||
---
|
||||
|
||||
## Security & Cybersecurity Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
cybersecurity concept art, digital security shield,
|
||||
encrypted data streams, firewall visualization,
|
||||
network security diagram, threat detection system,
|
||||
secure connection network, cryptography illustration,
|
||||
cyber defense interface, security monitoring dashboard,
|
||||
glowing security barriers, protected data vault,
|
||||
ethical hacking interface, penetration testing tools,
|
||||
dark mode tech aesthetic, green matrix-style code,
|
||||
professional security illustration, high-tech composition
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- Penetration testing, vulnerability scanning
|
||||
- Firewall, IDS/IPS, SIEM
|
||||
- Encryption, SSL/TLS, zero trust
|
||||
- Security monitoring, threat intelligence
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#10B981` (Green), `#0EA5E9` (Sky Blue)
|
||||
- Secondary: `#8B5CF6` (Purple), `#EF4444` (Red)
|
||||
- Accent: `#F59E0B` (Amber), `#06B6D4` (Cyan)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
realistic office photo, security guards, people,
|
||||
physical locks, keys, cameras,
|
||||
dark, scary, threatening, ominous,
|
||||
text, code snippets, terminal text, watermark
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- SDXL Base 1.0
|
||||
- DreamShaper 8
|
||||
|
||||
---
|
||||
|
||||
## Data Science & Analytics Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
data visualization dashboard, analytics interface,
|
||||
big data processing, statistical charts and graphs,
|
||||
machine learning insights, predictive analytics,
|
||||
data pipeline illustration, ETL process visualization,
|
||||
interactive data dashboard, business intelligence,
|
||||
colorful data charts, infographic elements,
|
||||
modern analytics design, clean data presentation,
|
||||
professional data visualization, gradient backgrounds,
|
||||
isometric data center, flowing information streams
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- Data pipeline, ETL, data warehouse
|
||||
- BI dashboard, Tableau, Power BI
|
||||
- Statistical analysis, data mining
|
||||
- Pandas, NumPy, data processing
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#3B82F6` (Blue), `#8B5CF6` (Purple)
|
||||
- Secondary: `#06B6D4` (Cyan), `#10B981` (Green)
|
||||
- Accent: `#EC4899` (Pink), `#F59E0B` (Amber)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
spreadsheet screenshot, Excel interface,
|
||||
people analyzing data, hands, faces,
|
||||
cluttered charts, messy graphs, confusing layout,
|
||||
text labels, numbers, watermark, low quality
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- SDXL Base 1.0
|
||||
- DreamShaper 8
|
||||
|
||||
---
|
||||
|
||||
## E-commerce & Marketplace Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
modern e-commerce platform interface, online shopping design,
|
||||
product showcase grid, shopping cart visualization,
|
||||
payment system interface, marketplace dashboard,
|
||||
product cards layout, checkout flow design,
|
||||
clean storefront design, modern retail aesthetic,
|
||||
shopping bag icons, product imagery, price tags design,
|
||||
conversion-optimized layout, mobile commerce,
|
||||
professional e-commerce photography, studio product shots,
|
||||
vibrant shopping experience, user-friendly interface
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- Online store, payment gateway, Stripe
|
||||
- Product catalog, inventory management
|
||||
- Shopping cart, checkout flow, conversion
|
||||
- Marketplace platform, vendor management
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#EC4899` (Pink), `#F59E0B` (Amber)
|
||||
- Secondary: `#8B5CF6` (Purple), `#10B981` (Green)
|
||||
- Accent: `#3B82F6` (Blue), `#EF4444` (Red)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
realistic store photo, physical shop, retail store,
|
||||
people shopping, customers, cashiers, hands,
|
||||
cluttered shelves, messy products,
|
||||
text prices, brand logos, watermark
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- Realistic Vision V5.1
|
||||
- Juggernaut XL
|
||||
|
||||
---
|
||||
|
||||
## Automation & Workflow Projects
|
||||
|
||||
### Base Prompt
|
||||
```
|
||||
workflow automation visualization, process flow diagram,
|
||||
automated pipeline illustration, task orchestration,
|
||||
business process automation, workflow nodes connected,
|
||||
integration platform design, automation dashboard,
|
||||
robotic process automation, efficiency visualization,
|
||||
streamlined processes, gear mechanisms, conveyor systems,
|
||||
modern workflow interface, productivity tools,
|
||||
clean automation design, professional illustration,
|
||||
isometric process view, smooth gradient backgrounds
|
||||
```
|
||||
|
||||
### Technical Keywords
|
||||
- n8n, Zapier, workflow automation
|
||||
- Integration platform, API orchestration
|
||||
- Task scheduling, cron jobs, triggers
|
||||
- Business process automation, RPA
|
||||
|
||||
### Color Palette
|
||||
- Primary: `#8B5CF6` (Purple), `#06B6D4` (Cyan)
|
||||
- Secondary: `#10B981` (Green), `#3B82F6` (Blue)
|
||||
- Accent: `#F59E0B` (Amber), `#EC4899` (Pink)
|
||||
|
||||
### Negative Prompt
|
||||
```
|
||||
realistic factory photo, physical machinery,
|
||||
people working, hands, faces, workers,
|
||||
cluttered, messy, industrial setting,
|
||||
text, labels, watermark, low quality
|
||||
```
|
||||
|
||||
### Recommended Model
|
||||
- SDXL Base 1.0
|
||||
- DreamShaper 8
|
||||
|
||||
---
|
||||
|
||||
## Universal Negative Prompt
|
||||
|
||||
Use this as a base for all generations:
|
||||
|
||||
```
|
||||
low quality, blurry, pixelated, grainy, jpeg artifacts, compression artifacts,
|
||||
text, letters, words, numbers, watermark, signature, copyright, logo, brand name,
|
||||
people, person, human, face, faces, hands, fingers, arms, body parts,
|
||||
portrait, selfie, crowd, group of people,
|
||||
cluttered, messy, chaotic, disorganized, busy, overwhelming,
|
||||
dark, gloomy, depressing, scary, ominous, threatening,
|
||||
ugly, distorted, deformed, mutation, extra limbs, bad anatomy,
|
||||
realistic photo, stock photo, photograph, camera phone,
|
||||
duplicate, duplication, repetitive, copied elements,
|
||||
old, outdated, vintage, retro (unless specifically wanted),
|
||||
screenshot, UI screenshot, browser window
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Prompt Engineering Best Practices
|
||||
|
||||
### 1. Specificity Matters
|
||||
- Be specific about visual elements you want
|
||||
- Include style keywords: "isometric", "minimalist", "modern"
|
||||
- Specify quality: "4k resolution", "high quality", "professional"
|
||||
|
||||
### 2. Weight Distribution
|
||||
- Most important elements should be early in the prompt
|
||||
- Use emphasis syntax if your tool supports it: `(keyword:1.2)` or `((keyword))`
|
||||
|
||||
### 3. Category Mixing
|
||||
- Combine multiple category templates for hybrid projects
|
||||
- Example: AI + Web App = neural network + modern dashboard UI
|
||||
|
||||
### 4. Color Psychology
|
||||
- **Blue**: Trust, technology, corporate
|
||||
- **Purple**: Innovation, creativity, luxury
|
||||
- **Green**: Growth, success, eco-friendly
|
||||
- **Orange**: Energy, action, excitement
|
||||
- **Pink**: Modern, playful, creative
|
||||
|
||||
### 5. Consistency
|
||||
- Use the same negative prompt across all generations
|
||||
- Maintain consistent aspect ratios (4:3 for project cards)
|
||||
- Stick to similar quality settings
|
||||
|
||||
### 6. A/B Testing
|
||||
- Generate 2-3 variants with slightly different prompts
|
||||
- Test which style resonates better with your audience
|
||||
- Refine prompts based on results
|
||||
|
||||
---
|
||||
|
||||
## Advanced Techniques
|
||||
|
||||
### ControlNet Integration
|
||||
If using ControlNet, you can guide composition:
|
||||
- Use Canny edge detection for layout control
|
||||
- Use Depth maps for 3D perspective
|
||||
- Use OpenPose for element positioning
|
||||
|
||||
### Multi-Stage Generation
|
||||
1. Generate base composition at lower resolution (512x512)
|
||||
2. Upscale using img2img with same prompt
|
||||
3. Apply post-processing (sharpening, color grading)
|
||||
|
||||
### Style Consistency
|
||||
To maintain consistent style across all project images:
|
||||
```
|
||||
Add to every prompt:
|
||||
"in the style of modern tech illustration, consistent design language,
|
||||
professional portfolio aesthetic, cohesive visual identity"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Troubleshooting Common Issues
|
||||
|
||||
### Issue: Too Abstract / Not Related to Project
|
||||
**Solution**: Add more specific technical keywords from project description
|
||||
|
||||
### Issue: Text Appearing in Images
|
||||
**Solution**: Add multiple text-related terms to negative prompt:
|
||||
`text, letters, words, typography, font, writing, characters`
|
||||
|
||||
### Issue: Dark or Poorly Lit
|
||||
**Solution**: Add lighting keywords:
|
||||
`studio lighting, bright, well-lit, soft lighting, professional lighting`
|
||||
|
||||
### Issue: Cluttered Composition
|
||||
**Solution**: Add composition keywords:
|
||||
`clean composition, minimalist, negative space, centered, balanced, organized`
|
||||
|
||||
### Issue: Wrong Aspect Ratio
|
||||
**Solution**: Specify dimensions explicitly in generation settings:
|
||||
- Cards: 1024x768 (4:3)
|
||||
- Hero: 1920x1080 (16:9)
|
||||
- Square: 1024x1024 (1:1)
|
||||
|
||||
---
|
||||
|
||||
## Quick Reference Card
|
||||
|
||||
| Category | Primary Colors | Key Style | Model |
|
||||
|----------|---------------|-----------|-------|
|
||||
| Web | Blue, Purple | Glass UI | SDXL |
|
||||
| Mobile | Indigo, Pink | Mockup | Realistic Vision |
|
||||
| DevOps | Cyan, Orange | Diagram | SDXL |
|
||||
| AI/ML | Purple, Cyan | Futuristic | SDXL |
|
||||
| Game | Red, Amber | Cinematic | Juggernaut |
|
||||
| Blockchain | Gold, Blue | Neon | SDXL |
|
||||
| IoT | Green, Cyan | Product | Realistic Vision |
|
||||
| Security | Green, Blue | Dark Tech | SDXL |
|
||||
| Data | Blue, Purple | Charts | SDXL |
|
||||
|
||||
---
|
||||
|
||||
**Last Updated**: 2024
|
||||
**Version**: 1.0
|
||||
**Maintained by**: Portfolio AI Image Generation System
|
||||
366
docs/ai-image-generation/QUICKSTART.md
Normal file
366
docs/ai-image-generation/QUICKSTART.md
Normal file
@@ -0,0 +1,366 @@
|
||||
# Quick Start Guide: AI Image Generation
|
||||
|
||||
Get AI-powered project images up and running in 15 minutes.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- Docker installed
|
||||
- 8GB+ RAM
|
||||
- GPU recommended (NVIDIA with CUDA support)
|
||||
- Node.js 18+ for portfolio app
|
||||
|
||||
## Step 1: Install Stable Diffusion WebUI (5 min)
|
||||
|
||||
```bash
|
||||
# Clone the repository
|
||||
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
|
||||
cd stable-diffusion-webui
|
||||
|
||||
# Run with API enabled
|
||||
./webui.sh --api --listen
|
||||
|
||||
# For low VRAM GPUs (< 8GB)
|
||||
./webui.sh --api --listen --medvram
|
||||
|
||||
# Wait for model download and startup
|
||||
# Access WebUI at: http://localhost:7860
|
||||
```
|
||||
|
||||
## Step 2: Download a Model (3 min)
|
||||
|
||||
Open WebUI at `http://localhost:7860` and download a model:
|
||||
|
||||
**Option A: Via WebUI**
|
||||
1. Go to **Checkpoint Merger** tab
|
||||
2. Click **Model Download**
|
||||
3. Enter: `stabilityai/stable-diffusion-xl-base-1.0`
|
||||
4. Wait for download (6.94 GB)
|
||||
|
||||
**Option B: Manual Download**
|
||||
```bash
|
||||
cd models/Stable-diffusion/
|
||||
wget https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors
|
||||
```
|
||||
|
||||
## Step 3: Test Stable Diffusion API (1 min)
|
||||
|
||||
```bash
|
||||
curl -X POST http://localhost:7860/sdapi/v1/txt2img \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"prompt": "modern tech dashboard, blue gradient, minimalist design",
|
||||
"steps": 20,
|
||||
"width": 512,
|
||||
"height": 512
|
||||
}' | jq '.images[0]' | base64 -d > test.png
|
||||
```
|
||||
|
||||
Open `test.png` - if you see an image, API is working! ✅
|
||||
|
||||
## Step 4: Setup n8n (2 min)
|
||||
|
||||
```bash
|
||||
# Docker Compose method
|
||||
docker run -d \
|
||||
--name n8n \
|
||||
-p 5678:5678 \
|
||||
-v ~/.n8n:/home/node/.n8n \
|
||||
n8nio/n8n
|
||||
|
||||
# Wait 30 seconds for startup
|
||||
# Access n8n at: http://localhost:5678
|
||||
```
|
||||
|
||||
## Step 5: Import Workflow (1 min)
|
||||
|
||||
1. Open n8n at `http://localhost:5678`
|
||||
2. Create account (first time only)
|
||||
3. Click **+ New Workflow**
|
||||
4. Click **⋮** (three dots) → **Import from File**
|
||||
5. Select `docs/ai-image-generation/n8n-workflow-ai-image-generator.json`
|
||||
6. Click **Save**
|
||||
|
||||
## Step 6: Configure Workflow (2 min)
|
||||
|
||||
### A. Add PostgreSQL Credentials
|
||||
1. Click **Get Project Data** node
|
||||
2. Click **Credential to connect with**
|
||||
3. Enter your database credentials:
|
||||
- Host: `localhost` (or your DB host)
|
||||
- Database: `portfolio`
|
||||
- User: `your_username`
|
||||
- Password: `your_password`
|
||||
4. Click **Save**
|
||||
|
||||
### B. Configure Stable Diffusion URL
|
||||
1. Click **Generate Image (Stable Diffusion)** node
|
||||
2. Update URL to: `http://localhost:7860/sdapi/v1/txt2img`
|
||||
3. If SD is on different machine: `http://YOUR_SD_IP:7860/sdapi/v1/txt2img`
|
||||
|
||||
### C. Set Webhook Authentication
|
||||
1. Click **Webhook Trigger** node
|
||||
2. Click **Add Credential**
|
||||
3. Set header: `Authorization`
|
||||
4. Set value: `Bearer your-secret-token-here`
|
||||
5. Save this token - you'll need it!
|
||||
|
||||
### D. Update Image Save Path
|
||||
1. Click **Save Image to File** node
|
||||
2. Update `uploadDir` path to your portfolio's public folder:
|
||||
```javascript
|
||||
const uploadDir = '/path/to/portfolio/public/generated-images';
|
||||
```
|
||||
|
||||
## Step 7: Create Directory for Images (1 min)
|
||||
|
||||
```bash
|
||||
cd /path/to/portfolio
|
||||
mkdir -p public/generated-images
|
||||
chmod 755 public/generated-images
|
||||
```
|
||||
|
||||
## Step 8: Add Environment Variables (1 min)
|
||||
|
||||
Add to `portfolio/.env.local`:
|
||||
|
||||
```bash
|
||||
# n8n Webhook Configuration
|
||||
N8N_WEBHOOK_URL=http://localhost:5678/webhook
|
||||
N8N_SECRET_TOKEN=your-secret-token-here
|
||||
|
||||
# Stable Diffusion API
|
||||
SD_API_URL=http://localhost:7860
|
||||
|
||||
# Auto-generate images for new projects
|
||||
AUTO_GENERATE_IMAGES=true
|
||||
|
||||
# Image storage
|
||||
GENERATED_IMAGES_DIR=/path/to/portfolio/public/generated-images
|
||||
```
|
||||
|
||||
## Step 9: Test the Full Pipeline (2 min)
|
||||
|
||||
```bash
|
||||
# Start your portfolio app
|
||||
cd portfolio
|
||||
npm run dev
|
||||
|
||||
# In another terminal, trigger image generation
|
||||
curl -X POST http://localhost:5678/webhook/ai-image-generation \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer your-secret-token-here" \
|
||||
-d '{
|
||||
"projectId": 1
|
||||
}'
|
||||
|
||||
# Check response (should take 15-30 seconds)
|
||||
# Response example:
|
||||
# {
|
||||
# "success": true,
|
||||
# "projectId": 1,
|
||||
# "imageUrl": "/generated-images/project-1-1234567890.png",
|
||||
# "generatedAt": "2024-01-15T10:30:00Z"
|
||||
# }
|
||||
```
|
||||
|
||||
## Step 10: Verify Image (1 min)
|
||||
|
||||
```bash
|
||||
# Check if image was created
|
||||
ls -lh public/generated-images/
|
||||
|
||||
# Open in browser
|
||||
open http://localhost:3000/generated-images/project-1-*.png
|
||||
```
|
||||
|
||||
You should see a generated image! 🎉
|
||||
|
||||
---
|
||||
|
||||
## Using the Admin UI
|
||||
|
||||
If you created the admin component:
|
||||
|
||||
1. Navigate to your admin page (create one if needed)
|
||||
2. Add the AI Image Generator component:
|
||||
|
||||
```tsx
|
||||
import AIImageGenerator from '@/app/components/admin/AIImageGenerator';
|
||||
|
||||
<AIImageGenerator
|
||||
projectId={projectId}
|
||||
projectTitle="My Awesome Project"
|
||||
currentImageUrl={project.imageUrl}
|
||||
onImageGenerated={(url) => console.log('Generated:', url)}
|
||||
/>
|
||||
```
|
||||
|
||||
3. Click **Generate Image** button
|
||||
4. Wait 15-30 seconds
|
||||
5. Image appears automatically!
|
||||
|
||||
---
|
||||
|
||||
## Automatic Generation on New Projects
|
||||
|
||||
Add this to your project creation API:
|
||||
|
||||
```typescript
|
||||
// In portfolio/app/api/projects/route.ts (or similar)
|
||||
|
||||
export async function POST(req: Request) {
|
||||
// ... your project creation code ...
|
||||
|
||||
const newProject = await createProject(data);
|
||||
|
||||
// Trigger AI image generation
|
||||
if (process.env.AUTO_GENERATE_IMAGES === 'true') {
|
||||
fetch(`${process.env.N8N_WEBHOOK_URL}/ai-image-generation`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${process.env.N8N_SECRET_TOKEN}`
|
||||
},
|
||||
body: JSON.stringify({ projectId: newProject.id })
|
||||
}).catch(err => console.error('AI generation failed:', err));
|
||||
}
|
||||
|
||||
return NextResponse.json(newProject);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### "Connection refused to localhost:7860"
|
||||
```bash
|
||||
# Check if SD WebUI is running
|
||||
ps aux | grep webui
|
||||
|
||||
# Restart with API flag
|
||||
cd stable-diffusion-webui
|
||||
./webui.sh --api --listen
|
||||
```
|
||||
|
||||
### "CUDA out of memory"
|
||||
```bash
|
||||
# Restart with lower VRAM usage
|
||||
./webui.sh --api --listen --medvram
|
||||
|
||||
# Or even lower
|
||||
./webui.sh --api --listen --lowvram
|
||||
```
|
||||
|
||||
### "n8n workflow fails at database step"
|
||||
- Check PostgreSQL is running: `pg_isready`
|
||||
- Verify credentials in n8n node
|
||||
- Check database connection from terminal:
|
||||
```bash
|
||||
psql -h localhost -U your_username -d portfolio
|
||||
```
|
||||
|
||||
### "Image saves but doesn't appear on website"
|
||||
- Check directory permissions: `chmod 755 public/generated-images`
|
||||
- Verify path in n8n workflow matches portfolio structure
|
||||
- Check Next.js static files config in `next.config.js`
|
||||
|
||||
### "Generated images are low quality"
|
||||
Edit n8n workflow's SD node, increase:
|
||||
- `steps`: 20 → 40
|
||||
- `cfg_scale`: 7 → 9
|
||||
- `width/height`: 512 → 1024
|
||||
|
||||
### "Images don't match project theme"
|
||||
Edit **Build AI Prompt** node in n8n:
|
||||
- Add more specific technical keywords
|
||||
- Include project category in style description
|
||||
- Adjust color palette keywords
|
||||
|
||||
---
|
||||
|
||||
## Next Steps
|
||||
|
||||
✅ **You're done!** Images now generate automatically.
|
||||
|
||||
**Optional Enhancements:**
|
||||
|
||||
1. **Batch Generate**: Generate images for all existing projects
|
||||
```bash
|
||||
# Create a script: scripts/batch-generate-images.ts
|
||||
for projectId in $(psql -t -c "SELECT id FROM projects WHERE image_url IS NULL"); do
|
||||
curl -X POST http://localhost:5678/webhook/ai-image-generation \
|
||||
-H "Authorization: Bearer $N8N_SECRET_TOKEN" \
|
||||
-d "{\"projectId\": $projectId}"
|
||||
sleep 30 # Wait for generation
|
||||
done
|
||||
```
|
||||
|
||||
2. **Custom Models**: Download specialized models for better results
|
||||
- `dreamshaper_8.safetensors` for web/UI projects
|
||||
- `realisticVision_v51.safetensors` for product shots
|
||||
- `juggernautXL_v8.safetensors` for modern tech aesthetics
|
||||
|
||||
3. **Prompt Refinement**: Edit prompt templates in n8n workflow
|
||||
- Check `docs/ai-image-generation/PROMPT_TEMPLATES.md`
|
||||
- Test different styles for your brand
|
||||
|
||||
4. **Monitoring**: Set up logging and alerts
|
||||
- Add Discord/Slack notifications to n8n workflow
|
||||
- Log generation stats to analytics
|
||||
|
||||
5. **Optimization**: Compress images after generation
|
||||
```bash
|
||||
npm install sharp
|
||||
# Add post-processing step to n8n workflow
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Performance Benchmarks
|
||||
|
||||
| Hardware | Generation Time | Image Quality |
|
||||
|----------|----------------|---------------|
|
||||
| RTX 4090 | ~8 seconds | Excellent |
|
||||
| RTX 3080 | ~15 seconds | Excellent |
|
||||
| RTX 3060 | ~25 seconds | Good |
|
||||
| GTX 1660 | ~45 seconds | Good |
|
||||
| CPU only | ~5 minutes | Fair |
|
||||
|
||||
**Recommended**: RTX 3060 or better for production use.
|
||||
|
||||
---
|
||||
|
||||
## Cost Analysis
|
||||
|
||||
**Local Setup (One-time):**
|
||||
- GPU (RTX 3060): ~$300-400
|
||||
- OR Cloud GPU (RunPod, vast.ai): $0.20-0.50/hour
|
||||
|
||||
**Per Image Cost:**
|
||||
- Local: $0.00 (electricity ~$0.001)
|
||||
- Cloud GPU: ~$0.01-0.02 per image
|
||||
|
||||
**vs. Commercial APIs:**
|
||||
- DALL-E 3: $0.04 per image
|
||||
- Midjourney: ~$0.06 per image (with subscription)
|
||||
- Stable Diffusion API: $0.02 per image
|
||||
|
||||
💡 **Break-even**: After ~500 images, local setup pays for itself!
|
||||
|
||||
---
|
||||
|
||||
## Support & Resources
|
||||
|
||||
- **Documentation**: `docs/ai-image-generation/SETUP.md`
|
||||
- **Prompt Templates**: `docs/ai-image-generation/PROMPT_TEMPLATES.md`
|
||||
- **SD WebUI Wiki**: https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki
|
||||
- **n8n Documentation**: https://docs.n8n.io
|
||||
- **Community Discord**: [Your Discord link]
|
||||
|
||||
**Need Help?** Open an issue or reach out!
|
||||
|
||||
---
|
||||
|
||||
**Total Setup Time**: ~15 minutes
|
||||
**Result**: Automatic AI-generated project images 🎨✨
|
||||
423
docs/ai-image-generation/README.md
Normal file
423
docs/ai-image-generation/README.md
Normal file
@@ -0,0 +1,423 @@
|
||||
# AI Image Generation System
|
||||
|
||||
Automatically generate stunning project cover images using local AI models.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## 🎨 What is this?
|
||||
|
||||
This system automatically creates professional, tech-themed cover images for your portfolio projects using AI. No more stock photos, no design skills needed.
|
||||
|
||||
### Features
|
||||
|
||||
✨ **Fully Automatic** - Generate images when creating new projects
|
||||
🎯 **Context-Aware** - Uses project title, description, category, and tech stack
|
||||
🖼️ **High Quality** - 1024x768 optimized for web display
|
||||
🔒 **Privacy-First** - Runs 100% locally, no data sent to external APIs
|
||||
⚡ **Fast** - 15-30 seconds per image with GPU
|
||||
💰 **Free** - No per-image costs after initial setup
|
||||
🎨 **Customizable** - Full control over style, colors, and aesthetics
|
||||
|
||||
## 🚀 Quick Start
|
||||
|
||||
**Want to get started in 15 minutes?** → Check out [QUICKSTART.md](./QUICKSTART.md)
|
||||
|
||||
**For detailed setup and configuration** → See [SETUP.md](./SETUP.md)
|
||||
|
||||
## 📋 Table of Contents
|
||||
|
||||
- [How It Works](#how-it-works)
|
||||
- [System Architecture](#system-architecture)
|
||||
- [Installation](#installation)
|
||||
- [Usage](#usage)
|
||||
- [Prompt Engineering](#prompt-engineering)
|
||||
- [Examples](#examples)
|
||||
- [Troubleshooting](#troubleshooting)
|
||||
- [FAQ](#faq)
|
||||
|
||||
## 🔧 How It Works
|
||||
|
||||
```mermaid
|
||||
graph LR
|
||||
A[Create Project] --> B[Trigger n8n Webhook]
|
||||
B --> C[Fetch Project Data]
|
||||
C --> D[Build AI Prompt]
|
||||
D --> E[Stable Diffusion]
|
||||
E --> F[Save Image]
|
||||
F --> G[Update Database]
|
||||
G --> H[Display on Site]
|
||||
```
|
||||
|
||||
1. **Project Creation**: You create or update a project
|
||||
2. **Data Extraction**: System reads project metadata (title, description, tags, category)
|
||||
3. **Prompt Generation**: AI-optimized prompt is created based on project type
|
||||
4. **Image Generation**: Stable Diffusion generates a unique image
|
||||
5. **Storage**: Image is saved and optimized
|
||||
6. **Database Update**: Project's `imageUrl` is updated
|
||||
7. **Display**: Image appears automatically on your portfolio
|
||||
|
||||
## 🏗️ System Architecture
|
||||
|
||||
```
|
||||
┌─────────────────┐
|
||||
│ Portfolio App │
|
||||
│ (Next.js) │
|
||||
└────────┬────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────┐ ┌─────────────────┐
|
||||
│ n8n Workflow │─────▶│ PostgreSQL DB │
|
||||
│ (Automation) │◀─────│ (Projects) │
|
||||
└────────┬────────┘ └─────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────┐
|
||||
│ Stable Diffusion│
|
||||
│ WebUI │
|
||||
│ (Image Gen) │
|
||||
└─────────────────┘
|
||||
```
|
||||
|
||||
### Components
|
||||
|
||||
- **Next.js App**: Frontend and API endpoints
|
||||
- **n8n**: Workflow automation and orchestration
|
||||
- **Stable Diffusion**: Local AI image generation
|
||||
- **PostgreSQL**: Project data storage
|
||||
- **File System**: Generated image storage
|
||||
|
||||
## 📦 Installation
|
||||
|
||||
### Prerequisites
|
||||
|
||||
- **Node.js** 18+
|
||||
- **Docker** (recommended) or Python 3.10+
|
||||
- **PostgreSQL** database
|
||||
- **8GB+ RAM** minimum
|
||||
- **GPU recommended** (NVIDIA with CUDA support)
|
||||
- Minimum: GTX 1060 6GB
|
||||
- Recommended: RTX 3060 12GB or better
|
||||
- Also works on CPU (slower)
|
||||
|
||||
### Step-by-Step Setup
|
||||
|
||||
#### 1. Install Stable Diffusion WebUI
|
||||
|
||||
```bash
|
||||
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
|
||||
cd stable-diffusion-webui
|
||||
./webui.sh --api --listen
|
||||
```
|
||||
|
||||
Wait for model download (~7GB). Access at: `http://localhost:7860`
|
||||
|
||||
#### 2. Install n8n
|
||||
|
||||
```bash
|
||||
# Docker (recommended)
|
||||
docker run -d --name n8n -p 5678:5678 -v ~/.n8n:/home/node/.n8n n8nio/n8n
|
||||
|
||||
# Or npm
|
||||
npm install -g n8n
|
||||
n8n start
|
||||
```
|
||||
|
||||
Access at: `http://localhost:5678`
|
||||
|
||||
#### 3. Import Workflow
|
||||
|
||||
1. Open n8n at `http://localhost:5678`
|
||||
2. Import `n8n-workflow-ai-image-generator.json`
|
||||
3. Configure database credentials
|
||||
4. Update Stable Diffusion API URL
|
||||
5. Set webhook authentication token
|
||||
|
||||
#### 4. Configure Portfolio App
|
||||
|
||||
Add to `.env.local`:
|
||||
|
||||
```bash
|
||||
N8N_WEBHOOK_URL=http://localhost:5678/webhook
|
||||
N8N_SECRET_TOKEN=your-secure-token-here
|
||||
SD_API_URL=http://localhost:7860
|
||||
AUTO_GENERATE_IMAGES=true
|
||||
GENERATED_IMAGES_DIR=/path/to/portfolio/public/generated-images
|
||||
```
|
||||
|
||||
#### 5. Create Image Directory
|
||||
|
||||
```bash
|
||||
mkdir -p public/generated-images
|
||||
chmod 755 public/generated-images
|
||||
```
|
||||
|
||||
**That's it!** 🎉 You're ready to generate images.
|
||||
|
||||
## 💻 Usage
|
||||
|
||||
### Automatic Generation
|
||||
|
||||
When you create a new project, an image is automatically generated:
|
||||
|
||||
```typescript
|
||||
// In your project creation API
|
||||
const newProject = await createProject(data);
|
||||
|
||||
if (process.env.AUTO_GENERATE_IMAGES === 'true') {
|
||||
await fetch(`${process.env.N8N_WEBHOOK_URL}/ai-image-generation`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${process.env.N8N_SECRET_TOKEN}`
|
||||
},
|
||||
body: JSON.stringify({ projectId: newProject.id })
|
||||
});
|
||||
}
|
||||
```
|
||||
|
||||
### Manual Generation via API
|
||||
|
||||
```bash
|
||||
curl -X POST http://localhost:3000/api/n8n/generate-image \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "Authorization: Bearer YOUR_TOKEN" \
|
||||
-d '{"projectId": 123}'
|
||||
```
|
||||
|
||||
### Admin UI Component
|
||||
|
||||
```tsx
|
||||
import AIImageGenerator from '@/app/components/admin/AIImageGenerator';
|
||||
|
||||
<AIImageGenerator
|
||||
projectId={project.id}
|
||||
projectTitle={project.title}
|
||||
currentImageUrl={project.imageUrl}
|
||||
onImageGenerated={(url) => {
|
||||
console.log('New image:', url);
|
||||
}}
|
||||
/>
|
||||
```
|
||||
|
||||
### Batch Generation
|
||||
|
||||
Generate images for all existing projects:
|
||||
|
||||
```bash
|
||||
# Get all projects without images
|
||||
psql -d portfolio -t -c "SELECT id FROM projects WHERE image_url IS NULL" | while read id; do
|
||||
curl -X POST http://localhost:3000/api/n8n/generate-image \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"projectId\": $id}"
|
||||
sleep 30 # Wait for generation
|
||||
done
|
||||
```
|
||||
|
||||
## 🎯 Prompt Engineering
|
||||
|
||||
The system automatically generates optimized prompts based on project category:
|
||||
|
||||
### Web Application Example
|
||||
|
||||
**Input Project:**
|
||||
- Title: "Real-Time Analytics Dashboard"
|
||||
- Category: "web"
|
||||
- Tags: ["React", "Next.js", "TypeScript"]
|
||||
|
||||
**Generated Prompt:**
|
||||
```
|
||||
Professional tech project cover image, modern web interface,
|
||||
clean dashboard UI, gradient backgrounds, glass morphism effect,
|
||||
representing "Real-Time Analytics Dashboard", React, Next.js, TypeScript,
|
||||
modern minimalist design, vibrant gradient colors, high quality digital art,
|
||||
isometric perspective, color palette: cyan, purple, pink, blue accents,
|
||||
4k resolution, no text, no watermarks, futuristic, professional
|
||||
```
|
||||
|
||||
**Result:** Clean, modern dashboard visualization in your brand colors
|
||||
|
||||
### Customize Prompts
|
||||
|
||||
Edit the `Build AI Prompt` node in n8n workflow to customize:
|
||||
|
||||
```javascript
|
||||
// Add your brand colors
|
||||
const brandColors = 'navy blue, gold accents, white backgrounds';
|
||||
|
||||
// Add style preferences
|
||||
const stylePreference = 'minimalist, clean, corporate, professional';
|
||||
|
||||
// Modify prompt template
|
||||
const prompt = `
|
||||
${categoryStyle},
|
||||
${projectTitle},
|
||||
${brandColors},
|
||||
${stylePreference},
|
||||
4k quality, trending on artstation
|
||||
`;
|
||||
```
|
||||
|
||||
See [PROMPT_TEMPLATES.md](./PROMPT_TEMPLATES.md) for category-specific templates.
|
||||
|
||||
## 🖼️ Examples
|
||||
|
||||
### Before & After
|
||||
|
||||
| Category | Without AI Image | With AI Image |
|
||||
|----------|------------------|---------------|
|
||||
| Web App | Generic stock photo | Custom dashboard visualization |
|
||||
| Mobile App | App store screenshot | Professional phone mockup |
|
||||
| DevOps | Server rack photo | Cloud architecture diagram |
|
||||
| AI/ML | Brain illustration | Neural network visualization |
|
||||
|
||||
### Quality Comparison
|
||||
|
||||
**Settings:**
|
||||
- Resolution: 1024x768
|
||||
- Steps: 30
|
||||
- CFG Scale: 7
|
||||
- Sampler: DPM++ 2M Karras
|
||||
- Model: SDXL Base 1.0
|
||||
|
||||
**Generation Time:**
|
||||
- RTX 4090: ~8 seconds
|
||||
- RTX 3080: ~15 seconds
|
||||
- RTX 3060: ~25 seconds
|
||||
- CPU: ~5 minutes
|
||||
|
||||
## 🐛 Troubleshooting
|
||||
|
||||
### Common Issues
|
||||
|
||||
#### "Connection refused to SD API"
|
||||
```bash
|
||||
# Check if SD WebUI is running
|
||||
ps aux | grep webui
|
||||
|
||||
# Restart with API enabled
|
||||
cd stable-diffusion-webui
|
||||
./webui.sh --api --listen
|
||||
```
|
||||
|
||||
#### "CUDA out of memory"
|
||||
```bash
|
||||
# Use lower VRAM mode
|
||||
./webui.sh --api --listen --medvram
|
||||
```
|
||||
|
||||
#### "Images are low quality"
|
||||
In n8n workflow, increase:
|
||||
- Steps: 30 → 40
|
||||
- CFG Scale: 7 → 9
|
||||
- Resolution: 512 → 1024
|
||||
|
||||
#### "Images don't match project"
|
||||
- Add more specific keywords to prompt
|
||||
- Use category-specific templates
|
||||
- Refine negative prompts
|
||||
|
||||
See [SETUP.md](./SETUP.md#troubleshooting) for more solutions.
|
||||
|
||||
## ❓ FAQ
|
||||
|
||||
### How much does it cost?
|
||||
|
||||
**Initial Setup:** $300-400 for GPU (or $0 with cloud GPU rental)
|
||||
**Per Image:** $0.00 (local electricity ~$0.001)
|
||||
**Break-even:** ~500 images vs. commercial APIs
|
||||
|
||||
### Can I use this without a GPU?
|
||||
|
||||
Yes, but it's slower (~5 minutes per image on CPU). Consider cloud GPU services:
|
||||
- RunPod: ~$0.20/hour
|
||||
- vast.ai: ~$0.15/hour
|
||||
- Google Colab: Free with limitations
|
||||
|
||||
### Is the data sent anywhere?
|
||||
|
||||
No! Everything runs locally. Your project data never leaves your server.
|
||||
|
||||
### Can I customize the style?
|
||||
|
||||
Absolutely! Edit prompts in the n8n workflow or use the template system.
|
||||
|
||||
### What models should I use?
|
||||
|
||||
- **SDXL Base 1.0**: Best all-around quality
|
||||
- **DreamShaper 8**: Artistic, modern tech style
|
||||
- **Realistic Vision V5**: Photorealistic results
|
||||
- **Juggernaut XL**: Clean, professional aesthetics
|
||||
|
||||
### Can I generate images on-demand?
|
||||
|
||||
Yes! Use the admin UI component or API endpoint to regenerate anytime.
|
||||
|
||||
### How do I change image dimensions?
|
||||
|
||||
Edit the n8n workflow's SD node:
|
||||
```json
|
||||
{
|
||||
"width": 1920, // Change this
|
||||
"height": 1080 // And this
|
||||
}
|
||||
```
|
||||
|
||||
### Can I use a different AI model?
|
||||
|
||||
Yes! The system works with:
|
||||
- Stable Diffusion WebUI (default)
|
||||
- ComfyUI (more advanced)
|
||||
- Any API that accepts txt2img requests
|
||||
|
||||
## 📚 Additional Resources
|
||||
|
||||
- **[SETUP.md](./SETUP.md)** - Detailed installation guide
|
||||
- **[QUICKSTART.md](./QUICKSTART.md)** - 15-minute setup guide
|
||||
- **[PROMPT_TEMPLATES.md](./PROMPT_TEMPLATES.md)** - Category-specific prompts
|
||||
- **[n8n-workflow-ai-image-generator.json](./n8n-workflow-ai-image-generator.json)** - Workflow file
|
||||
|
||||
### External Documentation
|
||||
|
||||
- [Stable Diffusion WebUI Wiki](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki)
|
||||
- [n8n Documentation](https://docs.n8n.io)
|
||||
- [Stable Diffusion Prompt Guide](https://prompthero.com/stable-diffusion-prompt-guide)
|
||||
|
||||
## 🤝 Contributing
|
||||
|
||||
Have improvements or new prompt templates? Contributions welcome!
|
||||
|
||||
1. Fork the repository
|
||||
2. Create a feature branch
|
||||
3. Test your changes
|
||||
4. Submit a pull request
|
||||
|
||||
## 📝 License
|
||||
|
||||
This system is part of your portfolio project. AI-generated images are yours to use freely.
|
||||
|
||||
**Model Licenses:**
|
||||
- SDXL Base 1.0: CreativeML Open RAIL++-M License
|
||||
- Other models: Check individual model licenses
|
||||
|
||||
## 🙏 Credits
|
||||
|
||||
- **Stable Diffusion**: Stability AI & AUTOMATIC1111
|
||||
- **n8n**: n8n GmbH
|
||||
- **Prompt Engineering**: Community templates and best practices
|
||||
|
||||
## 💬 Support
|
||||
|
||||
Need help? Found a bug?
|
||||
|
||||
- Open an issue on GitHub
|
||||
- Check existing documentation
|
||||
- Join the community Discord
|
||||
- Email: contact@dk0.dev
|
||||
|
||||
---
|
||||
|
||||
**Built with ❤️ for automatic, beautiful project images**
|
||||
|
||||
*Last Updated: 2024*
|
||||
486
docs/ai-image-generation/SETUP.md
Normal file
486
docs/ai-image-generation/SETUP.md
Normal file
@@ -0,0 +1,486 @@
|
||||
# AI Image Generation Setup
|
||||
|
||||
This guide explains how to set up automatic AI-powered image generation for your portfolio projects using local AI models.
|
||||
|
||||
## Overview
|
||||
|
||||
The system automatically generates project cover images by:
|
||||
1. Reading project metadata (title, description, tags, tech stack)
|
||||
2. Creating an optimized prompt for image generation
|
||||
3. Sending the prompt to a local AI image generator
|
||||
4. Saving the generated image
|
||||
5. Updating the project's `imageUrl` in the database
|
||||
|
||||
## Supported Local AI Tools
|
||||
|
||||
### Option 1: Stable Diffusion WebUI (AUTOMATIC1111) - Recommended
|
||||
|
||||
**Pros:**
|
||||
- Most mature and widely used
|
||||
- Excellent API support
|
||||
- Large model ecosystem
|
||||
- Easy to use
|
||||
|
||||
**Installation:**
|
||||
```bash
|
||||
# Clone the repository
|
||||
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
|
||||
cd stable-diffusion-webui
|
||||
|
||||
# Install and run (will download models automatically)
|
||||
./webui.sh --api --listen
|
||||
```
|
||||
|
||||
**API Endpoint:** `http://localhost:7860`
|
||||
|
||||
**Recommended Models:**
|
||||
- **SDXL Base 1.0** - High quality, versatile
|
||||
- **Realistic Vision V5.1** - Photorealistic images
|
||||
- **DreamShaper 8** - Artistic, tech-focused imagery
|
||||
- **Juggernaut XL** - Modern, clean aesthetics
|
||||
|
||||
**Download Models:**
|
||||
```bash
|
||||
cd models/Stable-diffusion/
|
||||
|
||||
# SDXL Base (6.94 GB)
|
||||
wget https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors
|
||||
|
||||
# Or use the WebUI's model downloader
|
||||
```
|
||||
|
||||
### Option 2: ComfyUI
|
||||
|
||||
**Pros:**
|
||||
- Node-based workflow system
|
||||
- More control over generation pipeline
|
||||
- Better for complex compositions
|
||||
|
||||
**Installation:**
|
||||
```bash
|
||||
git clone https://github.com/comfyanonymous/ComfyUI.git
|
||||
cd ComfyUI
|
||||
pip install -r requirements.txt
|
||||
python main.py --listen 0.0.0.0 --port 8188
|
||||
```
|
||||
|
||||
**API Endpoint:** `http://localhost:8188`
|
||||
|
||||
### Option 3: Ollama + Stable Diffusion
|
||||
|
||||
**Pros:**
|
||||
- Lightweight
|
||||
- Easy model management
|
||||
- Can combine with LLM for better prompts
|
||||
|
||||
**Installation:**
|
||||
```bash
|
||||
# Install Ollama
|
||||
curl -fsSL https://ollama.com/install.sh | sh
|
||||
|
||||
# Install a vision-capable model
|
||||
ollama pull llava
|
||||
|
||||
# For image generation, you'll still need SD WebUI or ComfyUI
|
||||
```
|
||||
|
||||
## n8n Workflow Setup
|
||||
|
||||
### 1. Install n8n (if not already installed)
|
||||
|
||||
```bash
|
||||
# Docker Compose (recommended)
|
||||
docker-compose up -d n8n
|
||||
|
||||
# Or npm
|
||||
npm install -g n8n
|
||||
n8n start
|
||||
```
|
||||
|
||||
### 2. Import Workflow
|
||||
|
||||
1. Open n8n at `http://localhost:5678`
|
||||
2. Go to **Workflows** → **Import from File**
|
||||
3. Import `n8n-workflows/ai-image-generator.json`
|
||||
|
||||
### 3. Configure Workflow Nodes
|
||||
|
||||
#### Node 1: Webhook Trigger
|
||||
- **Method:** POST
|
||||
- **Path:** `ai-image-generation`
|
||||
- **Authentication:** Header Auth (use secret token)
|
||||
|
||||
#### Node 2: Postgres - Get Project Data
|
||||
```sql
|
||||
SELECT id, title, description, tags, category, content
|
||||
FROM projects
|
||||
WHERE id = $json.projectId
|
||||
LIMIT 1;
|
||||
```
|
||||
|
||||
#### Node 3: Code - Build AI Prompt
|
||||
```javascript
|
||||
// Extract project data
|
||||
const project = $input.first().json;
|
||||
|
||||
// Build sophisticated prompt
|
||||
const styleKeywords = {
|
||||
'web': 'modern web interface, clean UI, gradient backgrounds, glass morphism',
|
||||
'mobile': 'mobile app mockup, sleek design, app icons, smartphone screen',
|
||||
'devops': 'server infrastructure, network diagram, cloud architecture, terminal windows',
|
||||
'game': 'game scene, 3D environment, gaming interface, player HUD',
|
||||
'ai': 'neural network visualization, AI chip, data flow, futuristic tech',
|
||||
'automation': 'workflow diagram, automated processes, gears and circuits'
|
||||
};
|
||||
|
||||
const categoryStyle = styleKeywords[project.category?.toLowerCase()] || 'technology concept';
|
||||
|
||||
const prompt = `
|
||||
Professional tech project cover image, ${categoryStyle},
|
||||
representing "${project.title}",
|
||||
modern design, vibrant colors, high quality,
|
||||
isometric view, minimalist, clean composition,
|
||||
4k resolution, trending on artstation,
|
||||
color palette: blue, purple, teal accents,
|
||||
no text, no people, no logos
|
||||
`.trim().replace(/\s+/g, ' ');
|
||||
|
||||
const negativePrompt = `
|
||||
low quality, blurry, pixelated, text, watermark,
|
||||
signature, logo, people, faces, hands,
|
||||
cluttered, messy, dark, gloomy
|
||||
`.trim().replace(/\s+/g, ' ');
|
||||
|
||||
return {
|
||||
json: {
|
||||
projectId: project.id,
|
||||
prompt: prompt,
|
||||
negativePrompt: negativePrompt,
|
||||
title: project.title,
|
||||
category: project.category
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
#### Node 4: HTTP Request - Generate Image (Stable Diffusion)
|
||||
- **Method:** POST
|
||||
- **URL:** `http://your-sd-server:7860/sdapi/v1/txt2img`
|
||||
- **Body:**
|
||||
```json
|
||||
{
|
||||
"prompt": "={{ $json.prompt }}",
|
||||
"negative_prompt": "={{ $json.negativePrompt }}",
|
||||
"steps": 30,
|
||||
"cfg_scale": 7,
|
||||
"width": 1024,
|
||||
"height": 768,
|
||||
"sampler_name": "DPM++ 2M Karras",
|
||||
"seed": -1,
|
||||
"batch_size": 1,
|
||||
"n_iter": 1
|
||||
}
|
||||
```
|
||||
|
||||
#### Node 5: Code - Save Image to File
|
||||
```javascript
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
const imageData = $input.first().json.images[0]; // Base64 image
|
||||
const projectId = $json.projectId;
|
||||
const timestamp = Date.now();
|
||||
|
||||
// Create directory if doesn't exist
|
||||
const uploadDir = '/app/public/generated-images';
|
||||
if (!fs.existsSync(uploadDir)) {
|
||||
fs.mkdirSync(uploadDir, { recursive: true });
|
||||
}
|
||||
|
||||
// Save image
|
||||
const filename = `project-${projectId}-${timestamp}.png`;
|
||||
const filepath = path.join(uploadDir, filename);
|
||||
|
||||
fs.writeFileSync(filepath, Buffer.from(imageData, 'base64'));
|
||||
|
||||
return {
|
||||
json: {
|
||||
projectId: projectId,
|
||||
imageUrl: `/generated-images/${filename}`,
|
||||
filepath: filepath
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
#### Node 6: Postgres - Update Project
|
||||
```sql
|
||||
UPDATE projects
|
||||
SET image_url = $json.imageUrl,
|
||||
updated_at = NOW()
|
||||
WHERE id = $json.projectId;
|
||||
```
|
||||
|
||||
#### Node 7: Webhook Response
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"projectId": "={{ $json.projectId }}",
|
||||
"imageUrl": "={{ $json.imageUrl }}",
|
||||
"message": "Image generated successfully"
|
||||
}
|
||||
```
|
||||
|
||||
## API Integration
|
||||
|
||||
### Generate Image for Project
|
||||
|
||||
**Endpoint:** `POST /api/n8n/generate-image`
|
||||
|
||||
**Request:**
|
||||
```json
|
||||
{
|
||||
"projectId": 123,
|
||||
"regenerate": false
|
||||
}
|
||||
```
|
||||
|
||||
**Response:**
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"projectId": 123,
|
||||
"imageUrl": "/generated-images/project-123-1234567890.png",
|
||||
"generatedAt": "2024-01-15T10:30:00Z"
|
||||
}
|
||||
```
|
||||
|
||||
### Automatic Generation on Project Creation
|
||||
|
||||
Add this to your project creation API:
|
||||
|
||||
```typescript
|
||||
// After creating project in database
|
||||
if (process.env.AUTO_GENERATE_IMAGES === 'true') {
|
||||
await fetch(`${process.env.N8N_WEBHOOK_URL}/ai-image-generation`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${process.env.N8N_SECRET_TOKEN}`
|
||||
},
|
||||
body: JSON.stringify({
|
||||
projectId: newProject.id
|
||||
})
|
||||
});
|
||||
}
|
||||
```
|
||||
|
||||
## Environment Variables
|
||||
|
||||
Add to `.env.local`:
|
||||
|
||||
```bash
|
||||
# AI Image Generation
|
||||
N8N_WEBHOOK_URL=http://localhost:5678/webhook
|
||||
N8N_SECRET_TOKEN=your-secure-token-here
|
||||
AUTO_GENERATE_IMAGES=true
|
||||
|
||||
# Stable Diffusion API
|
||||
SD_API_URL=http://localhost:7860
|
||||
SD_API_KEY=optional-if-protected
|
||||
|
||||
# Image Storage
|
||||
GENERATED_IMAGES_DIR=/app/public/generated-images
|
||||
```
|
||||
|
||||
## Prompt Engineering Tips
|
||||
|
||||
### Good Prompts for Tech Projects
|
||||
|
||||
**Web Application:**
|
||||
```
|
||||
modern web dashboard interface, clean UI design, gradient background,
|
||||
glass morphism, floating panels, data visualization, charts and graphs,
|
||||
vibrant blue and purple color scheme, isometric view, 4k quality
|
||||
```
|
||||
|
||||
**Mobile App:**
|
||||
```
|
||||
sleek mobile app interface mockup, smartphone screen, modern app design,
|
||||
minimalist UI, smooth gradients, app icons, notification badges,
|
||||
floating elements, teal and pink accents, professional photography
|
||||
```
|
||||
|
||||
**DevOps/Infrastructure:**
|
||||
```
|
||||
cloud infrastructure diagram, server network visualization,
|
||||
interconnected nodes, data flow arrows, container icons,
|
||||
modern tech illustration, isometric perspective, cyan and orange colors
|
||||
```
|
||||
|
||||
**AI/ML Project:**
|
||||
```
|
||||
artificial intelligence concept, neural network visualization,
|
||||
glowing nodes and connections, data streams, futuristic interface,
|
||||
holographic elements, purple and blue neon lighting, high tech
|
||||
```
|
||||
|
||||
### Negative Prompts (What to Avoid)
|
||||
|
||||
```
|
||||
text, watermark, signature, logo, brand name, letters, numbers,
|
||||
people, faces, hands, fingers, human figures,
|
||||
low quality, blurry, pixelated, jpeg artifacts,
|
||||
dark, gloomy, depressing, messy, cluttered,
|
||||
realistic photo, stock photo
|
||||
```
|
||||
|
||||
## Image Specifications
|
||||
|
||||
**Recommended Settings:**
|
||||
- **Resolution:** 1024x768 (4:3 aspect ratio for cards)
|
||||
- **Format:** PNG (with transparency support)
|
||||
- **Size:** < 500KB (optimize after generation)
|
||||
- **Color Profile:** sRGB
|
||||
- **Sampling Steps:** 25-35 (balance quality vs speed)
|
||||
- **CFG Scale:** 6-8 (how closely to follow prompt)
|
||||
|
||||
## Optimization
|
||||
|
||||
### Post-Processing Pipeline
|
||||
|
||||
```bash
|
||||
# Install image optimization tools
|
||||
npm install sharp tinypng-cli
|
||||
|
||||
# Optimize generated images
|
||||
sharp input.png -o optimized.png --webp --quality 85
|
||||
|
||||
# Or use TinyPNG
|
||||
tinypng input.png --key YOUR_API_KEY
|
||||
```
|
||||
|
||||
### Caching Strategy
|
||||
|
||||
```typescript
|
||||
// Cache generated images in Redis
|
||||
await redis.set(
|
||||
`project:${projectId}:image`,
|
||||
imageUrl,
|
||||
'EX',
|
||||
60 * 60 * 24 * 30 // 30 days
|
||||
);
|
||||
```
|
||||
|
||||
## Monitoring & Debugging
|
||||
|
||||
### Check Stable Diffusion Status
|
||||
|
||||
```bash
|
||||
curl http://localhost:7860/sdapi/v1/sd-models
|
||||
```
|
||||
|
||||
### View n8n Execution Logs
|
||||
|
||||
1. Open n8n UI → Executions
|
||||
2. Filter by workflow "AI Image Generator"
|
||||
3. Check error logs and execution time
|
||||
|
||||
### Test Image Generation
|
||||
|
||||
```bash
|
||||
curl -X POST http://localhost:7860/sdapi/v1/txt2img \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"prompt": "modern tech interface, blue gradient",
|
||||
"steps": 20,
|
||||
"width": 512,
|
||||
"height": 512
|
||||
}'
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### "CUDA out of memory"
|
||||
- Reduce image resolution (768x576 instead of 1024x768)
|
||||
- Lower batch size to 1
|
||||
- Use `--lowvram` or `--medvram` flags when starting SD
|
||||
|
||||
### "Connection refused to SD API"
|
||||
- Check if SD WebUI is running: `ps aux | grep webui`
|
||||
- Verify API is enabled: `--api` flag in startup
|
||||
- Check firewall: `sudo ufw allow 7860`
|
||||
|
||||
### "Poor image quality"
|
||||
- Increase sampling steps (30-40)
|
||||
- Try different samplers (Euler a, DPM++ 2M Karras)
|
||||
- Adjust CFG scale (7-9)
|
||||
- Use better checkpoint model (SDXL, Realistic Vision)
|
||||
|
||||
### "Images don't match project theme"
|
||||
- Refine prompts with more specific keywords
|
||||
- Use category-specific style templates
|
||||
- Add technical keywords from project tags
|
||||
- Experiment with different negative prompts
|
||||
|
||||
## Advanced: Multi-Model Strategy
|
||||
|
||||
Use different models for different project types:
|
||||
|
||||
```javascript
|
||||
const modelMap = {
|
||||
'web': 'dreamshaper_8.safetensors',
|
||||
'mobile': 'realisticVision_v51.safetensors',
|
||||
'devops': 'juggernautXL_v8.safetensors',
|
||||
'ai': 'sdxl_base_1.0.safetensors'
|
||||
};
|
||||
|
||||
// Switch model before generation
|
||||
await fetch('http://localhost:7860/sdapi/v1/options', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
sd_model_checkpoint: modelMap[project.category]
|
||||
})
|
||||
});
|
||||
```
|
||||
|
||||
## Security Considerations
|
||||
|
||||
1. **Isolate SD WebUI:** Run in Docker container, not exposed to internet
|
||||
2. **Authentication:** Protect n8n webhooks with tokens
|
||||
3. **Rate Limiting:** Limit image generation requests
|
||||
4. **Content Filtering:** Validate prompts to prevent abuse
|
||||
5. **Resource Limits:** Set GPU memory limits in Docker
|
||||
|
||||
## Cost & Performance
|
||||
|
||||
**Hardware Requirements:**
|
||||
- **Minimum:** 8GB RAM, GTX 1060 6GB
|
||||
- **Recommended:** 16GB RAM, RTX 3060 12GB
|
||||
- **Optimal:** 32GB RAM, RTX 4090 24GB
|
||||
|
||||
**Generation Time:**
|
||||
- **512x512:** ~5-10 seconds
|
||||
- **1024x768:** ~15-30 seconds
|
||||
- **1024x1024 (SDXL):** ~30-60 seconds
|
||||
|
||||
**Storage:**
|
||||
- ~500KB per optimized image
|
||||
- ~50MB for 100 projects
|
||||
|
||||
## Future Enhancements
|
||||
|
||||
- [ ] Style transfer from existing brand assets
|
||||
- [ ] A/B testing different image variants
|
||||
- [ ] User feedback loop for prompt refinement
|
||||
- [ ] Batch generation for multiple projects
|
||||
- [ ] Integration with DALL-E 3 / Midjourney as fallback
|
||||
- [ ] Automatic alt text generation for accessibility
|
||||
- [ ] Version history for generated images
|
||||
|
||||
---
|
||||
|
||||
**Next Steps:**
|
||||
1. Set up Stable Diffusion WebUI locally
|
||||
2. Import n8n workflow
|
||||
3. Test with sample project
|
||||
4. Refine prompts based on results
|
||||
5. Enable auto-generation for new projects
|
||||
144
docs/ai-image-generation/WEBHOOK_SETUP.md
Normal file
144
docs/ai-image-generation/WEBHOOK_SETUP.md
Normal file
@@ -0,0 +1,144 @@
|
||||
# n8n Webhook Setup for Image Generation
|
||||
|
||||
## Current Project Image Requirements
|
||||
|
||||
### Image Size & Aspect Ratio
|
||||
- **Required Size**: 1024x768 pixels (4:3 aspect ratio)
|
||||
- **Why**: The UI uses `aspect-[4/3]` for project cards (see `app/components/Projects.tsx:112`)
|
||||
- **Your Current Webhook**: Generates 1024x1024 (square) - **needs to be changed to 1024x768**
|
||||
|
||||
### How Projects Work
|
||||
1. Projects are displayed in a grid with 4:3 aspect ratio cards
|
||||
2. Images are displayed using Next.js `Image` component with `fill` and `object-cover`
|
||||
3. The preview in `AIImageGenerator.tsx` also uses 4:3 aspect ratio
|
||||
|
||||
## Your n8n Webhook Configuration
|
||||
|
||||
### Current Setup
|
||||
- **Webhook URL**: `https://n8n.dk0.dev/webhook/image-gen`
|
||||
- **Path**: `/webhook/image-gen`
|
||||
- **Image Service**: pollinations.ai (Flux model)
|
||||
- **Current Image Size**: 1024x1024 (square) ❌
|
||||
|
||||
### Required Changes
|
||||
|
||||
#### 1. Update Image Dimensions
|
||||
In your n8n workflow's HTTP Request node, change:
|
||||
```json
|
||||
{
|
||||
"name": "width",
|
||||
"value": "1024" // ✅ Keep this
|
||||
},
|
||||
{
|
||||
"name": "height",
|
||||
"value": "768" // ❌ Change from "1024" to "768"
|
||||
}
|
||||
```
|
||||
|
||||
#### 2. Update Webhook Response Format
|
||||
Your "Respond to Webhook" node should return JSON with the image URL, not the image binary.
|
||||
|
||||
**Current Issue**: The workflow returns the image directly from pollinations.ai, but the API expects JSON.
|
||||
|
||||
**Solution**: Modify the "Respond to Webhook" node to return:
|
||||
```json
|
||||
{
|
||||
"imageUrl": "https://image.pollinations.ai/prompt/...",
|
||||
"projectId": {{ $json.projectId }},
|
||||
"generatedAt": "{{ $now.toISO() }}"
|
||||
}
|
||||
```
|
||||
|
||||
**How to fix**:
|
||||
1. In your n8n workflow, add a "Code" node between "HTTP Request" and "Respond to Webhook"
|
||||
2. Extract the pollinations.ai URL from the HTTP Request response
|
||||
3. Return JSON with the URL
|
||||
|
||||
Example Code node:
|
||||
```javascript
|
||||
// Get the pollinations.ai URL that was used
|
||||
const prompt = $('Code in JavaScript').first().json.generatedPrompt;
|
||||
const encodedPrompt = encodeURIComponent(prompt);
|
||||
const imageUrl = `https://image.pollinations.ai/prompt/${encodedPrompt}?nologo=true&model=flux&width=1024&height=768`;
|
||||
|
||||
return {
|
||||
json: {
|
||||
imageUrl: imageUrl,
|
||||
projectId: $('Code in JavaScript').first().json.projectId,
|
||||
generatedAt: new Date().toISOString()
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
#### 3. Expected Request Format
|
||||
The API now sends:
|
||||
```json
|
||||
{
|
||||
"projectId": 123,
|
||||
"projectData": {
|
||||
"title": "Project Title",
|
||||
"category": "Technology",
|
||||
"description": "Project description"
|
||||
},
|
||||
"regenerate": false,
|
||||
"triggeredBy": "api",
|
||||
"timestamp": "2024-01-01T00:00:00.000Z"
|
||||
}
|
||||
```
|
||||
|
||||
Your webhook already handles this format correctly! ✅
|
||||
|
||||
## Updated API Route
|
||||
|
||||
The API route (`app/api/n8n/generate-image/route.ts`) has been updated to:
|
||||
1. ✅ Fetch project data before calling webhook
|
||||
2. ✅ Send data in the format your webhook expects (`body.projectData`)
|
||||
3. ✅ Use the new webhook path (`/webhook/image-gen`)
|
||||
4. ✅ Handle JSON response with imageUrl
|
||||
5. ✅ Automatically update the project with the generated image URL
|
||||
|
||||
## Testing
|
||||
|
||||
After updating your n8n workflow:
|
||||
|
||||
1. **Test the webhook directly**:
|
||||
```bash
|
||||
curl -X POST https://n8n.dk0.dev/webhook/image-gen \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"projectId": 1,
|
||||
"projectData": {
|
||||
"title": "Test Project",
|
||||
"category": "Technology",
|
||||
"description": "A test project"
|
||||
}
|
||||
}'
|
||||
```
|
||||
|
||||
Expected response:
|
||||
```json
|
||||
{
|
||||
"imageUrl": "https://image.pollinations.ai/prompt/...",
|
||||
"projectId": 1,
|
||||
"generatedAt": "2024-01-01T00:00:00.000Z"
|
||||
}
|
||||
```
|
||||
|
||||
2. **Test via the API**:
|
||||
```bash
|
||||
curl -X POST http://localhost:3000/api/n8n/generate-image \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"projectId": 1}'
|
||||
```
|
||||
|
||||
## Summary of Changes Needed
|
||||
|
||||
- [ ] Change image height from 1024 to 768 in HTTP Request node
|
||||
- [ ] Modify "Respond to Webhook" to return JSON with imageUrl (not image binary)
|
||||
- [ ] Ensure the imageUrl is the pollinations.ai URL (stable, can be used directly)
|
||||
|
||||
## Notes
|
||||
|
||||
- Pollinations.ai URLs are stable and can be used directly - no need to download/save the image
|
||||
- The 4:3 aspect ratio (1024x768) matches the UI design perfectly
|
||||
- Square images (1024x1024) will be cropped to fit the 4:3 container
|
||||
340
docs/ai-image-generation/n8n-workflow-ai-image-generator.json
Normal file
340
docs/ai-image-generation/n8n-workflow-ai-image-generator.json
Normal file
@@ -0,0 +1,340 @@
|
||||
{
|
||||
"name": "AI Project Image Generator",
|
||||
"nodes": [
|
||||
{
|
||||
"parameters": {
|
||||
"httpMethod": "POST",
|
||||
"path": "ai-image-generation",
|
||||
"responseMode": "responseNode",
|
||||
"options": {
|
||||
"authType": "headerAuth"
|
||||
}
|
||||
},
|
||||
"id": "webhook-trigger",
|
||||
"name": "Webhook Trigger",
|
||||
"type": "n8n-nodes-base.webhook",
|
||||
"typeVersion": 1,
|
||||
"position": [250, 300],
|
||||
"webhookId": "ai-image-gen-webhook",
|
||||
"credentials": {
|
||||
"httpHeaderAuth": {
|
||||
"id": "1",
|
||||
"name": "Header Auth"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"operation": "executeQuery",
|
||||
"query": "SELECT id, title, description, tags, category, content, tech_stack FROM projects WHERE id = $1 LIMIT 1",
|
||||
"additionalFields": {
|
||||
"queryParameters": "={{ $json.body.projectId }}"
|
||||
}
|
||||
},
|
||||
"id": "get-project-data",
|
||||
"name": "Get Project Data",
|
||||
"type": "n8n-nodes-base.postgres",
|
||||
"typeVersion": 2,
|
||||
"position": [450, 300],
|
||||
"credentials": {
|
||||
"postgres": {
|
||||
"id": "2",
|
||||
"name": "PostgreSQL"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"jsCode": "// Extract project data\nconst project = $input.first().json;\n\n// Style keywords by category\nconst styleKeywords = {\n 'web': 'modern web interface, clean UI dashboard, gradient backgrounds, glass morphism effect, floating panels',\n 'mobile': 'mobile app mockup, sleek smartphone design, app icons, modern UI elements, notification badges',\n 'devops': 'server infrastructure, cloud network diagram, container orchestration, CI/CD pipeline visualization',\n 'backend': 'API architecture, database systems, microservices diagram, server endpoints, data flow',\n 'game': 'game environment scene, 3D rendered world, gaming interface, player HUD elements',\n 'ai': 'neural network visualization, AI chip design, machine learning data flow, futuristic technology',\n 'automation': 'workflow automation diagram, process flows, interconnected systems, automated pipeline',\n 'security': 'cybersecurity shields, encrypted data streams, security locks, firewall visualization',\n 'iot': 'Internet of Things devices, sensor networks, smart home technology, connected devices',\n 'blockchain': 'blockchain network, crypto technology, distributed ledger, decentralized nodes'\n};\n\nconst categoryStyle = styleKeywords[project.category?.toLowerCase()] || 'modern technology concept visualization';\n\n// Extract tech-specific keywords from tags and tech_stack\nconst techKeywords = [];\nif (project.tags) {\n const tags = Array.isArray(project.tags) ? project.tags : JSON.parse(project.tags || '[]');\n techKeywords.push(...tags.slice(0, 3));\n}\nif (project.tech_stack) {\n const stack = Array.isArray(project.tech_stack) ? project.tech_stack : JSON.parse(project.tech_stack || '[]');\n techKeywords.push(...stack.slice(0, 2));\n}\n\nconst techContext = techKeywords.length > 0 ? techKeywords.join(', ') + ' technology,' : '';\n\n// Build sophisticated prompt\nconst prompt = `\nProfessional tech project cover image, ${categoryStyle},\nrepresenting the concept of \"${project.title}\",\n${techContext}\nmodern minimalist design, vibrant gradient colors,\nhigh quality digital art, isometric perspective,\nclean composition, soft lighting,\ncolor palette: cyan, purple, pink, blue accents,\n4k resolution, trending on artstation,\nno text, no watermarks, no people, no logos,\nfuturistic, professional, tech-focused\n`.trim().replace(/\\s+/g, ' ');\n\n// Comprehensive negative prompt\nconst negativePrompt = `\nlow quality, blurry, pixelated, grainy, jpeg artifacts,\ntext, letters, words, watermark, signature, logo, brand name,\npeople, faces, hands, fingers, human figures, person,\ncluttered, messy, chaotic, disorganized,\ndark, gloomy, depressing, ugly, distorted,\nrealistic photo, stock photo, photograph,\nbad anatomy, deformed, mutation, extra limbs,\nduplication, duplicate elements, repetitive patterns\n`.trim().replace(/\\s+/g, ' ');\n\nreturn {\n json: {\n projectId: project.id,\n prompt: prompt,\n negativePrompt: negativePrompt,\n title: project.title,\n category: project.category,\n timestamp: Date.now()\n }\n};"
|
||||
},
|
||||
"id": "build-ai-prompt",
|
||||
"name": "Build AI Prompt",
|
||||
"type": "n8n-nodes-base.code",
|
||||
"typeVersion": 2,
|
||||
"position": [650, 300]
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"method": "POST",
|
||||
"url": "={{ $env.SD_API_URL || 'http://localhost:7860' }}/sdapi/v1/txt2img",
|
||||
"authentication": "genericCredentialType",
|
||||
"genericAuthType": "httpHeaderAuth",
|
||||
"sendBody": true,
|
||||
"bodyParameters": {
|
||||
"parameters": [
|
||||
{
|
||||
"name": "prompt",
|
||||
"value": "={{ $json.prompt }}"
|
||||
},
|
||||
{
|
||||
"name": "negative_prompt",
|
||||
"value": "={{ $json.negativePrompt }}"
|
||||
},
|
||||
{
|
||||
"name": "steps",
|
||||
"value": "30"
|
||||
},
|
||||
{
|
||||
"name": "cfg_scale",
|
||||
"value": "7"
|
||||
},
|
||||
{
|
||||
"name": "width",
|
||||
"value": "1024"
|
||||
},
|
||||
{
|
||||
"name": "height",
|
||||
"value": "768"
|
||||
},
|
||||
{
|
||||
"name": "sampler_name",
|
||||
"value": "DPM++ 2M Karras"
|
||||
},
|
||||
{
|
||||
"name": "seed",
|
||||
"value": "-1"
|
||||
},
|
||||
{
|
||||
"name": "batch_size",
|
||||
"value": "1"
|
||||
},
|
||||
{
|
||||
"name": "n_iter",
|
||||
"value": "1"
|
||||
},
|
||||
{
|
||||
"name": "save_images",
|
||||
"value": "false"
|
||||
}
|
||||
]
|
||||
},
|
||||
"options": {
|
||||
"timeout": 180000
|
||||
}
|
||||
},
|
||||
"id": "generate-image-sd",
|
||||
"name": "Generate Image (Stable Diffusion)",
|
||||
"type": "n8n-nodes-base.httpRequest",
|
||||
"typeVersion": 4,
|
||||
"position": [850, 300],
|
||||
"credentials": {
|
||||
"httpHeaderAuth": {
|
||||
"id": "3",
|
||||
"name": "SD API Auth"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"jsCode": "const fs = require('fs');\nconst path = require('path');\n\n// Get the base64 image data from Stable Diffusion response\nconst response = $input.first().json;\nconst imageData = response.images[0]; // Base64 encoded PNG\n\nconst projectId = $('Build AI Prompt').first().json.projectId;\nconst timestamp = Date.now();\n\n// Define upload directory (adjust path based on your setup)\nconst uploadDir = process.env.GENERATED_IMAGES_DIR || '/app/public/generated-images';\n\n// Create directory if it doesn't exist\nif (!fs.existsSync(uploadDir)) {\n fs.mkdirSync(uploadDir, { recursive: true });\n}\n\n// Generate filename\nconst filename = `project-${projectId}-${timestamp}.png`;\nconst filepath = path.join(uploadDir, filename);\n\n// Convert base64 to buffer and save\ntry {\n const imageBuffer = Buffer.from(imageData, 'base64');\n fs.writeFileSync(filepath, imageBuffer);\n \n // Get file size for logging\n const stats = fs.statSync(filepath);\n const fileSizeKB = (stats.size / 1024).toFixed(2);\n \n return {\n json: {\n projectId: projectId,\n imageUrl: `/generated-images/${filename}`,\n filepath: filepath,\n filename: filename,\n fileSize: fileSizeKB + ' KB',\n generatedAt: new Date().toISOString(),\n success: true\n }\n };\n} catch (error) {\n return {\n json: {\n projectId: projectId,\n error: error.message,\n success: false\n }\n };\n}"
|
||||
},
|
||||
"id": "save-image-file",
|
||||
"name": "Save Image to File",
|
||||
"type": "n8n-nodes-base.code",
|
||||
"typeVersion": 2,
|
||||
"position": [1050, 300]
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"operation": "executeQuery",
|
||||
"query": "UPDATE projects SET image_url = $1, updated_at = NOW() WHERE id = $2 RETURNING id, title, image_url",
|
||||
"additionalFields": {
|
||||
"queryParameters": "={{ $json.imageUrl }},={{ $json.projectId }}"
|
||||
}
|
||||
},
|
||||
"id": "update-project-image",
|
||||
"name": "Update Project Image URL",
|
||||
"type": "n8n-nodes-base.postgres",
|
||||
"typeVersion": 2,
|
||||
"position": [1250, 300],
|
||||
"credentials": {
|
||||
"postgres": {
|
||||
"id": "2",
|
||||
"name": "PostgreSQL"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"respondWith": "json",
|
||||
"responseBody": "={\n \"success\": true,\n \"projectId\": {{ $json.id }},\n \"title\": \"{{ $json.title }}\",\n \"imageUrl\": \"{{ $json.image_url }}\",\n \"generatedAt\": \"{{ $('Save Image to File').first().json.generatedAt }}\",\n \"fileSize\": \"{{ $('Save Image to File').first().json.fileSize }}\",\n \"message\": \"Project image generated successfully\"\n}",
|
||||
"options": {}
|
||||
},
|
||||
"id": "webhook-response",
|
||||
"name": "Webhook Response",
|
||||
"type": "n8n-nodes-base.respondToWebhook",
|
||||
"typeVersion": 1,
|
||||
"position": [1450, 300]
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"conditions": {
|
||||
"boolean": [
|
||||
{
|
||||
"value1": "={{ $json.success }}",
|
||||
"value2": true
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"id": "check-save-success",
|
||||
"name": "Check Save Success",
|
||||
"type": "n8n-nodes-base.if",
|
||||
"typeVersion": 1,
|
||||
"position": [1050, 450]
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"respondWith": "json",
|
||||
"responseBody": "={\n \"success\": false,\n \"error\": \"{{ $json.error || 'Failed to save image' }}\",\n \"projectId\": {{ $json.projectId }},\n \"message\": \"Image generation failed\"\n}",
|
||||
"options": {
|
||||
"responseCode": 500
|
||||
}
|
||||
},
|
||||
"id": "error-response",
|
||||
"name": "Error Response",
|
||||
"type": "n8n-nodes-base.respondToWebhook",
|
||||
"typeVersion": 1,
|
||||
"position": [1250, 500]
|
||||
},
|
||||
{
|
||||
"parameters": {
|
||||
"operation": "executeQuery",
|
||||
"query": "INSERT INTO activity_logs (type, action, details, created_at) VALUES ('ai_generation', 'image_generated', $1, NOW())",
|
||||
"additionalFields": {
|
||||
"queryParameters": "={{ JSON.stringify({ projectId: $json.id, imageUrl: $json.image_url, timestamp: new Date().toISOString() }) }}"
|
||||
}
|
||||
},
|
||||
"id": "log-activity",
|
||||
"name": "Log Generation Activity",
|
||||
"type": "n8n-nodes-base.postgres",
|
||||
"typeVersion": 2,
|
||||
"position": [1250, 150],
|
||||
"credentials": {
|
||||
"postgres": {
|
||||
"id": "2",
|
||||
"name": "PostgreSQL"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"connections": {
|
||||
"Webhook Trigger": {
|
||||
"main": [
|
||||
[
|
||||
{
|
||||
"node": "Get Project Data",
|
||||
"type": "main",
|
||||
"index": 0
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Get Project Data": {
|
||||
"main": [
|
||||
[
|
||||
{
|
||||
"node": "Build AI Prompt",
|
||||
"type": "main",
|
||||
"index": 0
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Build AI Prompt": {
|
||||
"main": [
|
||||
[
|
||||
{
|
||||
"node": "Generate Image (Stable Diffusion)",
|
||||
"type": "main",
|
||||
"index": 0
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Generate Image (Stable Diffusion)": {
|
||||
"main": [
|
||||
[
|
||||
{
|
||||
"node": "Save Image to File",
|
||||
"type": "main",
|
||||
"index": 0
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Save Image to File": {
|
||||
"main": [
|
||||
[
|
||||
{
|
||||
"node": "Check Save Success",
|
||||
"type": "main",
|
||||
"index": 0
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Check Save Success": {
|
||||
"main": [
|
||||
[
|
||||
{
|
||||
"node": "Update Project Image URL",
|
||||
"type": "main",
|
||||
"index": 0
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"node": "Error Response",
|
||||
"type": "main",
|
||||
"index": 0
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Update Project Image URL": {
|
||||
"main": [
|
||||
[
|
||||
{
|
||||
"node": "Log Generation Activity",
|
||||
"type": "main",
|
||||
"index": 0
|
||||
},
|
||||
{
|
||||
"node": "Webhook Response",
|
||||
"type": "main",
|
||||
"index": 0
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
},
|
||||
"settings": {
|
||||
"executionOrder": "v1",
|
||||
"saveManualExecutions": true,
|
||||
"callerPolicy": "workflowsFromSameOwner",
|
||||
"errorWorkflow": ""
|
||||
},
|
||||
"staticData": null,
|
||||
"tags": [
|
||||
{
|
||||
"name": "AI",
|
||||
"id": "ai-tag"
|
||||
},
|
||||
{
|
||||
"name": "Automation",
|
||||
"id": "automation-tag"
|
||||
},
|
||||
{
|
||||
"name": "Image Generation",
|
||||
"id": "image-gen-tag"
|
||||
}
|
||||
],
|
||||
"meta": {
|
||||
"instanceId": "your-instance-id"
|
||||
},
|
||||
"id": "ai-image-generator-workflow",
|
||||
"versionId": "1",
|
||||
"triggerCount": 1,
|
||||
"active": true
|
||||
}
|
||||
91
docs/setup_activity_status.sql
Normal file
91
docs/setup_activity_status.sql
Normal file
@@ -0,0 +1,91 @@
|
||||
-- Activity Status Table Setup for n8n Integration
|
||||
-- This table stores real-time activity data from various sources
|
||||
|
||||
-- Drop existing table if it exists
|
||||
DROP TABLE IF EXISTS activity_status CASCADE;
|
||||
|
||||
-- Create the activity_status table
|
||||
CREATE TABLE activity_status (
|
||||
id SERIAL PRIMARY KEY,
|
||||
|
||||
-- Activity (Coding, Reading, etc.)
|
||||
activity_type VARCHAR(50), -- 'coding', 'listening', 'watching', 'gaming', 'reading'
|
||||
activity_details TEXT,
|
||||
activity_project VARCHAR(255),
|
||||
activity_language VARCHAR(50),
|
||||
activity_repo VARCHAR(255),
|
||||
|
||||
-- Music (Spotify, Apple Music)
|
||||
music_playing BOOLEAN DEFAULT FALSE,
|
||||
music_track VARCHAR(255),
|
||||
music_artist VARCHAR(255),
|
||||
music_album VARCHAR(255),
|
||||
music_platform VARCHAR(50), -- 'spotify', 'apple'
|
||||
music_progress INTEGER, -- 0-100 (percentage)
|
||||
music_album_art TEXT, -- URL to album art
|
||||
|
||||
-- Watching (YouTube, Netflix, Twitch)
|
||||
watching_title VARCHAR(255),
|
||||
watching_platform VARCHAR(50), -- 'youtube', 'netflix', 'twitch'
|
||||
watching_type VARCHAR(50), -- 'video', 'stream', 'movie', 'series'
|
||||
|
||||
-- Gaming (Steam, PlayStation, Xbox, Discord)
|
||||
gaming_game VARCHAR(255),
|
||||
gaming_platform VARCHAR(50), -- 'steam', 'playstation', 'xbox', 'discord'
|
||||
gaming_status VARCHAR(50), -- 'playing', 'idle'
|
||||
|
||||
-- Status (Mood & Custom Message)
|
||||
status_mood VARCHAR(10), -- emoji like '😊', '💻', '🎮', '😴'
|
||||
status_message TEXT,
|
||||
|
||||
-- Timestamps
|
||||
created_at TIMESTAMP DEFAULT NOW(),
|
||||
updated_at TIMESTAMP DEFAULT NOW()
|
||||
);
|
||||
|
||||
-- Create index for faster queries
|
||||
CREATE INDEX idx_activity_status_updated_at ON activity_status(updated_at DESC);
|
||||
|
||||
-- Insert default row (will be updated by n8n workflows)
|
||||
INSERT INTO activity_status (
|
||||
id,
|
||||
activity_type,
|
||||
activity_details,
|
||||
music_playing,
|
||||
status_mood,
|
||||
status_message
|
||||
) VALUES (
|
||||
1,
|
||||
NULL,
|
||||
NULL,
|
||||
FALSE,
|
||||
'💻',
|
||||
'Getting started...'
|
||||
);
|
||||
|
||||
-- Create function to automatically update updated_at timestamp
|
||||
CREATE OR REPLACE FUNCTION update_activity_status_timestamp()
|
||||
RETURNS TRIGGER AS $$
|
||||
BEGIN
|
||||
NEW.updated_at = NOW();
|
||||
RETURN NEW;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
||||
-- Create trigger to call the function on UPDATE
|
||||
CREATE TRIGGER trigger_update_activity_status_timestamp
|
||||
BEFORE UPDATE ON activity_status
|
||||
FOR EACH ROW
|
||||
EXECUTE FUNCTION update_activity_status_timestamp();
|
||||
|
||||
-- Grant permissions (adjust as needed)
|
||||
-- GRANT SELECT, INSERT, UPDATE ON activity_status TO your_app_user;
|
||||
-- GRANT USAGE, SELECT ON SEQUENCE activity_status_id_seq TO your_app_user;
|
||||
|
||||
-- Display success message
|
||||
DO $$
|
||||
BEGIN
|
||||
RAISE NOTICE '✅ Activity Status table created successfully!';
|
||||
RAISE NOTICE '📝 You can now configure your n8n workflows to update this table.';
|
||||
RAISE NOTICE '🔗 See docs/N8N_INTEGRATION.md for setup instructions.';
|
||||
END $$;
|
||||
85
e2e/accessibility.spec.ts
Normal file
85
e2e/accessibility.spec.ts
Normal file
@@ -0,0 +1,85 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* Accessibility Tests
|
||||
* Basic accessibility checks
|
||||
*/
|
||||
test.describe('Accessibility Tests', () => {
|
||||
test('Home page has proper heading structure', async ({ page }) => {
|
||||
await page.goto('/', { waitUntil: 'domcontentloaded' });
|
||||
|
||||
// Check for h1
|
||||
const h1 = page.locator('h1');
|
||||
const h1Count = await h1.count();
|
||||
|
||||
// Should have at least one h1
|
||||
expect(h1Count).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
test('Images have alt text', async ({ page }) => {
|
||||
await page.goto('/', { waitUntil: 'domcontentloaded' });
|
||||
|
||||
const images = page.locator('img');
|
||||
const imageCount = await images.count();
|
||||
|
||||
if (imageCount > 0) {
|
||||
// Check first few images have alt text
|
||||
for (let i = 0; i < Math.min(5, imageCount); i++) {
|
||||
const img = images.nth(i);
|
||||
const alt = await img.getAttribute('alt');
|
||||
|
||||
// Alt should exist (can be empty for decorative images)
|
||||
expect(alt).not.toBeNull();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
test('Links have descriptive text', async ({ page }) => {
|
||||
await page.goto('/', { waitUntil: 'domcontentloaded' });
|
||||
|
||||
const links = page.locator('a[href]');
|
||||
const linkCount = await links.count();
|
||||
|
||||
if (linkCount > 0) {
|
||||
// Check first few links have text or aria-label
|
||||
for (let i = 0; i < Math.min(5, linkCount); i++) {
|
||||
const link = links.nth(i);
|
||||
const text = await link.textContent();
|
||||
const ariaLabel = await link.getAttribute('aria-label');
|
||||
|
||||
// Should have text or aria-label
|
||||
expect(text?.trim().length || ariaLabel?.length).toBeGreaterThan(0);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
test('Forms have labels', async ({ page }) => {
|
||||
await page.goto('/manage', { waitUntil: 'domcontentloaded' });
|
||||
|
||||
const inputs = page.locator('input, textarea, select');
|
||||
const inputCount = await inputs.count();
|
||||
|
||||
if (inputCount > 0) {
|
||||
// Check that inputs have associated labels or aria-labels
|
||||
for (let i = 0; i < Math.min(5, inputCount); i++) {
|
||||
const input = inputs.nth(i);
|
||||
const id = await input.getAttribute('id');
|
||||
const ariaLabel = await input.getAttribute('aria-label');
|
||||
const placeholder = await input.getAttribute('placeholder');
|
||||
const type = await input.getAttribute('type');
|
||||
|
||||
// Skip hidden inputs
|
||||
if (type === 'hidden') continue;
|
||||
|
||||
// Should have label, aria-label, or placeholder
|
||||
if (id) {
|
||||
const label = page.locator(`label[for="${id}"]`);
|
||||
const hasLabel = await label.count() > 0;
|
||||
expect(hasLabel || ariaLabel || placeholder).toBeTruthy();
|
||||
} else {
|
||||
expect(ariaLabel || placeholder).toBeTruthy();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
95
e2e/critical-paths.spec.ts
Normal file
95
e2e/critical-paths.spec.ts
Normal file
@@ -0,0 +1,95 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* Critical Path Tests
|
||||
* Tests the most important user flows
|
||||
*/
|
||||
test.describe('Critical Paths', () => {
|
||||
test('Home page loads and displays correctly', async ({ page }) => {
|
||||
await page.goto('/', { waitUntil: 'networkidle' });
|
||||
|
||||
// Wait for page to be fully loaded
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
|
||||
// Check page title (more flexible)
|
||||
const title = await page.title();
|
||||
expect(title).toMatch(/Portfolio|Dennis|Konkol/i);
|
||||
|
||||
// Check key sections exist
|
||||
await expect(page.locator('header, nav')).toBeVisible({ timeout: 10000 });
|
||||
await expect(page.locator('main')).toBeVisible({ timeout: 10000 });
|
||||
|
||||
// Check for hero section or any content
|
||||
const hero = page.locator('section, [role="banner"], h1, body').first();
|
||||
await expect(hero).toBeVisible({ timeout: 10000 });
|
||||
});
|
||||
|
||||
test('Projects page loads and displays projects', async ({ page }) => {
|
||||
await page.goto('/projects', { waitUntil: 'networkidle' });
|
||||
|
||||
// Wait for projects to load
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
|
||||
// Check page title (more flexible)
|
||||
const title = await page.title();
|
||||
expect(title.length).toBeGreaterThan(0); // Just check title exists
|
||||
|
||||
// Check projects are displayed (at least one project card or content)
|
||||
const projectCards = page.locator('[data-testid="project-card"], article, .project-card, main');
|
||||
const count = await projectCards.count();
|
||||
|
||||
// At minimum, main content should be visible
|
||||
expect(count).toBeGreaterThan(0);
|
||||
await expect(projectCards.first()).toBeVisible({ timeout: 10000 });
|
||||
});
|
||||
|
||||
test('Individual project page loads', async ({ page }) => {
|
||||
// First, get a project slug from the projects page
|
||||
await page.goto('/projects', { waitUntil: 'networkidle' });
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
|
||||
// Try to find a project link
|
||||
const projectLink = page.locator('a[href*="/projects/"]').first();
|
||||
|
||||
if (await projectLink.count() > 0) {
|
||||
const href = await projectLink.getAttribute('href');
|
||||
if (href) {
|
||||
await page.goto(href, { waitUntil: 'networkidle' });
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
|
||||
// Check project content is visible (more flexible)
|
||||
const content = page.locator('h1, h2, main, article, body');
|
||||
await expect(content.first()).toBeVisible({ timeout: 10000 });
|
||||
}
|
||||
} else {
|
||||
// Skip test if no projects exist
|
||||
test.skip();
|
||||
}
|
||||
});
|
||||
|
||||
test('Admin dashboard is accessible', async ({ page }) => {
|
||||
await page.goto('/manage', { waitUntil: 'networkidle' });
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
|
||||
// Should show login form or dashboard or any content
|
||||
const content = page.locator('form, [data-testid="admin-dashboard"], body, main');
|
||||
await expect(content.first()).toBeVisible({ timeout: 10000 });
|
||||
});
|
||||
|
||||
test('API health endpoint works', async ({ request }) => {
|
||||
const response = await request.get('/api/health');
|
||||
expect(response.ok()).toBeTruthy();
|
||||
|
||||
const data = await response.json();
|
||||
expect(data).toHaveProperty('status');
|
||||
});
|
||||
|
||||
test('API projects endpoint returns data', async ({ request }) => {
|
||||
const response = await request.get('/api/projects?published=true');
|
||||
expect(response.ok()).toBeTruthy();
|
||||
|
||||
const data = await response.json();
|
||||
expect(data).toHaveProperty('projects');
|
||||
expect(Array.isArray(data.projects)).toBeTruthy();
|
||||
});
|
||||
});
|
||||
98
e2e/email.spec.ts
Normal file
98
e2e/email.spec.ts
Normal file
@@ -0,0 +1,98 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* Email API Tests
|
||||
* Tests email sending and response functionality
|
||||
*/
|
||||
test.describe('Email Functionality', () => {
|
||||
test('Email API endpoint exists and accepts requests', async ({ request }) => {
|
||||
const response = await request.post('/api/email', {
|
||||
data: {
|
||||
name: 'Test User',
|
||||
email: 'test@example.com',
|
||||
subject: 'Test Subject',
|
||||
message: 'Test message content',
|
||||
},
|
||||
});
|
||||
|
||||
// Should accept the request (even if email sending fails in test)
|
||||
expect([200, 201, 400, 500]).toContain(response.status());
|
||||
|
||||
// Should return JSON
|
||||
const contentType = response.headers()['content-type'];
|
||||
expect(contentType).toContain('application/json');
|
||||
});
|
||||
|
||||
test('Email API validates required fields', async ({ request }) => {
|
||||
// Missing required fields
|
||||
const response = await request.post('/api/email', {
|
||||
data: {
|
||||
name: 'Test User',
|
||||
// Missing email, subject, message
|
||||
},
|
||||
});
|
||||
|
||||
// Should return error for missing fields
|
||||
if (response.status() === 400) {
|
||||
const data = await response.json();
|
||||
expect(data).toHaveProperty('error');
|
||||
}
|
||||
});
|
||||
|
||||
test('Email respond endpoint exists', async ({ request }) => {
|
||||
// Test the email respond endpoint
|
||||
const response = await request.post('/api/email/respond', {
|
||||
data: {
|
||||
contactId: 1,
|
||||
template: 'thank_you',
|
||||
message: 'Test response',
|
||||
},
|
||||
});
|
||||
|
||||
// Should handle the request (may fail if no contact exists, that's OK)
|
||||
expect([200, 400, 404, 500]).toContain(response.status());
|
||||
});
|
||||
|
||||
test('Email API handles invalid email format', async ({ request }) => {
|
||||
const response = await request.post('/api/email', {
|
||||
data: {
|
||||
name: 'Test User',
|
||||
email: 'invalid-email-format',
|
||||
subject: 'Test',
|
||||
message: 'Test message',
|
||||
},
|
||||
});
|
||||
|
||||
// Should validate email format
|
||||
if (response.status() === 400) {
|
||||
const data = await response.json();
|
||||
expect(data).toHaveProperty('error');
|
||||
}
|
||||
});
|
||||
|
||||
test('Email API rate limiting works', async ({ request }) => {
|
||||
// Send multiple requests quickly
|
||||
const requests = Array(10).fill(null).map(() =>
|
||||
request.post('/api/email', {
|
||||
data: {
|
||||
name: 'Test User',
|
||||
email: 'test@example.com',
|
||||
subject: 'Test',
|
||||
message: 'Test message',
|
||||
},
|
||||
})
|
||||
);
|
||||
|
||||
const responses = await Promise.all(requests);
|
||||
|
||||
// At least one should be rate limited (429) if rate limiting is working
|
||||
// Note: We check but don't require it, as rate limiting may not be implemented
|
||||
const _rateLimited = responses.some(r => r.status() === 429);
|
||||
|
||||
// If rate limiting is not implemented, that's OK for now
|
||||
// Just ensure the endpoint doesn't crash
|
||||
responses.forEach(response => {
|
||||
expect([200, 201, 400, 429, 500]).toContain(response.status());
|
||||
});
|
||||
});
|
||||
});
|
||||
128
e2e/hydration.spec.ts
Normal file
128
e2e/hydration.spec.ts
Normal file
@@ -0,0 +1,128 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* Hydration Tests
|
||||
* Ensures React hydration works correctly without errors
|
||||
*/
|
||||
test.describe('Hydration Tests', () => {
|
||||
test('No hydration errors in console', async ({ page }) => {
|
||||
const consoleErrors: string[] = [];
|
||||
const consoleWarnings: string[] = [];
|
||||
|
||||
// Capture console messages
|
||||
page.on('console', (msg) => {
|
||||
const text = msg.text();
|
||||
if (msg.type() === 'error') {
|
||||
consoleErrors.push(text);
|
||||
} else if (msg.type() === 'warning') {
|
||||
consoleWarnings.push(text);
|
||||
}
|
||||
});
|
||||
|
||||
// Navigate to home page
|
||||
await page.goto('/', { waitUntil: 'networkidle' });
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
|
||||
// Check for hydration errors
|
||||
const hydrationErrors = consoleErrors.filter(error =>
|
||||
error.includes('Hydration') ||
|
||||
error.includes('hydration') ||
|
||||
error.includes('Text content does not match') ||
|
||||
error.includes('Expected server HTML')
|
||||
);
|
||||
|
||||
expect(hydrationErrors.length).toBe(0);
|
||||
|
||||
// Log warnings for review (but don't fail)
|
||||
if (consoleWarnings.length > 0) {
|
||||
console.log('Console warnings:', consoleWarnings);
|
||||
}
|
||||
});
|
||||
|
||||
test('No duplicate React key warnings', async ({ page }) => {
|
||||
const consoleWarnings: string[] = [];
|
||||
|
||||
page.on('console', (msg) => {
|
||||
if (msg.type() === 'warning') {
|
||||
const text = msg.text();
|
||||
if (text.includes('key') || text.includes('duplicate')) {
|
||||
consoleWarnings.push(text);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Check for duplicate key warnings
|
||||
const keyWarnings = consoleWarnings.filter(warning =>
|
||||
warning.includes('key') && warning.includes('duplicate')
|
||||
);
|
||||
|
||||
expect(keyWarnings.length).toBe(0);
|
||||
});
|
||||
|
||||
test('Client-side navigation works without hydration errors', async ({ page }) => {
|
||||
const consoleErrors: string[] = [];
|
||||
|
||||
page.on('console', (msg) => {
|
||||
if (msg.type() === 'error') {
|
||||
consoleErrors.push(msg.text());
|
||||
}
|
||||
});
|
||||
|
||||
await page.goto('/', { waitUntil: 'networkidle' });
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
|
||||
// Navigate to projects page via link
|
||||
const projectsLink = page.locator('a[href="/projects"], a[href*="projects"]').first();
|
||||
if (await projectsLink.count() > 0) {
|
||||
await projectsLink.click();
|
||||
await page.waitForLoadState('domcontentloaded');
|
||||
|
||||
// Check for errors after navigation
|
||||
const hydrationErrors = consoleErrors.filter(error =>
|
||||
error.includes('Hydration') || error.includes('hydration')
|
||||
);
|
||||
|
||||
expect(hydrationErrors.length).toBe(0);
|
||||
}
|
||||
});
|
||||
|
||||
test('Server and client HTML match', async ({ page }) => {
|
||||
await page.goto('/');
|
||||
|
||||
// Get initial HTML
|
||||
const initialHTML = await page.content();
|
||||
|
||||
// Wait for React to hydrate
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Get HTML after hydration
|
||||
const hydratedHTML = await page.content();
|
||||
|
||||
// Basic check: main structure should be similar
|
||||
// (exact match is hard due to dynamic content)
|
||||
expect(hydratedHTML.length).toBeGreaterThan(0);
|
||||
expect(initialHTML.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
test('Interactive elements work after hydration', async ({ page }) => {
|
||||
await page.goto('/');
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
// Try to find and click interactive elements
|
||||
const buttons = page.locator('button, a[role="button"]');
|
||||
const buttonCount = await buttons.count();
|
||||
|
||||
if (buttonCount > 0) {
|
||||
const firstButton = buttons.first();
|
||||
await expect(firstButton).toBeVisible();
|
||||
|
||||
// Try clicking (should not throw)
|
||||
await firstButton.click().catch(() => {
|
||||
// Some buttons might be disabled, that's OK
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
97
e2e/performance.spec.ts
Normal file
97
e2e/performance.spec.ts
Normal file
@@ -0,0 +1,97 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* Performance Tests
|
||||
* Ensures pages load quickly and perform well
|
||||
*/
|
||||
test.describe('Performance Tests', () => {
|
||||
test('Home page loads within acceptable time', async ({ page }) => {
|
||||
const startTime = Date.now();
|
||||
|
||||
await page.goto('/', { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const loadTime = Date.now() - startTime;
|
||||
|
||||
// Should load within 5 seconds
|
||||
expect(loadTime).toBeLessThan(5000);
|
||||
});
|
||||
|
||||
test('Projects page loads quickly', async ({ page }) => {
|
||||
const startTime = Date.now();
|
||||
|
||||
await page.goto('/projects', { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
const loadTime = Date.now() - startTime;
|
||||
|
||||
// Should load within 5 seconds
|
||||
expect(loadTime).toBeLessThan(5000);
|
||||
});
|
||||
|
||||
test('No large layout shifts', async ({ page }) => {
|
||||
await page.goto('/', { waitUntil: 'domcontentloaded' });
|
||||
|
||||
// Check for layout stability
|
||||
const layoutShift = await page.evaluate(() => {
|
||||
return new Promise<number>((resolve) => {
|
||||
let maxShift = 0;
|
||||
const observer = new PerformanceObserver((list) => {
|
||||
for (const entry of list.getEntries()) {
|
||||
if (entry.entryType === 'layout-shift') {
|
||||
const layoutShiftEntry = entry as PerformanceEntry & {
|
||||
hadRecentInput?: boolean;
|
||||
value?: number;
|
||||
};
|
||||
if (!layoutShiftEntry.hadRecentInput && layoutShiftEntry.value !== undefined) {
|
||||
maxShift = Math.max(maxShift, layoutShiftEntry.value);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
observer.observe({ entryTypes: ['layout-shift'] });
|
||||
|
||||
setTimeout(() => {
|
||||
observer.disconnect();
|
||||
resolve(maxShift);
|
||||
}, 3000);
|
||||
});
|
||||
});
|
||||
|
||||
// Layout shift should be minimal (CLS < 0.1 is good)
|
||||
expect(layoutShift as number).toBeLessThan(0.25);
|
||||
});
|
||||
|
||||
test('Images are optimized', async ({ page }) => {
|
||||
await page.goto('/', { waitUntil: 'domcontentloaded' });
|
||||
|
||||
// Check that Next.js Image component is used
|
||||
const images = page.locator('img');
|
||||
const imageCount = await images.count();
|
||||
|
||||
if (imageCount > 0) {
|
||||
// Check that images have proper attributes
|
||||
const firstImage = images.first();
|
||||
const src = await firstImage.getAttribute('src');
|
||||
|
||||
// Next.js images should have optimized src
|
||||
if (src) {
|
||||
// Should be using Next.js image optimization or have proper format
|
||||
expect(src.includes('_next') || src.includes('data:') || src.startsWith('/')).toBeTruthy();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
test('API endpoints respond quickly', async ({ request }) => {
|
||||
const startTime = Date.now();
|
||||
|
||||
const response = await request.get('/api/health');
|
||||
|
||||
const responseTime = Date.now() - startTime;
|
||||
|
||||
expect(response.ok()).toBeTruthy();
|
||||
// API should respond within 1 second
|
||||
expect(responseTime).toBeLessThan(1000);
|
||||
});
|
||||
});
|
||||
@@ -25,6 +25,11 @@ MY_INFO_PASSWORD=your-info-email-password
|
||||
NEXT_PUBLIC_UMAMI_URL=https://analytics.dk0.dev
|
||||
NEXT_PUBLIC_UMAMI_WEBSITE_ID=b3665829-927a-4ada-b9bb-fcf24171061e
|
||||
|
||||
# n8n Integration (optional - for automation and AI features)
|
||||
N8N_WEBHOOK_URL=https://n8n.dk0.dev
|
||||
N8N_SECRET_TOKEN=your-n8n-secret-token
|
||||
N8N_API_KEY=your-n8n-api-key
|
||||
|
||||
# Security
|
||||
# JWT_SECRET=your-jwt-secret
|
||||
# ENCRYPTION_KEY=your-encryption-key
|
||||
|
||||
@@ -9,8 +9,29 @@ const compat = new FlatCompat({
|
||||
baseDirectory: __dirname,
|
||||
});
|
||||
|
||||
const eslintConfig = [{
|
||||
ignores: ["node_modules/**", ".next/**", "out/**", "build/**", "next-env.d.ts"]
|
||||
}, ...compat.extends("next/core-web-vitals", "next/typescript")];
|
||||
const eslintConfig = [
|
||||
{
|
||||
ignores: [
|
||||
"node_modules/**",
|
||||
".next/**",
|
||||
"out/**",
|
||||
"build/**",
|
||||
"next-env.d.ts",
|
||||
],
|
||||
},
|
||||
...compat.extends("next/core-web-vitals", "next/typescript"),
|
||||
{
|
||||
rules: {
|
||||
"@typescript-eslint/no-unused-vars": [
|
||||
"error",
|
||||
{
|
||||
argsIgnorePattern: "^_",
|
||||
varsIgnorePattern: "^_",
|
||||
caughtErrorsIgnorePattern: "^_",
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
export default eslintConfig;
|
||||
|
||||
@@ -1,44 +1,38 @@
|
||||
import type { Config } from 'jest'
|
||||
import nextJest from 'next/jest.js'
|
||||
|
||||
import type { Config } from "jest";
|
||||
import nextJest from "next/jest.js";
|
||||
|
||||
const createJestConfig = nextJest({
|
||||
// Provide the path to your Next.js app to load next.config.js and .env files in your test environment
|
||||
dir: './',
|
||||
})
|
||||
|
||||
dir: "./",
|
||||
});
|
||||
|
||||
// Add any custom config to be passed to Jest
|
||||
const config: Config = {
|
||||
coverageProvider: 'babel',
|
||||
testEnvironment: 'jsdom',
|
||||
coverageProvider: "v8",
|
||||
testEnvironment: "jsdom",
|
||||
// Add more setup options before each test is run
|
||||
setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
|
||||
// Ignore tests inside __mocks__ directory
|
||||
testPathIgnorePatterns: ['/node_modules/', '/__mocks__/'],
|
||||
setupFilesAfterEnv: ["<rootDir>/jest.setup.ts"],
|
||||
// Ignore tests inside __mocks__ directory and E2E tests (Playwright)
|
||||
testPathIgnorePatterns: ["/node_modules/", "/__mocks__/", "/.next/", "/e2e/"],
|
||||
// Transform react-markdown and other ESM modules
|
||||
transformIgnorePatterns: [
|
||||
'node_modules/(?!(react-markdown|remark-.*|rehype-.*|unified|bail|is-plain-obj|trough|vfile|vfile-message|unist-.*|micromark|parse-entities|character-entities|mdast-.*|hast-.*|property-information|space-separated-tokens|comma-separated-tokens|web-namespaces|zwitch|longest-streak|ccount)/)'
|
||||
"node_modules/(?!(react-markdown|remark-.*|rehype-.*|unified|bail|is-plain-obj|trough|vfile|vfile-message|unist-.*|micromark|parse-entities|character-entities|mdast-.*|hast-.*|property-information|space-separated-tokens|comma-separated-tokens|web-namespaces|zwitch|longest-streak|ccount)/)",
|
||||
],
|
||||
// Fix for production React builds
|
||||
testEnvironmentOptions: {
|
||||
customExportConditions: [''],
|
||||
},
|
||||
// Module name mapping to fix haste collision
|
||||
moduleNameMapper: {
|
||||
'^@/(.*)$': '<rootDir>/$1',
|
||||
},
|
||||
// Fix haste collision by excluding .next directory
|
||||
haste: {
|
||||
hasteImplModulePath: undefined,
|
||||
"^@/(.*)$": "<rootDir>/$1",
|
||||
},
|
||||
// Exclude problematic directories from haste
|
||||
modulePathIgnorePatterns: ['<rootDir>/.next/'],
|
||||
modulePathIgnorePatterns: ["<rootDir>/.next/", "<rootDir>/node_modules/", "<rootDir>/e2e/"],
|
||||
// Clear mocks between tests
|
||||
clearMocks: true,
|
||||
// Reset modules between tests
|
||||
resetMocks: true,
|
||||
// Restore mocks between tests
|
||||
restoreMocks: true,
|
||||
}
|
||||
|
||||
// Max workers for better performance
|
||||
maxWorkers: "50%",
|
||||
};
|
||||
|
||||
// createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
|
||||
export default createJestConfig(config)
|
||||
export default createJestConfig(config);
|
||||
|
||||
117
jest.setup.ts
117
jest.setup.ts
@@ -1,65 +1,92 @@
|
||||
import 'whatwg-fetch';
|
||||
import "@testing-library/jest-dom";
|
||||
import "whatwg-fetch";
|
||||
import React from "react";
|
||||
import { render } from '@testing-library/react';
|
||||
import { ToastProvider } from '@/components/Toast';
|
||||
import { render } from "@testing-library/react";
|
||||
import { ToastProvider } from "@/components/Toast";
|
||||
|
||||
// Fix for React production builds in testing
|
||||
// Mock React's act function for production builds
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
// Override React.act for production builds
|
||||
const originalAct = React.act;
|
||||
if (!originalAct) {
|
||||
// @ts-expect-error - Mock for production builds
|
||||
React.act = (callback: () => void) => {
|
||||
callback();
|
||||
// Mock Next.js router
|
||||
jest.mock("next/navigation", () => ({
|
||||
useRouter() {
|
||||
return {
|
||||
push: jest.fn(),
|
||||
replace: jest.fn(),
|
||||
prefetch: jest.fn(),
|
||||
back: jest.fn(),
|
||||
pathname: "/",
|
||||
query: {},
|
||||
asPath: "/",
|
||||
};
|
||||
}
|
||||
|
||||
// Also mock the act function from react-dom/test-utils
|
||||
// This is handled by Jest's module resolution
|
||||
}
|
||||
|
||||
// Mock react-responsive-masonry
|
||||
jest.mock("react-responsive-masonry", () => ({
|
||||
__esModule: true,
|
||||
default: ({ children }: { children: React.ReactNode }) =>
|
||||
React.createElement("div", null, children),
|
||||
get ResponsiveMasonry() {
|
||||
const ResponsiveMasonryComponent = ({ children }: { children: React.ReactNode }) =>
|
||||
React.createElement("div", null, children);
|
||||
ResponsiveMasonryComponent.displayName = 'ResponsiveMasonry';
|
||||
return ResponsiveMasonryComponent;
|
||||
},
|
||||
usePathname() {
|
||||
return "/";
|
||||
},
|
||||
useSearchParams() {
|
||||
return new URLSearchParams();
|
||||
},
|
||||
notFound: jest.fn(),
|
||||
}));
|
||||
|
||||
// Mock next/link
|
||||
jest.mock('next/link', () => {
|
||||
const LinkComponent = ({ children }: { children: React.ReactNode }) => children;
|
||||
LinkComponent.displayName = 'Link';
|
||||
return LinkComponent;
|
||||
jest.mock("next/link", () => {
|
||||
return function Link({
|
||||
children,
|
||||
href,
|
||||
}: {
|
||||
children: React.ReactNode;
|
||||
href: string;
|
||||
}) {
|
||||
return React.createElement("a", { href }, children);
|
||||
};
|
||||
});
|
||||
|
||||
// Mock next/image
|
||||
jest.mock('next/image', () => {
|
||||
const ImageComponent = ({ src, alt, fill, priority, ...props }: Record<string, unknown>) => {
|
||||
// Convert boolean props to strings for DOM compatibility
|
||||
const domProps: Record<string, unknown> = { src, alt };
|
||||
if (fill) domProps.style = { width: '100%', height: '100%', objectFit: 'cover' };
|
||||
if (priority) domProps.loading = 'eager';
|
||||
|
||||
return React.createElement('img', { ...domProps, ...props });
|
||||
jest.mock("next/image", () => {
|
||||
return function Image({
|
||||
src,
|
||||
alt,
|
||||
...props
|
||||
}: React.ImgHTMLAttributes<HTMLImageElement>) {
|
||||
return React.createElement("img", { src, alt, ...props });
|
||||
};
|
||||
});
|
||||
|
||||
// Mock react-responsive-masonry if it's used
|
||||
jest.mock("react-responsive-masonry", () => {
|
||||
const MasonryComponent = function Masonry({
|
||||
children,
|
||||
}: {
|
||||
children: React.ReactNode;
|
||||
}) {
|
||||
return React.createElement("div", { "data-testid": "masonry" }, children);
|
||||
};
|
||||
|
||||
const ResponsiveMasonryComponent = function ResponsiveMasonry({
|
||||
children,
|
||||
}: {
|
||||
children: React.ReactNode;
|
||||
}) {
|
||||
return React.createElement(
|
||||
"div",
|
||||
{ "data-testid": "responsive-masonry" },
|
||||
children,
|
||||
);
|
||||
};
|
||||
|
||||
return {
|
||||
__esModule: true,
|
||||
default: MasonryComponent,
|
||||
ResponsiveMasonry: ResponsiveMasonryComponent,
|
||||
};
|
||||
ImageComponent.displayName = 'Image';
|
||||
return ImageComponent;
|
||||
});
|
||||
|
||||
// Custom render function with ToastProvider
|
||||
const customRender = (ui: React.ReactElement, options = {}) =>
|
||||
render(ui, {
|
||||
wrapper: ({ children }) => React.createElement(ToastProvider, null, children),
|
||||
wrapper: ({ children }) =>
|
||||
React.createElement(ToastProvider, null, children),
|
||||
...options,
|
||||
});
|
||||
|
||||
// Re-export everything
|
||||
export * from '@testing-library/react';
|
||||
export { customRender as render };
|
||||
export * from "@testing-library/react";
|
||||
export { customRender as render };
|
||||
|
||||
177
lib/redis.ts
177
lib/redis.ts
@@ -1,35 +1,116 @@
|
||||
import { createClient } from 'redis';
|
||||
import { createClient } from "redis";
|
||||
|
||||
let redisClient: ReturnType<typeof createClient> | null = null;
|
||||
let connectionFailed = false; // Track if connection has permanently failed
|
||||
|
||||
interface RedisError {
|
||||
code?: string;
|
||||
message?: string;
|
||||
errors?: RedisError[];
|
||||
cause?: unknown;
|
||||
}
|
||||
|
||||
// Helper to check if error is connection refused
|
||||
const isConnectionRefused = (err: unknown): boolean => {
|
||||
if (!err) return false;
|
||||
|
||||
const error = err as RedisError;
|
||||
|
||||
// Check direct properties
|
||||
if (
|
||||
error.code === "ECONNREFUSED" ||
|
||||
error.message?.includes("ECONNREFUSED")
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Check AggregateError
|
||||
if (error.errors && Array.isArray(error.errors)) {
|
||||
return error.errors.some(
|
||||
(e: RedisError) =>
|
||||
e?.code === "ECONNREFUSED" || e?.message?.includes("ECONNREFUSED"),
|
||||
);
|
||||
}
|
||||
|
||||
// Check nested error
|
||||
if (error.cause) {
|
||||
return isConnectionRefused(error.cause);
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
export const getRedisClient = async () => {
|
||||
// If Redis URL is not configured, return null instead of trying to connect
|
||||
if (!process.env.REDIS_URL) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// If connection has already failed, don't try again
|
||||
if (connectionFailed) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!redisClient) {
|
||||
const redisUrl = process.env.REDIS_URL || 'redis://localhost:6379';
|
||||
|
||||
redisClient = createClient({
|
||||
url: redisUrl,
|
||||
socket: {
|
||||
reconnectStrategy: (retries) => Math.min(retries * 50, 1000)
|
||||
const redisUrl = process.env.REDIS_URL;
|
||||
|
||||
try {
|
||||
redisClient = createClient({
|
||||
url: redisUrl,
|
||||
socket: {
|
||||
reconnectStrategy: (retries) => {
|
||||
// Stop trying after 1 attempt to avoid spam
|
||||
if (retries > 1) {
|
||||
connectionFailed = true;
|
||||
return false;
|
||||
}
|
||||
return false; // Don't reconnect automatically
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
redisClient.on("error", (err: unknown) => {
|
||||
// Silently handle connection refused errors - Redis is optional
|
||||
if (isConnectionRefused(err)) {
|
||||
connectionFailed = true;
|
||||
return; // Don't log connection refused errors
|
||||
}
|
||||
// Only log non-connection-refused errors
|
||||
console.error("Redis Client Error:", err);
|
||||
});
|
||||
|
||||
redisClient.on("connect", () => {
|
||||
console.log("Redis Client Connected");
|
||||
connectionFailed = false; // Reset on successful connection
|
||||
});
|
||||
|
||||
redisClient.on("ready", () => {
|
||||
console.log("Redis Client Ready");
|
||||
connectionFailed = false; // Reset on ready
|
||||
});
|
||||
|
||||
redisClient.on("end", () => {
|
||||
console.log("Redis Client Disconnected");
|
||||
});
|
||||
|
||||
await redisClient.connect().catch((err: unknown) => {
|
||||
// Connection failed
|
||||
if (isConnectionRefused(err)) {
|
||||
connectionFailed = true;
|
||||
// Silently handle connection refused - Redis is optional
|
||||
} else {
|
||||
// Only log non-connection-refused errors
|
||||
console.error("Redis connection failed:", err);
|
||||
}
|
||||
redisClient = null;
|
||||
});
|
||||
} catch (error: unknown) {
|
||||
// If connection fails, set to null
|
||||
if (isConnectionRefused(error)) {
|
||||
connectionFailed = true;
|
||||
}
|
||||
});
|
||||
|
||||
redisClient.on('error', (err) => {
|
||||
console.error('Redis Client Error:', err);
|
||||
});
|
||||
|
||||
redisClient.on('connect', () => {
|
||||
console.log('Redis Client Connected');
|
||||
});
|
||||
|
||||
redisClient.on('ready', () => {
|
||||
console.log('Redis Client Ready');
|
||||
});
|
||||
|
||||
redisClient.on('end', () => {
|
||||
console.log('Redis Client Disconnected');
|
||||
});
|
||||
|
||||
await redisClient.connect();
|
||||
redisClient = null;
|
||||
}
|
||||
}
|
||||
|
||||
return redisClient;
|
||||
@@ -47,10 +128,11 @@ export const cache = {
|
||||
async get(key: string) {
|
||||
try {
|
||||
const client = await getRedisClient();
|
||||
if (!client) return null;
|
||||
const value = await client.get(key);
|
||||
return value ? JSON.parse(value) : null;
|
||||
} catch (error) {
|
||||
console.error('Redis GET error:', error);
|
||||
} catch (_error) {
|
||||
// Silently fail if Redis is not available
|
||||
return null;
|
||||
}
|
||||
},
|
||||
@@ -58,10 +140,11 @@ export const cache = {
|
||||
async set(key: string, value: unknown, ttlSeconds = 3600) {
|
||||
try {
|
||||
const client = await getRedisClient();
|
||||
if (!client) return false;
|
||||
await client.setEx(key, ttlSeconds, JSON.stringify(value));
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.error('Redis SET error:', error);
|
||||
} catch (_error) {
|
||||
// Silently fail if Redis is not available
|
||||
return false;
|
||||
}
|
||||
},
|
||||
@@ -69,10 +152,11 @@ export const cache = {
|
||||
async del(key: string) {
|
||||
try {
|
||||
const client = await getRedisClient();
|
||||
if (!client) return false;
|
||||
await client.del(key);
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.error('Redis DEL error:', error);
|
||||
} catch (_error) {
|
||||
// Silently fail if Redis is not available
|
||||
return false;
|
||||
}
|
||||
},
|
||||
@@ -80,9 +164,10 @@ export const cache = {
|
||||
async exists(key: string) {
|
||||
try {
|
||||
const client = await getRedisClient();
|
||||
if (!client) return false;
|
||||
return await client.exists(key);
|
||||
} catch (error) {
|
||||
console.error('Redis EXISTS error:', error);
|
||||
} catch (_error) {
|
||||
// Silently fail if Redis is not available
|
||||
return false;
|
||||
}
|
||||
},
|
||||
@@ -90,13 +175,14 @@ export const cache = {
|
||||
async flush() {
|
||||
try {
|
||||
const client = await getRedisClient();
|
||||
if (!client) return false;
|
||||
await client.flushAll();
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.error('Redis FLUSH error:', error);
|
||||
} catch (_error) {
|
||||
// Silently fail if Redis is not available
|
||||
return false;
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
// Session management
|
||||
@@ -117,7 +203,7 @@ export const session = {
|
||||
|
||||
async destroy(sessionId: string) {
|
||||
return await cache.del(sessionId);
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
// Analytics caching
|
||||
@@ -131,28 +217,29 @@ export const analyticsCache = {
|
||||
},
|
||||
|
||||
async getOverallStats() {
|
||||
return await cache.get('analytics:overall');
|
||||
return await cache.get("analytics:overall");
|
||||
},
|
||||
|
||||
async setOverallStats(stats: unknown, ttlSeconds = 600) {
|
||||
return await cache.set('analytics:overall', stats, ttlSeconds);
|
||||
return await cache.set("analytics:overall", stats, ttlSeconds);
|
||||
},
|
||||
|
||||
async invalidateProject(projectId: number) {
|
||||
await cache.del(`analytics:project:${projectId}`);
|
||||
await cache.del('analytics:overall');
|
||||
await cache.del("analytics:overall");
|
||||
},
|
||||
|
||||
async clearAll() {
|
||||
try {
|
||||
const client = await getRedisClient();
|
||||
if (!client) return;
|
||||
// Clear all analytics-related keys
|
||||
const keys = await client.keys('analytics:*');
|
||||
const keys = await client.keys("analytics:*");
|
||||
if (keys.length > 0) {
|
||||
await client.del(keys);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error clearing analytics cache:', error);
|
||||
} catch (_error) {
|
||||
// Silently fail if Redis is not available
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,16 +1,31 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import type { NextRequest } from 'next/server';
|
||||
import { NextResponse } from "next/server";
|
||||
import type { NextRequest } from "next/server";
|
||||
|
||||
export function middleware(request: NextRequest) {
|
||||
// For /manage and /editor routes, allow direct access (authentication disabled)
|
||||
if (request.nextUrl.pathname.startsWith('/manage') ||
|
||||
request.nextUrl.pathname.startsWith('/editor')) {
|
||||
// Allow direct access without authentication
|
||||
return NextResponse.next();
|
||||
// For /manage and /editor routes, the pages handle their own authentication
|
||||
// No middleware redirect needed - let the pages show login forms
|
||||
|
||||
// Add security headers to all responses
|
||||
const response = NextResponse.next();
|
||||
|
||||
// Security headers (complementing next.config.ts headers)
|
||||
response.headers.set("X-DNS-Prefetch-Control", "on");
|
||||
response.headers.set("X-Frame-Options", "DENY");
|
||||
response.headers.set("X-Content-Type-Options", "nosniff");
|
||||
response.headers.set("X-XSS-Protection", "1; mode=block");
|
||||
response.headers.set("Referrer-Policy", "strict-origin-when-cross-origin");
|
||||
response.headers.set(
|
||||
"Permissions-Policy",
|
||||
"camera=(), microphone=(), geolocation=()",
|
||||
);
|
||||
|
||||
// Rate limiting headers for API routes
|
||||
if (request.nextUrl.pathname.startsWith("/api/")) {
|
||||
response.headers.set("X-RateLimit-Limit", "100");
|
||||
response.headers.set("X-RateLimit-Remaining", "99");
|
||||
}
|
||||
|
||||
// For all other routes, continue with normal processing
|
||||
return NextResponse.next();
|
||||
return response;
|
||||
}
|
||||
|
||||
export const config = {
|
||||
@@ -24,6 +39,6 @@ export const config = {
|
||||
* - favicon.ico (favicon file)
|
||||
* - api/auth (auth API routes - need to be processed)
|
||||
*/
|
||||
'/((?!api/email|api/health|_next/static|_next/image|favicon.ico|api/auth).*)',
|
||||
"/((?!api/email|api/health|_next/static|_next/image|favicon.ico|api/auth).*)",
|
||||
],
|
||||
};
|
||||
};
|
||||
|
||||
143
next.config.ts
143
next.config.ts
@@ -1,56 +1,145 @@
|
||||
import type { NextConfig } from "next";
|
||||
import dotenv from "dotenv";
|
||||
import path from "path";
|
||||
import bundleAnalyzer from "@next/bundle-analyzer";
|
||||
|
||||
// Lade die .env Datei aus dem Arbeitsverzeichnis
|
||||
dotenv.config({ path: path.resolve(__dirname, '.env') });
|
||||
// Load the .env file from the working directory
|
||||
dotenv.config({ path: path.resolve(process.cwd(), ".env") });
|
||||
|
||||
const nextConfig: NextConfig = {
|
||||
// Enable standalone output for Docker
|
||||
output: 'standalone',
|
||||
outputFileTracingRoot: path.join(__dirname, '../../'),
|
||||
|
||||
// Ensure proper server configuration
|
||||
serverRuntimeConfig: {
|
||||
// Will only be available on the server side
|
||||
},
|
||||
|
||||
output: "standalone",
|
||||
outputFileTracingRoot: path.join(process.cwd()),
|
||||
|
||||
// Optimize for production
|
||||
compress: true,
|
||||
poweredByHeader: false,
|
||||
|
||||
|
||||
// React Strict Mode
|
||||
reactStrictMode: true,
|
||||
|
||||
// Disable ESLint during build for Docker
|
||||
eslint: {
|
||||
ignoreDuringBuilds: process.env.NODE_ENV === 'production',
|
||||
ignoreDuringBuilds: process.env.NODE_ENV === "production",
|
||||
},
|
||||
|
||||
|
||||
// Environment variables
|
||||
env: {
|
||||
NEXT_PUBLIC_BASE_URL: process.env.NEXT_PUBLIC_BASE_URL
|
||||
NEXT_PUBLIC_BASE_URL: process.env.NEXT_PUBLIC_BASE_URL,
|
||||
},
|
||||
|
||||
|
||||
// Performance optimizations
|
||||
experimental: {
|
||||
optimizePackageImports: ['lucide-react', 'framer-motion'],
|
||||
optimizePackageImports: ["lucide-react", "framer-motion"],
|
||||
},
|
||||
|
||||
|
||||
// Image optimization
|
||||
images: {
|
||||
formats: ['image/webp', 'image/avif'],
|
||||
formats: ["image/webp", "image/avif"],
|
||||
minimumCacheTTL: 60,
|
||||
remotePatterns: [
|
||||
{
|
||||
protocol: "https",
|
||||
hostname: "i.scdn.co",
|
||||
},
|
||||
{
|
||||
protocol: "https",
|
||||
hostname: "cdn.discordapp.com",
|
||||
},
|
||||
{
|
||||
protocol: "https",
|
||||
hostname: "media.discordapp.net",
|
||||
},
|
||||
],
|
||||
},
|
||||
|
||||
// Dynamic routes are handled automatically by Next.js
|
||||
|
||||
// Add cache-busting headers
|
||||
|
||||
// Webpack configuration
|
||||
webpack: (config, { isServer, dev, webpack }) => {
|
||||
// Fix for module resolution issues
|
||||
config.resolve.fallback = {
|
||||
...config.resolve.fallback,
|
||||
fs: false,
|
||||
net: false,
|
||||
tls: false,
|
||||
};
|
||||
|
||||
// Safari + React 19 + Next.js 15 compatibility fixes
|
||||
if (dev && !isServer) {
|
||||
// Disable module concatenation to prevent factory initialization issues
|
||||
config.optimization = {
|
||||
...config.optimization,
|
||||
concatenateModules: false,
|
||||
providedExports: false,
|
||||
usedExports: false,
|
||||
};
|
||||
|
||||
// Add DefinePlugin to ensure proper environment detection
|
||||
config.plugins.push(
|
||||
new webpack.DefinePlugin({
|
||||
"process.env.__NEXT_DISABLE_REACT_STRICT_MODE": JSON.stringify(false),
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
return config;
|
||||
},
|
||||
|
||||
// Security and cache headers
|
||||
async headers() {
|
||||
return [
|
||||
{
|
||||
source: '/(.*)',
|
||||
source: "/(.*)",
|
||||
headers: [
|
||||
{
|
||||
key: 'Cache-Control',
|
||||
value: 'public, max-age=0, must-revalidate',
|
||||
key: "X-DNS-Prefetch-Control",
|
||||
value: "on",
|
||||
},
|
||||
{
|
||||
key: "Strict-Transport-Security",
|
||||
value: "max-age=63072000; includeSubDomains; preload",
|
||||
},
|
||||
{
|
||||
key: "X-Frame-Options",
|
||||
value: "DENY",
|
||||
},
|
||||
{
|
||||
key: "X-Content-Type-Options",
|
||||
value: "nosniff",
|
||||
},
|
||||
{
|
||||
key: "X-XSS-Protection",
|
||||
value: "1; mode=block",
|
||||
},
|
||||
{
|
||||
key: "Referrer-Policy",
|
||||
value: "strict-origin-when-cross-origin",
|
||||
},
|
||||
{
|
||||
key: "Permissions-Policy",
|
||||
value: "camera=(), microphone=(), geolocation=()",
|
||||
},
|
||||
{
|
||||
key: "Content-Security-Policy",
|
||||
value:
|
||||
"default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://analytics.dk0.dev; script-src-elem 'self' 'unsafe-inline' https://analytics.dk0.dev; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com data:; img-src 'self' data: https:; connect-src 'self' https://analytics.dk0.dev https://api.quotable.io; frame-ancestors 'none'; base-uri 'self'; form-action 'self';",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
source: "/api/(.*)",
|
||||
headers: [
|
||||
{
|
||||
key: "Cache-Control",
|
||||
value: "no-store, no-cache, must-revalidate, proxy-revalidate",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
source: "/_next/static/(.*)",
|
||||
headers: [
|
||||
{
|
||||
key: "Cache-Control",
|
||||
value: "public, max-age=31536000, immutable",
|
||||
},
|
||||
],
|
||||
},
|
||||
@@ -58,10 +147,8 @@ const nextConfig: NextConfig = {
|
||||
},
|
||||
};
|
||||
|
||||
import bundleAnalyzer from "@next/bundle-analyzer";
|
||||
|
||||
const withBundleAnalyzer = bundleAnalyzer({
|
||||
enabled: process.env.ANALYZE === "true",
|
||||
});
|
||||
|
||||
module.exports = withBundleAnalyzer(nextConfig);
|
||||
export default withBundleAnalyzer(nextConfig);
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
http {
|
||||
upstream portfolio_backend {
|
||||
# Health check enabled upstream
|
||||
server portfolio-app-1:3000 max_fails=3 fail_timeout=30s;
|
||||
server portfolio-app-2:3000 max_fails=3 fail_timeout=30s;
|
||||
}
|
||||
|
||||
# Resolver for dynamic upstream resolution
|
||||
resolver 127.0.0.11 valid=10s;
|
||||
|
||||
# Main server
|
||||
server {
|
||||
listen 80;
|
||||
server_name _;
|
||||
|
||||
# Health check endpoint
|
||||
location /health {
|
||||
access_log off;
|
||||
return 200 "healthy\n";
|
||||
add_header Content-Type text/plain;
|
||||
}
|
||||
|
||||
# Main location
|
||||
location / {
|
||||
proxy_pass http://portfolio_backend;
|
||||
|
||||
# Proxy settings
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
|
||||
# Timeout settings
|
||||
proxy_connect_timeout 5s;
|
||||
proxy_send_timeout 60s;
|
||||
proxy_read_timeout 60s;
|
||||
|
||||
# Buffer settings
|
||||
proxy_buffering on;
|
||||
proxy_buffer_size 4k;
|
||||
proxy_buffers 8 4k;
|
||||
|
||||
# Health check for upstream
|
||||
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
|
||||
proxy_next_upstream_tries 2;
|
||||
proxy_next_upstream_timeout 10s;
|
||||
}
|
||||
|
||||
# Static files caching
|
||||
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
|
||||
proxy_pass http://portfolio_backend;
|
||||
|
||||
# Proxy settings
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
|
||||
expires 1y;
|
||||
add_header Cache-Control "public, immutable";
|
||||
}
|
||||
}
|
||||
}
|
||||
545
package-lock.json
generated
545
package-lock.json
generated
@@ -9,28 +9,28 @@
|
||||
"version": "0.1.0",
|
||||
"dependencies": {
|
||||
"@next/bundle-analyzer": "^15.1.7",
|
||||
"@prisma/client": "^5.7.1",
|
||||
"@prisma/client": "^5.22.0",
|
||||
"@vercel/og": "^0.6.5",
|
||||
"clsx": "^2.1.0",
|
||||
"dotenv": "^16.4.7",
|
||||
"framer-motion": "^11.0.0",
|
||||
"framer-motion": "^12.24.10",
|
||||
"gray-matter": "^4.0.3",
|
||||
"lucide-react": "^0.542.0",
|
||||
"next": "^15.5.2",
|
||||
"next": "^15.5.7",
|
||||
"node-cache": "^5.1.2",
|
||||
"node-fetch": "^2.7.0",
|
||||
"nodemailer": "^6.10.0",
|
||||
"prisma": "^5.7.1",
|
||||
"react": "^19.0.0",
|
||||
"react-dom": "^19.0.0",
|
||||
"nodemailer": "^7.0.11",
|
||||
"react": "^19.0.1",
|
||||
"react-dom": "^19.0.1",
|
||||
"react-icons": "^5.5.0",
|
||||
"react-markdown": "^9.0.1",
|
||||
"react-markdown": "^10.1.0",
|
||||
"react-responsive-masonry": "^2.7.1",
|
||||
"redis": "^5.8.2",
|
||||
"tailwind-merge": "^2.2.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/eslintrc": "^3",
|
||||
"@playwright/test": "^1.57.0",
|
||||
"@testing-library/dom": "^10.4.0",
|
||||
"@testing-library/jest-dom": "^6.6.3",
|
||||
"@testing-library/react": "^16.2.0",
|
||||
@@ -44,16 +44,18 @@
|
||||
"@types/react-syntax-highlighter": "^15.5.11",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint": "^9",
|
||||
"eslint-config-next": "15.1.7",
|
||||
"eslint-config-next": "^15.5.7",
|
||||
"jest": "^29.7.0",
|
||||
"jest-environment-jsdom": "^29.7.0",
|
||||
"nodemailer-mock": "^2.0.8",
|
||||
"nodemailer-mock": "^2.0.9",
|
||||
"playwright": "^1.57.0",
|
||||
"postcss": "^8",
|
||||
"prisma": "^5.22.0",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"ts-jest": "^29.2.5",
|
||||
"ts-node": "^10.9.2",
|
||||
"tsx": "^4.20.5",
|
||||
"typescript": "^5.7.3",
|
||||
"typescript": "5.9.3",
|
||||
"whatwg-fetch": "^3.6.20"
|
||||
}
|
||||
},
|
||||
@@ -1800,9 +1802,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
|
||||
"version": "3.14.1",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
|
||||
"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
|
||||
"version": "3.14.2",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
|
||||
"integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -2265,14 +2267,15 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@next/env": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.2.tgz",
|
||||
"integrity": "sha512-Qe06ew4zt12LeO6N7j8/nULSOe3fMXE4dM6xgpBQNvdzyK1sv5y4oAP3bq4LamrvGCZtmRYnW8URFCeX5nFgGg=="
|
||||
"version": "15.5.9",
|
||||
"resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.9.tgz",
|
||||
"integrity": "sha512-4GlTZ+EJM7WaW2HEZcyU317tIQDjkQIyENDLxYJfSWlfqguN+dHkZgyQTV/7ykvobU7yEH5gKvreNrH4B6QgIg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@next/eslint-plugin-next": {
|
||||
"version": "15.1.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-15.1.7.tgz",
|
||||
"integrity": "sha512-kRP7RjSxfTO13NE317ek3mSGzoZlI33nc/i5hs1KaWpK+egs85xg0DJ4p32QEiHnR0mVjuUfhRIun7awqfL7pQ==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-15.5.7.tgz",
|
||||
"integrity": "sha512-DtRU2N7BkGr8r+pExfuWHwMEPX5SD57FeA6pxdgCHODo+b/UgIgjE+rgWKtJAbEbGhVZ2jtHn4g3wNhWFoNBQQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -2280,12 +2283,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@next/swc-darwin-arm64": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.2.tgz",
|
||||
"integrity": "sha512-8bGt577BXGSd4iqFygmzIfTYizHb0LGWqH+qgIF/2EDxS5JsSdERJKA8WgwDyNBZgTIIA4D8qUtoQHmxIIquoQ==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.7.tgz",
|
||||
"integrity": "sha512-IZwtxCEpI91HVU/rAUOOobWSZv4P2DeTtNaCdHqLcTJU4wdNXgAySvKa/qJCgR5m6KI8UsKDXtO2B31jcaw1Yw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
@@ -2295,12 +2299,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@next/swc-darwin-x64": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.2.tgz",
|
||||
"integrity": "sha512-2DjnmR6JHK4X+dgTXt5/sOCu/7yPtqpYt8s8hLkHFK3MGkka2snTv3yRMdHvuRtJVkPwCGsvBSwmoQCHatauFQ==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.7.tgz",
|
||||
"integrity": "sha512-UP6CaDBcqaCBuiq/gfCEJw7sPEoX1aIjZHnBWN9v9qYHQdMKvCKcAVs4OX1vIjeE+tC5EIuwDTVIoXpUes29lg==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
@@ -2310,12 +2315,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@next/swc-linux-arm64-gnu": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.2.tgz",
|
||||
"integrity": "sha512-3j7SWDBS2Wov/L9q0mFJtEvQ5miIqfO4l7d2m9Mo06ddsgUK8gWfHGgbjdFlCp2Ek7MmMQZSxpGFqcC8zGh2AA==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.7.tgz",
|
||||
"integrity": "sha512-NCslw3GrNIw7OgmRBxHtdWFQYhexoUCq+0oS2ccjyYLtcn1SzGzeM54jpTFonIMUjNbHmpKpziXnpxhSWLcmBA==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
@@ -2325,12 +2331,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@next/swc-linux-arm64-musl": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.2.tgz",
|
||||
"integrity": "sha512-s6N8k8dF9YGc5T01UPQ08yxsK6fUow5gG1/axWc1HVVBYQBgOjca4oUZF7s4p+kwhkB1bDSGR8QznWrFZ/Rt5g==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.7.tgz",
|
||||
"integrity": "sha512-nfymt+SE5cvtTrG9u1wdoxBr9bVB7mtKTcj0ltRn6gkP/2Nu1zM5ei8rwP9qKQP0Y//umK+TtkKgNtfboBxRrw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
@@ -2340,12 +2347,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@next/swc-linux-x64-gnu": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.2.tgz",
|
||||
"integrity": "sha512-o1RV/KOODQh6dM6ZRJGZbc+MOAHww33Vbs5JC9Mp1gDk8cpEO+cYC/l7rweiEalkSm5/1WGa4zY7xrNwObN4+Q==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.7.tgz",
|
||||
"integrity": "sha512-hvXcZvCaaEbCZcVzcY7E1uXN9xWZfFvkNHwbe/n4OkRhFWrs1J1QV+4U1BN06tXLdaS4DazEGXwgqnu/VMcmqw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
@@ -2355,12 +2363,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@next/swc-linux-x64-musl": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.2.tgz",
|
||||
"integrity": "sha512-/VUnh7w8RElYZ0IV83nUcP/J4KJ6LLYliiBIri3p3aW2giF+PAVgZb6mk8jbQSB3WlTai8gEmCAr7kptFa1H6g==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.7.tgz",
|
||||
"integrity": "sha512-4IUO539b8FmF0odY6/SqANJdgwn1xs1GkPO5doZugwZ3ETF6JUdckk7RGmsfSf7ws8Qb2YB5It33mvNL/0acqA==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
@@ -2370,12 +2379,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@next/swc-win32-arm64-msvc": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.2.tgz",
|
||||
"integrity": "sha512-sMPyTvRcNKXseNQ/7qRfVRLa0VhR0esmQ29DD6pqvG71+JdVnESJaHPA8t7bc67KD5spP3+DOCNLhqlEI2ZgQg==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.7.tgz",
|
||||
"integrity": "sha512-CpJVTkYI3ZajQkC5vajM7/ApKJUOlm6uP4BknM3XKvJ7VXAvCqSjSLmM0LKdYzn6nBJVSjdclx8nYJSa3xlTgQ==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
@@ -2385,12 +2395,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@next/swc-win32-x64-msvc": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.2.tgz",
|
||||
"integrity": "sha512-W5VvyZHnxG/2ukhZF/9Ikdra5fdNftxI6ybeVKYvBPDtyx7x4jPPSNduUkfH5fo3zG0JQ0bPxgy41af2JX5D4Q==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.7.tgz",
|
||||
"integrity": "sha512-gMzgBX164I6DN+9/PGA+9dQiwmTkE4TloBNx8Kv9UiGARsr9Nba7IpcBRA1iTV9vwlYnrE3Uy6I7Aj6qLjQuqw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
@@ -2458,6 +2469,22 @@
|
||||
"node": ">=14"
|
||||
}
|
||||
},
|
||||
"node_modules/@playwright/test": {
|
||||
"version": "1.57.0",
|
||||
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz",
|
||||
"integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"playwright": "1.57.0"
|
||||
},
|
||||
"bin": {
|
||||
"playwright": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/@polka/url": {
|
||||
"version": "1.0.0-next.28",
|
||||
"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
|
||||
@@ -2469,6 +2496,7 @@
|
||||
"resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.22.0.tgz",
|
||||
"integrity": "sha512-M0SVXfyHnQREBKxCgyo7sffrKttwE6R8PMq330MIUF0pTwjUhLbW84pFDlf06B27XyCR++VtjugEnIHdr07SVA==",
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"engines": {
|
||||
"node": ">=16.13"
|
||||
},
|
||||
@@ -2484,13 +2512,17 @@
|
||||
"node_modules/@prisma/debug": {
|
||||
"version": "5.22.0",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.22.0.tgz",
|
||||
"integrity": "sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ=="
|
||||
"integrity": "sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/@prisma/engines": {
|
||||
"version": "5.22.0",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.22.0.tgz",
|
||||
"integrity": "sha512-UNjfslWhAt06kVL3CjkuYpHAWSO6L4kDCVPegV6itt7nD1kSJavd3vhgAEhjglLJJKEdJ7oIqDJ+yHk6qO8gPA==",
|
||||
"devOptional": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@prisma/debug": "5.22.0",
|
||||
"@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
|
||||
@@ -2501,12 +2533,16 @@
|
||||
"node_modules/@prisma/engines-version": {
|
||||
"version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2.tgz",
|
||||
"integrity": "sha512-2PTmxFR2yHW/eB3uqWtcgRcgAbG1rwG9ZriSvQw+nnb7c4uCr3RAcGMb6/zfE88SKlC1Nj2ziUvc96Z379mHgQ=="
|
||||
"integrity": "sha512-2PTmxFR2yHW/eB3uqWtcgRcgAbG1rwG9ZriSvQw+nnb7c4uCr3RAcGMb6/zfE88SKlC1Nj2ziUvc96Z379mHgQ==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/@prisma/fetch-engine": {
|
||||
"version": "5.22.0",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.22.0.tgz",
|
||||
"integrity": "sha512-bkrD/Mc2fSvkQBV5EpoFcZ87AvOgDxbG99488a5cexp5Ccny+UM6MAe/UFkUC0wLYD9+9befNOqGiIJhhq+HbA==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@prisma/debug": "5.22.0",
|
||||
"@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
|
||||
@@ -2517,6 +2553,8 @@
|
||||
"version": "5.22.0",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.22.0.tgz",
|
||||
"integrity": "sha512-pHhpQdr1UPFpt+zFfnPazhulaZYCUqeIcPpJViYoq9R+D/yw4fjE+CtnsnKzPYm0ddUbeXUzjGVGIRVgPDCk4Q==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@prisma/debug": "5.22.0"
|
||||
}
|
||||
@@ -3086,21 +3124,21 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@typescript-eslint/eslint-plugin": {
|
||||
"version": "8.24.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz",
|
||||
"integrity": "sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==",
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.48.1.tgz",
|
||||
"integrity": "sha512-X63hI1bxl5ohelzr0LY5coufyl0LJNthld+abwxpCoo6Gq+hSqhKwci7MUWkXo67mzgUK6YFByhmaHmUcuBJmA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@eslint-community/regexpp": "^4.10.0",
|
||||
"@typescript-eslint/scope-manager": "8.24.1",
|
||||
"@typescript-eslint/type-utils": "8.24.1",
|
||||
"@typescript-eslint/utils": "8.24.1",
|
||||
"@typescript-eslint/visitor-keys": "8.24.1",
|
||||
"@typescript-eslint/scope-manager": "8.48.1",
|
||||
"@typescript-eslint/type-utils": "8.48.1",
|
||||
"@typescript-eslint/utils": "8.48.1",
|
||||
"@typescript-eslint/visitor-keys": "8.48.1",
|
||||
"graphemer": "^1.4.0",
|
||||
"ignore": "^5.3.1",
|
||||
"ignore": "^7.0.0",
|
||||
"natural-compare": "^1.4.0",
|
||||
"ts-api-utils": "^2.0.1"
|
||||
"ts-api-utils": "^2.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
@@ -3110,22 +3148,32 @@
|
||||
"url": "https://opencollective.com/typescript-eslint"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
|
||||
"@typescript-eslint/parser": "^8.48.1",
|
||||
"eslint": "^8.57.0 || ^9.0.0",
|
||||
"typescript": ">=4.8.4 <5.8.0"
|
||||
"typescript": ">=4.8.4 <6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
|
||||
"version": "7.0.5",
|
||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
|
||||
"integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 4"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/parser": {
|
||||
"version": "8.24.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.1.tgz",
|
||||
"integrity": "sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==",
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.48.1.tgz",
|
||||
"integrity": "sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/scope-manager": "8.24.1",
|
||||
"@typescript-eslint/types": "8.24.1",
|
||||
"@typescript-eslint/typescript-estree": "8.24.1",
|
||||
"@typescript-eslint/visitor-keys": "8.24.1",
|
||||
"@typescript-eslint/scope-manager": "8.48.1",
|
||||
"@typescript-eslint/types": "8.48.1",
|
||||
"@typescript-eslint/typescript-estree": "8.48.1",
|
||||
"@typescript-eslint/visitor-keys": "8.48.1",
|
||||
"debug": "^4.3.4"
|
||||
},
|
||||
"engines": {
|
||||
@@ -3137,18 +3185,40 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"eslint": "^8.57.0 || ^9.0.0",
|
||||
"typescript": ">=4.8.4 <5.8.0"
|
||||
"typescript": ">=4.8.4 <6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/scope-manager": {
|
||||
"version": "8.24.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz",
|
||||
"integrity": "sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==",
|
||||
"node_modules/@typescript-eslint/project-service": {
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.48.1.tgz",
|
||||
"integrity": "sha512-HQWSicah4s9z2/HifRPQ6b6R7G+SBx64JlFQpgSSHWPKdvCZX57XCbszg/bapbRsOEv42q5tayTYcEFpACcX1w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/types": "8.24.1",
|
||||
"@typescript-eslint/visitor-keys": "8.24.1"
|
||||
"@typescript-eslint/tsconfig-utils": "^8.48.1",
|
||||
"@typescript-eslint/types": "^8.48.1",
|
||||
"debug": "^4.3.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/typescript-eslint"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"typescript": ">=4.8.4 <6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/scope-manager": {
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.48.1.tgz",
|
||||
"integrity": "sha512-rj4vWQsytQbLxC5Bf4XwZ0/CKd362DkWMUkviT7DCS057SK64D5lH74sSGzhI6PDD2HCEq02xAP9cX68dYyg1w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/types": "8.48.1",
|
||||
"@typescript-eslint/visitor-keys": "8.48.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
@@ -3158,17 +3228,35 @@
|
||||
"url": "https://opencollective.com/typescript-eslint"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/tsconfig-utils": {
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.48.1.tgz",
|
||||
"integrity": "sha512-k0Jhs4CpEffIBm6wPaCXBAD7jxBtrHjrSgtfCjUvPp9AZ78lXKdTR8fxyZO5y4vWNlOvYXRtngSZNSn+H53Jkw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/typescript-eslint"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"typescript": ">=4.8.4 <6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/type-utils": {
|
||||
"version": "8.24.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz",
|
||||
"integrity": "sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==",
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.48.1.tgz",
|
||||
"integrity": "sha512-1jEop81a3LrJQLTf/1VfPQdhIY4PlGDBc/i67EVWObrtvcziysbLN3oReexHOM6N3jyXgCrkBsZpqwH0hiDOQg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/typescript-estree": "8.24.1",
|
||||
"@typescript-eslint/utils": "8.24.1",
|
||||
"@typescript-eslint/types": "8.48.1",
|
||||
"@typescript-eslint/typescript-estree": "8.48.1",
|
||||
"@typescript-eslint/utils": "8.48.1",
|
||||
"debug": "^4.3.4",
|
||||
"ts-api-utils": "^2.0.1"
|
||||
"ts-api-utils": "^2.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
@@ -3179,13 +3267,13 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"eslint": "^8.57.0 || ^9.0.0",
|
||||
"typescript": ">=4.8.4 <5.8.0"
|
||||
"typescript": ">=4.8.4 <6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/types": {
|
||||
"version": "8.24.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.1.tgz",
|
||||
"integrity": "sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==",
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.48.1.tgz",
|
||||
"integrity": "sha512-+fZ3LZNeiELGmimrujsDCT4CRIbq5oXdHe7chLiW8qzqyPMnn1puNstCrMNVAqwcl2FdIxkuJ4tOs/RFDBVc/Q==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
@@ -3197,20 +3285,21 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/typescript-estree": {
|
||||
"version": "8.24.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz",
|
||||
"integrity": "sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==",
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.48.1.tgz",
|
||||
"integrity": "sha512-/9wQ4PqaefTK6POVTjJaYS0bynCgzh6ClJHGSBj06XEHjkfylzB+A3qvyaXnErEZSaxhIo4YdyBgq6j4RysxDg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/types": "8.24.1",
|
||||
"@typescript-eslint/visitor-keys": "8.24.1",
|
||||
"@typescript-eslint/project-service": "8.48.1",
|
||||
"@typescript-eslint/tsconfig-utils": "8.48.1",
|
||||
"@typescript-eslint/types": "8.48.1",
|
||||
"@typescript-eslint/visitor-keys": "8.48.1",
|
||||
"debug": "^4.3.4",
|
||||
"fast-glob": "^3.3.2",
|
||||
"is-glob": "^4.0.3",
|
||||
"minimatch": "^9.0.4",
|
||||
"semver": "^7.6.0",
|
||||
"ts-api-utils": "^2.0.1"
|
||||
"tinyglobby": "^0.2.15",
|
||||
"ts-api-utils": "^2.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
@@ -3220,7 +3309,7 @@
|
||||
"url": "https://opencollective.com/typescript-eslint"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"typescript": ">=4.8.4 <5.8.0"
|
||||
"typescript": ">=4.8.4 <6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
|
||||
@@ -3228,38 +3317,9 @@
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
|
||||
"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"balanced-match": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/typescript-estree/node_modules/fast-glob": {
|
||||
"version": "3.3.3",
|
||||
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
|
||||
"integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@nodelib/fs.stat": "^2.0.2",
|
||||
"@nodelib/fs.walk": "^1.2.3",
|
||||
"glob-parent": "^5.1.2",
|
||||
"merge2": "^1.3.0",
|
||||
"micromatch": "^4.0.8"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.6.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/typescript-estree/node_modules/glob-parent": {
|
||||
"version": "5.1.2",
|
||||
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
|
||||
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"is-glob": "^4.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 6"
|
||||
"balanced-match": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
|
||||
@@ -3279,16 +3339,16 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/utils": {
|
||||
"version": "8.24.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.1.tgz",
|
||||
"integrity": "sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==",
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.48.1.tgz",
|
||||
"integrity": "sha512-fAnhLrDjiVfey5wwFRwrweyRlCmdz5ZxXz2G/4cLn0YDLjTapmN4gcCsTBR1N2rWnZSDeWpYtgLDsJt+FpmcwA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@eslint-community/eslint-utils": "^4.4.0",
|
||||
"@typescript-eslint/scope-manager": "8.24.1",
|
||||
"@typescript-eslint/types": "8.24.1",
|
||||
"@typescript-eslint/typescript-estree": "8.24.1"
|
||||
"@eslint-community/eslint-utils": "^4.7.0",
|
||||
"@typescript-eslint/scope-manager": "8.48.1",
|
||||
"@typescript-eslint/types": "8.48.1",
|
||||
"@typescript-eslint/typescript-estree": "8.48.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
@@ -3299,18 +3359,18 @@
|
||||
},
|
||||
"peerDependencies": {
|
||||
"eslint": "^8.57.0 || ^9.0.0",
|
||||
"typescript": ">=4.8.4 <5.8.0"
|
||||
"typescript": ">=4.8.4 <6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@typescript-eslint/visitor-keys": {
|
||||
"version": "8.24.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz",
|
||||
"integrity": "sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==",
|
||||
"version": "8.48.1",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.48.1.tgz",
|
||||
"integrity": "sha512-BmxxndzEWhE4TIEEMBs8lP3MBWN3jFPs/p6gPm/wkv02o41hI6cq9AuSmGAaTTHPtA1FTi2jBre4A9rm5ZmX+Q==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/types": "8.24.1",
|
||||
"eslint-visitor-keys": "^4.2.0"
|
||||
"@typescript-eslint/types": "8.48.1",
|
||||
"eslint-visitor-keys": "^4.2.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
@@ -4838,9 +4898,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/dotenv": {
|
||||
"version": "16.4.7",
|
||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
|
||||
"integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
|
||||
"version": "16.6.1",
|
||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
|
||||
"integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
|
||||
"license": "BSD-2-Clause",
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
@@ -5283,13 +5343,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/eslint-config-next": {
|
||||
"version": "15.1.7",
|
||||
"resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-15.1.7.tgz",
|
||||
"integrity": "sha512-zXoMnYUIy3XHaAoOhrcYkT9UQWvXqWju2K7NNsmb5wd/7XESDwof61eUdW4QhERr3eJ9Ko/vnXqIrj8kk/drYw==",
|
||||
"version": "15.5.7",
|
||||
"resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-15.5.7.tgz",
|
||||
"integrity": "sha512-nU/TRGHHeG81NeLW5DeQT5t6BDUqbpsNQTvef1ld/tqHT+/zTx60/TIhKnmPISTTe++DVo+DLxDmk4rnwHaZVw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@next/eslint-plugin-next": "15.1.7",
|
||||
"@next/eslint-plugin-next": "15.5.7",
|
||||
"@rushstack/eslint-patch": "^1.10.3",
|
||||
"@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
|
||||
"@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
|
||||
@@ -5932,13 +5992,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/foreground-child": {
|
||||
"version": "3.3.0",
|
||||
"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
|
||||
"integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
|
||||
"version": "3.3.1",
|
||||
"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
|
||||
"integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"cross-spawn": "^7.0.0",
|
||||
"cross-spawn": "^7.0.6",
|
||||
"signal-exit": "^4.0.1"
|
||||
},
|
||||
"engines": {
|
||||
@@ -5978,12 +6038,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/framer-motion": {
|
||||
"version": "11.18.2",
|
||||
"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.18.2.tgz",
|
||||
"integrity": "sha512-5F5Och7wrvtLVElIpclDT0CBzMVg3dL22B64aZwHtsIY8RB4mXICLrkajK4G9R+ieSAGcgrLeae2SeUTg2pr6w==",
|
||||
"version": "12.24.10",
|
||||
"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.24.10.tgz",
|
||||
"integrity": "sha512-8yoyMkCn2RmV9UB9mfmMuzKyenQe909hRQRl0yGBhbZJjZZ9bSU87NIGAruqCXCuTNCA0qHw2LWLrcXLL9GF6A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"motion-dom": "^11.18.1",
|
||||
"motion-utils": "^11.18.1",
|
||||
"motion-dom": "^12.24.10",
|
||||
"motion-utils": "^12.24.10",
|
||||
"tslib": "^2.4.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
@@ -6295,9 +6356,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/gray-matter/node_modules/js-yaml": {
|
||||
"version": "3.14.1",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
|
||||
"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
|
||||
"version": "3.14.2",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
|
||||
"integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"argparse": "^1.0.7",
|
||||
@@ -8251,9 +8312,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/js-yaml": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
|
||||
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
|
||||
"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -8706,9 +8767,10 @@
|
||||
}
|
||||
},
|
||||
"node_modules/mdast-util-to-hast": {
|
||||
"version": "13.2.0",
|
||||
"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz",
|
||||
"integrity": "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==",
|
||||
"version": "13.2.1",
|
||||
"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
|
||||
"integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/hast": "^3.0.0",
|
||||
"@types/mdast": "^4.0.0",
|
||||
@@ -9286,17 +9348,19 @@
|
||||
}
|
||||
},
|
||||
"node_modules/motion-dom": {
|
||||
"version": "11.18.1",
|
||||
"resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-11.18.1.tgz",
|
||||
"integrity": "sha512-g76KvA001z+atjfxczdRtw/RXOM3OMSdd1f4DL77qCTF/+avrRJiawSG4yDibEQ215sr9kpinSlX2pCTJ9zbhw==",
|
||||
"version": "12.24.10",
|
||||
"resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.24.10.tgz",
|
||||
"integrity": "sha512-H3HStYaJ6wANoZVNT0ZmYZHGvrpvi9pKJRzsgNEHkdITR4Qd9FFu2e9sH4e2Phr4tKCmyyloex6SOSmv0Tlq+g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"motion-utils": "^11.18.1"
|
||||
"motion-utils": "^12.24.10"
|
||||
}
|
||||
},
|
||||
"node_modules/motion-utils": {
|
||||
"version": "11.18.1",
|
||||
"resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-11.18.1.tgz",
|
||||
"integrity": "sha512-49Kt+HKjtbJKLtgO/LKj9Ld+6vw9BjH5d9sc40R/kVyH8GLAXgT42M2NnuPcJNuA3s9ZfZBUcwIgpmZWGEE+hA=="
|
||||
"version": "12.24.10",
|
||||
"resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.24.10.tgz",
|
||||
"integrity": "sha512-x5TFgkCIP4pPsRLpKoI86jv/q8t8FQOiM/0E8QKBzfMozWHfkKap2gA1hOki+B5g3IsBNpxbUnfOum1+dgvYww==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/mrmime": {
|
||||
"version": "2.0.1",
|
||||
@@ -9351,11 +9415,12 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/next": {
|
||||
"version": "15.5.2",
|
||||
"resolved": "https://registry.npmjs.org/next/-/next-15.5.2.tgz",
|
||||
"integrity": "sha512-H8Otr7abj1glFhbGnvUt3gz++0AF1+QoCXEBmd/6aKbfdFwrn0LpA836Ed5+00va/7HQSDD+mOoVhn3tNy3e/Q==",
|
||||
"version": "15.5.9",
|
||||
"resolved": "https://registry.npmjs.org/next/-/next-15.5.9.tgz",
|
||||
"integrity": "sha512-agNLK89seZEtC5zUHwtut0+tNrc0Xw4FT/Dg+B/VLEo9pAcS9rtTKpek3V6kVcVwsB2YlqMaHdfZL4eLEVYuCg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@next/env": "15.5.2",
|
||||
"@next/env": "15.5.9",
|
||||
"@swc/helpers": "0.5.15",
|
||||
"caniuse-lite": "^1.0.30001579",
|
||||
"postcss": "8.4.31",
|
||||
@@ -9368,14 +9433,14 @@
|
||||
"node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@next/swc-darwin-arm64": "15.5.2",
|
||||
"@next/swc-darwin-x64": "15.5.2",
|
||||
"@next/swc-linux-arm64-gnu": "15.5.2",
|
||||
"@next/swc-linux-arm64-musl": "15.5.2",
|
||||
"@next/swc-linux-x64-gnu": "15.5.2",
|
||||
"@next/swc-linux-x64-musl": "15.5.2",
|
||||
"@next/swc-win32-arm64-msvc": "15.5.2",
|
||||
"@next/swc-win32-x64-msvc": "15.5.2",
|
||||
"@next/swc-darwin-arm64": "15.5.7",
|
||||
"@next/swc-darwin-x64": "15.5.7",
|
||||
"@next/swc-linux-arm64-gnu": "15.5.7",
|
||||
"@next/swc-linux-arm64-musl": "15.5.7",
|
||||
"@next/swc-linux-x64-gnu": "15.5.7",
|
||||
"@next/swc-linux-x64-musl": "15.5.7",
|
||||
"@next/swc-win32-arm64-msvc": "15.5.7",
|
||||
"@next/swc-win32-x64-msvc": "15.5.7",
|
||||
"sharp": "^0.34.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
@@ -9498,25 +9563,25 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/nodemailer": {
|
||||
"version": "6.10.0",
|
||||
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz",
|
||||
"integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==",
|
||||
"version": "7.0.11",
|
||||
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.11.tgz",
|
||||
"integrity": "sha512-gnXhNRE0FNhD7wPSCGhdNh46Hs6nm+uTyg+Kq0cZukNQiYdnCsoQjodNP9BQVG9XrcK/v6/MgpAPBUFyzh9pvw==",
|
||||
"license": "MIT-0",
|
||||
"engines": {
|
||||
"node": ">=6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/nodemailer-mock": {
|
||||
"version": "2.0.8",
|
||||
"resolved": "https://registry.npmjs.org/nodemailer-mock/-/nodemailer-mock-2.0.8.tgz",
|
||||
"integrity": "sha512-4NbxjUlBOC1BEl9i7y1gN/taNR9aKOvRnZsrv3ChQr+OLBRteY+8xf3KkEwVH6XTQflkUAMEM1uWRvSCZe6+3A==",
|
||||
"version": "2.0.9",
|
||||
"resolved": "https://registry.npmjs.org/nodemailer-mock/-/nodemailer-mock-2.0.9.tgz",
|
||||
"integrity": "sha512-aDYiH2oUCE6NYolHssoorV7rWLR7Dfn6ZPjF3p3rtJkueHc7bU8VA6VpSslL4ffkTYbbNmpU5huEoIXYdK5Fgg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"debug": "^4.4.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"nodemailer": "^6.x"
|
||||
"nodemailer": "^6.x || ^7.x"
|
||||
}
|
||||
},
|
||||
"node_modules/normalize-path": {
|
||||
@@ -10054,6 +10119,52 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright": {
|
||||
"version": "1.57.0",
|
||||
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
|
||||
"integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"playwright-core": "1.57.0"
|
||||
},
|
||||
"bin": {
|
||||
"playwright": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"fsevents": "2.3.2"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright-core": {
|
||||
"version": "1.57.0",
|
||||
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
|
||||
"integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
"playwright-core": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright/node_modules/fsevents": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
||||
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/possible-typed-array-names": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
|
||||
@@ -10255,7 +10366,9 @@
|
||||
"version": "5.22.0",
|
||||
"resolved": "https://registry.npmjs.org/prisma/-/prisma-5.22.0.tgz",
|
||||
"integrity": "sha512-vtpjW3XuYCSnMsNVBjLMNkTj6OZbudcPPTPYHqX0CJfpcdWciI1dM8uHETwmDxxiqEwCIE6WvXucWUetJgfu/A==",
|
||||
"devOptional": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@prisma/engines": "5.22.0"
|
||||
},
|
||||
@@ -10380,24 +10493,24 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/react": {
|
||||
"version": "19.0.0",
|
||||
"resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz",
|
||||
"integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==",
|
||||
"version": "19.0.1",
|
||||
"resolved": "https://registry.npmjs.org/react/-/react-19.0.1.tgz",
|
||||
"integrity": "sha512-nVRaZCuEyvu69sWrkdwjP6QY57C+lY+uMNNMyWUFJb9Z/JlaBOQus7mSMfGYsblv7R691u6SSJA/dX9IRnyyLQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/react-dom": {
|
||||
"version": "19.0.0",
|
||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz",
|
||||
"integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==",
|
||||
"version": "19.0.1",
|
||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.1.tgz",
|
||||
"integrity": "sha512-3TJg51HSbJiLVYCS6vWwWsyqoS36aGEOCmtLLHxROlSZZ5Bk10xpxHFbrCu4DdqgR85DDc9Vucxqhai3g2xjtA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"scheduler": "^0.25.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "^19.0.0"
|
||||
"react": "^19.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/react-icons": {
|
||||
@@ -10417,9 +10530,10 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/react-markdown": {
|
||||
"version": "9.1.0",
|
||||
"resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-9.1.0.tgz",
|
||||
"integrity": "sha512-xaijuJB0kzGiUdG7nc2MOMDUDBWPyGAjZtUrow9XxUeua8IqeP+VlIfAZ3bphpcLTnSZXz6z9jcVC/TCwbfgdw==",
|
||||
"version": "10.1.0",
|
||||
"resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-10.1.0.tgz",
|
||||
"integrity": "sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/hast": "^3.0.0",
|
||||
"@types/mdast": "^4.0.0",
|
||||
@@ -11498,9 +11612,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/sucrase/node_modules/glob": {
|
||||
"version": "10.4.5",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
|
||||
"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
|
||||
"version": "10.5.0",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
|
||||
"integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
@@ -11699,14 +11813,14 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/tinyglobby": {
|
||||
"version": "0.2.12",
|
||||
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
|
||||
"integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
|
||||
"version": "0.2.15",
|
||||
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
|
||||
"integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"fdir": "^6.4.3",
|
||||
"picomatch": "^4.0.2"
|
||||
"fdir": "^6.5.0",
|
||||
"picomatch": "^4.0.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12.0.0"
|
||||
@@ -11716,11 +11830,14 @@
|
||||
}
|
||||
},
|
||||
"node_modules/tinyglobby/node_modules/fdir": {
|
||||
"version": "6.4.3",
|
||||
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
|
||||
"integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
|
||||
"version": "6.5.0",
|
||||
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
|
||||
"integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=12.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"picomatch": "^3 || ^4"
|
||||
},
|
||||
@@ -11731,9 +11848,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/tinyglobby/node_modules/picomatch": {
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
|
||||
"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
|
||||
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
@@ -11820,9 +11937,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/ts-api-utils": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
|
||||
"integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
|
||||
"integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
@@ -12115,9 +12232,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/typescript": {
|
||||
"version": "5.7.3",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
|
||||
"integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
|
||||
"version": "5.9.3",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
|
||||
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
|
||||
37
package.json
37
package.json
@@ -7,7 +7,7 @@
|
||||
"dev:simple": "node scripts/dev-simple.js",
|
||||
"dev:next": "next dev",
|
||||
"db:setup": "node scripts/setup-database.js",
|
||||
"db:seed": "tsx prisma/seed.ts",
|
||||
"db:seed": "tsx -r dotenv/config prisma/seed.ts dotenv_config_path=.env.local",
|
||||
"build": "next build",
|
||||
"start": "next start",
|
||||
"lint": "eslint .",
|
||||
@@ -15,11 +15,22 @@
|
||||
"pre-push": "./scripts/pre-push.sh",
|
||||
"pre-push:full": "./scripts/pre-push-full.sh",
|
||||
"pre-push:quick": "./scripts/pre-push-quick.sh",
|
||||
"test:all": "./scripts/test-all.sh",
|
||||
"buildAnalyze": "cross-env ANALYZE=true next build",
|
||||
"test": "jest",
|
||||
"test:production": "NODE_ENV=production jest --config jest.config.production.ts",
|
||||
"test:watch": "jest --watch",
|
||||
"test:coverage": "jest --coverage",
|
||||
"test:e2e": "playwright test",
|
||||
"test:e2e:ui": "playwright test --ui",
|
||||
"test:e2e:headed": "playwright test --headed",
|
||||
"test:e2e:debug": "playwright test --debug",
|
||||
"test:all": "npm run test && npm run test:e2e",
|
||||
"test:critical": "playwright test e2e/critical-paths.spec.ts",
|
||||
"test:hydration": "playwright test e2e/hydration.spec.ts",
|
||||
"test:email": "playwright test e2e/email.spec.ts",
|
||||
"test:performance": "playwright test e2e/performance.spec.ts",
|
||||
"test:accessibility": "playwright test e2e/accessibility.spec.ts",
|
||||
"db:generate": "prisma generate",
|
||||
"db:push": "prisma db push",
|
||||
"db:studio": "prisma studio",
|
||||
@@ -43,28 +54,28 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@next/bundle-analyzer": "^15.1.7",
|
||||
"@prisma/client": "^5.7.1",
|
||||
"@prisma/client": "^5.22.0",
|
||||
"@vercel/og": "^0.6.5",
|
||||
"clsx": "^2.1.0",
|
||||
"dotenv": "^16.4.7",
|
||||
"framer-motion": "^11.0.0",
|
||||
"framer-motion": "^12.24.10",
|
||||
"gray-matter": "^4.0.3",
|
||||
"lucide-react": "^0.542.0",
|
||||
"next": "^15.5.2",
|
||||
"next": "^15.5.7",
|
||||
"node-cache": "^5.1.2",
|
||||
"node-fetch": "^2.7.0",
|
||||
"nodemailer": "^6.10.0",
|
||||
"prisma": "^5.7.1",
|
||||
"react": "^19.0.0",
|
||||
"react-dom": "^19.0.0",
|
||||
"nodemailer": "^7.0.11",
|
||||
"react": "^19.0.1",
|
||||
"react-dom": "^19.0.1",
|
||||
"react-icons": "^5.5.0",
|
||||
"react-markdown": "^9.0.1",
|
||||
"react-markdown": "^10.1.0",
|
||||
"react-responsive-masonry": "^2.7.1",
|
||||
"redis": "^5.8.2",
|
||||
"tailwind-merge": "^2.2.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/eslintrc": "^3",
|
||||
"@playwright/test": "^1.57.0",
|
||||
"@testing-library/dom": "^10.4.0",
|
||||
"@testing-library/jest-dom": "^6.6.3",
|
||||
"@testing-library/react": "^16.2.0",
|
||||
@@ -78,16 +89,18 @@
|
||||
"@types/react-syntax-highlighter": "^15.5.11",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint": "^9",
|
||||
"eslint-config-next": "15.1.7",
|
||||
"eslint-config-next": "^15.5.7",
|
||||
"jest": "^29.7.0",
|
||||
"jest-environment-jsdom": "^29.7.0",
|
||||
"nodemailer-mock": "^2.0.8",
|
||||
"nodemailer-mock": "^2.0.9",
|
||||
"playwright": "^1.57.0",
|
||||
"postcss": "^8",
|
||||
"prisma": "^5.22.0",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"ts-jest": "^29.2.5",
|
||||
"ts-node": "^10.9.2",
|
||||
"tsx": "^4.20.5",
|
||||
"typescript": "^5.7.3",
|
||||
"typescript": "5.9.3",
|
||||
"whatwg-fetch": "^3.6.20"
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user