Fix frontend routing

app.py

@@ -1,209 +1,201 @@
 """
 Moharek GEO Platform - Hugging Face Space
-Complete integration of FastAPI backend + Gradio frontend
+AI-Powered Generative Engine Optimization Platform
 """
 
 import os
 import sys
 from pathlib import Path
 
-# Add paths
+# Add server to path
 sys.path.insert(0, str(Path(__file__).parent))
 
 import gradio as gr
-import uvicorn
+from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
-from fastapi.responses import FileResponse
+from fastapi.responses import FileResponse, HTMLResponse
 
-# Import the main FastAPI app
+# Import the main API
 from server.api import app as fastapi_app
 
 # Configuration
-PORT = int(os.environ.get("PORT", 7860))
-HOST = "0.0.0.0"
-
-print("🚀 Moharek GEO Platform Starting...")
-print(f"📍 Working directory: {Path.cwd()}")
-print(f"🌐 Server: http://{HOST}:{PORT}")
-
-# Mount frontend files at /app prefix
 frontend_path = Path(__file__).parent / "frontend"
+
+# Mount frontend static files
 if frontend_path.exists():
-    print(f"📁 Frontend path: {frontend_path}")
+    # Mount all static assets
+    fastapi_app.mount("/assets", StaticFiles(directory=str(frontend_path / "assets")), name="assets")
     
-    # Mount static files
-    fastapi_app.mount("/frontend", StaticFiles(directory=str(frontend_path)), name="frontend_static")
+    # Serve SVG logos
+    @fastapi_app.get("/moharek-logo-v2.svg")
+    async def serve_logo_v2():
+        return FileResponse(str(frontend_path / "moharek-logo-v2.svg"))
     
-    # Serve frontend pages at /app/* - MUST be defined before Gradio mounting
-    from fastapi.responses import JSONResponse
+    @fastapi_app.get("/moharek-logo.svg")
+    async def serve_logo():
+        return FileResponse(str(frontend_path / "moharek-logo.svg"))
+    
+    @fastapi_app.get("/moharek-favicon.svg")
+    async def serve_favicon():
+        return FileResponse(str(frontend_path / "moharek-favicon.svg"))
+    
+    # Serve JavaScript files
+    @fastapi_app.get("/{filename}.js")
+    async def serve_js(filename: str):
+        file_path = frontend_path / f"{filename}.js"
+        if file_path.exists():
+            return FileResponse(str(file_path), media_type="application/javascript")
+        return {"ok": False, "error": "not found"}
     
-    @fastapi_app.get("/app/")
-    async def serve_app_index():
+    # Serve CSS files
+    @fastapi_app.get("/{filename}.css")
+    async def serve_css(filename: str):
+        file_path = frontend_path / f"{filename}.css"
+        if file_path.exists():
+            return FileResponse(str(file_path), media_type="text/css")
+        return {"ok": False, "error": "not found"}
+    
+    # Serve HTML pages
+    @fastapi_app.get("/{page}.html")
+    async def serve_page(page: str):
+        file_path = frontend_path / f"{page}.html"
+        if file_path.exists():
+            return FileResponse(str(file_path), media_type="text/html")
+        return {"ok": False, "error": "not found"}
+    
+    # Serve index at root
+    @fastapi_app.get("/")
+    async def serve_index():
         index_file = frontend_path / "index.html"
         if index_file.exists():
-            return FileResponse(str(index_file))
-        return JSONResponse({"error": "index.html not found"}, status_code=404)
-    
-    @fastapi_app.get("/app/{page}")
-    async def serve_app_page(page: str):
-        # Handle both .html and without extension
-        if not page.endswith('.html'):
-            page = page + '.html'
-        
-        file_path = frontend_path / page
-        if file_path.exists():
-            return FileResponse(str(file_path))
-        
-        return JSONResponse({"error": f"Page {page} not found"}, status_code=404)
+            return FileResponse(str(index_file), media_type="text/html")
+        return HTMLResponse(content="<h1>Moharek GEO Platform</h1><p>Frontend files not found</p>")
 
 # Create Gradio interface
