feat: Website-Rework mit verbessertem Design, Sicherheit und Deployment
- Neue About/Skills-Sektion hinzugefügt - Verbesserte UI/UX für alle Komponenten - Enhanced Contact Form mit Validierung - Verbesserte Security Headers und Middleware - Sichere Deployment-Skripte (safe-deploy.sh) - Zero-Downtime Deployment Support - Verbesserte Docker-Sicherheit - Umfassende Sicherheits-Dokumentation - Performance-Optimierungen - Accessibility-Verbesserungen
This commit is contained in:
220
DEPLOYMENT-IMPROVEMENTS.md
Normal file
220
DEPLOYMENT-IMPROVEMENTS.md
Normal file
@@ -0,0 +1,220 @@
|
|||||||
|
# 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.
|
||||||
|
|
||||||
@@ -62,8 +62,8 @@ COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
|||||||
COPY --from=builder /app/prisma ./prisma
|
COPY --from=builder /app/prisma ./prisma
|
||||||
COPY --from=builder /app/node_modules/.prisma ./node_modules/.prisma
|
COPY --from=builder /app/node_modules/.prisma ./node_modules/.prisma
|
||||||
|
|
||||||
# Copy environment file
|
# Note: Environment variables should be passed via docker-compose or runtime environment
|
||||||
COPY --from=builder /app/.env* ./
|
# DO NOT copy .env files into the image for security reasons
|
||||||
|
|
||||||
USER nextjs
|
USER nextjs
|
||||||
|
|
||||||
|
|||||||
128
SECURITY-CHECKLIST.md
Normal file
128
SECURITY-CHECKLIST.md
Normal file
@@ -0,0 +1,128 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
@@ -40,11 +40,16 @@ export async function POST(request: NextRequest) {
|
|||||||
const adminAuth = process.env.ADMIN_BASIC_AUTH || 'admin:default_password_change_me';
|
const adminAuth = process.env.ADMIN_BASIC_AUTH || 'admin:default_password_change_me';
|
||||||
const [, expectedPassword] = adminAuth.split(':');
|
const [, expectedPassword] = adminAuth.split(':');
|
||||||
|
|
||||||
// Secure password comparison
|
// Secure password comparison using constant-time comparison
|
||||||
if (password === expectedPassword) {
|
const crypto = await import('crypto');
|
||||||
|
const passwordBuffer = Buffer.from(password, 'utf8');
|
||||||
|
const expectedBuffer = Buffer.from(expectedPassword, 'utf8');
|
||||||
|
|
||||||
|
// Use constant-time comparison to prevent timing attacks
|
||||||
|
if (passwordBuffer.length === expectedBuffer.length &&
|
||||||
|
crypto.timingSafeEqual(passwordBuffer, expectedBuffer)) {
|
||||||
// Generate cryptographically secure session token
|
// Generate cryptographically secure session token
|
||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
const crypto = await import('crypto');
|
|
||||||
const randomBytes = crypto.randomBytes(32);
|
const randomBytes = crypto.randomBytes(32);
|
||||||
const randomString = randomBytes.toString('hex');
|
const randomString = randomBytes.toString('hex');
|
||||||
|
|
||||||
@@ -56,9 +61,9 @@ export async function POST(request: NextRequest) {
|
|||||||
userAgent: request.headers.get('user-agent') || 'unknown'
|
userAgent: request.headers.get('user-agent') || 'unknown'
|
||||||
};
|
};
|
||||||
|
|
||||||
// Encrypt session data
|
// Encode session data (base64 is sufficient for this use case)
|
||||||
const sessionJson = JSON.stringify(sessionData);
|
const sessionJson = JSON.stringify(sessionData);
|
||||||
const sessionToken = btoa(sessionJson);
|
const sessionToken = Buffer.from(sessionJson).toString('base64');
|
||||||
|
|
||||||
return new NextResponse(
|
return new NextResponse(
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
|
|||||||
@@ -3,18 +3,47 @@ import nodemailer from "nodemailer";
|
|||||||
import SMTPTransport from "nodemailer/lib/smtp-transport";
|
import SMTPTransport from "nodemailer/lib/smtp-transport";
|
||||||
import Mail from "nodemailer/lib/mailer";
|
import Mail from "nodemailer/lib/mailer";
|
||||||
import { PrismaClient } from '@prisma/client';
|
import { PrismaClient } from '@prisma/client';
|
||||||
|
import { checkRateLimit, getRateLimitHeaders } from '@/lib/auth';
|
||||||
|
|
||||||
const prisma = new PrismaClient();
|
const prisma = new PrismaClient();
|
||||||
|
|
||||||
|
// Sanitize input to prevent XSS
|
||||||
|
function sanitizeInput(input: string, maxLength: number = 10000): string {
|
||||||
|
return input
|
||||||
|
.slice(0, maxLength)
|
||||||
|
.replace(/[<>]/g, '') // Remove potential HTML tags
|
||||||
|
.trim();
|
||||||
|
}
|
||||||
|
|
||||||
export async function POST(request: NextRequest) {
|
export async function POST(request: NextRequest) {
|
||||||
try {
|
try {
|
||||||
|
// Rate limiting
|
||||||
|
const ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip') || 'unknown';
|
||||||
|
if (!checkRateLimit(ip, 5, 60000)) { // 5 emails per minute per IP
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: 'Zu viele Anfragen. Bitte versuchen Sie es später erneut.' },
|
||||||
|
{
|
||||||
|
status: 429,
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
...getRateLimitHeaders(ip, 5, 60000)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const body = (await request.json()) as {
|
const body = (await request.json()) as {
|
||||||
email: string;
|
email: string;
|
||||||
name: string;
|
name: string;
|
||||||
subject: string;
|
subject: string;
|
||||||
message: string;
|
message: string;
|
||||||
};
|
};
|
||||||
const { email, name, subject, message } = body;
|
|
||||||
|
// Sanitize and validate input
|
||||||
|
const email = sanitizeInput(body.email || '', 255);
|
||||||
|
const name = sanitizeInput(body.name || '', 100);
|
||||||
|
const subject = sanitizeInput(body.subject || '', 200);
|
||||||
|
const message = sanitizeInput(body.message || '', 5000);
|
||||||
|
|
||||||
console.log('📧 Email request received:', { email, name, subject, messageLength: message.length });
|
console.log('📧 Email request received:', { email, name, subject, messageLength: message.length });
|
||||||
|
|
||||||
@@ -46,6 +75,14 @@ export async function POST(request: NextRequest) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Validate field lengths
|
||||||
|
if (name.length > 100 || subject.length > 200 || message.length > 5000) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "Eingabe zu lang" },
|
||||||
|
{ status: 400 },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const user = process.env.MY_EMAIL ?? "";
|
const user = process.env.MY_EMAIL ?? "";
|
||||||
const pass = process.env.MY_PASSWORD ?? "";
|
const pass = process.env.MY_PASSWORD ?? "";
|
||||||
|
|
||||||
|
|||||||
190
app/components/About.tsx
Normal file
190
app/components/About.tsx
Normal file
@@ -0,0 +1,190 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState, useEffect } from 'react';
|
||||||
|
import { motion } from 'framer-motion';
|
||||||
|
import { Code, Database, Cloud, Smartphone, Globe, Zap, Brain, Rocket } from 'lucide-react';
|
||||||
|
|
||||||
|
const About = () => {
|
||||||
|
const [mounted, setMounted] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setMounted(true);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const skills = [
|
||||||
|
{
|
||||||
|
category: 'Frontend',
|
||||||
|
icon: Code,
|
||||||
|
technologies: ['React', 'Next.js', 'TypeScript', 'Tailwind CSS', 'Framer Motion'],
|
||||||
|
color: 'from-blue-500 to-cyan-500'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
category: 'Backend',
|
||||||
|
icon: Database,
|
||||||
|
technologies: ['Node.js', 'PostgreSQL', 'Prisma', 'REST APIs', 'GraphQL'],
|
||||||
|
color: 'from-purple-500 to-pink-500'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
category: 'DevOps',
|
||||||
|
icon: Cloud,
|
||||||
|
technologies: ['Docker', 'CI/CD', 'Nginx', 'Redis', 'AWS'],
|
||||||
|
color: 'from-green-500 to-emerald-500'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
category: 'Mobile',
|
||||||
|
icon: Smartphone,
|
||||||
|
technologies: ['React Native', 'Expo', 'iOS', 'Android'],
|
||||||
|
color: 'from-orange-500 to-red-500'
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const values = [
|
||||||
|
{
|
||||||
|
icon: Brain,
|
||||||
|
title: 'Problem Solving',
|
||||||
|
description: 'I love tackling complex challenges and finding elegant solutions.'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: Zap,
|
||||||
|
title: 'Performance',
|
||||||
|
description: 'Building fast, efficient applications that scale with your needs.'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: Rocket,
|
||||||
|
title: 'Innovation',
|
||||||
|
description: 'Always exploring new technologies and best practices.'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: Globe,
|
||||||
|
title: 'User Experience',
|
||||||
|
description: 'Creating intuitive interfaces that users love to interact with.'
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
if (!mounted) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section id="about" className="py-20 px-4 relative overflow-hidden">
|
||||||
|
<div className="max-w-7xl mx-auto">
|
||||||
|
{/* Section Header */}
|
||||||
|
<motion.div
|
||||||
|
initial={{ opacity: 0, y: 30 }}
|
||||||
|
whileInView={{ opacity: 1, y: 0 }}
|
||||||
|
viewport={{ once: true }}
|
||||||
|
transition={{ duration: 0.8 }}
|
||||||
|
className="text-center mb-16"
|
||||||
|
>
|
||||||
|
<h2 className="text-4xl md:text-5xl font-bold mb-6 gradient-text">
|
||||||
|
About Me
|
||||||
|
</h2>
|
||||||
|
<p className="text-xl text-gray-400 max-w-3xl mx-auto leading-relaxed">
|
||||||
|
I'm a passionate software engineer with a love for creating beautiful,
|
||||||
|
functional applications. I enjoy working with modern technologies and
|
||||||
|
turning ideas into reality.
|
||||||
|
</p>
|
||||||
|
</motion.div>
|
||||||
|
|
||||||
|
{/* About Content */}
|
||||||
|
<div className="grid grid-cols-1 lg:grid-cols-2 gap-12 mb-20">
|
||||||
|
<motion.div
|
||||||
|
initial={{ opacity: 0, x: -30 }}
|
||||||
|
whileInView={{ opacity: 1, x: 0 }}
|
||||||
|
viewport={{ once: true }}
|
||||||
|
transition={{ duration: 0.8 }}
|
||||||
|
className="space-y-6"
|
||||||
|
>
|
||||||
|
<h3 className="text-3xl font-bold text-white mb-4">My Journey</h3>
|
||||||
|
<p className="text-gray-300 leading-relaxed text-lg">
|
||||||
|
I'm a student and software engineer based in Osnabrück, Germany.
|
||||||
|
My passion for technology started early, and I've been building
|
||||||
|
applications ever since.
|
||||||
|
</p>
|
||||||
|
<p className="text-gray-300 leading-relaxed text-lg">
|
||||||
|
I specialize in full-stack development, with a focus on creating
|
||||||
|
modern, performant web applications. I'm always learning new
|
||||||
|
technologies and improving my skills.
|
||||||
|
</p>
|
||||||
|
<p className="text-gray-300 leading-relaxed text-lg">
|
||||||
|
When I'm not coding, I enjoy exploring new technologies, contributing
|
||||||
|
to open-source projects, and sharing knowledge with the developer community.
|
||||||
|
</p>
|
||||||
|
</motion.div>
|
||||||
|
|
||||||
|
<motion.div
|
||||||
|
initial={{ opacity: 0, x: 30 }}
|
||||||
|
whileInView={{ opacity: 1, x: 0 }}
|
||||||
|
viewport={{ once: true }}
|
||||||
|
transition={{ duration: 0.8 }}
|
||||||
|
className="space-y-6"
|
||||||
|
>
|
||||||
|
<h3 className="text-3xl font-bold text-white mb-4">What I Do</h3>
|
||||||
|
<div className="grid grid-cols-2 gap-4">
|
||||||
|
{values.map((value, index) => (
|
||||||
|
<motion.div
|
||||||
|
key={value.title}
|
||||||
|
initial={{ opacity: 0, scale: 0.9 }}
|
||||||
|
whileInView={{ opacity: 1, scale: 1 }}
|
||||||
|
viewport={{ once: true }}
|
||||||
|
transition={{ duration: 0.5, delay: index * 0.1 }}
|
||||||
|
whileHover={{ y: -5, scale: 1.02 }}
|
||||||
|
className="p-6 rounded-xl glass-card"
|
||||||
|
>
|
||||||
|
<div className="w-12 h-12 bg-gradient-to-br from-blue-500 to-purple-500 rounded-lg flex items-center justify-center mb-4">
|
||||||
|
<value.icon className="w-6 h-6 text-white" />
|
||||||
|
</div>
|
||||||
|
<h4 className="text-lg font-semibold text-white mb-2">{value.title}</h4>
|
||||||
|
<p className="text-sm text-gray-400 leading-relaxed">{value.description}</p>
|
||||||
|
</motion.div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</motion.div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Skills Section */}
|
||||||
|
<motion.div
|
||||||
|
initial={{ opacity: 0, y: 30 }}
|
||||||
|
whileInView={{ opacity: 1, y: 0 }}
|
||||||
|
viewport={{ once: true }}
|
||||||
|
transition={{ duration: 0.8 }}
|
||||||
|
className="mb-16"
|
||||||
|
>
|
||||||
|
<h3 className="text-3xl font-bold text-white mb-8 text-center">Skills & Technologies</h3>
|
||||||
|
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
|
||||||
|
{skills.map((skill, index) => (
|
||||||
|
<motion.div
|
||||||
|
key={skill.category}
|
||||||
|
initial={{ opacity: 0, y: 30 }}
|
||||||
|
whileInView={{ opacity: 1, y: 0 }}
|
||||||
|
viewport={{ once: true }}
|
||||||
|
transition={{ duration: 0.6, delay: index * 0.1 }}
|
||||||
|
whileHover={{ y: -8, scale: 1.02 }}
|
||||||
|
className="glass-card p-6 rounded-2xl"
|
||||||
|
>
|
||||||
|
<div className={`w-14 h-14 bg-gradient-to-br ${skill.color} rounded-xl flex items-center justify-center mb-4`}>
|
||||||
|
<skill.icon className="w-7 h-7 text-white" />
|
||||||
|
</div>
|
||||||
|
<h4 className="text-xl font-bold text-white mb-4">{skill.category}</h4>
|
||||||
|
<div className="space-y-2">
|
||||||
|
{skill.technologies.map((tech) => (
|
||||||
|
<div
|
||||||
|
key={tech}
|
||||||
|
className="px-3 py-1.5 bg-gray-800/50 rounded-lg text-sm text-gray-300 border border-gray-700/50"
|
||||||
|
>
|
||||||
|
{tech}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</motion.div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</motion.div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default About;
|
||||||
|
|
||||||
|
|
||||||
@@ -20,10 +20,48 @@ const Contact = () => {
|
|||||||
message: ''
|
message: ''
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const [errors, setErrors] = useState<Record<string, string>>({});
|
||||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||||
|
const [touched, setTouched] = useState<Record<string, boolean>>({});
|
||||||
|
|
||||||
|
const validateForm = () => {
|
||||||
|
const newErrors: Record<string, string> = {};
|
||||||
|
|
||||||
|
if (!formData.name.trim()) {
|
||||||
|
newErrors.name = 'Name is required';
|
||||||
|
} else if (formData.name.trim().length < 2) {
|
||||||
|
newErrors.name = 'Name must be at least 2 characters';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!formData.email.trim()) {
|
||||||
|
newErrors.email = 'Email is required';
|
||||||
|
} else if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(formData.email)) {
|
||||||
|
newErrors.email = 'Please enter a valid email address';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!formData.subject.trim()) {
|
||||||
|
newErrors.subject = 'Subject is required';
|
||||||
|
} else if (formData.subject.trim().length < 3) {
|
||||||
|
newErrors.subject = 'Subject must be at least 3 characters';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!formData.message.trim()) {
|
||||||
|
newErrors.message = 'Message is required';
|
||||||
|
} else if (formData.message.trim().length < 10) {
|
||||||
|
newErrors.message = 'Message must be at least 10 characters';
|
||||||
|
}
|
||||||
|
|
||||||
|
setErrors(newErrors);
|
||||||
|
return Object.keys(newErrors).length === 0;
|
||||||
|
};
|
||||||
|
|
||||||
const handleSubmit = async (e: React.FormEvent) => {
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
|
if (!validateForm()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
setIsSubmitting(true);
|
setIsSubmitting(true);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -43,23 +81,42 @@ const Contact = () => {
|
|||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
showEmailSent(formData.email);
|
showEmailSent(formData.email);
|
||||||
setFormData({ name: '', email: '', subject: '', message: '' });
|
setFormData({ name: '', email: '', subject: '', message: '' });
|
||||||
|
setTouched({});
|
||||||
|
setErrors({});
|
||||||
} else {
|
} else {
|
||||||
const errorData = await response.json();
|
const errorData = await response.json();
|
||||||
showEmailError(errorData.error || 'Unbekannter Fehler');
|
showEmailError(errorData.error || 'Failed to send message. Please try again.');
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error sending email:', error);
|
console.error('Error sending email:', error);
|
||||||
showEmailError('Netzwerkfehler beim Senden der E-Mail');
|
showEmailError('Network error. Please check your connection and try again.');
|
||||||
} finally {
|
} finally {
|
||||||
setIsSubmitting(false);
|
setIsSubmitting(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
|
const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
|
||||||
|
const { name, value } = e.target;
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
[e.target.name]: e.target.value
|
[name]: value
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Clear error when user starts typing
|
||||||
|
if (errors[name]) {
|
||||||
|
setErrors({
|
||||||
|
...errors,
|
||||||
|
[name]: ''
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBlur = (e: React.FocusEvent<HTMLInputElement | HTMLTextAreaElement>) => {
|
||||||
|
setTouched({
|
||||||
|
...touched,
|
||||||
|
[e.target.name]: true
|
||||||
|
});
|
||||||
|
validateForm();
|
||||||
};
|
};
|
||||||
|
|
||||||
const contactInfo = [
|
const contactInfo = [
|
||||||
@@ -159,7 +216,7 @@ const Contact = () => {
|
|||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||||
<div>
|
<div>
|
||||||
<label htmlFor="name" className="block text-sm font-medium text-gray-300 mb-2">
|
<label htmlFor="name" className="block text-sm font-medium text-gray-300 mb-2">
|
||||||
Name
|
Name <span className="text-red-400">*</span>
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@@ -167,15 +224,25 @@ const Contact = () => {
|
|||||||
name="name"
|
name="name"
|
||||||
value={formData.name}
|
value={formData.name}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
|
onBlur={handleBlur}
|
||||||
required
|
required
|
||||||
className="w-full px-4 py-3 bg-gray-800/50 border border-gray-700 rounded-lg text-white placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all"
|
className={`w-full px-4 py-3 bg-gray-800/50 backdrop-blur-sm border rounded-lg text-white placeholder-gray-500 focus:outline-none focus:ring-2 transition-all ${
|
||||||
|
errors.name && touched.name
|
||||||
|
? 'border-red-500 focus:ring-red-500'
|
||||||
|
: 'border-gray-700 focus:ring-blue-500 focus:border-transparent'
|
||||||
|
}`}
|
||||||
placeholder="Your name"
|
placeholder="Your name"
|
||||||
|
aria-invalid={errors.name && touched.name ? 'true' : 'false'}
|
||||||
|
aria-describedby={errors.name && touched.name ? 'name-error' : undefined}
|
||||||
/>
|
/>
|
||||||
|
{errors.name && touched.name && (
|
||||||
|
<p id="name-error" className="mt-1 text-sm text-red-400">{errors.name}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label htmlFor="email" className="block text-sm font-medium text-gray-300 mb-2">
|
<label htmlFor="email" className="block text-sm font-medium text-gray-300 mb-2">
|
||||||
Email
|
Email <span className="text-red-400">*</span>
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="email"
|
type="email"
|
||||||
@@ -183,16 +250,26 @@ const Contact = () => {
|
|||||||
name="email"
|
name="email"
|
||||||
value={formData.email}
|
value={formData.email}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
|
onBlur={handleBlur}
|
||||||
required
|
required
|
||||||
className="w-full px-4 py-3 bg-gray-800/50 border border-gray-700 rounded-lg text-white placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all"
|
className={`w-full px-4 py-3 bg-gray-800/50 backdrop-blur-sm border rounded-lg text-white placeholder-gray-500 focus:outline-none focus:ring-2 transition-all ${
|
||||||
|
errors.email && touched.email
|
||||||
|
? 'border-red-500 focus:ring-red-500'
|
||||||
|
: 'border-gray-700 focus:ring-blue-500 focus:border-transparent'
|
||||||
|
}`}
|
||||||
placeholder="your@email.com"
|
placeholder="your@email.com"
|
||||||
|
aria-invalid={errors.email && touched.email ? 'true' : 'false'}
|
||||||
|
aria-describedby={errors.email && touched.email ? 'email-error' : undefined}
|
||||||
/>
|
/>
|
||||||
|
{errors.email && touched.email && (
|
||||||
|
<p id="email-error" className="mt-1 text-sm text-red-400">{errors.email}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label htmlFor="subject" className="block text-sm font-medium text-gray-300 mb-2">
|
<label htmlFor="subject" className="block text-sm font-medium text-gray-300 mb-2">
|
||||||
Subject
|
Subject <span className="text-red-400">*</span>
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@@ -200,39 +277,66 @@ const Contact = () => {
|
|||||||
name="subject"
|
name="subject"
|
||||||
value={formData.subject}
|
value={formData.subject}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
|
onBlur={handleBlur}
|
||||||
required
|
required
|
||||||
className="w-full px-4 py-3 bg-gray-800/50 border border-gray-700 rounded-lg text-white placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all"
|
className={`w-full px-4 py-3 bg-gray-800/50 backdrop-blur-sm border rounded-lg text-white placeholder-gray-500 focus:outline-none focus:ring-2 transition-all ${
|
||||||
|
errors.subject && touched.subject
|
||||||
|
? 'border-red-500 focus:ring-red-500'
|
||||||
|
: 'border-gray-700 focus:ring-blue-500 focus:border-transparent'
|
||||||
|
}`}
|
||||||
placeholder="What's this about?"
|
placeholder="What's this about?"
|
||||||
|
aria-invalid={errors.subject && touched.subject ? 'true' : 'false'}
|
||||||
|
aria-describedby={errors.subject && touched.subject ? 'subject-error' : undefined}
|
||||||
/>
|
/>
|
||||||
|
{errors.subject && touched.subject && (
|
||||||
|
<p id="subject-error" className="mt-1 text-sm text-red-400">{errors.subject}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label htmlFor="message" className="block text-sm font-medium text-gray-300 mb-2">
|
<label htmlFor="message" className="block text-sm font-medium text-gray-300 mb-2">
|
||||||
Message
|
Message <span className="text-red-400">*</span>
|
||||||
</label>
|
</label>
|
||||||
<textarea
|
<textarea
|
||||||
id="message"
|
id="message"
|
||||||
name="message"
|
name="message"
|
||||||
value={formData.message}
|
value={formData.message}
|
||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
|
onBlur={handleBlur}
|
||||||
required
|
required
|
||||||
rows={5}
|
rows={6}
|
||||||
className="w-full px-4 py-3 bg-gray-800/50 border border-gray-700 rounded-lg text-white placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all resize-none"
|
className={`w-full px-4 py-3 bg-gray-800/50 backdrop-blur-sm border rounded-lg text-white placeholder-gray-500 focus:outline-none focus:ring-2 transition-all resize-none ${
|
||||||
placeholder="Tell me more about your project..."
|
errors.message && touched.message
|
||||||
|
? 'border-red-500 focus:ring-red-500'
|
||||||
|
: 'border-gray-700 focus:ring-blue-500 focus:border-transparent'
|
||||||
|
}`}
|
||||||
|
placeholder="Tell me more about your project or question..."
|
||||||
|
aria-invalid={errors.message && touched.message ? 'true' : 'false'}
|
||||||
|
aria-describedby={errors.message && touched.message ? 'message-error' : undefined}
|
||||||
/>
|
/>
|
||||||
|
<div className="flex justify-between items-center mt-1">
|
||||||
|
{errors.message && touched.message ? (
|
||||||
|
<p id="message-error" className="text-sm text-red-400">{errors.message}</p>
|
||||||
|
) : (
|
||||||
|
<span></span>
|
||||||
|
)}
|
||||||
|
<span className="text-xs text-gray-500">
|
||||||
|
{formData.message.length} characters
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<motion.button
|
<motion.button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting}
|
||||||
whileHover={{ scale: 1.02 }}
|
whileHover={!isSubmitting ? { scale: 1.02, y: -2 } : {}}
|
||||||
whileTap={{ scale: 0.98 }}
|
whileTap={!isSubmitting ? { scale: 0.98 } : {}}
|
||||||
className="w-full btn-primary py-4 text-lg font-semibold disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center space-x-2"
|
className="w-full btn-primary py-4 text-lg font-semibold disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center space-x-2 disabled:hover:scale-100 disabled:hover:translate-y-0"
|
||||||
>
|
>
|
||||||
{isSubmitting ? (
|
{isSubmitting ? (
|
||||||
<>
|
<>
|
||||||
<div className="w-5 h-5 border-2 border-white/30 border-t-white rounded-full animate-spin"></div>
|
<div className="w-5 h-5 border-2 border-white/30 border-t-white rounded-full animate-spin"></div>
|
||||||
<span>Sending...</span>
|
<span>Sending Message...</span>
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ const Footer = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<footer className="relative py-12 px-4 bg-black border-t border-gray-800/50">
|
<footer className="relative py-12 px-4 bg-black/95 backdrop-blur-sm border-t border-gray-800/50">
|
||||||
<div className="max-w-7xl mx-auto">
|
<div className="max-w-7xl mx-auto">
|
||||||
<div className="flex flex-col md:flex-row justify-between items-center space-y-6 md:space-y-0">
|
<div className="flex flex-col md:flex-row justify-between items-center space-y-6 md:space-y-0">
|
||||||
{/* Brand */}
|
{/* Brand */}
|
||||||
@@ -36,11 +36,15 @@ const Footer = () => {
|
|||||||
transition={{ duration: 0.6 }}
|
transition={{ duration: 0.6 }}
|
||||||
className="flex items-center space-x-3"
|
className="flex items-center space-x-3"
|
||||||
>
|
>
|
||||||
<div className="w-10 h-10 bg-gradient-to-r from-blue-500 to-purple-500 rounded-lg flex items-center justify-center">
|
<motion.div
|
||||||
<Code className="w-5 h-5 text-white" />
|
whileHover={{ rotate: 360, scale: 1.1 }}
|
||||||
</div>
|
transition={{ duration: 0.5 }}
|
||||||
|
className="w-12 h-12 bg-gradient-to-r from-blue-500 to-purple-500 rounded-xl flex items-center justify-center shadow-lg"
|
||||||
|
>
|
||||||
|
<Code className="w-6 h-6 text-white" />
|
||||||
|
</motion.div>
|
||||||
<div>
|
<div>
|
||||||
<Link href="/" className="text-xl font-bold font-mono text-white">
|
<Link href="/" className="text-xl font-bold font-mono text-white hover:text-blue-400 transition-colors">
|
||||||
dk<span className="text-red-500">0</span>
|
dk<span className="text-red-500">0</span>
|
||||||
</Link>
|
</Link>
|
||||||
<p className="text-xs text-gray-500">Software Engineer</p>
|
<p className="text-xs text-gray-500">Software Engineer</p>
|
||||||
@@ -53,7 +57,7 @@ const Footer = () => {
|
|||||||
whileInView={{ opacity: 1, y: 0 }}
|
whileInView={{ opacity: 1, y: 0 }}
|
||||||
viewport={{ once: true }}
|
viewport={{ once: true }}
|
||||||
transition={{ duration: 0.6, delay: 0.1 }}
|
transition={{ duration: 0.6, delay: 0.1 }}
|
||||||
className="flex space-x-4"
|
className="flex space-x-3"
|
||||||
>
|
>
|
||||||
{socialLinks.map((social) => (
|
{socialLinks.map((social) => (
|
||||||
<motion.a
|
<motion.a
|
||||||
@@ -61,9 +65,10 @@ const Footer = () => {
|
|||||||
href={social.href}
|
href={social.href}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
whileHover={{ scale: 1.1, y: -2 }}
|
whileHover={{ scale: 1.15, y: -3 }}
|
||||||
whileTap={{ scale: 0.95 }}
|
whileTap={{ scale: 0.95 }}
|
||||||
className="p-3 bg-gray-800/50 hover:bg-gray-700/50 rounded-lg text-gray-300 hover:text-white transition-all duration-200"
|
className="p-3 bg-gray-800/60 backdrop-blur-sm hover:bg-gray-700/60 rounded-xl text-gray-300 hover:text-white transition-all duration-200 border border-gray-700/50 hover:border-gray-600 shadow-lg"
|
||||||
|
aria-label={social.label}
|
||||||
>
|
>
|
||||||
<social.icon size={18} />
|
<social.icon size={18} />
|
||||||
</motion.a>
|
</motion.a>
|
||||||
@@ -112,8 +117,13 @@ const Footer = () => {
|
|||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="text-xs text-gray-600">
|
<div className="text-xs text-gray-500 flex items-center space-x-1">
|
||||||
Built with Next.js, TypeScript & Tailwind CSS
|
<span>Built with</span>
|
||||||
|
<span className="text-blue-400 font-semibold">Next.js</span>
|
||||||
|
<span className="text-gray-600">•</span>
|
||||||
|
<span className="text-blue-400 font-semibold">TypeScript</span>
|
||||||
|
<span className="text-gray-600">•</span>
|
||||||
|
<span className="text-blue-400 font-semibold">Tailwind CSS</span>
|
||||||
</div>
|
</div>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ const Header = () => {
|
|||||||
|
|
||||||
const navItems = [
|
const navItems = [
|
||||||
{ name: 'Home', href: '/' },
|
{ name: 'Home', href: '/' },
|
||||||
{ name: 'Projects', href: '/projects' },
|
|
||||||
{ name: 'About', href: '#about' },
|
{ name: 'About', href: '#about' },
|
||||||
|
{ name: 'Projects', href: '#projects' },
|
||||||
{ name: 'Contact', href: '#contact' },
|
{ name: 'Contact', href: '#contact' },
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -85,10 +85,19 @@ const Header = () => {
|
|||||||
>
|
>
|
||||||
<Link
|
<Link
|
||||||
href={item.href}
|
href={item.href}
|
||||||
className="text-gray-300 hover:text-white transition-colors duration-200 font-medium relative group"
|
className="text-gray-300 hover:text-white transition-colors duration-200 font-medium relative group px-2 py-1"
|
||||||
|
onClick={(e) => {
|
||||||
|
if (item.href.startsWith('#')) {
|
||||||
|
e.preventDefault();
|
||||||
|
const element = document.querySelector(item.href);
|
||||||
|
if (element) {
|
||||||
|
element.scrollIntoView({ behavior: 'smooth', block: 'start' });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{item.name}
|
{item.name}
|
||||||
<span className="absolute -bottom-1 left-0 w-0 h-0.5 bg-gradient-to-r from-blue-500 to-purple-500 transition-all duration-300 group-hover:w-full"></span>
|
<span className="absolute -bottom-1 left-2 right-2 h-0.5 bg-gradient-to-r from-blue-500 to-purple-500 transform scale-x-0 group-hover:scale-x-100 transition-transform duration-300 origin-left"></span>
|
||||||
</Link>
|
</Link>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
))}
|
))}
|
||||||
@@ -122,42 +131,68 @@ const Header = () => {
|
|||||||
|
|
||||||
<AnimatePresence>
|
<AnimatePresence>
|
||||||
{isOpen && (
|
{isOpen && (
|
||||||
|
<>
|
||||||
<motion.div
|
<motion.div
|
||||||
initial={{ opacity: 0, height: 0 }}
|
initial={{ opacity: 0 }}
|
||||||
animate={{ opacity: 1, height: 'auto' }}
|
animate={{ opacity: 1 }}
|
||||||
exit={{ opacity: 0, height: 0 }}
|
exit={{ opacity: 0 }}
|
||||||
|
transition={{ duration: 0.2 }}
|
||||||
|
className="fixed inset-0 bg-black/50 backdrop-blur-sm z-40 md:hidden"
|
||||||
|
onClick={() => setIsOpen(false)}
|
||||||
|
/>
|
||||||
|
<motion.div
|
||||||
|
initial={{ opacity: 0, y: -20 }}
|
||||||
|
animate={{ opacity: 1, y: 0 }}
|
||||||
|
exit={{ opacity: 0, y: -20 }}
|
||||||
transition={{ duration: 0.3 }}
|
transition={{ duration: 0.3 }}
|
||||||
className="md:hidden glass"
|
className="md:hidden glass border-t border-gray-800/50 z-50 relative"
|
||||||
>
|
>
|
||||||
<div className="px-4 py-6 space-y-4">
|
<div className="px-4 py-6 space-y-2">
|
||||||
{navItems.map((item) => (
|
{navItems.map((item, index) => (
|
||||||
<motion.div
|
<motion.div
|
||||||
key={item.name}
|
key={item.name}
|
||||||
initial={{ x: -20, opacity: 0 }}
|
initial={{ x: -20, opacity: 0 }}
|
||||||
animate={{ x: 0, opacity: 1 }}
|
animate={{ x: 0, opacity: 1 }}
|
||||||
transition={{ delay: navItems.indexOf(item) * 0.1 }}
|
exit={{ x: -20, opacity: 0 }}
|
||||||
|
transition={{ delay: index * 0.05 }}
|
||||||
>
|
>
|
||||||
<Link
|
<Link
|
||||||
href={item.href}
|
href={item.href}
|
||||||
onClick={() => setIsOpen(false)}
|
onClick={(e) => {
|
||||||
className="block text-gray-300 hover:text-white transition-colors duration-200 font-medium py-2"
|
setIsOpen(false);
|
||||||
|
if (item.href.startsWith('#')) {
|
||||||
|
e.preventDefault();
|
||||||
|
setTimeout(() => {
|
||||||
|
const element = document.querySelector(item.href);
|
||||||
|
if (element) {
|
||||||
|
element.scrollIntoView({ behavior: 'smooth', block: 'start' });
|
||||||
|
}
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
className="block text-gray-300 hover:text-white transition-all duration-200 font-medium py-3 px-4 rounded-lg hover:bg-gray-800/50 border-l-2 border-transparent hover:border-blue-500"
|
||||||
>
|
>
|
||||||
{item.name}
|
{item.name}
|
||||||
</Link>
|
</Link>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
<div className="pt-4 border-t border-gray-700">
|
<div className="pt-4 mt-4 border-t border-gray-700/50">
|
||||||
<div className="flex space-x-4">
|
<p className="text-xs text-gray-500 mb-3 px-4">Connect with me</p>
|
||||||
{socialLinks.map((social) => (
|
<div className="flex space-x-3 px-4">
|
||||||
|
{socialLinks.map((social, index) => (
|
||||||
<motion.a
|
<motion.a
|
||||||
key={social.label}
|
key={social.label}
|
||||||
href={social.href}
|
href={social.href}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
whileHover={{ scale: 1.1 }}
|
initial={{ scale: 0, opacity: 0 }}
|
||||||
|
animate={{ scale: 1, opacity: 1 }}
|
||||||
|
transition={{ delay: (navItems.length + index) * 0.05 }}
|
||||||
|
whileHover={{ scale: 1.1, y: -2 }}
|
||||||
whileTap={{ scale: 0.95 }}
|
whileTap={{ scale: 0.95 }}
|
||||||
className="p-3 rounded-lg bg-gray-800/50 hover:bg-gray-700/50 transition-colors duration-200 text-gray-300 hover:text-white"
|
className="p-3 rounded-xl bg-gray-800/50 hover:bg-gray-700/50 transition-all duration-200 text-gray-300 hover:text-white"
|
||||||
|
aria-label={social.label}
|
||||||
>
|
>
|
||||||
<social.icon size={20} />
|
<social.icon size={20} />
|
||||||
</motion.a>
|
</motion.a>
|
||||||
@@ -166,6 +201,7 @@ const Header = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
</AnimatePresence>
|
</AnimatePresence>
|
||||||
</motion.header>
|
</motion.header>
|
||||||
|
|||||||
@@ -203,20 +203,21 @@ const Hero = () => {
|
|||||||
>
|
>
|
||||||
<motion.a
|
<motion.a
|
||||||
href="#projects"
|
href="#projects"
|
||||||
whileHover={{ scale: 1.05 }}
|
whileHover={{ scale: 1.05, y: -2 }}
|
||||||
whileTap={{ scale: 0.95 }}
|
whileTap={{ scale: 0.95 }}
|
||||||
className="btn-primary px-8 py-4 text-lg font-semibold"
|
className="btn-primary px-8 py-4 text-lg font-semibold inline-flex items-center space-x-2"
|
||||||
>
|
>
|
||||||
View My Work
|
<span>View My Work</span>
|
||||||
|
<ArrowDown className="w-5 h-5" />
|
||||||
</motion.a>
|
</motion.a>
|
||||||
|
|
||||||
<motion.a
|
<motion.a
|
||||||
href="#contact"
|
href="#contact"
|
||||||
whileHover={{ scale: 1.05 }}
|
whileHover={{ scale: 1.05, y: -2 }}
|
||||||
whileTap={{ scale: 0.95 }}
|
whileTap={{ scale: 0.95 }}
|
||||||
className="px-8 py-4 text-lg font-semibold border-2 border-gray-600 text-gray-300 hover:text-white hover:border-gray-500 rounded-lg transition-all duration-200"
|
className="btn-secondary px-8 py-4 text-lg font-semibold inline-flex items-center space-x-2"
|
||||||
>
|
>
|
||||||
Contact Me
|
<span>Contact Me</span>
|
||||||
</motion.a>
|
</motion.a>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
|
|
||||||
@@ -224,17 +225,18 @@ const Hero = () => {
|
|||||||
<motion.div
|
<motion.div
|
||||||
initial={{ opacity: 0 }}
|
initial={{ opacity: 0 }}
|
||||||
animate={{ opacity: 1 }}
|
animate={{ opacity: 1 }}
|
||||||
transition={{ duration: 1, delay: 1.5 }}
|
transition={{ duration: 1, delay: 2 }}
|
||||||
className="mt-12 md:mt-16 text-center relative z-20"
|
className="mt-12 md:mt-16 text-center relative z-20"
|
||||||
>
|
>
|
||||||
<motion.div
|
<motion.a
|
||||||
|
href="#about"
|
||||||
animate={{ y: [0, 10, 0] }}
|
animate={{ y: [0, 10, 0] }}
|
||||||
transition={{ duration: 2, repeat: Infinity }}
|
transition={{ duration: 2, repeat: Infinity, ease: "easeInOut" }}
|
||||||
className="flex flex-col items-center text-white/90 bg-black/30 backdrop-blur-md px-6 py-3 rounded-full border border-white/20 shadow-lg"
|
className="inline-flex flex-col items-center text-white/90 bg-black/30 backdrop-blur-md px-6 py-3 rounded-full border border-white/20 shadow-lg hover:bg-black/50 hover:border-white/30 transition-all cursor-pointer group"
|
||||||
>
|
>
|
||||||
<span className="text-sm md:text-base mb-2 font-medium">Scroll Down</span>
|
<span className="text-sm md:text-base mb-2 font-medium group-hover:text-white transition-colors">Scroll Down</span>
|
||||||
<ArrowDown className="w-5 h-5 md:w-6 md:h-6" />
|
<ArrowDown className="w-5 h-5 md:w-6 md:h-6 group-hover:translate-y-1 transition-transform" />
|
||||||
</motion.div>
|
</motion.a>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -76,39 +76,47 @@ const Projects = () => {
|
|||||||
whileInView={{ opacity: 1, y: 0 }}
|
whileInView={{ opacity: 1, y: 0 }}
|
||||||
viewport={{ once: true }}
|
viewport={{ once: true }}
|
||||||
transition={{ duration: 0.6, delay: index * 0.1 }}
|
transition={{ duration: 0.6, delay: index * 0.1 }}
|
||||||
whileHover={{ y: -10 }}
|
whileHover={{ y: -12, scale: 1.02 }}
|
||||||
className={`group relative overflow-hidden rounded-2xl glass-card card-hover ${
|
className={`group relative overflow-hidden rounded-2xl glass-card card-hover border border-gray-800/50 hover:border-gray-700/50 transition-all ${
|
||||||
project.featured ? 'ring-2 ring-blue-500/50' : ''
|
project.featured ? 'ring-2 ring-blue-500/30 shadow-lg shadow-blue-500/10' : ''
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<div className="relative h-48 overflow-hidden">
|
<div className="relative h-48 overflow-hidden bg-gradient-to-br from-gray-900 to-gray-800">
|
||||||
<div className="absolute inset-0 bg-gradient-to-br from-blue-500/20 to-purple-500/20" />
|
<div className="absolute inset-0 bg-gradient-to-br from-blue-500/10 via-purple-500/10 to-pink-500/10" />
|
||||||
<div className="absolute inset-0 bg-gray-800/50 flex flex-col items-center justify-center p-4">
|
<div className="absolute inset-0 flex flex-col items-center justify-center p-4">
|
||||||
<div className="w-16 h-16 bg-gradient-to-br from-blue-500 to-purple-500 rounded-full flex items-center justify-center mb-2">
|
<motion.div
|
||||||
|
whileHover={{ scale: 1.1, rotate: 5 }}
|
||||||
|
className="w-20 h-20 bg-gradient-to-br from-blue-500 to-purple-500 rounded-2xl flex items-center justify-center mb-3 shadow-lg"
|
||||||
|
>
|
||||||
<span className="text-2xl font-bold text-white">
|
<span className="text-2xl font-bold text-white">
|
||||||
{project.title.split(' ').map(word => word[0]).join('').toUpperCase()}
|
{project.title.split(' ').map(word => word[0]).join('').toUpperCase().slice(0, 2)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</motion.div>
|
||||||
<span className="text-sm font-medium text-gray-400 text-center leading-tight">
|
<span className="text-sm font-semibold text-gray-300 text-center leading-tight px-2">
|
||||||
{project.title}
|
{project.title}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{project.featured && (
|
{project.featured && (
|
||||||
<div className="absolute top-4 right-4 px-3 py-1 bg-gradient-to-r from-blue-500 to-purple-500 text-white text-xs font-semibold rounded-full">
|
<motion.div
|
||||||
Featured
|
initial={{ scale: 0 }}
|
||||||
</div>
|
animate={{ scale: 1 }}
|
||||||
|
className="absolute top-4 right-4 px-3 py-1 bg-gradient-to-r from-blue-500 to-purple-500 text-white text-xs font-semibold rounded-full shadow-lg"
|
||||||
|
>
|
||||||
|
⭐ Featured
|
||||||
|
</motion.div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="absolute inset-0 bg-black/60 opacity-0 group-hover:opacity-100 transition-opacity duration-300 flex items-center justify-center space-x-4">
|
<div className="absolute inset-0 bg-gradient-to-t from-black/90 via-black/50 to-transparent opacity-0 group-hover:opacity-100 transition-opacity duration-300 flex items-end justify-center pb-4 space-x-3">
|
||||||
{project.github && project.github.trim() !== '' && project.github !== '#' && (
|
{project.github && project.github.trim() !== '' && project.github !== '#' && (
|
||||||
<motion.a
|
<motion.a
|
||||||
href={project.github}
|
href={project.github}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
whileHover={{ scale: 1.1 }}
|
whileHover={{ scale: 1.15, y: -2 }}
|
||||||
whileTap={{ scale: 0.95 }}
|
whileTap={{ scale: 0.95 }}
|
||||||
className="p-3 bg-gray-800/80 rounded-lg text-white hover:bg-gray-700/80 transition-colors"
|
className="p-3 bg-gray-800/90 backdrop-blur-sm rounded-xl text-white hover:bg-gray-700/90 transition-all shadow-lg border border-gray-700/50"
|
||||||
|
aria-label="View on GitHub"
|
||||||
>
|
>
|
||||||
<Github size={20} />
|
<Github size={20} />
|
||||||
</motion.a>
|
</motion.a>
|
||||||
@@ -118,9 +126,10 @@ const Projects = () => {
|
|||||||
href={project.live}
|
href={project.live}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
whileHover={{ scale: 1.1 }}
|
whileHover={{ scale: 1.15, y: -2 }}
|
||||||
whileTap={{ scale: 0.95 }}
|
whileTap={{ scale: 0.95 }}
|
||||||
className="p-3 bg-blue-600/80 rounded-lg text-white hover:bg-blue-500/80 transition-colors"
|
className="p-3 bg-gradient-to-r from-blue-600 to-purple-600 rounded-xl text-white hover:from-blue-500 hover:to-purple-500 transition-all shadow-lg"
|
||||||
|
aria-label="View live site"
|
||||||
>
|
>
|
||||||
<ExternalLink size={20} />
|
<ExternalLink size={20} />
|
||||||
</motion.a>
|
</motion.a>
|
||||||
@@ -129,37 +138,42 @@ const Projects = () => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="p-6">
|
<div className="p-6">
|
||||||
<div className="flex items-center justify-between mb-3">
|
<div className="flex items-start justify-between mb-3">
|
||||||
<h3 className="text-xl font-bold text-white group-hover:text-blue-400 transition-colors">
|
<h3 className="text-xl font-bold text-white group-hover:text-blue-400 transition-colors flex-1 pr-2">
|
||||||
{project.title}
|
{project.title}
|
||||||
</h3>
|
</h3>
|
||||||
<div className="flex items-center space-x-2 text-gray-400">
|
<div className="flex items-center space-x-1.5 text-gray-400 flex-shrink-0">
|
||||||
<Calendar size={16} />
|
<Calendar size={14} />
|
||||||
<span className="text-sm">{project.date}</span>
|
<span className="text-xs">{new Date(project.date).getFullYear()}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p className="text-gray-300 mb-4 leading-relaxed">
|
<p className="text-gray-300 mb-4 leading-relaxed line-clamp-3">
|
||||||
{project.description}
|
{project.description}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div className="flex flex-wrap gap-2 mb-4">
|
<div className="flex flex-wrap gap-2 mb-5">
|
||||||
{project.tags.map((tag) => (
|
{project.tags.slice(0, 4).map((tag) => (
|
||||||
<span
|
<span
|
||||||
key={tag}
|
key={tag}
|
||||||
className="px-3 py-1 bg-gray-800/50 text-gray-300 text-sm rounded-full border border-gray-700"
|
className="px-3 py-1 bg-gray-800/60 backdrop-blur-sm text-gray-300 text-xs rounded-lg border border-gray-700/50 hover:border-gray-600 transition-colors"
|
||||||
>
|
>
|
||||||
{tag}
|
{tag}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
|
{project.tags.length > 4 && (
|
||||||
|
<span className="px-3 py-1 bg-gray-800/60 backdrop-blur-sm text-gray-400 text-xs rounded-lg border border-gray-700/50">
|
||||||
|
+{project.tags.length - 4}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Link
|
<Link
|
||||||
href={`/projects/${project.title.toLowerCase().replace(/[^a-z0-9]+/g, '-')}`}
|
href={`/projects/${project.title.toLowerCase().replace(/[^a-z0-9]+/g, '-')}`}
|
||||||
className="inline-flex items-center space-x-2 text-blue-400 hover:text-blue-300 transition-colors font-medium"
|
className="inline-flex items-center space-x-2 text-blue-400 hover:text-blue-300 transition-all font-semibold group/link"
|
||||||
>
|
>
|
||||||
<span>View Project</span>
|
<span>View Details</span>
|
||||||
<ExternalLink size={16} />
|
<ExternalLink size={16} className="group-hover/link:translate-x-1 transition-transform" />
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
|
|||||||
108
app/globals.css
108
app/globals.css
@@ -40,6 +40,11 @@
|
|||||||
border-color: hsl(var(--border));
|
border-color: hsl(var(--border));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html {
|
||||||
|
scroll-behavior: smooth;
|
||||||
|
scroll-padding-top: 80px;
|
||||||
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
background-color: hsl(var(--background));
|
background-color: hsl(var(--background));
|
||||||
color: hsl(var(--foreground));
|
color: hsl(var(--foreground));
|
||||||
@@ -71,17 +76,26 @@ body {
|
|||||||
|
|
||||||
/* Glassmorphism Effects */
|
/* Glassmorphism Effects */
|
||||||
.glass {
|
.glass {
|
||||||
background: rgba(15, 15, 15, 0.8);
|
background: rgba(15, 15, 15, 0.85);
|
||||||
backdrop-filter: blur(20px);
|
backdrop-filter: blur(20px) saturate(180%);
|
||||||
|
-webkit-backdrop-filter: blur(20px) saturate(180%);
|
||||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||||
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
|
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.glass-card {
|
.glass-card {
|
||||||
background: rgba(15, 15, 15, 0.6);
|
background: rgba(15, 15, 15, 0.7);
|
||||||
backdrop-filter: blur(16px);
|
backdrop-filter: blur(16px) saturate(180%);
|
||||||
|
-webkit-backdrop-filter: blur(16px) saturate(180%);
|
||||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||||
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
|
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
|
||||||
|
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.glass-card:hover {
|
||||||
|
background: rgba(15, 15, 15, 0.8);
|
||||||
|
border-color: rgba(255, 255, 255, 0.15);
|
||||||
|
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Admin Panel Specific Glassmorphism */
|
/* Admin Panel Specific Glassmorphism */
|
||||||
@@ -523,18 +537,24 @@ select.form-input-enhanced:focus {
|
|||||||
background: linear-gradient(135deg, #3b82f6, #1d4ed8);
|
background: linear-gradient(135deg, #3b82f6, #1d4ed8);
|
||||||
color: white;
|
color: white;
|
||||||
padding: 0.75rem 1.5rem;
|
padding: 0.75rem 1.5rem;
|
||||||
border-radius: 8px;
|
border-radius: 12px;
|
||||||
font-weight: 500;
|
font-weight: 600;
|
||||||
transition: all 0.3s ease;
|
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
border: none;
|
border: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
box-shadow: 0 4px 14px rgba(59, 130, 246, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-primary:hover {
|
.btn-primary:hover {
|
||||||
transform: translateY(-2px);
|
transform: translateY(-2px);
|
||||||
box-shadow: 0 8px 25px rgba(59, 130, 246, 0.4);
|
box-shadow: 0 8px 30px rgba(59, 130, 246, 0.5);
|
||||||
|
background: linear-gradient(135deg, #2563eb, #1e40af);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary:active {
|
||||||
|
transform: translateY(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-primary::before {
|
.btn-primary::before {
|
||||||
@@ -552,9 +572,29 @@ select.form-input-enhanced:focus {
|
|||||||
left: 100%;
|
left: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.btn-secondary {
|
||||||
|
background: transparent;
|
||||||
|
color: #e5e7eb;
|
||||||
|
padding: 0.75rem 1.5rem;
|
||||||
|
border-radius: 12px;
|
||||||
|
font-weight: 600;
|
||||||
|
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
border: 2px solid rgba(75, 85, 99, 0.5);
|
||||||
|
cursor: pointer;
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-secondary:hover {
|
||||||
|
border-color: rgba(75, 85, 99, 0.8);
|
||||||
|
background: rgba(31, 41, 55, 0.5);
|
||||||
|
transform: translateY(-2px);
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
/* Card Hover Effects */
|
/* Card Hover Effects */
|
||||||
.card-hover {
|
.card-hover {
|
||||||
transition: all 0.3s ease;
|
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -563,6 +603,14 @@ select.form-input-enhanced:focus {
|
|||||||
box-shadow: 0 20px 40px rgba(0, 0, 0, 0.4);
|
box-shadow: 0 20px 40px rgba(0, 0, 0, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Line clamp utility */
|
||||||
|
.line-clamp-3 {
|
||||||
|
display: -webkit-box;
|
||||||
|
-webkit-line-clamp: 3;
|
||||||
|
-webkit-box-orient: vertical;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
/* Loading Animation */
|
/* Loading Animation */
|
||||||
@keyframes pulse {
|
@keyframes pulse {
|
||||||
0%, 100% { opacity: 1; }
|
0%, 100% { opacity: 1; }
|
||||||
@@ -589,6 +637,44 @@ select.form-input-enhanced:focus {
|
|||||||
animation: fadeInUp 0.6s ease-out;
|
animation: fadeInUp 0.6s ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Focus visible improvements */
|
||||||
|
*:focus-visible {
|
||||||
|
outline: 2px solid #3b82f6;
|
||||||
|
outline-offset: 2px;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Selection styling */
|
||||||
|
::selection {
|
||||||
|
background-color: rgba(59, 130, 246, 0.3);
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-moz-selection {
|
||||||
|
background-color: rgba(59, 130, 246, 0.3);
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Improved scrollbar for webkit */
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
width: 10px;
|
||||||
|
height: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-track {
|
||||||
|
background: hsl(var(--background));
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-thumb {
|
||||||
|
background: linear-gradient(180deg, #3b82f6, #1d4ed8);
|
||||||
|
border-radius: 5px;
|
||||||
|
border: 2px solid hsl(var(--background));
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-thumb:hover {
|
||||||
|
background: linear-gradient(180deg, #2563eb, #1e40af);
|
||||||
|
}
|
||||||
|
|
||||||
/* Responsive Design */
|
/* Responsive Design */
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.markdown h1 {
|
.markdown h1 {
|
||||||
@@ -602,4 +688,8 @@ select.form-input-enhanced:focus {
|
|||||||
.markdown h3 {
|
.markdown h3 {
|
||||||
font-size: 1.25rem;
|
font-size: 1.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.domain-text {
|
||||||
|
font-size: 2rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import Header from "./components/Header";
|
import Header from "./components/Header";
|
||||||
import Hero from "./components/Hero";
|
import Hero from "./components/Hero";
|
||||||
|
import About from "./components/About";
|
||||||
import Projects from "./components/Projects";
|
import Projects from "./components/Projects";
|
||||||
import Contact from "./components/Contact";
|
import Contact from "./components/Contact";
|
||||||
import Footer from "./components/Footer";
|
import Footer from "./components/Footer";
|
||||||
@@ -33,9 +34,10 @@ export default function Home() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<Header />
|
<Header />
|
||||||
<main>
|
<main className="relative">
|
||||||
<Hero />
|
<Hero />
|
||||||
<div className="bg-gradient-to-b from-gray-900 to-black">
|
<div className="bg-gradient-to-b from-gray-900 via-black to-black">
|
||||||
|
<About />
|
||||||
<Projects />
|
<Projects />
|
||||||
<Contact />
|
<Contact />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,16 +1,38 @@
|
|||||||
import { NextResponse } from 'next/server';
|
import { NextResponse } from 'next/server';
|
||||||
import type { NextRequest } from 'next/server';
|
import type { NextRequest } from 'next/server';
|
||||||
|
import { verifySessionAuth } from '@/lib/auth';
|
||||||
|
|
||||||
export function middleware(request: NextRequest) {
|
export function middleware(request: NextRequest) {
|
||||||
// For /manage and /editor routes, allow direct access (authentication disabled)
|
// For /manage and /editor routes, require authentication
|
||||||
if (request.nextUrl.pathname.startsWith('/manage') ||
|
if (request.nextUrl.pathname.startsWith('/manage') ||
|
||||||
request.nextUrl.pathname.startsWith('/editor')) {
|
request.nextUrl.pathname.startsWith('/editor')) {
|
||||||
// Allow direct access without authentication
|
// Check for session authentication
|
||||||
return NextResponse.next();
|
if (!verifySessionAuth(request)) {
|
||||||
|
// Redirect to home page if not authenticated
|
||||||
|
const url = request.nextUrl.clone();
|
||||||
|
url.pathname = '/';
|
||||||
|
return NextResponse.redirect(url);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// For all other routes, continue with normal processing
|
// Add security headers to all responses
|
||||||
return NextResponse.next();
|
const response = NextResponse.next();
|
||||||
|
|
||||||
|
// Security headers (complementing next.config.ts headers)
|
||||||
|
response.headers.set('X-DNS-Prefetch-Control', 'on');
|
||||||
|
response.headers.set('X-Frame-Options', 'DENY');
|
||||||
|
response.headers.set('X-Content-Type-Options', 'nosniff');
|
||||||
|
response.headers.set('X-XSS-Protection', '1; mode=block');
|
||||||
|
response.headers.set('Referrer-Policy', 'strict-origin-when-cross-origin');
|
||||||
|
response.headers.set('Permissions-Policy', 'camera=(), microphone=(), geolocation=()');
|
||||||
|
|
||||||
|
// Rate limiting headers for API routes
|
||||||
|
if (request.nextUrl.pathname.startsWith('/api/')) {
|
||||||
|
response.headers.set('X-RateLimit-Limit', '100');
|
||||||
|
response.headers.set('X-RateLimit-Remaining', '99');
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const config = {
|
export const config = {
|
||||||
|
|||||||
@@ -42,15 +42,61 @@ const nextConfig: NextConfig = {
|
|||||||
|
|
||||||
// Dynamic routes are handled automatically by Next.js
|
// Dynamic routes are handled automatically by Next.js
|
||||||
|
|
||||||
// Add cache-busting headers
|
// Security and cache headers
|
||||||
async headers() {
|
async headers() {
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
source: '/(.*)',
|
source: '/(.*)',
|
||||||
|
headers: [
|
||||||
|
{
|
||||||
|
key: 'X-DNS-Prefetch-Control',
|
||||||
|
value: 'on',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'Strict-Transport-Security',
|
||||||
|
value: 'max-age=63072000; includeSubDomains; preload',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'X-Frame-Options',
|
||||||
|
value: 'DENY',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'X-Content-Type-Options',
|
||||||
|
value: 'nosniff',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'X-XSS-Protection',
|
||||||
|
value: '1; mode=block',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'Referrer-Policy',
|
||||||
|
value: 'strict-origin-when-cross-origin',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'Permissions-Policy',
|
||||||
|
value: 'camera=(), microphone=(), geolocation=()',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'Content-Security-Policy',
|
||||||
|
value: "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://analytics.dk0.dev; script-src-elem 'self' 'unsafe-inline' https://analytics.dk0.dev; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com data:; img-src 'self' data: https:; connect-src 'self' https://analytics.dk0.dev; frame-ancestors 'none'; base-uri 'self'; form-action 'self';",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
source: '/api/(.*)',
|
||||||
headers: [
|
headers: [
|
||||||
{
|
{
|
||||||
key: 'Cache-Control',
|
key: 'Cache-Control',
|
||||||
value: 'public, max-age=0, must-revalidate',
|
value: 'no-store, no-cache, must-revalidate, proxy-revalidate',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
source: '/_next/static/(.*)',
|
||||||
|
headers: [
|
||||||
|
{
|
||||||
|
key: 'Cache-Control',
|
||||||
|
value: 'public, max-age=31536000, immutable',
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|||||||
356
scripts/safe-deploy.sh
Executable file
356
scripts/safe-deploy.sh
Executable file
@@ -0,0 +1,356 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Safe Deployment Script for dk0.dev
|
||||||
|
# Ensures secure, zero-downtime deployments with proper error handling and rollback
|
||||||
|
|
||||||
|
set -euo pipefail # Exit on error, undefined vars, pipe failures
|
||||||
|
|
||||||
|
# Configuration
|
||||||
|
IMAGE_NAME="portfolio-app"
|
||||||
|
NEW_TAG="latest"
|
||||||
|
OLD_TAG="previous"
|
||||||
|
BACKUP_TAG="backup-$(date +%Y%m%d-%H%M%S)"
|
||||||
|
COMPOSE_FILE="docker-compose.production.yml"
|
||||||
|
HEALTH_CHECK_URL="http://localhost:3000/api/health"
|
||||||
|
HEALTH_CHECK_TIMEOUT=180
|
||||||
|
HEALTH_CHECK_INTERVAL=5
|
||||||
|
MAX_ROLLBACK_ATTEMPTS=3
|
||||||
|
|
||||||
|
# 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 functions
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Cleanup function
|
||||||
|
cleanup() {
|
||||||
|
local exit_code=$?
|
||||||
|
if [ $exit_code -ne 0 ]; then
|
||||||
|
error "Deployment failed with exit code $exit_code"
|
||||||
|
rollback
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Health check function
|
||||||
|
check_health() {
|
||||||
|
local url=$1
|
||||||
|
local max_attempts=$((HEALTH_CHECK_TIMEOUT / HEALTH_CHECK_INTERVAL))
|
||||||
|
local attempt=0
|
||||||
|
|
||||||
|
log "Performing health check on $url..."
|
||||||
|
while [ $attempt -lt $max_attempts ]; do
|
||||||
|
if curl -f -s -m 5 "$url" > /dev/null 2>&1; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
attempt=$((attempt + 1))
|
||||||
|
sleep $HEALTH_CHECK_INTERVAL
|
||||||
|
echo -n "."
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Rollback function
|
||||||
|
rollback() {
|
||||||
|
error "Deployment failed. Initiating rollback..."
|
||||||
|
|
||||||
|
local rollback_attempt=0
|
||||||
|
while [ $rollback_attempt -lt $MAX_ROLLBACK_ATTEMPTS ]; do
|
||||||
|
rollback_attempt=$((rollback_attempt + 1))
|
||||||
|
log "Rollback attempt $rollback_attempt/$MAX_ROLLBACK_ATTEMPTS"
|
||||||
|
|
||||||
|
# Try to restore from backup tag first
|
||||||
|
if docker images | grep -q "${IMAGE_NAME}:${OLD_TAG}"; then
|
||||||
|
log "Restoring from previous image..."
|
||||||
|
docker tag "${IMAGE_NAME}:${OLD_TAG}" "${IMAGE_NAME}:${NEW_TAG}" || {
|
||||||
|
warning "Failed to tag previous image"
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
elif docker images | grep -q "${IMAGE_NAME}:${BACKUP_TAG}"; then
|
||||||
|
log "Restoring from backup image..."
|
||||||
|
docker tag "${IMAGE_NAME}:${BACKUP_TAG}" "${IMAGE_NAME}:${NEW_TAG}" || {
|
||||||
|
warning "Failed to tag backup image"
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
else
|
||||||
|
error "No backup image found for rollback"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Restart container with previous image
|
||||||
|
log "Restarting container with previous image..."
|
||||||
|
docker-compose -f "$COMPOSE_FILE" up -d --force-recreate portfolio || {
|
||||||
|
warning "Failed to restart container"
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
# Wait for health check
|
||||||
|
sleep 10
|
||||||
|
if check_health "$HEALTH_CHECK_URL"; then
|
||||||
|
success "Rollback successful!"
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
warning "Rollback attempt $rollback_attempt failed health check"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
error "All rollback attempts failed"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Pre-deployment checks
|
||||||
|
pre_deployment_checks() {
|
||||||
|
log "Running pre-deployment checks..."
|
||||||
|
|
||||||
|
# Check if running as root
|
||||||
|
if [[ $EUID -eq 0 ]]; then
|
||||||
|
error "This script should not be run as root"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if Docker is running
|
||||||
|
if ! docker info > /dev/null 2>&1; then
|
||||||
|
error "Docker is not running. Please start Docker and try again."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if docker-compose is available
|
||||||
|
if ! command -v docker-compose &> /dev/null && ! docker compose version &> /dev/null; then
|
||||||
|
error "docker-compose is not installed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if .env file exists
|
||||||
|
if [ ! -f .env ]; then
|
||||||
|
error ".env file not found. Please create it before deploying."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if required environment variables are set
|
||||||
|
local required_vars=("DATABASE_URL" "NEXT_PUBLIC_BASE_URL")
|
||||||
|
for var in "${required_vars[@]}"; do
|
||||||
|
if ! grep -q "^${var}=" .env 2>/dev/null; then
|
||||||
|
warning "Required environment variable $var not found in .env"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Check disk space (at least 2GB free)
|
||||||
|
local available_space=$(df -BG . | tail -1 | awk '{print $4}' | sed 's/G//')
|
||||||
|
if [ "$available_space" -lt 2 ]; then
|
||||||
|
error "Insufficient disk space. At least 2GB required, but only ${available_space}GB available."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
success "Pre-deployment checks passed"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Build application
|
||||||
|
build_application() {
|
||||||
|
log "Building application..."
|
||||||
|
|
||||||
|
# Build Next.js application
|
||||||
|
log "Building Next.js application..."
|
||||||
|
npm ci --prefer-offline --no-audit || {
|
||||||
|
error "npm install failed"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
npm run build || {
|
||||||
|
error "Build failed"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
success "Application built successfully"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Build Docker image
|
||||||
|
build_docker_image() {
|
||||||
|
log "Building Docker image..."
|
||||||
|
|
||||||
|
# Backup current image if it exists
|
||||||
|
if docker images | grep -q "${IMAGE_NAME}:${NEW_TAG}"; then
|
||||||
|
log "Backing up current image..."
|
||||||
|
docker tag "${IMAGE_NAME}:${NEW_TAG}" "${IMAGE_NAME}:${OLD_TAG}" || {
|
||||||
|
warning "Could not backup current image (this might be the first deployment)"
|
||||||
|
}
|
||||||
|
docker tag "${IMAGE_NAME}:${NEW_TAG}" "${IMAGE_NAME}:${BACKUP_TAG}" || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Build new image
|
||||||
|
docker build -t "${IMAGE_NAME}:${NEW_TAG}" . || {
|
||||||
|
error "Failed to build Docker image"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Verify new image
|
||||||
|
if ! docker images | grep -q "${IMAGE_NAME}:${NEW_TAG}"; then
|
||||||
|
error "New image not found after build"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
success "Docker image built successfully"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Deploy application
|
||||||
|
deploy_application() {
|
||||||
|
log "Deploying application..."
|
||||||
|
|
||||||
|
# Start new container
|
||||||
|
if command -v docker-compose &> /dev/null; then
|
||||||
|
docker-compose -f "$COMPOSE_FILE" up -d --force-recreate portfolio || {
|
||||||
|
error "Failed to start new container"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
else
|
||||||
|
docker compose -f "$COMPOSE_FILE" up -d --force-recreate portfolio || {
|
||||||
|
error "Failed to start new container"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Wait for container to start
|
||||||
|
log "Waiting for container to start..."
|
||||||
|
sleep 15
|
||||||
|
|
||||||
|
# Check if container is running
|
||||||
|
if ! docker ps | grep -q "portfolio-app"; then
|
||||||
|
error "Container failed to start"
|
||||||
|
log "Container logs:"
|
||||||
|
docker logs portfolio-app --tail=50
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
success "Container started successfully"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Run database migrations
|
||||||
|
run_migrations() {
|
||||||
|
log "Running database migrations..."
|
||||||
|
|
||||||
|
# Wait for database to be ready
|
||||||
|
local db_ready=false
|
||||||
|
for i in {1..30}; do
|
||||||
|
if docker exec portfolio-app npx prisma db push --skip-generate --accept-data-loss 2>&1 | grep -q "Database.*ready\|Everything is in sync"; then
|
||||||
|
db_ready=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ "$db_ready" = false ]; then
|
||||||
|
warning "Database might not be ready, but continuing..."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Run migrations
|
||||||
|
docker exec portfolio-app npx prisma db push --skip-generate || {
|
||||||
|
warning "Database migration had issues, but continuing..."
|
||||||
|
}
|
||||||
|
|
||||||
|
success "Database migrations completed"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Verify deployment
|
||||||
|
verify_deployment() {
|
||||||
|
log "Verifying deployment..."
|
||||||
|
|
||||||
|
# Health check
|
||||||
|
if ! check_health "$HEALTH_CHECK_URL"; then
|
||||||
|
error "Health check failed"
|
||||||
|
log "Container logs:"
|
||||||
|
docker logs portfolio-app --tail=100
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Test main page
|
||||||
|
if ! curl -f -s -m 10 "http://localhost:3000/" > /dev/null 2>&1; then
|
||||||
|
error "Main page is not accessible"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Test API endpoint
|
||||||
|
if ! curl -f -s -m 10 "http://localhost:3000/api/health" > /dev/null 2>&1; then
|
||||||
|
error "API health endpoint is not accessible"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
success "Deployment verification successful"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Cleanup old images
|
||||||
|
cleanup_old_images() {
|
||||||
|
log "Cleaning up old images..."
|
||||||
|
|
||||||
|
# Keep last 5 versions
|
||||||
|
docker images "${IMAGE_NAME}" --format "{{.Tag}}" | \
|
||||||
|
grep -E "^(backup-|previous|failed-)" | \
|
||||||
|
sort -r | \
|
||||||
|
tail -n +6 | \
|
||||||
|
while read -r tag; do
|
||||||
|
docker rmi "${IMAGE_NAME}:${tag}" 2>/dev/null || true
|
||||||
|
done
|
||||||
|
|
||||||
|
success "Cleanup completed"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Main deployment flow
|
||||||
|
main() {
|
||||||
|
log "Starting safe deployment for dk0.dev..."
|
||||||
|
|
||||||
|
# Set up error handling
|
||||||
|
trap cleanup ERR
|
||||||
|
|
||||||
|
# Run deployment steps
|
||||||
|
pre_deployment_checks
|
||||||
|
build_application
|
||||||
|
build_docker_image
|
||||||
|
deploy_application
|
||||||
|
run_migrations
|
||||||
|
|
||||||
|
# Verify deployment
|
||||||
|
if verify_deployment; then
|
||||||
|
cleanup_old_images
|
||||||
|
|
||||||
|
# Show deployment info
|
||||||
|
log "Deployment completed successfully!"
|
||||||
|
log "Container status:"
|
||||||
|
if command -v docker-compose &> /dev/null; then
|
||||||
|
docker-compose -f "$COMPOSE_FILE" ps
|
||||||
|
else
|
||||||
|
docker compose -f "$COMPOSE_FILE" ps
|
||||||
|
fi
|
||||||
|
|
||||||
|
log "Resource usage:"
|
||||||
|
docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}" portfolio-app
|
||||||
|
|
||||||
|
success "Application is available at: http://localhost:3000/"
|
||||||
|
success "Health check endpoint: $HEALTH_CHECK_URL"
|
||||||
|
|
||||||
|
# Disable error trap (deployment successful)
|
||||||
|
trap - ERR
|
||||||
|
else
|
||||||
|
error "Deployment verification failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Run main function
|
||||||
|
main "$@"
|
||||||
|
|
||||||
184
scripts/zero-downtime-deploy.sh
Executable file
184
scripts/zero-downtime-deploy.sh
Executable file
@@ -0,0 +1,184 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Zero-Downtime Deployment Script for dk0.dev
|
||||||
|
# This script ensures safe, zero-downtime deployments with rollback capability
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
# Configuration
|
||||||
|
IMAGE_NAME="portfolio-app"
|
||||||
|
NEW_TAG="latest"
|
||||||
|
OLD_TAG="previous"
|
||||||
|
COMPOSE_FILE="docker-compose.production.yml"
|
||||||
|
HEALTH_CHECK_URL="http://localhost:3000/api/health"
|
||||||
|
HEALTH_CHECK_TIMEOUT=120
|
||||||
|
HEALTH_CHECK_INTERVAL=5
|
||||||
|
|
||||||
|
# Logging functions
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Check if running as root
|
||||||
|
if [[ $EUID -eq 0 ]]; then
|
||||||
|
error "This script should not be run as root"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if Docker is running
|
||||||
|
if ! docker info > /dev/null 2>&1; then
|
||||||
|
error "Docker is not running. Please start Docker and try again."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if docker-compose is available
|
||||||
|
if ! command -v docker-compose &> /dev/null; then
|
||||||
|
error "docker-compose is not installed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Health check function
|
||||||
|
check_health() {
|
||||||
|
local url=$1
|
||||||
|
local max_attempts=$((HEALTH_CHECK_TIMEOUT / HEALTH_CHECK_INTERVAL))
|
||||||
|
local attempt=0
|
||||||
|
|
||||||
|
while [ $attempt -lt $max_attempts ]; do
|
||||||
|
if curl -f -s "$url" > /dev/null 2>&1; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
attempt=$((attempt + 1))
|
||||||
|
sleep $HEALTH_CHECK_INTERVAL
|
||||||
|
echo -n "."
|
||||||
|
done
|
||||||
|
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Rollback function
|
||||||
|
rollback() {
|
||||||
|
error "Deployment failed. Rolling back..."
|
||||||
|
|
||||||
|
# Tag current image as failed
|
||||||
|
if docker images | grep -q "${IMAGE_NAME}:${NEW_TAG}"; then
|
||||||
|
docker tag "${IMAGE_NAME}:${NEW_TAG}" "${IMAGE_NAME}:failed-$(date +%s)" || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Restore previous image
|
||||||
|
if docker images | grep -q "${IMAGE_NAME}:${OLD_TAG}"; then
|
||||||
|
log "Restoring previous image..."
|
||||||
|
docker tag "${IMAGE_NAME}:${OLD_TAG}" "${IMAGE_NAME}:${NEW_TAG}"
|
||||||
|
docker-compose -f "$COMPOSE_FILE" up -d --force-recreate portfolio || {
|
||||||
|
error "Failed to rollback"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if check_health "$HEALTH_CHECK_URL"; then
|
||||||
|
success "Rollback successful"
|
||||||
|
else
|
||||||
|
error "Rollback completed but health check failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
error "No previous image found for rollback"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Trap errors for automatic rollback
|
||||||
|
trap rollback ERR
|
||||||
|
|
||||||
|
log "Starting zero-downtime deployment..."
|
||||||
|
|
||||||
|
# Step 1: Backup current image
|
||||||
|
if docker images | grep -q "${IMAGE_NAME}:${NEW_TAG}"; then
|
||||||
|
log "Backing up current image..."
|
||||||
|
docker tag "${IMAGE_NAME}:${NEW_TAG}" "${IMAGE_NAME}:${OLD_TAG}" || {
|
||||||
|
warning "Could not backup current image (this might be the first deployment)"
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Step 2: Build new image
|
||||||
|
log "Building new image..."
|
||||||
|
docker build -t "${IMAGE_NAME}:${NEW_TAG}" . || {
|
||||||
|
error "Failed to build image"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Step 3: Verify new image
|
||||||
|
log "Verifying new image..."
|
||||||
|
if ! docker images | grep -q "${IMAGE_NAME}:${NEW_TAG}"; then
|
||||||
|
error "New image not found after build"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Step 4: Start new container in background (blue-green deployment)
|
||||||
|
log "Starting new container..."
|
||||||
|
docker-compose -f "$COMPOSE_FILE" up -d --force-recreate portfolio || {
|
||||||
|
error "Failed to start new container"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Step 5: Wait for health check
|
||||||
|
log "Waiting for health check..."
|
||||||
|
if check_health "$HEALTH_CHECK_URL"; then
|
||||||
|
success "New container is healthy!"
|
||||||
|
else
|
||||||
|
error "Health check failed for new container"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Step 6: Run database migrations (if needed)
|
||||||
|
log "Running database migrations..."
|
||||||
|
docker exec portfolio-app npx prisma db push --skip-generate || {
|
||||||
|
warning "Database migration failed, but continuing..."
|
||||||
|
}
|
||||||
|
|
||||||
|
# Step 7: Final verification
|
||||||
|
log "Performing final verification..."
|
||||||
|
if check_health "$HEALTH_CHECK_URL"; then
|
||||||
|
success "Deployment successful!"
|
||||||
|
|
||||||
|
# Show container status
|
||||||
|
log "Container status:"
|
||||||
|
docker-compose -f "$COMPOSE_FILE" ps
|
||||||
|
|
||||||
|
# Cleanup old images (keep last 3 versions)
|
||||||
|
log "Cleaning up old images..."
|
||||||
|
docker images "${IMAGE_NAME}" --format "{{.Tag}}" | grep -E "^(failed-|previous)" | sort -r | tail -n +4 | while read tag; do
|
||||||
|
docker rmi "${IMAGE_NAME}:${tag}" 2>/dev/null || true
|
||||||
|
done
|
||||||
|
|
||||||
|
success "Zero-downtime deployment completed successfully!"
|
||||||
|
log "Application is available at: http://localhost:3000/"
|
||||||
|
log "Health check endpoint: $HEALTH_CHECK_URL"
|
||||||
|
|
||||||
|
else
|
||||||
|
error "Final verification failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Disable error trap (deployment successful)
|
||||||
|
trap - ERR
|
||||||
|
|
||||||
|
success "All done!"
|
||||||
|
|
||||||
Reference in New Issue
Block a user