Update Dockerfile

Dockerfile

@@ -49,30 +49,100 @@ if [ ! -f eula.txt ]; then
     echo "✅ EULA accepted"
 fi
 
+# ==========================================
+# GIT CONFIGURATION (VERY IMPORTANT!)
+# ==========================================
+echo "🔧 Setting up Git configuration..."
+git config --global user.email "minecraft@huggingface.co"
+git config --global user.name "Minecraft Bot"
+git config --global init.defaultBranch main
+
+# Check if this is a git repo, if not initialize
+if [ ! -d .git ]; then
+    echo "📦 Initializing git repository..."
+    git init
+    git remote add origin https://$GITHUB_TOKEN@github.com/Walukapah/mcserver.git
+fi
+
+# Ensure remote URL has token
+git remote set-url origin https://$GITHUB_TOKEN@github.com/Walukapah/mcserver.git
+
+# Create .gitignore to avoid unnecessary files
+cat > .gitignore << 'GITIGNORE'
+*.log
+logs/
+cache/
+tmp/
+*.tmp
+GITIGNORE
+
+echo "✅ Git configured successfully"
+
 # Create logs directory for persistent storage
 mkdir -p /app/logs
 
-# Create backup script
-cat > /app/backup.sh << 'BACKUPSCRIPT'
+# ==========================================
+# BACKUP SCRIPT (Fixed Path)
+# ==========================================
+cat > /app/mcserver/backup.sh << 'BACKUPSCRIPT'
 #!/bin/bash
-cd /app/mcserver 2>/dev/null || exit 0
-git config user.email "minecraft@huggingface.co"
-git config user.name "Minecraft Bot"
+set -e
+
+echo ""
+echo "💾 [BACKUP] Starting backup at $(date '+%Y-%m-%d %H:%M:%S')"
+echo "📂 Current directory: $(pwd)"
+
+# Must be in mcserver directory
+cd /app/mcserver 2>/dev/null || {
+    echo "❌ ERROR: Cannot find /app/mcserver directory!"
+    exit 1
+}
+
+# Check if git is initialized
+if [ ! -d .git ]; then
+    echo "❌ ERROR: Not a git repository!"
+    exit 1
+fi
+
+# Check for changes
+if git diff --quiet && git diff --cached --quiet && [ -z "$(git ls-files --others --exclude-standard)" ]; then
+    echo "ℹ️  No changes to backup"
+    exit 0
+fi
+
+echo "📤 Pushing changes to GitHub..."
+
+# Add all files including new ones
 git add -A
-git commit -m "Auto backup: $(date '+%Y-%m-%d %H:%M:%S')" || true
-git push origin main 2>/dev/null || git push origin master 2>/dev/null || true
+
+# Commit with timestamp
+git commit -m "🎮 Auto backup: $(date '+%Y-%m-%d %H:%M:%S') | Server Data Backup" || {
+    echo "ℹ️  Nothing new to commit"
+    exit 0
+}
+
+# Push to GitHub
+git push origin main 2>&1 || git push origin master 2>&1 || {
+    echo "❌ ERROR: Failed to push to GitHub!"
+    echo "🔍 Checking remote URL..."
+    git remote -v
+    exit 1
+}
+
+echo "✅ [BACKUP] Successfully pushed to GitHub!"
+echo ""
 BACKUPSCRIPT
 
-chmod +x /app/backup.sh
+chmod +x /app/mcserver/backup.sh
 
-# Start backup loop in background
+# ==========================================
+# BACKUP LOOP (Fixed - runs in correct directory)
+# ==========================================
 (
+    echo "⏰ Backup scheduler started (every 5 minutes)"
     while true; do
         sleep 300
-        echo ""
-        echo "💾 [BACKUP] Running auto-backup at $(date)"
-        /app/backup.sh 2>/dev/null || true
-        echo ""
+        /app/mcserver/backup.sh 2>&1 || true
     done
 ) &
 
