Feat/profile menu

.github/workflows/deploy-backend.yml

@@ -1,71 +1,116 @@
-name: Deploy Backend
+name: Deploy Backend to EC2
 
 on:
   push:
     branches:
       - dev
     paths:
       - 'Backend/**'
+      - 'AI/**'
+      - 'docker-compose.yml'
       - '.github/workflows/deploy-backend.yml'
 
 jobs:
   deploy-backend:
-    name: Deploy Backend to EC2
+    name: Deploy Backend + AI with Docker
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      
+
       - name: Deploy to Backend EC2
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.BACKEND_HOST }}
           username: ubuntu
           key: ${{ secrets.BACKEND_SSH_KEY }}
           script: |
-            echo "🚀 Starting backend deployment..."
+            echo "=========================================="
+            echo "🚀 Starting Backend Deployment with Docker"
+            echo "=========================================="
             echo "📍 Backend Server: 13.250.231.18"
-
-            # Navigate to app directory
-            cd /var/www/backend
-
-            # Backup old version
+            echo ""
+
+            # Navigate to deployment directory
+            cd /var/www/backend || exit 1
+
+            # Backup old version (if exists)
             if [ -d "DevAlign" ]; then
               echo "📦 Backing up current version..."
               rm -rf DevAlign-backup
-              mv DevAlign DevAlign-backup
+              cp -r DevAlign DevAlign-backup
+              echo "✅ Backup created"
             fi
-
-            # Clone latest code
-            echo "📥 Cloning repository..."
-            git clone -b dev https://github.com/PentabyteDevAlign/DevAlign.git
-
-            # Install dependencies
-            echo "📦 Installing backend dependencies..."
-            cd DevAlign/Backend
-            npm install --production
-
-            # Copy environment file
+
+            # Clone or pull latest code from dev branch
+            if [ -d "DevAlign" ]; then
+              echo "📥 Pulling latest changes from dev branch..."
+              cd DevAlign
+              git fetch origin dev
+              git reset --hard origin/dev
+              git pull origin dev
+            else
+              echo "📥 Cloning repository..."
+              git clone -b dev https://github.com/PentabyteDevAlign/DevAlign.git
+              cd DevAlign
+            fi
+
+            echo "✅ Code updated successfully"
+            echo ""
+
+            # Copy environment files from secure location
             echo "⚙️ Copying environment variables..."
-            cp /var/www/backend/.env .env
-
-            # Stop existing PM2 process
-            echo "🛑 Stopping existing backend process..."
-            pm2 stop devalign-backend 2>/dev/null || true
-            pm2 delete devalign-backend 2>/dev/null || true
-
-            # Start backend with PM2
-            echo "▶️ Starting backend server..."
-            pm2 start npm --name "devalign-backend" -- start
-            pm2 save
-
-            # Setup PM2 auto-restart on server reboot
-            sudo env PATH=$PATH:/usr/bin pm2 startup systemd -u ubuntu --hp /home/ubuntu 2>/dev/null || true
-
-            # Show status
-            pm2 status
-
-            echo "✅ Backend deployment complete!"
-            echo "🌐 Backend API running at: http://13.250.231.18:5000"
-            echo "📊 Check logs with: pm2 logs devalign-backend"
+            cp /var/www/backend/.env.backend Backend/.env
+            cp /var/www/backend/.env.ai AI/.env
+            echo "✅ Environment files copied"
+            echo ""
+
+            # Stop existing Docker containers
+            echo "🛑 Stopping existing Docker containers..."
+            docker compose down 2>/dev/null || true
+            echo "✅ Containers stopped"
+            echo ""
+
+            # Remove old images to save space (optional, but recommended)
+            echo "🧹 Cleaning up old Docker images..."
+            docker image prune -f
+            echo ""
+
+            # Build and start containers
+            echo "🔨 Building and starting Docker containers..."
+            docker compose up -d --build
+
+            # Wait for containers to be healthy
+            echo ""
+            echo "⏳ Waiting for containers to start (10 seconds)..."
+            sleep 10
+
+            # Check container status
+            echo ""
+            echo "📊 Container Status:"
+            docker compose ps
+
+            # Show container logs (last 20 lines)
+            echo ""
+            echo "📋 Recent Backend Logs:"
+            docker compose logs --tail=20 backend
+
+            echo ""
+            echo "📋 Recent AI Backend Logs:"
+            docker compose logs --tail=20 ai-backend
+
+            echo ""
+            echo "=========================================="
+            echo "✅ Backend Deployment Complete!"
+            echo "=========================================="
+            echo "🌐 Backend API: http://13.250.231.18:5000"
+            echo "🤖 AI API: http://13.250.231.18:8000"
+            echo ""
+            echo "📊 Check logs with:"
+            echo "   docker compose logs -f backend"
+            echo "   docker compose logs -f ai-backend"
+            echo ""
+            echo "🔄 Restart containers with:"
+            echo "   docker compose restart"
+            echo "=========================================="

.github/workflows/deploy-frontend.yml

@@ -1,4 +1,4 @@
-name: Deploy Frontend
+name: Deploy Frontend to EC2
 
 on:
   push:
@@ -10,63 +10,129 @@ on:
 
 jobs:
   deploy-frontend:
-    name: Deploy Frontend to EC2
+    name: Deploy Frontend with Nginx
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      
+
       - name: Deploy to Frontend EC2
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.FRONTEND_HOST }}
           username: ubuntu
           key: ${{ secrets.FRONTEND_SSH_KEY }}
           script: |
-            echo "🚀 Starting frontend deployment..."
+            echo "=========================================="
+            echo "🚀 Starting Frontend Deployment"
+            echo "=========================================="
             echo "📍 Frontend Server: 18.141.166.14"
