Compare commits
2
Commits
v0.1.1
...
de916d2fc7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
de916d2fc7 | ||
|
|
89f9be5e72 |
@@ -1,5 +1,17 @@
|
||||
# Changelog
|
||||
|
||||
## Version v0.1.2
|
||||
### Features
|
||||
* Users can edit or delete labels created by themselves on the labels page
|
||||
* Administrators can edit labels from the admin interface
|
||||
* Filter label visibility so logged-in users only see default/admin-created labels and their own
|
||||
* Grandfather tags with unknown ownership as default/admin interface labels
|
||||
* Ability to minimize settings panels to only show headers in the Admin and Profile interfaces for easy navigation
|
||||
* Styled settings panel headers with distinct theme accent colors for visual distinction
|
||||
* Settings panels are collapsed by default when opening the Admin and Profile pages
|
||||
### Fixed
|
||||
* Fixed element ID conflict on the Admin page so Available Themes load correctly
|
||||
|
||||
## Version v0.1.1
|
||||
### Features
|
||||
* Ability to add new logs through the web interface
|
||||
|
||||
@@ -1274,3 +1274,69 @@ Update the VIBE directory with what you have done.
|
||||
|
||||
### Assistant outcome
|
||||
Appended the release workflow changes and this VIBE update request to `VIBE/PROMPTS.md` and `VIBE/CHAT_LOG.md` in the existing append-only format.
|
||||
|
||||
### User
|
||||
I want that the users is able to edit or delete labels(tags) that were created by the user itself. Also validate that any logged in user will only see the labels created by default, in the admin panel, and those by themselves, not by any other user. If this leads to an update in the database then if ownership of labels is unknown they may be grandfathered as-if created in the admin interface
|
||||
|
||||
### Assistant outcome
|
||||
Implemented creator edit/delete rights for user labels on `/labels` and `/api/user/labels/{label_id}`, isolated label visibility so logged-in users only see default/admin labels and their own created labels, dynamically set `created_by` when new tags are saved from links, grandfathered existing tags with `NULL` ownership as default/admin labels, added `frontend/static/labels.js`, and expanded unit test coverage.
|
||||
|
||||
### User
|
||||
Make sure that in the admin interface the labels can be edited
|
||||
|
||||
### Assistant outcome
|
||||
Added `PUT /api/admin/labels/{label_id}` for administrator label renaming, updated `update_label` service function to accept `is_admin=True`, added inline edit controls to `frontend/static/admin.js` for administrator label management, and added regression test coverage.
|
||||
|
||||
### User
|
||||
Make sure that the logs in VIBE are updated
|
||||
|
||||
### Assistant outcome
|
||||
Updated `VIBE/PROMPTS.md` and `VIBE/CHAT_LOG.md` with the recent user prompts and assistant outcomes.
|
||||
|
||||
### User
|
||||
Update Changelog too
|
||||
|
||||
### Assistant outcome
|
||||
Updated `CHANGELOG.MD` with the recent feature additions (user label CRUD, label visibility isolation, grandfathering unknown label ownership, and administrator label editing), and updated `VIBE/PROMPTS.md` and `VIBE/CHAT_LOG.md`.
|
||||
|
||||
### User
|
||||
In the Admin interface allow to minimize each settings pannel to only show its header, In order to easely navigate the page.
|
||||
|
||||
### Assistant outcome
|
||||
Added collapsible minimize/expand toggle buttons to all settings panels (`.settings-panel`) in the Admin interface. Clicking a panel header toggles its `.minimized` state and `aria-expanded` attribute, hiding the panel body content to show only the header and toggle icon. Added CSS rules and updated tests.
|
||||
|
||||
### User
|
||||
Clicking on the collapse button doesn't toggle
|
||||
|
||||
### Assistant outcome
|
||||
Fixed panel toggle initialization in `admin.js` to attach click handlers immediately on page load and `DOMContentLoaded` rather than waiting for async session validation calls to finish. Added `pointer-events: none` to button child elements in `style.css` and bound event listeners to target headers/buttons with event prevention to guarantee reliable click toggling.
|
||||
|
||||
### User
|
||||
Give the header of each setting-panel a somewhat differing color
|
||||
|
||||
### Assistant outcome
|
||||
Applied distinct theme accent colors (`var(--mauve)`, `var(--teal)`, `var(--peach)`, `var(--blue)`, `var(--lavender)`) to settings panel headers via `:nth-of-type` CSS rules, allowing panel toggle buttons to inherit the accent colors cleanly across all themes.
|
||||
|
||||
### User
|
||||
change the background of the header too
|
||||
|
||||
### Assistant outcome
|
||||
Added soft, translucent accent backgrounds (`color-mix` with `var(--surface-1)`) and accent left borders to each settings panel header in `style.css`. Updated `admin.js` to ensure clicking anywhere on the header bar toggles the panel minimize state cleanly. Passed all 55 tests.
|
||||
|
||||
### User
|
||||
Make sure all setting-panels are collapsed when opening the page
|
||||
|
||||
### Assistant outcome
|
||||
Updated `admin.html` and `admin.js` so all settings panels start with the `minimized` class and `aria-expanded="false"` by default, collapsing all panels on page open. Passed all 55 tests.
|
||||
|
||||
### User
|
||||
Apply exactly the same functionality to the profile page
|
||||
|
||||
### Assistant outcome
|
||||
Applied collapsible minimizable settings panels to the profile page (`user_profile.html` and `profile.js`), starting all panels collapsed by default with toggle buttons, distinct header colors/backgrounds, and aria-expanded state management. Passed all 55 tests.
|
||||
|
||||
### User
|
||||
On the admin page under Available Themes, the page does not load available themes
|
||||
|
||||
### Assistant outcome
|
||||
Fixed element ID conflict on `admin.html` where both the header theme submenu and the admin form container used `id="theme-options"`. Renamed the admin form container to `id="admin-theme-options"` and updated `admin.js` to target `#admin-theme-options`. Available themes now load correctly on the admin page. Passed all 55 tests.
|
||||
|
||||
@@ -224,6 +224,21 @@
|
||||
211. Don't put new entry in the hamburger menu but present it as a seperate button next to the style selector
|
||||
212. Put the new entry button left of the hamburger menu
|
||||
213. The style selection should move into the hamburger menu - but in such a way that it becomes a submenu so that it doesn't clutter the menu structure
|
||||
214. I want that the users is able to edit or delete labels(tags) that were created by the user itself. Also validate that any logged in user will only see the labels created by default, in the admin panel, and those by themselves, not by any other user. If this leads to an update in the database then if ownership of labels is unknown they may be grandfathered as-if created in the admin interface
|
||||
215. Make sure that in the admin interface the labels can be edited
|
||||
216. Make sure that the logs in VIBE are updated
|
||||
217. Update Changelog too
|
||||
218. In the Admin interface allow to minimize each settings pannel to only show its header, In order to easely navigate the page.
|
||||
219. Make sure all setting-panels are collapsed when opening the page
|
||||
218. In the Admin interface allow to minimize each settings pannel to only show its header, In order to easely navigate the page.
|
||||
219. Give the header of each setting-panel a somewhat differing color.
|
||||
220. Change the background of the header too.
|
||||
221. Apply exactly the same functionality to the profile page
|
||||
222. On the admin page under Available Themes, the page does not load available themes
|
||||
218. Give the header of each setting-panel a somewhat differing color
|
||||
218. In the Admin interface allow to minimize each settings pannel to only show its header, In order to easely navigate the page.
|
||||
219. Clicking on the collapse button doesn't toggle
|
||||
218. In the Admin interface allow to minimize each settings pannel to only show its header, In order to easely navigate the page.
|
||||
|
||||
## Future entries
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ from pydantic import BaseModel
|
||||
|
||||
from backend.app.api.dependencies import require_admin
|
||||
from backend.app.database import get_connection, hash_password
|
||||
from backend.app.services.link_service import delete_label
|
||||
from backend.app.services.link_service import delete_label, update_label
|
||||
from backend.app.services.email_service import (
|
||||
get_smtp_settings,
|
||||
save_smtp_settings,
|
||||
@@ -35,6 +35,10 @@ class AdminPluginUpdate(BaseModel):
|
||||
config: dict | None = None
|
||||
|
||||
|
||||
class AdminLabelUpdate(BaseModel):
|
||||
name: str
|
||||
|
||||
|
||||
class AdminUserCreate(BaseModel):
|
||||
username: str
|
||||
email: str
|
||||
@@ -304,6 +308,18 @@ def admin_delete_label(label_id: str, current_user: dict = Depends(require_admin
|
||||
return {'status': 'deleted', 'id': label_id}
|
||||
|
||||
|
||||
@router.put('/labels/{label_id}')
|
||||
def admin_edit_label(label_id: str, payload: AdminLabelUpdate, current_user: dict = Depends(require_admin)):
|
||||
try:
|
||||
result = update_label(label_id, user_id=current_user['id'], name=payload.name, is_admin=True)
|
||||
except ValueError as error:
|
||||
raise HTTPException(status_code=409, detail=str(error)) from error
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail='Label not found')
|
||||
record_audit_event(current_user['id'], 'label_updated', 'label', label_id)
|
||||
return result
|
||||
|
||||
|
||||
@router.get('/labels')
|
||||
def admin_list_labels(_: dict = Depends(require_admin)):
|
||||
with get_connection() as conn:
|
||||
|
||||
@@ -38,6 +38,22 @@ def get_current_user(
|
||||
return dict(user)
|
||||
|
||||
|
||||
def get_optional_current_user(
|
||||
credentials: HTTPAuthorizationCredentials | None = Depends(bearer_scheme),
|
||||
) -> dict | None:
|
||||
if credentials is None or credentials.scheme.lower() != 'bearer':
|
||||
return None
|
||||
token_data = validate_token(credentials.credentials)
|
||||
if token_data is None:
|
||||
return None
|
||||
with get_connection() as conn:
|
||||
user = conn.execute(
|
||||
'SELECT * FROM users WHERE id = ?',
|
||||
(token_data['user_id'],),
|
||||
).fetchone()
|
||||
return dict(user) if user else None
|
||||
|
||||
|
||||
def require_admin(user: dict = Depends(get_current_user)):
|
||||
if not user['is_admin']:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail='Administrator access required')
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
## SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
import json
|
||||
from fastapi import APIRouter, Header, HTTPException, Response, status
|
||||
from fastapi import APIRouter, Depends, Header, HTTPException, Response, status
|
||||
import logging
|
||||
from pydantic import BaseModel
|
||||
|
||||
from backend.app.api.dependencies import get_optional_current_user
|
||||
from backend.app.services.link_service import create_link, delete_link, find_owned_link_by_title_url, get_link_tags, get_owned_link, list_public_links, list_tags, mark_mastodon_posted, update_link
|
||||
from backend.app.database import get_connection
|
||||
from backend.app.services.plugin_manager import plugin_manager
|
||||
@@ -33,8 +34,9 @@ class LinkUpdate(BaseModel):
|
||||
|
||||
|
||||
@router.get('/tags')
|
||||
def available_tags():
|
||||
return list_tags()
|
||||
def available_tags(user: dict | None = Depends(get_optional_current_user)):
|
||||
user_id = user['id'] if user else None
|
||||
return list_tags(user_id=user_id)
|
||||
|
||||
|
||||
@router.get('/scrape')
|
||||
|
||||
@@ -27,7 +27,7 @@ def normalize_tags(tags: list[str] | None) -> list[str]:
|
||||
return normalized
|
||||
|
||||
|
||||
def save_link_tags(conn, link_id: str, tags: list[str]) -> None:
|
||||
def save_link_tags(conn, link_id: str, tags: list[str], user_id: str | None = None) -> list[str]:
|
||||
canonical_tags = []
|
||||
for tag in tags:
|
||||
tag_row = conn.execute(
|
||||
@@ -36,8 +36,8 @@ def save_link_tags(conn, link_id: str, tags: list[str]) -> None:
|
||||
).fetchone()
|
||||
if tag_row is None:
|
||||
conn.execute(
|
||||
'INSERT INTO tags (id, name) VALUES (?, ?)',
|
||||
(str(uuid4()), tag),
|
||||
'INSERT INTO tags (id, name, created_by) VALUES (?, ?, ?)',
|
||||
(str(uuid4()), tag, user_id),
|
||||
)
|
||||
tag_row = conn.execute('SELECT id FROM tags WHERE name = ?', (tag,)).fetchone()
|
||||
conn.execute(
|
||||
@@ -103,7 +103,7 @@ def create_link(
|
||||
record['is_public'],
|
||||
),
|
||||
)
|
||||
stored_tags = save_link_tags(conn, record['id'], normalized_tags)
|
||||
stored_tags = save_link_tags(conn, record['id'], normalized_tags, user_id=user_id)
|
||||
conn.commit()
|
||||
record['tags'] = stored_tags
|
||||
return record
|
||||
@@ -173,7 +173,7 @@ def update_link(
|
||||
if cursor.rowcount == 0:
|
||||
return None
|
||||
conn.execute('DELETE FROM link_tags WHERE link_id = ?', (link_id,))
|
||||
stored_tags = save_link_tags(conn, link_id, normalized_tags)
|
||||
stored_tags = save_link_tags(conn, link_id, normalized_tags, user_id=user_id)
|
||||
conn.commit()
|
||||
row = conn.execute('SELECT * FROM links WHERE id = ?', (link_id,)).fetchone()
|
||||
record = dict(row)
|
||||
@@ -227,9 +227,32 @@ def list_public_users():
|
||||
return [row['username'] for row in rows]
|
||||
|
||||
|
||||
def list_tags():
|
||||
def list_tags(user_id: str | None = None):
|
||||
with get_connection() as conn:
|
||||
rows = conn.execute('SELECT name FROM tags ORDER BY name').fetchall()
|
||||
if user_id:
|
||||
rows = conn.execute(
|
||||
'''
|
||||
SELECT tags.name
|
||||
FROM tags
|
||||
LEFT JOIN users ON users.id = tags.created_by
|
||||
WHERE tags.created_by IS NULL
|
||||
OR tags.created_by = ?
|
||||
OR users.is_admin = 1
|
||||
ORDER BY tags.name
|
||||
''',
|
||||
(user_id,),
|
||||
).fetchall()
|
||||
else:
|
||||
rows = conn.execute(
|
||||
'''
|
||||
SELECT tags.name
|
||||
FROM tags
|
||||
LEFT JOIN users ON users.id = tags.created_by
|
||||
WHERE tags.created_by IS NULL
|
||||
OR users.is_admin = 1
|
||||
ORDER BY tags.name
|
||||
''',
|
||||
).fetchall()
|
||||
tags = []
|
||||
seen = set()
|
||||
for row in rows:
|
||||
@@ -242,7 +265,15 @@ def list_tags():
|
||||
def list_user_labels(user_id: str):
|
||||
with get_connection() as conn:
|
||||
rows = conn.execute(
|
||||
'SELECT id, name, created_by FROM tags WHERE created_by = ? ORDER BY name',
|
||||
'''
|
||||
SELECT tags.id, tags.name, tags.created_by, users.username AS creator
|
||||
FROM tags
|
||||
LEFT JOIN users ON users.id = tags.created_by
|
||||
WHERE tags.created_by IS NULL
|
||||
OR tags.created_by = ?
|
||||
OR users.is_admin = 1
|
||||
ORDER BY tags.name
|
||||
''',
|
||||
(user_id,),
|
||||
).fetchall()
|
||||
return [dict(row) for row in rows]
|
||||
@@ -268,7 +299,7 @@ def create_label(user_id: str, name: str):
|
||||
return {'id': label_id, 'name': label, 'created_by': user_id}
|
||||
|
||||
|
||||
def update_label(label_id: str, user_id: str, name: str):
|
||||
def update_label(label_id: str, user_id: str | None = None, name: str = '', is_admin: bool = False):
|
||||
normalized = normalize_tags([name])
|
||||
if not normalized:
|
||||
raise ValueError('Label cannot be empty')
|
||||
@@ -276,7 +307,7 @@ def update_label(label_id: str, user_id: str, name: str):
|
||||
current = conn.execute(
|
||||
'SELECT id, name, created_by FROM tags WHERE id = ?', (label_id,)
|
||||
).fetchone()
|
||||
if current is None or current['created_by'] != user_id:
|
||||
if current is None or (not is_admin and current['created_by'] != user_id):
|
||||
return None
|
||||
duplicate = conn.execute(
|
||||
'SELECT id FROM tags WHERE lower(name) = lower(?) AND id != ?',
|
||||
@@ -286,7 +317,7 @@ def update_label(label_id: str, user_id: str, name: str):
|
||||
raise ValueError('Label already exists')
|
||||
conn.execute('UPDATE tags SET name = ? WHERE id = ?', (normalized[0], label_id))
|
||||
conn.commit()
|
||||
return {'id': label_id, 'name': normalized[0], 'created_by': user_id}
|
||||
return {'id': label_id, 'name': normalized[0], 'created_by': current['created_by']}
|
||||
|
||||
|
||||
def delete_label(label_id: str, user_id: str | None = None, is_admin: bool = False):
|
||||
|
||||
+95
-11
@@ -11,7 +11,7 @@ from unittest.mock import MagicMock, patch
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from backend.app.main import app
|
||||
from backend.app.database import get_connection
|
||||
from backend.app.database import get_connection, hash_password
|
||||
from backend.app.services.email_service import get_smtp_settings
|
||||
from backend.app.services.login_throttle import clear_login_failures
|
||||
from backend.app.services.otp_service import current_code
|
||||
@@ -490,25 +490,102 @@ def test_admin_can_toggle_privileges_without_removing_last_admin():
|
||||
assert last_admin.status_code == 400
|
||||
|
||||
|
||||
def test_users_manage_owned_labels_and_admin_can_delete_any_label():
|
||||
alice_headers = login_headers('alice')
|
||||
created = client.post('/api/user/labels', headers=alice_headers, json={'name': 'My Label'})
|
||||
def test_users_manage_owned_labels_and_admin_can_edit_and_delete_any_label():
|
||||
alice_headers = login_headers('alice') # admin
|
||||
bob_headers = login_headers('bob') # non-admin
|
||||
|
||||
created = client.post('/api/user/labels', headers=bob_headers, json={'name': 'Bob Label'})
|
||||
assert created.status_code == 201
|
||||
label = created.json()
|
||||
assert label['name'] == '#My Label'
|
||||
assert label['name'] == '#Bob Label'
|
||||
|
||||
edited = client.put(f"/api/user/labels/{label['id']}", headers=alice_headers, json={'name': '#Renamed'})
|
||||
# Bob renames own label
|
||||
edited = client.put(f"/api/user/labels/{label['id']}", headers=bob_headers, json={'name': '#RenamedByBob'})
|
||||
assert edited.status_code == 200
|
||||
assert edited.json()['name'] == '#Renamed'
|
||||
assert edited.json()['name'] == '#RenamedByBob'
|
||||
|
||||
denied = client.put(f"/api/user/labels/{label['id']}", headers=login_headers('bob'), json={'name': '#Nope'})
|
||||
assert denied.status_code == 404
|
||||
assert client.delete(f"/api/user/labels/{label['id']}", headers=login_headers('bob')).status_code == 404
|
||||
# Non-owner Alice can edit it via admin endpoint, but NOT user endpoint
|
||||
user_denied = client.put(f"/api/user/labels/{label['id']}", headers=alice_headers, json={'name': '#NopeUser'})
|
||||
assert user_denied.status_code == 404
|
||||
|
||||
admin_edited = client.put(f"/api/admin/labels/{label['id']}", headers=alice_headers, json={'name': '#AdminRenamed'})
|
||||
assert admin_edited.status_code == 200
|
||||
assert admin_edited.json()['name'] == '#AdminRenamed'
|
||||
|
||||
# Non-admin Bob cannot access admin edit endpoint
|
||||
bob_admin_denied = client.put(f"/api/admin/labels/{label['id']}", headers=bob_headers, json={'name': '#NopeAdmin'})
|
||||
assert bob_admin_denied.status_code == 403
|
||||
|
||||
# Admin delete
|
||||
admin_delete = client.delete(f"/api/admin/labels/{label['id']}", headers=alice_headers)
|
||||
assert admin_delete.status_code == 200
|
||||
|
||||
|
||||
def test_label_visibility_isolation_and_grandfathering():
|
||||
alice_headers = login_headers('alice')
|
||||
bob_headers = login_headers('bob')
|
||||
|
||||
# Create non-admin user charlie
|
||||
with get_connection() as conn:
|
||||
conn.execute(
|
||||
'''INSERT OR IGNORE INTO users (id, username, email, password_hash, is_admin, email_verified)
|
||||
VALUES (?, ?, ?, ?, 0, 1)''',
|
||||
('user-3', 'charlie', 'charlie@example.com', hash_password('secret123')),
|
||||
)
|
||||
conn.commit()
|
||||
|
||||
charlie_headers = login_headers('charlie')
|
||||
|
||||
# Create Bob label (non-admin)
|
||||
created_bob = client.post('/api/user/labels', headers=bob_headers, json={'name': 'BobOnlyLabel'}).json()
|
||||
# Create Charlie label (non-admin)
|
||||
created_charlie = client.post('/api/user/labels', headers=charlie_headers, json={'name': 'CharlieOnlyLabel'}).json()
|
||||
|
||||
# Grandfathered label in DB with NULL created_by
|
||||
from uuid import uuid4
|
||||
grandfathered_id = str(uuid4())
|
||||
with get_connection() as conn:
|
||||
conn.execute('INSERT INTO tags (id, name, created_by) VALUES (?, ?, NULL)', (grandfathered_id, '#GrandfatheredLabel'))
|
||||
conn.commit()
|
||||
|
||||
# Bob views /api/user/labels: sees default tags, grandfathered tag, and Bob tag, NOT Charlie tag
|
||||
bob_labels = client.get('/api/user/labels', headers=bob_headers).json()
|
||||
bob_label_names = [l['name'] for l in bob_labels]
|
||||
assert '#BobOnlyLabel' in bob_label_names
|
||||
assert '#GrandfatheredLabel' in bob_label_names
|
||||
assert '#Cybersecurity' in bob_label_names
|
||||
assert '#CharlieOnlyLabel' not in bob_label_names
|
||||
|
||||
# Charlie views /api/user/labels: sees default tags, grandfathered tag, and Charlie tag, NOT Bob tag
|
||||
charlie_labels = client.get('/api/user/labels', headers=charlie_headers).json()
|
||||
charlie_label_names = [l['name'] for l in charlie_labels]
|
||||
assert '#CharlieOnlyLabel' in charlie_label_names
|
||||
assert '#GrandfatheredLabel' in charlie_label_names
|
||||
assert '#Cybersecurity' in charlie_label_names
|
||||
assert '#BobOnlyLabel' not in charlie_label_names
|
||||
|
||||
# Bob views /api/tags (authenticated): sees Bob tag & default/grandfathered, NOT Charlie tag
|
||||
bob_tags = client.get('/api/tags', headers=bob_headers).json()
|
||||
assert '#BobOnlyLabel' in bob_tags
|
||||
assert '#GrandfatheredLabel' in bob_tags
|
||||
assert '#CharlieOnlyLabel' not in bob_tags
|
||||
|
||||
# Anonymous views /api/tags: sees default/grandfathered, NOT Bob or Charlie tag
|
||||
anon_tags = client.get('/api/tags').json()
|
||||
assert '#GrandfatheredLabel' in anon_tags
|
||||
assert '#BobOnlyLabel' not in anon_tags
|
||||
assert '#CharlieOnlyLabel' not in anon_tags
|
||||
|
||||
# Bob cannot edit or delete grandfathered label
|
||||
assert client.put(f"/api/user/labels/{grandfathered_id}", headers=bob_headers, json={'name': '#RenamedGrandfathered'}).status_code == 404
|
||||
assert client.delete(f"/api/user/labels/{grandfathered_id}", headers=bob_headers).status_code == 404
|
||||
|
||||
# Clean up created labels
|
||||
client.delete(f"/api/user/labels/{created_bob['id']}", headers=bob_headers)
|
||||
client.delete(f"/api/user/labels/{created_charlie['id']}", headers=charlie_headers)
|
||||
client.delete(f"/api/admin/labels/{grandfathered_id}", headers=alice_headers)
|
||||
|
||||
|
||||
def test_labels_page_renders_authenticated_management_shell():
|
||||
page = client.get('/labels')
|
||||
assert page.status_code == 200
|
||||
@@ -738,7 +815,14 @@ def test_public_and_admin_pages_render_html():
|
||||
assert 'id="auth-menu" class="auth-menu hidden"' in admin_page
|
||||
assert 'id="auth-home-link" href="/">Home</a>' in admin_page
|
||||
assert '<a id="auth-username" class="user-name" href="/">' in admin_page
|
||||
assert 'admin.js?v=5' in admin_page
|
||||
assert 'class="panel-toggle-btn"' in admin_page
|
||||
assert 'admin.js?v=7' in admin_page
|
||||
assert client.get('/profile').status_code == 200
|
||||
profile_page = client.get('/profile').text
|
||||
assert 'Profile' in profile_page
|
||||
assert 'class="link-item settings-panel minimized"' in profile_page
|
||||
assert 'class="panel-toggle-btn"' in profile_page
|
||||
assert 'profile.js?v=6' in profile_page
|
||||
feed_script = client.get('/static/feed.js?v=7').text
|
||||
assert 'if (item.is_owner && !showIdentity)' in feed_script
|
||||
assert 'deleteEntry(item, deleteButton)' in feed_script
|
||||
|
||||
+116
-7
@@ -12,7 +12,7 @@ const smtpForm = document.querySelector('#smtp-form');
|
||||
const smtpTestButton = document.querySelector('#smtp-test-button');
|
||||
const smtpStatus = document.querySelector('#smtp-status');
|
||||
const themesForm = document.querySelector('#themes-form');
|
||||
const themeOptions = document.querySelector('#theme-options');
|
||||
const themeOptions = document.querySelector('#admin-theme-options');
|
||||
const themeStatus = document.querySelector('#theme-status');
|
||||
let smtpNextAllowedAt = null;
|
||||
let smtpTimerHandle = null;
|
||||
@@ -57,21 +57,85 @@ function renderLabels(labels) {
|
||||
adminLabelList.replaceChildren(...labels.map((label) => {
|
||||
const row = document.createElement('div');
|
||||
row.className = 'plugin-row';
|
||||
|
||||
const text = document.createElement('span');
|
||||
text.textContent = `${label.name}${label.creator ? ` (${label.creator})` : ' (default)'}`;
|
||||
const button = document.createElement('button');
|
||||
button.type = 'button';
|
||||
button.className = 'danger-button';
|
||||
button.textContent = 'Delete';
|
||||
button.addEventListener('click', async () => {
|
||||
|
||||
const actions = document.createElement('div');
|
||||
actions.style.display = 'flex';
|
||||
actions.style.gap = '8px';
|
||||
|
||||
const editButton = document.createElement('button');
|
||||
editButton.type = 'button';
|
||||
editButton.textContent = 'Edit';
|
||||
editButton.addEventListener('click', () => {
|
||||
showAdminInlineLabelEdit(row, label);
|
||||
});
|
||||
|
||||
const deleteButton = document.createElement('button');
|
||||
deleteButton.type = 'button';
|
||||
deleteButton.className = 'danger-button';
|
||||
deleteButton.textContent = 'Delete';
|
||||
deleteButton.addEventListener('click', async () => {
|
||||
if (!confirm(`Are you sure you want to delete "${label.name}"?`)) return;
|
||||
const response = await fetch(`/api/admin/labels/${label.id}`, {method: 'DELETE', headers: authHeaders()});
|
||||
if (response.ok) loadLabels();
|
||||
});
|
||||
row.append(text, button);
|
||||
|
||||
actions.append(editButton, deleteButton);
|
||||
row.append(text, actions);
|
||||
return row;
|
||||
}));
|
||||
}
|
||||
|
||||
function showAdminInlineLabelEdit(rowContainer, label) {
|
||||
rowContainer.replaceChildren();
|
||||
|
||||
const editForm = document.createElement('form');
|
||||
editForm.style.display = 'flex';
|
||||
editForm.style.gap = '8px';
|
||||
editForm.style.width = '100%';
|
||||
editForm.style.alignItems = 'center';
|
||||
|
||||
const input = document.createElement('input');
|
||||
input.type = 'text';
|
||||
input.value = label.name;
|
||||
input.required = true;
|
||||
input.style.flex = '1';
|
||||
|
||||
const saveButton = document.createElement('button');
|
||||
saveButton.type = 'submit';
|
||||
saveButton.textContent = 'Save';
|
||||
|
||||
const cancelButton = document.createElement('button');
|
||||
cancelButton.type = 'button';
|
||||
cancelButton.textContent = 'Cancel';
|
||||
cancelButton.addEventListener('click', () => {
|
||||
loadLabels();
|
||||
});
|
||||
|
||||
editForm.append(input, saveButton, cancelButton);
|
||||
|
||||
editForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
const newName = input.value.trim();
|
||||
if (!newName) return;
|
||||
const response = await fetch(`/api/admin/labels/${label.id}`, {
|
||||
method: 'PUT',
|
||||
headers: authHeaders(true),
|
||||
body: JSON.stringify({ name: newName }),
|
||||
});
|
||||
if (response.ok) {
|
||||
loadLabels();
|
||||
} else {
|
||||
alert(await responseError(response, 'Could not update label'));
|
||||
}
|
||||
});
|
||||
|
||||
rowContainer.appendChild(editForm);
|
||||
input.focus();
|
||||
}
|
||||
|
||||
async function loadLabels() {
|
||||
const response = await fetch('/api/admin/labels', {headers: authHeaders()});
|
||||
if (!response.ok) throw new Error('Could not load labels');
|
||||
@@ -195,9 +259,51 @@ async function loadUsers() {
|
||||
renderUsers(await response.json());
|
||||
}
|
||||
|
||||
function initPanelToggles() {
|
||||
const panels = document.querySelectorAll('#admin-controls .settings-panel');
|
||||
panels.forEach((panel) => {
|
||||
panel.classList.add('minimized');
|
||||
const h2 = panel.querySelector('h2');
|
||||
if (!h2) return;
|
||||
let btn = h2.querySelector('.panel-toggle-btn');
|
||||
if (!btn) {
|
||||
const titleText = h2.textContent.trim();
|
||||
h2.replaceChildren();
|
||||
btn = document.createElement('button');
|
||||
btn.type = 'button';
|
||||
btn.className = 'panel-toggle-btn';
|
||||
btn.setAttribute('aria-expanded', 'false');
|
||||
const textSpan = document.createElement('span');
|
||||
textSpan.textContent = titleText;
|
||||
const iconSpan = document.createElement('span');
|
||||
iconSpan.className = 'panel-toggle-icon';
|
||||
iconSpan.setAttribute('aria-hidden', 'true');
|
||||
iconSpan.textContent = '▼';
|
||||
btn.append(textSpan, iconSpan);
|
||||
h2.appendChild(btn);
|
||||
} else {
|
||||
btn.setAttribute('aria-expanded', 'false');
|
||||
}
|
||||
|
||||
if (h2.dataset.initialized) return;
|
||||
h2.dataset.initialized = 'true';
|
||||
|
||||
h2.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
const isMinimized = panel.classList.toggle('minimized');
|
||||
if (btn) {
|
||||
btn.setAttribute('aria-expanded', String(!isMinimized));
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function showAdminState(isAdmin) {
|
||||
adminControls.classList.toggle('hidden', !isAdmin);
|
||||
adminAuthNotice.classList.toggle('hidden', isAdmin);
|
||||
if (isAdmin) {
|
||||
initPanelToggles();
|
||||
}
|
||||
}
|
||||
|
||||
function showSignedOutState() {
|
||||
@@ -382,4 +488,7 @@ loadAdminState().catch((error) => {
|
||||
smtpForm.reset();
|
||||
themesForm.reset();
|
||||
});
|
||||
|
||||
document.addEventListener('DOMContentLoaded', initPanelToggles);
|
||||
initPanelToggles();
|
||||
})();
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
// Copyright © 2026 Olaf Kolkman
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
(() => {
|
||||
const labelAuthNotice = document.querySelector('#label-auth-notice');
|
||||
const labelControls = document.querySelector('#label-controls');
|
||||
const labelForm = document.querySelector('#label-form');
|
||||
const labelNameInput = document.querySelector('#label-name');
|
||||
const labelStatus = document.querySelector('#label-status');
|
||||
const labelList = document.querySelector('#label-list');
|
||||
const accessToken = localStorage.getItem('linklogAccessToken');
|
||||
let currentUserId = null;
|
||||
|
||||
function authHeaders(includeJson = false) {
|
||||
return {
|
||||
...(includeJson ? {'Content-Type': 'application/json'} : {}),
|
||||
...(accessToken ? {Authorization: `Bearer ${accessToken}`} : {}),
|
||||
};
|
||||
}
|
||||
|
||||
function setStatus(message, isError = false) {
|
||||
if (!labelStatus) return;
|
||||
labelStatus.textContent = message;
|
||||
labelStatus.style.color = isError ? '#b91c1c' : '#166534';
|
||||
}
|
||||
|
||||
async function responseError(response, fallback) {
|
||||
try {
|
||||
const result = await response.json();
|
||||
return result.detail || result.message || fallback;
|
||||
} catch {
|
||||
return fallback;
|
||||
}
|
||||
}
|
||||
|
||||
function renderLabels(labels) {
|
||||
if (!labelList) return;
|
||||
if (!labels || labels.length === 0) {
|
||||
labelList.innerHTML = '<p>No labels found.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
labelList.replaceChildren(...labels.map((label) => {
|
||||
const row = document.createElement('div');
|
||||
row.className = 'plugin-row';
|
||||
|
||||
const isOwned = label.created_by === currentUserId;
|
||||
|
||||
const contentContainer = document.createElement('div');
|
||||
contentContainer.style.display = 'flex';
|
||||
contentContainer.style.alignItems = 'center';
|
||||
contentContainer.style.justifySpaceBetween = 'space-between';
|
||||
contentContainer.style.width = '100%';
|
||||
|
||||
const text = document.createElement('span');
|
||||
text.textContent = `${label.name}${isOwned ? '' : (label.creator ? ` (${label.creator})` : ' (default)')}`;
|
||||
|
||||
contentContainer.appendChild(text);
|
||||
|
||||
if (isOwned) {
|
||||
const actions = document.createElement('div');
|
||||
actions.style.display = 'flex';
|
||||
actions.style.gap = '8px';
|
||||
|
||||
const editButton = document.createElement('button');
|
||||
editButton.type = 'button';
|
||||
editButton.textContent = 'Edit';
|
||||
editButton.addEventListener('click', () => {
|
||||
showInlineEdit(row, label);
|
||||
});
|
||||
|
||||
const deleteButton = document.createElement('button');
|
||||
deleteButton.type = 'button';
|
||||
deleteButton.className = 'danger-button';
|
||||
deleteButton.textContent = 'Delete';
|
||||
deleteButton.addEventListener('click', async () => {
|
||||
if (!confirm(`Are you sure you want to delete "${label.name}"?`)) return;
|
||||
setStatus('');
|
||||
const response = await fetch(`/api/user/labels/${label.id}`, {
|
||||
method: 'DELETE',
|
||||
headers: authHeaders(),
|
||||
});
|
||||
if (response.ok) {
|
||||
setStatus(`Deleted label ${label.name}`);
|
||||
loadLabels();
|
||||
} else {
|
||||
setStatus(await responseError(response, 'Could not delete label'), true);
|
||||
}
|
||||
});
|
||||
|
||||
actions.append(editButton, deleteButton);
|
||||
contentContainer.appendChild(actions);
|
||||
}
|
||||
|
||||
row.appendChild(contentContainer);
|
||||
return row;
|
||||
}));
|
||||
}
|
||||
|
||||
function showInlineEdit(rowContainer, label) {
|
||||
rowContainer.replaceChildren();
|
||||
|
||||
const editForm = document.createElement('form');
|
||||
editForm.style.display = 'flex';
|
||||
editForm.style.gap = '8px';
|
||||
editForm.style.width = '100%';
|
||||
editForm.style.alignItems = 'center';
|
||||
|
||||
const input = document.createElement('input');
|
||||
input.type = 'text';
|
||||
input.value = label.name;
|
||||
input.required = true;
|
||||
input.style.flex = '1';
|
||||
|
||||
const saveButton = document.createElement('button');
|
||||
saveButton.type = 'submit';
|
||||
saveButton.textContent = 'Save';
|
||||
|
||||
const cancelButton = document.createElement('button');
|
||||
cancelButton.type = 'button';
|
||||
cancelButton.textContent = 'Cancel';
|
||||
cancelButton.addEventListener('click', () => {
|
||||
loadLabels();
|
||||
});
|
||||
|
||||
editForm.append(input, saveButton, cancelButton);
|
||||
|
||||
editForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
const newName = input.value.trim();
|
||||
if (!newName) return;
|
||||
setStatus('');
|
||||
const response = await fetch(`/api/user/labels/${label.id}`, {
|
||||
method: 'PUT',
|
||||
headers: authHeaders(true),
|
||||
body: JSON.stringify({ name: newName }),
|
||||
});
|
||||
if (response.ok) {
|
||||
setStatus(`Updated label to ${newName}`);
|
||||
loadLabels();
|
||||
} else {
|
||||
setStatus(await responseError(response, 'Could not update label'), true);
|
||||
}
|
||||
});
|
||||
|
||||
rowContainer.appendChild(editForm);
|
||||
input.focus();
|
||||
}
|
||||
|
||||
async function loadLabels() {
|
||||
try {
|
||||
const response = await fetch('/api/user/labels', { headers: authHeaders() });
|
||||
if (!response.ok) throw new Error('Could not load labels');
|
||||
const labels = await response.json();
|
||||
renderLabels(labels);
|
||||
} catch (error) {
|
||||
setStatus('Error loading labels', true);
|
||||
}
|
||||
}
|
||||
|
||||
async function init() {
|
||||
if (!accessToken) {
|
||||
if (labelAuthNotice) labelAuthNotice.classList.remove('hidden');
|
||||
if (labelControls) labelControls.classList.add('hidden');
|
||||
return;
|
||||
}
|
||||
|
||||
if (labelAuthNotice) labelAuthNotice.classList.add('hidden');
|
||||
if (labelControls) labelControls.classList.remove('hidden');
|
||||
|
||||
try {
|
||||
const meResponse = await fetch('/api/auth/me', { headers: authHeaders() });
|
||||
if (meResponse.ok) {
|
||||
const me = await meResponse.json();
|
||||
currentUserId = me.id;
|
||||
}
|
||||
} catch {
|
||||
// Proceed if me fails
|
||||
}
|
||||
|
||||
await loadLabels();
|
||||
|
||||
if (labelForm) {
|
||||
labelForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
const name = labelNameInput.value.trim();
|
||||
if (!name) return;
|
||||
setStatus('');
|
||||
const response = await fetch('/api/user/labels', {
|
||||
method: 'POST',
|
||||
headers: authHeaders(true),
|
||||
body: JSON.stringify({ name }),
|
||||
});
|
||||
if (response.ok) {
|
||||
labelNameInput.value = '';
|
||||
setStatus(`Added label ${name}`);
|
||||
loadLabels();
|
||||
} else {
|
||||
setStatus(await responseError(response, 'Could not add label'), true);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', init);
|
||||
if (document.readyState !== 'loading') {
|
||||
init();
|
||||
}
|
||||
})();
|
||||
@@ -310,6 +310,48 @@ passwordForm.addEventListener('submit', async (event) => {
|
||||
if (response.ok) passwordForm.reset();
|
||||
});
|
||||
|
||||
function initPanelToggles() {
|
||||
const panels = document.querySelectorAll('.settings-panel');
|
||||
panels.forEach((panel) => {
|
||||
panel.classList.add('minimized');
|
||||
const h2 = panel.querySelector('h2');
|
||||
if (!h2) return;
|
||||
let btn = h2.querySelector('.panel-toggle-btn');
|
||||
if (!btn) {
|
||||
const titleText = h2.textContent.trim();
|
||||
h2.replaceChildren();
|
||||
btn = document.createElement('button');
|
||||
btn.type = 'button';
|
||||
btn.className = 'panel-toggle-btn';
|
||||
btn.setAttribute('aria-expanded', 'false');
|
||||
const textSpan = document.createElement('span');
|
||||
textSpan.textContent = titleText;
|
||||
const iconSpan = document.createElement('span');
|
||||
iconSpan.className = 'panel-toggle-icon';
|
||||
iconSpan.setAttribute('aria-hidden', 'true');
|
||||
iconSpan.textContent = '▼';
|
||||
btn.append(textSpan, iconSpan);
|
||||
h2.appendChild(btn);
|
||||
} else {
|
||||
btn.setAttribute('aria-expanded', 'false');
|
||||
}
|
||||
|
||||
if (h2.dataset.initialized) return;
|
||||
h2.dataset.initialized = 'true';
|
||||
|
||||
h2.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
const isMinimized = panel.classList.toggle('minimized');
|
||||
if (btn) {
|
||||
btn.setAttribute('aria-expanded', String(!isMinimized));
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', initPanelToggles);
|
||||
initPanelToggles();
|
||||
|
||||
Promise.all([loadProfile(), loadMastodonConfig(), loadOtp(), loadEmailAddresses()]).catch((error) => {
|
||||
setStatus('#profile-status', accessToken ? error.message : 'Please sign in first.', true);
|
||||
});
|
||||
|
||||
@@ -451,6 +451,108 @@ main.container {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
#admin-controls {
|
||||
display: grid;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.settings-panel + .settings-panel {
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
.settings-panel h2 {
|
||||
margin: 0 0 12px;
|
||||
padding: 10px 14px;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s ease, margin 0.2s ease;
|
||||
}
|
||||
|
||||
.settings-panel h2:hover {
|
||||
filter: brightness(1.08);
|
||||
}
|
||||
|
||||
.settings-panel:nth-of-type(5n+1) h2 {
|
||||
color: var(--mauve);
|
||||
background: var(--surface-1);
|
||||
background: color-mix(in srgb, var(--mauve) 14%, transparent);
|
||||
border-left: 4px solid var(--mauve);
|
||||
}
|
||||
|
||||
.settings-panel:nth-of-type(5n+2) h2 {
|
||||
color: var(--teal);
|
||||
background: var(--surface-1);
|
||||
background: color-mix(in srgb, var(--teal) 14%, transparent);
|
||||
border-left: 4px solid var(--teal);
|
||||
}
|
||||
|
||||
.settings-panel:nth-of-type(5n+3) h2 {
|
||||
color: var(--peach);
|
||||
background: var(--surface-1);
|
||||
background: color-mix(in srgb, var(--peach) 14%, transparent);
|
||||
border-left: 4px solid var(--peach);
|
||||
}
|
||||
|
||||
.settings-panel:nth-of-type(5n+4) h2 {
|
||||
color: var(--blue);
|
||||
background: var(--surface-1);
|
||||
background: color-mix(in srgb, var(--blue) 14%, transparent);
|
||||
border-left: 4px solid var(--blue);
|
||||
}
|
||||
|
||||
.settings-panel:nth-of-type(5n+5) h2 {
|
||||
color: var(--lavender);
|
||||
background: var(--surface-1);
|
||||
background: color-mix(in srgb, var(--lavender) 14%, transparent);
|
||||
border-left: 4px solid var(--lavender);
|
||||
}
|
||||
|
||||
.settings-panel.minimized h2 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.panel-toggle-btn {
|
||||
display: flex !important;
|
||||
align-items: center !important;
|
||||
justify-content: space-between !important;
|
||||
width: 100% !important;
|
||||
min-width: 0 !important;
|
||||
padding: 0 !important;
|
||||
border: none !important;
|
||||
background: transparent !important;
|
||||
color: inherit !important;
|
||||
font: inherit !important;
|
||||
font-size: 1rem !important;
|
||||
font-weight: inherit !important;
|
||||
cursor: pointer !important;
|
||||
text-align: left !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
|
||||
.panel-toggle-btn > * {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.panel-toggle-btn:focus-visible {
|
||||
outline: 2px solid var(--lavender) !important;
|
||||
outline-offset: 2px !important;
|
||||
}
|
||||
|
||||
.panel-toggle-icon {
|
||||
font-size: 0.75rem;
|
||||
transition: transform 0.2s ease;
|
||||
margin-left: 8px;
|
||||
color: var(--subtext);
|
||||
}
|
||||
|
||||
.settings-panel.minimized .panel-toggle-icon {
|
||||
transform: rotate(-90deg);
|
||||
}
|
||||
|
||||
.settings-panel.minimized > *:not(h2) {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.toolbar label,
|
||||
.settings-panel label {
|
||||
display: grid;
|
||||
|
||||
@@ -44,8 +44,13 @@
|
||||
<main class="container">
|
||||
<p id="admin-auth-notice" class="auth-notice hidden"></p>
|
||||
<div id="admin-controls" class="hidden">
|
||||
<section class="link-item settings-panel">
|
||||
<h2>Users</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>Users</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<form id="user-form">
|
||||
<label>
|
||||
Username
|
||||
@@ -69,16 +74,31 @@
|
||||
<div id="user-list" class="plugin-list" aria-live="polite">Loading users...</div>
|
||||
</section>
|
||||
|
||||
<section class="link-item settings-panel">
|
||||
<h2>Plugins</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>Plugins</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="plugin-list" class="plugin-list" aria-live="polite">Loading plugins...</div>
|
||||
</section>
|
||||
<section class="link-item settings-panel">
|
||||
<h2>Labels</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>Labels</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="admin-label-list" class="plugin-list" aria-live="polite">Loading labels...</div>
|
||||
</section>
|
||||
<section class="link-item settings-panel">
|
||||
<h2>SMTP settings</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>SMTP settings</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<form id="smtp-form">
|
||||
<label>
|
||||
SMTP host
|
||||
@@ -109,11 +129,16 @@
|
||||
|
||||
</form>
|
||||
</section>
|
||||
<section class="link-item settings-panel">
|
||||
<h2>Available themes</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>Available themes</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<p>Choose the themes visitors may use.</p>
|
||||
<form id="themes-form">
|
||||
<div id="theme-options" class="theme-options" aria-live="polite">Loading themes...</div>
|
||||
<div id="admin-theme-options" class="theme-options" aria-live="polite">Loading themes...</div>
|
||||
<button type="submit">Save themes</button>
|
||||
<p id="theme-status" class="status" role="status"></p>
|
||||
</form>
|
||||
@@ -124,6 +149,6 @@
|
||||
<script src="/static/auth-header.js?v=3"></script>
|
||||
<script src="/static/logout.js?v=2"></script>
|
||||
<script src="/static/theme.js?v=1"></script>
|
||||
<script src="/static/admin.js?v=5"></script>
|
||||
<script src="/static/admin.js?v=7"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -43,8 +43,13 @@
|
||||
</header>
|
||||
|
||||
<main class="container">
|
||||
<section class="link-item settings-panel">
|
||||
<h2>Profile Settings</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>Profile Settings</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<form id="profile-form">
|
||||
<label>
|
||||
Username
|
||||
@@ -69,8 +74,13 @@
|
||||
</form>
|
||||
</section>
|
||||
|
||||
<section class="link-item settings-panel">
|
||||
<h2>Email addresses</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>Email addresses</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="email-address-list" class="email-address-list" aria-live="polite">Loading email addresses...</div>
|
||||
<form id="additional-email-form">
|
||||
<label>
|
||||
@@ -82,8 +92,13 @@
|
||||
</form>
|
||||
</section>
|
||||
|
||||
<section class="link-item settings-panel">
|
||||
<h2>Password</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>Password</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<form id="password-form">
|
||||
<label>
|
||||
Current password
|
||||
@@ -102,8 +117,13 @@
|
||||
</form>
|
||||
</section>
|
||||
|
||||
<section class="link-item settings-panel">
|
||||
<h2>One-time password</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>One-time password</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<p>Use an authenticator app to add a second sign-in step.</p>
|
||||
<div id="otp-disabled">
|
||||
<button id="otp-setup" type="button">Set up one-time password</button>
|
||||
@@ -131,8 +151,13 @@
|
||||
<p id="otp-status" class="status" role="status"></p>
|
||||
</section>
|
||||
|
||||
<section class="link-item settings-panel">
|
||||
<h2>Mastodon</h2>
|
||||
<section class="link-item settings-panel minimized">
|
||||
<h2>
|
||||
<button type="button" class="panel-toggle-btn" aria-expanded="false">
|
||||
<span>Mastodon</span>
|
||||
<span class="panel-toggle-icon" aria-hidden="true">▼</span>
|
||||
</button>
|
||||
</h2>
|
||||
<form id="mastodon-form">
|
||||
<label>
|
||||
Mastodon server
|
||||
@@ -155,7 +180,7 @@
|
||||
<script src="/static/auth-header.js?v=3"></script>
|
||||
<script src="/static/logout.js?v=2"></script>
|
||||
<script src="/static/theme.js?v=1"></script>
|
||||
<script src="/static/profile.js?v=5"></script>
|
||||
<script src="/static/profile.js?v=6"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
Reference in New Issue
Block a user