Upload 24 files

app.py

@@ -1,9 +1,7 @@
-from fastapi import FastAPI, Request
-from fastapi.responses import HTMLResponse
-from fastapi.templating import Jinja2Templates
+from fastapi import FastAPI
 import docker
 import dotenv
-from routers.deploy import router as deploy_router, deployed_projects
+from routers.deploy import router as deploy_router
 from routers.controls import router as controls_router
 from routers.logs import router as logs_router
 
@@ -11,67 +9,24 @@ from routers.logs import router as logs_router
 dotenv.load_dotenv()
 
 app = FastAPI()
-
-# --- Templating ---
-templates = Jinja2Templates(directory="templates")
-
-# --- Routers ---
 app.include_router(controls_router, prefix="/controls")
 app.include_router(logs_router, prefix="/logs")
 app.include_router(deploy_router, prefix="/deploy")
 
-# --- Docker Client ---
 client = docker.from_env()
 
-# --- Endpoints ---
-@app.get("/", response_class=HTMLResponse)
-async def dashboard(request: Request):
-    """Serves the main dashboard page."""
-    return templates.TemplateResponse("dashboard.html", {"request": request})
-
-@app.get("/projects")
-def get_projects():
-    """Returns a list of all deployed projects with their status and URL."""
-    
-    # Create a list of projects from the deployed_projects dictionary
-    projects_list = []
-    for project_id, details in deployed_projects.items():
-        container_name = details.get("container_name", "N/A")
-        public_url = details.get("public_url", "#")
-        local_url = "#"
-        
-        if container_name != "N/A":
-            try:
-                container = client.containers.get(container_name)
-                port_bindings = client.api.inspect_container(container.id)['NetworkSettings']['Ports']
-                if '8080/tcp' in port_bindings and port_bindings['8080/tcp'] is not None:
-                    host_port = port_bindings['8080/tcp'][0]['HostPort']
-                    # Get the local IP address of the machine
-                    import socket
-                    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-                    try:
-                        # Doesn't matter if the host is reachable
-                        s.connect(('10.255.255.255', 1))
-                        host_ip = s.getsockname()[0]
-                    except Exception:
-                        host_ip = '127.0.0.1' # Fallback to localhost
-                    finally:
-                        s.close()
-                    local_url = f"http://{host_ip}:{host_port}"
-            except docker.errors.NotFound:
-                print(f"Container {container_name} not found for project {project_id}.")
-            except Exception as e:
-                print(f"Error getting local URL for container {container_name}: {e}")
-
-        projects_list.append({
-            "id": project_id,
-            "name": details.get("app_name", "N/A"),
-            "status": details.get("status", "Unknown"),
-            "public_url": public_url,
-            "local_url": local_url,
-            "container_name": container_name
-        })
-    
-    return projects_list
+@app.get("/")
+def dashboard():
+    containers = client.containers.list(all=True)
+    container_list = [
+        {
+            "id": container.id,
+            "name": container.name,
+            "status": container.status,
+            "image": container.image.tags
+        }
+        for container in containers
+    ]
+    return {"containers": container_list}
 
 

project.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5470cebe77d2a9c10b64850108e237040fac72c4519aa8a28e54bfc24fc64d6
+size 2498

templates/dashboard.html

@@ -49,54 +49,53 @@
         card.innerHTML = `
           <h3>${proj.name}</h3>
           <p>Status: <b>${proj.status}</b></p>
-          <p>Public URL: <a href="${proj.public_url}" target="_blank">${proj.public_url}</a></p>
-          <p>Local URL: <a href="${proj.local_url}" target="_blank">${proj.local_url}</a></p>
+          <p>URL: <a href="${proj.url}" target="_blank">${proj.url}</a></p>
           <div class="buttons">
-            <button onclick="stopProject('${proj.container_name}')">🛑 Stop</button>
-            <button onclick="startProject('${proj.container_name}')">▶️ Start</button>
-            <button onclick="pauseProject('${proj.container_name}')">⏸️ Pause</button>
-            <button onclick="toggleLogs('${proj.container_name}')">📜 View Logs</button>
+            <button onclick="stopProject('${proj.name}')">🛑 Stop</button>
+            <button onclick="startProject('${proj.name}')">▶️ Start</button>
+            <button onclick="pauseProject('${proj.name}')">⏸️ Pause</button>
+            <button onclick="toggleLogs('${proj.name}')">📜 View Logs</button>
           </div>
-          <pre id="log-${proj.container_name}" style="display:none"></pre>
+          <pre id="log-${proj.name}" style="display:none"></pre>
         `;
 
         container.appendChild(card);
       });
     }
 
-    async function stopProject(containerName) {
-      await fetch(`/controls/stop/${containerName}`);
+    async function stopProject(name) {
+      await fetch(`/stop/${name}`, { method: 'POST' });
       fetchProjects();
     }
 
-    async function startProject(containerName) {
-        await fetch(`/controls/start/${containerName}`);
-      fetchProjects();
+    async function startProject(name) {
+      alert('Start functionality is not implemented via FastAPI yet.');
     }
 
-    async function pauseProject(containerName) {
-        await fetch(`/controls/pause/${containerName}`);
-      fetchProjects();
+    async function pauseProject(name) {
+      alert('Pause functionality is not implemented via FastAPI yet.');
     }
 
-    function toggleLogs(containerName) {
-      const pre = document.getElementById(`log-${containerName}`);
+    function toggleLogs(name) {
+      const pre = document.getElementById(`log-${name}`);
       if (pre.style.display === 'none') {
         pre.style.display = 'block';
-        fetchLogs(containerName, pre);
+        streamLogs(name, pre);
       } else {
         pre.style.display = 'none';
       }
     }
 
-    async function fetchLogs(containerName, target) {
-        const res = await fetch(`/logs/fetch/${containerName}`);
-        const logs = await res.text();
-        target.innerHTML = logs;
+    function streamLogs(name, target) {
+      const evtSrc = new EventSource(`/logs/${name}`);
+      evtSrc.onmessage = function (event) {
+        target.textContent += event.data + "\n";
+        target.scrollTop = target.scrollHeight;
+      };
+      evtSrc.onerror = () => evtSrc.close();
     }
 
     fetchProjects();
-    setInterval(fetchProjects, 5000); // Refresh every 5 seconds
   </script>
 </body>
 </html>