🌐 i18n(translation): add archive-related translations
- add new translation keys for archive feature in both German and English
✨ feat(server): implement archived servers feature
- create endpoints for listing and restoring archived servers
- add HTML template for displaying archived servers
- update navigation to include archived servers link
This commit is contained in:
parent
c6a2ed928b
commit
d0622ae361
4 changed files with 138 additions and 0 deletions
10
app/i18n.py
10
app/i18n.py
|
|
@ -12,6 +12,7 @@ translations: Dict[str, Dict[str, str]] = {
|
||||||
"nav.users": "User",
|
"nav.users": "User",
|
||||||
"nav.overview": "Übersicht",
|
"nav.overview": "Übersicht",
|
||||||
"nav.map": "Karte",
|
"nav.map": "Karte",
|
||||||
|
"nav.archive": "Archiv",
|
||||||
"nav.new_server": "Server anlegen",
|
"nav.new_server": "Server anlegen",
|
||||||
"nav.logout": "Logout",
|
"nav.logout": "Logout",
|
||||||
"nav.login": "Login",
|
"nav.login": "Login",
|
||||||
|
|
@ -45,6 +46,10 @@ translations: Dict[str, Dict[str, str]] = {
|
||||||
"server_list.empty": "Noch keine Server erfasst. Leg den ersten mit „Server anlegen“ oben rechts an.",
|
"server_list.empty": "Noch keine Server erfasst. Leg den ersten mit „Server anlegen“ oben rechts an.",
|
||||||
"price.month": "Monat",
|
"price.month": "Monat",
|
||||||
"price.year": "Jahr",
|
"price.year": "Jahr",
|
||||||
|
"archive.title": "Archivierte Server",
|
||||||
|
"archive.subtitle": "Ausgeblendete (archivierte) Server. Hier kannst du sie wiederherstellen.",
|
||||||
|
"archive.restore": "Wiederherstellen",
|
||||||
|
"archive.empty": "Keine archivierten Server vorhanden.",
|
||||||
"server_detail.server": "Server",
|
"server_detail.server": "Server",
|
||||||
"server_detail.contract_end": "Vertragsende",
|
"server_detail.contract_end": "Vertragsende",
|
||||||
"server_detail.days_ago": "vor {days} Tagen",
|
"server_detail.days_ago": "vor {days} Tagen",
|
||||||
|
|
@ -169,6 +174,7 @@ translations: Dict[str, Dict[str, str]] = {
|
||||||
"nav.users": "Users",
|
"nav.users": "Users",
|
||||||
"nav.overview": "Overview",
|
"nav.overview": "Overview",
|
||||||
"nav.map": "Map",
|
"nav.map": "Map",
|
||||||
|
"nav.archive": "Archive",
|
||||||
"nav.new_server": "Add server",
|
"nav.new_server": "Add server",
|
||||||
"nav.logout": "Logout",
|
"nav.logout": "Logout",
|
||||||
"nav.login": "Login",
|
"nav.login": "Login",
|
||||||
|
|
@ -202,6 +208,10 @@ translations: Dict[str, Dict[str, str]] = {
|
||||||
"server_list.empty": "No servers yet. Create the first one via “Add server” in the top right.",
|
"server_list.empty": "No servers yet. Create the first one via “Add server” in the top right.",
|
||||||
"price.month": "Month",
|
"price.month": "Month",
|
||||||
"price.year": "Year",
|
"price.year": "Year",
|
||||||
|
"archive.title": "Archived servers",
|
||||||
|
"archive.subtitle": "Hidden (archived) servers. Restore them here.",
|
||||||
|
"archive.restore": "Restore",
|
||||||
|
"archive.empty": "No archived servers found.",
|
||||||
"server_detail.server": "Server",
|
"server_detail.server": "Server",
|
||||||
"server_detail.contract_end": "Contract end",
|
"server_detail.contract_end": "Contract end",
|
||||||
"server_detail.days_ago": "{days} days ago",
|
"server_detail.days_ago": "{days} days ago",
|
||||||
|
|
|
||||||
52
app/main.py
52
app/main.py
|
|
@ -624,6 +624,33 @@ def create_server(
|
||||||
return RedirectResponse(url="/", status_code=303)
|
return RedirectResponse(url="/", status_code=303)
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/servers/archived", response_class=HTMLResponse)
|
||||||
|
def archived_servers(
|
||||||
|
request: Request,
|
||||||
|
session: Session = Depends(get_session),
|
||||||
|
current_user: User = Depends(require_current_user),
|
||||||
|
):
|
||||||
|
"""List archived servers for the current user."""
|
||||||
|
servers = session.exec(
|
||||||
|
select(Server)
|
||||||
|
.where(Server.archived == True)
|
||||||
|
.where(Server.owner_id == current_user.id)
|
||||||
|
.order_by(Server.provider, Server.name)
|
||||||
|
).all()
|
||||||
|
|
||||||
|
csrf_token = ensure_csrf_token(request)
|
||||||
|
|
||||||
|
return templates.TemplateResponse(
|
||||||
|
"servers_archived.html",
|
||||||
|
{
|
||||||
|
"request": request,
|
||||||
|
"servers": servers,
|
||||||
|
"current_user": current_user,
|
||||||
|
"csrf_token": csrf_token,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@app.get("/servers/{server_id}", response_class=HTMLResponse)
|
@app.get("/servers/{server_id}", response_class=HTMLResponse)
|
||||||
def server_detail(
|
def server_detail(
|
||||||
server_id: int,
|
server_id: int,
|
||||||
|
|
@ -801,6 +828,31 @@ def archive_server(
|
||||||
return RedirectResponse("/", status_code=303)
|
return RedirectResponse("/", status_code=303)
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/servers/{server_id}/unarchive")
|
||||||
|
def unarchive_server(
|
||||||
|
server_id: int,
|
||||||
|
request: Request,
|
||||||
|
csrf_token: str = Form(...),
|
||||||
|
session: Session = Depends(get_session),
|
||||||
|
current_user: User = Depends(require_current_user),
|
||||||
|
):
|
||||||
|
"""Restore an archived server."""
|
||||||
|
if not validate_csrf(request, csrf_token):
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid CSRF token."
|
||||||
|
)
|
||||||
|
|
||||||
|
server = session.get(Server, server_id)
|
||||||
|
if not server or server.owner_id != current_user.id:
|
||||||
|
return RedirectResponse("/", status_code=303)
|
||||||
|
|
||||||
|
server.archived = False
|
||||||
|
server.updated_at = datetime.utcnow()
|
||||||
|
session.add(server)
|
||||||
|
session.commit()
|
||||||
|
return RedirectResponse("/servers/archived", status_code=303)
|
||||||
|
|
||||||
|
|
||||||
# ------------- Per-user map view -------------
|
# ------------- Per-user map view -------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,9 @@
|
||||||
<a href="/map" class="text-slate-300 hover:text-white underline-offset-2 hover:underline">
|
<a href="/map" class="text-slate-300 hover:text-white underline-offset-2 hover:underline">
|
||||||
{{ t("nav.map") }}
|
{{ t("nav.map") }}
|
||||||
</a>
|
</a>
|
||||||
|
<a href="/servers/archived" class="text-slate-300 hover:text-white underline-offset-2 hover:underline">
|
||||||
|
{{ t("nav.archive") }}
|
||||||
|
</a>
|
||||||
<a
|
<a
|
||||||
href="/servers/new"
|
href="/servers/new"
|
||||||
class="inline-flex items-center gap-1 rounded-lg bg-indigo-500 px-3 py-1.5 font-medium hover:bg-indigo-400 focus:outline-none focus:ring focus:ring-indigo-500/40"
|
class="inline-flex items-center gap-1 rounded-lg bg-indigo-500 px-3 py-1.5 font-medium hover:bg-indigo-400 focus:outline-none focus:ring focus:ring-indigo-500/40"
|
||||||
|
|
|
||||||
73
app/templates/servers_archived.html
Normal file
73
app/templates/servers_archived.html
Normal file
|
|
@ -0,0 +1,73 @@
|
||||||
|
{% extends "base.html" %}
|
||||||
|
{% block content %}
|
||||||
|
<div class="flex flex-col gap-4">
|
||||||
|
<div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
||||||
|
<div>
|
||||||
|
<h1 class="text-lg font-semibold tracking-tight">{{ t("archive.title") }}</h1>
|
||||||
|
<p class="text-xs text-slate-400">
|
||||||
|
{{ t("archive.subtitle") }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% if servers %}
|
||||||
|
<div class="overflow-hidden rounded-xl border border-slate-800 bg-slate-900/60">
|
||||||
|
<table class="min-w-full text-sm">
|
||||||
|
<thead class="bg-slate-900/80">
|
||||||
|
<tr class="text-xs uppercase tracking-wide text-slate-400">
|
||||||
|
<th class="px-3 py-2 text-left">{{ t("table.name") }}</th>
|
||||||
|
<th class="px-3 py-2 text-left">{{ t("table.provider") }}</th>
|
||||||
|
<th class="px-3 py-2 text-left">{{ t("table.type") }}</th>
|
||||||
|
<th class="px-3 py-2 text-left">{{ t("table.location") }}</th>
|
||||||
|
<th class="px-3 py-2 text-left">{{ t("table.ipv4") }}</th>
|
||||||
|
<th class="px-3 py-2 text-right">{{ t("table.action") }}</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for s in servers %}
|
||||||
|
<tr class="border-t border-slate-800/80 hover:bg-slate-800/50">
|
||||||
|
<td class="px-3 py-2">
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<div>
|
||||||
|
<span class="text-slate-100 font-medium">{{ s.name }}</span>
|
||||||
|
{% if s.hostname %}
|
||||||
|
<div class="text-[11px] text-slate-400">{{ s.hostname }}</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td class="px-3 py-2 text-slate-200">{{ s.provider }}</td>
|
||||||
|
<td class="px-3 py-2">
|
||||||
|
<span class="inline-flex rounded-full bg-slate-800 px-2 py-0.5 text-[11px] text-slate-300">
|
||||||
|
{{ s.type }}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td class="px-3 py-2 text-slate-200">
|
||||||
|
{% if s.location %}{{ s.location }}{% else %}<span class="text-slate-500">–</span>{% endif %}
|
||||||
|
</td>
|
||||||
|
<td class="px-3 py-2 text-slate-200">
|
||||||
|
{% if s.ipv4 %}{{ s.ipv4 }}{% else %}<span class="text-slate-500">–</span>{% endif %}
|
||||||
|
</td>
|
||||||
|
<td class="px-3 py-2 text-right text-slate-200">
|
||||||
|
<form method="post" action="/servers/{{ s.id }}/unarchive">
|
||||||
|
<input type="hidden" name="csrf_token" value="{{ csrf_token }}" />
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
class="text-emerald-200 hover:text-emerald-100 underline text-xs"
|
||||||
|
>
|
||||||
|
{{ t("archive.restore") }}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="rounded-xl border border-dashed border-slate-700 bg-slate-900/40 p-6 text-sm text-slate-300">
|
||||||
|
{{ t("archive.empty") }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue