Serve clean index_v2.html frontend, remove comments, mount /static

app_main.py

@@ -1,12 +1,13 @@
-"""Restructured homepage with CSS-first approach to hide news."""
+"""VNEWS v2 - Clean frontend served from static/index_v2.html. Comments removed."""
 from app_run import *
 from app_run import app, f5, f6, rt, PATCH_INJECT, UNIFIED_INJECT_FIXED, HIGHLIGHT_FULL_OVERRIDE, EXTRA_WALL_FIX, FAST_HASHTAG_JS
-from fastapi.responses import HTMLResponse, JSONResponse
+from fastapi.responses import HTMLResponse, JSONResponse, FileResponse
+from fastapi.staticfiles import StaticFiles
 from fastapi import Query
 import requests as req
 from urllib.parse import quote
 from bs4 import BeautifulSoup
-import re, html as html_lib
+import re, html as html_lib, os
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
 def _clean(s):return re.sub(r"\s+"," ",html_lib.unescape(str(s or ""))).strip()
@@ -103,9 +104,11 @@ def _search_all(topic, limit=30):
         if i.get('url') and i['url'] not in seen:seen.add(i['url']);unique.append(i)
     return unique[:limit]
 
+# Remove old routes we're overriding
 app.router.routes=[r for r in app.router.routes if not (
     (getattr(r,'path',None)=='/api/hashtag/sources' and 'GET' in getattr(r,'methods',set())) or
-    (getattr(r,'path',None)=='/' and 'GET' in getattr(r,'methods',set()))
+    (getattr(r,'path',None)=='/' and 'GET' in getattr(r,'methods',set())) or
+    (getattr(r,'path',None) in ('/api/short/comments','/api/short/comment'))
 )]
 
 @app.get('/api/hashtag/sources')
@@ -114,97 +117,33 @@ def _ht(topic:str=Query(...), page:int=Query(default=0)):
     per_page=6;start=page*per_page;end=start+per_page
     return JSONResponse({'sources':all_items[start:end],'topic':topic,'page':page,'has_more':end<len(all_items),'total':len(all_items)})
 
