[RTY-260028]: make qr constant

Author: Ravindrayadav04

app/main.py

@@ -6,12 +6,13 @@
 
 from fastapi import FastAPI, Request
 
-# from fastapi.responses import JSONResponse
+from fastapi.responses import JSONResponse
 from fastapi.staticfiles import StaticFiles
 from starlette.middleware.sessions import SessionMiddleware
 
 # from fastapi.exceptions import RequestValidationError
 # from starlette.exceptions import HTTPException as StarletteHTTPException
+from fastapi.exceptions import HTTPException as FastAPIHTTPException
 from fastapi.templating import Jinja2Templates
 
 from app.routes import ui_router
@@ -24,6 +25,7 @@
 from app.utils.config import (
     CACHE_TTL,
     SESSION_SECRET,
+    QR_DIR,
 )
 
 
@@ -96,34 +98,65 @@ async def lifespan(app: FastAPI):
 app.add_middleware(SessionMiddleware, secret_key=SESSION_SECRET)
 templates = Jinja2Templates(directory="app/templates")
 
+# Mount QR static files
 BASE_DIR = Path(__file__).resolve().parent
-STATIC_DIR = BASE_DIR / "static"
 
-app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
-
-# QR codes are now served from /qr, which maps to assets/images/qr in the project root
-PROJECT_ROOT = BASE_DIR.parent
-QR_DIR = PROJECT_ROOT / "assets" / "images" / "qr"
-app.mount("/qr", StaticFiles(directory=QR_DIR), name="qr")
+# Mount QR static files
+app.mount(
+    "/static",
+    StaticFiles(directory=str(BASE_DIR / "static")),
+    name="static",
+)
+# Ensure QR directory exists at startup
+QR_DIR.mkdir(parents=True, exist_ok=True)
+app.mount(
+    "/qr",
+    StaticFiles(directory=str(QR_DIR)),
+    name="qr",
+)
 
 # -----------------------------
 # Global error handler
 # -----------------------------
-# app.exception_handler(Exception)
-# sync def global_exception_handler(request: Request, exc: Exception):
-#    traceback.print_exc()
-#    return JSONResponse(
+# @app.exception_handler(Exception)
+# async def global_exception_handler(request: Request, exc: Exception):
+#  traceback.print_exc()
+#  return JSONResponse(
 #        status_code=500,
 #        content={"success": False, "error": "INTERNAL_SERVER_ERROR"},
 #    )
 
 
