chore: Clean up old files

This commit is contained in:
2026-01-08 17:55:29 +01:00
parent cd4d2367ab
commit 3b2c94c699
35 changed files with 317 additions and 5472 deletions

View File

@@ -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

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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

17
.gitignore vendored
View File

@@ -39,3 +39,20 @@ yarn-error.log*
# typescript # typescript
*.tsbuildinfo *.tsbuildinfo
next-env.d.ts next-env.d.ts
# logs
logs/*.log
*.log
# test results
test-results/
playwright-report/
coverage/
# IDE
.idea/
.vscode/
# OS
.DS_Store
Thumbs.db

View File

@@ -1,253 +0,0 @@
# After Push Setup Guide
After pulling this dev branch, follow these steps to get everything working.
## 🚀 Quick Setup (5 minutes)
### 1. Install Dependencies
```bash
npm install
```
### 2. Setup Database (REQUIRED)
The new `activity_status` table is required for the activity feed to work without errors.
**Option A: Automatic (Recommended)**
```bash
chmod +x prisma/migrations/quick-fix.sh
./prisma/migrations/quick-fix.sh
```
**Option B: Manual**
```bash
psql -d portfolio -f prisma/migrations/create_activity_status.sql
```
**Option C: Using pgAdmin/GUI**
1. Open your database tool
2. Connect to `portfolio` database
3. Open the Query Tool
4. Copy contents of `prisma/migrations/create_activity_status.sql`
5. Execute the query
### 3. Verify Setup
```bash
# Check if table exists
psql -d portfolio -c "\d activity_status"
# Should show table structure with columns:
# - id, activity_type, activity_details, etc.
```
### 4. Start Dev Server
```bash
npm run dev
```
### 5. Test Everything
Visit these URLs and check for errors:
- ✅ http://localhost:3000 - Home page (no hydration errors)
- ✅ http://localhost:3000/manage - Admin login form (no redirect)
- ✅ http://localhost:3000/api/n8n/status - Should return JSON (not error)
**Check Browser Console:**
- ❌ No "Hydration failed" errors
- ❌ No "two children with same key" warnings
- ❌ No "relation activity_status does not exist" errors
## ✨ What's New
### Fixed Issues
1. **Hydration Errors** - React SSR/CSR mismatches resolved
2. **Duplicate Keys** - All list items now have unique keys
3. **Navbar Overlap** - Header no longer covers hero section
4. **Admin Access** - `/manage` now shows login form (no redirect loop)
5. **Database Errors** - Activity feed works without errors
### New Features
1. **AI Image Generation System** - Automatic project cover images
2. **ActivityStatus Model** - Real-time activity tracking in database
3. **Enhanced APIs** - New endpoints for image generation
## 🤖 Optional: AI Image Generation Setup
If you want to use the new AI image generation feature:
### Prerequisites
- Stable Diffusion WebUI installed
- n8n workflow automation
- GPU recommended (or cloud GPU)
### Quick Start Guide
See detailed instructions: `docs/ai-image-generation/QUICKSTART.md`
### Environment Variables
Add to `.env.local`:
```bash
# AI Image Generation (Optional)
N8N_WEBHOOK_URL=http://localhost:5678/webhook
N8N_SECRET_TOKEN=generate-a-secure-random-token
SD_API_URL=http://localhost:7860
AUTO_GENERATE_IMAGES=false # Set to true when ready
GENERATED_IMAGES_DIR=/path/to/portfolio/public/generated-images
```
Generate secure token:
```bash
openssl rand -hex 32
```
## 🐛 Troubleshooting
### "relation activity_status does not exist"
**Problem:** Database migration not applied
**Solution:**
```bash
./prisma/migrations/quick-fix.sh
# Then restart: npm run dev
```
### "/manage redirects to home page"
**Problem:** Browser cached old middleware behavior
**Solution:**
```bash
# Hard refresh: Ctrl+Shift+R (Windows/Linux) or Cmd+Shift+R (Mac)
# Or use Incognito/Private window
```
### Build Errors
**Problem:** Dependencies out of sync
**Solution:**
```bash
rm -rf node_modules package-lock.json
npm install
npm run build
```
### Hydration Errors Still Appearing
**Problem:** Old build cached
**Solution:**
```bash
rm -rf .next
npm run dev
```
### Database Connection Failed
**Problem:** PostgreSQL not running
**Solution:**
```bash
# Check status
pg_isready
# Start PostgreSQL
# macOS:
brew services start postgresql
# Linux:
sudo systemctl start postgresql
# Docker:
docker start postgres_container
```
## 📚 Documentation
### Core Documentation
- `CHANGELOG_DEV.md` - All changes in this release
- `PRE_PUSH_CHECKLIST.md` - What was tested before push
### AI Image Generation
- `docs/ai-image-generation/README.md` - Overview
- `docs/ai-image-generation/SETUP.md` - Detailed setup (486 lines)
- `docs/ai-image-generation/QUICKSTART.md` - 15-min setup
- `docs/ai-image-generation/PROMPT_TEMPLATES.md` - Prompt engineering
- `docs/ai-image-generation/ENVIRONMENT.md` - Environment variables
### Database
- `prisma/migrations/README.md` - Migration guide
- `prisma/migrations/create_activity_status.sql` - SQL script
## ✅ Verification Checklist
After setup, verify:
- [ ] `npm run dev` starts without errors
- [ ] Home page loads: http://localhost:3000
- [ ] No hydration errors in browser console
- [ ] No duplicate key warnings
- [ ] Admin page accessible: http://localhost:3000/manage
- [ ] Shows login form (not redirect)
- [ ] API works: `curl http://localhost:3000/api/n8n/status`
- [ ] Returns: `{"activity":null,"music":null,...}`
- [ ] Database has `activity_status` table
- [ ] Navbar doesn't overlap content
## 🔍 Quick Tests
Run these commands to verify everything:
```bash
# 1. Build test
npm run build
# 2. Lint test
npm run lint
# Should show: 0 errors, 8 warnings (warnings are OK)
# 3. API test
curl http://localhost:3000/api/n8n/status
# Should return JSON, not HTML error page
# 4. Database test
psql -d portfolio -c "SELECT COUNT(*) FROM activity_status;"
# Should return: count = 1
# 5. Page test
curl -I http://localhost:3000/manage | grep "HTTP"
# Should show: HTTP/1.1 200 OK (not 302/307)
```
## 🎯 All Working?
If all checks pass, you're ready to develop! 🎉
### What You Can Do Now:
1. ✅ Develop new features without hydration errors
2. ✅ Access admin panel at `/manage`
3. ✅ Activity feed works without database errors
4. ✅ Use AI image generation (if setup complete)
### Need Help?
- Check `CHANGELOG_DEV.md` for detailed changes
- Review `docs/ai-image-generation/` for AI features
- Check `prisma/migrations/README.md` for database issues
## 🚦 Next Steps
1. **Review Changes**: Read `CHANGELOG_DEV.md`
2. **Test Features**: Try the admin panel, create projects
3. **Optional AI Setup**: Follow `docs/ai-image-generation/QUICKSTART.md`
4. **Report Issues**: Document any problems found
---
**Setup Time**: ~5 minutes
**Status**: Ready to develop
**Questions?**: Check documentation or create an issue

View File

@@ -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

View File

@@ -1,194 +0,0 @@
# ✅ Automated Testing Setup Complete!
## 🎉 What's Been Set Up
### 1. **Prisma Fixed** ✅
- Downgraded from Prisma 7.2.0 to 5.22.0 (compatible with current schema)
- Schema validation now passes
### 2. **TypeScript Errors Fixed** ✅
- Fixed test file TypeScript errors
- All type checks pass
### 3. **Playwright E2E Testing** ✅
- Installed Playwright
- Created comprehensive test suites:
- **Critical Paths** (`e2e/critical-paths.spec.ts`)
- **Hydration** (`e2e/hydration.spec.ts`)
- **Email** (`e2e/email.spec.ts`)
- **Performance** (`e2e/performance.spec.ts`)
- **Accessibility** (`e2e/accessibility.spec.ts`)
### 4. **Test Scripts** ✅
Added to `package.json`:
- `npm run test:all` - Run everything
- `npm run test:e2e` - E2E tests only
- `npm run test:critical` - Critical paths
- `npm run test:hydration` - Hydration tests
- `npm run test:email` - Email tests
- `npm run test:performance` - Performance tests
- `npm run test:accessibility` - Accessibility tests
### 5. **Comprehensive Test Script** ✅
- Created `scripts/test-all.sh`
- Runs all checks automatically
- Color-coded output
- Exit codes for CI/CD
## 🚀 Quick Start
### Run All Tests
```bash
npm run test:all
```
This runs:
1. ✅ TypeScript check
2. ✅ ESLint
3. ✅ Build
4. ✅ Unit tests
5. ✅ Critical paths E2E
6. ✅ Hydration tests
7. ✅ Email tests
8. ✅ Performance tests
9. ✅ Accessibility tests
### Run Specific Tests
```bash
# Critical paths only
npm run test:critical
# Hydration tests only
npm run test:hydration
# Email tests only
npm run test:email
```
## 📋 What Gets Tested
### Critical Paths ✅
- Home page loads
- Projects page works
- Individual project pages
- Admin dashboard
- API endpoints
### Hydration ✅
- No hydration errors
- No duplicate React keys
- Client-side navigation
- Server/client HTML match
- Interactive elements work
### Email ✅
- Email API accepts requests
- Field validation
- Email format validation
- Rate limiting
- Respond endpoint
### Performance ✅
- Page load times
- Layout shifts
- Image optimization
- API response times
### Accessibility ✅
- Heading structure
- Alt text on images
- Descriptive link text
- Form labels
## 📚 Documentation
- **`TESTING_GUIDE.md`** - Complete testing guide
- **`SAFE_PUSH_TO_MAIN.md`** - Updated with testing steps
- **`playwright.config.ts`** - Playwright configuration
## 🎯 Pre-Push Checklist (Updated)
Before pushing to main:
```bash
npm run test:all
```
This ensures:
- ✅ Code compiles
- ✅ No lint errors
- ✅ All tests pass
- ✅ Critical paths work
- ✅ No hydration errors
- ✅ Email API works
## 🔧 Configuration
### Playwright
- **Browsers**: Chromium, Firefox, WebKit, Mobile
- **Base URL**: `http://localhost:3000`
- **Screenshots**: On failure
- **Videos**: On failure
### Test Environment
- Automatically starts dev server
- Cleans up after tests
- Handles errors gracefully
## 🐛 Debugging
### Visual Debugging
```bash
npm run test:e2e:ui
```
### Step Through Tests
```bash
npm run test:e2e:debug
```
### See Browser
```bash
npm run test:e2e:headed
```
## 📊 Test Reports
After running tests:
```bash
npx playwright show-report
```
Shows:
- Test results
- Screenshots
- Videos
- Timeline
## ✅ Status
- ✅ Prisma fixed
- ✅ TypeScript errors fixed
- ✅ Playwright installed
- ✅ Test suites created
- ✅ Scripts added
- ✅ Documentation complete
- ✅ Ready to use!
## 🚀 Next Steps
1. **Run tests now**:
```bash
npm run test:all
```
2. **Before every push**:
```bash
npm run test:all
```
3. **In CI/CD**:
Add `npm run test:all` to your pipeline
---
**You're all set!** 🎉 Automated testing is ready to go!

85
AUTO_DEPLOYMENT_STATUS.md Normal file
View 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.

View File

@@ -1,273 +0,0 @@
# Changelog - Dev Branch
All notable changes for the development branch.
## [Unreleased] - 2024-01-15
### 🎨 UI/UX Improvements
#### Fixed Hydration Errors
- **ActivityFeed Component**: Fixed server/client mismatch causing hydration errors
- Changed button styling from gradient to solid colors for consistency
- Updated icon sizes: `MessageSquare` from 24px to 20px
- Updated notification badge: from `w-4 h-4` to `w-3 h-3`
- Changed gap spacing: from `gap-3` to `gap-2`
- Simplified badge styling: removed gradient, kept solid color
- Added `timestamp` field to chat messages for stable React keys
- Files changed: `app/components/ActivityFeed.tsx`
#### Fixed Duplicate React Keys
- **About Component**: Made all list item keys unique
- Tech stack outer keys: `${stack.category}-${idx}`
- Tech stack inner keys: `${stack.category}-${item}-${itemIdx}`
- Hobby keys: `hobby-${hobby.text}-${idx}`
- Files changed: `app/components/About.tsx`
- **Projects Component**: Fixed duplicate keys in project tags
- Project tag keys: `${project.id}-${tag}-${tIdx}`
- Files changed: `app/components/Projects.tsx`
#### Fixed Navbar Overlap
- Added spacer div after Header to prevent navbar from covering hero section
- Spacer height: `h-24 md:h-32`
- Files changed: `app/page.tsx`
### 🔧 Backend & Infrastructure
#### Database Schema Updates
- **Added ActivityStatus Model** for real-time activity tracking
- Stores coding activity, music playing, gaming status, etc.
- Single-row table (id always 1) for current status
- Includes automatic `updated_at` timestamp
- Fields:
- Activity: type, details, project, language, repo
- Music: playing, track, artist, album, platform, progress, album art
- Watching: title, platform, type
- Gaming: game, platform, status
- Status: mood, custom message
- Files changed: `prisma/schema.prisma`
- **Created SQL Migration Script**
- Manual migration for `activity_status` table
- Includes trigger for automatic timestamp updates
- Safe to run multiple times (idempotent)
- Files created:
- `prisma/migrations/create_activity_status.sql`
- `prisma/migrations/quick-fix.sh` (auto-setup script)
- `prisma/migrations/README.md` (documentation)
#### API Improvements
- **Fixed n8n Status Endpoint**
- Now handles missing `activity_status` table gracefully
- Returns empty state instead of 500 error
- Added proper TypeScript interface for ActivityStatusRow
- Fixed ESLint `any` type error
- Files changed: `app/api/n8n/status/route.ts`
- **Added AI Image Generation API**
- New endpoint: `POST /api/n8n/generate-image`
- Triggers AI image generation for projects via n8n
- Supports regeneration with `regenerate: true` flag
- Check status: `GET /api/n8n/generate-image?projectId=123`
- Files created: `app/api/n8n/generate-image/route.ts`
### 🔐 Security & Authentication
#### Middleware Fix
- **Removed premature authentication redirect**
- `/manage` and `/editor` routes now show login forms properly
- Authentication handled client-side by pages themselves
- No more redirect loop to home page
- Security headers still applied to all routes
- Files changed: `middleware.ts`
### 🤖 New Features: AI Image Generation
#### Complete AI Image Generation System
- **Automatic project cover image generation** using local Stable Diffusion
- **n8n Workflow Integration** for automation
- **Context-Aware Prompts** based on project metadata
**New Files Created:**
```
docs/ai-image-generation/
├── README.md # Main overview & getting started
├── SETUP.md # Detailed installation (486 lines)
├── QUICKSTART.md # 15-minute quick start guide
├── PROMPT_TEMPLATES.md # Category-specific prompt templates (612 lines)
├── ENVIRONMENT.md # Environment variables documentation
└── n8n-workflow-ai-image-generator.json # Ready-to-import workflow
```
**Components:**
- `app/components/admin/AIImageGenerator.tsx` - Admin UI for image generation
- Preview current/generated images
- Generate/Regenerate buttons with status
- Loading states and error handling
- Shows generation settings
**Key Features:**
- ✅ Fully automatic image generation on project creation
- ✅ Manual regeneration via admin UI
- ✅ Category-specific prompt templates (10+ categories)
- ✅ Local Stable Diffusion support (no API costs)
- ✅ n8n workflow for orchestration
- ✅ Optimized for web display (1024x768)
- ✅ Privacy-first (100% local, no external APIs)
**Supported Categories:**
- Web Applications
- Mobile Apps
- DevOps/Infrastructure
- Backend/API
- AI/ML
- Game Development
- Blockchain
- IoT/Hardware
- Security
- Data Science
- E-commerce
- Automation/Workflow
**Environment Variables Added:**
```bash
N8N_WEBHOOK_URL=http://localhost:5678/webhook
N8N_SECRET_TOKEN=your-secure-token
SD_API_URL=http://localhost:7860
AUTO_GENERATE_IMAGES=true
GENERATED_IMAGES_DIR=/path/to/public/generated-images
```
### 📚 Documentation
#### New Documentation Files
- `docs/ai-image-generation/README.md` - System overview
- `docs/ai-image-generation/SETUP.md` - Complete setup guide
- `docs/ai-image-generation/QUICKSTART.md` - Fast setup (15 min)
- `docs/ai-image-generation/PROMPT_TEMPLATES.md` - Prompt engineering guide
- `docs/ai-image-generation/ENVIRONMENT.md` - Env vars documentation
- `prisma/migrations/README.md` - Database migration guide
#### Setup Scripts
- `prisma/migrations/quick-fix.sh` - Auto-setup database
- Loads DATABASE_URL from .env.local
- Creates activity_status table
- Verifies migration success
- Provides troubleshooting tips
### 🐛 Bug Fixes
1. **Hydration Errors**: Fixed React hydration mismatches in ActivityFeed
2. **Duplicate Keys**: Fixed "two children with same key" errors
3. **Navbar Overlap**: Added spacer to prevent header covering content
4. **Database Errors**: Fixed "relation does not exist" errors
5. **Admin Access**: Fixed redirect loop preventing access to /manage
6. **TypeScript Errors**: Fixed ESLint warnings and type issues
### 🔄 Migration Guide
#### For Existing Installations:
1. **Update Database Schema:**
```bash
# Option A: Automatic
./prisma/migrations/quick-fix.sh
# Option B: Manual
psql -d portfolio -f prisma/migrations/create_activity_status.sql
```
2. **Update Dependencies** (if needed):
```bash
npm install
```
3. **Restart Dev Server:**
```bash
npm run dev
```
4. **Verify:**
- Visit http://localhost:3000 - should load without errors
- Visit http://localhost:3000/manage - should show login form
- Check console - no hydration or database errors
### ⚠️ Breaking Changes
**None** - All changes are backward compatible
### 📝 Notes
- The `activity_status` table is optional - system works without it
- AI Image Generation is opt-in via environment variables
- Admin authentication still works as before
- All existing features remain functional
### 🚀 Performance
- No performance regressions
- Image generation runs asynchronously (doesn't block UI)
- Activity status queries are cached
### 🧪 Testing
**Tested Components:**
- ✅ ActivityFeed (hydration fixed)
- ✅ About section (keys fixed)
- ✅ Projects section (keys fixed)
- ✅ Header/Navbar (spacing fixed)
- ✅ Admin login (/manage)
- ✅ API endpoints (n8n status, generate-image)
**Browser Compatibility:**
- Chrome/Edge ✅
- Firefox ✅
- Safari ✅
### 📦 File Changes Summary
**Modified Files:** (13)
- `app/page.tsx`
- `app/components/About.tsx`
- `app/components/Projects.tsx`
- `app/components/ActivityFeed.tsx`
- `app/api/n8n/status/route.ts`
- `middleware.ts`
- `prisma/schema.prisma`
**New Files:** (11)
- `app/api/n8n/generate-image/route.ts`
- `app/components/admin/AIImageGenerator.tsx`
- `docs/ai-image-generation/README.md`
- `docs/ai-image-generation/SETUP.md`
- `docs/ai-image-generation/QUICKSTART.md`
- `docs/ai-image-generation/PROMPT_TEMPLATES.md`
- `docs/ai-image-generation/ENVIRONMENT.md`
- `docs/ai-image-generation/n8n-workflow-ai-image-generator.json`
- `prisma/migrations/create_activity_status.sql`
- `prisma/migrations/quick-fix.sh`
- `prisma/migrations/README.md`
### 🎯 Next Steps
**Before Merging to Main:**
1. [ ] Test AI image generation with Stable Diffusion
2. [ ] Test n8n workflow integration
3. [ ] Run full test suite
4. [ ] Update main README.md with new features
5. [ ] Create demo images/screenshots
**Future Enhancements:**
- [ ] Batch image generation for all projects
- [ ] Image optimization pipeline
- [ ] A/B testing for different image styles
- [ ] Integration with DALL-E 3 as fallback
- [ ] Automatic alt text generation
---
**Release Date**: TBD
**Branch**: dev
**Status**: Ready for testing
**Breaking Changes**: None
**Migration Required**: Database only (optional)

66
CLEANUP_PLAN.md Normal file
View 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
View 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

View File

@@ -1,135 +0,0 @@
feat: Fix hydration errors, navbar overlap, and add AI image generation system
## 🎨 UI/UX Fixes
### Fixed React Hydration Errors
- ActivityFeed: Standardized button styling (gradient → solid)
- ActivityFeed: Unified icon sizes and spacing for SSR/CSR consistency
- ActivityFeed: Added timestamps to chat messages for stable React keys
- About: Fixed duplicate keys in tech stack items (added unique key combinations)
- Projects: Fixed duplicate keys in project tags (combined projectId + tag + index)
### Fixed Layout Issues
- Added spacer after Header component (h-24 md:h-32) to prevent navbar overlap
- Hero section now properly visible below fixed navbar
## 🔧 Backend Improvements
### Database Schema
- Added ActivityStatus model for real-time activity tracking
- Supports: coding activity, music playing, watching, gaming, status/mood
- Single-row design (id=1) with auto-updating timestamps
### API Enhancements
- Fixed n8n status endpoint to handle missing table gracefully
- Added TypeScript interfaces (removed ESLint `any` warnings)
- New API: POST /api/n8n/generate-image for AI image generation
- New API: GET /api/n8n/generate-image?projectId=X for status check
## 🔐 Security & Auth
### Middleware Updates
- Removed premature auth redirect for /manage and /editor routes
- Pages now handle their own authentication (show login forms)
- Security headers still applied to all routes
## 🤖 New Feature: AI Image Generation System
### Complete automated project cover image generation using local Stable Diffusion
**Core Components:**
- Admin UI component (AIImageGenerator.tsx) with preview, generate, and regenerate
- n8n workflow integration for automation
- Context-aware prompt generation based on project metadata
- Support for 10+ project categories with optimized prompts
**Documentation (6 new files):**
- README.md - System overview and features
- SETUP.md - Detailed installation guide (486 lines)
- QUICKSTART.md - 15-minute quick start
- PROMPT_TEMPLATES.md - Category-specific templates (612 lines)
- ENVIRONMENT.md - Environment variables reference
- n8n-workflow-ai-image-generator.json - Ready-to-import workflow
**Database Migration:**
- SQL script: create_activity_status.sql
- Auto-setup script: quick-fix.sh
- Migration guide: prisma/migrations/README.md
**Key Features:**
✅ Automatic generation on project creation
✅ Manual regeneration via admin UI
✅ Category-specific prompts (web, mobile, devops, ai, game, etc.)
✅ Local Stable Diffusion (no API costs, privacy-first)
✅ n8n workflow orchestration
✅ Optimized for web (1024x768)
## 📝 Documentation
- CHANGELOG_DEV.md - Complete changelog with migration guide
- PRE_PUSH_CHECKLIST.md - Pre-push verification checklist
- Comprehensive AI image generation docs
## 🐛 Bug Fixes
1. Fixed "Hydration failed" errors in ActivityFeed
2. Fixed "two children with same key" warnings
3. Fixed navbar overlapping hero section
4. Fixed "relation activity_status does not exist" errors
5. Fixed /manage redirect loop (was going to home page)
6. Fixed TypeScript ESLint errors and warnings
7. Fixed duplicate transition prop in Hero component
## ⚠️ Breaking Changes
None - All changes are backward compatible
## 🔄 Migration Required
Database migration needed for new ActivityStatus table:
```bash
./prisma/migrations/quick-fix.sh
# OR
psql -d portfolio -f prisma/migrations/create_activity_status.sql
```
## 📦 Files Changed
**Modified (7):**
- app/page.tsx
- app/components/About.tsx
- app/components/Projects.tsx
- app/components/ActivityFeed.tsx
- app/components/Hero.tsx
- app/api/n8n/status/route.ts
- middleware.ts
- prisma/schema.prisma
**Created (14):**
- app/api/n8n/generate-image/route.ts
- app/components/admin/AIImageGenerator.tsx
- docs/ai-image-generation/* (6 files)
- prisma/migrations/* (3 files)
- CHANGELOG_DEV.md
- PRE_PUSH_CHECKLIST.md
- COMMIT_MESSAGE.txt
## ✅ Testing
- [x] Build successful: npm run build
- [x] Linting passed: npm run lint (0 errors, 8 warnings)
- [x] No hydration errors in console
- [x] No duplicate key warnings
- [x] /manage accessible (shows login form)
- [x] API endpoints responding correctly
- [x] Navbar no longer overlaps content
## 🚀 Next Steps
1. Test AI image generation with Stable Diffusion setup
2. Test n8n workflow integration
3. Create demo screenshots for new features
4. Update main README.md after merge
---
Co-authored-by: AI Assistant (Claude Sonnet 4.5)

View File

@@ -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

View File

@@ -1,220 +0,0 @@
# Deployment & Sicherheits-Verbesserungen
## ✅ Durchgeführte Verbesserungen
### 1. Skills-Anpassung
- **Frontend**: 5 Skills (React, Next.js, TypeScript, Tailwind CSS, Framer Motion)
- **Backend**: 5 Skills (Node.js, PostgreSQL, Prisma, REST APIs, GraphQL)
- **DevOps**: 5 Skills (Docker, CI/CD, Nginx, Redis, AWS)
- **Mobile**: 4 Skills (React Native, Expo, iOS, Android)
Die Skills sind jetzt ausgewogen und repräsentieren die Technologien korrekt.
### 2. Sichere Deployment-Skripte
#### Neues `safe-deploy.sh` Skript
- ✅ Pre-Deployment-Checks (Docker, Disk Space, .env)
- ✅ Automatische Image-Backups
- ✅ Health Checks vor und nach Deployment
- ✅ Automatisches Rollback bei Fehlern
- ✅ Database Migration Handling
- ✅ Cleanup alter Images
- ✅ Detailliertes Logging
**Verwendung:**
```bash
./scripts/safe-deploy.sh
```
#### Bestehende Zero-Downtime-Deployment
- ✅ Blue-Green Deployment Strategie
- ✅ Rollback-Funktionalität
- ✅ Health Check Integration
### 3. Verbesserte Sicherheits-Headers
#### Next.js Config (`next.config.ts`)
- ✅ Erweiterte Content-Security-Policy
- ✅ Frame-Ancestors Protection
- ✅ Base-URI Restriction
- ✅ Form-Action Restriction
#### Middleware (`middleware.ts`)
- ✅ Rate Limiting Headers für API-Routes
- ✅ Zusätzliche Security Headers
- ✅ Permissions-Policy Header
### 4. Docker-Sicherheit
#### Dockerfile
- ✅ Non-root User (`nextjs:nodejs`)
- ✅ Multi-stage Build für kleinere Images
- ✅ Health Checks integriert
- ✅ Keine Secrets im Image
- ✅ Minimale Angriffsfläche
#### Docker Compose
- ✅ Resource Limits für alle Services
- ✅ Health Checks für alle Container
- ✅ Proper Network Isolation
- ✅ Volume Management
### 5. Website-Überprüfung
#### Komponenten
- ✅ Alle Komponenten funktionieren korrekt
- ✅ Responsive Design getestet
- ✅ Accessibility verbessert
- ✅ Performance optimiert
#### API-Routes
- ✅ Rate Limiting implementiert
- ✅ Input Validation
- ✅ Error Handling
- ✅ CSRF Protection
## 🔒 Sicherheits-Checkliste
### Vor jedem Deployment
- [ ] `.env` Datei überprüfen
- [ ] Secrets nicht im Code
- [ ] Dependencies aktualisiert (`npm audit`)
- [ ] Tests erfolgreich (`npm test`)
- [ ] Build erfolgreich (`npm run build`)
### Während des Deployments
- [ ] `safe-deploy.sh` verwenden
- [ ] Health Checks überwachen
- [ ] Logs überprüfen
- [ ] Rollback-Bereitschaft
### Nach dem Deployment
- [ ] Health Check Endpoint testen
- [ ] Hauptseite testen
- [ ] Admin-Panel testen
- [ ] SSL-Zertifikat prüfen
- [ ] Security Headers validieren
## 📋 Update-Prozess
### Standard-Update
```bash
# 1. Code aktualisieren
git pull origin production
# 2. Dependencies aktualisieren (optional)
npm ci
# 3. Sicher deployen
./scripts/safe-deploy.sh
```
### Notfall-Rollback
```bash
# Automatisch durch safe-deploy.sh
# Oder manuell:
docker tag portfolio-app:previous portfolio-app:latest
docker-compose -f docker-compose.production.yml up -d --force-recreate portfolio
```
## 🚀 Best Practices
### 1. Environment Variables
- ✅ Niemals in Git committen
- ✅ Nur in `.env` Datei (nicht versioniert)
- ✅ Sichere Passwörter verwenden
- ✅ Regelmäßig rotieren
### 2. Docker Images
- ✅ Immer mit Tags versehen
- ✅ Alte Images regelmäßig aufräumen
- ✅ Multi-stage Builds verwenden
- ✅ Non-root User verwenden
### 3. Monitoring
- ✅ Health Checks überwachen
- ✅ Logs regelmäßig prüfen
- ✅ Resource Usage überwachen
- ✅ Error Tracking aktivieren
### 4. Updates
- ✅ Regelmäßige Dependency-Updates
- ✅ Security Patches sofort einspielen
- ✅ Vor Updates testen
- ✅ Rollback-Plan bereithalten
## 🔍 Sicherheits-Tests
### Security Headers Test
```bash
curl -I https://dk0.dev
```
### SSL Test
```bash
openssl s_client -connect dk0.dev:443 -servername dk0.dev
```
### Dependency Audit
```bash
npm audit
npm audit fix
```
### Secret Detection
```bash
./scripts/check-secrets.sh
```
## 📊 Monitoring
### Health Check
- Endpoint: `https://dk0.dev/api/health`
- Intervall: 30 Sekunden
- Timeout: 10 Sekunden
- Retries: 3
### Container Health
- PostgreSQL: `pg_isready`
- Redis: `redis-cli ping`
- Application: `/api/health`
## 🛠️ Troubleshooting
### Deployment schlägt fehl
1. Logs prüfen: `docker logs portfolio-app`
2. Health Check prüfen: `curl http://localhost:3000/api/health`
3. Container Status: `docker ps`
4. Rollback durchführen
### Health Check schlägt fehl
1. Container Logs prüfen
2. Database Connection prüfen
3. Environment Variables prüfen
4. Ports prüfen
### Performance-Probleme
1. Resource Usage prüfen: `docker stats`
2. Logs auf Errors prüfen
3. Database Queries optimieren
4. Cache prüfen
## 📝 Wichtige Dateien
- `scripts/safe-deploy.sh` - Sichere Deployment-Skript
- `SECURITY-CHECKLIST.md` - Detaillierte Sicherheits-Checkliste
- `docker-compose.production.yml` - Production Docker Compose
- `Dockerfile` - Docker Image Definition
- `next.config.ts` - Next.js Konfiguration mit Security Headers
- `middleware.ts` - Middleware mit Security Headers
## ✅ Zusammenfassung
Die Website ist jetzt:
- ✅ Sicher konfiguriert (Security Headers, Non-root User, etc.)
- ✅ Deployment-ready (Zero-Downtime, Rollback, Health Checks)
- ✅ Update-sicher (Backups, Validierung, Monitoring)
- ✅ Production-ready (Resource Limits, Health Checks, Logging)
Alle Verbesserungen sind implementiert und getestet. Die Website kann sicher deployed und aktualisiert werden.

View File

@@ -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

53
GIT_CONNECTION_FIX.md Normal file
View 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
```

View File

@@ -1,176 +0,0 @@
# Pre-Push Checklist - Dev Branch
Before pushing to the dev branch, verify all items below are complete.
## ✅ Required Checks
### 1. Code Quality
- [ ] No TypeScript errors: `npm run build`
- [ ] No ESLint errors: `npm run lint`
- [ ] All diagnostics resolved (only warnings allowed)
- [ ] Code formatted: `npx prettier --write .` (if using Prettier)
### 2. Database
- [ ] Prisma schema is valid: `npx prisma format`
- [ ] Migration script exists: `prisma/migrations/create_activity_status.sql`
- [ ] Migration tested locally: `./prisma/migrations/quick-fix.sh`
- [ ] Database changes documented in CHANGELOG_DEV.md
### 3. Functionality Tests
- [ ] Dev server starts without errors: `npm run dev`
- [ ] Home page loads: http://localhost:3000
- [ ] Admin page accessible: http://localhost:3000/manage
- [ ] No hydration errors in console
- [ ] No "duplicate key" warnings in console
- [ ] Activity Feed loads without database errors
- [ ] API endpoints respond correctly:
```bash
curl http://localhost:3000/api/n8n/status
curl http://localhost:3000/api/health
```
### 4. Visual Checks
- [ ] Navbar doesn't overlap hero section
- [ ] All sections render correctly
- [ ] Project cards display properly
- [ ] About section tech stacks show correct colors
- [ ] Mobile responsive (test in DevTools)
### 5. Security
- [ ] No sensitive data in code (passwords, tokens, API keys)
- [ ] `.env.local` not committed (check `.gitignore`)
- [ ] Auth endpoints protected
- [ ] Rate limiting in place
- [ ] CSRF tokens implemented
### 6. Documentation
- [ ] CHANGELOG_DEV.md updated with all changes
- [ ] New features documented
- [ ] Breaking changes noted (if any)
- [ ] Migration guide included
- [ ] README files created for new features
### 7. Git Hygiene
- [ ] Commit messages are descriptive
- [ ] No merge conflicts
- [ ] Large files not committed (check git status)
- [ ] Build artifacts excluded (.next, node_modules)
- [ ] Commit history is clean (consider squashing if needed)
## 🧪 Testing Commands
Run these before pushing:
```bash
# 1. Build check
npm run build
# 2. Lint check
npm run lint
# 3. Type check
npx tsc --noEmit
# 4. Format check
npx prisma format
# 5. Start dev server
npm run dev
# 6. Test API endpoints
curl http://localhost:3000/api/n8n/status
curl http://localhost:3000/api/health
curl -I http://localhost:3000/manage
# 7. Check for hydration errors
# Open browser console and look for:
# - "Hydration failed" (should be NONE)
# - "two children with the same key" (should be NONE)
```
## 📋 Files Changed Review
### Modified Files
- [ ] `app/page.tsx` - Spacer added for navbar
- [ ] `app/components/About.tsx` - Fixed duplicate keys
- [ ] `app/components/Projects.tsx` - Fixed duplicate keys
- [ ] `app/components/ActivityFeed.tsx` - Fixed hydration errors
- [ ] `app/api/n8n/status/route.ts` - Fixed TypeScript errors
- [ ] `middleware.ts` - Removed auth redirect
- [ ] `prisma/schema.prisma` - Added ActivityStatus model
### New Files
- [ ] `app/api/n8n/generate-image/route.ts`
- [ ] `app/components/admin/AIImageGenerator.tsx`
- [ ] `docs/ai-image-generation/` (all files)
- [ ] `prisma/migrations/` (all files)
- [ ] `CHANGELOG_DEV.md`
- [ ] `PRE_PUSH_CHECKLIST.md` (this file)
## 🚨 Critical Checks
### Must Have ZERO of These:
- [ ] No `console.error()` output when loading pages
- [ ] No React hydration errors
- [ ] No "duplicate key" warnings
- [ ] No database connection errors (after migration)
- [ ] No TypeScript compilation errors
- [ ] No ESLint errors (warnings are OK)
### Environment Variables
Ensure these are documented but NOT committed:
```bash
# Required
DATABASE_URL=postgresql://...
# Optional (for new features)
N8N_WEBHOOK_URL=http://localhost:5678/webhook
N8N_SECRET_TOKEN=your-token
SD_API_URL=http://localhost:7860
AUTO_GENERATE_IMAGES=false
GENERATED_IMAGES_DIR=/path/to/public/generated-images
```
## 📝 Final Verification
Run this complete check:
```bash
# Clean build
rm -rf .next
npm run build
# Should complete without errors
# Then test the build
npm start
# Visit in browser
# - http://localhost:3000
# - http://localhost:3000/manage
# - http://localhost:3000/projects
```
## 🎯 Ready to Push?
If all items above are checked, run:
```bash
git status
git add .
git commit -m "feat: Fixed hydration errors, navbar overlap, and added AI image generation system"
git push origin dev
```
## 📞 Need Help?
If any checks fail:
1. Check CHANGELOG_DEV.md for troubleshooting
2. Review docs/ai-image-generation/SETUP.md
3. Check prisma/migrations/README.md for database issues
4. Review error messages carefully
---
**Last Updated**: 2024-01-15
**Branch**: dev
**Status**: Pre-merge checklist

View File

@@ -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.

View File

@@ -1,244 +0,0 @@
# ✅ READY TO PUSH - Dev Branch
**Status**: All fixes complete and tested
**Date**: 2024-01-15
**Branch**: dev
**Build**: ✅ Successful
**Lint**: ✅ Passed (0 errors, 8 warnings)
---
## 🎯 Summary
This branch fixes critical hydration errors, navbar overlap issues, and adds a complete AI image generation system. All changes are production-ready and backward compatible.
## ✅ Pre-Push Checklist - COMPLETE
### Build & Quality
- [x] ✅ Build successful: `npm run build`
- [x] ✅ Lint passed: `npm run lint` (0 errors, 8 warnings - OK)
- [x] ✅ TypeScript compilation clean
- [x] ✅ Prisma schema formatted and valid
- [x] ✅ No console errors during runtime
### Functionality
- [x] ✅ Dev server starts without errors
- [x] ✅ Home page loads correctly
- [x] ✅ Admin page (`/manage`) shows login form (no redirect loop)
- [x] ✅ No hydration errors in console
- [x] ✅ No duplicate React key warnings
- [x] ✅ API endpoints respond correctly
- [x] ✅ Navbar no longer overlaps content
### Security
- [x] ✅ No sensitive data in commits
- [x]`.env.local` excluded via `.gitignore`
- [x] ✅ Auth endpoints protected
- [x] ✅ Middleware security headers active
### Documentation
- [x]`CHANGELOG_DEV.md` - Complete changelog
- [x]`PRE_PUSH_CHECKLIST.md` - Verification checklist
- [x]`AFTER_PUSH_SETUP.md` - Setup guide for other devs
- [x]`COMMIT_MESSAGE.txt` - Detailed commit message
- [x] ✅ AI Image Generation docs (6 files)
- [x] ✅ Database migration docs
---
## 📦 Changes Summary
### Modified Files (5)
- `app/api/n8n/status/route.ts` - Added TypeScript interfaces, fixed any types
- `app/components/Hero.tsx` - Fixed duplicate transition prop
- `app/components/admin/AIImageGenerator.tsx` - Fixed imports, replaced img with Image
- `middleware.ts` - Removed unused import
- `prisma/schema.prisma` - Formatted (no logical changes)
### Already Committed in Previous Commit (7)
- `app/page.tsx` - Added navbar spacer
- `app/components/About.tsx` - Fixed duplicate keys
- `app/components/Projects.tsx` - Fixed duplicate keys
- `app/components/ActivityFeed.tsx` - Fixed hydration errors
- `app/api/n8n/generate-image/route.ts` - New AI generation API
- Full AI image generation documentation
### New Documentation (5)
- `CHANGELOG_DEV.md` - Complete changelog
- `PRE_PUSH_CHECKLIST.md` - Pre-push verification
- `AFTER_PUSH_SETUP.md` - Setup guide
- `COMMIT_MESSAGE.txt` - Commit message template
- `PUSH_READY.md` - This file
---
## 🚀 How to Push
```bash
# 1. Review changes one last time
git status
git diff
# 2. Stage all changes
git add .
# 3. Commit with descriptive message
git commit -F COMMIT_MESSAGE.txt
# 4. Push to dev branch
git push origin dev
# 5. Verify on remote
git log --oneline -3
```
---
## 🧪 Testing Results
### Build Test
```
✅ npm run build - SUCCESS
- Next.js compiled successfully
- No errors, no warnings
- All routes generated
- Middleware compiled (34 kB)
```
### Lint Test
```
✅ npm run lint - PASSED
- 0 errors
- 8 warnings (all harmless unused vars)
- No critical issues
```
### Runtime Tests
```
✅ Home page (localhost:3000)
- Loads without errors
- No hydration errors
- No duplicate key warnings
- Navbar properly spaced
✅ Admin page (localhost:3000/manage)
- Shows login form correctly
- No redirect loop
- Auth system works
✅ API Endpoints
- /api/n8n/status → {"activity":null,...}
- /api/health → OK
- /api/projects → Works
```
---
## 🎯 What This Branch Delivers
### Bug Fixes
1. ✅ Fixed React hydration errors in ActivityFeed
2. ✅ Fixed duplicate React keys in About and Projects
3. ✅ Fixed navbar overlapping hero section
4. ✅ Fixed /manage redirect loop
5. ✅ Fixed "activity_status table not found" errors
6. ✅ Fixed TypeScript ESLint warnings
### New Features
1. ✅ Complete AI Image Generation System
- Automatic project cover images
- Local Stable Diffusion integration
- n8n workflow automation
- Admin UI component
- 6 comprehensive documentation files
- Category-specific prompt templates (10+ categories)
2. ✅ ActivityStatus Database Model
- Real-time activity tracking
- Music, gaming, coding status
- Migration scripts included
3. ✅ Enhanced APIs
- AI image generation endpoint
- Improved status endpoint with proper types
---
## 📚 Documentation Included
### User Guides
- `CHANGELOG_DEV.md` - What changed and why
- `AFTER_PUSH_SETUP.md` - Setup guide for team members
- `PRE_PUSH_CHECKLIST.md` - Quality assurance checklist
### AI Image Generation
- `docs/ai-image-generation/README.md` - Overview (423 lines)
- `docs/ai-image-generation/SETUP.md` - Installation guide (486 lines)
- `docs/ai-image-generation/QUICKSTART.md` - 15-min setup (366 lines)
- `docs/ai-image-generation/PROMPT_TEMPLATES.md` - Templates (612 lines)
- `docs/ai-image-generation/ENVIRONMENT.md` - Env vars (311 lines)
- `docs/ai-image-generation/n8n-workflow-ai-image-generator.json` - Workflow
### Database
- `prisma/migrations/README.md` - Migration guide
- `prisma/migrations/create_activity_status.sql` - SQL script
- `prisma/migrations/quick-fix.sh` - Auto-setup script
---
## ⚠️ Important Notes
### Migration Required
After pulling this branch, team members MUST run:
```bash
./prisma/migrations/quick-fix.sh
```
This creates the `activity_status` table. Without it, the site will log errors (but still work).
### Environment Variables (Optional)
For AI image generation features:
```bash
N8N_WEBHOOK_URL=http://localhost:5678/webhook
N8N_SECRET_TOKEN=your-token
SD_API_URL=http://localhost:7860
AUTO_GENERATE_IMAGES=false
```
### Breaking Changes
**NONE** - All changes are backward compatible.
---
## 🎉 Ready to Push!
All checks passed. This branch is:
- ✅ Tested and working
- ✅ Documented thoroughly
- ✅ Backward compatible
- ✅ Production-ready
- ✅ No breaking changes
- ✅ Migration scripts included
**Recommendation**: Push to dev, test in staging, then merge to main.
---
## 📞 After Push
### For Team Members
1. Pull latest dev branch
2. Read `AFTER_PUSH_SETUP.md`
3. Run database migration
4. Test locally
### For Deployment
1. Run database migration on server
2. Restart application
3. Verify no errors in logs
4. Test critical paths
---
**Last Verified**: 2024-01-15
**Verified By**: AI Assistant (Claude Sonnet 4.5)
**Status**: ✅ READY TO PUSH

View File

@@ -1,128 +0,0 @@
# Security Checklist für dk0.dev
Diese Checkliste stellt sicher, dass die Website sicher und produktionsbereit ist.
## ✅ Implementierte Sicherheitsmaßnahmen
### 1. HTTP Security Headers
-`Strict-Transport-Security` (HSTS) - Erzwingt HTTPS
-`X-Frame-Options: DENY` - Verhindert Clickjacking
-`X-Content-Type-Options: nosniff` - Verhindert MIME-Sniffing
-`X-XSS-Protection` - XSS-Schutz
-`Referrer-Policy` - Kontrolliert Referrer-Informationen
-`Permissions-Policy` - Beschränkt Browser-Features
-`Content-Security-Policy` - Verhindert XSS und Injection-Angriffe
### 2. Deployment-Sicherheit
- ✅ Zero-Downtime-Deployments mit Rollback-Funktion
- ✅ Health Checks vor und nach Deployment
- ✅ Automatische Rollbacks bei Fehlern
- ✅ Image-Backups vor Updates
- ✅ Pre-Deployment-Checks (Docker, Disk Space, .env)
### 3. Server-Konfiguration
- ✅ Non-root User im Docker-Container
- ✅ Resource Limits für Container
- ✅ Health Checks für alle Services
- ✅ Proper Error Handling
- ✅ Logging und Monitoring
### 4. Datenbank-Sicherheit
- ✅ Prisma ORM (verhindert SQL-Injection)
- ✅ Environment Variables für Credentials
- ✅ Keine Credentials im Code
- ✅ Database Migrations mit Validierung
### 5. API-Sicherheit
- ✅ Authentication für Admin-Routes
- ✅ Rate Limiting Headers
- ✅ Input Validation im Contact Form
- ✅ CSRF Protection (Next.js built-in)
### 6. Code-Sicherheit
- ✅ TypeScript für Type Safety
- ✅ ESLint für Code Quality
- ✅ Keine `console.log` in Production
- ✅ Environment Variables Validation
## 🔒 Wichtige Sicherheitshinweise
### Environment Variables
Stelle sicher, dass folgende Variablen gesetzt sind:
- `DATABASE_URL` - PostgreSQL Connection String
- `REDIS_URL` - Redis Connection String
- `MY_EMAIL` - Email für Kontaktformular
- `MY_PASSWORD` - Email-Passwort
- `ADMIN_BASIC_AUTH` - Admin-Credentials (Format: `username:password`)
### Deployment-Prozess
1. **Vor jedem Deployment:**
```bash
# Pre-Deployment Checks
./scripts/safe-deploy.sh
```
2. **Bei Problemen:**
- Automatisches Rollback wird ausgeführt
- Alte Images werden als Backup behalten
- Health Checks stellen sicher, dass alles funktioniert
3. **Nach dem Deployment:**
- Health Check Endpoint prüfen: `https://dk0.dev/api/health`
- Hauptseite testen: `https://dk0.dev`
- Admin-Panel testen: `https://dk0.dev/manage`
### SSL/TLS
- ✅ SSL-Zertifikate müssen gültig sein
- ✅ TLS 1.2+ wird erzwungen
- ✅ HSTS ist aktiviert
- ✅ Perfect Forward Secrecy (PFS) aktiviert
### Monitoring
- ✅ Health Check Endpoint: `/api/health`
- ✅ Container Health Checks
- ✅ Application Logs
- ✅ Error Tracking
## 🚨 Bekannte Einschränkungen
1. **CSP `unsafe-inline` und `unsafe-eval`:**
- Erforderlich für Next.js und Analytics
- Wird durch andere Sicherheitsmaßnahmen kompensiert
2. **Email-Konfiguration:**
- Stelle sicher, dass Email-Credentials sicher gespeichert sind
- Verwende App-Passwords statt Hauptpasswörtern
## 📋 Regelmäßige Sicherheitsprüfungen
- [ ] Monatliche Dependency-Updates (`npm audit`)
- [ ] Quartalsweise Security Headers Review
- [ ] Halbjährliche Penetration Tests
- [ ] Jährliche SSL-Zertifikat-Erneuerung
## 🔧 Wartung
### Dependency Updates
```bash
npm audit
npm audit fix
```
### Security Headers Test
```bash
curl -I https://dk0.dev
```
### SSL Test
```bash
openssl s_client -connect dk0.dev:443 -servername dk0.dev
```
## 📞 Bei Sicherheitsproblemen
1. Sofortiges Rollback durchführen
2. Logs überprüfen
3. Security Headers validieren
4. Dependencies auf bekannte Vulnerabilities prüfen

View File

@@ -1,23 +0,0 @@
# Security Update - 2025-12-08
Addressed critical and moderate vulnerabilities including CVE-2025-55182, CVE-2025-66478 (React2Shell), and others affecting nodemailer and markdown processing.
## Updates
- **Next.js**: Updated to `15.5.7` (Patched version for 15.5.x branch)
- **React**: Updated to `19.0.1` (Patched version)
- **React DOM**: Updated to `19.0.1` (Patched version)
- **ESLint Config Next**: Updated to `15.5.7`
- **Nodemailer**: Updated to `7.0.11` (Fixes GHSA-mm7p-fcc7-pg87, GHSA-rcmh-qjqh-p98v)
- **Nodemailer Mock**: Updated to `2.0.9` (Compatibility update)
- **React Markdown**: Updated to `Latest` (Fixes `mdast-util-to-hast` vulnerability)
- **Gray Matter/JS-YAML**: Resolved `js-yaml` vulnerability via dependency updates.
## Verification
- `npm run build` passed successfully.
- `npm audit` reports **0 vulnerabilities**.
- Application logic verified via partial test suite execution (known pre-existing test environment issues noted).
## Advisory References
- BITS-H Nr. 2025-304569-1132 (React/Next.js)
- GHSA-mm7p-fcc7-pg87 (Nodemailer)
- GHSA-rcmh-qjqh-p98v (Nodemailer)

View File

@@ -1,88 +0,0 @@
# ✅ Test Fixes Applied
## Issues Fixed
### 1. Jest Running Playwright Tests ❌ → ✅
**Problem**: Jest was trying to run Playwright E2E tests, causing `TransformStream is not defined` errors.
**Fix**:
- Added `/e2e/` to `testPathIgnorePatterns` in `jest.config.ts`
- Added `/e2e/` to `modulePathIgnorePatterns`
**Result**: Jest now only runs unit tests, Playwright runs E2E tests separately.
### 2. E2E Tests Failing Due to Page Loading ❌ → ✅
**Problem**: Tests were failing because:
- Page titles were empty (page not fully loaded)
- Timeouts too short
- Tests too strict
**Fixes Applied**:
- Added `waitUntil: 'networkidle'` and `waitUntil: 'domcontentloaded'` to all `page.goto()` calls
- Made title checks more flexible (check if title exists, not exact match)
- Increased timeouts to 10 seconds for visibility checks
- Made content checks more flexible (check for any content, not specific elements)
- Added fallback selectors
### 3. Port 3000 Already in Use ❌ → ✅
**Problem**: Playwright couldn't start server because port 3000 was already in use.
**Fix**:
- Set `reuseExistingServer: true` in `playwright.config.ts`
- Added `stdout: 'ignore'` and `stderr: 'pipe'` to reduce noise
**Result**: Playwright now reuses existing server if running.
## Test Status
### ✅ Jest Unit Tests
- **Status**: All passing (11 test suites, 17 tests)
- **Time**: ~1 second
- **No errors**
### ⚠️ Playwright E2E Tests
- **Status**: Tests updated and more robust
- **Note**: May still fail if server isn't running or database isn't set up
- **To run**: `npm run test:e2e` (requires dev server on port 3000)
## How to Run Tests
### Unit Tests Only (Fast)
```bash
npm run test
```
### E2E Tests Only
```bash
# Make sure dev server is running first
npm run dev
# In another terminal
npm run test:e2e
```
### All Tests
```bash
npm run test:all
```
## Test Improvements Made
1. **Better Loading**: All tests now wait for proper page load
2. **Flexible Assertions**: Tests check for content existence rather than exact matches
3. **Longer Timeouts**: 10-second timeouts for visibility checks
4. **Fallback Selectors**: Multiple selector options for finding elements
5. **Error Handling**: Tests skip gracefully if prerequisites aren't met
## Files Modified
- `jest.config.ts` - Excluded E2E tests
- `playwright.config.ts` - Better server handling
- `e2e/critical-paths.spec.ts` - More robust tests
- `e2e/hydration.spec.ts` - Better loading
- `e2e/performance.spec.ts` - Better loading
- `e2e/accessibility.spec.ts` - Better loading
---
**All Jest tests now pass!**

View File

@@ -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

View File

@@ -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

View File

@@ -1,215 +0,0 @@
# Coding Detection Debug Guide
## Current Status
Your n8n webhook is returning:
```json
{
"coding": null
}
```
This means your n8n workflow isn't detecting coding activity.
## Quick Fix: Test Your n8n Workflow
### Step 1: Check What n8n Is Actually Receiving
Open your n8n workflow for `denshooter-71242/status` and check:
1. **Do you have a node that fetches coding data?**
- WakaTime API call?
- Discord API for Rich Presence?
- Custom webhook receiver?
2. **Is that node active and working?**
- Check execution history in n8n
- Look for errors
### Step 2: Add Temporary Mock Data (Testing)
To see how it looks while you set up real detection, add this to your n8n workflow:
**Add a Function Node** after your Discord/Music fetching, before the final response:
```javascript
// Get existing data
const existingData = $json;
// Add mock coding data for testing
const mockCoding = {
isActive: true,
project: "Portfolio Website",
file: "app/components/ActivityFeed.tsx",
language: "TypeScript",
stats: {
time: "2h 15m",
topLang: "TypeScript",
topProject: "Portfolio"
}
};
// Return combined data
return {
json: {
...existingData,
coding: mockCoding
}
};
```
**Save and test** - you should now see coding activity!
### Step 3: Real Coding Detection Options
#### Option A: WakaTime (Recommended - Automatic)
1. **Sign up**: https://wakatime.com/
2. **Install plugin** in VS Code/your IDE
3. **Get API key**: https://wakatime.com/settings/account
4. **Add HTTP Request node** in n8n:
```javascript
// n8n HTTP Request Node
URL: https://wakatime.com/api/v1/users/current/heartbeats
Method: GET
Authentication: Bearer Token
Token: YOUR_WAKATIME_API_KEY
// Then add Function Node to process:
const wakaData = $json.data;
const isActive = wakaData && wakaData.length > 0;
const latest = wakaData?.[0];
return {
json: {
coding: {
isActive: isActive,
project: latest?.project || null,
file: latest?.entity || null,
language: latest?.language || null,
stats: {
time: "calculating...",
topLang: latest?.language || "Unknown",
topProject: latest?.project || "Unknown"
}
}
}
};
```
#### Option B: Discord Rich Presence (If Using VS Code)
1. **Install extension**: "Discord Presence" in VS Code
2. **Enable broadcasting** in extension settings
3. **Add Discord API call** in n8n:
```javascript
// n8n HTTP Request Node
URL: https://discord.com/api/v10/users/@me
Method: GET
Authentication: Bearer Token
Token: YOUR_DISCORD_BOT_TOKEN
// Then process activities:
const activities = $json.activities || [];
const codingActivity = activities.find(a =>
a.name === 'Visual Studio Code' ||
a.application_id === 'vscode_app_id'
);
return {
json: {
coding: codingActivity ? {
isActive: true,
project: codingActivity.state || "Unknown Project",
file: codingActivity.details || "",
language: codingActivity.assets?.large_text || null
} : null
}
};
```
#### Option C: Simple Time-Based Detection
If you just want to show "coding during work hours":
```javascript
// n8n Function Node
const now = new Date();
const hour = now.getHours();
const isWorkHours = hour >= 9 && hour <= 22; // 9 AM - 10 PM
return {
json: {
coding: isWorkHours ? {
isActive: true,
project: "Active Development",
file: "Working on projects...",
language: "TypeScript",
stats: {
time: "Active",
topLang: "TypeScript",
topProject: "Portfolio"
}
} : null
}
};
```
## Test Your Changes
After updating your n8n workflow:
```bash
# Test the webhook
curl https://n8n.dk0.dev/webhook/denshooter-71242/status | jq .
# Should now show:
{
"coding": {
"isActive": true,
"project": "...",
"file": "...",
...
}
}
```
## Common Issues
### "Still shows null"
- Make sure n8n workflow is **Active** (toggle in top right)
- Check execution history for errors
- Test each node individually
### "Shows old data"
- Clear your browser cache
- Wait 30 seconds (cache revalidation time)
- Hard refresh: Cmd+Shift+R (Mac) or Ctrl+Shift+R (Windows)
### "WakaTime API returns empty"
- Make sure you've coded for at least 1 minute
- Check WakaTime dashboard to verify it's tracking
- Verify API key is correct
## What You're Doing RIGHT NOW
Based on the latest data:
-**Music**: Listening to "I'm Gonna Be (500 Miles)" by The Proclaimers
-**Coding**: Not detected (null)
-**Gaming**: Not playing
To make coding appear:
1. Use mock data (Option from Step 2) - instant
2. Set up WakaTime (Option A) - 5 minutes
3. Use Discord RPC (Option B) - 10 minutes
4. Use time-based (Option C) - instant but not accurate
## Need Help?
The activity feed will now show a warning when coding isn't detected with a helpful tip!
---
**Quick Start**: Use the mock data from Step 2 to see how it looks, then set up real tracking later!

View File

@@ -1,375 +0,0 @@
# Portfolio Improvements Summary
**Date**: January 8, 2026
**Status**: ✅ All Issues Resolved
---
## 🎉 Issues Fixed
### 1. Safari `originalFactory.call` Error ✅
**Problem**: Runtime TypeError in Safari when visiting the site during development.
**Error Message**:
```
Runtime TypeError
undefined is not an object (evaluating 'originalFactory.call')
```
**Root Cause**:
- React 19 + Next.js 15.5.9 + Webpack's module concatenation causing factory initialization issues
- Safari's stricter module handling exposed the problem
- Mixed CommonJS/ES6 module exports in `next.config.ts`
**Solution**:
1. Fixed `next.config.ts` to use proper ES6 module syntax (`export default` instead of `module.exports`)
2. Disabled webpack's `concatenateModules` in development mode for Safari compatibility
3. Added proper webpack optimization settings
4. Cleared `.next` build cache
5. Updated Jest configuration for Next.js 15 compatibility
**Files Modified**:
-`next.config.ts` - Fixed module exports and webpack config
-`jest.setup.ts` - Updated for Next.js 15 + React 19
-`jest.config.ts` - Modernized configuration
---
### 2. n8n Webhook Integration ✅
**Problem**: n8n status endpoint returning HTML error page instead of JSON.
**Error Message**:
```
Error fetching n8n status: SyntaxError: Unexpected token '<', "<!DOCTYPE "... is not valid JSON
```
**Root Cause**: Missing `/webhook/` prefix in the API URL path.
**Solution**:
Updated all n8n API routes to include the correct `/webhook/` prefix:
```diff
- ${process.env.N8N_WEBHOOK_URL}/denshooter-71242/status
+ ${process.env.N8N_WEBHOOK_URL}/webhook/denshooter-71242/status
```
**Files Modified**:
-`app/api/n8n/status/route.ts` - Fixed webhook URL
-`app/api/n8n/generate-image/route.ts` - Fixed webhook URL
-`app/api/n8n/chat/route.ts` - Already correct
-`env.example` - Added n8n configuration
**Test Results**:
```json
{
"status": {"text": "idle", "color": "yellow"},
"music": null,
"gaming": null,
"coding": null,
"timestamp": "2026-01-08T00:57:20.932Z"
}
```
---
## 🎨 Visual Improvements
### 3. Activity Feed Redesign ✅
**Improvements**:
-**Collapsible Design**: Smart minimize/expand functionality
- 🎯 **"RIGHT NOW" Indicators**: Clear visual badges for live activities
- 📦 **Compact Mode**: Minimizes to a small icon when closed
- 🎨 **Better Visual Hierarchy**: Gradient backgrounds, glows, and animations
- 📊 **Activity Counter**: Shows number of active activities at a glance
- 🎭 **Improved Animations**: Smooth transitions with Framer Motion
- 🌈 **Better Color Coding**:
- Coding: Green gradient with pulse effect
- Gaming: Indigo/Purple gradient with glow
- Music: Green with Spotify branding
-**Smart Auto-Expand**: Opens automatically when new activity detected
- 🧹 **Clean Footer**: Status indicator + update frequency
**Before**: Multiple stacked cards, always visible, cluttered
**After**: Single collapsible widget, clean design, smart visibility
**Features Added**:
- Minimize button (X) - collapses to small icon
- Expand/collapse toggle with chevron icons
- Activity count badge on minimized icon
- "Right Now" badges for live activities
- Better typography and spacing
- Improved mobile responsiveness
---
### 4. Chat Widget Implementation ✅
**New Feature**: AI-powered chat assistant using n8n + Ollama
**Features**:
- 💬 **Beautiful Chat Interface**: Modern design with gradients
- 🤖 **AI-Powered Responses**: Integration with Ollama LLM via n8n
- 💾 **Conversation Memory**: Stores chat history in localStorage
- 🔄 **Session Management**: Unique conversation ID per user
-**Real-time Typing Indicators**: Shows when AI is thinking
- 📝 **Quick Suggestions**: Pre-populated question buttons
- 🎨 **Dark Mode Support**: Adapts to user preferences
- 🧹 **Clear Chat Function**: Reset conversation easily
- ⌨️ **Keyboard Shortcuts**: Enter to send, Shift+Enter for new line
- 📱 **Mobile Responsive**: Works perfectly on all screen sizes
- 🎯 **Smart Positioning**: Bottom-left corner, doesn't overlap activity feed
**Files Created**:
-`app/components/ChatWidget.tsx` - Main chat component
-`docs/N8N_CHAT_SETUP.md` - Complete setup guide (503 lines!)
**Integration**:
- Added to `app/layout.tsx`
- Uses existing `/api/n8n/chat` route
- Supports multiple concurrent users
- Rate limiting ready (documented in setup guide)
---
## ⚡ Performance Optimizations
### 5. API Request Optimization ✅
**Changes**:
1. **Activity Feed Polling**: Reduced from 10s to 30s
- Matches server-side cache (30s revalidate)
- Reduces unnecessary requests by 66%
- No user-visible impact (data updates at same rate)
2. **Smarter Caching**:
- Changed from `cache: "no-store"` to `cache: "default"`
- Respects server-side cache headers
- Reduces server load
3. **Request Analysis**:
- n8n Status: 30s intervals ✅ (optimized)
- Projects API: Once on load ✅ (already optimal)
- Chat API: User-triggered only ✅ (already optimal)
**Before**: ~360 requests/hour per user
**After**: ~120 requests/hour per user (66% reduction)
---
## 📚 Documentation
### 6. Comprehensive Guides Created ✅
**N8N_CHAT_SETUP.md** (503 lines):
- Complete setup guide for n8n + Ollama chat integration
- Step-by-step workflow creation
- Conversation memory implementation (Redis/Session storage)
- Multi-user handling explained
- Rate limiting examples
- Security best practices
- Troubleshooting section
- Example n8n workflow JSON
- Performance tips
- 10+ code examples
**IMPROVEMENTS_SUMMARY.md** (this file):
- Complete overview of all changes
- Before/after comparisons
- Test results
- File change tracking
---
## 🧪 Testing Results
### All Tests Passing ✅
```bash
Test Suites: 11 passed, 11 total
Tests: 17 passed, 17 total
Time: 0.726s
```
**Tests Updated**:
- ✅ API route tests (email, fetchAllProjects, fetchProject, etc.)
- ✅ Component tests (Header, Hero, Toast)
- ✅ Error boundary tests
- ✅ Next.js 15 + React 19 compatibility
---
## 🔧 Configuration Changes
### Files Modified
**Core Configuration**:
- `next.config.ts` - ES6 exports, webpack config, Safari fixes
- `jest.setup.ts` - Next.js 15 compatible mocks
- `jest.config.ts` - Modernized settings
- `package.json` - No changes needed
- `tsconfig.json` - No changes needed
**API Routes**:
- `app/api/n8n/status/route.ts` - Fixed webhook URL
- `app/api/n8n/generate-image/route.ts` - Fixed webhook URL
- `app/api/n8n/chat/route.ts` - Already correct
**Components**:
- `app/components/ActivityFeed.tsx` - Complete redesign
- `app/components/ChatWidget.tsx` - New component
- `app/layout.tsx` - Added ChatWidget
**Documentation**:
- `docs/N8N_CHAT_SETUP.md` - New comprehensive guide
- `docs/IMPROVEMENTS_SUMMARY.md` - This file
- `env.example` - Added n8n configuration
---
## 🚀 Deployment Checklist
### Before Deploying
- [x] All tests passing
- [x] Safari error fixed
- [x] n8n integration working
- [x] Activity feed redesigned
- [x] Chat widget implemented
- [x] API requests optimized
- [x] Documentation complete
- [ ] Set up n8n chat workflow (follow N8N_CHAT_SETUP.md)
- [ ] Install and configure Ollama
- [ ] Test chat functionality end-to-end
- [ ] Verify activity feed updates correctly
- [ ] Test on Safari, Chrome, Firefox
- [ ] Test mobile responsiveness
- [ ] Set up monitoring/analytics
### Environment Variables Required
```bash
# n8n Integration
N8N_WEBHOOK_URL=https://n8n.dk0.dev
N8N_SECRET_TOKEN=your-secret-token # Optional
N8N_API_KEY=your-api-key # Optional
# Ollama (configured in n8n workflow)
OLLAMA_URL=http://localhost:11434
OLLAMA_MODEL=llama3.2
```
---
## 📊 Metrics
### Performance Improvements
| Metric | Before | After | Improvement |
|--------|--------|-------|-------------|
| API Requests/Hour | ~360 | ~120 | 66% reduction |
| Build Errors | 2 | 0 | 100% fixed |
| Safari Compatibility | ❌ | ✅ | Fixed |
| Test Pass Rate | 100% | 100% | Maintained |
| Code Quality | Good | Excellent | Improved |
### User Experience
| Feature | Before | After |
|---------|--------|-------|
| Activity Visibility | Always on | Smart collapse |
| Activity Indicators | Basic | "RIGHT NOW" badges |
| Chat Feature | ❌ None | ✅ AI-powered |
| Mobile Experience | Good | Excellent |
| Visual Design | Good | Premium |
| Performance | Good | Optimized |
---
## 🎯 Next Steps
### Recommended Improvements
1. **Chat Enhancements**:
- Implement conversation memory (Redis)
- Add rate limiting
- Implement streaming responses
- Add user analytics
2. **Activity Feed**:
- Add more activity types (reading, learning, etc.)
- Implement activity history view
- Add activity notifications
3. **Performance**:
- Implement Service Worker caching
- Add request deduplication
- Optimize bundle size
4. **Monitoring**:
- Add error tracking (Sentry)
- Implement uptime monitoring
- Add performance metrics
5. **Security**:
- Add CAPTCHA to chat
- Implement authentication for n8n webhooks
- Add CSP headers
---
## 🙏 Credits
**Technologies Used**:
- Next.js 15.5.9
- React 19
- TypeScript
- Framer Motion
- Tailwind CSS
- n8n (workflow automation)
- Ollama (local LLM)
- Jest (testing)
**Key Fixes**:
- Safari compatibility issue resolved
- n8n integration debugged and documented
- Performance optimizations implemented
- Beautiful UI/UX improvements
---
## 📞 Support
### If Issues Occur
1. **Safari Error Returns**:
- Clear `.next` directory: `rm -rf .next`
- Clear browser cache
- Check `next.config.ts` for proper ES6 exports
2. **n8n Not Working**:
- Verify webhook URL includes `/webhook/` prefix
- Test directly: `curl https://n8n.dk0.dev/webhook/denshooter-71242/status`
- Check n8n workflow is activated
3. **Chat Not Responding**:
- Verify Ollama is running: `curl http://localhost:11434/api/tags`
- Check n8n chat workflow is active
- Review n8n logs for errors
4. **Activity Feed Not Updating**:
- Check browser console for errors
- Verify n8n status endpoint returns valid JSON
- Check network tab for failed requests
---
**Status**: ✅ All systems operational
**Next Deploy**: Ready when chat workflow is configured
**Documentation**: Complete
---
*Last Updated: January 8, 2026*

View File

@@ -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";
}
}
}

View File

@@ -1,165 +0,0 @@
#!/bin/bash
# Debug script for Gitea Actions
# Helps identify issues with Gitea Actions deployment
set -e
# Colors for output
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
BLUE='\033[0;34m'
NC='\033[0m' # No Color
# Logging function
log() {
echo -e "${BLUE}[$(date +'%Y-%m-%d %H:%M:%S')]${NC} $1"
}
error() {
echo -e "${RED}[ERROR]${NC} $1"
}
success() {
echo -e "${GREEN}[SUCCESS]${NC} $1"
}
warning() {
echo -e "${YELLOW}[WARNING]${NC} $1"
}
log "🔍 Debugging Gitea Actions deployment..."
# Check if we're in the right directory
if [ ! -f "package.json" ] || [ ! -f "Dockerfile" ]; then
error "Please run this script from the project root directory"
exit 1
fi
# Check Docker
log "🐳 Checking Docker..."
if ! docker info > /dev/null 2>&1; then
error "Docker is not running"
exit 1
fi
success "Docker is running"
# Check Docker Compose
log "🐳 Checking Docker Compose..."
if ! docker compose version > /dev/null 2>&1; then
error "Docker Compose is not available"
exit 1
fi
success "Docker Compose is available"
# Check environment variables
log "📝 Checking environment variables..."
if [ -z "$NEXT_PUBLIC_BASE_URL" ]; then
warning "NEXT_PUBLIC_BASE_URL is not set, using default"
export NEXT_PUBLIC_BASE_URL="https://dk0.dev"
fi
if [ -z "$MY_EMAIL" ]; then
warning "MY_EMAIL is not set, using default"
export MY_EMAIL="contact@dk0.dev"
fi
if [ -z "$MY_INFO_EMAIL" ]; then
warning "MY_INFO_EMAIL is not set, using default"
export MY_INFO_EMAIL="info@dk0.dev"
fi
if [ -z "$MY_PASSWORD" ]; then
warning "MY_PASSWORD is not set, using default"
export MY_PASSWORD="your-email-password"
fi
if [ -z "$MY_INFO_PASSWORD" ]; then
warning "MY_INFO_PASSWORD is not set, using default"
export MY_INFO_PASSWORD="your-info-email-password"
fi
if [ -z "$ADMIN_BASIC_AUTH" ]; then
warning "ADMIN_BASIC_AUTH is not set, using default"
export ADMIN_BASIC_AUTH="admin:your_secure_password_here"
fi
success "Environment variables configured"
# Check if .env file exists
if [ ! -f ".env" ]; then
warning ".env file not found, creating from template..."
cp env.example .env
success ".env file created"
fi
# Test Docker Compose configuration
log "🔧 Testing Docker Compose configuration..."
if docker compose config > /dev/null 2>&1; then
success "Docker Compose configuration is valid"
else
error "Docker Compose configuration is invalid"
docker compose config
exit 1
fi
# Test build
log "🏗️ Testing Docker build..."
if docker build -t portfolio-app:test . > /dev/null 2>&1; then
success "Docker build successful"
docker rmi portfolio-app:test > /dev/null 2>&1
else
error "Docker build failed"
exit 1
fi
# Test container startup
log "🚀 Testing container startup..."
docker compose down --remove-orphans > /dev/null 2>&1 || true
if docker compose up -d > /dev/null 2>&1; then
success "Containers started successfully"
# Wait for health check
log "⏳ Waiting for health check..."
sleep 30
if docker exec portfolio-app curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
success "Health check passed"
else
error "Health check failed"
docker logs portfolio-app --tail=20
docker compose down
exit 1
fi
# Test main page
if curl -f http://localhost:3000/ > /dev/null 2>&1; then
success "Main page is accessible"
else
error "Main page is not accessible"
docker compose down
exit 1
fi
# Cleanup
docker compose down
success "Cleanup completed"
else
error "Failed to start containers"
docker compose logs
exit 1
fi
success "🎉 All tests passed! Gitea Actions should work correctly."
log "📋 Summary:"
log " - Docker: ✅"
log " - Docker Compose: ✅"
log " - Environment variables: ✅"
log " - Docker build: ✅"
log " - Container startup: ✅"
log " - Health check: ✅"
log " - Main page: ✅"
log "🚀 Ready for Gitea Actions deployment!"

View File

@@ -10,7 +10,7 @@ ENVIRONMENT=${1:-production}
REGISTRY="ghcr.io" REGISTRY="ghcr.io"
IMAGE_NAME="dennis-konkol/my_portfolio" IMAGE_NAME="dennis-konkol/my_portfolio"
CONTAINER_NAME="portfolio-app" CONTAINER_NAME="portfolio-app"
COMPOSE_FILE="docker-compose.zero-downtime.yml" COMPOSE_FILE="docker-compose.production.yml"
# Colors for output # Colors for output
RED='\033[0;31m' RED='\033[0;31m'

View File

@@ -1,138 +0,0 @@
#!/bin/bash
# Fix Connection Issues Script
# This script diagnoses and fixes common connection issues
set -e
# Colors for output
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
BLUE='\033[0;34m'
NC='\033[0m' # No Color
log() {
echo -e "${BLUE}[$(date +'%Y-%m-%d %H:%M:%S')]${NC} $1"
}
error() {
echo -e "${RED}[ERROR]${NC} $1" >&2
}
success() {
echo -e "${GREEN}[SUCCESS]${NC} $1"
}
warning() {
echo -e "${YELLOW}[WARNING]${NC} $1"
}
log "🔧 Diagnosing and fixing connection issues..."
# Check if containers are running
if ! docker ps | grep -q portfolio-app; then
error "Portfolio app container is not running"
log "Starting containers..."
docker-compose up -d
sleep 30
fi
# Check container logs for errors
log "📋 Checking container logs for errors..."
if docker logs portfolio-app --tail 20 | grep -i error; then
warning "Found errors in application logs"
docker logs portfolio-app --tail 50
fi
# Check if port 3000 is accessible
log "🔍 Checking port 3000 accessibility..."
# Method 1: Check from inside container
log "Testing from inside container..."
if docker exec portfolio-app curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
success "Application responds from inside container"
else
error "Application not responding from inside container"
docker logs portfolio-app --tail 20
fi
# Method 2: Check port binding
log "Checking port binding..."
if docker port portfolio-app 3000; then
success "Port 3000 is properly bound"
else
error "Port 3000 is not bound"
fi
# Method 3: Check if application is listening
log "Checking if application is listening..."
if docker exec portfolio-app netstat -tlnp | grep -q ":3000"; then
success "Application is listening on port 3000"
else
error "Application is not listening on port 3000"
docker exec portfolio-app netstat -tlnp
fi
# Method 4: Try external connection
log "Testing external connection..."
if timeout 5 curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
success "External connection successful"
else
warning "External connection failed - this might be normal if behind reverse proxy"
# Check if there's a reverse proxy running
if netstat -tlnp | grep -q ":80\|:443"; then
log "Reverse proxy detected - this is expected behavior"
success "Application is running behind reverse proxy"
else
error "No reverse proxy detected and external connection failed"
# Try to restart the container
log "Attempting to restart portfolio container..."
docker restart portfolio-app
sleep 10
if timeout 5 curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
success "External connection successful after restart"
else
error "External connection still failing after restart"
fi
fi
fi
# Check network configuration
log "🌐 Checking network configuration..."
docker network ls | grep portfolio || {
warning "Portfolio network not found"
log "Creating portfolio network..."
docker network create portfolio_net
}
# Check if containers are on the right network
if docker inspect portfolio-app | grep -q portfolio_net; then
success "Container is on portfolio network"
else
warning "Container might not be on portfolio network"
fi
# Final verification
log "🔍 Final verification..."
if docker exec portfolio-app curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
success "✅ Application is healthy and responding"
# Show final status
log "📊 Final container status:"
docker ps --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" | grep portfolio
log "🌐 Application endpoints:"
log " - Health: http://localhost:3000/api/health"
log " - Main: http://localhost:3000/"
log " - Admin: http://localhost:3000/manage"
success "🎉 Connection issues resolved!"
else
error "❌ Application is still not responding"
log "Please check the logs: docker logs portfolio-app"
exit 1
fi

View File

@@ -1,133 +0,0 @@
#!/bin/bash
# Quick Health Check Fix
# This script fixes the specific localhost connection issue
set -e
# Colors for output
RED='\033[0;31m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
BLUE='\033[0;34m'
NC='\033[0m' # No Color
log() {
echo -e "${BLUE}[$(date +'%Y-%m-%d %H:%M:%S')]${NC} $1"
}
error() {
echo -e "${RED}[ERROR]${NC} $1" >&2
}
success() {
echo -e "${GREEN}[SUCCESS]${NC} $1"
}
warning() {
echo -e "${YELLOW}[WARNING]${NC} $1"
}
log "🔧 Quick health check fix..."
# Check if containers are running
if ! docker ps | grep -q portfolio-app; then
error "Portfolio app container is not running"
exit 1
fi
# The issue is likely that the health check is running from outside the container
# but the application is only accessible from inside the container network
log "🔍 Diagnosing the issue..."
# Check if the application is accessible from inside the container
if docker exec portfolio-app curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
success "✅ Application is healthy from inside container"
else
error "❌ Application not responding from inside container"
exit 1
fi
# Check if the application is accessible from outside the container
if curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
success "✅ Application is accessible from outside container"
log "The health check should work. The issue might be with the health check script itself."
else
warning "⚠️ Application not accessible from outside container"
log "This is the root cause of the health check failure."
# Check if the port is properly bound
if docker port portfolio-app 3000 > /dev/null 2>&1; then
log "Port 3000 is bound: $(docker port portfolio-app 3000)"
else
error "Port 3000 is not bound"
exit 1
fi
# Check if the application is listening on the correct interface
log "Checking what interface the application is listening on..."
docker exec portfolio-app netstat -tlnp | grep :3000 || {
error "Application is not listening on port 3000"
exit 1
}
# Check if there are any firewall rules blocking the connection
log "Checking for potential firewall issues..."
if command -v iptables > /dev/null 2>&1; then
if iptables -L | grep -q "DROP.*3000"; then
warning "Found iptables rules that might block port 3000"
fi
fi
# Try to restart the container to fix binding issues
log "Attempting to restart the portfolio container to fix binding issues..."
docker restart portfolio-app
sleep 15
# Test again
if curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
success "✅ Application is now accessible after restart"
else
error "❌ Application still not accessible after restart"
# Check if there's a reverse proxy running that might be interfering
if netstat -tlnp | grep -q ":80\|:443"; then
log "Found reverse proxy running - this might be the intended setup"
log "The application might be designed to run behind a reverse proxy"
success "✅ Application is running behind reverse proxy (this is normal)"
else
error "❌ No reverse proxy found and application not accessible"
# Show detailed debugging info
log "🔍 Debugging information:"
log "Container status:"
docker ps | grep portfolio
log "Port binding:"
docker port portfolio-app 3000 || echo "No port binding found"
log "Application logs (last 20 lines):"
docker logs portfolio-app --tail 20
log "Network interfaces:"
docker exec portfolio-app netstat -tlnp
log "Host network interfaces:"
netstat -tlnp | grep 3000 || echo "Port 3000 not found on host"
exit 1
fi
fi
fi
# Final verification
log "🔍 Final verification..."
if curl -f http://localhost:3000/api/health > /dev/null 2>&1; then
success "✅ Main page is accessible!"
log "Health check should now pass"
else
warning "⚠️ Main page still not accessible from outside"
log "This might be normal if you're running behind a reverse proxy"
log "The application is working correctly - the health check script needs to be updated"
fi
success "🎉 Health check fix completed!"
log "Application is running and healthy"
log "If you're still getting health check failures, the issue is with the health check script, not the application"