-# CSS hides news grids INSTANTLY (no JS delay). Shorts/Wall/AI/Livescore use .slider-wrap/.ls-section — not affected.
-HOMEPAGE_RESTRUCTURE_JS = r'''
-<style>
-/* INSTANTLY hide all news grids on homepage — they use .section-title + .grid directly under #view-home */
-#view-home>.section-title,#view-home>.grid{display:none!important}
-</style>
-<script>
-(function(){
-function esc(s){return String(s||'').replace(/[&<>"']/g,function(m){return{'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]});}
+# Mount static files directory
+STATIC_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'static')
+app.mount('/static', StaticFiles(directory=STATIC_DIR), name='static')
 
-// Add "Tin tức" tab
-function addNewsTab(){
-  var bar=document.getElementById('cat-bar');
-  if(!bar||bar.querySelector('[data-cat="news-all"]'))return;
-  var btn=document.createElement('div');
-  btn.className='cat';btn.dataset.cat='news-all';btn.textContent='📰 Tin tức';
-  btn.onclick=function(){switchToNewsTab();};
-  var videoTab=bar.querySelector('[data-cat="video"]');
-  if(videoTab)videoTab.after(btn);else bar.appendChild(btn);
-}
-function switchToNewsTab(){
-  document.querySelectorAll('.cat').forEach(function(c){c.classList.remove('active')});
-  document.querySelector('[data-cat="news-all"]')?.classList.add('active');
-  showView('view-cat');loadNewsTab();
-}
-async function loadNewsTab(){
-  var el=document.getElementById('view-cat');
-  el.innerHTML='<div class="loading">Đang tải tin tức...</div>';
-  try{
-    var r=await fetch('/api/homepage');var news=await r.json();
-    if(!news.length){el.innerHTML='<div class="loading">Không có tin</div>';return;}
-    var groups={};news.forEach(function(a){if(!groups[a.group])groups[a.group]=[];groups[a.group].push(a);});
-    var h='';
-    for(var g in groups){var arts=groups[g];h+='<div class="section-title">'+esc(g)+'</div><div class="grid">';arts.slice(0,6).forEach(function(a){var bg=a.source==='bbc'?'badge-bbc':a.source==='dantri'?'badge-dt':'badge-vne';h+='<div class="card" onclick="readArticle(\''+esc(a.link)+'\')"><div class="card-img">'+(a.img?'<img src="'+esc(a.img)+'">':'')+'</div><div class="card-body"><span class="badge '+bg+'">'+esc(a.source)+'</span><div class="card-title">'+esc(a.title)+'</div></div></div>';});h+='</div>';}
-    el.innerHTML=h;
-  }catch(e){el.innerHTML='<div class="loading">Lỗi</div>';}
-}
+# Categories endpoint for v2 frontend
+@app.get('/api/categories')
+def _categories():
+    return JSONResponse([])
 
-// Auto-load first hashtag
-function autoLoadFirst(){
-  var chips=document.querySelectorAll('.hot-chip[data-fixed]');
-  if(chips.length>0){
-    var first=chips[0];var topic=first.dataset.topic||first.textContent.replace(/^#/,'').trim();
-    if(topic&&typeof showHashtagSources==='function'){showHashtagSources(topic);return true;}
-  }
-  return false;
-}
+# Storage status
+@app.get('/api/storage_status')
+def _storage():
+    data_dir='/data'
+    return JSONResponse({'persistent':os.path.isdir(data_dir) and os.access(data_dir, os.W_OK)})
 
-setTimeout(addNewsTab,2000);
-var _at=0;var _ai=setInterval(function(){_at++;if(autoLoadFirst()||_at>12)clearInterval(_ai);},2000);
-})();
-</script>
-'''
-
-HASHTAG_FIX_JS = r'''
-<script>
-(function(){
-function patchChips(){
-  document.querySelectorAll('.hot-chip:not([data-fixed])').forEach(function(chip){
-    chip.dataset.fixed='1';
-    var oc=chip.getAttribute('onclick')||'';
-    var m=oc.match(/\.value='([^']+)'/);
-    var topic=m?m[1]:chip.textContent.replace(/^#/,'').trim();
-    chip.dataset.topic=topic;
-    chip.removeAttribute('onclick');
-    chip.addEventListener('click',function(e){
-      e.preventDefault();e.stopPropagation();
-      if(typeof showHashtagSources==='function')showHashtagSources(topic);
-    });
-  });
-}
-setTimeout(patchChips,1500);
-setInterval(patchChips,2000);
-})();
-</script>
-'''
+# Share page
+@app.get('/s')
+async def _share(url:str='',title:str='',img:str=''):
+    html=f'<!DOCTYPE html><html><head><meta property="og:title" content="{_clean(title)}"><meta property="og:url" content="{_clean(url)}"><meta property="og:image" content="{_clean(img)}"><meta property="og:type" content="article"><meta property="og:site_name" content="VNEWS"><meta http-equiv="refresh" content="0;url={_clean(url) or "/"}"></head><body>Redirecting...</body></html>'
+    return HTMLResponse(html)
 
+# === SERVE CLEAN V2 FRONTEND ===
 @app.get('/')
-async def _index_final():
-    html=f5.f4.f3.f2.f1._load_index_html()
-    body=''
-    body+=getattr(rt.old,'PATCH_INJECT','')
-    body+=f5.f4.f3.f2.f1.FINAL_INJECT+f5.f4.f3.FINAL3_INJECT+f5.f4.FINAL4_INJECT+f5.FINAL5_INJECT
-    body+=getattr(f6,'FINAL6_INJECT','')
-    body+=getattr(f6,'FINAL6_FAST_HOME_INJECT','')
-    body+=getattr(f6,'FINAL6E_INJECT','')
-    body+=PATCH_INJECT
-    body+=UNIFIED_INJECT_FIXED
-    body+=HIGHLIGHT_FULL_OVERRIDE
-    body+=EXTRA_WALL_FIX
-    body+=FAST_HASHTAG_JS
-    body+=HASHTAG_FIX_JS
-    body+=HOMEPAGE_RESTRUCTURE_JS
-    return HTMLResponse(html.replace('</body>',body+'\n</body>') if '</body>' in html else html+body)
+async def _index_v2():
+    """Serve the clean v2 frontend - no injection layers."""
+    index_path = os.path.join(STATIC_DIR, 'index_v2.html')
+    if os.path.exists(index_path):
+        return FileResponse(index_path, media_type='text/html')
+    # Fallback: old method if file missing
+    return HTMLResponse('<html><body><h1>VNEWS</h1><p>Building...</p></body></html>')