-def create_gradio_ui():
-    with gr.Blocks(
-        title="Moharek GEO Platform",
-        theme=gr.themes.Soft(primary_hue="teal", secondary_hue="green"),
-        css="""
-        .gradio-container {
-            background: linear-gradient(135deg, #071f21 0%, #0F4246 100%);
-            font-family: 'Cairo', sans-serif;
-        }
-        .gr-button-primary {
-            background: linear-gradient(135deg, #c8f04e, #a8d630) !important;
-            color: #071f21 !important;
-            font-weight: 900 !important;
-        }
-        """
-    ) as demo:
-        gr.Markdown("""
-        # 🚀 محرك — Moharek GEO Platform
-        
-        ## منصة تحسين محركات البحث بالذكاء الاصطناعي
-        
-        **Search Growth System** — 5 محركات متكاملة
-        
-        ---
-        
-        ### 🎯 الميزات الرئيسية:
-        
-        - 📈 **SEO Engine** — تحسين محركات البحث
-        - 🤖 **AI Visibility Engine** — الظهور في ChatGPT
-        - 🎯 **Ads Engine** — إدارة الإعلانات
-        - 📝 **Content Engine** — إنشاء المحتوى
-        - ⭐ **Trust Engine** — بناء الثقة
-        """)
-        
-        with gr.Row():
-            with gr.Column(scale=2):
-                gr.Markdown("### 🔍 ابدأ التحليل")
-                
-                url_input = gr.Textbox(
-                    label="رابط الموقع",
-                    placeholder="https://example.com"
-                )
-                
-                org_input = gr.Textbox(
-                    label="اسم الشركة",
-                    placeholder="اسم شركتك"
-                )
-                
-                pages_slider = gr.Slider(
-                    minimum=10,
-                    maximum=100,
-                    value=50,
-                    step=10,
-                    label="عدد الصفحات"
-                )
-                
-                analyze_btn = gr.Button("🚀 ابدأ التحليل", variant="primary")
+with gr.Blocks(
+    title="Moharek GEO Platform",
+    theme=gr.themes.Soft(primary_hue="teal", secondary_hue="green"),
+    css="""
+    .gradio-container {
+        background: linear-gradient(135deg, #071f21 0%, #0F4246 100%);
+        font-family: 'Cairo', sans-serif;
+    }
+    .gr-button-primary {
+        background: linear-gradient(135deg, #c8f04e, #a8d630) !important;
+        color: #071f21 !important;
+        font-weight: 900 !important;
+    }
+    """
+) as demo:
+    
+    gr.Markdown("""
+    # 🚀 محرك — Moharek GEO Platform
+    
+    ## منصة تحسين محركات البحث بالذكاء الاصطناعي
+    
+    **Search Growth System** — 5 محركات متكاملة تغطي كل رحلة العميل
+    
+    ---
+    
+    ### 🎯 الميزات الرئيسية:
+    
+    - 📈 **SEO Engine** — تحسين محركات البحث التقليدية
+    - 🤖 **AI Visibility Engine** — الظهور في ChatGPT و Gemini
+    - 🎯 **Ads Engine** — إدارة الإعلانات الذكية
+    - 📝 **Content Engine** — إنشاء محتوى متعدد القنوات
+    - ⭐ **Trust Engine** — بناء الثقة والسمعة الرقمية
+    """)
+    
+    with gr.Row():
+        with gr.Column(scale=2):
+            gr.Markdown("### 🔍 ابدأ تحليل موقعك الآن")
             
-            with gr.Column(scale=1):
-                gr.Markdown("""
-                ### 📊 ماذا ستحصل؟
-                
-                ✅ تحليل SEO شامل  
-                ✅ تقييم GEO Score  
-                ✅ استخراج الكلمات المفتاحية  
-                ✅ توصيات قابلة للتنفيذ  
-                
-                ---
-                
-                ### 🌐 الوصول الكامل
-                
-                👉 [لوحة التحكم](/app/portal.html)  
-                👉 [تسجيل الدخول](/app/login.html)  
-                👉 [API Docs](/api/docs)  
-                """)
-        
-        status_output = gr.Textbox(label="الحالة", interactive=False, lines=3)
-        json_output = gr.JSON(label="النتائج")
-        
-        def analyze(url, org, pages):
-            if not url or not url.startswith('http'):
-                return "❌ الرجاء إدخال رابط صحيح", None
+            website_url = gr.Textbox(
+                label="رابط الموقع",
+                placeholder="https://example.com",
+                info="أدخل رابط موقعك للحصول على تحليل شامل"
+            )
             
