storm/skald
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename public group URLs to halls

Browse Source
This commit is contained in:
Storm Dragon
2026-05-17 22:22:46 -04:00
parent bda0e548d3
commit 55528b8e62
21 changed files with 312 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/example/example.js
+1 -1
View File
@@ -307,7 +307,7 @@ document.getElementById('start').onclick = async function(e) {
let button = /** @type{HTMLButtonElement} */(this);
button.hidden = true;
try {
await start("/group/public/");
await start("/hall/public/");
} catch(e) {
displayError(e);
};
static/index.html
+7 -7
View File
@@ -15,22 +15,22 @@
<div class="home">
<h1 id="title" class="navbar-brand">Skald</h1>
<form id="groupform">
<label for="group">Group:</label>
<input id="group" type="text" name="group" class="form-control form-control-inline" autofocus/>
<form id="hallform">
<label for="hall">Hall:</label>
<input id="hall" type="text" name="hall" class="form-control form-control-inline" autofocus/>
<input id='submitbutton' type="submit" value="Join" class="btn btn-default btn-large"/><br/>
</form>
<p id="errormessage"></p>
<div id="public-groups" class="groups">
<h2>Public groups</h2>
<div id="public-halls" class="groups">
<h2>Public halls</h2>
<table id="public-groups-table"></table>
<table id="public-halls-table"></table>
</div>
</div>
<footer class="signature">
<p><a href="https://skald.org/">Skald</a> by <a href="https://www.irif.fr/~jch/" rel="author">Juliusz Chroboczek</a></p>
<p>Skald is derived from <a href="https://galene.org/">Galene</a> by <a href="https://www.irif.fr/~jch/" rel="author">Juliusz Chroboczek</a></p>
</footer>
<script src="/mainpage.js" defer></script>
static/mainpage.css
+1 -1
View File
@@ -26,7 +26,7 @@ body {
padding: 1.875rem;
}
#public-groups-table tr a{
#public-halls-table tr a{
margin-left: 0.9375rem;
font-weight: 700;
}
static/mainpage.js
+10 -10
View File
@@ -20,16 +20,16 @@
'use strict';
document.getElementById('groupform').onsubmit = async function(e) {
document.getElementById('hallform').onsubmit = async function(e) {
e.preventDefault();
clearError();
let groupinput = document.getElementById('group')
let groupinput = document.getElementById('hall')
let button = document.getElementById('submitbutton');
let group = groupinput.value.trim();
if(group === '')
return;
let url = '/group/' + group + '/';
let url = '/hall/' + group + '/';
let statusUrl = url + '.status.json';
try {
@@ -78,25 +78,25 @@ function clearError() {
}
}
async function listPublicGroups() {
let div = document.getElementById('public-groups');
let table = document.getElementById('public-groups-table');
async function listPublicHalls() {
let div = document.getElementById('public-halls');
let table = document.getElementById('public-halls-table');
let l;
try {
let r = await fetch('/public-groups.json');
let r = await fetch('/public-halls.json');
if(!r.ok)
throw new Error(`${r.status} ${r.statusText}`);
l = await r.json();
} catch(e) {
table.textContent = `Couldn't fetch groups: ${e}`;
table.textContent = `Couldn't fetch halls: ${e}`;
div.classList.remove('nogroups');
div.classList.add('groups');
return;
}
if (l.length === 0) {
table.textContent = '(No groups found.)';
table.textContent = '(No halls found.)';
div.classList.remove('groups');
div.classList.add('nogroups');
return;
@@ -131,4 +131,4 @@ async function listPublicGroups() {
}
listPublicGroups();
listPublicHalls();
static/management.js
+14 -14
View File
@@ -159,7 +159,7 @@ async function updateObject(url, values, etag) {
* @returns {Promise<Array<string>>}
*/
async function listGroups() {
return await listObjects('/skald-api/v0/.groups/');
return await listObjects('/skald-api/v0/.halls/');
}
/**
@@ -170,7 +170,7 @@ async function listGroups() {
* @returns {Promise<Object>}
*/
async function getGroup(group, etag) {
return await getObject(`/skald-api/v0/.groups/${group}`, etag);
return await getObject(`/skald-api/v0/.halls/${group}`, etag);
}
/**
@@ -180,7 +180,7 @@ async function getGroup(group, etag) {
* @param {Object} [values]
*/
async function createGroup(group, values) {
return await createObject(`/skald-api/v0/.groups/${group}`, values);
return await createObject(`/skald-api/v0/.halls/${group}`, values);
}
/**
@@ -190,11 +190,11 @@ async function createGroup(group, values) {
* @param {string} [etag]
*/
async function deleteGroup(group, etag) {
return await deleteObject(`/skald-api/v0/.groups/${group}`, etag);
return await deleteObject(`/skald-api/v0/.halls/${group}`, etag);
}
/**
* updateGroup modifies a group definition.
* updateGroup modifies a hall definition.
* Any fields present in values are overriden, any fields absent in values
* are left unchanged.
*
@@ -203,7 +203,7 @@ async function deleteGroup(group, etag) {
* @param {string} [etag]
*/
async function updateGroup(group, values, etag) {
return await updateObject(`/skald-api/v0/.groups/${group}`, values);
return await updateObject(`/skald-api/v0/.halls/${group}`, values);
}
/**
@@ -213,7 +213,7 @@ async function updateGroup(group, values, etag) {
* @returns {Promise<Array<string>>}
*/
async function listUsers(group) {
return await listObjects(`/skald-api/v0/.groups/${group}/.users/`);
return await listObjects(`/skald-api/v0/.halls/${group}/.users/`);
}
/**
@@ -225,11 +225,11 @@ async function listUsers(group) {
*/
function userURL(group, user, wildcard) {
if(wildcard)
return `/skald-api/v0/.groups/${group}/.wildcard-user`;
return `/skald-api/v0/.halls/${group}/.wildcard-user`;
else if(user === "")
return `/skald-api/v0/.groups/${group}/.empty-user`;
return `/skald-api/v0/.halls/${group}/.empty-user`;
else
return `/skald-api/v0/.groups/${group}/.users/${user}`
return `/skald-api/v0/.halls/${group}/.users/${user}`
}
/**
@@ -320,7 +320,7 @@ async function setPassword(group, user, wildcard, password, oldpassword) {
* @returns {Promise<Array<string>>}
*/
async function listTokens(group) {
return await listObjects(`/skald-api/v0/.groups/${group}/.tokens/`);
return await listObjects(`/skald-api/v0/.halls/${group}/.tokens/`);
}
/**
@@ -332,7 +332,7 @@ async function listTokens(group) {
* @returns {Promise<Object>}
*/
async function getToken(group, token, etag) {
return await getObject(`/skald-api/v0/.groups/${group}/.tokens/${token}`,
return await getObject(`/skald-api/v0/.halls/${group}/.tokens/${token}`,
etag);
}
@@ -353,7 +353,7 @@ async function createToken(group, template) {
}
let r = await fetch(
`/skald-api/v0/.groups/${group}/.tokens/`,
`/skald-api/v0/.halls/${group}/.tokens/`,
options);
if(!r.ok)
throw httpError(r);
@@ -373,6 +373,6 @@ async function updateToken(group, token, etag) {
if(!token.token)
throw new Error("Unnamed token");
return await updateObject(
`/skald-api/v0/.groups/${group}/.tokens/${token.token}`,
`/skald-api/v0/.halls/${group}/.tokens/${token.token}`,
token, etag);
}