From 53ab98071ad62c8402e0db4f37d1aa095ec302f8 Mon Sep 17 00:00:00 2001 From: RecursiveZero Date: Mon, 16 Feb 2026 22:03:51 +0530 Subject: [PATCH 01/34] separate config env --- app/main.py | 5 +- app/utils/config.py | 23 ++----- app/utils/config_env.py | 15 +++++ group_shorten.ps1 | 134 ---------------------------------------- 4 files changed, 22 insertions(+), 155 deletions(-) create mode 100644 app/utils/config_env.py delete mode 100644 group_shorten.ps1 diff --git a/app/main.py b/app/main.py index cea15eb..09bb540 100644 --- a/app/main.py +++ b/app/main.py @@ -18,7 +18,7 @@ set_cache_pair, url_cache, ) -from app.utils.config import DOMAIN, MAX_RECENT_URLS, SESSION_SECRET, load_env +from app.utils.config import DOMAIN, MAX_RECENT_URLS, SESSION_SECRET from app.utils.helper import ( format_date, generate_code, @@ -27,7 +27,6 @@ ) from app.utils.qr import generate_qr_with_logo -load_env() # ----------------------------- @@ -151,7 +150,7 @@ async def create_short_url( return RedirectResponse("/", status_code=303) # Mypy now knows short_code is strictly 'str' - new_short_url = build_short_url(short_code, str(request.base_url)) + new_short_url = build_short_url(short_code, DOMAIN) session.update( { diff --git a/app/utils/config.py b/app/utils/config.py index c29ffec..0b9d73f 100644 --- a/app/utils/config.py +++ b/app/utils/config.py @@ -1,27 +1,14 @@ -import os - -from dotenv import load_dotenv - - -def load_env(): - env = os.getenv("ENV", "development") - file_map = { - "production": ".env", - "local": ".env.local", - "development": ".env.development", - } - load_dotenv(file_map.get(env, ".env.development"), override=True) - print(f"Environment selected: {env}") - print(f"MODE value: {os.getenv('MODE')}") - +import os # ------------------------- # Helpers # ------------------------- -def _get_bool(key: str, default: bool) -> bool: - return os.getenv(key, str(default)).lower() in ("1", "true", "yes", "on") +from app.utils.config_env import load_env # noqa: F401 + +load_env() + def _get_int(key: str, default: int) -> int: try: return int(os.getenv(key, default)) diff --git a/app/utils/config_env.py b/app/utils/config_env.py new file mode 100644 index 0000000..049232d --- /dev/null +++ b/app/utils/config_env.py @@ -0,0 +1,15 @@ +import os + +from dotenv import load_dotenv + + +def load_env(): + env = os.getenv("ENV", "development") + file_map = { + "production": ".env", + "local": ".env.local", + "development": ".env.development", + } + load_dotenv(file_map.get(env, ".env.development"), override=True) + print(f"Environment selected: {env}") + print(f"MODE value: {os.getenv('MODE')}") diff --git a/group_shorten.ps1 b/group_shorten.ps1 deleted file mode 100644 index 3e52c10..0000000 --- a/group_shorten.ps1 +++ /dev/null @@ -1,134 +0,0 @@ -<# -========================================================= - PowerShell Script: group_shorten.ps1 ---------------------------------------------------------- - Description: - Bulk URL shortener client for Tiny API. - Reads a JSON file containing multiple URLs and sends - them one-by-one to the /api/shorten endpoint. - ---------------------------------------------------------- - HOW TO RUN (Windows PowerShell TERMINAL) ---------------------------------------------------------- - - 1. Open PowerShell as Administrator - - 2. Allow script execution (one-time): - Set-ExecutionPolicy RemoteSigned - - 3. Navigate to project root: - cd path\to\your\project - - 4. Run with JSON file: - .\group_shorten.ps1 -file ".\request\mixed_urls.json" - - 5. Or run without argument (interactive): - .\group_shorten.ps1 - - ---------------------------------------------------------- - HOW TO RUN (Windows PowerShell ISE) ---------------------------------------------------------- - - Method 1: Run with parameter - -------------------------------- - 1. Open Windows PowerShell ISE - 2. Open this script file (group_shorten.ps1) - 3. In the top menu, click: - File → New PowerShell Tab - 4. In the console pane (bottom), run: - .\group_shorten.ps1 -file ".\request\mixed_urls.json" - - Method 2: Run interactively - -------------------------------- - 1. Open Windows PowerShell ISE - 2. Open this script file - 3. Press the green ▶️ Run Script button - 4. When prompted, enter the JSON file path - ---------------------------------------------------------- - Expected JSON input format: - [ - { "url": "https://example.com" }, - { "url": "https://google.com" } - ] -========================================================= -#> - -param ( - [string]$file -) - -# Ask for file path if not provided -if (-not $file) { - $file = Read-Host "Enter path to JSON file" -} - -# Validate file -if (-not (Test-Path $file)) { - Write-Host "❌ File not found: $file" -ForegroundColor Red - exit 1 -} - -# Load JSON -try { - $data = Get-Content $file -Raw | ConvertFrom-Json -} -catch { - Write-Host "❌ Invalid JSON file" -ForegroundColor Red - exit 1 -} - -$apiUrl = "http://127.0.0.1:8001/api/v1/shorten" - -Write-Host "`n🚀 Processing URLs..." -ForegroundColor Cyan - -foreach ($item in $data) { - - # Support string + object format - $url = if ($item -is [string]) { $item } else { $item.url } - - if (-not $url) { - Write-Host "⚠️ Empty URL, skipped" -ForegroundColor Yellow - continue - } - - # -------- LOCAL URL VALIDATION -------- - if ($url -notmatch '^[a-zA-Z]+://') { - Write-Host "❌ ERROR:" $url "- Missing protocol (http/https)" -ForegroundColor yellow - continue - } - - if ($url -notmatch '^https?://') { - Write-Host "❌ ERROR:" $url "- Unsupported protocol" -ForegroundColor yellow - continue - } - - if ($url -match 'https?:/[^/]') { - Write-Host "❌ ERROR:" $url "- Malformed URL (missing /)" -ForegroundColor yellow - continue - } - - if ($url -match '\.\.') { - Write-Host "❌ ERROR:" $url "- Invalid domain format" -ForegroundColor yellow - continue - } - - # -------- API REQUEST -------- - $body = @{ url = $url } | ConvertTo-Json - - try { - $response = Invoke-RestMethod ` - -Uri $apiUrl ` - -Method POST ` - -ContentType "application/json" ` - -Body $body - - Write-Host "✅ SUCCESS:" $url "→" $response.short_code -ForegroundColor Green - } - catch { - Write-Host "❌ ERROR:" $url "- Rejected by API" -ForegroundColor Yellow - } -} - -Write-Host "`n🎉 Done!" -ForegroundColor Cyan From 2669d81b8fe5b8bbd98418c6972d561f6a969858 Mon Sep 17 00:00:00 2001 From: RecursiveZero Date: Tue, 17 Feb 2026 13:44:33 +0530 Subject: [PATCH 02/34] update theme based UI --- app/static/css/tiny.css | 343 ++++++++++++++++++++++++++++---------- app/templates/header.html | 11 ++ app/templates/index.html | 71 ++++---- app/templates/layout.html | 4 +- 4 files changed, 293 insertions(+), 136 deletions(-) create mode 100644 app/templates/header.html diff --git a/app/static/css/tiny.css b/app/static/css/tiny.css index db092a6..873f075 100644 --- a/app/static/css/tiny.css +++ b/app/static/css/tiny.css @@ -16,64 +16,158 @@ body { background-image: radial-gradient(circle at 50% -20%, #1e1e2e 0%, transparent 50%); } +body { + background: var(--bg); + color: var(--text-primary); + font-family: "Inter", system-ui, sans-serif; + margin: 0; + overflow-x: hidden; + background-image: radial-gradient(circle at 50% -20%, #1e1e2e 0%, transparent 50%); +} + +/* Light theme overrides */ +body.light-theme { + --bg: #f9fafb; + --glass: rgba(0, 0, 0, 0.03); + --glass-border: rgba(0, 0, 0, 0.07); + --accent: #2563eb; + --text-primary: #111827; + --text-secondary: #4b5563; + + /* Remove or soften the dark gradient */ + background-image: none; + /* clean white background */ + /* Or use a subtle light gradient if you prefer */ + /* background-image: radial-gradient(circle at 50% -20%, #e5e7eb 0%, transparent 50%); */ +} + +/* Layout */ .main-layout { max-width: 900px; margin: 0 auto; - padding: 6rem 1.5rem; + padding: 4rem 1rem; display: flex; flex-direction: column; - align-items: center; gap: 2rem; - min-height: 52vh; } -/* --- LARGE HERO INPUT --- */ +.site-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 1rem 1.5rem; + background: var(--glass); + border-bottom: 1px solid var(--glass-border); + backdrop-filter: blur(10px); +} + +.header-left, +.header-right { + display: flex; + gap: 1rem; + align-items: center; +} + +.header-center { + flex: 1; + text-align: center; +} + +.logo { + margin: 0; + font-size: 1.5rem; + font-weight: 700; + color: var(--text-primary); +} + +.icon-btn { + background: none; + border: none; + color: var(--text-primary); + font-size: 1.2rem; + cursor: pointer; + transition: color 0.3s; +} + +.icon-btn:hover { + color: var(--accent); +} + +@media (max-width: 600px) { + .logo { + font-size: 1.2rem; + } +} + +/* Hero input */ .hero-input-card { width: 100%; background: var(--glass); backdrop-filter: blur(20px); border: 1px solid var(--glass-border); - border-radius: 2.5rem; - padding: 3rem; - box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5); + border-radius: 2rem; + padding: 2rem; } .hero-input-card h1 { - font-size: 3.5rem; + font-size: 2.5rem; font-weight: 800; - letter-spacing: -3px; - margin: 0 0 1.5rem 0; text-align: center; - background: linear-gradient(to right, #fff, #666); + margin-bottom: 1.5rem; + background: linear-gradient(to right, var(--text-primary), var(--text-secondary)); -webkit-background-clip: text; -webkit-text-fill-color: transparent; } .input-wrapper { - position: relative; display: flex; gap: 1rem; + flex-wrap: wrap; } .input-wrapper input { flex: 1; + min-width: 200px; background: rgba(255, 255, 255, 0.05); border: 1px solid var(--glass-border); border-radius: 1.5rem; - padding: 1.5rem 2rem; - color: white; - font-size: 1.2rem; - outline: none; - transition: all 0.3s ease; + padding: 1rem; + font-size: 1rem; + color: var(--text-primary); } -.input-wrapper input:focus { - border-color: var(--accent); - background: rgba(255, 255, 255, 0.08); - box-shadow: 0 0 0 4px rgba(99, 102, 241, 0.1); +.btn-primary { + padding: 0.8rem 2rem; + border-radius: 1.5rem; + background: var(--accent); + color: #fff; + font-weight: bold; + border: none; + cursor: pointer; + transition: background 0.3s; +} + +.btn-primary:hover { + background: #4f46e5; +} + +.options-row { + margin-top: 1rem; + display: flex; + flex-wrap: wrap; + gap: 1rem; + font-size: 0.85rem; + color: var(--text-secondary); +} + +.checkbox-label { + display: flex; + align-items: center; + gap: 0.5rem; + cursor: pointer; } -/* --- OUTPUT CARD (Immediate Result) --- */ +/* Result card */ .result-card { width: 100%; background: linear-gradient(145deg, rgba(99, 102, 241, 0.1), rgba(0, 0, 0, 0)); @@ -81,30 +175,89 @@ body { border-radius: 2rem; padding: 2rem; display: flex; - align-items: center; justify-content: space-between; - animation: slideUp 0.6s cubic-bezier(0.16, 1, 0.3, 1); + align-items: center; + gap: 2rem; +} + +.result-content { + display: flex; + align-items: center; + gap: 1.5rem; } -/* --- SCROLLABLE RECENT TRAY --- */ +.qr-image { + width: 80px; + height: 80px; + border-radius: 1rem; + background: #fff; + padding: 0.5rem; +} + +.ready-label { + font-size: 0.8rem; + text-transform: uppercase; + color: var(--accent); + font-weight: 800; +} + +.short-url a { + font-size: 1.5rem; + font-weight: 700; + color: var(--text-primary); + text-decoration: none; +} + +.result-actions { + display: flex; + flex-direction: column; + align-items: flex-end; + gap: 0.5rem; +} + +.btn-copy { + background: rgba(255, 255, 255, 0.05); + border: 1px solid var(--glass-border); + color: var(--text-primary); + padding: 0.8rem 1.5rem; + border-radius: 1rem; + cursor: pointer; + transition: all 0.3s ease; +} + +.btn-copy:hover { + border-color: var(--accent); + color: var(--accent); +} + +.download-link { + font-size: 0.75rem; + color: var(--text-secondary); + text-decoration: none; +} + +.download-link:hover { + color: var(--accent); +} + +/* Recent tray */ .recent-tray { width: 100%; - margin-top: 4rem; + margin-top: 2rem; } .recent-header { display: flex; justify-content: space-between; margin-bottom: 1rem; - padding: 0 1rem; + padding: 0 0.5rem; } .scroll-container { display: flex; gap: 1rem; overflow-x: auto; - padding: 1rem; - mask-image: linear-gradient(to right, black 85%, transparent); + padding: 1rem 0; } .scroll-container::-webkit-scrollbar { @@ -112,51 +265,53 @@ body { } .recent-item { - min-width: 250px; + min-width: 220px; background: var(--glass); border: 1px solid var(--glass-border); - padding: 1.5rem; - border-radius: 1.5rem; - font-size: 0.9rem; + padding: 1rem; + border-radius: 1rem; + display: flex; + flex-direction: column; + gap: 0.5rem; + flex-shrink: 0; } -@keyframes slideUp { - from { - opacity: 0; - transform: translateY(20px); - } +.short-code { + color: var(--accent); + font-weight: bold; +} - to { - opacity: 1; - transform: translateY(0); - } +.original-url { + color: var(--text-secondary); + font-size: 0.8rem; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } -/* --- LARGE FOOTER --- */ +/* Footer */ .big-footer { background: rgba(255, 255, 255, 0.01); - border-top: 1px solid var(--border); - padding: 6rem 0 3rem 0; - margin-top: 8rem; + border-top: 1px solid var(--glass-border); + padding: 4rem 1rem 2rem; + margin-top: 4rem; } .footer-grid { max-width: 1200px; margin: 0 auto; - padding: 0 1.5rem; display: grid; grid-template-columns: 2fr 1fr 1fr 1fr; - gap: 4rem; + gap: 2rem; } .footer-brand h3 { font-size: 1.5rem; - margin: 0 0 1rem 0; - letter-spacing: -1px; + margin-bottom: 1rem; } .footer-brand p { - color: var(--text-dim); + color: var(--text-secondary); line-height: 1.6; max-width: 320px; } @@ -165,8 +320,8 @@ body { font-size: 0.85rem; text-transform: uppercase; letter-spacing: 0.1em; - margin-bottom: 1.5rem; - color: var(--text); + margin-bottom: 1rem; + color: var(--text-primary); } .footer-col ul { @@ -180,7 +335,7 @@ body { } .footer-col ul li a { - color: var(--text-dim); + color: var(--text-secondary); text-decoration: none; font-size: 0.9rem; transition: color 0.2s; @@ -192,65 +347,69 @@ body { .footer-bottom { max-width: 1200px; - margin: 4rem auto 0; - padding: 2rem 1.5rem 0; - border-top: 1px solid var(--border); + margin: 2rem auto 0; + padding-top: 1rem; + border-top: 1px solid var(--glass-border); display: flex; + flex-wrap: wrap; justify-content: space-between; align-items: center; - color: var(--text-dim); + color: var(--text-secondary); font-size: 0.8rem; } +.footer-meta { + display: flex; + gap: 1rem; +} + +.footer-meta a { + color: inherit; + text-decoration: none; +} + +.footer-meta a:hover { + color: var(--accent); +} + +/* Responsive adjustments */ @media (max-width: 900px) { .footer-grid { grid-template-columns: 1fr 1fr; } } -/* The container for the icon/button */ -.copy-btn { - position: relative; - cursor: pointer; - transition: transform 0.1s ease; -} +@media (max-width: 700px) { + .result-card { + flex-direction: column; + align-items: flex-start; + } -.copy-btn:active { - transform: scale(0.9); -} + .result-actions { + align-items: flex-start; + } -/* The "Smart" Tooltip */ -.copy-btn.copy-success::after { - content: attr(data-tooltip); - position: absolute; - top: -30px; - left: 50%; - transform: translateX(-50%); - background: #333; - color: #fff; - padding: 4px 8px; - border-radius: 4px; - font-size: 12px; - white-space: nowrap; - animation: fadeInOut 2s forwards; + .recent-item { + min-width: 180px; + } } -@keyframes fadeInOut { - 0% { - opacity: 0; - transform: translate(-50%, 5px); +@media (max-width: 600px) { + .hero-input-card h1 { + font-size: 2rem; } - 15% { - opacity: 1; - transform: translate(-50%, 0); + .short-url a { + font-size: 1.2rem; } - 85% { - opacity: 1; + .footer-grid { + grid-template-columns: 1fr; } - 100% { - opacity: 0; + .footer-bottom { + flex-direction: column; + gap: 1rem; + text-align: center; } } diff --git a/app/templates/header.html b/app/templates/header.html new file mode 100644 index 0000000..c7b19b1 --- /dev/null +++ b/app/templates/header.html @@ -0,0 +1,11 @@ +
+
+ +
+ +
+
+ + +
+
\ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index eeadff1..7a5ecd4 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -8,47 +8,34 @@

