Compare commits
12 Commits
0c6026aea8
...
ai/issue-6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d8900cfb7f | ||
| 20128d195b | |||
| d901385900 | |||
|
|
2add9e7cb8 | ||
| fe63bd15f3 | |||
| 733e7ef193 | |||
| d566388fc6 | |||
| 86e1d34beb | |||
| cd741880ac | |||
| 378e28f703 | |||
|
|
7e1ed4475e | ||
|
|
844ed006cc |
@@ -193,4 +193,113 @@ router.get('/get-settings', passport.authenticate('jwt', {session: false}), asyn
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// -- Account management (the "Manage accounts" window of the site settings) ----
|
||||||
|
// /api/user is mounted before the JWT guard, so every route below authenticates
|
||||||
|
// inline; and only an administrator gets past isAdmin (services/middleware.js).
|
||||||
|
|
||||||
|
router.get('/list', passport.authenticate('jwt', {session: false}), isAdmin, async (req, res) => {
|
||||||
|
try {
|
||||||
|
// No account gets out with its password or an unfinished setup code.
|
||||||
|
const users = await User.find().select('-password -setupCode').sort({ date: 1 });
|
||||||
|
res.json({ status: "ok", users });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: "error", msg: "errors.internal" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// The admin creates the account with the password its user logs in with; the
|
||||||
|
// setupCode flow above stays as it is, nothing on the frontend completes it.
|
||||||
|
router.post('/create', passport.authenticate('jwt', {session: false}), isAdmin, async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { name, username, email, password } = req.body;
|
||||||
|
if (!(name && username && email && password)) {
|
||||||
|
return res.json({ status: "error", msg: "errors.missing-data" });
|
||||||
|
}
|
||||||
|
|
||||||
|
const existingUser = await User.findOne({
|
||||||
|
$or: [
|
||||||
|
{ email: email },
|
||||||
|
{ username: username }
|
||||||
|
]
|
||||||
|
});
|
||||||
|
if (existingUser) {
|
||||||
|
return res.json({
|
||||||
|
status: "error",
|
||||||
|
msg: "register.errors.email-username-exists"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const salt = await bcrypt.genSalt(10);
|
||||||
|
let user = new User({
|
||||||
|
name: name,
|
||||||
|
username: username,
|
||||||
|
email: email,
|
||||||
|
password: await bcrypt.hash(password, salt)
|
||||||
|
});
|
||||||
|
await user.save();
|
||||||
|
res.json({
|
||||||
|
status: "ok",
|
||||||
|
user: {
|
||||||
|
_id: user._id,
|
||||||
|
name: user.name,
|
||||||
|
username: user.username,
|
||||||
|
email: user.email,
|
||||||
|
admin: user.admin,
|
||||||
|
date: user.date
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: "error", msg: "errors.internal" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
router.post('/set-admin', passport.authenticate('jwt', {session: false}), isAdmin, async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { id, admin } = req.body;
|
||||||
|
if (!id || typeof admin !== 'boolean') {
|
||||||
|
return res.json({ status: "error", msg: "errors.missing-data" });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Switching one's own rights off could leave an instance with nobody who
|
||||||
|
// can manage accounts at all, so the row for yourself stays closed.
|
||||||
|
if (String(req.user._id) === String(id)) {
|
||||||
|
return res.json({ status: "error", msg: "settings.site-administration.accounts.errors.self-admin" });
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = await User.findOne({ _id: id });
|
||||||
|
if (!user) return res.json({ status: "error", msg: "errors.notfound" });
|
||||||
|
|
||||||
|
user.admin = admin;
|
||||||
|
await user.save();
|
||||||
|
res.json({ status: "ok", user: { _id: user._id, admin: user.admin } });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: "error", msg: "errors.internal" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Only the account itself goes; what it created stays as it is.
|
||||||
|
router.post('/delete', passport.authenticate('jwt', {session: false}), isAdmin, async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { id } = req.body;
|
||||||
|
if (!id) return res.json({ status: "error", msg: "errors.missing-data" });
|
||||||
|
|
||||||
|
// Same guard as the admin switch: nobody locks themselves out on the way out.
|
||||||
|
if (String(req.user._id) === String(id)) {
|
||||||
|
return res.json({ status: "error", msg: "settings.site-administration.accounts.errors.self-delete" });
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = await User.findOne({ _id: id });
|
||||||
|
if (!user) return res.json({ status: "error", msg: "errors.notfound" });
|
||||||
|
|
||||||
|
await user.deleteOne();
|
||||||
|
res.json({ status: "ok" });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: "error", msg: "errors.internal" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
@@ -1,5 +1,28 @@
|
|||||||
const { numberOr, asText, plainText, stringList } = require('./foundry-fields');
|
const { numberOr, asText, plainText, stringList } = require('./foundry-fields');
|
||||||
|
|
||||||
|
// D&D 5e keeps an actor's background, species, class and subclass as a reference to an
|
||||||
|
// embedded item: `system.details.background` and friends hold that item's id, and the
|
||||||
|
// field's `fallback` option hands back the bare id when the item is gone. Dragonroll
|
||||||
|
// holds names, so a reference is read through the actor's items and an id that resolves
|
||||||
|
// to nothing is dropped. An id travelling back as a name is how Foundry ends up with a
|
||||||
|
// background item — and a details reference — that does not exist (Syndria98/dragonroll#54).
|
||||||
|
const FOUNDRY_DOCUMENT_ID = /^[A-Za-z0-9_-]{16}$/;
|
||||||
|
|
||||||
|
function looksLikeFoundryId(value) {
|
||||||
|
// Sixteen plain letters is a name; the ids Foundry generates carry a digit.
|
||||||
|
return FOUNDRY_DOCUMENT_ID.test(value) && /[0-9]/.test(value) && /[A-Za-z]/.test(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// The name a `system.details` entry stands for: an embedded item's id resolves to that
|
||||||
|
// item's name, and plain text (older system releases store the name here) is the name.
|
||||||
|
function detailsName(value, items) {
|
||||||
|
const text = asText(value).trim();
|
||||||
|
if (!text) return '';
|
||||||
|
const referenced = items.find((item) => asText(item?._id ?? item?.id).trim() === text);
|
||||||
|
if (referenced) return asText(referenced.name).trim();
|
||||||
|
return looksLikeFoundryId(text) ? '' : text;
|
||||||
|
}
|
||||||
|
|
||||||
function foundryActorToCharacter(foundryActor) {
|
function foundryActorToCharacter(foundryActor) {
|
||||||
const system = foundryActor.system || {};
|
const system = foundryActor.system || {};
|
||||||
const details = system.details || {};
|
const details = system.details || {};
|
||||||
@@ -25,11 +48,11 @@ function foundryActorToCharacter(foundryActor) {
|
|||||||
type: ['character', 'npc', 'creature'].includes(savedDragonrollType)
|
type: ['character', 'npc', 'creature'].includes(savedDragonrollType)
|
||||||
? savedDragonrollType
|
? savedDragonrollType
|
||||||
: (['character', 'npc', 'creature'].includes(foundryActor.type) ? foundryActor.type : 'character'),
|
: (['character', 'npc', 'creature'].includes(foundryActor.type) ? foundryActor.type : 'character'),
|
||||||
species: asText(details.race || details.species),
|
species: detailsName(details.race || details.species, items),
|
||||||
className: asText(details.class || classItem?.name),
|
className: detailsName(details.class, items) || asText(classItem?.name),
|
||||||
subclass: asText(details.subclass || subclassItem?.name),
|
subclass: detailsName(details.subclass, items) || asText(subclassItem?.name),
|
||||||
level: numberOr(details.level ?? classItem?.system?.levels, 1),
|
level: numberOr(details.level ?? classItem?.system?.levels, 1),
|
||||||
background: asText(details.background || backgroundItem?.name),
|
background: detailsName(details.background, items) || asText(backgroundItem?.name),
|
||||||
challengeRating: String(details.cr ?? ''),
|
challengeRating: String(details.cr ?? ''),
|
||||||
description: plainText(details.biography?.value || details.biography),
|
description: plainText(details.biography?.value || details.biography),
|
||||||
image: asText(foundryActor.img || foundryActor.image),
|
image: asText(foundryActor.img || foundryActor.image),
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ let updatingPairingStatus = false;
|
|||||||
let linkedCampaignName = "";
|
let linkedCampaignName = "";
|
||||||
let linkProblem = "";
|
let linkProblem = "";
|
||||||
let actorSyncTimeout;
|
let actorSyncTimeout;
|
||||||
|
let characterSyncRetryTimeout;
|
||||||
let characterSyncRunning = false;
|
let characterSyncRunning = false;
|
||||||
let actorSyncErrorLogged = false;
|
let actorSyncErrorLogged = false;
|
||||||
const syncingActorIds = new Set();
|
const syncingActorIds = new Set();
|
||||||
@@ -1000,10 +1001,10 @@ function makeFoundryCharacterData(entry) {
|
|||||||
type: entry.type === "character" ? "character" : "npc",
|
type: entry.type === "character" ? "character" : "npc",
|
||||||
img: getDragonrollImageUrl(entry.image) || undefined,
|
img: getDragonrollImageUrl(entry.image) || undefined,
|
||||||
system: {
|
system: {
|
||||||
|
// `details.race` and `details.background` are left out on purpose: they reference
|
||||||
|
// embedded items and are linked once the actor stands with its items made.
|
||||||
details: {
|
details: {
|
||||||
race: entry.species || "",
|
|
||||||
level: Number(entry.level) || 1,
|
level: Number(entry.level) || 1,
|
||||||
background: entry.background || "",
|
|
||||||
biography: { value: entry.description || "" },
|
biography: { value: entry.description || "" },
|
||||||
cr: entry.challengeRating || "",
|
cr: entry.challengeRating || "",
|
||||||
},
|
},
|
||||||
@@ -1036,9 +1037,7 @@ function characterUpdateData(entry) {
|
|||||||
const updates = {
|
const updates = {
|
||||||
name: entry.name,
|
name: entry.name,
|
||||||
img: getDragonrollImageUrl(entry.image) || "icons/svg/mystery-man.svg",
|
img: getDragonrollImageUrl(entry.image) || "icons/svg/mystery-man.svg",
|
||||||
"system.details.race": entry.species || "",
|
|
||||||
"system.details.level": Number(entry.level) || 1,
|
"system.details.level": Number(entry.level) || 1,
|
||||||
"system.details.background": entry.background || "",
|
|
||||||
"system.details.biography.value": entry.description || "",
|
"system.details.biography.value": entry.description || "",
|
||||||
"system.details.cr": entry.challengeRating || "",
|
"system.details.cr": entry.challengeRating || "",
|
||||||
[`flags.${MODULE_ID}.traits`]: entry.traits || "",
|
[`flags.${MODULE_ID}.traits`]: entry.traits || "",
|
||||||
@@ -1052,6 +1051,40 @@ function characterUpdateData(entry) {
|
|||||||
return updates;
|
return updates;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// `system.details.background` and `system.details.race` are LocalDocumentFields in
|
||||||
|
// D&D 5e: they hold the id of an item embedded in the actor, never its name. A name
|
||||||
|
// written into one is a reference that resolves to nothing, and adding that item in
|
||||||
|
// Foundry then fails, so each of these follows the actor's own item for it instead.
|
||||||
|
const EMBEDDED_DETAILS = [
|
||||||
|
// Dragonroll owns the background item it lists, so its reference follows it always and
|
||||||
|
// a background taken off in the campaign leaves no reference behind.
|
||||||
|
{ field: "background", path: "system.details.background", types: ["background"], clearWhenMissing: true },
|
||||||
|
// The species item belongs to the world: point at it when it carries the name, and
|
||||||
|
// leave the reference to the GM when it does not.
|
||||||
|
{ field: "species", path: "system.details.race", types: ["race", "species"] },
|
||||||
|
];
|
||||||
|
|
||||||
|
function localDocumentId(value) {
|
||||||
|
// The field resolves to the referenced document when it can and to the stored id
|
||||||
|
// when the document is gone (its `fallback` option).
|
||||||
|
if (typeof value === "string") return value;
|
||||||
|
return value?._id || "";
|
||||||
|
}
|
||||||
|
|
||||||
|
function embeddedDetailReferenceData(actor, entry) {
|
||||||
|
const updates = {};
|
||||||
|
for (const detail of EMBEDDED_DETAILS) {
|
||||||
|
const wanted = String(entry[detail.field] || "").trim();
|
||||||
|
const item = wanted
|
||||||
|
? actor.items?.contents?.find((candidate) => detail.types.includes(candidate.type) && candidate.name === wanted)
|
||||||
|
: null;
|
||||||
|
const reference = item?.id || "";
|
||||||
|
if (!reference && !detail.clearWhenMissing) continue;
|
||||||
|
if (localDocumentId(documentValue(actor, detail.path)) !== reference) updates[detail.path] = reference;
|
||||||
|
}
|
||||||
|
return updates;
|
||||||
|
}
|
||||||
|
|
||||||
async function reconcileEmbeddedItems(actor, entry) {
|
async function reconcileEmbeddedItems(actor, entry) {
|
||||||
const desired = [];
|
const desired = [];
|
||||||
if (entry.className) desired.push({ type: "class", name: entry.className, system: { levels: Number(entry.level) || 1 } });
|
if (entry.className) desired.push({ type: "class", name: entry.className, system: { levels: Number(entry.level) || 1 } });
|
||||||
@@ -1110,6 +1143,9 @@ async function applyDragonrollCharacter(actor, entry) {
|
|||||||
await withActorSyncSuppressed(actor, async () => {
|
await withActorSyncSuppressed(actor, async () => {
|
||||||
if (changed) await actor.update(updates);
|
if (changed) await actor.update(updates);
|
||||||
await reconcileEmbeddedItems(actor, entry);
|
await reconcileEmbeddedItems(actor, entry);
|
||||||
|
// The item references are written after the reconcile that makes the items they point at.
|
||||||
|
const references = embeddedDetailReferenceData(actor, entry);
|
||||||
|
if (Object.keys(references).length) await actor.update(references);
|
||||||
if (dragonrollActorId(actor) !== String(entry._id)
|
if (dragonrollActorId(actor) !== String(entry._id)
|
||||||
|| actor.getFlag?.(MODULE_ID, "actorType") !== entry.type) {
|
|| actor.getFlag?.(MODULE_ID, "actorType") !== entry.type) {
|
||||||
await actor.update({
|
await actor.update({
|
||||||
@@ -1137,7 +1173,12 @@ async function createFoundryCharacter(entry) {
|
|||||||
if (!actor) return;
|
if (!actor) return;
|
||||||
|
|
||||||
await withActorSyncSuppressed(actor, async () => {
|
await withActorSyncSuppressed(actor, async () => {
|
||||||
await actor.update({ [`flags.${MODULE_ID}.syncMutation`]: false });
|
await actor.update({
|
||||||
|
// The actor was made with its items, so its background and species references
|
||||||
|
// can point at them right away.
|
||||||
|
...embeddedDetailReferenceData(actor, entry),
|
||||||
|
[`flags.${MODULE_ID}.syncMutation`]: false,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
await mapDragonrollActor(entry._id, actor.id);
|
await mapDragonrollActor(entry._id, actor.id);
|
||||||
}
|
}
|
||||||
@@ -1183,6 +1224,14 @@ async function reconcileDragonrollCharacters() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Both sides converge on a timer that only runs while the world is open, so a
|
||||||
|
// round that could not reach Dragonroll is asked for again in a while instead of
|
||||||
|
// leaving the campaign with whatever it happened to receive.
|
||||||
|
function scheduleDragonrollCharacterSync(delay = 15000) {
|
||||||
|
clearTimeout(characterSyncRetryTimeout);
|
||||||
|
characterSyncRetryTimeout = setTimeout(reconcileDragonrollCharacters, delay);
|
||||||
|
}
|
||||||
|
|
||||||
async function initializeCharacterSync() {
|
async function initializeCharacterSync() {
|
||||||
if (!getSyncToken() || !game.user?.isGM || !game.world || !isAutoSyncEnabled()) return;
|
if (!getSyncToken() || !game.user?.isGM || !game.world || !isAutoSyncEnabled()) return;
|
||||||
try {
|
try {
|
||||||
|
|||||||
289
frontend/app/components/windows/AccountManagementWindow.vue
Normal file
289
frontend/app/components/windows/AccountManagementWindow.vue
Normal file
@@ -0,0 +1,289 @@
|
|||||||
|
<script setup>
|
||||||
|
import { onMounted, ref } from 'vue';
|
||||||
|
|
||||||
|
import WindowHandle from './partials/WindowHandle.vue';
|
||||||
|
import Server from '~/services/Server';
|
||||||
|
import { DisplayToast } from '~/services/Toaster';
|
||||||
|
import { GetUser } from '@/services/User';
|
||||||
|
import { SetupHandle, SetSize, ResetPosition, Top, SetResizable, SetMinSize } from '@/services/Windows';
|
||||||
|
|
||||||
|
const handle = ref(null);
|
||||||
|
const wrapper = ref(null);
|
||||||
|
|
||||||
|
const props = defineProps(['data']);
|
||||||
|
const data = props.data;
|
||||||
|
|
||||||
|
const id = data.id;
|
||||||
|
|
||||||
|
// The admin standing in front of the window: their own row keeps the switches closed,
|
||||||
|
// the server answers the same to anybody who still tries (routes/user.js).
|
||||||
|
const currentUserId = GetUser()?._id;
|
||||||
|
|
||||||
|
const users = ref([]);
|
||||||
|
const busy = ref("");
|
||||||
|
|
||||||
|
const creating = ref(false);
|
||||||
|
const name = ref("");
|
||||||
|
const username = ref("");
|
||||||
|
const email = ref("");
|
||||||
|
const password = ref("");
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
Top(wrapper);
|
||||||
|
SetupHandle(id, handle);
|
||||||
|
SetSize(id, {width: 620, height: 520});
|
||||||
|
ResetPosition(id, "center");
|
||||||
|
SetResizable(id, true);
|
||||||
|
SetMinSize(id, {width: 460, height: 360});
|
||||||
|
|
||||||
|
LoadUsers();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function LoadUsers(){
|
||||||
|
try {
|
||||||
|
const response = await Server().get('/user/list');
|
||||||
|
if(response.data.status !== 'ok') return;
|
||||||
|
users.value = response.data.users || [];
|
||||||
|
} catch {
|
||||||
|
DisplayToast('red', $t('errors.internal'), 3000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function ClearForm(){
|
||||||
|
name.value = "";
|
||||||
|
username.value = "";
|
||||||
|
email.value = "";
|
||||||
|
password.value = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
async function CreateAccount(){
|
||||||
|
// The checks the register window makes before it asks the server for an account
|
||||||
|
if(username.value.length < 3){
|
||||||
|
DisplayToast('red', $t('settings.site-administration.accounts.errors.username-empty'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(email.value.length < 5 || !email.value.includes('@')){
|
||||||
|
DisplayToast('red', $t('settings.site-administration.accounts.errors.email-empty'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(name.value.length == 0){
|
||||||
|
DisplayToast('red', $t('settings.site-administration.accounts.errors.name-empty'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(password.value.length == 0){
|
||||||
|
DisplayToast('red', $t('settings.site-administration.accounts.errors.password-empty'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
creating.value = true;
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/user/create', {
|
||||||
|
name: name.value,
|
||||||
|
username: username.value,
|
||||||
|
email: email.value,
|
||||||
|
password: password.value
|
||||||
|
});
|
||||||
|
if(response.data.status !== 'ok'){
|
||||||
|
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
users.value.push(response.data.user);
|
||||||
|
ClearForm();
|
||||||
|
DisplayToast('green', $t('settings.site-administration.accounts.created'), 3000);
|
||||||
|
} catch {
|
||||||
|
DisplayToast('red', $t('errors.internal'), 3000);
|
||||||
|
} finally {
|
||||||
|
creating.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function ToggleAdmin(user){
|
||||||
|
busy.value = user._id;
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/user/set-admin', { id: user._id, admin: !user.admin });
|
||||||
|
if(response.data.status !== 'ok'){
|
||||||
|
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
user.admin = response.data.user.admin;
|
||||||
|
DisplayToast('green', $t('settings.site-administration.accounts.updated'), 3000);
|
||||||
|
} catch {
|
||||||
|
DisplayToast('red', $t('errors.internal'), 3000);
|
||||||
|
} finally {
|
||||||
|
busy.value = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function DeleteAccount(user){
|
||||||
|
busy.value = user._id;
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/user/delete', { id: user._id });
|
||||||
|
if(response.data.status !== 'ok'){
|
||||||
|
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
users.value = users.value.filter((account) => account._id !== user._id);
|
||||||
|
DisplayToast('green', $t('settings.site-administration.accounts.deleted'), 3000);
|
||||||
|
} catch {
|
||||||
|
DisplayToast('red', $t('errors.internal'), 3000);
|
||||||
|
} finally {
|
||||||
|
busy.value = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function IsSelf(user){
|
||||||
|
return user._id === currentUserId;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="window-wrapper" :id="'window-wrapper-' + id" ref="wrapper">
|
||||||
|
<WindowHandle :window="id" ref="handle"></WindowHandle>
|
||||||
|
|
||||||
|
<!-- Body -->
|
||||||
|
<div class="accounts-body">
|
||||||
|
<div class="accounts-list">
|
||||||
|
<div v-for="user in users" :key="user._id" class="account-row">
|
||||||
|
<div class="account-info">
|
||||||
|
<span class="account-name">{{ user.name }} <span v-if="IsSelf(user)" class="account-self">({{ $t('settings.site-administration.accounts.you') }})</span></span>
|
||||||
|
<span class="account-line">@{{ user.username }}</span>
|
||||||
|
<span class="account-line">{{ user.email }}</span>
|
||||||
|
<span v-if="user.admin" class="account-admin">{{ $t('settings.site-administration.accounts.admin') }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="account-actions" v-if="!IsSelf(user)">
|
||||||
|
<button class="btn-primary button-small sound-click" type="button" :disabled="busy !== ''" v-on:click.prevent="ToggleAdmin(user)">
|
||||||
|
{{ user.admin ? $t('settings.site-administration.accounts.remove-admin') : $t('settings.site-administration.accounts.make-admin') }}
|
||||||
|
</button>
|
||||||
|
<button class="btn-primary button-small danger sound-click" type="button" :disabled="busy !== ''" v-on:click.prevent="DeleteAccount(user)">
|
||||||
|
{{ $t('settings.site-administration.accounts.delete') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form class="new-account" v-on:submit.prevent="CreateAccount">
|
||||||
|
<h3>{{ $t('settings.site-administration.accounts.new-account') }}</h3>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="account-name-field">{{$t('settings.site-administration.accounts.name')}}</label>
|
||||||
|
<input id="account-name-field" type="text" name="name" v-model="name" autocomplete="off">
|
||||||
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="account-username-field">{{$t('settings.site-administration.accounts.username')}}</label>
|
||||||
|
<input id="account-username-field" type="text" name="username" v-model="username" autocomplete="off">
|
||||||
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="account-email-field">{{$t('settings.site-administration.accounts.email')}}</label>
|
||||||
|
<input id="account-email-field" type="email" name="email" v-model="email" autocomplete="off">
|
||||||
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="account-password-field">{{$t('settings.site-administration.accounts.password')}}</label>
|
||||||
|
<input id="account-password-field" type="password" name="password" v-model="password" autocomplete="off">
|
||||||
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<button class="btn-primary sound-click" type="submit" :disabled="creating">
|
||||||
|
{{ $t('settings.site-administration.accounts.create') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.window-wrapper {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accounts-body {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
flex: 1;
|
||||||
|
width: 100%;
|
||||||
|
min-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accounts-list {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-row {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-radius: 6px;
|
||||||
|
background-color: var(--color-background-soft);
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-name {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-line {
|
||||||
|
font-size: 13px;
|
||||||
|
opacity: 0.75;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-self {
|
||||||
|
font-weight: normal;
|
||||||
|
opacity: 0.75;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-admin {
|
||||||
|
color: var(--color-green);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.danger {
|
||||||
|
color: var(--color-red);
|
||||||
|
}
|
||||||
|
|
||||||
|
.new-account {
|
||||||
|
padding: 0 16px 16px 16px;
|
||||||
|
border-top: 1px solid var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.new-account h3 {
|
||||||
|
font-family: MrEavesRemake;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-field {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-field input {
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -24,6 +24,16 @@ const abilityStats = [
|
|||||||
{ key: 'int', label: 'INT' }, { key: 'wis', label: 'WIS' }, { key: 'cha', label: 'CHA' }
|
{ key: 'int', label: 'INT' }, { key: 'wis', label: 'WIS' }, { key: 'cha', label: 'CHA' }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// Les pestanyes del lateral dret reparteixen la fitxa: característiques i combat,
|
||||||
|
// inventari, trets i conjurs. Són pestanyes de marcadors, no una pàgina nova.
|
||||||
|
const tabs = [
|
||||||
|
{ key: 'abilities', label: 'campaigns.character-sheet.tabs.abilities' },
|
||||||
|
{ key: 'inventory', label: 'campaigns.character-sheet.tabs.inventory' },
|
||||||
|
{ key: 'traits', label: 'campaigns.character-sheet.tabs.traits' },
|
||||||
|
{ key: 'spells', label: 'campaigns.character-sheet.tabs.spells' }
|
||||||
|
];
|
||||||
|
const activeTab = ref('abilities');
|
||||||
|
|
||||||
function normalizeActor(actor) {
|
function normalizeActor(actor) {
|
||||||
return {
|
return {
|
||||||
name: actor?.name ?? '',
|
name: actor?.name ?? '',
|
||||||
@@ -207,101 +217,124 @@ async function saveSheet() {
|
|||||||
|
|
||||||
<div v-if="error" class="sheet-error">{{ error }}</div>
|
<div v-if="error" class="sheet-error">{{ error }}</div>
|
||||||
|
|
||||||
<main class="sheet-grid">
|
<div class="sheet-layout">
|
||||||
<div v-if="form.image || editing" class="sheet-portrait" :class="{ empty: !form.image }">
|
<div class="sheet-content">
|
||||||
<img v-if="form.image" :src="imageUrl" :alt="$t('campaigns.character-sheet.photo')">
|
<main v-show="activeTab === 'abilities'" class="sheet-grid">
|
||||||
<button v-if="editing && !form.image" class="portrait-upload" type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
<div v-if="form.image || editing" class="sheet-portrait" :class="{ empty: !form.image }">
|
||||||
{{ uploadingPhoto ? $t('campaigns.character-sheet.uploading-photo') : $t('campaigns.character-sheet.upload-photo') }}
|
<img v-if="form.image" :src="imageUrl" :alt="$t('campaigns.character-sheet.photo')">
|
||||||
</button>
|
<button v-if="editing && !form.image" class="portrait-upload" type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
||||||
<div v-if="editing && form.image" class="portrait-controls">
|
{{ uploadingPhoto ? $t('campaigns.character-sheet.uploading-photo') : $t('campaigns.character-sheet.upload-photo') }}
|
||||||
<button type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
</button>
|
||||||
{{ uploadingPhoto ? $t('campaigns.character-sheet.uploading-photo') : $t('campaigns.character-sheet.change-photo') }}
|
<div v-if="editing && form.image" class="portrait-controls">
|
||||||
</button>
|
<button type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
||||||
<button type="button" :disabled="uploadingPhoto" :aria-label="$t('campaigns.character-sheet.remove-photo')" @click="removePhoto">×</button>
|
{{ uploadingPhoto ? $t('campaigns.character-sheet.uploading-photo') : $t('campaigns.character-sheet.change-photo') }}
|
||||||
</div>
|
</button>
|
||||||
<input ref="photoInput" class="photo-input" type="file" accept="image/*" @change="onPhotoSelected">
|
<button type="button" :disabled="uploadingPhoto" :aria-label="$t('campaigns.character-sheet.remove-photo')" @click="removePhoto">×</button>
|
||||||
|
</div>
|
||||||
|
<input ref="photoInput" class="photo-input" type="file" accept="image/*" @change="onPhotoSelected">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<section class="sheet-panel abilities-panel">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.ability-scores') }}</h2>
|
||||||
|
<div class="ability-grid">
|
||||||
|
<div v-for="stat in abilityStats" :key="stat.key" class="ability-card">
|
||||||
|
<span class="ability-label">{{ stat.label }}</span>
|
||||||
|
<input v-if="editing" v-model.number="form.abilityScores[stat.key]" type="number" min="1" max="30" :aria-label="stat.label">
|
||||||
|
<strong v-else class="ability-score">{{ form.abilityScores[stat.key] }}</strong>
|
||||||
|
<span class="ability-modifier">{{ abilityModifier(form.abilityScores[stat.key]) }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="proficiency-badge">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.proficiency-bonus') }}</span>
|
||||||
|
<strong>+{{ proficiencyBonus }}</strong>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="sheet-panel combat-panel">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.combat') }}</h2>
|
||||||
|
<div class="combat-stats">
|
||||||
|
<div class="combat-stat">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.armor-class') }}</span>
|
||||||
|
<input v-if="editing" v-model.number="form.armorClass" type="number" min="0">
|
||||||
|
<strong v-else>{{ form.armorClass }}</strong>
|
||||||
|
</div>
|
||||||
|
<div class="combat-stat">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.speed') }}</span>
|
||||||
|
<label v-if="editing" class="number-with-unit"><input v-model.number="form.speed" type="number" min="0"><small>ft</small></label>
|
||||||
|
<strong v-else>{{ form.speed }} <small>ft</small></strong>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<h3>{{ $t('campaigns.character-sheet.proficiencies') }}</h3>
|
||||||
|
<textarea v-if="editing" v-model="form.proficiencies" rows="5" :placeholder="$t('campaigns.character-sheet.proficiencies-placeholder')" />
|
||||||
|
<p v-else class="sheet-copy">{{ form.proficiencies || $t('campaigns.character-sheet.empty-proficiencies') }}</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<main v-show="activeTab === 'inventory'" class="sheet-tab-body">
|
||||||
|
<section class="sheet-panel inventory-panel">
|
||||||
|
<div class="panel-title-row">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.inventory') }}</h2>
|
||||||
|
<button v-if="editing" class="sheet-button secondary compact" type="button" @click="addInventoryItem">{{ $t('campaigns.character-sheet.add-item') }}</button>
|
||||||
|
</div>
|
||||||
|
<div class="weight-summary">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.carried-weight') }}</span>
|
||||||
|
<strong>{{ carriedWeight.toFixed(1) }} / {{ carryingCapacity }} lb</strong>
|
||||||
|
</div>
|
||||||
|
<div class="weight-track"><div class="weight-fill" :style="{ width: `${carryPercent}%` }" /></div>
|
||||||
|
<div class="inventory-table-wrap">
|
||||||
|
<table class="inventory-table">
|
||||||
|
<thead><tr>
|
||||||
|
<th>{{ $t('campaigns.character-sheet.item-name') }}</th>
|
||||||
|
<th>{{ $t('campaigns.character-sheet.quantity') }}</th>
|
||||||
|
<th>{{ $t('campaigns.character-sheet.weight-each') }}</th>
|
||||||
|
<th>{{ $t('campaigns.character-sheet.total-weight') }}</th>
|
||||||
|
<th v-if="editing"><span class="sr-only">{{ $t('campaigns.character-sheet.actions') }}</span></th>
|
||||||
|
</tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr v-for="(item, index) in form.inventory" :key="index">
|
||||||
|
<td><input v-if="editing" v-model="item.name" :aria-label="$t('campaigns.character-sheet.item-name')"><span v-else>{{ item.name }}</span></td>
|
||||||
|
<td><input v-if="editing" v-model.number="item.quantity" type="number" min="1" :aria-label="$t('campaigns.character-sheet.quantity')"><span v-else>{{ item.quantity }}</span></td>
|
||||||
|
<td><input v-if="editing" v-model.number="item.weight" type="number" min="0" step="0.1" :aria-label="$t('campaigns.character-sheet.weight-each')"><span v-else>{{ Number(item.weight).toFixed(1) }} lb</span></td>
|
||||||
|
<td>{{ ((Number(item.quantity) || 0) * (Number(item.weight) || 0)).toFixed(1) }} lb</td>
|
||||||
|
<td v-if="editing"><button class="remove-item" type="button" @click="removeInventoryItem(index)">×</button></td>
|
||||||
|
</tr>
|
||||||
|
<tr v-if="form.inventory.length === 0"><td :colspan="editing ? 5 : 4" class="empty-inventory">{{ $t('campaigns.character-sheet.empty-inventory') }}</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<main v-show="activeTab === 'traits'" class="sheet-tab-body">
|
||||||
|
<section class="sheet-panel traits-panel">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.traits') }}</h2>
|
||||||
|
<textarea v-if="editing" v-model="form.traits" rows="12" :placeholder="$t('campaigns.character-sheet.traits-placeholder')" />
|
||||||
|
<p v-else class="sheet-copy">{{ form.traits || $t('campaigns.character-sheet.empty-traits') }}</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<main v-show="activeTab === 'spells'" class="sheet-tab-body">
|
||||||
|
<section class="sheet-panel spells-panel">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.spells') }}</h2>
|
||||||
|
<textarea v-if="editing" v-model="form.spells" rows="12" :placeholder="$t('campaigns.character-sheet.spells-placeholder')" />
|
||||||
|
<p v-else class="sheet-copy">{{ form.spells || $t('campaigns.character-sheet.empty-spells') }}</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<section class="sheet-panel abilities-panel">
|
<nav class="sheet-tabs" role="tablist" aria-orientation="vertical">
|
||||||
<h2>{{ $t('campaigns.character-sheet.ability-scores') }}</h2>
|
<button
|
||||||
<div class="ability-grid">
|
v-for="tab in tabs"
|
||||||
<div v-for="stat in abilityStats" :key="stat.key" class="ability-card">
|
:key="tab.key"
|
||||||
<span class="ability-label">{{ stat.label }}</span>
|
class="sheet-tab"
|
||||||
<input v-if="editing" v-model.number="form.abilityScores[stat.key]" type="number" min="1" max="30" :aria-label="stat.label">
|
:class="{ active: activeTab === tab.key }"
|
||||||
<strong v-else class="ability-score">{{ form.abilityScores[stat.key] }}</strong>
|
type="button"
|
||||||
<span class="ability-modifier">{{ abilityModifier(form.abilityScores[stat.key]) }}</span>
|
role="tab"
|
||||||
</div>
|
:aria-selected="activeTab === tab.key"
|
||||||
</div>
|
@click="activeTab = tab.key"
|
||||||
<div class="proficiency-badge">
|
>{{ $t(tab.label) }}</button>
|
||||||
<span>{{ $t('campaigns.character-sheet.proficiency-bonus') }}</span>
|
</nav>
|
||||||
<strong>+{{ proficiencyBonus }}</strong>
|
</div>
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="sheet-panel combat-panel">
|
|
||||||
<h2>{{ $t('campaigns.character-sheet.combat') }}</h2>
|
|
||||||
<div class="combat-stats">
|
|
||||||
<div class="combat-stat">
|
|
||||||
<span>{{ $t('campaigns.character-sheet.armor-class') }}</span>
|
|
||||||
<input v-if="editing" v-model.number="form.armorClass" type="number" min="0">
|
|
||||||
<strong v-else>{{ form.armorClass }}</strong>
|
|
||||||
</div>
|
|
||||||
<div class="combat-stat">
|
|
||||||
<span>{{ $t('campaigns.character-sheet.speed') }}</span>
|
|
||||||
<label v-if="editing" class="number-with-unit"><input v-model.number="form.speed" type="number" min="0"><small>ft</small></label>
|
|
||||||
<strong v-else>{{ form.speed }} <small>ft</small></strong>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<h3>{{ $t('campaigns.character-sheet.proficiencies') }}</h3>
|
|
||||||
<textarea v-if="editing" v-model="form.proficiencies" rows="5" :placeholder="$t('campaigns.character-sheet.proficiencies-placeholder')" />
|
|
||||||
<p v-else class="sheet-copy">{{ form.proficiencies || $t('campaigns.character-sheet.empty-proficiencies') }}</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="sheet-panel traits-panel">
|
|
||||||
<h2>{{ $t('campaigns.character-sheet.traits') }}</h2>
|
|
||||||
<textarea v-if="editing" v-model="form.traits" rows="5" :placeholder="$t('campaigns.character-sheet.traits-placeholder')" />
|
|
||||||
<p v-else class="sheet-copy">{{ form.traits || $t('campaigns.character-sheet.empty-traits') }}</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="sheet-panel spells-panel">
|
|
||||||
<h2>{{ $t('campaigns.character-sheet.spells') }}</h2>
|
|
||||||
<textarea v-if="editing" v-model="form.spells" rows="5" :placeholder="$t('campaigns.character-sheet.spells-placeholder')" />
|
|
||||||
<p v-else class="sheet-copy">{{ form.spells || $t('campaigns.character-sheet.empty-spells') }}</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="sheet-panel inventory-panel">
|
|
||||||
<div class="panel-title-row">
|
|
||||||
<h2>{{ $t('campaigns.character-sheet.inventory') }}</h2>
|
|
||||||
<button v-if="editing" class="sheet-button secondary compact" type="button" @click="addInventoryItem">{{ $t('campaigns.character-sheet.add-item') }}</button>
|
|
||||||
</div>
|
|
||||||
<div class="weight-summary">
|
|
||||||
<span>{{ $t('campaigns.character-sheet.carried-weight') }}</span>
|
|
||||||
<strong>{{ carriedWeight.toFixed(1) }} / {{ carryingCapacity }} lb</strong>
|
|
||||||
</div>
|
|
||||||
<div class="weight-track"><div class="weight-fill" :style="{ width: `${carryPercent}%` }" /></div>
|
|
||||||
<div class="inventory-table-wrap">
|
|
||||||
<table class="inventory-table">
|
|
||||||
<thead><tr>
|
|
||||||
<th>{{ $t('campaigns.character-sheet.item-name') }}</th>
|
|
||||||
<th>{{ $t('campaigns.character-sheet.quantity') }}</th>
|
|
||||||
<th>{{ $t('campaigns.character-sheet.weight-each') }}</th>
|
|
||||||
<th>{{ $t('campaigns.character-sheet.total-weight') }}</th>
|
|
||||||
<th v-if="editing"><span class="sr-only">{{ $t('campaigns.character-sheet.actions') }}</span></th>
|
|
||||||
</tr></thead>
|
|
||||||
<tbody>
|
|
||||||
<tr v-for="(item, index) in form.inventory" :key="index">
|
|
||||||
<td><input v-if="editing" v-model="item.name" :aria-label="$t('campaigns.character-sheet.item-name')"><span v-else>{{ item.name }}</span></td>
|
|
||||||
<td><input v-if="editing" v-model.number="item.quantity" type="number" min="1" :aria-label="$t('campaigns.character-sheet.quantity')"><span v-else>{{ item.quantity }}</span></td>
|
|
||||||
<td><input v-if="editing" v-model.number="item.weight" type="number" min="0" step="0.1" :aria-label="$t('campaigns.character-sheet.weight-each')"><span v-else>{{ Number(item.weight).toFixed(1) }} lb</span></td>
|
|
||||||
<td>{{ ((Number(item.quantity) || 0) * (Number(item.weight) || 0)).toFixed(1) }} lb</td>
|
|
||||||
<td v-if="editing"><button class="remove-item" type="button" @click="removeInventoryItem(index)">×</button></td>
|
|
||||||
</tr>
|
|
||||||
<tr v-if="form.inventory.length === 0"><td :colspan="editing ? 5 : 4" class="empty-inventory">{{ $t('campaigns.character-sheet.empty-inventory') }}</td></tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</main>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -325,7 +358,27 @@ async function saveSheet() {
|
|||||||
.sheet-button.primary { background: var(--color-link); color: var(--color-background); border-color: var(--color-link); }
|
.sheet-button.primary { background: var(--color-link); color: var(--color-background); border-color: var(--color-link); }
|
||||||
.sheet-button:disabled { opacity: .55; cursor: wait; }
|
.sheet-button:disabled { opacity: .55; cursor: wait; }
|
||||||
.sheet-button.compact { padding: 5px 9px; font-size: 12px; }
|
.sheet-button.compact { padding: 5px 9px; font-size: 12px; }
|
||||||
.sheet-grid { display: grid; grid-template-columns: minmax(200px, 34%) minmax(0, 1fr) minmax(0, 1fr); grid-template-rows: auto auto auto auto; gap: 11px; align-items: start; }
|
.sheet-grid { display: grid; grid-template-columns: minmax(200px, 34%) minmax(0, 1fr) minmax(0, 1fr); grid-template-rows: auto auto; gap: 11px; align-items: start; }
|
||||||
|
.sheet-layout { display: flex; align-items: flex-start; gap: 10px; }
|
||||||
|
.sheet-content { flex: 1 1 auto; min-width: 0; }
|
||||||
|
.sheet-tab-body { display: block; }
|
||||||
|
.sheet-tabs { flex: 0 0 auto; display: flex; flex-direction: column; gap: 6px; position: sticky; top: 0; align-self: flex-start; }
|
||||||
|
.sheet-tab {
|
||||||
|
text-align: left;
|
||||||
|
padding: 9px 14px 9px 11px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-left-width: 3px;
|
||||||
|
border-radius: 0 9px 9px 0;
|
||||||
|
background: var(--color-background-soft);
|
||||||
|
color: var(--color-text);
|
||||||
|
font: 13px MrEavesRemake;
|
||||||
|
letter-spacing: .02em;
|
||||||
|
white-space: nowrap;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background .15s ease, border-color .15s ease, color .15s ease;
|
||||||
|
}
|
||||||
|
.sheet-tab:hover { background: var(--color-button-hover); }
|
||||||
|
.sheet-tab.active { background: var(--color-background-light); color: var(--color-link); border-left-color: var(--color-link); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
||||||
.sheet-panel { min-width: 0; padding: 13px; border: 1px solid var(--color-border); border-radius: 10px; background: var(--color-background-light); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
.sheet-panel { min-width: 0; padding: 13px; border: 1px solid var(--color-border); border-radius: 10px; background: var(--color-background-light); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
||||||
.sheet-panel h2 { margin: 0 0 12px; padding-bottom: 7px; border-bottom: 1px solid var(--color-border); font: 17px MrEavesRemake; letter-spacing: .03em; }
|
.sheet-panel h2 { margin: 0 0 12px; padding-bottom: 7px; border-bottom: 1px solid var(--color-border); font: 17px MrEavesRemake; letter-spacing: .03em; }
|
||||||
.sheet-panel h3 { margin: 13px 0 7px; font: 14px MrEavesRemake; }
|
.sheet-panel h3 { margin: 13px 0 7px; font: 14px MrEavesRemake; }
|
||||||
@@ -340,9 +393,7 @@ async function saveSheet() {
|
|||||||
.portrait-controls button:disabled { opacity: .55; cursor: wait; }
|
.portrait-controls button:disabled { opacity: .55; cursor: wait; }
|
||||||
.photo-input { display: none; }
|
.photo-input { display: none; }
|
||||||
.abilities-panel { grid-column: 2 / -1; grid-row: 1; }
|
.abilities-panel { grid-column: 2 / -1; grid-row: 1; }
|
||||||
.combat-panel { grid-column: 2; grid-row: 2; }
|
.combat-panel { grid-column: 2 / -1; grid-row: 2; }
|
||||||
.traits-panel { grid-column: 3; grid-row: 2; }
|
|
||||||
.spells-panel { grid-column: 2 / -1; grid-row: 3; }
|
|
||||||
.ability-grid { display: grid; grid-template-columns: repeat(6, minmax(0, 1fr)); gap: 7px; }
|
.ability-grid { display: grid; grid-template-columns: repeat(6, minmax(0, 1fr)); gap: 7px; }
|
||||||
.ability-card { min-height: 83px; padding: 8px 5px; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 3px; border: 1px solid var(--color-border); border-radius: 8px; background: var(--color-background-soft); }
|
.ability-card { min-height: 83px; padding: 8px 5px; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 3px; border: 1px solid var(--color-border); border-radius: 8px; background: var(--color-background-soft); }
|
||||||
.ability-label { font-size: 11px; font-weight: 700; letter-spacing: .08em; opacity: .75; }
|
.ability-label { font-size: 11px; font-weight: 700; letter-spacing: .08em; opacity: .75; }
|
||||||
@@ -369,7 +420,6 @@ textarea { resize: vertical; width: 100%; min-height: 88px; font-size: 12px; }
|
|||||||
.weight-summary strong { white-space: nowrap; }
|
.weight-summary strong { white-space: nowrap; }
|
||||||
.weight-track { height: 5px; margin-bottom: 10px; overflow: hidden; border-radius: 999px; background: var(--color-background-soft); }
|
.weight-track { height: 5px; margin-bottom: 10px; overflow: hidden; border-radius: 999px; background: var(--color-background-soft); }
|
||||||
.weight-fill { height: 100%; border-radius: inherit; background: var(--color-link); transition: width .2s ease; }
|
.weight-fill { height: 100%; border-radius: inherit; background: var(--color-link); transition: width .2s ease; }
|
||||||
.inventory-panel { grid-column: 2 / -1; grid-row: 4; }
|
|
||||||
.inventory-table-wrap { overflow-x: auto; }
|
.inventory-table-wrap { overflow-x: auto; }
|
||||||
.inventory-table { width: 100%; border-collapse: collapse; font-size: 12px; }
|
.inventory-table { width: 100%; border-collapse: collapse; font-size: 12px; }
|
||||||
.inventory-table th { padding: 6px 7px; text-align: left; font-weight: 600; opacity: .7; }
|
.inventory-table th { padding: 6px 7px; text-align: left; font-weight: 600; opacity: .7; }
|
||||||
@@ -383,17 +433,17 @@ textarea { resize: vertical; width: 100%; min-height: 88px; font-size: 12px; }
|
|||||||
.sheet-error { padding: 7px 10px; margin-bottom: 10px; border-radius: 6px; color: var(--color-red); background: var(--color-background-soft); font-size: 12px; }
|
.sheet-error { padding: 7px 10px; margin-bottom: 10px; border-radius: 6px; color: var(--color-red); background: var(--color-background-soft); font-size: 12px; }
|
||||||
.sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; }
|
.sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; }
|
||||||
@media (max-width: 760px) {
|
@media (max-width: 760px) {
|
||||||
.sheet-grid { grid-template-columns: 1fr 1fr; grid-template-rows: none; }
|
.sheet-grid { grid-template-columns: 1fr; grid-template-rows: none; }
|
||||||
.sheet-portrait { grid-column: 1 / -1; grid-row: auto; }
|
.sheet-portrait, .abilities-panel, .combat-panel { grid-column: 1 / -1; grid-row: auto; }
|
||||||
.abilities-panel { grid-column: 1 / -1; grid-row: auto; }
|
|
||||||
.combat-panel, .traits-panel { grid-column: auto; grid-row: auto; }
|
|
||||||
.spells-panel, .inventory-panel { grid-column: 1 / -1; grid-row: auto; }
|
|
||||||
}
|
}
|
||||||
@media (max-width: 520px) {
|
@media (max-width: 520px) {
|
||||||
.sheet-body { padding: 10px; }
|
.sheet-body { padding: 10px; }
|
||||||
.sheet-hero { align-items: flex-start; flex-wrap: wrap; }
|
.sheet-hero { align-items: flex-start; flex-wrap: wrap; }
|
||||||
.sheet-actions { margin-left: auto; }
|
.sheet-actions { margin-left: auto; }
|
||||||
.sheet-grid { grid-template-columns: 1fr; }
|
|
||||||
.ability-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
|
.ability-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
|
||||||
|
.sheet-layout { flex-direction: column; }
|
||||||
|
.sheet-tabs { flex-direction: row; flex-wrap: wrap; order: -1; }
|
||||||
|
.sheet-tab { flex: 1 1 auto; text-align: center; border-radius: 7px; border-left-width: 1px; border-top-width: 3px; }
|
||||||
|
.sheet-tab.active { border-left-color: var(--color-border); border-top-color: var(--color-link); }
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -80,21 +80,15 @@ onMounted(() => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
function OpenManageAccounts(){
|
function OpenManageAccounts(){
|
||||||
ClearWindow('settings');
|
ClearWindow({ type: 'settings' });
|
||||||
CreateWindow('account_management', {
|
CreateWindow('account_management', {
|
||||||
type: 'account_management',
|
// Back returns to the settings tab this button sits on; CreateWindow leaves
|
||||||
title: 'settings.site-administration.manage-accounts.title',
|
// a window that is already open alone.
|
||||||
id: 'account-management',
|
|
||||||
back: () => {
|
back: () => {
|
||||||
ClearWindow('account-management')
|
ClearWindow({ type: 'account_management' });
|
||||||
CreateWindow('settings', {
|
CreateWindow('settings');
|
||||||
id: 'settings',
|
|
||||||
type: 'settings',
|
|
||||||
title: 'settings.title',
|
|
||||||
back: () => { ClearWindow('settings'); CreateWindow('main_menu'); }
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const getLocaleName = (locale) => {
|
const getLocaleName = (locale) => {
|
||||||
|
|||||||
@@ -34,6 +34,12 @@ const defWindows = {
|
|||||||
},
|
},
|
||||||
movable: true
|
movable: true
|
||||||
},
|
},
|
||||||
|
account_management: {
|
||||||
|
title: 'windows.account-management',
|
||||||
|
component: () => import('~/components/windows/AccountManagementWindow.vue'),
|
||||||
|
close: () => ClearWindow({type: 'account_management'}),
|
||||||
|
movable: true
|
||||||
|
},
|
||||||
create_campaign: {
|
create_campaign: {
|
||||||
title: "windows.create-campaign",
|
title: "windows.create-campaign",
|
||||||
component: () => import('~/components/windows/CreateCampaignWindow.vue'),
|
component: () => import('~/components/windows/CreateCampaignWindow.vue'),
|
||||||
|
|||||||
@@ -105,6 +105,7 @@
|
|||||||
},
|
},
|
||||||
"character-sheet": {
|
"character-sheet": {
|
||||||
"title": "Fitxa de personatge", "name": "Nom del personatge", "class": "Classe", "subclass": "Subclasse", "unset-class": "Classe sense definir",
|
"title": "Fitxa de personatge", "name": "Nom del personatge", "class": "Classe", "subclass": "Subclasse", "unset-class": "Classe sense definir",
|
||||||
|
"tabs": { "abilities": "Característiques", "inventory": "Inventari", "traits": "Trets", "spells": "Conjurs" },
|
||||||
"level": "Nivell", "species": "Espècie", "unset-species": "Espècie sense definir", "edit": "Edita la fitxa", "cancel": "Cancel·la",
|
"level": "Nivell", "species": "Espècie", "unset-species": "Espècie sense definir", "edit": "Edita la fitxa", "cancel": "Cancel·la",
|
||||||
"saving": "Desant...", "save": "Desa la fitxa", "save-error": "No s'ha pogut desar aquesta fitxa de personatge.", "photo": "Foto", "upload-photo": "Pujar foto", "change-photo": "Canviar foto", "remove-photo": "Treure foto", "uploading-photo": "Pujant...", "photo-error": "No s'ha pogut pujar aquesta foto.", "ability-scores": "Característiques", "proficiency-bonus": "Bonificador de competència",
|
"saving": "Desant...", "save": "Desa la fitxa", "save-error": "No s'ha pogut desar aquesta fitxa de personatge.", "photo": "Foto", "upload-photo": "Pujar foto", "change-photo": "Canviar foto", "remove-photo": "Treure foto", "uploading-photo": "Pujant...", "photo-error": "No s'ha pogut pujar aquesta foto.", "ability-scores": "Característiques", "proficiency-bonus": "Bonificador de competència",
|
||||||
"combat": "Combat", "armor-class": "Classe d'armadura", "speed": "Velocitat", "proficiencies": "Competències",
|
"combat": "Combat", "armor-class": "Classe d'armadura", "speed": "Velocitat", "proficiencies": "Competències",
|
||||||
|
|||||||
@@ -8,6 +8,30 @@
|
|||||||
"language": "Idioma"
|
"language": "Idioma"
|
||||||
},
|
},
|
||||||
"site-administration": {
|
"site-administration": {
|
||||||
"manage-accounts": "Gestiona els comptes"
|
"manage-accounts": "Gestiona els comptes",
|
||||||
|
"accounts": {
|
||||||
|
"you": "tu",
|
||||||
|
"admin": "Administrador",
|
||||||
|
"make-admin": "Fes-lo administrador",
|
||||||
|
"remove-admin": "Treu-li l'administrador",
|
||||||
|
"delete": "Elimina",
|
||||||
|
"new-account": "Nou compte",
|
||||||
|
"name": "Nom",
|
||||||
|
"username": "Nom d'usuari",
|
||||||
|
"email": "Correu electrònic",
|
||||||
|
"password": "Contrasenya",
|
||||||
|
"create": "Crea el compte",
|
||||||
|
"created": "Compte creat",
|
||||||
|
"updated": "Compte actualitzat",
|
||||||
|
"deleted": "Compte eliminat",
|
||||||
|
"errors": {
|
||||||
|
"name-empty": "Si us plau, introdueix un nom.",
|
||||||
|
"username-empty": "Si us plau, introdueix un nom d'usuari.",
|
||||||
|
"email-empty": "Si us plau, introdueix un correu electrònic vàlid.",
|
||||||
|
"password-empty": "Si us plau, introdueix una contrasenya.",
|
||||||
|
"self-admin": "No pots canviar els teus propis privilegis d'administrador.",
|
||||||
|
"self-delete": "No pots eliminar el teu propi compte."
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
"example": "Finestra d'exemple",
|
"example": "Finestra d'exemple",
|
||||||
"edit-profile": "Editar perfil",
|
"edit-profile": "Editar perfil",
|
||||||
"settings": "Configuració",
|
"settings": "Configuració",
|
||||||
|
"account-management": "Gestió dels comptes",
|
||||||
"create-campaign": "Crear campanya",
|
"create-campaign": "Crear campanya",
|
||||||
"create-map": "Crear mapa",
|
"create-map": "Crear mapa",
|
||||||
"map-viewer": "Mapa",
|
"map-viewer": "Mapa",
|
||||||
|
|||||||
@@ -109,6 +109,7 @@
|
|||||||
},
|
},
|
||||||
"character-sheet": {
|
"character-sheet": {
|
||||||
"title": "Character Sheet", "name": "Character name", "class": "Class", "subclass": "Subclass", "unset-class": "Class not set",
|
"title": "Character Sheet", "name": "Character name", "class": "Class", "subclass": "Subclass", "unset-class": "Class not set",
|
||||||
|
"tabs": { "abilities": "Ability Scores", "inventory": "Inventory", "traits": "Traits", "spells": "Spells" },
|
||||||
"level": "Level", "species": "Species", "unset-species": "Species not set", "edit": "Edit sheet", "cancel": "Cancel",
|
"level": "Level", "species": "Species", "unset-species": "Species not set", "edit": "Edit sheet", "cancel": "Cancel",
|
||||||
"saving": "Saving...", "save": "Save sheet", "save-error": "Unable to save this character sheet.",
|
"saving": "Saving...", "save": "Save sheet", "save-error": "Unable to save this character sheet.",
|
||||||
"photo": "Photo", "upload-photo": "Upload photo", "change-photo": "Change photo", "remove-photo": "Remove photo",
|
"photo": "Photo", "upload-photo": "Upload photo", "change-photo": "Change photo", "remove-photo": "Remove photo",
|
||||||
|
|||||||
@@ -8,6 +8,30 @@
|
|||||||
"language": "Language"
|
"language": "Language"
|
||||||
},
|
},
|
||||||
"site-administration": {
|
"site-administration": {
|
||||||
"manage-accounts": "Manage accounts"
|
"manage-accounts": "Manage accounts",
|
||||||
|
"accounts": {
|
||||||
|
"you": "you",
|
||||||
|
"admin": "Administrator",
|
||||||
|
"make-admin": "Make administrator",
|
||||||
|
"remove-admin": "Remove administrator",
|
||||||
|
"delete": "Delete",
|
||||||
|
"new-account": "New account",
|
||||||
|
"name": "Name",
|
||||||
|
"username": "Username",
|
||||||
|
"email": "Email",
|
||||||
|
"password": "Password",
|
||||||
|
"create": "Create account",
|
||||||
|
"created": "Account created",
|
||||||
|
"updated": "Account updated",
|
||||||
|
"deleted": "Account deleted",
|
||||||
|
"errors": {
|
||||||
|
"name-empty": "Please enter a name.",
|
||||||
|
"username-empty": "Please enter a username.",
|
||||||
|
"email-empty": "Please enter a valid email address.",
|
||||||
|
"password-empty": "Please enter a password.",
|
||||||
|
"self-admin": "You cannot change your own administrator rights.",
|
||||||
|
"self-delete": "You cannot delete your own account."
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
"example": "Example Window",
|
"example": "Example Window",
|
||||||
"edit-profile": "Edit Profile",
|
"edit-profile": "Edit Profile",
|
||||||
"settings": "Settings",
|
"settings": "Settings",
|
||||||
|
"account-management": "Manage accounts",
|
||||||
"create-campaign": "Create Campaign",
|
"create-campaign": "Create Campaign",
|
||||||
"create-map": "Create Map",
|
"create-map": "Create Map",
|
||||||
"map-viewer": "Map",
|
"map-viewer": "Map",
|
||||||
|
|||||||
@@ -105,6 +105,7 @@
|
|||||||
},
|
},
|
||||||
"character-sheet": {
|
"character-sheet": {
|
||||||
"title": "Hoja de personaje", "name": "Nombre del personaje", "class": "Clase", "subclass": "Subclase", "unset-class": "Clase sin definir",
|
"title": "Hoja de personaje", "name": "Nombre del personaje", "class": "Clase", "subclass": "Subclase", "unset-class": "Clase sin definir",
|
||||||
|
"tabs": { "abilities": "Características", "inventory": "Inventario", "traits": "Rasgos", "spells": "Conjuros" },
|
||||||
"level": "Nivel", "species": "Especie", "unset-species": "Especie sin definir", "edit": "Editar hoja", "cancel": "Cancelar",
|
"level": "Nivel", "species": "Especie", "unset-species": "Especie sin definir", "edit": "Editar hoja", "cancel": "Cancelar",
|
||||||
"saving": "Guardando...", "save": "Guardar hoja", "save-error": "No se pudo guardar esta hoja de personaje.", "photo": "Foto", "upload-photo": "Subir foto", "change-photo": "Cambiar foto", "remove-photo": "Quitar foto", "uploading-photo": "Subiendo...", "photo-error": "No se pudo subir esta foto.", "ability-scores": "Características", "proficiency-bonus": "Bonificador por competencia",
|
"saving": "Guardando...", "save": "Guardar hoja", "save-error": "No se pudo guardar esta hoja de personaje.", "photo": "Foto", "upload-photo": "Subir foto", "change-photo": "Cambiar foto", "remove-photo": "Quitar foto", "uploading-photo": "Subiendo...", "photo-error": "No se pudo subir esta foto.", "ability-scores": "Características", "proficiency-bonus": "Bonificador por competencia",
|
||||||
"combat": "Combate", "armor-class": "Clase de armadura", "speed": "Velocidad", "proficiencies": "Competencias",
|
"combat": "Combate", "armor-class": "Clase de armadura", "speed": "Velocidad", "proficiencies": "Competencias",
|
||||||
|
|||||||
@@ -8,6 +8,30 @@
|
|||||||
"language": "Idioma"
|
"language": "Idioma"
|
||||||
},
|
},
|
||||||
"site-administration": {
|
"site-administration": {
|
||||||
"manage-accounts": "Gestionar cuentas"
|
"manage-accounts": "Gestionar cuentas",
|
||||||
|
"accounts": {
|
||||||
|
"you": "tú",
|
||||||
|
"admin": "Administrador",
|
||||||
|
"make-admin": "Nombrar administrador",
|
||||||
|
"remove-admin": "Quitar administrador",
|
||||||
|
"delete": "Eliminar",
|
||||||
|
"new-account": "Nueva cuenta",
|
||||||
|
"name": "Nombre",
|
||||||
|
"username": "Nombre de usuario",
|
||||||
|
"email": "Correo electrónico",
|
||||||
|
"password": "Contraseña",
|
||||||
|
"create": "Crear cuenta",
|
||||||
|
"created": "Cuenta creada",
|
||||||
|
"updated": "Cuenta actualizada",
|
||||||
|
"deleted": "Cuenta eliminada",
|
||||||
|
"errors": {
|
||||||
|
"name-empty": "Por favor, introduce un nombre.",
|
||||||
|
"username-empty": "Por favor, introduce un nombre de usuario.",
|
||||||
|
"email-empty": "Por favor, introduce un correo electrónico válido.",
|
||||||
|
"password-empty": "Por favor, introduce una contraseña.",
|
||||||
|
"self-admin": "No puedes cambiar tus propios privilegios de administrador.",
|
||||||
|
"self-delete": "No puedes eliminar tu propia cuenta."
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
"example": "Ventana de ejemplo",
|
"example": "Ventana de ejemplo",
|
||||||
"edit-profile": "Editar perfil",
|
"edit-profile": "Editar perfil",
|
||||||
"settings": "Configuración",
|
"settings": "Configuración",
|
||||||
|
"account-management": "Gestionar cuentas",
|
||||||
"create-campaign": "Crear campanya",
|
"create-campaign": "Crear campanya",
|
||||||
"create-map": "Crear mapa",
|
"create-map": "Crear mapa",
|
||||||
"map-viewer": "Mapa",
|
"map-viewer": "Mapa",
|
||||||
|
|||||||
89
tests/character-sheet-tabs.test.js
Normal file
89
tests/character-sheet-tabs.test.js
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
// Tests for Syndria98/dragonroll#55: the character sheet splits its contents across bookmarks down
|
||||||
|
// the right edge (ability scores, inventory, traits, spells) instead of stacking every panel on one
|
||||||
|
// long page.
|
||||||
|
//
|
||||||
|
// The repository root installs no dependencies, so the window wiring is read from the sources the way
|
||||||
|
// tests/item-sheet-window.test.js and tests/settings-window.test.js do it.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const sheetSource = read("frontend", "app", "components", "windows", "CharacterSheetWindow.vue");
|
||||||
|
const script = /<script setup>([\s\S]*?)<\/script>/.exec(sheetSource)?.[1] ?? "";
|
||||||
|
const template = /<template>([\s\S]*)<\/template>/.exec(sheetSource)?.[1] ?? "";
|
||||||
|
|
||||||
|
// The four bookmarks the issue asks for, in order.
|
||||||
|
test("the sheet declares the four tabs the issue splits the contents into", () => {
|
||||||
|
const array = /const tabs = \[([\s\S]*?)\];/.exec(script)?.[1] ?? "";
|
||||||
|
const keys = [...array.matchAll(/key:\s*['"](\w+)['"]/g)].map((m) => m[1]);
|
||||||
|
assert.deepEqual(keys, ["abilities", "inventory", "traits", "spells"]);
|
||||||
|
for (const key of keys) {
|
||||||
|
assert.ok(
|
||||||
|
new RegExp(`label:\\s*['"]campaigns\\.character-sheet\\.tabs\\.${key}['"]`).test(array),
|
||||||
|
`the ${key} tab must point at its own i18n key`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
assert.match(script, /const activeTab = ref\(['"]abilities['"]\)/, "the sheet opens on the ability scores tab");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the tabs sit on the right as a vertical bookmark rail", () => {
|
||||||
|
assert.match(template, /<nav class="sheet-tabs"[^>]*role="tablist"[^>]*aria-orientation="vertical"/);
|
||||||
|
assert.match(template, /v-for="tab in tabs"[\s\S]*?:aria-selected="activeTab === tab\.key"/);
|
||||||
|
const rail = /\.sheet-tabs\s*\{[^}]*\}/.exec(sheetSource)?.[0] ?? "";
|
||||||
|
assert.match(rail, /flex-direction:\s*column/, "the bookmarks stack down the right edge");
|
||||||
|
// content column and rail sit side by side, the rail hugging the right
|
||||||
|
assert.match(sheetSource, /\.sheet-layout\s*\{[^}]*display:\s*flex[^}]*\}/, "content and rail share a row");
|
||||||
|
assert.match(sheetSource, /\.sheet-content\s*\{[^}]*flex:\s*1[^}]*\}/, "the content takes the room, the rail stays slim");
|
||||||
|
});
|
||||||
|
|
||||||
|
// Each tab shows only its own panels; the rest are hidden with v-show so an in-progress edit is
|
||||||
|
// not thrown away when hopping between tabs.
|
||||||
|
function tabBody(key) {
|
||||||
|
const block = new RegExp(`<main v-show="activeTab === '${key}'"[\\s\\S]*?</main>`).exec(template)?.[0];
|
||||||
|
assert.ok(block, `expected a body for the ${key} tab`);
|
||||||
|
return block;
|
||||||
|
}
|
||||||
|
|
||||||
|
test("every tab shows only its own content and hides the others", () => {
|
||||||
|
const abilities = tabBody("abilities");
|
||||||
|
assert.match(abilities, /class="sheet-portrait"/, "the portrait stays with ability scores");
|
||||||
|
assert.match(abilities, /class="sheet-panel abilities-panel"/);
|
||||||
|
assert.match(abilities, /class="sheet-panel combat-panel"/, "combat rides with the ability scores");
|
||||||
|
for (const other of ["inventory-panel", "traits-panel", "spells-panel"]) {
|
||||||
|
assert.doesNotMatch(abilities, new RegExp(other));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const [key, panel] of [["inventory", "inventory-panel"], ["traits", "traits-panel"], ["spells", "spells-panel"]]) {
|
||||||
|
const body = tabBody(key);
|
||||||
|
assert.ok(body.includes(panel), `the ${key} tab shows the ${panel}`);
|
||||||
|
assert.doesNotMatch(body, /class="sheet-portrait"/);
|
||||||
|
}
|
||||||
|
|
||||||
|
// the panels are toggled, not unmounted, so editing on one tab and flipping away keeps the draft
|
||||||
|
assert.match(template, /v-show="activeTab === 'inventory'"/);
|
||||||
|
assert.match(template, /v-show="activeTab === 'traits'"/);
|
||||||
|
assert.match(template, /v-show="activeTab === 'spells'"/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the tabs still edit and save through the existing sheet form", () => {
|
||||||
|
assert.match(tabBody("inventory"), /@click="addInventoryItem"/);
|
||||||
|
assert.match(tabBody("inventory"), /removeInventoryItem\(index\)/);
|
||||||
|
assert.match(tabBody("traits"), /v-model="form\.traits"/);
|
||||||
|
assert.match(tabBody("spells"), /v-model="form\.spells"/);
|
||||||
|
assert.match(tabBody("abilities"), /v-model\.number="form\.abilityScores\[stat\.key\]"/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every locale names the four tabs", () => {
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const sheet = JSON.parse(read("frontend", "i18n", "locales", locale, "campaigns.json"))["character-sheet"];
|
||||||
|
for (const key of ["abilities", "inventory", "traits", "spells"]) {
|
||||||
|
assert.ok(sheet.tabs?.[key], `${locale} is missing campaigns.character-sheet.tabs.${key}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
417
tests/foundry-actor-details.test.js
Normal file
417
tests/foundry-actor-details.test.js
Normal file
@@ -0,0 +1,417 @@
|
|||||||
|
// Tests for the D&D 5e details the system keeps as a reference to an embedded item
|
||||||
|
// (Syndria98/dragonroll#54). `system.details.background` and `system.details.race` are
|
||||||
|
// LocalDocumentFields: they hold the id of the actor's background / race item and never
|
||||||
|
// its name, and their `fallback` option hands the bare id back when that item is gone.
|
||||||
|
// Dragonroll holds names, so reading the id as a name and writing it back gave Foundry a
|
||||||
|
// background item that does not exist and a details reference resolving to nothing —
|
||||||
|
// adding a background in Foundry then failed.
|
||||||
|
//
|
||||||
|
// The backend mapper is plain CommonJS and is required directly. The Foundry module is
|
||||||
|
// loaded into a `node:vm` context holding stubbed Foundry globals with fake timers, like
|
||||||
|
// tests/foundry-sync-toggle.test.js: the characters Dragonroll answers with are applied
|
||||||
|
// to a stubbed actor, so the references it writes are observable.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
const vm = require("node:vm");
|
||||||
|
|
||||||
|
const MODULE_ID = "dragonroll-foundry";
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const { foundryActorToCharacter } = require(path.join(__dirname, "..", "backend", "src", "services", "actor-foundry.js"));
|
||||||
|
|
||||||
|
// Foundry generates document ids as sixteen characters of its alphabet, digits included.
|
||||||
|
const ID_GONE = "aB3cD9eF1gH2iJ4k";
|
||||||
|
const ID_SOLDIER = "Kx7pQ2mR9vT4wZ8n";
|
||||||
|
const ID_HUMAN = "7QcL2fYh5Bd0Mn3s";
|
||||||
|
|
||||||
|
function foundryActor(details = {}, items = []) {
|
||||||
|
return { _id: "actor-1", name: "Thalia", type: "character", system: { details }, items };
|
||||||
|
}
|
||||||
|
|
||||||
|
test("a background carried as an item arrives by its name, not its id", () => {
|
||||||
|
const character = foundryActor(
|
||||||
|
{ background: ID_SOLDIER },
|
||||||
|
[{ _id: ID_SOLDIER, name: "Soldier", type: "background" }],
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.equal(foundryActorToCharacter(character).background, "Soldier");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a background reference whose item is gone does not become a background", () => {
|
||||||
|
// The item was deleted, and `fallback: true` gives the id back instead.
|
||||||
|
const character = foundryActor({ background: ID_GONE }, []);
|
||||||
|
|
||||||
|
assert.equal(foundryActorToCharacter(character).background, "");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a background item takes the place of a reference that resolves to nothing", () => {
|
||||||
|
const character = foundryActor(
|
||||||
|
{ background: ID_GONE },
|
||||||
|
[{ _id: ID_SOLDIER, name: "Soldier", type: "background" }],
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.equal(foundryActorToCharacter(character).background, "Soldier");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a plain-text background from an older system release is still a name", () => {
|
||||||
|
const character = foundryActor({ background: "Sailor" }, []);
|
||||||
|
|
||||||
|
assert.equal(foundryActorToCharacter(character).background, "Sailor");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the class, subclass and species references resolve the same way", () => {
|
||||||
|
const items = [
|
||||||
|
{ _id: ID_HUMAN, name: "Human", type: "race" },
|
||||||
|
{ _id: "cls1Id00000000", name: "Fighter", type: "class" },
|
||||||
|
{ _id: "sub1Id00000000", name: "Oracle", type: "subclass" },
|
||||||
|
];
|
||||||
|
const character = foundryActor(
|
||||||
|
{ race: ID_HUMAN, class: "cls1Id00000000", subclass: "sub1Id00000000" },
|
||||||
|
items,
|
||||||
|
);
|
||||||
|
|
||||||
|
const fields = foundryActorToCharacter(character);
|
||||||
|
assert.equal(fields.species, "Human");
|
||||||
|
assert.equal(fields.className, "Fighter");
|
||||||
|
assert.equal(fields.subclass, "Oracle");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a class reference that resolves to nothing falls back to the class item", () => {
|
||||||
|
const character = foundryActor(
|
||||||
|
{ class: ID_GONE, race: ID_GONE },
|
||||||
|
[{ _id: "cls1Id00000000", name: "Fighter", type: "class" }],
|
||||||
|
);
|
||||||
|
|
||||||
|
const fields = foundryActorToCharacter(character);
|
||||||
|
assert.equal(fields.className, "Fighter", "the class the actor carries, not the id");
|
||||||
|
assert.equal(fields.species, "", "and nothing to name the species from");
|
||||||
|
});
|
||||||
|
|
||||||
|
// --- The Foundry module applies Dragonroll's character --------------------------
|
||||||
|
|
||||||
|
// A reference is either the id this sync wrote or the document the field resolves to.
|
||||||
|
function referenceId(actor, field) {
|
||||||
|
const value = actor.system.details?.[field];
|
||||||
|
return typeof value === "string" ? value : value?._id || "";
|
||||||
|
}
|
||||||
|
|
||||||
|
function makeStubItem(id, { name, type, system = {}, flags = {} }) {
|
||||||
|
return {
|
||||||
|
_id: id,
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
type,
|
||||||
|
system,
|
||||||
|
flags,
|
||||||
|
parent: { documentName: "Actor" },
|
||||||
|
getFlag(module, key) { return this.flags?.[module]?.[key]; },
|
||||||
|
toObject() {
|
||||||
|
return { _id: this.id, name: this.name, type: this.type, system: this.system, flags: this.flags };
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function writeDotted(target, data) {
|
||||||
|
for (const [key, value] of Object.entries(data)) {
|
||||||
|
const parts = key.split(".");
|
||||||
|
const last = parts.pop();
|
||||||
|
let node = target;
|
||||||
|
for (const part of parts) node = node[part] ??= {};
|
||||||
|
node[last] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let stubCounter = 0;
|
||||||
|
|
||||||
|
function makeStubActor(name, { type = "character", system = {}, flags = {}, items = [] } = {}) {
|
||||||
|
stubCounter += 1;
|
||||||
|
const id = `actor-${stubCounter}`;
|
||||||
|
const contents = items.map((item, index) => makeStubItem(item._id || `embedded-${stubCounter}-${index}`, item));
|
||||||
|
const actor = {
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
type,
|
||||||
|
documentName: "Actor",
|
||||||
|
img: "icons/svg/mystery-man.svg",
|
||||||
|
system,
|
||||||
|
flags,
|
||||||
|
items: { contents },
|
||||||
|
getFlag(module, key) { return this.flags?.[module]?.[key]; },
|
||||||
|
async update(data) {
|
||||||
|
writeDotted(this, data);
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
async updateEmbeddedDocuments(documentName, updates) {
|
||||||
|
for (const update of updates) {
|
||||||
|
const item = contents.find((candidate) => candidate.id === update._id);
|
||||||
|
if (item) writeDotted(item, update);
|
||||||
|
}
|
||||||
|
return updates.map((update) => contents.find((candidate) => candidate.id === update._id));
|
||||||
|
},
|
||||||
|
async createEmbeddedDocuments(documentName, datas) {
|
||||||
|
const created = datas.map((data) => {
|
||||||
|
const item = makeStubItem(`embedded-${stubCounter}-${contents.length}`, data);
|
||||||
|
item.name = data.name;
|
||||||
|
item.type = data.type;
|
||||||
|
contents.push(item);
|
||||||
|
return item;
|
||||||
|
});
|
||||||
|
return created;
|
||||||
|
},
|
||||||
|
async deleteEmbeddedDocuments(documentName, ids) {
|
||||||
|
for (const id of ids) {
|
||||||
|
const index = contents.findIndex((item) => item.id === id);
|
||||||
|
if (index >= 0) contents.splice(index, 1);
|
||||||
|
}
|
||||||
|
return ids;
|
||||||
|
},
|
||||||
|
toObject() {
|
||||||
|
return {
|
||||||
|
_id: this.id,
|
||||||
|
name: this.name,
|
||||||
|
type: this.type,
|
||||||
|
img: this.img,
|
||||||
|
flags: this.flags,
|
||||||
|
system: this.system,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
return actor;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A linked world with the actors it holds, answering `foundry/sync/characters` with the
|
||||||
|
// campaign's characters. Each one is applied to its Foundry actor on the next reconcile.
|
||||||
|
function makeWorld({ actors = [], remoteActors = [] } = {}) {
|
||||||
|
const state = {
|
||||||
|
hooks: new Map(),
|
||||||
|
registered: new Map(),
|
||||||
|
requests: [],
|
||||||
|
timers: new Map(),
|
||||||
|
nextTimerId: 1,
|
||||||
|
logs: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
const settingsStore = { autoSync: true, syncToken: "sync-token-1", dragonrollApiUrl: "http://backend.test:5000" };
|
||||||
|
const sandbox = {
|
||||||
|
console: {
|
||||||
|
log() {},
|
||||||
|
info() {},
|
||||||
|
warn: (...args) => state.logs.push(args.map(String).join(" ")),
|
||||||
|
error: (...args) => state.logs.push(args.map(String).join(" ")),
|
||||||
|
},
|
||||||
|
URL,
|
||||||
|
CONFIG: {},
|
||||||
|
window: { location: { origin: "http://vtt.test" } },
|
||||||
|
ui: { notifications: { info() {}, warn() {}, error() {} } },
|
||||||
|
Hooks: {
|
||||||
|
once(name, fn) { state.hooks.set(name, [fn]); },
|
||||||
|
on(name, fn) { state.hooks.set(name, [...(state.hooks.get(name) || []), fn]); },
|
||||||
|
},
|
||||||
|
setTimeout: (fn, delay = 0) => {
|
||||||
|
const timerId = state.nextTimerId++;
|
||||||
|
state.timers.set(timerId, { fn, delay });
|
||||||
|
return timerId;
|
||||||
|
},
|
||||||
|
clearTimeout: (timerId) => state.timers.delete(timerId),
|
||||||
|
setInterval: () => 0,
|
||||||
|
clearInterval: () => {},
|
||||||
|
fetch: async (url, options = {}) => {
|
||||||
|
const href = String(url);
|
||||||
|
state.requests.push({ href, method: options.method, body: options.body ? JSON.parse(options.body) : null });
|
||||||
|
if (href.includes("foundry/sync/characters")) return { ok: true, status: 200, json: async () => ({ status: "ok", actors: remoteActors }) };
|
||||||
|
if (href.includes("foundry/sync/items")) return { ok: true, status: 200, json: async () => ({ status: "ok", items: [] }) };
|
||||||
|
return { ok: true, status: 200, json: async () => ({ status: "ok", actors: [], items: [] }) };
|
||||||
|
},
|
||||||
|
Item: { async create() { return null; } },
|
||||||
|
Actor: {
|
||||||
|
async create(data) {
|
||||||
|
const actor = makeStubActor(data.name, {
|
||||||
|
type: data.type,
|
||||||
|
system: structuredClone(data.system || {}),
|
||||||
|
flags: structuredClone(data.flags || {}),
|
||||||
|
items: (data.items || []).map((item) => ({ name: item.name, type: item.type, system: item.system })),
|
||||||
|
});
|
||||||
|
actors.push(actor);
|
||||||
|
return actor;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
sandbox.game = {
|
||||||
|
user: { isGM: true },
|
||||||
|
world: { id: "world-1", title: "Test World" },
|
||||||
|
system: { id: "dnd5e" },
|
||||||
|
modules: { get: () => ({}) },
|
||||||
|
actors: { contents: actors, get: (actorId) => actors.find((actor) => actor.id === actorId) },
|
||||||
|
items: { contents: [], get: () => null },
|
||||||
|
folders: { contents: [], get: () => null },
|
||||||
|
settings: {
|
||||||
|
register(module, key, definition) {
|
||||||
|
state.registered.set(key, definition);
|
||||||
|
if (!(key in settingsStore)) settingsStore[key] = definition.default;
|
||||||
|
},
|
||||||
|
get(module, key) { return settingsStore[key]; },
|
||||||
|
async set(module, key, value) {
|
||||||
|
settingsStore[key] = value;
|
||||||
|
await state.registered.get(key)?.onChange?.(value);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
vm.createContext(sandbox);
|
||||||
|
vm.runInContext(read("dragonroll-foundry", "scripts", "api.js"), sandbox);
|
||||||
|
|
||||||
|
state.game = sandbox.game;
|
||||||
|
state.actor = (actorId) => actors.find((actor) => actor.id === actorId);
|
||||||
|
const drain = async () => { await new Promise((resolve) => setImmediate(resolve)); };
|
||||||
|
|
||||||
|
// World start: the actors are pushed, then the campaign's characters are applied.
|
||||||
|
state.start = async () => {
|
||||||
|
await state.fire("init");
|
||||||
|
await state.fire("ready");
|
||||||
|
await state.runTimers();
|
||||||
|
return state;
|
||||||
|
};
|
||||||
|
|
||||||
|
state.fire = async (name, ...args) => {
|
||||||
|
for (const handler of state.hooks.get(name) || []) await handler(...args);
|
||||||
|
await drain();
|
||||||
|
};
|
||||||
|
state.runTimers = async () => {
|
||||||
|
for (let round = 0; round < 6; round += 1) {
|
||||||
|
if (!state.timers.size && round > 2) break;
|
||||||
|
const due = [...state.timers.values()];
|
||||||
|
state.timers.clear();
|
||||||
|
for (const timer of due) await timer.fn();
|
||||||
|
await drain();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
state.itemNames = (actor) => actor.items.contents.map((item) => [item.type, item.name]);
|
||||||
|
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The campaign's character for `actor`, holding what Dragonroll keeps for it.
|
||||||
|
function campaignCharacter(actor, over = {}) {
|
||||||
|
return {
|
||||||
|
_id: "dr-actor-1",
|
||||||
|
name: "Thalia",
|
||||||
|
type: "character",
|
||||||
|
species: "",
|
||||||
|
className: "",
|
||||||
|
subclass: "",
|
||||||
|
level: 1,
|
||||||
|
background: "",
|
||||||
|
challengeRating: "",
|
||||||
|
description: "",
|
||||||
|
image: "",
|
||||||
|
abilityScores: {},
|
||||||
|
armorClass: 10,
|
||||||
|
speed: 30,
|
||||||
|
traits: "",
|
||||||
|
proficiencies: "",
|
||||||
|
spells: "",
|
||||||
|
inventory: [],
|
||||||
|
foundryActorId: actor?.id ?? null,
|
||||||
|
...over,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
test("Dragonroll's background becomes the actor's background item, referenced by id", async () => {
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
system: { details: { background: "" } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
});
|
||||||
|
const world = await makeWorld({
|
||||||
|
actors: [actor],
|
||||||
|
remoteActors: [campaignCharacter(actor, { background: "Soldier" })],
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
const background = actor.items.contents.find((item) => item.type === "background");
|
||||||
|
assert.ok(background, "the character's background stands in Foundry as an item");
|
||||||
|
assert.equal(background.name, "Soldier");
|
||||||
|
assert.equal(referenceId(actor, "background"), background.id, "its details reference points at the item");
|
||||||
|
assert.equal(actor.system.details.background, background.id);
|
||||||
|
assert.deepEqual(world.logs, [], "applying the character did not warn");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the background an earlier sync invented is taken back out", async () => {
|
||||||
|
// What the bug left behind: an item named after the id the details field held, next to
|
||||||
|
// the real background, and a reference the old sync overwrote with that id.
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
system: { details: { background: ID_GONE } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
items: [
|
||||||
|
{ _id: ID_SOLDIER, name: "Soldier", type: "background", flags: { [MODULE_ID]: { syncedItem: true } } },
|
||||||
|
{ _id: "item-bogus", name: ID_GONE, type: "background", flags: { [MODULE_ID]: { syncedItem: true } } },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const world = await makeWorld({
|
||||||
|
actors: [actor],
|
||||||
|
remoteActors: [campaignCharacter(actor, { background: "Soldier" })],
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
assert.deepEqual(world.itemNames(actor), [["background", "Soldier"]], "only the real background is left");
|
||||||
|
assert.equal(referenceId(actor, "background"), ID_SOLDIER, "and the reference resolves to it");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a background taken off in Dragonroll clears the reference", async () => {
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
system: { details: { background: ID_SOLDIER } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
items: [
|
||||||
|
{ _id: ID_SOLDIER, name: "Soldier", type: "background", flags: { [MODULE_ID]: { syncedItem: true } } },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const world = await makeWorld({ actors: [actor], remoteActors: [campaignCharacter(actor)] }).start();
|
||||||
|
|
||||||
|
assert.deepEqual(world.itemNames(actor), [], "the background item went with it");
|
||||||
|
assert.equal(referenceId(actor, "background"), "", "and no reference is left pointing at nothing");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a species never lands in the details reference as a name", async () => {
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
// A species picked in the sheet: dnd5e made the race item and referenced it by id.
|
||||||
|
system: { details: { race: ID_HUMAN } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
items: [{ _id: ID_HUMAN, name: "Human", type: "race", flags: { [MODULE_ID]: { syncedItem: true } } }],
|
||||||
|
});
|
||||||
|
await makeWorld({
|
||||||
|
actors: [actor],
|
||||||
|
remoteActors: [campaignCharacter(actor, { species: "Human", background: "Soldier" })],
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
assert.equal(referenceId(actor, "race"), ID_HUMAN, "the species reference still points at the race item");
|
||||||
|
assert.notEqual(actor.system.details.race, "Human", "a name in it would resolve to nothing");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a species the world keeps as plain text is left to the world", async () => {
|
||||||
|
// An actor migrated from an older system release: no race item, the name is what the
|
||||||
|
// field holds, and Dragonroll has nothing to reference.
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
system: { details: { race: "Human" } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
});
|
||||||
|
await makeWorld({
|
||||||
|
actors: [actor],
|
||||||
|
remoteActors: [campaignCharacter(actor, { species: "Human" })],
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
assert.equal(actor.system.details.race, "Human", "the text the sheet reads is kept as it was");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a character made in Dragonroll references the background it is created with", async () => {
|
||||||
|
const world = await makeWorld({ actors: [], remoteActors: [campaignCharacter(null, { background: "Soldier" })] }).start();
|
||||||
|
|
||||||
|
const [actor] = world.game.actors.contents;
|
||||||
|
assert.ok(actor, "the campaign's character was made in this world");
|
||||||
|
const background = actor.items.contents.find((item) => item.type === "background");
|
||||||
|
assert.ok(background, "created together with its background item");
|
||||||
|
assert.equal(background.name, "Soldier");
|
||||||
|
assert.equal(referenceId(actor, "background"), background.id, "referenced by that item's id, never its name");
|
||||||
|
});
|
||||||
@@ -55,7 +55,7 @@ function matches(document, filter = {}) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function fakeModel(table, seed = []) {
|
function fakeModel(table, seed = [], campaignId) {
|
||||||
const rows = [];
|
const rows = [];
|
||||||
let counter = 0;
|
let counter = 0;
|
||||||
|
|
||||||
@@ -74,7 +74,9 @@ function fakeModel(table, seed = []) {
|
|||||||
Object.defineProperty(Document.prototype, "id", { get() { return this._id; } });
|
Object.defineProperty(Document.prototype, "id", { get() { return this._id; } });
|
||||||
|
|
||||||
for (const data of seed) {
|
for (const data of seed) {
|
||||||
const row = new Document({ [table === "folder" ? "target" : "name"]: undefined, ...data });
|
// A seeded row belongs to the campaign the requests are made against unless the
|
||||||
|
// seed says otherwise: the routes scope every lookup by campaign.
|
||||||
|
const row = new Document({ campaign: campaignId, [table === "folder" ? "target" : "name"]: undefined, ...data });
|
||||||
row.isNew = false;
|
row.isNew = false;
|
||||||
rows.push(row);
|
rows.push(row);
|
||||||
}
|
}
|
||||||
@@ -121,13 +123,16 @@ function loadSyncRoute({ seed = {}, worldId = "world-1" } = {}) {
|
|||||||
};
|
};
|
||||||
const campaign = { _id: "campaign-1", id: "campaign-1", name: "Test Campaign", foundryWorldId: worldId };
|
const campaign = { _id: "campaign-1", id: "campaign-1", name: "Test Campaign", foundryWorldId: worldId };
|
||||||
const models = {
|
const models = {
|
||||||
"../models/Actor": fakeModel("actor", seed.actors),
|
"../models/Actor": fakeModel("actor", seed.actors, campaign.id),
|
||||||
"../models/Item": fakeModel("item", seed.items),
|
"../models/Item": fakeModel("item", seed.items, campaign.id),
|
||||||
"../models/Folder": fakeModel("folder", seed.folders),
|
"../models/Folder": fakeModel("folder", seed.folders, campaign.id),
|
||||||
};
|
};
|
||||||
|
|
||||||
const requireStub = (id) => {
|
const requireStub = (id) => {
|
||||||
if (id === "express") return { Router: () => router };
|
if (id === "express") return { Router: () => router };
|
||||||
|
// The route hashes the sync token with node's own crypto: the real module costs nothing
|
||||||
|
// to hand it, and nothing here depends on what the hash looks like.
|
||||||
|
if (id === "node:crypto") return require("node:crypto");
|
||||||
if (id === "mongoose") return { isValidObjectId: (value) => typeof value === "string" && value.length > 20 };
|
if (id === "mongoose") return { isValidObjectId: (value) => typeof value === "string" && value.length > 20 };
|
||||||
if (id === "../models/Campaign") return { findOne: async () => campaign };
|
if (id === "../models/Campaign") return { findOne: async () => campaign };
|
||||||
if (id === "../services/actor-foundry") return { foundryActorToCharacter: (actor) => ({ name: actor?.name ?? "" }) };
|
if (id === "../services/actor-foundry") return { foundryActorToCharacter: (actor) => ({ name: actor?.name ?? "" }) };
|
||||||
@@ -298,9 +303,12 @@ test("every folder listing says which campaign list it belongs to", () => {
|
|||||||
// field existed carry none at all. tests/entry-folders.test.js runs these routes.
|
// field existed carry none at all. tests/entry-folders.test.js runs these routes.
|
||||||
for (const route of ["note.js", "folder.js"]) {
|
for (const route of ["note.js", "folder.js"]) {
|
||||||
const source = read("backend", "src", "routes", route);
|
const source = read("backend", "src", "routes", route);
|
||||||
const listings = source.match(/Folder\.find\(/g) ?? [];
|
// The listings that gather a campaign's folders are the ones shown as a section's
|
||||||
|
// tree. A walk of one folder's own children (`parentFolder`) is inside a single
|
||||||
|
// list already: folders are only ever nested within their own section.
|
||||||
|
const listings = source.match(/Folder\.find\(\{\s*campaign/g) ?? [];
|
||||||
assert.ok(listings.length, `${route} lists folders`);
|
assert.ok(listings.length, `${route} lists folders`);
|
||||||
const filtered = source.match(/Folder\.find\(\{[^{]*Folder\.filterForTarget\((?:'note'|target)\)/g) ?? [];
|
const filtered = source.match(/Folder\.find\(\{\s*campaign[^{]*Folder\.filterForTarget\((?:'note'|target)\)/g) ?? [];
|
||||||
assert.equal(filtered.length, listings.length, `${route} has a folder listing that names no campaign list`);
|
assert.equal(filtered.length, listings.length, `${route} has a folder listing that names no campaign list`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -354,6 +362,10 @@ function makeWorld() {
|
|||||||
id: "actor-1", name: "Thalia", type: "character", documentName: "Actor", flags: {},
|
id: "actor-1", name: "Thalia", type: "character", documentName: "Actor", flags: {},
|
||||||
items: { contents: [carriedItem] },
|
items: { contents: [carriedItem] },
|
||||||
getFlag() { return undefined; },
|
getFlag() { return undefined; },
|
||||||
|
// A pushed actor has its items marked as synced and itself mapped to the
|
||||||
|
// campaign row: nothing here reads those flags back.
|
||||||
|
async update() { return this; },
|
||||||
|
async updateEmbeddedDocuments() { return []; },
|
||||||
toObject() { return { _id: this.id, name: this.name, type: this.type, flags: this.flags }; },
|
toObject() { return { _id: this.id, name: this.name, type: this.type, flags: this.flags }; },
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
@@ -523,12 +535,12 @@ test("autosync off: folder changes stop syncing", async () => {
|
|||||||
|
|
||||||
// --- The sidebar groups its items under those folders ----------------------------
|
// --- The sidebar groups its items under those folders ----------------------------
|
||||||
|
|
||||||
async function loadItemFoldersService() {
|
function loadItemFoldersService() {
|
||||||
const source = read("frontend", "app", "services", "ItemFolders.js").replace("export { BuildItemRows };", "return { BuildItemRows };");
|
const source = read("frontend", "app", "services", "ItemFolders.js").replace("export { BuildItemRows };", "return { BuildItemRows };");
|
||||||
return vm.compileFunction(source)();
|
return vm.compileFunction(source)();
|
||||||
}
|
}
|
||||||
|
|
||||||
const { BuildItemRows } = await loadItemFoldersService();
|
const { BuildItemRows } = loadItemFoldersService();
|
||||||
|
|
||||||
const SIDEBAR_FOLDERS = [
|
const SIDEBAR_FOLDERS = [
|
||||||
{ _id: "f-melee", name: "Melee Weapons" },
|
{ _id: "f-melee", name: "Melee Weapons" },
|
||||||
@@ -546,13 +558,15 @@ test("items are grouped under the folder they stand in, nested", () => {
|
|||||||
row.kind, row.kind === "folder" ? row.folder.name : row.item.name, row.depth,
|
row.kind, row.kind === "folder" ? row.folder.name : row.item.name, row.depth,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// Every folder is followed by what stands in it, one step deeper, and the items that
|
||||||
|
// stand at the root come last (see BuildItemRows).
|
||||||
assert.deepEqual(shape, [
|
assert.deepEqual(shape, [
|
||||||
["folder", "Melee Weapons", 0],
|
["folder", "Melee Weapons", 0],
|
||||||
|
["item", "Longsword", 1],
|
||||||
["folder", "Ranged Weapons", 0],
|
["folder", "Ranged Weapons", 0],
|
||||||
["folder", "Powder Weapons", 1],
|
["folder", "Powder Weapons", 1],
|
||||||
["item", "Pistol", 1],
|
["item", "Pistol", 2],
|
||||||
["item", "Torch", 0],
|
["item", "Torch", 0],
|
||||||
["item", "Longsword", 1],
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -579,9 +593,9 @@ test("an item whose folder is gone, or a folder nested in itself, reads as a roo
|
|||||||
);
|
);
|
||||||
|
|
||||||
const shape = rows.map((row) => [row.kind, row.kind === "folder" ? row.folder.name : row.item.name]);
|
const shape = rows.map((row) => [row.kind, row.kind === "folder" ? row.folder.name : row.item.name]);
|
||||||
assert.ok(shape.includes(["item", "Torch"]), "the item is not lost with the folder that was removed");
|
assert.ok(shape.some(([kind, name]) => kind === "item" && name === "Torch"), "the item is not lost with the folder that was removed");
|
||||||
assert.deepEqual(new Set(shape.filter(([kind]) => kind === "folder").map(([, name]) => name)), new Set(["A", "B"]));
|
assert.deepEqual(new Set(shape.filter(([kind]) => kind === "folder").map(([, name]) => name)), new Set(["A", "B"]));
|
||||||
assert.equal(rows.filter(([kind]) => kind === "folder").length, 2, "a broken tree is walked once, not forever");
|
assert.equal(shape.filter(([kind]) => kind === "folder").length, 2, "a broken tree is walked once, not forever");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("every locale labels the folder row", () => {
|
test("every locale labels the folder row", () => {
|
||||||
|
|||||||
@@ -66,8 +66,8 @@ test("the item routes accept the icon and upload one", () => {
|
|||||||
test("the item info window is registered and opens on a sidebar click", () => {
|
test("the item info window is registered and opens on a sidebar click", () => {
|
||||||
assert.match(windowDefsSource, /item_sheet:\s*{\s*title:[^}]*ItemSheetWindow\.vue/s);
|
assert.match(windowDefsSource, /item_sheet:\s*{\s*title:[^}]*ItemSheetWindow\.vue/s);
|
||||||
// clicking (or Enter/Space on) an item row opens the window instead of expanding inline.
|
// clicking (or Enter/Space on) an item row opens the window instead of expanding inline.
|
||||||
// Since #44 the rows come from the folder tree the world synced, so the row holds the item.
|
// The rows come from the item list's folder tree, so the row holds the item.
|
||||||
assert.match(sidebarSource, /v-for="row in itemRows"[\s\S]*?@click="openItemSheet\(row\.item\)"/);
|
assert.match(sidebarSource, /v-for="row in entryRows\.item\.value"[\s\S]*?@click="openItemSheet\(row\.item\)"/);
|
||||||
assert.match(sidebarSource, /CreateWindow\(['"]item_sheet['"],\s*\{ item \}\)/);
|
assert.match(sidebarSource, /CreateWindow\(['"]item_sheet['"],\s*\{ item \}\)/);
|
||||||
assert.doesNotMatch(sidebarSource, /toggleEntryDetails/);
|
assert.doesNotMatch(sidebarSource, /toggleEntryDetails/);
|
||||||
});
|
});
|
||||||
|
|||||||
217
tests/manage-accounts.test.js
Normal file
217
tests/manage-accounts.test.js
Normal file
@@ -0,0 +1,217 @@
|
|||||||
|
// Tests for "Manage accounts" of Syndria98/dragonroll#51: the button on the settings window's site
|
||||||
|
// administration tab opened a window type (`account_management`) that was never registered in
|
||||||
|
// `WindowDefinitions.js`, so `getComponent` dereferenced `defWindows[type].component` on `undefined` —
|
||||||
|
// `can't access property "component", (intermediate value)[type] is undefined` — instead of opening
|
||||||
|
// anything. The window is the site administration screen now (list accounts, create one, grant or
|
||||||
|
// take administrator rights, delete one), guarded on the backend by the `isAdmin` middleware.
|
||||||
|
//
|
||||||
|
// Like tests/settings-window.test.js, the window wiring is read from the sources; the window registry
|
||||||
|
// is also checked against every window type the frontend opens, which is what catches this class of
|
||||||
|
// bug before the click does.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const frontendApp = path.join(__dirname, "..", "frontend", "app");
|
||||||
|
const windowDefsSource = read("frontend", "app", "services", "WindowDefinitions.js");
|
||||||
|
const settingsWindowSource = read("frontend", "app", "components", "windows", "SettingsWindow.vue");
|
||||||
|
const accountsWindowSource = read("frontend", "app", "components", "windows", "AccountManagementWindow.vue");
|
||||||
|
const userRouteSource = read("backend", "src", "routes", "user.js");
|
||||||
|
|
||||||
|
// -- the window registry -------------------------------------------------------
|
||||||
|
|
||||||
|
// Top-level entries of `defWindows`: every entry sits at 2 spaces, its contents at 4+.
|
||||||
|
function registryEntries() {
|
||||||
|
const header = /^ {2}([A-Za-z_]\w*):\s*\{/gm;
|
||||||
|
const marks = [];
|
||||||
|
let match;
|
||||||
|
while ((match = header.exec(windowDefsSource))) marks.push({ type: match[1], index: match.index });
|
||||||
|
assert.ok(marks.length > 0, "expected window definitions to register windows");
|
||||||
|
|
||||||
|
const entries = {};
|
||||||
|
marks.forEach((mark, i) => {
|
||||||
|
const end = i + 1 < marks.length ? marks[i + 1].index : windowDefsSource.length;
|
||||||
|
entries[mark.type] = windowDefsSource.slice(mark.index, end);
|
||||||
|
});
|
||||||
|
return entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
function* sourceFiles(dir) {
|
||||||
|
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
||||||
|
const full = path.join(dir, entry.name);
|
||||||
|
if (entry.isDirectory()) yield* sourceFiles(full);
|
||||||
|
else if (/\.(vue|js|ts)$/.test(entry.name)) yield full;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
test("account_management is a registered window with a component on disk", () => {
|
||||||
|
const entries = registryEntries();
|
||||||
|
const definition = entries["account_management"];
|
||||||
|
assert.ok(definition, "account_management must be registered or getComponent opens undefined");
|
||||||
|
assert.match(definition, /AccountManagementWindow\.vue/);
|
||||||
|
const component = path.join(frontendApp, "components", "windows", "AccountManagementWindow.vue");
|
||||||
|
assert.ok(fs.existsSync(component), "the window component file must exist");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("no window is opened with a type that is not registered", () => {
|
||||||
|
const registered = registryEntries();
|
||||||
|
// The type is the first string argument of CreateWindow; CreateChildWindow takes a parent
|
||||||
|
// (GetFirstWindowId('main_menu')-style, a registered type itself) before the type. Data
|
||||||
|
// objects after it hold strings that mean nothing to the registry, so they stay unmatched.
|
||||||
|
const createWindow = /CreateWindow\(\s*['"]([a-z_]+)['"]/g;
|
||||||
|
const createChildWindow = /CreateChildWindow\(\s*(?:GetFirstWindowId\(\s*['"]([a-z_]+)['"]\s*\)|[a-z_]+)\s*,\s*['"]([a-z_]+)['"]/g;
|
||||||
|
|
||||||
|
for (const file of sourceFiles(frontendApp)) {
|
||||||
|
const source = fs.readFileSync(file, "utf8");
|
||||||
|
const found = [...source.matchAll(createWindow), ...source.matchAll(createChildWindow)];
|
||||||
|
for (const match of found) {
|
||||||
|
for (const type of match.slice(1)) {
|
||||||
|
if (!type) continue;
|
||||||
|
assert.ok(
|
||||||
|
registered[type],
|
||||||
|
`${path.relative(frontendApp, file)} opens '${type}', which WindowDefinitions.js does not define`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every registered window points at a component file that exists", () => {
|
||||||
|
for (const [type, definition] of Object.entries(registryEntries())) {
|
||||||
|
const imported = /import\(['"]([^'"]+)['"]\)/.exec(definition)?.[1];
|
||||||
|
assert.ok(imported, `${type} must import a component`);
|
||||||
|
const file = path.join(frontendApp, imported.replace(/^~\//, ""));
|
||||||
|
assert.ok(fs.existsSync(file), `${type} points at ${imported}, which is not there`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- opening it from the settings window ----------------------------------------
|
||||||
|
|
||||||
|
const openManageAccounts = /function OpenManageAccounts\(\)\s*\{[\s\S]*?\n\}/.exec(settingsWindowSource)?.[0];
|
||||||
|
|
||||||
|
test("the settings tab opens the account window and can come back", () => {
|
||||||
|
assert.ok(openManageAccounts, "expected an OpenManageAccounts in the settings window");
|
||||||
|
assert.match(openManageAccounts, /CreateWindow\(\s*'account_management'/);
|
||||||
|
// ClearWindow takes a selector object; a bare string matched neither `selector.type` nor
|
||||||
|
// `selector.id` and closed nothing, leaving both windows stacked.
|
||||||
|
assert.match(openManageAccounts, /ClearWindow\(\s*\{\s*type:\s*'settings'\s*\}\s*\)/);
|
||||||
|
assert.match(openManageAccounts, /ClearWindow\(\s*\{\s*type:\s*'account_management'\s*\}\s*\)/);
|
||||||
|
assert.match(openManageAccounts, /CreateWindow\(\s*'settings'/, "back returns to the settings window");
|
||||||
|
assert.doesNotMatch(settingsWindowSource, /ClearWindow\(\s*['"]/g, "no ClearWindow call may pass a bare string");
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- the account management window ------------------------------------------------
|
||||||
|
|
||||||
|
test("the account window talks to the account management endpoints", () => {
|
||||||
|
assert.match(accountsWindowSource, /Server\(\)\.get\(['"]\/user\/list['"]/);
|
||||||
|
assert.match(accountsWindowSource, /Server\(\)\.post\(['"]\/user\/create['"]/);
|
||||||
|
assert.match(accountsWindowSource, /Server\(\)\.post\(['"]\/user\/set-admin['"]/);
|
||||||
|
assert.match(accountsWindowSource, /Server\(\)\.post\(['"]\/user\/delete['"]/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the window closes the switches on the row of the admin using it", () => {
|
||||||
|
// The server answers the same way to anybody who still posts it (see below); the row just
|
||||||
|
// does not invite the attempt.
|
||||||
|
assert.match(accountsWindowSource, /v-if="!IsSelf\(user\)"/);
|
||||||
|
assert.match(accountsWindowSource, /GetUser\(\)\?\._id/);
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- the backend routes -----------------------------------------------------------
|
||||||
|
|
||||||
|
function routeDeclaration(method, route) {
|
||||||
|
const declaration = new RegExp(`router\\.${method}\\(['"]${route}['"][^\\n]*`).exec(userRouteSource)?.[0];
|
||||||
|
assert.ok(declaration, `expected a ${method.toUpperCase()} ${route} route`);
|
||||||
|
// /api/user is mounted before the JWT guard: without inline authentication the route would
|
||||||
|
// be public to any request (landmine 5 of AGENTS.md), and only an admin may manage accounts.
|
||||||
|
assert.match(declaration, /passport\.authenticate\(['"]jwt['"]/);
|
||||||
|
assert.match(declaration, /isAdmin/, `${route} may only be answered for an administrator`);
|
||||||
|
return declaration;
|
||||||
|
}
|
||||||
|
|
||||||
|
function routeBlock(method, route) {
|
||||||
|
const start = userRouteSource.indexOf(`router.${method}('${route}'`);
|
||||||
|
assert.ok(start !== -1, `expected a ${method.toUpperCase()} ${route} route`);
|
||||||
|
const next = userRouteSource.indexOf(`\nrouter.`, start + 1);
|
||||||
|
return userRouteSource.slice(start, next === -1 ? userRouteSource.length : next);
|
||||||
|
}
|
||||||
|
|
||||||
|
test("GET /user/list answers the accounts without passwords or setup codes", () => {
|
||||||
|
routeDeclaration("get", "/list");
|
||||||
|
assert.match(routeBlock("get", "/list"), /select\(['"]-password -setupCode['"]\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("POST /user/create stores a hashed password and refuses duplicates", () => {
|
||||||
|
const block = routeBlock("post", "/create");
|
||||||
|
assert.match(block, /bcrypt\.hash\(password/, "the password must not go in as it came");
|
||||||
|
assert.match(block, /register\.errors\.email-username-exists/, "duplicates answer with the register message");
|
||||||
|
assert.doesNotMatch(block, /setupCode/, "no half-finished setup account is invented here");
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const route of ["/set-admin", "/delete"]) {
|
||||||
|
test(`POST /user${route} refuses to act on the admin that is asking`, () => {
|
||||||
|
routeDeclaration("post", route);
|
||||||
|
const block = routeBlock("post", route);
|
||||||
|
assert.match(block, /String\(req\.user\._id\) === String\(id\)/, "an admin keeps their own account closed");
|
||||||
|
assert.match(block, /errors\.internal/);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// -- i18n --------------------------------------------------------------------------
|
||||||
|
|
||||||
|
test("every locale titles the account window and names its strings", () => {
|
||||||
|
const required = [
|
||||||
|
"accounts.you",
|
||||||
|
"accounts.admin",
|
||||||
|
"accounts.make-admin",
|
||||||
|
"accounts.remove-admin",
|
||||||
|
"accounts.delete",
|
||||||
|
"accounts.new-account",
|
||||||
|
"accounts.name",
|
||||||
|
"accounts.username",
|
||||||
|
"accounts.email",
|
||||||
|
"accounts.password",
|
||||||
|
"accounts.create",
|
||||||
|
"accounts.created",
|
||||||
|
"accounts.updated",
|
||||||
|
"accounts.deleted",
|
||||||
|
"accounts.errors.self-admin",
|
||||||
|
"accounts.errors.self-delete",
|
||||||
|
];
|
||||||
|
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const windows = JSON.parse(read("frontend", "i18n", "locales", locale, "windows.json"));
|
||||||
|
assert.ok(windows["account-management"]?.trim(), `${locale} is missing the account window title`);
|
||||||
|
|
||||||
|
const settings = JSON.parse(read("frontend", "i18n", "locales", locale, "settings.json"));
|
||||||
|
assert.ok(settings["site-administration"]?.["manage-accounts"]?.trim(), `${locale} is missing manage accounts`);
|
||||||
|
for (const key of required) {
|
||||||
|
const value = key.split(".").reduce((node, part) => node?.[part], settings["site-administration"]);
|
||||||
|
assert.ok(value?.trim(), `${locale} is missing settings.site-administration.${key}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every accounts string the window translates exists in every locale", () => {
|
||||||
|
// $t keys with nothing to translate fall back to the key itself, so every accounts key the
|
||||||
|
// window uses has to be carried by every locale. (`errors.internal` is the envelope fallback
|
||||||
|
// every window toasts the same way and stays out of it.)
|
||||||
|
const used = [...new Set(
|
||||||
|
[...accountsWindowSource.matchAll(/\$t\(\s*['"](settings\.site-administration\.accounts\.[\w.-]+)['"]/g)]
|
||||||
|
.map((key) => key[1])
|
||||||
|
)];
|
||||||
|
assert.ok(used.length >= 14, `expected the window's translated strings, found ${used.length}`);
|
||||||
|
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const settings = JSON.parse(read("frontend", "i18n", "locales", locale, "settings.json"));
|
||||||
|
for (const key of used) {
|
||||||
|
const value = key.split(".").slice(1).reduce((node, part) => node?.[part], settings);
|
||||||
|
assert.ok(typeof value === "string" && value.trim(), `${locale} is missing ${key}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -85,6 +85,9 @@ function loadMapRoutes({ ownsCampaign = true, maps = [], notes = [] } = {}) {
|
|||||||
},
|
},
|
||||||
// The pins do not ask after actors, only the token routes below do.
|
// The pins do not ask after actors, only the token routes below do.
|
||||||
"../models/Actor": { findOne: () => mongooseQuery(null) },
|
"../models/Actor": { findOne: () => mongooseQuery(null) },
|
||||||
|
// The map list's own folder tree: `/list` reads it and `/update` checks a move
|
||||||
|
// against it, so the pins need the model to answer, never what it answers.
|
||||||
|
"../models/Folder": { find: () => mongooseQuery([]), belongsToSection: async () => true },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,7 +184,12 @@ function loadNoteRoutes({ ownsCampaign = true, notes = [], folders = [], deleted
|
|||||||
findById: (id) => mongooseQuery(notes.find((note) => note._id === id) ?? null),
|
findById: (id) => mongooseQuery(notes.find((note) => note._id === id) ?? null),
|
||||||
deleteOne: () => mongooseQuery({ deletedCount }),
|
deleteOne: () => mongooseQuery({ deletedCount }),
|
||||||
},
|
},
|
||||||
"../models/Folder": { find: () => mongooseQuery(folders) },
|
"../models/Folder": {
|
||||||
|
find: () => mongooseQuery(folders),
|
||||||
|
// models/Folder.js: the note tree is every folder that is not one of the other
|
||||||
|
// campaign lists, whose rows carry no target at all.
|
||||||
|
filterForTarget: (target) => (target === "note" ? { target: { $nin: ["actor", "item", "map"] } } : { target }),
|
||||||
|
},
|
||||||
"../models/Map": {
|
"../models/Map": {
|
||||||
// The driver drops the pins of the note from every map holding one; what is worth
|
// The driver drops the pins of the note from every map holding one; what is worth
|
||||||
// keeping here is the filter it is asked to do that with.
|
// keeping here is the filter it is asked to do that with.
|
||||||
|
|||||||
@@ -82,6 +82,9 @@ function loadMapRoutes({ ownsCampaign = true, maps = [], actors = [] } = {}) {
|
|||||||
: null
|
: null
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
// The map list's own folder tree: `/list` reads it and `/update` checks a move
|
||||||
|
// against it, so the tokens need the model to answer, never what it answers.
|
||||||
|
"../models/Folder": { find: () => mongooseQuery([]), belongsToSection: async () => true },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,6 +191,8 @@ function loadActorRoutes({ ownsCampaign = true, actors = [], deletedCount = 1 }
|
|||||||
return { modifiedCount: 1 };
|
return { modifiedCount: 1 };
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
// The actor list's own folder tree, which the delete does not ask after.
|
||||||
|
"../models/Folder": { find: () => mongooseQuery([]), belongsToSection: async () => true },
|
||||||
});
|
});
|
||||||
return { api, tokensPulled };
|
return { api, tokensPulled };
|
||||||
}
|
}
|
||||||
@@ -299,10 +304,14 @@ function mapViewerTokenWiringTests() {
|
|||||||
const sidebar = readRepoFile("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
const sidebar = readRepoFile("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
||||||
|
|
||||||
test("an actor row of the sidebar can be dragged out of it", () => {
|
test("an actor row of the sidebar can be dragged out of it", () => {
|
||||||
const actorRow = /<div v-for="actor in actors"[^>]*>/.exec(sidebar)?.[0];
|
// The actors' block of the sidebar: since the entry lists got their folders the rows
|
||||||
|
// come from that tree, so the actor row holds its actor as `row.item`.
|
||||||
|
const actorSection = /<template v-else-if="activeSection === 'actors'">([\s\S]*?)<\/template>\s*\n\s*<template v-else-if="activeSection === 'items'">/
|
||||||
|
.exec(sidebar)?.[1] ?? "";
|
||||||
|
const actorRow = /<div v-else class="entity-entry"[^>]*>/.exec(actorSection)?.[0];
|
||||||
assert.ok(actorRow, "expected the actor rows of the sidebar");
|
assert.ok(actorRow, "expected the actor rows of the sidebar");
|
||||||
assert.match(actorRow, /draggable="true"/);
|
assert.match(actorRow, /draggable="true"/);
|
||||||
assert.match(actorRow, /@dragstart="startActorDrag\(\$event, actor\)"/);
|
assert.match(actorRow, /@dragstart="startActorDrag\(\$event, row\.item\)"/);
|
||||||
assert.match(sidebar, /setData\(ACTOR_DRAG_TYPE, String\(actor\._id\)\)/);
|
assert.match(sidebar, /setData\(ACTOR_DRAG_TYPE, String\(actor\._id\)\)/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user