-@app.exception_handler(404)
-async def custom_404_handler(request: Request, exc):
-    return templates.TemplateResponse(
-        "404.html",
-        {"request": request},
-        status_code=404,
+# @app.exception_handler(404)
+# async def custom_404_handler(request: Request, exc):
+#    return templates.TemplateResponse(
+#        "404.html",
+#        {"request": request},
+#        status_code=404,
+#    )
+
+
+@app.exception_handler(FastAPIHTTPException)
+async def http_exception_handler(request: Request, exc: FastAPIHTTPException):
+
+    # If it's API/UI route → return JSON
+    if request.url.path.startswith("/cache") or request.url.path.startswith("/api"):
+        return JSONResponse(
+            status_code=exc.status_code,
+            content={"error": exc.detail},
+        )
+
+    # If it's browser route → return HTML page
+    if exc.status_code == 404:
+        return templates.TemplateResponse(
+            "404.html",
+            {"request": request},
+            status_code=404,
+        )
+
+    return JSONResponse(
+        status_code=exc.status_code,
+        content={"success": False, "error": exc.detail},
     )
 
 

app/routes.py

@@ -1,6 +1,5 @@
 import os
 from datetime import datetime, timezone
-from pathlib import Path
 from typing import Optional
 from app.utils.cache import list_cache_clean, clear_cache
 from fastapi import (
@@ -35,13 +34,12 @@
     remove_cache_key,
     rev_cache,
 )
-from app.utils.config import DOMAIN, MAX_RECENT_URLS, CACHE_PURGE_TOKEN
+from app.utils.config import DOMAIN, MAX_RECENT_URLS, CACHE_PURGE_TOKEN, QR_DIR
 from app.utils.helper import generate_code, is_valid_url, sanitize_url, format_date
 from app.utils.qr import generate_qr_with_logo
 
-BASE_DIR = Path(__file__).resolve().parent
-templates = Jinja2Templates(directory=str(BASE_DIR / "templates"))
-
+# templates = Jinja2Templates(directory=str(BASE_DIR / "templates"))
+templates = Jinja2Templates(directory="app/templates")
 # Routers
 ui_router = APIRouter()
 api_router = APIRouter()
@@ -68,10 +66,7 @@ async def index(request: Request):
     if qr_enabled and new_short_url and short_code:
         qr_data = new_short_url
         qr_filename = f"{short_code}.png"
-        PROJECT_ROOT = BASE_DIR.parent  # go from app/ → project root
-        qr_dir = PROJECT_ROOT / "assets" / "images" / "qr"
-        qr_dir.mkdir(parents=True, exist_ok=True)
-        generate_qr_with_logo(qr_data, str(qr_dir / qr_filename))
+        generate_qr_with_logo(qr_data, str(QR_DIR / qr_filename))
         qr_image = f"/qr/{qr_filename}"
 
     recent_urls = db.get_recent_urls(MAX_RECENT_URLS) or get_recent_from_cache(
@@ -139,7 +134,6 @@ async def create_short_url(
     return RedirectResponse("/", status_code=status.HTTP_303_SEE_OTHER)
 
 
-@ui_router.get("/recent", response_class=HTMLResponse)
 @ui_router.get("/history", response_class=HTMLResponse)
 async def recent_urls(request: Request):
     recent_urls_list = db.get_recent_urls(MAX_RECENT_URLS) or get_recent_from_cache(
@@ -229,14 +223,15 @@ def redirect_short_ui(short_code: str, background_tasks: BackgroundTasks):
     raise HTTPException(status_code=404, detail="Page not found")
 
 
-@ui_router.delete("/recent/{short_code}")
+@ui_router.delete("/history/{short_code}")
 def delete_recent_api(short_code: str):
     recent = get_recent_from_cache(MAX_RECENT_URLS) or []
     removed_from_cache = False
 
     for i, item in enumerate(recent):
         code = item.get("short_code") or item.get("code")
         if code == short_code:
+            recent.pop(i)  # remove from cache
             removed_from_cache = True
             break
 
@@ -246,7 +241,6 @@ def delete_recent_api(short_code: str):
     if db_available:
         db_deleted = db.delete_by_short_code(short_code)
 
-    # ✅ If nothing was deleted anywhere → 404
     if not removed_from_cache and not db_deleted:
         raise HTTPException(
             status_code=404, detail=f"short_code '{short_code}' not found"

app/static/css/tiny.css

@@ -334,6 +334,7 @@ body.dark-theme .app-header {
   justify-content: space-between;
   margin-bottom: 1rem;
   padding: 0 0.5rem;
+  align-items: center;
 }
 
 .scroll-container {
@@ -364,15 +365,6 @@ body.dark-theme .app-header {
   font-weight: bold;
 }
 
-/*.original-url {
-  color: var(--text-secondary);
-  font-size: 0.8rem;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}*/
-
-
 .hero {
   text-align: center;
   margin: 40px 0;
@@ -748,22 +740,6 @@ body.dark-theme .footer-bottom a {
 }
 
 
-/* ===============================
-   HOME PAGE FIX — LONG URL WRAP
-   (does NOT affect table)
-================================= */
-/*.recent-tray .recent-item .original-url,
-.recent-tray .recent-item .original-url a {
-  white-space: normal !important;
-  word-break: break-word !important;
-  overflow-wrap: anywhere !important;
-  line-break: anywhere !important;
-  display: block;
-}
-
-.recent-tray .recent-item {
-  max-width: 20px;
-}*/
 
 
 /* allow wrapping */
@@ -789,4 +765,26 @@ body.dark-theme .footer-bottom a {
   min-width: 0;
   /* allows shrinking inside flex/grid */
   max-width: 100%;
+}
+
+/* ===============================
+   VIEW HISTORY COLOR BY THEME
+================================= */
+
+body.dark-theme .history-link {
+  color: #ffffff;
+}
+
+body.light-theme .history-link {
+  color: #000000;
+}
+
+.history-link {
+  text-decoration: line;
+  font-weight: 600;
+  transition: 0.2s ease;
+}
+
+.history-link:hover {
+  opacity: 0.7;
 }

app/templates/index.html

@@ -33,7 +33,7 @@ <h1>Shorten Your Links</h1>
   </div> {% endif %} <div class="recent-tray">
     <div class="recent-header">
       <h3>Recently Shortened</h3>
-      <a href="/recent" class="history-link" target="_blank">View History →</a>
+      <a href="/history" class="history-link" target="_blank">View History →</a>
     </div>
     <div class="scroll-container"> {% for url in urls %} <div class="recent-item">
         <div class="short-code">/{{ url.short_code }}</div>

app/templates/recent.html

@@ -42,7 +42,7 @@ <h1>Recent Shortened URLs</h1>
   function deleteUrl(shortCode, btn) {
     if (!confirm("Are you sure you want to delete this URL?")) return;
 
-    fetch(`/recent/${shortCode}`, {
+    fetch(`/history/${shortCode}`, {
       method: "DELETE"
     })
       .then(async (res) => {
@@ -52,20 +52,15 @@ <h1>Recent Shortened URLs</h1>
           throw new Error("Delete failed");
         }
 
-        return fetch(`/delete/${shortCode}`, { method: "POST" });
-      })
-      .then(res => {
-        if (!res.ok) throw new Error("Delete failed");
-
+        // ✅ remove row from table
         const row = btn.closest("tr");
         if (row) row.remove();
       })
       .catch((err) => {
         console.error(err);
         alert("Failed to delete URL");
       });
-  }   // ✅ <-- THIS WAS MISSING
-
+  }
 
   function toggleRecent() {
     const box = document.getElementById('recentList');

app/utils/config.py

@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 
 # -------------------------
 # Helpers
@@ -79,3 +80,10 @@ def _get_int(key: str, default: int) -> int:
 # -------------------------
 SHORT_CODE_LENGTH = 6
 MAX_URL_LENGTH = 2048
+
+# for making the qr constant
+# Base project paths
+BASE_DIR = Path(__file__).resolve().parent.parent  # app/
+PROJECT_ROOT = BASE_DIR.parent  # project root
+# QR directory constant
+QR_DIR = PROJECT_ROOT / "assets" / "images" / "qr"