@@ -80,7 +150,7 @@ echo "✅ Auto-backup enabled (every 5 minutes)"
 echo ""
 
 # ==========================================
-# WEB TERMINAL SERVER (No Blue Button)
+# WEB TERMINAL SERVER
 # ==========================================
 cat > /app/web_terminal.py << 'PYTHON_SCRIPT'
 import os
@@ -273,6 +343,52 @@ def start_minecraft():
     
     threading.Thread(target=process_commands, daemon=True).start()
 
+# ==========================================
+# BACKUP API ENDPOINT (Manual Trigger)
+# ==========================================
+@app.route('/backup', methods=['POST'])
+def manual_backup():
+    """Trigger manual backup"""
+    try:
+        result = subprocess.run(
+            ['/app/mcserver/backup.sh'], 
+            capture_output=True, 
+            text=True, 
+            timeout=60,
+            cwd='/app/mcserver'
+        )
+        return {
+            'success': result.returncode == 0,
+            'output': result.stdout,
+            'error': result.stderr if result.stderr else None
+        }
+    except Exception as e:
+        return {'success': False, 'error': str(e)}
+
+@app.route('/backup/status')
+def backup_status():
+    """Check backup/git status"""
+    try:
+        result = subprocess.run(
+            ['git', 'status', '--short'], 
+            capture_output=True, 
+            text=True, 
+            timeout=10,
+            cwd='/app/mcserver'
+        )
+        return {
+            'has_changes': len(result.stdout.strip()) > 0,
+            'status': result.stdout,
+            'branch': subprocess.run(
+                ['git', 'branch', '--show-current'], 
+                capture_output=True, 
+                text=True,
+                cwd='/app/mcserver'
+            ).stdout.strip()
+        }
+    except Exception as e:
+        return {'error': str(e)}
+
 HTML_TEMPLATE = """
 <!DOCTYPE html>
 <html lang="en">
@@ -352,7 +468,6 @@ HTML_TEMPLATE = """
         
         .nav-btn:hover { color: #fff; background: rgba(255,255,255,0.1); }
         
-        /* Status indicator dot on status icon */
         .nav-btn .status-dot {
             position: absolute;
             bottom: 6px;
@@ -364,9 +479,7 @@ HTML_TEMPLATE = """
             border: 2px solid #252a30;
         }
         
-        .nav-btn .status-dot.offline {
-            background: #ef4444;
-        }
+        .nav-btn .status-dot.offline { background: #ef4444; }
         
         /* Main Layout */
         .main-container { 
@@ -433,6 +546,8 @@ HTML_TEMPLATE = """
         .btn-secondary:hover { background: #4b5563; }
         .btn-danger { background: #dc2626; color: white; }
         .btn-danger:hover { background: #b91c1c; }
+        .btn-success { background: #16a34a; color: white; }
+        .btn-success:hover { background: #15803d; }
         .btn:disabled { opacity: 0.5; cursor: not-allowed; }
         
         /* Terminal */
@@ -465,7 +580,6 @@ HTML_TEMPLATE = """
         .terminal-line.success { color: #3fb950; }
         .terminal-line.system { color: #a855f7; font-weight: 500; }
         
-        /* Typing Preview Line */
         .typing-preview {
             color: #6e7681;
             font-style: italic;
@@ -663,9 +777,7 @@ HTML_TEMPLATE = """
             box-shadow: 0 10px 40px rgba(0,0,0,0.5);
         }
         
-        .status-modal.active {
-            display: block;
-        }
+        .status-modal.active { display: block; }
         
         .status-modal-header {
             display: flex;
@@ -690,9 +802,7 @@ HTML_TEMPLATE = """
             font-size: 18px;
         }
         
-        .status-modal-close:hover {
-            color: #fff;
-        }
+        .status-modal-close:hover { color: #fff; }
         
         .status-item {
             display: flex;
@@ -701,20 +811,10 @@ HTML_TEMPLATE = """
             border-bottom: 1px solid #2a2f35;
         }
         
-        .status-item:last-child {
-            border-bottom: none;
-        }
-        
-        .status-label-modal {
-            color: #9ca3af;
-            font-size: 13px;
-        }
+        .status-item:last-child { border-bottom: none; }
         
-        .status-value-modal {
-            color: #f0f6fc;
-            font-weight: 500;
-            font-size: 13px;
-        }
+        .status-label-modal { color: #9ca3af; font-size: 13px; }
+        .status-value-modal { color: #f0f6fc; font-weight: 500; font-size: 13px; }
         
         .modal-overlay {
             display: none;
@@ -727,15 +827,61 @@ HTML_TEMPLATE = """
             z-index: 250;
         }
         
-        .modal-overlay.active {
-            display: block;
+        .modal-overlay.active { display: block; }
+        
+        /* Backup Section */
+        .backup-section {
+            margin-top: 15px;
+            padding-top: 15px;
+            border-top: 1px solid #363b42;
+        }
+        
+        .backup-title {
+            font-size: 12px;
+            color: #9ca3af;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            margin-bottom: 10px;
+            display: flex;
+            align-items: center;
+            gap: 6px;
+        }
+        
+        .backup-btn {
+            width: 100%;
+            padding: 10px;
+            background: #1e40af;
+            color: white;
+            border: none;
+            border-radius: 6px;
+            font-size: 12px;
+            font-weight: 500;
+            cursor: pointer;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            gap: 6px;
+            transition: all 0.2s;
+            margin-bottom: 8px;
+        }
+        
+        .backup-btn:hover { background: #1e3a8a; }
+        .backup-btn:disabled { opacity: 0.5; cursor: not-allowed; }
+        
+        .backup-status {
+            font-size: 11px;
+            color: #6b7280;
+            text-align: center;
+            padding: 5px;
         }
         
+        .backup-status.success { color: #22c55e; }
+        .backup-status.error { color: #ef4444; }
+        
         /* ============================================
            MOBILE RESPONSIVE BREAKPOINTS
            ============================================ */
         
-        /* Tablet (768px and below) */
         @media screen and (max-width: 768px) {
             .sidebar {
                 position: fixed;
@@ -748,21 +894,11 @@ HTML_TEMPLATE = """
                 box-shadow: -4px 0 20px rgba(0,0,0,0.5);
             }
             
-            .sidebar.active {
-                right: 0;
-            }
-            
-            .connection-bar {
-                right: 0;
-            }
+            .sidebar.active { right: 0; }
+            .connection-bar { right: 0; }
             
-            .console-header {
-                padding: 10px 12px;
-            }
-            
-            .server-title {
-                font-size: 14px;
-            }
+            .console-header { padding: 10px 12px; }
+            .server-title { font-size: 14px; }
             
             .btn {
                 padding: 6px 10px;
@@ -770,43 +906,32 @@ HTML_TEMPLATE = """
                 min-height: 32px;
             }
             
-            .btn span {
-                display: none;
-            }
+            .btn span { display: none; }
             
             .terminal {
                 font-size: 11px;
                 padding: 10px;
             }
             
-            .command-area {
-                padding: 8px 10px;
-            }
+            .command-area { padding: 8px 10px; }
             
             .send-btn {
                 padding: 10px 14px;
                 font-size: 12px;
             }
             
-            .send-btn span {
-                display: none;
-            }
+            .send-btn span { display: none; }
         }
         
-        /* Mobile (480px and below) */
         @media screen and (max-width: 480px) {
-            .top-nav {
-                padding: 0 10px;
-            }
+            .top-nav { padding: 0 10px; }
             
             .nav-tab {
                 padding: 0 10px;
                 font-size: 12px;
             }
             
-            .nav-tab i {
-                font-size: 12px;
-            }
+            .nav-tab i { font-size: 12px; }
             
             .console-header {
                 flex-direction: column;
@@ -830,13 +955,8 @@ HTML_TEMPLATE = """
                 line-height: 1.4;
             }
             
-            .command-input-wrapper {
-                min-height: 40px;
-            }
-            
-            #commandInput {
-                font-size: 16px;
-            }
+            .command-input-wrapper { min-height: 40px; }
+            #commandInput { font-size: 16px; }
             
             .send-btn {
                 min-height: 40px;
@@ -848,9 +968,7 @@ HTML_TEMPLATE = """
                 right: -100%;
             }
             
-            .stat-card {
-                padding: 10px;
-            }
+            .stat-card { padding: 10px; }
             
             .stat-icon {
                 width: 36px;
@@ -858,9 +976,7 @@ HTML_TEMPLATE = """
                 font-size: 16px;
             }
             
-            .stat-value {
-                font-size: 14px;
-            }
+            .stat-value { font-size: 14px; }
             
             .status-modal {
                 min-width: 90vw;
@@ -868,39 +984,17 @@ HTML_TEMPLATE = """
             }
         }
         
-        /* Landscape mobile */
         @media screen and (max-height: 500px) and (orientation: landscape) {
-            .console-header {
-                padding: 8px 12px;
-            }
-            
-            .command-area {
-                padding: 6px 10px;
-            }
-            
-            .sidebar {
-                padding: 10px;
-            }
-            
-            .stat-card {
-                padding: 8px;
-                margin-bottom: 6px;
-            }
+            .console-header { padding: 8px 12px; }
+            .command-area { padding: 6px 10px; }
+            .sidebar { padding: 10px; }
+            .stat-card { padding: 8px; margin-bottom: 6px; }
         }
         
-        /* Large screens */
         @media screen and (min-width: 1400px) {
-            .sidebar {
-                width: 320px;
-            }
-            
-            .terminal {
-                font-size: 13px;
-            }
-            
-            .stat-value {
-                font-size: 18px;
-            }
+            .sidebar { width: 320px; }
+            .terminal { font-size: 13px; }
+            .stat-value { font-size: 18px; }
         }
     </style>
 </head>
@@ -1072,6 +1166,20 @@ HTML_TEMPLATE = """
                     <div class="stat-sub">Online players</div>
                 </div>
             </div>
+            
+            <!-- Backup Section -->
+            <div class="backup-section">
+                <div class="backup-title">
+                    <i class="fas fa-cloud-upload-alt"></i> GitHub Backup
+                </div>
+                <button class="backup-btn" id="backupBtn" onclick="triggerBackup()">
+                    <i class="fas fa-save"></i> Backup Now
+                </button>
+                <button class="backup-btn" style="background: #374151;" onclick="checkBackupStatus()">
+                    <i class="fas fa-info-circle"></i> Check Status
+                </button>
+                <div class="backup-status" id="backupStatus">Auto-backup every 5 min</div>
+            </div>
         </div>
     </div>
 
@@ -1088,6 +1196,8 @@ HTML_TEMPLATE = """
         const statusModal = document.getElementById('statusModal');
         const modalOverlay = document.getElementById('modalOverlay');
         const navStatusDot = document.getElementById('navStatusDot');
+        const backupBtn = document.getElementById('backupBtn');
+        const backupStatus = document.getElementById('backupStatus');
         
         let ws = null;
         let reconnectAttempts = 0;
@@ -1107,7 +1217,6 @@ HTML_TEMPLATE = """
             };
             connectionBar.innerHTML = '<i class="fas ' + icons[status] + '"></i><span>' + message + '</span>';
             
-            // Update modal status
             const wsStatus = document.getElementById('modalWsStatus');
             if (status === 'connected') {
                 wsStatus.innerHTML = '<span style="color: #22c55e;">● Connected</span>';
@@ -1150,7 +1259,6 @@ HTML_TEMPLATE = """
         }
         
         function addTerminalLine(text, type = '') {
-            // Remove typing preview if exists
             if (typingPreviewLine && typingPreviewLine.parentNode) {
                 typingPreviewLine.parentNode.removeChild(typingPreviewLine);
                 typingPreviewLine = null;
@@ -1183,13 +1291,11 @@ HTML_TEMPLATE = """
         function updateTypingPreview() {
             const text = commandInput.value.trim();
             
-            // Remove old preview
             if (typingPreviewLine && typingPreviewLine.parentNode) {
                 typingPreviewLine.parentNode.removeChild(typingPreviewLine);
                 typingPreviewLine = null;
             }
             
-            // Show preview if text exists
             if (text && isServerRunning) {
                 typingPreviewLine = document.createElement('div');
                 typingPreviewLine.className = 'terminal-line typing-preview';
@@ -1236,6 +1342,60 @@ HTML_TEMPLATE = """
         
         setInterval(updateUptime, 1000);
         
+        // ==========================================
+        // BACKUP FUNCTIONS
+        // ==========================================
+        async function triggerBackup() {
+            backupBtn.disabled = true;
+            backupStatus.textContent = 'Backing up...';
+            backupStatus.className = 'backup-status';
+            
+            try {
+                const response = await fetch('/backup', { method: 'POST' });
+                const result = await response.json();
+                
+                if (result.success) {
+                    backupStatus.textContent = '✅ Backup successful!';
+                    backupStatus.className = 'backup-status success';
+                    addTerminalLine('[SYSTEM] GitHub backup completed successfully!', 'system');
+                } else {
+                    backupStatus.textContent = '❌ Backup failed: ' + (result.error || 'Unknown error');
+                    backupStatus.className = 'backup-status error';
+                    addTerminalLine('[ERROR] Backup failed: ' + (result.error || 'Unknown error'), 'error');
+                }
+            } catch (e) {
+                backupStatus.textContent = '❌ Network error';
+                backupStatus.className = 'backup-status error';
+            }
+            
+            setTimeout(() => {
+                backupBtn.disabled = false;
+            }, 5000);
+        }
+        
+        async function checkBackupStatus() {
+            backupStatus.textContent = 'Checking...';
+            
+            try {
+                const response = await fetch('/backup/status');
+                const result = await response.json();
+                
+                if (result.error) {
+                    backupStatus.textContent = '❌ Error: ' + result.error;
+                    backupStatus.className = 'backup-status error';
+                } else if (result.has_changes) {
+                    backupStatus.textContent = '📝 Unsaved changes: ' + result.status.split('\\n').length + ' files';
+                    backupStatus.className = 'backup-status';
+                } else {
+                    backupStatus.textContent = '✅ All changes synced';
+                    backupStatus.className = 'backup-status success';
+                }
+            } catch (e) {
+                backupStatus.textContent = '❌ Network error';
+                backupStatus.className = 'backup-status error';
+            }
+        }
+        
         function connect() {
             const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
             ws = new WebSocket(protocol + '//' + window.location.host + '/ws');
@@ -1260,7 +1420,6 @@ HTML_TEMPLATE = """
                     const memUsed = ((data.memoryTotal * data.memory / 100) / 1024 / 1024 / 1024).toFixed(2);
                     document.getElementById('memorySub').textContent = memUsed + ' / ' + memTotal + ' GB';
                     
-                    // Update modal stats
                     document.getElementById('modalCpu').textContent = data.cpu.toFixed(1) + '%';
                     document.getElementById('modalMemory').textContent = data.memory.toFixed(1) + '%';
                     
@@ -1297,7 +1456,6 @@ HTML_TEMPLATE = """
         function sendInput() {
             const cmd = commandInput.value.trim();
             if (cmd && ws && ws.readyState === WebSocket.OPEN) {
-                // Remove preview immediately on send
                 if (typingPreviewLine && typingPreviewLine.parentNode) {
                     typingPreviewLine.parentNode.removeChild(typingPreviewLine);
                     typingPreviewLine = null;
@@ -1313,13 +1471,11 @@ HTML_TEMPLATE = """
             }
         }
         
-        // Input event listeners for real-time typing preview
         commandInput.addEventListener('input', updateTypingPreview);
         commandInput.addEventListener('keyup', updateTypingPreview);
         
         commandInput.addEventListener('keypress', (e) => {
             if (e.key === 'Enter') {
-                // Remove preview immediately on enter
                 if (typingPreviewLine && typingPreviewLine.parentNode) {
                     typingPreviewLine.parentNode.removeChild(typingPreviewLine);
                     typingPreviewLine = null;
@@ -1328,7 +1484,6 @@ HTML_TEMPLATE = """
             }
         });
         
-        // Clear preview when input loses focus
         commandInput.addEventListener('blur', () => {
             if (typingPreviewLine && typingPreviewLine.parentNode) {
                 typingPreviewLine.parentNode.removeChild(typingPreviewLine);
@@ -1363,12 +1518,9 @@ HTML_TEMPLATE = """
         function toggleStatusModal() {
             statusModal.classList.toggle('active');
             modalOverlay.classList.toggle('active');
-            
-            // Update address in modal
             document.getElementById('modalAddress').textContent = window.location.hostname;
         }
         
-        // Close sidebar when clicking outside on mobile
         document.addEventListener('click', (e) => {
             if (window.innerWidth <= 768 && sidebarOpen) {
                 if (!sidebar.contains(e.target) && !e.target.closest('.sidebar-toggle')) {
@@ -1377,14 +1529,12 @@ HTML_TEMPLATE = """
             }
         });
         
-        // Handle orientation change
         window.addEventListener('orientationchange', () => {
             setTimeout(() => {
                 terminal.scrollTop = terminal.scrollHeight;
             }, 300);
         });
         
-        // Handle resize
         let resizeTimer;
         window.addEventListener('resize', () => {
             clearTimeout(resizeTimer);
@@ -1397,7 +1547,6 @@ HTML_TEMPLATE = """
             }, 250);
         });
         
-        // Prevent zoom on double tap for iOS
         let lastTouchEnd = 0;
         document.addEventListener('touchend', (e) => {
             const now = Date.now();
@@ -1430,7 +1579,6 @@ def websocket(ws):
     global server_start_time
     print("[WS] Client connected", flush=True)
     
-    # Send history logs first
     try:
         if logs_history:
             ws.send(json.dumps({
@@ -1468,7 +1616,6 @@ def websocket(ws):
     stats_thread = threading.Thread(target=send_stats, daemon=True)
     stats_thread.start()
     
-    # Send output
     def send_output():
         while True:
             try:
@@ -1485,7 +1632,6 @@ def websocket(ws):
     output_thread = threading.Thread(target=send_output, daemon=True)
     output_thread.start()
     
-    # Receive commands
     while True:
         try:
             data = ws.receive(timeout=5)
@@ -1556,14 +1702,15 @@ fi
 
 echo ""
 echo "=========================================="
-echo "✅ Minecraft Server (No Blue Button Version) is LIVE!"
+echo "✅ Minecraft Server with GitHub Backup is LIVE!"
 echo "🌐 Access at: https://your-space.hf.space"
 echo "📱 Mobile optimized interface enabled"
 echo "💾 Logs are now persistent across refreshes"
 echo "⏰ Uptime tracking fixed"
 echo "⌨️ Real-time command typing preview enabled"
 echo "📊 Status modal with heartbeat icon added"
-echo "🔵 Blue floating button REMOVED"
+echo "☁️ GitHub Auto-backup every 5 minutes"
+echo "🔧 Manual backup button added to sidebar"
 echo "=========================================="
 
 # Keep container alive