-            try:
-                import requests
-                response = requests.post(
-                    f"http://localhost:{PORT}/api/jobs",
-                    json={
-                        "url": url,
-                        "org_name": org or "Unknown",
-                        "org_url": url,
-                        "max_pages": int(pages),
-                        "runs": 1
-                    },
-                    timeout=30
-                )
-                
-                if response.status_code == 200:
-                    data = response.json()
-                    if data.get("ok"):
-                        job_id = data.get("job_id")
-                        return f"✅ تم إنشاء التحليل!\n\nJob ID: {job_id}", data
-                    return f"❌ خطأ: {data.get('error')}", None
-                return f"❌ خطأ: {response.status_code}", None
-            except Exception as e:
-                return f"❌ خطأ: {str(e)}", None
-        
-        analyze_btn.click(
-            fn=analyze,
-            inputs=[url_input, org_input, pages_slider],
-            outputs=[status_output, json_output]
-        )
+            org_name = gr.Textbox(
+                label="اسم الشركة/المؤسسة",
+                placeholder="اسم شركتك"
+            )
+            
+            max_pages = gr.Slider(
+                minimum=10,
+                maximum=100,
+                value=50,
+                step=10,
+                label="عدد الصفحات للتحليل"
+            )
+            
+            analyze_btn = gr.Button("🚀 ابدأ التحليل", variant="primary", size="lg")
         
-        gr.Markdown("""
-        ---
+        with gr.Column(scale=1):
+            gr.Markdown("""
+            ### 📊 ماذا ستحصل؟
+            
+            ✅ تحليل SEO شامل  
+            ✅ تقييم GEO Score  
+            ✅ استخراج الكلمات المفتاحية  
+            ✅ تحليل المحتوى  
+            ✅ توصيات قابلة للتنفيذ  
+            
+            ---
+            
+            ### 🌐 الوصول الكامل
+            
+            👉 <a href="/portal.html" target="_blank">افتح لوحة التحكم</a>
+            
+            👉 <a href="/index.html" target="_blank">الصفحة الرئيسية</a>
+            
+            👉 <a href="/api/docs" target="_blank">API Documentation</a>
+            """)
+    
+    output_status = gr.Textbox(label="حالة التحليل", interactive=False, lines=3)
+    output_json = gr.JSON(label="نتائج التحليل")
+    
+    def analyze_website(url, name, pages):
+        if not url or not url.startswith('http'):
+            return "❌ الرجاء إدخال رابط صحيح يبدأ بـ http:// أو https://", None
         
-        © 2025 محرك — Moharek GEO Platform
-        """)
+        try:
+            import requests
+            response = requests.post(
+                "http://localhost:7860/api/jobs",
+                json={
+                    "url": url,
+                    "org_name": name or "Unknown",
+                    "org_url": url,
+                    "max_pages": int(pages),
+                    "runs": 1
+                },
+                timeout=30
+            )
+            
+            if response.status_code == 200:
+                data = response.json()
+                if data.get("ok"):
+                    job_id = data.get("job_id")
+                    return f"✅ تم إنشاء التحليل بنجاح!\n\nJob ID: {job_id}\n\nيمكنك متابعة التقدم من لوحة التحكم", data
+                else:
+                    return f"❌ خطأ: {data.get('error', 'Unknown error')}", None
+            else:
+                return f"❌ خطأ في الاتصال: {response.status_code}", None
+        except Exception as e:
+            return f"❌ حدث خطأ: {str(e)}", None
     
-    return demo
-
-# Main execution
-if __name__ == "__main__":
-    print("✅ Creating Gradio interface...")
-    demo = create_gradio_ui()
-    
-    # Mount Gradio at /gradio to avoid route conflicts
-    print("✅ Mounting Gradio to FastAPI at /gradio...")
-    app = gr.mount_gradio_app(fastapi_app, demo, path="/gradio", root_path=os.environ.get("SPACE_ID", ""))
-    
-    # Add root redirect to Gradio
-    from fastapi.responses import RedirectResponse
-    
-    @app.get("/")
-    async def root_redirect():
-        return RedirectResponse(url="/gradio")
-    
-    print("✅ Starting server...")
-    print("📍 Gradio UI: /gradio")
-    print("📍 Portal: /app/portal.html")
-    print("📍 Login: /app/login.html")
-    print("📍 API: /api/*")
-    
-    uvicorn.run(
-        app,
-        host=HOST,
-        port=PORT,
-        log_level="info",
-        root_path=os.environ.get("SPACE_ID", "")
+    analyze_btn.click(
+        fn=analyze_website,
+        inputs=[website_url, org_name, max_pages],
+        outputs=[output_status, output_json]
     )
+    
+    gr.Markdown("""
+    ---
+    
+    © 2025 محرك — Moharek GEO Platform | Search Growth System
+    """)
+
+# Mount Gradio app to FastAPI
+app = gr.mount_gradio_app(fastapi_app, demo, path="/")