Skip to content

Commit c95db2a

Browse files
[RTY-260025]: feat(ui): update links to open in new tab
1 parent d7f5a0d commit c95db2a

File tree

2 files changed

+18
-31
lines changed

2 files changed

+18
-31
lines changed

app/routes.py

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ async def index(request: Request):
5656

5757
new_short_url = session.pop("new_short_url", None)
5858
qr_enabled = session.pop("qr_enabled", False)
59-
qr_type = session.pop("qr_type", "short")
6059
original_url = session.pop("original_url", None)
6160
short_code = session.pop("short_code", None)
6261
info_message = session.pop("info_message", None)
@@ -66,7 +65,7 @@ async def index(request: Request):
6665
qr_data = None
6766

6867
if qr_enabled and new_short_url and short_code:
69-
qr_data = new_short_url if qr_type == "short" else original_url
68+
qr_data = new_short_url
7069
qr_filename = f"{short_code}.png"
7170
qr_dir = BASE_DIR / "static" / "qr"
7271
qr_dir.mkdir(parents=True, exist_ok=True)
@@ -231,44 +230,30 @@ def delete_recent_api(short_code: str):
231230
recent = get_recent_from_cache(MAX_RECENT_URLS) or []
232231
removed_from_cache = False
233232

234-
# Try removing from cache (memory only)
235233
for i, item in enumerate(recent):
236234
code = item.get("short_code") or item.get("code")
237235
if code == short_code:
238-
recent.pop(i)
239236
removed_from_cache = True
240237
break
241238

242239
db_available = db.is_connected()
243240
db_deleted = False
244241

245-
# If DB available → rely ONLY on DB
246242
if db_available:
247243
db_deleted = db.delete_by_short_code(short_code)
248244

249-
if not db_deleted:
250-
raise HTTPException(
251-
status_code=404, detail=f"short_code '{short_code}' not found"
252-
)
253-
254-
return {
255-
"status": "deleted",
256-
"short_code": short_code,
257-
"db_deleted": True,
258-
"db_available": True,
259-
}
260-
261-
# If DB NOT available → rely on cache only
262-
if not removed_from_cache:
245+
# ✅ If nothing was deleted anywhere → 404
246+
if not removed_from_cache and not db_deleted:
263247
raise HTTPException(
264248
status_code=404, detail=f"short_code '{short_code}' not found"
265249
)
266250

267251
return {
252+
"success": True,
268253
"status": "deleted",
269254
"short_code": short_code,
270-
"db_deleted": False,
271-
"db_available": False,
255+
"db_deleted": db_deleted,
256+
"db_available": db_available,
272257
}
273258

274259

app/templates/index.html

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ <h1>tiny URL</h1>
2828
<div>
2929
<span class="ready-label">Ready</span>
3030
<div class="short-url">
31-
<a href="{{ new_short_url }}" id="shortUrlDisplay" style="text-decoration: underline;">
31+
<a href="{{ new_short_url }}" id="shortUrlDisplay" style="text-decoration: underline;" target="_blank"
32+
rel="noopener noreferrer">
3233
{{ new_short_url }}
3334
</a>
35+
</a>
3436
</div>
3537
</div>
3638
</div>
@@ -46,7 +48,7 @@ <h1>tiny URL</h1>
4648
<div class="recent-tray">
4749
<div class="recent-header">
4850
<h3>Recently Shortened</h3>
49-
<a href="/recent" class="history-link">View History →</a>
51+
<a href="/recent" class="history-link" target="_blank">View History →</a>
5052
</div>
5153
<div class="scroll-container">
5254
{% for url in urls %}
@@ -70,20 +72,20 @@ <h3>🔗 tiny URL</h3>
7072
<div class="footer-col">
7173
<h4>Product</h4>
7274
<ul>
73-
<li><a href="cache/list">CACHE URLs</a></li>
74-
<li><a href="#">API Documentation</a></li>
75-
<li><a href="#">Custom Branded Links</a></li>
76-
<li><a href="#">QR Code Engine</a></li>
75+
<li><a href="cache/list" target="_blank">CACHE URLs</a></li>
76+
<li><a href="#" target="_blank">API Documentation</a></li>
77+
<li><a href="#" target="_blank">Custom Branded Links</a></li>
78+
<li><a href="#" target="_blank">QR Code Engine</a></li>
7779
</ul>
7880
</div>
7981

8082
<div class="footer-col">
8183
<h4>Support</h4>
8284
<ul>
83-
<li><a href="/docs"> UI docs</a></li>
84-
<li><a href="#">Help Center</a></li>
85-
<li><a href="#">System Status</a></li>
86-
<li><a href="#">Contact Us</a></li>
85+
<li><a href="/docs" target="_blank"> UI docs</a></li>
86+
<li><a href="#" target="_blank">Help Center</a></li>
87+
<li><a href="#" target="_blank">System Status</a></li>
88+
<li><a href="#" target="_blank">Contact Us</a></li>
8789
</ul>
8890
</div>
8991

0 commit comments

Comments
 (0)