tiny URL

- +
-
-
{% if new_short_url %}
-
+
{% if qr_image %} - + {% endif %}
- Ready -
-
- - +
+ {% if qr_image %} - - Download QR - + Download QR {% endif %}
@@ -56,16 +43,14 @@

tiny URL

-

Recently Shortened

- View History → +

Recently Shortened

+ View History →
{% for url in urls %}
-
/{{ url.short_code }}
-
- {{ url.original_url }}
+
/{{ url.short_code }}
+
{{ url.original_url }}
{% endfor %}
@@ -110,38 +95,38 @@

Legal

© 2026 Recursive Zero Pvt Ltd. All rights reserved.
-
+
v2.4.0-stable - GitHub + GitHub
{% endblock %} \ No newline at end of file diff --git a/app/templates/layout.html b/app/templates/layout.html index aeb3e5b..e96619f 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -15,7 +15,7 @@ - + {% block head_extra %}{% endblock %} @@ -23,6 +23,8 @@
+ {% include "header.html" %} + {% block content %}{% endblock %} + + \ No newline at end of file diff --git a/app/utils/cache.py b/app/utils/cache.py index a6f1c6a..9150f4a 100644 --- a/app/utils/cache.py +++ b/app/utils/cache.py @@ -7,6 +7,7 @@ class UrlCacheItem(TypedDict): url: str expires_at: float + visit_count: int class RevCacheItem(TypedDict): @@ -60,8 +61,9 @@ def set_cache_pair(short_code: str, original_url: str) -> None: expires_at = now + CACHE_TTL url_cache[short_code] = { - "url": original_url, - "expires_at": expires_at, + "url": original_url, + "expires_at": expires_at, + "visit_count": 0, } rev_cache[original_url] = { @@ -112,13 +114,14 @@ def get_recent_from_cache(limit: int = MAX_RECENT_URLS) -> list[dict]: now = _now() items = [ - { - "short_code": data["short_code"], - "original_url": original_url, - } - for original_url, data in rev_cache.items() - if data["expires_at"] >= now - ] + { + "short_code": data["short_code"], + "original_url": original_url, + "visit_count": url_cache.get(data["short_code"], {}).get("visit_count", 0), + } + for original_url, data in rev_cache.items() + if data["expires_at"] >= now + ] items.sort( key=lambda x: rev_cache[x["original_url"]]["last_accessed"], reverse=True diff --git a/app/utils/config.py b/app/utils/config.py index af78124..7bd3cec 100644 --- a/app/utils/config.py +++ b/app/utils/config.py @@ -1,14 +1,15 @@ - import os + # ------------------------- # Helpers # ------------------------- -from app.utils.config_env import load_env # noqa: F401 +from app.utils.config_env import load_env # noqa: F401 load_env() + def _get_int(key: str, default: int) -> int: try: return int(os.getenv(key, default)) diff --git a/app/utils/db.py b/app/utils/db.py index be7ed0c..eb9453d 100644 --- a/app/utils/db.py +++ b/app/utils/db.py @@ -34,10 +34,10 @@ def connect_db(max_retries: Optional[int] = None) -> bool: """ Connect to MongoDB with retry logic and exponential backoff. - + Args: max_retries: Maximum number of retry attempts (defaults to config value) - + Returns: True if connection successful, False otherwise """ @@ -68,8 +68,10 @@ def connect_db(max_retries: Optional[int] = None) -> bool: for attempt in range(1, max_retries + 1): connection_state = "CONNECTING" last_connection_attempt = datetime.utcnow() - - logger.info(f"Attempting to connect to MongoDB (attempt {attempt}/{max_retries})...") + + logger.info( + f"Attempting to connect to MongoDB (attempt {attempt}/{max_retries})..." + ) try: # Create MongoClient with timeout and pool settings @@ -80,17 +82,17 @@ def connect_db(max_retries: Optional[int] = None) -> bool: minPoolSize=MONGO_MIN_POOL_SIZE, maxPoolSize=MONGO_MAX_POOL_SIZE, ) - + # Validate connection with ping new_client.admin.command("ping") - + # Connection successful client = new_client db = new_client[MONGO_DB_NAME] collection = db[MONGO_COLLECTION] connection_state = "CONNECTED" connection_error = None - + logger.info("Successfully connected to MongoDB") return True @@ -98,7 +100,7 @@ def connect_db(max_retries: Optional[int] = None) -> bool: error_msg = f"Connection attempt {attempt} failed: {str(e)}" logger.warning(error_msg) connection_error = str(e) - + if attempt < max_retries: logger.info(f"Retrying in {retry_delay:.1f} seconds...") time.sleep(retry_delay) @@ -120,7 +122,9 @@ def get_connection_state() -> dict[str, Any]: """Return current connection state information.""" return { "state": connection_state, - "last_attempt": last_connection_attempt.isoformat() if last_connection_attempt else None, + "last_attempt": ( + last_connection_attempt.isoformat() if last_connection_attempt else None + ), "error": connection_error, "connected": is_connected(), } @@ -227,23 +231,23 @@ def increment_visit(short_code: str) -> Optional[dict]: async def health_check_loop() -> None: """Background task that periodically checks database connection health.""" global connection_state, connection_error - + from app.utils.config import HEALTH_CHECK_INTERVAL_SECONDS - + logger.info("Health check loop started") - + try: while True: await asyncio.sleep(HEALTH_CHECK_INTERVAL_SECONDS) - + logger.debug("Running health check...") - + # If disconnected, try to reconnect if not is_connected(): logger.info("Database disconnected, attempting reconnection...") connect_db() continue - + # Validate active connection with ping try: if client is not None: @@ -253,7 +257,7 @@ async def health_check_loop() -> None: logger.error(f"Health check failed: {str(e)}") connection_state = "FAILED" connection_error = str(e) - + except asyncio.CancelledError: logger.info("Health check loop cancelled") raise @@ -262,7 +266,7 @@ async def health_check_loop() -> None: def start_health_check() -> Any: """Start the background health check task.""" global health_check_task - + health_check_task = asyncio.create_task(health_check_loop()) logger.info("Health check task started") return health_check_task @@ -271,7 +275,7 @@ def start_health_check() -> Any: async def stop_health_check() -> None: """Stop the background health check task.""" global health_check_task - + if health_check_task is not None: logger.info("Stopping health check task...") health_check_task.cancel() From 401d1d18e8cb877facf60079fe846e1a91dc8632 Mon Sep 17 00:00:00 2001 From: harshmishra2701 Date: Tue, 24 Feb 2026 21:48:28 +0530 Subject: [PATCH 20/34] [RTY-260025]: feat(cache): enhance cache management with created_at timestamp --- app/templates/recent.html | 20 ++++-- app/utils/cache.py | 140 ++++++++++++++++---------------------- 2 files changed, 73 insertions(+), 87 deletions(-) diff --git a/app/templates/recent.html b/app/templates/recent.html index 26c5d69..5d89d19 100644 --- a/app/templates/recent.html +++ b/app/templates/recent.html @@ -185,16 +185,25 @@

Support

function deleteUrl(shortCode, btn) { if (!confirm("Are you sure you want to delete this URL?")) return; - fetch(`/delete/${shortCode}`, { - method: "POST" + fetch(`/recent/${shortCode}`, { + method: "DELETE" }) - .then(res => { - if (!res.ok) throw new Error("Delete failed"); + .then(async (res) => { + const data = await res.json(); + + if (!res.ok || !data.success) { + throw new Error("Delete failed"); + } + const row = btn.closest("tr"); if (row) row.remove(); }) - .catch(() => alert("Failed to delete URL")); + .catch((err) => { + console.error(err); + alert("Failed to delete URL"); + }); } + function toggleRecent() { const box = document.getElementById('recentList'); box.style.display = box.style.display === 'block' ? 'none' : 'block'; @@ -202,7 +211,6 @@

Support

box.scrollIntoView({ behavior: 'smooth', block: 'center' }); } } - diff --git a/app/utils/cache.py b/app/utils/cache.py index 14027b4..a7ef4c2 100644 --- a/app/utils/cache.py +++ b/app/utils/cache.py @@ -1,6 +1,7 @@ import time from typing import TypedDict - +from datetime import datetime +from zoneinfo import ZoneInfo from app.utils.config import CACHE_TTL, MAX_RECENT_URLS @@ -12,9 +13,14 @@ class UrlCacheItem(TypedDict): class RevCacheItem(TypedDict): short_code: str expires_at: float + created_at: float last_accessed: float +# ----------------------- +# Performance caches (TTL) +# ----------------------- + # short_code -> original_url url_cache: dict[str, UrlCacheItem] = {} @@ -31,24 +37,21 @@ def _now() -> float: # ----------------------- -def _delete_pair_by_short_code(short_code: str) -> None: - """ - Remove both sides of cache using short_code. - """ - data = url_cache.pop(short_code, None) - if data: - original_url = data["url"] - rev_cache.pop(original_url, None) +def set_cache_pair(short_code: str, original_url: str) -> None: + now = _now() + expires_at = now + CACHE_TTL + url_cache[short_code] = { + "url": original_url, + "expires_at": expires_at, + } -def _delete_pair_by_url(original_url: str) -> None: - """ - Remove both sides of cache using original_url. - """ - data = rev_cache.pop(original_url, None) - if data: - short_code = data["short_code"] - url_cache.pop(short_code, None) + rev_cache[original_url] = { + "short_code": short_code, + "expires_at": expires_at, + "created_at": now, + "last_accessed": now, + } def get_from_cache(short_code: str) -> str | None: @@ -58,7 +61,8 @@ def get_from_cache(short_code: str) -> str | None: return None if data["expires_at"] < _now(): - _delete_pair_by_short_code(short_code) + url_cache.pop(short_code, None) + _remove_recent_if_exists(short_code) return None return data["url"] @@ -71,99 +75,70 @@ def get_short_from_cache(original_url: str) -> str | None: return None if data["expires_at"] < _now(): - _delete_pair_by_url(original_url) + rev_cache.pop(original_url, None) return None - # Touch for recent tracking data["last_accessed"] = _now() return data["short_code"] -def set_cache_pair(short_code: str, original_url: str) -> None: +def get_recent_from_cache(limit: int = MAX_RECENT_URLS) -> list[dict]: now = _now() - expires_at = now + CACHE_TTL - - url_cache[short_code] = { - "url": original_url, - "expires_at": expires_at, - } - - rev_cache[original_url] = { - "short_code": short_code, - "expires_at": expires_at, - "last_accessed": now, - } - - -def clear_cache() -> None: - """ - Useful for tests or if DB goes down and you want to reset cache. - """ - url_cache.clear() - rev_cache.clear() + valid_items = [ + { + "short_code": data["short_code"], + "original_url": original_url, + "created_at": data["created_at"], + } + for original_url, data in rev_cache.items() + if data["expires_at"] >= now + ] -# ----------------------- -# TTL Cleanup (ACTIVE) -# ----------------------- + valid_items.sort(key=lambda x: x["created_at"], reverse=True) + return valid_items[:limit] def cleanup_expired() -> None: - """ - Actively remove expired cache entries from both caches. - Safe to run periodically in background task. - """ now = _now() expired_short_codes = [ - key for key, value in url_cache.items() if value["expires_at"] < now + short_code for short_code, data in url_cache.items() if data["expires_at"] < now ] for short_code in expired_short_codes: - _delete_pair_by_short_code(short_code) + url_cache.pop(short_code, None) + _remove_recent_if_exists(short_code) - expired_urls = [ - key for key, value in rev_cache.items() if value["expires_at"] < now + expired_original_urls = [ + original_url + for original_url, data in rev_cache.items() + if data["expires_at"] < now ] - for original_url in expired_urls: - _delete_pair_by_url(original_url) - + for original_url in expired_original_urls: + rev_cache.pop(original_url, None) -# ----------------------- -# Recent URLs (derived from rev_cache) -# ----------------------- +def clear_cache() -> None: + url_cache.clear() + rev_cache.clear() -def get_recent_from_cache(limit: int = MAX_RECENT_URLS) -> list[dict]: - """ - Returns recent URLs based on cache activity (TTL-aware, no duplicates). - """ - now = _now() - valid_items = [ - { - "short_code": data["short_code"], - "original_url": original_url, - "last_accessed": data["last_accessed"], - } - for original_url, data in rev_cache.items() - if data["expires_at"] >= now - ] +def _remove_recent_if_exists(short_code: str) -> None: + to_delete = None - valid_items.sort(key=lambda x: x["last_accessed"], reverse=True) + for original_url, data in rev_cache.items(): + if data["short_code"] == short_code: + to_delete = original_url + break - return [ - { - "short_code": item["short_code"], - "original_url": item["original_url"], - } - for item in valid_items[:limit] - ] + if to_delete: + rev_cache.pop(to_delete, None) # ----------------------- -# Debug / Introspection +# UI helpers # ----------------------- @@ -177,6 +152,9 @@ def list_cache_clean() -> dict: { "short_code": data["short_code"], "original_url": original_url, + "created_at": datetime.fromtimestamp( + data["created_at"], tz=ZoneInfo("Asia/Kolkata") + ).strftime("%d %b %Y, %I:%M %p"), } for original_url, data in rev_cache.items() if data["expires_at"] >= now From 4acc7370df0ff6b6e1678a0ed9367d1e5b243939 Mon Sep 17 00:00:00 2001 From: harshmishra2701 Date: Wed, 25 Feb 2026 14:22:25 +0530 Subject: [PATCH 21/34] [RTY-260025]: feat(cache): adjust cache cleanup interval based on CACHE_TTL --- README.md | 2 +- app/main.py | 14 +++++++++++--- app/utils/config.py | 1 - app/utils/helper.py | 31 +++++++++++++++++++++++++------ 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6c65895..a668a74 100644 --- a/README.md +++ b/README.md @@ -277,7 +277,7 @@ pip install --upgrade dist/*.whl | GET | `/` | Home page (URL shortener UI) | | GET | `/recent` | Shows recently shortened URLs | | GET | `/{short_code}` | Redirects to the original URL | -| GET | `/debug/cache` | 🔧 Debug cache view (local/dev only) | +| GET | `/cache/list` | 🔧 Debug cache view (local/dev only) | 🔌 API Endpoints (v1) diff --git a/app/main.py b/app/main.py index 5af8621..c960eeb 100644 --- a/app/main.py +++ b/app/main.py @@ -13,22 +13,30 @@ from app.routes import ui_router from app.utils import db from app.utils.cache import cleanup_expired -from app.utils.config import SESSION_SECRET - # ----------------------------- # Background cache cleanup task # ----------------------------- +from app.utils.config import ( + CACHE_TTL, + SESSION_SECRET, +) + + async def cache_health_check(): logger = logging.getLogger(__name__) logger.info("🧹 Cache cleanup task started") + interval = max(1, CACHE_TTL // 3) # pure TTL-based + + logger.info(f"🕒 Cache cleanup interval set to {interval}s") + while True: try: cleanup_expired() except Exception as e: logger.error(f"Cache cleanup error: {e}") - await asyncio.sleep(5) # cleanup every 5 seconds + await asyncio.sleep(interval) # ----------------------------- diff --git a/app/utils/config.py b/app/utils/config.py index 7bd3cec..9d71811 100644 --- a/app/utils/config.py +++ b/app/utils/config.py @@ -64,7 +64,6 @@ def _get_int(key: str, default: int) -> int: # ------------------------- USE_CACHE = True CACHE_TTL = 900 # 15 minutes -MAX_CACHE_SIZE = 10_000 MAX_RECENT_URLS = 20 # ------------------------- diff --git a/app/utils/helper.py b/app/utils/helper.py index 30be0b2..1241ad2 100644 --- a/app/utils/helper.py +++ b/app/utils/helper.py @@ -1,6 +1,9 @@ import string import random -from datetime import timezone +from datetime import datetime, timezone +from zoneinfo import ZoneInfo +from typing import Union + import validators from app.utils.config import SHORT_CODE_LENGTH @@ -23,11 +26,27 @@ def generate_code(length: int = SHORT_CODE_LENGTH) -> str: return "".join(random.choice(chars) for _ in range(length)) -def format_date(dt): - if not dt: +def format_date(value: Union[float, datetime, None]) -> str: + """ + Formats both: + - float/int epoch timestamps (from cache) + - datetime objects (from DB) + into: '24 Feb 2026, 03:59 PM' (IST) + """ + if not value: return "Just now" - if dt.tzinfo is None: - dt = dt.replace(tzinfo=timezone.utc) + # If cache timestamp (epoch seconds) + if isinstance(value, (int, float)): + return datetime.fromtimestamp(value, tz=ZoneInfo("Asia/Kolkata")).strftime( + "%d %b %Y, %I:%M %p" + ) + + # If DB datetime + if isinstance(value, datetime): + if value.tzinfo is None: + value = value.replace(tzinfo=timezone.utc) + + return value.astimezone(ZoneInfo("Asia/Kolkata")).strftime("%d %b %Y, %I:%M %p") - return dt.strftime("%d %b %Y, %I:%M %p") + return "Just now" From 27ed5de8bc35f75c8377fd92f4e06867f41ace2d Mon Sep 17 00:00:00 2001 From: harshmishra2701 Date: Wed, 25 Feb 2026 20:25:55 +0530 Subject: [PATCH 22/34] [RTY-260025]: feat(cache): allow deleting single cache entry by short code or original URL --- app/routes.py | 74 ++++++++++++++++++++++++++++++++++------------ app/utils/cache.py | 7 +++++ 2 files changed, 62 insertions(+), 19 deletions(-) diff --git a/app/routes.py b/app/routes.py index 4fc7ea2..6c43297 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,7 +3,15 @@ from pathlib import Path from typing import Optional from app.utils.cache import list_cache_clean, clear_cache -from fastapi import APIRouter, Form, Request, status, HTTPException +from fastapi import ( + APIRouter, + Form, + Request, + status, + HTTPException, + Query, + BackgroundTasks, +) from fastapi.responses import ( HTMLResponse, PlainTextResponse, @@ -20,7 +28,9 @@ get_recent_from_cache, get_short_from_cache, set_cache_pair, + increment_visit_cache, url_cache, + rev_cache, ) from app.utils.config import DOMAIN, MAX_RECENT_URLS from app.utils.helper import generate_code, is_valid_url, sanitize_url, format_date @@ -134,7 +144,13 @@ async def recent_urls(request: Request): return templates.TemplateResponse( "recent.html", - {"request": request, "urls": recent_urls_list, "format_date": format_date}, + { + "request": request, + "urls": recent_urls_list, + "format_date": format_date, + "db_available": db.get_collection() is not None, + "get_visit_count_from_cache": increment_visit_cache, + }, ) @@ -144,10 +160,12 @@ def cache_list_ui(): @ui_router.post("/cache/clean") -def cache_clean_ui(key: str): +def cache_clean_ui( + key: str = Query(..., description="CLEAR_ALL | short_code | original_url"), +): """ - key=CLEAR_ALL -> force delete everything from cache - key=FORCE_ONE -> force delete one entry (requires short_code or original_url) + key=CLEAR_ALL -> force delete everything from cache + key= -> force delete one entry from cache """ if key == "CLEAR_ALL": clear_cache() # 🔥 force wipe all cache @@ -157,13 +175,43 @@ def cache_clean_ui(key: str): **list_cache_clean(), } - raise HTTPException(400, "Invalid key. Use key=CLEAR_ALL") + removed = False + + # Try deleting by short_code + data = url_cache.pop(key, None) + if data: + rev_cache.pop(data["url"], None) + removed = True + + # Try deleting by original_url + if not removed: + data = rev_cache.pop(key, None) + if data: + url_cache.pop(data["short_code"], None) + removed = True + + if removed: + return { + "status": "deleted", + "strategy": "FORCE_ONE", + "key": key, + **list_cache_clean(), + } + + raise HTTPException( + 404, + "Key not found in cache. Use key=CLEAR_ALL or a valid short_code/original_url.", + ) @ui_router.get("/{short_code}") -def redirect_short_ui(short_code: str): +def redirect_short_ui(short_code: str, background_tasks: BackgroundTasks): cached_url = get_from_cache(short_code) if cached_url: + if db.is_connected(): + background_tasks.add_task(db.increment_visit, short_code) + else: + increment_visit_cache(short_code) return RedirectResponse(cached_url) if db.is_connected(): @@ -172,15 +220,6 @@ def redirect_short_ui(short_code: str): set_cache_pair(short_code, doc["original_url"]) return RedirectResponse(doc["original_url"]) - recent_db = db.get_recent_urls(MAX_RECENT_URLS) - for item in recent_db or []: - code = item.get("short_code") or item.get("code") - if code == short_code: - original_url = item.get("original_url") - if original_url: - set_cache_pair(short_code, original_url) - return RedirectResponse(original_url) - recent_cache = get_recent_from_cache(MAX_RECENT_URLS) for item in recent_cache or []: code = item.get("short_code") or item.get("code") @@ -200,7 +239,6 @@ def delete_recent_api(short_code: str): UI should never fail if DB is down. """ - # 1️⃣ Remove from cache (source of truth for UI) recent = get_recent_from_cache(MAX_RECENT_URLS) removed_from_cache = False @@ -211,12 +249,10 @@ def delete_recent_api(short_code: str): removed_from_cache = True break - # 2️⃣ Best-effort DB delete db_deleted = False if db.is_connected(): db_deleted = db.delete_by_short_code(short_code) - # 3️⃣ Always succeed for UI return { "success": True, "removed_from_cache": removed_from_cache, diff --git a/app/utils/cache.py b/app/utils/cache.py index a7ef4c2..ab57acb 100644 --- a/app/utils/cache.py +++ b/app/utils/cache.py @@ -27,6 +27,9 @@ class RevCacheItem(TypedDict): # original_url -> short_code (+ metadata for recent tracking) rev_cache: dict[str, RevCacheItem] = {} +# short_code -> visit_count (temporary, in-memory) +visit_cache: dict[str, int] = {} + def _now() -> float: return time.time() @@ -54,6 +57,10 @@ def set_cache_pair(short_code: str, original_url: str) -> None: } +def increment_visit_cache(short_code: str) -> None: + visit_cache[short_code] = visit_cache.get(short_code, 0) + 1 + + def get_from_cache(short_code: str) -> str | None: data = url_cache.get(short_code) From c09a8715ab73839dbff70d447321838077d3efa4 Mon Sep 17 00:00:00 2001 From: harshmishra2701 Date: Thu, 26 Feb 2026 16:50:00 +0530 Subject: [PATCH 23/34] [RTY-260025]: feat(cache): add header security for cache purge and remove endpoints --- README.md | 31 +++++++++++++++----- app/routes.py | 69 +++++++++++++++++++------------------------ app/utils/cache.py | 71 ++++++++++++++++++++++++++++++++++++++------- app/utils/config.py | 3 ++ 4 files changed, 117 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index a668a74..bab2b73 100644 --- a/README.md +++ b/README.md @@ -268,7 +268,18 @@ pip install dist/*.whl pip install --upgrade dist/*.whl ``` -`📡 Endpoints` +# 📡 Endpoints + +# 🔐 Cache Admin Endpoints (Authentication) + +To use the cache admin endpoints (`/cache/purge`, `/cache/remove`), you must configure a secret token in your environment and send it in the request header. +Setup + +Add a token in your .env file: + +``` +CACHE_PURGE_TOKEN=your-secret-token +``` 🖥️ UI Endpoints @@ -278,16 +289,20 @@ pip install --upgrade dist/*.whl | GET | `/recent` | Shows recently shortened URLs | | GET | `/{short_code}` | Redirects to the original URL | | GET | `/cache/list` | 🔧 Debug cache view (local/dev only) | +| DELETE | `/cache/purge` | 🧹 Remove all entries from cache | +| PATCH | `/cache/remove` | 🧹 Remove a single cache entry | 🔌 API Endpoints (v1) -| Method | Path | Description | -| ------ | ------------------- | -------------------------------- | -| POST | `/api/v1/shorten` | Create a short URL | -| GET | `/api/v1/version` | Get API version | -| GET | `/api/v1/health` | Health check (DB + cache status) | -| GET | `/api/_debug/cache` | 🔧 Debug cache view (dev only) | -| GET | `/api/{short_code}` | Redirect to original URL | +| Method | Path | Description | +| ------ | ------------------- | ------------------------------------ | +| POST | `/api/v1/shorten` | Create a short URL | +| GET | `/api/v1/version` | Get API version | +| GET | `/api/v1/health` | Health check (DB + cache status) | +| GET | `/api/{short_code}` | Redirect to original URL | +| GET | `/cache/list` | 🔧 Debug cache view (local/dev only) | +| DELETE | `/cache/purge` | 🧹 Remove all entries from cache | +| PATCH | `/cache/remove` | 🧹 Remove a single cache entry | ## License diff --git a/app/routes.py b/app/routes.py index 6c43297..d7e087d 100644 --- a/app/routes.py +++ b/app/routes.py @@ -9,8 +9,9 @@ Request, status, HTTPException, - Query, BackgroundTasks, + Header, + Query, ) from fastapi.responses import ( HTMLResponse, @@ -30,9 +31,9 @@ set_cache_pair, increment_visit_cache, url_cache, - rev_cache, + remove_cache_key, ) -from app.utils.config import DOMAIN, MAX_RECENT_URLS +from app.utils.config import DOMAIN, MAX_RECENT_URLS, CACHE_PURGE_TOKEN from app.utils.helper import generate_code, is_valid_url, sanitize_url, format_date from app.utils.qr import generate_qr_with_logo @@ -159,49 +160,39 @@ def cache_list_ui(): return list_cache_clean() -@ui_router.post("/cache/clean") -def cache_clean_ui( - key: str = Query(..., description="CLEAR_ALL | short_code | original_url"), -): +@ui_router.delete("/cache/purge", response_class=PlainTextResponse) +def cache_purge_ui(cache_token: str = Header(...)): """ - key=CLEAR_ALL -> force delete everything from cache - key= -> force delete one entry from cache + Force delete everything from cache (secured by header) """ - if key == "CLEAR_ALL": - clear_cache() # 🔥 force wipe all cache - return { - "status": "cleared", - "strategy": "FORCE_FULL_RESET", - **list_cache_clean(), - } + if cache_token != CACHE_PURGE_TOKEN: + raise HTTPException(status_code=401, detail="Unauthorized") - removed = False + clear_cache() - # Try deleting by short_code - data = url_cache.pop(key, None) - if data: - rev_cache.pop(data["url"], None) - removed = True + return "cleared ALL" + + +@ui_router.patch("/cache/remove") +def cache_remove_one_ui( + key: str = Query(..., description="short_code OR original_url"), + cache_token: str = Header(...), +): + # 🔐 Header security + if cache_token != CACHE_PURGE_TOKEN: + raise HTTPException(status_code=401, detail="Unauthorized") + + removed = remove_cache_key(key) - # Try deleting by original_url if not removed: - data = rev_cache.pop(key, None) - if data: - url_cache.pop(data["short_code"], None) - removed = True - - if removed: - return { - "status": "deleted", - "strategy": "FORCE_ONE", - "key": key, - **list_cache_clean(), - } + raise HTTPException( + status_code=404, + detail="Key not found in cache.", + ) - raise HTTPException( - 404, - "Key not found in cache. Use key=CLEAR_ALL or a valid short_code/original_url.", - ) + return { + "status": "deleted", + } @ui_router.get("/{short_code}") diff --git a/app/utils/cache.py b/app/utils/cache.py index ab57acb..a9ac95a 100644 --- a/app/utils/cache.py +++ b/app/utils/cache.py @@ -17,6 +17,12 @@ class RevCacheItem(TypedDict): last_accessed: float +class RecentItem(TypedDict): + short_code: str + original_url: str + created_at: float + + # ----------------------- # Performance caches (TTL) # ----------------------- @@ -40,6 +46,25 @@ def _now() -> float: # ----------------------- +def _enforce_recent_limit() -> None: + """ + Ensure rev_cache keeps only MAX_RECENT_URLS most recent items. + Removes the oldest entries by created_at. + """ + if len(rev_cache) <= MAX_RECENT_URLS: + return + + sorted_items = sorted( + rev_cache.items(), + key=lambda item: item[1]["created_at"], + ) + + excess = len(rev_cache) - MAX_RECENT_URLS + for i in range(excess): + original_url, _ = sorted_items[i] + rev_cache.pop(original_url, None) + + def set_cache_pair(short_code: str, original_url: str) -> None: now = _now() expires_at = now + CACHE_TTL @@ -56,6 +81,8 @@ def set_cache_pair(short_code: str, original_url: str) -> None: "last_accessed": now, } + _enforce_recent_limit() + def increment_visit_cache(short_code: str) -> None: visit_cache[short_code] = visit_cache.get(short_code, 0) + 1 @@ -89,18 +116,20 @@ def get_short_from_cache(original_url: str) -> str | None: return data["short_code"] -def get_recent_from_cache(limit: int = MAX_RECENT_URLS) -> list[dict]: +def get_recent_from_cache(limit: int = MAX_RECENT_URLS) -> list[RecentItem]: now = _now() - valid_items = [ - { - "short_code": data["short_code"], - "original_url": original_url, - "created_at": data["created_at"], - } - for original_url, data in rev_cache.items() - if data["expires_at"] >= now - ] + valid_items: list[RecentItem] = [] + + for original_url, data in rev_cache.items(): + if data["expires_at"] >= now: + valid_items.append( + { + "short_code": data["short_code"], + "original_url": original_url, + "created_at": data["created_at"], + } + ) valid_items.sort(key=lambda x: x["created_at"], reverse=True) return valid_items[:limit] @@ -173,3 +202,25 @@ def list_cache_clean() -> dict: "MAX_RECENT_URLS": MAX_RECENT_URLS, "CACHE_TTL": CACHE_TTL, } + + +def remove_cache_key(key: str) -> bool: + """ + Remove a cache entry by short_code OR original_url. + """ + is_url = key.startswith("http://") or key.startswith("https://") + + if is_url: + rev_item = rev_cache.pop(key, None) + if rev_item: + url_cache.pop(rev_item["short_code"], None) + visit_cache.pop(rev_item["short_code"], None) + return True + else: + url_item = url_cache.pop(key, None) + if url_item: + rev_cache.pop(url_item["url"], None) + visit_cache.pop(key, None) + return True + + return False diff --git a/app/utils/config.py b/app/utils/config.py index 9d71811..5529f3e 100644 --- a/app/utils/config.py +++ b/app/utils/config.py @@ -71,6 +71,9 @@ def _get_int(key: str, default: int) -> int: # ------------------------- SESSION_SECRET = os.getenv("SESSION_SECRET", "super-secret-key") + +# Security token for cache/purge and cache/remove endpoint (in case we want to trigger it manually) +CACHE_PURGE_TOKEN = os.getenv("CACHE_PURGE_TOKEN", "dev-token") # ------------------------- # Short URL (constants) # ------------------------- From 13220f9e80209d898f1fa91a0ef1014a27d7ad1e Mon Sep 17 00:00:00 2001 From: harshmishra2701 Date: Thu, 26 Feb 2026 20:02:05 +0530 Subject: [PATCH 24/34] [RTY-260025]: feat(docs): add testing instructions and update footer links in README --- README.md | 20 ++++++++++++++++++++ app/routes.py | 4 ++-- app/templates/index.html | 6 +++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bab2b73..e480122 100644 --- a/README.md +++ b/README.md @@ -281,6 +281,26 @@ Add a token in your .env file: CACHE_PURGE_TOKEN=your-secret-token ``` +🧪 How to test + +PowerShell + +``` +Invoke-RestMethod ` + -Method DELETE ` + -Uri "http://127.0.0.1:8000/cache/purge" ` + -Headers @{ "X-Cache-Token" = "your-secret-token" } +``` + +🧹 Remove a single cache entry + +``` +Invoke-RestMethod ` + -Method PATCH ` + -Uri "http://127.0.0.1:8000/cache/remove?key=abc123" ` + -Headers @{ "X-Cache-Token" = "your-secret-token" } +``` + 🖥️ UI Endpoints | Method | Path | Description | diff --git a/app/routes.py b/app/routes.py index d7e087d..15cd7b1 100644 --- a/app/routes.py +++ b/app/routes.py @@ -161,7 +161,7 @@ def cache_list_ui(): @ui_router.delete("/cache/purge", response_class=PlainTextResponse) -def cache_purge_ui(cache_token: str = Header(...)): +def cache_purge_ui(cache_token: str = Header(..., alias="Cache-Token")): """ Force delete everything from cache (secured by header) """ @@ -176,7 +176,7 @@ def cache_purge_ui(cache_token: str = Header(...)): @ui_router.patch("/cache/remove") def cache_remove_one_ui( key: str = Query(..., description="short_code OR original_url"), - cache_token: str = Header(...), + cache_token: str = Header(..., alias="Cache-Token"), ): # 🔐 Header security if cache_token != CACHE_PURGE_TOKEN: diff --git a/app/templates/index.html b/app/templates/index.html index 7a5ecd4..986b414 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -28,7 +28,9 @@

tiny URL

@@ -68,6 +70,7 @@

🔗 tiny URL

Product

    +
  • CACHE URLs
  • API Documentation
  • Custom Branded Links
  • QR Code Engine
    • @@ -77,6 +80,7 @@

    Product

    Support

      +
    • UI docs
    • Help Center
    • System Status
    • Contact Us
      • From a84ffa4848a6092db40c5c50c3496c76343bcbed Mon Sep 17 00:00:00 2001 From: harshmishra2701 Date: Thu, 26 Feb 2026 20:58:19 +0530 Subject: [PATCH 25/34] [RTY-260025]: feat(api): improve delete_recent_api to handle DB availability and return status --- app/routes.py | 27 +++++++++++++++------------ app/utils/db.py | 12 +++++++++--- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/app/routes.py b/app/routes.py index 15cd7b1..5270214 100644 --- a/app/routes.py +++ b/app/routes.py @@ -225,15 +225,10 @@ def redirect_short_ui(short_code: str, background_tasks: BackgroundTasks): @ui_router.delete("/recent/{short_code}") def delete_recent_api(short_code: str): - """ - Delete a short URL from recent list (cache-first, DB optional). - UI should never fail if DB is down. - """ - - recent = get_recent_from_cache(MAX_RECENT_URLS) + recent = get_recent_from_cache(MAX_RECENT_URLS) or [] removed_from_cache = False - for i, item in enumerate(recent or []): + for i, item in enumerate(recent): code = item.get("short_code") or item.get("code") if code == short_code: recent.pop(i) @@ -241,13 +236,21 @@ def delete_recent_api(short_code: str): break db_deleted = False - if db.is_connected(): - db_deleted = db.delete_by_short_code(short_code) + db_available = db.is_connected() + + if db_available: + db_deleted = bool(db.delete_by_short_code(short_code)) + + if not removed_from_cache and not db_deleted: + raise HTTPException( + status_code=404, detail=f"short_code '{short_code}' not found" + ) return { - "success": True, - "removed_from_cache": removed_from_cache, - "db_deleted": bool(db_deleted), + "status": "deleted", + "short_code": short_code, + "db_deleted": db_deleted, + "db_available": db_available, } diff --git a/app/utils/db.py b/app/utils/db.py index 6d45537..0dda40a 100644 --- a/app/utils/db.py +++ b/app/utils/db.py @@ -40,7 +40,13 @@ def connect_db(max_retries: int = 1) -> bool: Returns: True if connection successful, False otherwise """ - global client, db, collection, connection_state, last_connection_attempt, connection_error + global \ + client, \ + db, \ + collection, \ + connection_state, \ + last_connection_attempt, \ + connection_error if not MONGO_INSTALLED: logger.error("PyMongo is not installed") @@ -152,8 +158,8 @@ def delete_by_short_code(short_code: str) -> bool: if not is_connected(): return False try: - collection.delete_one({"short_code": short_code}) - return True + result = collection.delete_one({"short_code": short_code}) + return result.deleted_count > 0 except PyMongoError as e: logger.error(f"DB error (delete_by_short_code): {e}") _mark_failed(e) From f2bb9f534ea2e6489d167c32d89f9329d0f04be4 Mon Sep 17 00:00:00 2001 From: Ravindrayadav04 Date: Thu, 26 Feb 2026 21:37:05 +0530 Subject: [PATCH 26/34] [RTY-260028]: fiexed the whole ui header and footer align --- app/main.py | 51 ++-- app/static/css/tiny.css | 337 +++++++++++++++++++++++-- app/static/style.css | 519 +++++++++++++++++++++++++------------- app/templates/footer.html | 41 +++ app/templates/header.html | 19 +- app/templates/index.html | 117 ++------- app/templates/layout.html | 27 +- app/templates/recent.html | 286 +++++---------------- app/utils/cache.py | 22 +- 9 files changed, 849 insertions(+), 570 deletions(-) create mode 100644 app/templates/footer.html diff --git a/app/main.py b/app/main.py index 0779b02..8eeba0f 100644 --- a/app/main.py +++ b/app/main.py @@ -4,7 +4,12 @@ import logging from fastapi import FastAPI, Form, Request, status -from fastapi.responses import HTMLResponse, PlainTextResponse, RedirectResponse, JSONResponse +from fastapi.responses import ( + HTMLResponse, + PlainTextResponse, + RedirectResponse, + JSONResponse, +) from fastapi.staticfiles import StaticFiles from fastapi.templating import Jinja2Templates from starlette.middleware.sessions import SessionMiddleware @@ -39,12 +44,12 @@ async def lifespan(app: FastAPI): db.connect_db() db.start_health_check() logger.info("Application startup complete") - + yield - + logger.info("Application shutdown: Cleaning up...") await db.stop_health_check() - + # Close MongoDB client gracefully try: if db.client is not None: @@ -52,7 +57,7 @@ async def lifespan(app: FastAPI): logger.info("MongoDB client closed") except Exception as e: logger.error(f"Error closing MongoDB client: {str(e)}") - + logger.info("Application shutdown complete") @@ -123,7 +128,7 @@ async def create_short_url( qr_type: str = Form("short"), ) -> RedirectResponse: logger = logging.getLogger(__name__) - + session = request.session qr_enabled = bool(generate_qr) original_url = sanitize_url(original_url) @@ -149,13 +154,17 @@ async def create_short_url( if not short_code: short_code = generate_code() set_cache_pair(short_code, original_url) - + # Only write to database if connected if db.is_connected(): db.insert_url(short_code, original_url) else: - logger.warning(f"Database not connected, URL {short_code} created in cache only") - session["info_message"] = "URL created (database temporarily unavailable)" + logger.warning( + f"Database not connected, URL {short_code} created in cache only" + ) + session["info_message"] = ( + "URL created (database temporarily unavailable)" + ) # --- TYPE GUARD FOR MYPY --- if not isinstance(short_code, str): @@ -180,9 +189,9 @@ async def create_short_url( @app.get("/recent", response_class=HTMLResponse) async def recent_urls(request: Request): - recent_urls_list = db.get_recent_urls( + recent_urls_list = db.get_recent_urls(MAX_RECENT_URLS) or get_recent_from_cache( MAX_RECENT_URLS - ) or get_recent_from_cache(MAX_RECENT_URLS) + ) normalized = [] for item in recent_urls_list: @@ -216,8 +225,8 @@ async def delete_url(request: Request, short_code: str): return PlainTextResponse("", status_code=204) -#@app.get("/{short_code}") -#async def redirect_short(request: Request, short_code: str): +# @app.get("/{short_code}") +# async def redirect_short(request: Request, short_code: str): # logger = logging.getLogger(__name__) # # Try cache first # cached_url = get_from_cache(short_code) @@ -241,6 +250,7 @@ async def delete_url(request: Request, short_code: str): # return PlainTextResponse("Invalid or expired short URL", status_code=404) + @app.get("/{short_code}") async def redirect_short(request: Request, short_code: str): logger = logging.getLogger(__name__) @@ -252,25 +262,26 @@ async def redirect_short(request: Request, short_code: str): db.increment_visit(short_code) else: from app.utils.cache import increment_cache_visit + increment_cache_visit(short_code) return RedirectResponse(cached_url) - + # Check if database is connected if not db.is_connected(): logger.warning(f"Database not connected, cannot redirect {short_code}") return PlainTextResponse( "Service temporarily unavailable. Please try again later.", status_code=503, - headers={"Retry-After": "30"} + headers={"Retry-After": "30"}, ) - + # Try database doc = db.increment_visit(short_code) if doc: set_cache_pair(short_code, doc["original_url"]) return RedirectResponse(doc["original_url"]) - + return PlainTextResponse("Invalid or expired short URL", status_code=404) @@ -283,15 +294,15 @@ async def coming_soon(request: Request): async def health_check(): """Health check endpoint showing database and cache status.""" state = db.get_connection_state() - + response_data = { "database": state, "cache": { "enabled": True, "size": len(url_cache), - } + }, } - + status_code = 200 if state["connected"] else 503 return JSONResponse(content=response_data, status_code=status_code) diff --git a/app/static/css/tiny.css b/app/static/css/tiny.css index 873f075..1224c96 100644 --- a/app/static/css/tiny.css +++ b/app/static/css/tiny.css @@ -27,69 +27,138 @@ body { /* Light theme overrides */ body.light-theme { + /* background + glass */ --bg: #f9fafb; --glass: rgba(0, 0, 0, 0.03); --glass-border: rgba(0, 0, 0, 0.07); - --accent: #2563eb; + + /* main card + text */ + --card: #ffffff; --text-primary: #111827; --text-secondary: #4b5563; + --text-color: #111827; - /* Remove or soften the dark gradient */ + /* accent */ + --accent: #2563eb; + + /* Remove the dark radial gradient */ background-image: none; - /* clean white background */ - /* Or use a subtle light gradient if you prefer */ - /* background-image: radial-gradient(circle at 50% -20%, #e5e7eb 0%, transparent 50%); */ } /* Layout */ .main-layout { max-width: 900px; margin: 0 auto; - padding: 4rem 1rem; + padding: 6rem 1rem 4rem; display: flex; flex-direction: column; gap: 2rem; } -.site-header { - display: flex; - justify-content: space-between; - align-items: center; - padding: 1rem 1.5rem; +.page { + padding-top: 6rem; +} + +/* Top navigation header */ +.app-header { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 55px; background: var(--glass); border-bottom: 1px solid var(--glass-border); - backdrop-filter: blur(10px); + display: flex; + align-items: center; + padding: 0 28px; + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08); + z-index: 1000; } .header-left, .header-right { display: flex; - gap: 1rem; align-items: center; + gap: 12px; } -.header-center { - flex: 1; - text-align: center; +.header-right { + margin-left: auto; } -.logo { - margin: 0; +.app-logo { + width: 36px; + height: 36px; + background: linear-gradient(135deg, #2563eb, #5ab9ff); + color: #ffffff; + border-radius: 10px; + display: flex; + align-items: center; + justify-content: center; + font-size: 18px; +} + +.app-name { font-size: 1.5rem; font-weight: 700; color: var(--text-primary); } -.icon-btn { - background: none; - border: none; +.header-nav { + position: absolute; + left: 50%; + transform: translateX(-50%); + display: flex; + gap: 26px; +} + +.nav-link, +.nav-link:link, +.nav-link:visited { + text-decoration: none; color: var(--text-primary); - font-size: 1.2rem; + font-weight: 500; + position: relative; +} + +body.dark-theme .app-header { + background: linear-gradient(180deg, #0b1220, #050b14); +} + +.dark-theme .nav-link { + color: #e5e7eb; +} + +.nav-link:hover { + color: #2563eb; +} + +.nav-link.active::after { + content: ""; + position: absolute; + bottom: -6px; + left: 0; + width: 100%; + height: 2px; + background: #111827; +} + +.dark-theme .nav-link.active::after { + background: #f8fafc; +} + +.theme-toggle { + background: transparent; + border: none; cursor: pointer; - transition: color 0.3s; + padding: 8px; + border-radius: 8px; + font-weight: 700; + background: var(--glass); + color: var(--text-primary); } -.icon-btn:hover { +.theme-toggle:hover { color: var(--accent); } @@ -289,9 +358,202 @@ body.light-theme { text-overflow: ellipsis; } + +.hero { + text-align: center; + margin: 40px 0; +} + +.hero h1 { + font-size: 42px; + font-weight: 700; +} + +/* Recent page full table layout (visit page) */ +.recent-page-container { + width: 100%; + max-width: 1100px; + margin: 30px auto; + padding: 28px; + background: var(--card); + backdrop-filter: blur(20px); + border: 1px solid var(--glass-border); + border-radius: 20px; + box-shadow: var(--card-shadow); + color: var(--text-color); + transition: background 0.3s ease, border 0.3s ease; +} + +.recent-table-wrapper { + margin-top: 20px; + width: 100%; + overflow-x: hidden; +} + +.recent-table { + width: 100%; + border-collapse: collapse; + border-radius: 12px; + overflow: hidden; + table-layout: fixed; +} + +.recent-table thead { + background: var(--glass); +} + +.recent-table th { + padding: 8px 14px; + text-align: left; + font-size: 13px; + letter-spacing: 0.08em; + text-transform: uppercase; + font-weight: 700; + color: var(--muted); + border-bottom: 1px solid var(--glass-border); +} + +.recent-table td { + padding: 14px; + font-size: 14px; + color: var(--text-primary); + border-bottom: 1px solid var(--glass-border); + transition: 0.25s ease; +} + +/* Stable column widths so important columns stay visible */ +.recent-table th:nth-child(1), +.recent-table td:nth-child(1) { + width: 6%; +} + +.recent-table th:nth-child(2), +.recent-table td:nth-child(2) { + width: 18%; +} + +.recent-table th:nth-child(3), +.recent-table td:nth-child(3) { + width: 38%; +} + +.recent-table th:nth-child(4), +.recent-table td:nth-child(4) { + width: 18%; +} + +.recent-table th:nth-child(5), +.recent-table td:nth-child(5) { + width: 8%; +} + +.recent-table th:nth-child(6), +.recent-table td:nth-child(6) { + width: 12%; +} + +.recent-table tbody tr:hover { + background: rgba(255, 255, 255, 0.05); +} + +.short-code a { + color: var(--accent); + font-weight: 700; + text-decoration: none; +} + +.short-code a:hover { + color: var(--accent-2); + text-decoration: underline; +} + +.original-url a { + color: var(--text-secondary); + text-decoration: none; +} + +.original-url a:hover { + color: var(--accent); +} + +.created-time { + font-size: 13px; + color: var(--muted); + white-space: nowrap; +} + +.recent-table td:nth-child(5) { + font-weight: 700; + color: var(--accent-2); +} + +.dark-theme .recent-table th, +.dark-theme .recent-table td { + color: #e5e7eb; + border-bottom: 1px solid var(--glass-border); +} + +.action-col { + display: flex; + gap: 12px; + justify-content: flex-end; + align-items: center; +} + +.action-btn { + width: 36px; + height: 36px; + border-radius: 10px; + display: flex; + align-items: center; + justify-content: center; + text-decoration: none; + font-size: 16px; + transition: 0.2s ease; +} + +.open-btn { + background: #3b82f6; + color: #fff; +} + +.delete-btn { + background: #ef4444; + color: #fff; +} + + +/* Action buttons */ +.action-col { + display: flex; + gap: 10px; +} + +.action-btn { + width: 36px; + height: 36px; + border-radius: 10px; + display: flex; + align-items: center; + justify-content: center; + text-decoration: none; + font-size: 16px; + transition: 0.2s ease; +} + +.open-btn { + background: #3b82f6; + color: #fff; +} + +.delete-btn { + background: #ef4444; + color: #fff; +} + /* Footer */ -.big-footer { - background: rgba(255, 255, 255, 0.01); +footer.big-footer { + background: var(--bg); border-top: 1px solid var(--glass-border); padding: 4rem 1rem 2rem; margin-top: 4rem; @@ -372,6 +634,27 @@ body.light-theme { color: var(--accent); } +/* Dark mode footer adjustments */ +body.dark-theme footer.big-footer { + background: #020617 !important; + border-top: 1px solid rgba(255, 255, 255, 0.06); +} + +body.dark-theme .footer-col h4 { + color: #f3f4f6; +} + +body.dark-theme .footer-col p, +body.dark-theme .footer-col ul li a, +body.dark-theme .footer-bottom { + color: #cbd5e1; +} + +body.dark-theme .footer-col ul li a:hover, +body.dark-theme .footer-bottom a { + color: #a5f3fc; +} + /* Responsive adjustments */ @media (max-width: 900px) { .footer-grid { @@ -412,4 +695,4 @@ body.light-theme { gap: 1rem; text-align: center; } -} +} \ No newline at end of file diff --git a/app/static/style.css b/app/static/style.css index d32e8d9..8dd7671 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -147,25 +147,6 @@ button { font-weight: 700; } -.app-header { - position: fixed; - top: 0; - left: 0; - width: 97%; - height: 55px; - background: white; - display: flex; - align-items: center; - padding: 0 28px; - box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08); - z-index: 1000; -} - -/* Dark mode */ -.dark-theme .app-header { - background: linear-gradient(180deg, #0b1220, #050b14); -} - footer { margin-top: 0; } @@ -177,77 +158,6 @@ body.dark-theme section { background: #0f1720 !important; } -.header-left { - display: flex; - align-items: center; - gap: 12px; -} - -.app-logo { - width: 36px; - height: 36px; - background: linear-gradient(135deg, #2563eb, #5ab9ff); - color: white; - border-radius: 10px; - display: flex; - align-items: center; - justify-content: center; - font-size: 18px; -} - -.app-name { - font-size: 20px; - font-weight: 700; - color: #111827; -} - -.dark-theme .app-name { - color: #f8fafc; -} - -.header-nav { - position: absolute; - left: 50%; - transform: translateX(-50%); - display: flex; - gap: 26px; -} - -.nav-link { - text-decoration: none; - color: #111827; - font-weight: 500; - position: relative; -} - -.dark-theme .nav-link { - color: #e5e7eb; -} - -.nav-link:hover { - color: #2563eb; -} - -.nav-link.active::after { - content: ""; - position: absolute; - bottom: -6px; - left: 0; - width: 100%; - height: 2px; - background: #111827; -} - -.dark-theme .nav-link.active::after { - background: #f8fafc; -} - -.header-right { - margin-left: auto; - display: flex; - align-items: center; -} - /*:root { --header-height: 55px; --bg: #eefaf8; @@ -278,6 +188,9 @@ body.dark-theme section { /* Shadow */ --card-shadow: 0 20px 60px rgba(0, 0, 0, 0.12); + --text-primary: var(--text-color); + --text-secondary: var(--text-muted); + --accent: var(--accent-1); } .dark-theme { @@ -538,154 +451,404 @@ footer { min-height: auto; } +/* /* =============================== + MODERN UI STYLE FOOTER (VISIT PAGE) +================================= */ + .app-footer { - background: white; - color: #e5e7eb; - padding: 8px 10px; - margin-top: auto; - position: relative; + background: rgba(255, 255, 255, 0.02); + backdrop-filter: blur(16px); + border-top: 1px solid var(--glass-border); + padding: 2.5rem 1rem 1.2rem; + /* reduced space */ + margin-top: 40px; } -.dark-theme .app-footer { - background: linear-gradient(180deg, #0b1220, #050b14); +/* Container */ +.footer-container { + max-width: 1100px; + margin: 0 auto; + + display: grid; + grid-template-columns: 2fr 1fr 1fr 1fr; + gap: 1.8rem; } -.footer-container { - margin: auto; +/* Footer columns */ +.footer-col h4 { + font-size: 14px; + font-weight: 700; + letter-spacing: 0.08em; + text-transform: uppercase; + margin-bottom: 16px; + color: var(--text-primary); +} + +.footer-col p { + color: var(--text-secondary); + font-size: 14px; + line-height: 1.6; +} + +.footer-col ul { + list-style: none; + padding: 0; + margin: 0; +} + +.footer-col ul li { + margin-bottom: 10px; +} + +.footer-col ul li a { + color: var(--text-secondary); + text-decoration: none; + font-size: 14px; + transition: 0.2s ease; +} + +.footer-col ul li a:hover { + color: var(--accent); +} + +/* Footer bottom */ +.footer-bottom { + /* margin: 3rem auto 0; + padding-top: 20px; + display: flex; - gap: 60px; justify-content: space-between; + align-items: center; + + border-top: 1px solid var(--glass-border); + font-size: 14px; + color: var(--text-secondary); */ + + max-width: 1200px; + margin: 2rem auto 0; + padding-top: 1rem; + border-top: 1px solid var(--glass-border); + display: flex; flex-wrap: wrap; + justify-content: space-between; + align-items: center; + color: var(--text-secondary); + font-size: 0.8rem; + +} + +/* Version + GitHub area */ +.footer-bottom a { + color: var(--accent); + text-decoration: none; + transition: 0.2s ease; } -.footer-brand { - max-width: 420px; +.footer-bottom a:hover { + opacity: 0.8; } -.footer-logo { - width: 42px; - height: 42px; - background: linear-gradient(135deg, #2563eb, #5ab9ff); - border-radius: 14px; - display: flex; - align-items: center; - justify-content: center; - font-size: 22px; +/* =============================== + DARK MODE SUPPORT +================================= */ + +.dark-theme .app-footer { + background: #0a0a0c; + backdrop-filter: blur(16px); + border-top: 1px solid rgba(255, 255, 255, 0.06); } -.dark-theme .footer-brand h3, -.dark-theme .footer-brand p, -.dark-theme .footer-col h4, -.dark-theme .app-footer a, +.dark-theme .footer-col h4 { + color: #f3f4f6; +} + +.dark-theme .footer-col p, +.dark-theme .footer-col ul li a, .dark-theme .footer-bottom { - color: #f8fafc; + color: #cbd5e1; } -.footer-brand h3 { - margin: 0; - color: #000000; - font-size: 22px; - font-weight: 700; +.dark-theme .footer-col ul li a:hover, +.dark-theme .footer-bottom a { + color: var(--accent-2); } -.footer-brand p { - margin-top: 8px; - color: #000000; - line-height: 1.6; - font-size: 14px; +/* =============================== + MOBILE RESPONSIVE +================================= */ + +@media (max-width: 900px) { + .footer-container { + grid-template-columns: 1fr 1fr; + } +} + +@media (max-width: 600px) { + .footer-container { + grid-template-columns: 1fr; + } + + .footer-bottom { + flex-direction: column; + gap: 10px; + text-align: center; + } +} + +/* REMOVE white line above footer in dark mode */ +footer { + margin-top: 0 !important; } -/* MAIN CONTENT */ +*/ +/* ===================================== + BIG FOOTER STYLE (FOR FIRST PAGE) + Using existing class names +===================================== */ -/* FOOTER */ +/*Footer wrapper .app-footer { - margin-top: auto; + background: rgba(255, 255, 255, 0.01); + border-top: 1px solid var(--glass-border); + padding: 4rem 1rem 2rem; + margin-top: 4rem; } -/* GitHub button */ -.github-btn { - display: inline-flex; - align-items: center; - gap: 2px; - margin-top: 1px; - padding: 10px 16px; - border-radius: 8px; - background: rgba(255, 255, 255, 0.06); - color: #000000; - text-decoration: none; - font-weight: 600; - transition: all 0.25s ease; +/* Grid container */ +.footer-container { + max-width: 1200px; + margin: 0 auto; + + display: grid; + grid-template-columns: 2fr 1fr 1fr 1fr; + gap: 2rem; } -.github-btn:hover { - background: black(11, 1, 1); - transform: translateY(-2px); +/* Brand column (first column) */ +.footer-container>div:first-child h4 { + font-size: 1.5rem; + margin-bottom: 1rem; } -.footer-links { - display: flex; - gap: 80px; - flex-wrap: wrap; +.footer-container>div:first-child p { + color: var(--text-secondary); + line-height: 1.6; + max-width: 320px; +} + +.footer-brand h3 { + font-size: 1.5rem; + margin-bottom: 1rem; } +.footer-brand p { + color: var(--text-secondary); + line-height: 1.6; + max-width: 320px; +} + +/* Other footer columns */ .footer-col h4 { - margin-bottom: 14px; - font-size: 16px; - color: #000000; - font-weight: 700; + font-size: 0.85rem; + text-transform: uppercase; + letter-spacing: 0.1em; + margin-bottom: 1rem; + color: var(--text-primary); +} + +.footer-col ul { + list-style: none; + padding: 0; + margin: 0; +} + +.footer-col ul li { + margin-bottom: 0.8rem; } -.footer-col a { - display: block; +.footer-col ul li a { + color: var(--text-secondary); text-decoration: none; - color: #000000; - margin-bottom: 10px; - font-size: 14px; + font-size: 0.9rem; transition: color 0.2s ease; } -.footer-col a:hover { - text-decoration: underline; +.footer-col ul li a:hover { + color: var(--accent); } -/* Bottom */ +/* Bottom row */ .footer-bottom { - margin-top: 10px; - border-top: 1px solid rgba(255, 255, 255, 0.153); - padding-top: 8px; - padding-bottom: 1px; - text-align: center; - font-size: 14px; - color: #080808; + max-width: 1200px; + margin: 2rem auto 0; + padding-top: 1rem; + border-top: 1px solid var(--glass-border); + + display: flex; + flex-wrap: wrap; + justify-content: space-between; + align-items: center; + + color: var(--text-secondary); + font-size: 0.8rem; } +/* Footer links inside bottom */ .footer-bottom a { - color: #030000; - font-weight: 600; + color: inherit; text-decoration: none; + transition: color 0.2s ease; } .footer-bottom a:hover { - text-decoration: underline; + color: var(--accent); } /* Responsive */ -@media (max-width: 768px) { +@media (max-width: 900px) { + .footer-container { + grid-template-columns: 1fr 1fr; + } +} + +@media (max-width: 600px) { .footer-container { + grid-template-columns: 1fr; + } + + .footer-bottom { flex-direction: column; - gap: 40px; + gap: 1rem; + text-align: center; } +} - .footer-links { - gap: 40px; +*/ + +/* Footer */ +.big-footer { + background: rgba(255, 255, 255, 0.01); + border-top: 1px solid var(--glass-border); + padding: 4rem 1rem 2rem; + margin-top: 4rem; +} + +.footer-grid { + max-width: 1200px; + margin: 0 auto; + display: grid; + grid-template-columns: 2fr 1fr 1fr 1fr; + gap: 2rem; +} + +.footer-brand h3 { + font-size: 1.5rem; + margin-bottom: 1rem; +} + +.footer-brand p { + color: var(--text-secondary); + line-height: 1.6; + max-width: 320px; +} + +.footer-col h4 { + font-size: 0.85rem; + text-transform: uppercase; + letter-spacing: 0.1em; + margin-bottom: 1rem; + color: var(--text-primary); +} + +.footer-col ul { + list-style: none; + padding: 0; + margin: 0; +} + +.footer-col ul li { + margin-bottom: 0.8rem; +} + +.footer-col ul li a { + color: var(--text-secondary); + text-decoration: none; + font-size: 0.9rem; + transition: color 0.2s; +} + +.footer-col ul li a:hover { + color: var(--accent); +} + +.footer-bottom { + max-width: 1200px; + margin: 2rem auto 0; + padding-top: 1rem; + border-top: 1px solid var(--glass-border); + display: flex; + flex-wrap: wrap; + justify-content: space-between; + align-items: center; + color: var(--text-secondary); + font-size: 0.8rem; +} + +.footer-meta { + display: flex; + gap: 1rem; +} + +.footer-meta a { + color: inherit; + text-decoration: none; +} + +.footer-meta a:hover { + color: var(--accent); +} + +/* Responsive adjustments */ +@media (max-width: 900px) { + .footer-grid { + grid-template-columns: 1fr 1fr; } } -/* REMOVE white line above footer in dark mode */ -footer { - margin-top: 0 !important; +@media (max-width: 700px) { + .result-card { + flex-direction: column; + align-items: flex-start; + } + + .result-actions { + align-items: flex-start; + } + + .recent-item { + min-width: 180px; + } } +@media (max-width: 600px) { + .hero-input-card h1 { + font-size: 2rem; + } + + .short-url a { + font-size: 1.2rem; + } + + .footer-grid { + grid-template-columns: 1fr; + } + + .footer-bottom { + flex-direction: column; + gap: 1rem; + text-align: center; + } +} /*=============================== MODERN GLASS RECENT TABLE diff --git a/app/templates/footer.html b/app/templates/footer.html new file mode 100644 index 0000000..84e04aa --- /dev/null +++ b/app/templates/footer.html @@ -0,0 +1,41 @@ + + diff --git a/app/templates/header.html b/app/templates/header.html index c7b19b1..88c06db 100644 --- a/app/templates/header.html +++ b/app/templates/header.html @@ -1,11 +1,16 @@ -
      -
      - -
      - +
      +
      + + RIZO.link
      +
      - - +
      \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index 7a5ecd4..5382c7a 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1,117 +1,40 @@ -{% extends "layout.html" %} - -{% block content %} +{% extends "layout.html" %} {% block content %}

      tiny URL

      -
      - - -
      -
      - - Analytics Enabled -
      +
      +
      Analytics Enabled
      -
      - - {% if new_short_url %} -
      -
      - {% if qr_image %} - - {% endif %} -
      - Ready -
      - {{ new_short_url }} -
      +
      {% if new_short_url %}
      +
      {% if qr_image %} {% endif %}
      -
      - - {% if qr_image %} - Download QR - {% endif %} -
      -
      - {% endif %} - -
      +
      {% if qr_image %} Download QR {% endif + %}
      +
      {% endif %}
      -

      Recently Shortened

      - View History → +

      Recently Shortened

      View History →
      -
      - {% for url in urls %} -
      +
      {% for url in urls %}
      /{{ url.short_code }}
      {{ url.original_url }}
      -
      - {% endfor %} -
      +
      {% endfor %}
      - - - {% endblock %} \ No newline at end of file diff --git a/app/templates/layout.html b/app/templates/layout.html index e96619f..12f6017 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -27,12 +27,37 @@ {% block content %}{% endblock %} + {% include "footer.html" %} + diff --git a/app/templates/recent.html b/app/templates/recent.html index d20b35a..d25afeb 100644 --- a/app/templates/recent.html +++ b/app/templates/recent.html @@ -1,225 +1,61 @@ - - - - - - - Recent URLs - - - - - - -
      -
      - - tiny URL -
      - - -
      - -
      -
      - - - -
      -
      - -
      - - - -
      -

      Recent Shortened URLs

      -
      - - -
      - -
      - - - - - - - - - - - - - - {% for url in urls %} - - - - - - - - - - - - - - - {% else %} - - - - {% endfor %} - -
      #Short URLOriginal URLCreatedVisitsActions
      {{ loop.index }} - - {{ request.host_url }}{{ url.short_code }} - - - - {{ url.original_url }} - - - {{ format_date(url.created_at) }} - {{ url.visit_count }} - - ↗ - - - - 🗑 - -
      - No URLs found. -
      -
      - -
      - -
      - - - - - - - - - \ No newline at end of file +{% extends "layout.html" %} +{% block title %}Recent URLs{% endblock %} +{% block content %} +
      +
      +
      +

      Recent Shortened URLs

      +
      +
      +
      + + + + + + + + + + + + {% for url in urls %} + + + + + + + {% else %} + + {% endfor %} +
      #Short URLOriginal URLCreatedVisitsActions
      {{ loop.index }} {{ + request.host_url }}{{ url.short_code }} {{ + url.original_url }} {{ format_date(url.created_at) }} {{ url.visit_count }} ↗ 🗑
      No URLs found.
      +
      +
      +
      + +{% endblock %} \ No newline at end of file diff --git a/app/utils/cache.py b/app/utils/cache.py index 9150f4a..bfb5649 100644 --- a/app/utils/cache.py +++ b/app/utils/cache.py @@ -61,9 +61,9 @@ def set_cache_pair(short_code: str, original_url: str) -> None: expires_at = now + CACHE_TTL url_cache[short_code] = { - "url": original_url, - "expires_at": expires_at, - "visit_count": 0, + "url": original_url, + "expires_at": expires_at, + "visit_count": 0, } rev_cache[original_url] = { @@ -114,14 +114,14 @@ def get_recent_from_cache(limit: int = MAX_RECENT_URLS) -> list[dict]: now = _now() items = [ - { - "short_code": data["short_code"], - "original_url": original_url, - "visit_count": url_cache.get(data["short_code"], {}).get("visit_count", 0), - } - for original_url, data in rev_cache.items() - if data["expires_at"] >= now - ] + { + "short_code": data["short_code"], + "original_url": original_url, + "visit_count": url_cache.get(data["short_code"], {}).get("visit_count", 0), + } + for original_url, data in rev_cache.items() + if data["expires_at"] >= now + ] items.sort( key=lambda x: rev_cache[x["original_url"]]["last_accessed"], reverse=True From d7f5a0d6ebc4efac803d093c9e707cadfc14152f Mon Sep 17 00:00:00 2001 From: harshmishra2701 Date: Fri, 27 Feb 2026 01:19:14 +0530 Subject: [PATCH 27/34] [RTY-260025]: feat(api): enhance cache purge and delete_recent_api for improved DB handling and response --- app/routes.py | 38 ++++++++++++++++++++++++++++---------- app/utils/db.py | 8 +------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/app/routes.py b/app/routes.py index 5270214..88493cc 100644 --- a/app/routes.py +++ b/app/routes.py @@ -32,6 +32,7 @@ increment_visit_cache, url_cache, remove_cache_key, + rev_cache, ) from app.utils.config import DOMAIN, MAX_RECENT_URLS, CACHE_PURGE_TOKEN from app.utils.helper import generate_code, is_valid_url, sanitize_url, format_date @@ -161,25 +162,27 @@ def cache_list_ui(): @ui_router.delete("/cache/purge", response_class=PlainTextResponse) -def cache_purge_ui(cache_token: str = Header(..., alias="Cache-Token")): +def cache_purge_ui(x_cache_token: str = Header(..., alias="X-Cache-Token")): """ Force delete everything from cache (secured by header) """ - if cache_token != CACHE_PURGE_TOKEN: + if x_cache_token != CACHE_PURGE_TOKEN: raise HTTPException(status_code=401, detail="Unauthorized") - clear_cache() + if not url_cache and not rev_cache: + return "No URLs in cache" + clear_cache() return "cleared ALL" @ui_router.patch("/cache/remove") def cache_remove_one_ui( key: str = Query(..., description="short_code OR original_url"), - cache_token: str = Header(..., alias="Cache-Token"), + x_cache_token: str = Header(..., alias="X-Cache-Token"), ): # 🔐 Header security - if cache_token != CACHE_PURGE_TOKEN: + if x_cache_token != CACHE_PURGE_TOKEN: raise HTTPException(status_code=401, detail="Unauthorized") removed = remove_cache_key(key) @@ -228,6 +231,7 @@ def delete_recent_api(short_code: str): recent = get_recent_from_cache(MAX_RECENT_URLS) or [] removed_from_cache = False + # Try removing from cache (memory only) for i, item in enumerate(recent): code = item.get("short_code") or item.get("code") if code == short_code: @@ -235,13 +239,27 @@ def delete_recent_api(short_code: str): removed_from_cache = True break - db_deleted = False db_available = db.is_connected() + db_deleted = False + # If DB available → rely ONLY on DB if db_available: - db_deleted = bool(db.delete_by_short_code(short_code)) + db_deleted = db.delete_by_short_code(short_code) + + if not db_deleted: + raise HTTPException( + status_code=404, detail=f"short_code '{short_code}' not found" + ) + + return { + "status": "deleted", + "short_code": short_code, + "db_deleted": True, + "db_available": True, + } - if not removed_from_cache and not db_deleted: + # If DB NOT available → rely on cache only + if not removed_from_cache: raise HTTPException( status_code=404, detail=f"short_code '{short_code}' not found" ) @@ -249,8 +267,8 @@ def delete_recent_api(short_code: str): return { "status": "deleted", "short_code": short_code, - "db_deleted": db_deleted, - "db_available": db_available, + "db_deleted": False, + "db_available": False, } diff --git a/app/utils/db.py b/app/utils/db.py index 0dda40a..ef5bba1 100644 --- a/app/utils/db.py +++ b/app/utils/db.py @@ -40,13 +40,7 @@ def connect_db(max_retries: int = 1) -> bool: Returns: True if connection successful, False otherwise """ - global \ - client, \ - db, \ - collection, \ - connection_state, \ - last_connection_attempt, \ - connection_error + global client, db, collection, connection_state, last_connection_attempt, connection_error if not MONGO_INSTALLED: logger.error("PyMongo is not installed") From 7219026a2a10609958bcd1c977a49c7e9b34b08e Mon Sep 17 00:00:00 2001 From: Ravindrayadav04 Date: Fri, 27 Feb 2026 15:42:10 +0530 Subject: [PATCH 28/34] [RTY-260028]: UI Enhancement --- app/static/css/tiny.css | 121 ++++++++++++-------------------------- app/templates/header.html | 2 +- app/templates/layout.html | 12 ---- 3 files changed, 37 insertions(+), 98 deletions(-) diff --git a/app/static/css/tiny.css b/app/static/css/tiny.css index 1224c96..aa18fe2 100644 --- a/app/static/css/tiny.css +++ b/app/static/css/tiny.css @@ -16,15 +16,6 @@ body { background-image: radial-gradient(circle at 50% -20%, #1e1e2e 0%, transparent 50%); } -body { - background: var(--bg); - color: var(--text-primary); - font-family: "Inter", system-ui, sans-serif; - margin: 0; - overflow-x: hidden; - background-image: radial-gradient(circle at 50% -20%, #1e1e2e 0%, transparent 50%); -} - /* Light theme overrides */ body.light-theme { /* background + glass */ @@ -59,19 +50,20 @@ body.light-theme { padding-top: 6rem; } -/* Top navigation header */ .app-header { position: fixed; top: 0; left: 0; width: 100%; height: 55px; - background: var(--glass); - border-bottom: 1px solid var(--glass-border); display: flex; align-items: center; - padding: 0 28px; - box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08); + justify-content: space-between; + padding: 0 10px; + box-sizing: border-box; + + background: var(--glass); + border-bottom: 1px solid var(--glass-border); z-index: 1000; } @@ -82,10 +74,6 @@ body.light-theme { gap: 12px; } -.header-right { - margin-left: auto; -} - .app-logo { width: 36px; height: 36px; @@ -105,11 +93,9 @@ body.light-theme { } .header-nav { - position: absolute; - left: 50%; - transform: translateX(-50%); display: flex; gap: 26px; + margin: 0 auto; } .nav-link, @@ -369,9 +355,8 @@ body.dark-theme .app-header { font-weight: 700; } -/* Recent page full table layout (visit page) */ + .recent-page-container { - width: 100%; max-width: 1100px; margin: 30px auto; padding: 28px; @@ -387,7 +372,7 @@ body.dark-theme .app-header { .recent-table-wrapper { margin-top: 20px; width: 100%; - overflow-x: hidden; + overflow-x: auto; } .recent-table { @@ -398,6 +383,7 @@ body.dark-theme .app-header { table-layout: fixed; } +/* Header */ .recent-table thead { background: var(--glass); } @@ -413,7 +399,9 @@ body.dark-theme .app-header { border-bottom: 1px solid var(--glass-border); } +/* Body cells */ .recent-table td { + vertical-align: middle; padding: 14px; font-size: 14px; color: var(--text-primary); @@ -421,41 +409,12 @@ body.dark-theme .app-header { transition: 0.25s ease; } -/* Stable column widths so important columns stay visible */ -.recent-table th:nth-child(1), -.recent-table td:nth-child(1) { - width: 6%; -} - -.recent-table th:nth-child(2), -.recent-table td:nth-child(2) { - width: 18%; -} - -.recent-table th:nth-child(3), -.recent-table td:nth-child(3) { - width: 38%; -} - -.recent-table th:nth-child(4), -.recent-table td:nth-child(4) { - width: 18%; -} - -.recent-table th:nth-child(5), -.recent-table td:nth-child(5) { - width: 8%; -} - -.recent-table th:nth-child(6), -.recent-table td:nth-child(6) { - width: 12%; -} - +/* Row hover */ .recent-table tbody tr:hover { background: rgba(255, 255, 255, 0.05); } +/* Short link */ .short-code a { color: var(--accent); font-weight: 700; @@ -467,37 +426,52 @@ body.dark-theme .app-header { text-decoration: underline; } +/*.original-url, .original-url a { - color: var(--text-secondary); - text-decoration: none; + white-space: normal; + word-break: break-word; + overflow-wrap: break-word; +}*/ + +.original-url { + max-width: 100%; +} + +.original-url a { + display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .original-url a:hover { color: var(--accent); } +/* Created time */ .created-time { font-size: 13px; color: var(--muted); white-space: nowrap; } +/* Visit count highlight */ .recent-table td:nth-child(5) { font-weight: 700; color: var(--accent-2); } +/* Dark mode adjustments */ .dark-theme .recent-table th, .dark-theme .recent-table td { color: #e5e7eb; border-bottom: 1px solid var(--glass-border); } +/* Action buttons */ .action-col { display: flex; - gap: 12px; - justify-content: flex-end; - align-items: center; + gap: 10px; } .action-btn { @@ -522,34 +496,11 @@ body.dark-theme .app-header { color: #fff; } - -/* Action buttons */ -.action-col { - display: flex; - gap: 10px; -} - -.action-btn { - width: 36px; - height: 36px; - border-radius: 10px; - display: flex; - align-items: center; - justify-content: center; - text-decoration: none; - font-size: 16px; - transition: 0.2s ease; +.recent-table-wrapper { + margin-bottom: 20px; } -.open-btn { - background: #3b82f6; - color: #fff; -} -.delete-btn { - background: #ef4444; - color: #fff; -} /* Footer */ footer.big-footer { diff --git a/app/templates/header.html b/app/templates/header.html index 88c06db..c5f3b30 100644 --- a/app/templates/header.html +++ b/app/templates/header.html @@ -8,7 +8,7 @@ Analysis Search Contact - 🕘 Recent URLs + History
      diff --git a/app/templates/layout.html b/app/templates/layout.html index 12f6017..23d8a6f 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -30,18 +30,6 @@ {% include "footer.html" %} \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index 5781de6..eb4f389 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -39,53 +39,6 @@

      Recently Shortened

      View History
      - -