diff --git a/src/meshcore_hub/web/static/css/app.css b/src/meshcore_hub/web/static/css/app.css index 0c00839..b42f892 100644 --- a/src/meshcore_hub/web/static/css/app.css +++ b/src/meshcore_hub/web/static/css/app.css @@ -256,10 +256,17 @@ font-style: italic; } +.prose { + overflow-wrap: break-word; + word-break: break-word; +} + .prose table { width: 100%; margin-bottom: 1rem; border-collapse: collapse; + display: block; + overflow-x: auto; } .prose th, diff --git a/src/meshcore_hub/web/static/js/spa/pages/custom-page.js b/src/meshcore_hub/web/static/js/spa/pages/custom-page.js index 3f5257b..57f9881 100644 --- a/src/meshcore_hub/web/static/js/spa/pages/custom-page.js +++ b/src/meshcore_hub/web/static/js/spa/pages/custom-page.js @@ -12,7 +12,7 @@ export async function render(container, params, router) { litRender(html`
-
+
${unsafeHTML(page.content_html)}
diff --git a/src/meshcore_hub/web/static/js/spa/pages/dashboard.js b/src/meshcore_hub/web/static/js/spa/pages/dashboard.js index a9f3e8a..47e1435 100644 --- a/src/meshcore_hub/web/static/js/spa/pages/dashboard.js +++ b/src/meshcore_hub/web/static/js/spa/pages/dashboard.js @@ -25,6 +25,7 @@ function formatTimeOnly(isoString) { function formatTimeShort(isoString) { return formatDateTime(isoString, { + month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', hour12: false, }); diff --git a/src/meshcore_hub/web/static/js/spa/pages/members.js b/src/meshcore_hub/web/static/js/spa/pages/members.js index f30c239..a0a230e 100644 --- a/src/meshcore_hub/web/static/js/spa/pages/members.js +++ b/src/meshcore_hub/web/static/js/spa/pages/members.js @@ -2,7 +2,7 @@ import { apiGet } from '../api.js'; import { html, litRender, nothing, t, errorAlert, getConfig } from '../components.js'; import { iconAntenna, iconUsers } from '../icons.js'; -function renderProfileTile(profile) { +function renderProfileTile(profile, router) { const callsignBadge = profile.callsign ? html`${profile.callsign}` : nothing; @@ -20,7 +20,12 @@ function renderProfileTile(profile) { const nodeBadges = profile.adopted_nodes && profile.adopted_nodes.length > 0 ? html`
${profile.adopted_nodes.map(node => { const label = node.name || node.public_key.slice(0, 12) + '...'; - return html`${label}`; + const handleClick = (e) => { + e.preventDefault(); + e.stopPropagation(); + router.navigate('/nodes/' + node.public_key); + }; + return html`${label}`; })}
` : nothing; @@ -29,7 +34,7 @@ function renderProfileTile(profile) { : nothing; const urlLink = profile.url - ? html`${profile.url}` + ? html` { e.preventDefault(); e.stopPropagation(); window.open(profile.url, '_blank', 'noopener,noreferrer'); }}>${profile.url}` : nothing; return html` @@ -47,14 +52,14 @@ function renderProfileTile(profile) { `; } -function renderGroup(title, profiles, icon) { +function renderGroup(title, profiles, icon, router) { if (profiles.length === 0) return nothing; return html`

${icon}${title}

- ${profiles.sort((a, b) => (a.name || '').localeCompare(b.name || '')).map(renderProfileTile)} + ${profiles.sort((a, b) => (a.name || '').localeCompare(b.name || '')).map(p => renderProfileTile(p, router))}
`; } @@ -92,8 +97,8 @@ export async function render(container, params, router) { ${t('common.count_entity', { count: profiles.length, entity: t('entities.members').toLowerCase() })}
-${renderGroup(t('members_page.operators'), operators, html`${iconAntenna('h-6 w-6')}`)} -${renderGroup(t('members_page.members'), members, html`${iconUsers('h-6 w-6')}`)} +${renderGroup(t('members_page.operators'), operators, html`${iconAntenna('h-6 w-6')}`, router)} +${renderGroup(t('members_page.members'), members, html`${iconUsers('h-6 w-6')}`, router)} `, container); } catch (e) { diff --git a/src/meshcore_hub/web/static/js/spa/pages/node-detail.js b/src/meshcore_hub/web/static/js/spa/pages/node-detail.js index 47376fe..3372355 100644 --- a/src/meshcore_hub/web/static/js/spa/pages/node-detail.js +++ b/src/meshcore_hub/web/static/js/spa/pages/node-detail.js @@ -44,12 +44,9 @@ function renderEditTagModal() { return html`
-

${t('common.edit_entity', { entity: t('entities.tag') })}

+

${t('common.edit_entity', { entity: t('entities.tag') })}:

-
- - -
+
@@ -154,11 +151,11 @@ export async function render(container, params, router) { ? html`-` : recvName ? html` -
${recvName}
-
${adv.observed_by.slice(0, 16)}...
+
${recvName}
+ ` : html` - ${adv.observed_by.slice(0, 16)}... + ${adv.observed_by.slice(0, 12)}... `; return html` ${formatDateTime(adv.received_at)} @@ -184,15 +181,15 @@ export async function render(container, params, router) { ${t('common.key')} ${t('common.value')} - ${t('common.type')} - ${t('common.actions')} + ${t('common.type')} + ${t('common.actions')} ${tags.map(tag => html` - ${tag.key} - ${tag.value || ''} - ${tag.value_type || 'string'} + ${tag.key} + ${tag.value || ''} + ${tag.value_type || 'string'}
@@ -454,6 +451,7 @@ ${canEditTags ? renderEditTagModal() : nothing}`, container); try { await apiPost('/api/v1/nodes/' + node.public_key + '/tags', { key, value, value_type: valueType }); showFlash('success', t('common.entity_added_success', { entity: t('entities.tag') })); + addForm.reset(); router.navigate('/nodes/' + node.public_key, true); } catch (err) { showFlash('error', err.message); @@ -466,11 +464,13 @@ ${canEditTags ? renderEditTagModal() : nothing}`, container); btn.addEventListener('click', () => { const modal = container.querySelector('#tagEditModal'); const keyInput = container.querySelector('#tagEditKey'); + const keyDisplay = container.querySelector('#tagEditKeyDisplay'); const valueInput = container.querySelector('#tagEditValue'); const typeSelect = container.querySelector('#tagEditType'); const errorLabel = container.querySelector('#tagEditError'); keyInput.value = btn.dataset.key; + if (keyDisplay) keyDisplay.textContent = btn.dataset.key; valueInput.value = btn.dataset.value; typeSelect.value = btn.dataset.type; if (errorLabel) errorLabel.innerHTML = ''; @@ -519,7 +519,7 @@ ${canEditTags ? renderEditTagModal() : nothing}`, container); btn.addEventListener('click', () => { const modal = container.querySelector('#tagDeleteModal'); const msg = container.querySelector('#tag-delete-msg'); - msg.textContent = t('common.delete_entity_confirm', { entity: t('entities.tag'), name: btn.dataset.key }); + msg.innerHTML = t('common.delete_entity_confirm', { entity: t('entities.tag'), name: btn.dataset.key }); modal._tagKey = btn.dataset.key; modal.showModal(); }, { signal }); diff --git a/src/meshcore_hub/web/static/js/spa/router.js b/src/meshcore_hub/web/static/js/spa/router.js index 244e3b2..a054495 100644 --- a/src/meshcore_hub/web/static/js/spa/router.js +++ b/src/meshcore_hub/web/static/js/spa/router.js @@ -122,6 +122,9 @@ export class Router { if (loader) loader.classList.add('hidden'); } + // Reset focus to dismiss any open dropdown after navigation + document.activeElement?.blur(); + // Scroll to top on navigation window.scrollTo(0, 0); } diff --git a/src/meshcore_hub/web/templates/spa.html b/src/meshcore_hub/web/templates/spa.html index d5dbd11..fbb1421 100644 --- a/src/meshcore_hub/web/templates/spa.html +++ b/src/meshcore_hub/web/templates/spa.html @@ -64,7 +64,7 @@
-