-
-            # Navigate to app directory
-            cd /var/www/frontend
-
-            # Backup old version
+            echo ""
+
+            # Navigate to deployment directory
+            cd /var/www/frontend || exit 1
+
+            # Backup old version (if exists)
             if [ -d "DevAlign" ]; then
               echo "📦 Backing up current version..."
               rm -rf DevAlign-backup
-              mv DevAlign DevAlign-backup
+              cp -r DevAlign DevAlign-backup
+              echo "✅ Backup created"
+            fi
+
+            # Clone or pull latest code from dev branch
+            if [ -d "DevAlign" ]; then
+              echo "📥 Pulling latest changes from dev branch..."
+              cd DevAlign
+              git fetch origin dev
+              git reset --hard origin/dev
+              git pull origin dev
+            else
+              echo "📥 Cloning repository..."
+              git clone -b dev https://github.com/PentabyteDevAlign/DevAlign.git
+              cd DevAlign
+            fi
+
+            echo "✅ Code updated successfully"
+            echo ""
+
+            # Navigate to Frontend directory
+            cd Frontend
+
+            # Use .env.production from repository (it's already in the code)
+            echo "⚙️ Using production environment from repository..."
+            if [ -f ".env.production" ]; then
+              echo "✅ Production environment file found in repository"
+              cat .env.production
+            else
+              echo "⚠️ Warning: .env.production not found in repository"
             fi
-
-            # Clone latest code
-            echo "📥 Cloning repository..."
-            git clone -b dev https://github.com/PentabyteDevAlign/DevAlign.git
-
-            # Build frontend
-            echo "🔨 Building frontend..."
-            cd DevAlign/Frontend
-
+            echo ""
+
             # Install dependencies
+            echo "📦 Installing dependencies..."
             npm install
-
-            # Build for production (will use .env.production)
+            echo "✅ Dependencies installed"
+            echo ""
+
+            # Build for production
+            echo "🔨 Building frontend for production..."
             npm run build
-            
+
             # Verify build was created
             if [ ! -d "dist" ]; then
               echo "❌ Build failed - dist folder not found!"
               exit 1
             fi
-
-            echo "📂 Build complete - files in dist folder"
-            ls -la dist
-
-            # Restart Nginx
-            echo "🔄 Restarting Nginx..."
-            sudo systemctl restart nginx
-
+
+            echo "✅ Build complete"
+            echo ""
+
+            # Show build directory contents
+            echo "📂 Build output (dist/):"
+            ls -lh dist/ | head -10
+            echo ""
+
+            # Copy build to nginx serve directory
+            echo "📋 Deploying build to Nginx..."
+            sudo rm -rf /var/www/html/*
+            sudo cp -r dist/* /var/www/html/
+            echo "✅ Build deployed to /var/www/html/"
+            echo ""
+
+            # Set proper permissions
+            echo "🔐 Setting permissions..."
+            sudo chown -R www-data:www-data /var/www/html
+            sudo chmod -R 755 /var/www/html
+            echo "✅ Permissions set"
+            echo ""
+
+            # Test Nginx configuration
+            echo "🔍 Testing Nginx configuration..."
+            sudo nginx -t
+
+            # Reload Nginx
+            echo "🔄 Reloading Nginx..."
+            sudo systemctl reload nginx
+
             # Check Nginx status
-            sudo systemctl status nginx --no-pager | head -5
-
-            echo "✅ Frontend deployment complete!"
-            echo "🌐 Frontend is live at: http://18.141.166.14"
-            echo "🔗 API calls will be proxied to: http://13.250.231.18:5000"
+            echo ""
+            echo "📊 Nginx Status:"
+            sudo systemctl status nginx --no-pager | head -10
+
+            echo ""
+            echo "=========================================="
+            echo "✅ Frontend Deployment Complete!"
+            echo "=========================================="
+            echo "🌐 Frontend URL: http://18.141.166.14"
+            echo "🔗 API Endpoint: http://13.250.231.18:5000"
+            echo ""
+            echo "📊 Check Nginx logs with:"
+            echo "   sudo tail -f /var/log/nginx/access.log"
+            echo "   sudo tail -f /var/log/nginx/error.log"
+            echo ""
+            echo "🔄 Manage Nginx with:"
+            echo "   sudo systemctl status nginx"
+            echo "   sudo systemctl restart nginx"
+            echo "=========================================="

AI/.env.example

@@ -1,3 +1,6 @@
-LLM_MODEL=
-LLM_BASE_URL=
-LLM_API_KEY=
+LLM_MODEL_CV=
+LLM_BASE_URL_CV=
+EMBEDDING_MODEL=
+LLM_BASE_URL_ROSTER=
+LLM_API_KEY=
+MONGO_URI=

AI/Dockerfile

@@ -15,4 +15,4 @@ COPY . .
 EXPOSE 8000
 
 # Run the application
-CMD ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]

AI/Makefile

@@ -0,0 +1,18 @@
+IMAGE_NAME = ai-be
+TAG = v1
+PORT = 8000
+
+.PHONY: build run stop clean
+
+build:
+	docker build -t $(IMAGE_NAME):$(TAG) .
+
+run:
+	docker run --rm -p $(PORT):$(PORT) -it $(IMAGE_NAME):$(TAG)
+
+stop:
+	docker stop $$(docker ps -q --filter ancestor=$(IMAGE_NAME):$(TAG))
+
+clean:
+	docker rm $$(docker ps -a -q --filter ancestor=$(IMAGE_NAME):$(TAG)) || true
+	docker rmi $(IMAGE_NAME):$(TAG) || true