Fix #10: Add map support #11

Merged
Syndria98 merged 2 commits from ai/issue-10 into master 2026-10-14 12:08:35 +00:00
14 changed files with 683 additions and 31 deletions
Showing only changes of commit bcd173d133 - Show all commits

View File

@@ -74,9 +74,9 @@ backend/src/
├── index.js app bootstrap: dotenv, static uploads, json limits (50mb),
│ passport init, CORS, route mounting, listen(5000)
├── db.js connectDB() -> mongoose.connect(process.env.DB_URI)
├── models/ User.js Campaign.js Note.js Folder.js Actor.js Item.js
├── models/ User.js Campaign.js Note.js Folder.js Actor.js Item.js Map.js
│ FoundryLinkRequest.js DiscordLinkRequest.js DiscordGuildLink.js
├── routes/ user.js campaign.js note.js folder.js actor.js item.js
├── routes/ user.js campaign.js note.js folder.js actor.js item.js map.js
│ foundry-link.js (token sync, mounted BEFORE auth) foundry.js (bridge proxy)
│ discord.js
├── services/
@@ -141,6 +141,7 @@ User ──< Campaign ──< Note ──?> Folder ──?> Folder (parentFolder
└───────< Folder
└───────< Actor (Foundry actors, when linked)
└───────< Item (Foundry gear + hand-made items)
└───────< Map (uploaded images + their grid settings)
```
| Model | File | Fields |
@@ -151,6 +152,7 @@ User ──< Campaign ──< Note ──?> Folder ──?> Folder (parentFolder
| `Folder` | `models/Folder.js` | `name*`, `campaign*` → Campaign, `parentFolder` → Folder (null = root), `color` (hex string, sidebar entry background), `date` |
| `Actor` | `models/Actor.js` | `name*`, `type` (`character`\|`npc`\|`creature`), `species`, `className`, `subclass`, `level`, `background`, `challengeRating`, `description`, `image`, `abilityScores{str..cha}`, `armorClass`, `speed`, `proficiencies`, `inventory[{name,quantity,weight}]` (flattened Foundry items, embedded — not `Item` docs), `traits`, `spells` (newline text), `campaign*` → Campaign, `foundryActorId` (unique per campaign), `date` |
| `Item` | `models/Item.js` | `name*`, `category` (`weapon`\|`armor`\|`shield`\|`adventuring-gear`\|`magic-item`\|`consumable`\|`tool`\|`treasure`\|`other`), `rarity` (`common`…`artifact`), `quantity`, `weight`, `properties`, `description`, `campaign*` → Campaign, `foundryItemId` (unique per campaign), `foundryNames` (names Foundry uses for it, keeps dedup stable across a Dragonroll rename), `date` |
| `Map` | `models/Map.js` | `name*`, `image` (filename in `src/uploads`), `gridSize` (cell size in image px), `offsetX`/`offsetY` (grid origin in image px), `scale` (distance one cell stands for), `campaign*` → Campaign, `date` |
`*` = required. Notes and folders are ordered by `date: -1` everywhere.
@@ -207,6 +209,12 @@ subfolders re-parented to null then deleted.
`POST /api/item/update` — `{id*, name?, category?, rarity?, quantity?, weight?, properties?, description?}` — partial, ownership checked. `''` for `quantity`/`weight` is ignored, like `/item/create`.
`POST /api/item/delete` — `{id}`
`GET /api/map/list?campaign=` → `{status:'ok',maps}`
`POST /api/map/create` — multipart (`image`) or JSON `{name*,campaign*,gridSize?,offsetX?,offsetY?,scale?}` → `{status:'ok',map}`
`POST /api/map/update` — `{id*, name?, gridSize?, offsetX?, offsetY?, scale?}`, partial, ownership checked. Send it as
multipart with an `image` field to replace the photo (multer reads the other fields from the form; JSON works too).
`POST /api/map/delete` — `{id}`
### 4.1 Foundry integration (actors, items)
`dragonroll-foundry/` holds the Foundry VTT module (`scripts/api.js`, loaded by `module.json`) and an

View File

@@ -79,10 +79,10 @@ app.use('/api/note', require('./routes/note'));
app.use('/api/folder', require('./routes/folder'));
app.use('/api/actor', require('./routes/actor'));
app.use('/api/item', require('./routes/item'));
app.use('/api/map', require('./routes/map'));
app.use('/api/foundry', require('./routes/foundry'));
/*
app.use('/campaign', require('./routes/campaign'));
app.use('/maps', require('./routes/map'));
app.use('/datagen', require('./routes/datagen'));
app.use('/admin', require('./routes/admin'));
*/

23
backend/src/models/Map.js Normal file
View File

@@ -0,0 +1,23 @@
const mongoose = require('mongoose');
const Schema = mongoose.Schema;
const MapSchema = new Schema({
name: { type: String, required: true, trim: true },
// Uploaded image, served from /api/public/<filename>
image: { type: String, default: '' },
// Grid cell size in image pixels
gridSize: { type: Number, min: 1, default: 50 },
// Grid origin, in image pixels from the top left corner of the image
offsetX: { type: Number, default: 0 },
offsetY: { type: Number, default: 0 },
// Distance each grid cell stands for (feet, metres...)
scale: { type: Number, min: 0.01, default: 5 },
campaign: {
type: Schema.Types.ObjectId,
ref: 'Campaign',
required: true
},
date: { type: Date, default: Date.now }
});
module.exports = mongoose.model('Map', MapSchema);

95
backend/src/routes/map.js Normal file
View File

@@ -0,0 +1,95 @@
const express = require('express');
const router = express.Router();
const upload = require('../services/storage');
const Campaign = require('../models/Campaign');
const Map = require('../models/Map');
async function userOwnsCampaign(campaignId, userId) {
const campaign = await Campaign.findOne({ _id: campaignId, createdBy: userId }).lean();
return Boolean(campaign);
}
// Grid values arrive as strings when the request is a multipart form upload.
function toNumber(value, fallback) {
if (value === undefined || value === null || value === '') return fallback;
const number = Number(value);
return Number.isFinite(number) ? number : fallback;
}
router.get('/list', async (req, res) => {
try {
const { campaign } = req.query;
if (!campaign) return res.json({ status: 'error', msg: 'errors.missing-data' });
if (!(await userOwnsCampaign(campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
const maps = await Map.find({ campaign }).sort({ name: 1 }).lean();
res.json({ status: 'ok', maps });
} catch (err) {
console.error(err);
res.json({ status: 'error', msg: 'errors.internal' });
}
});
router.post('/create', upload.single('image'), async (req, res) => {
try {
const { name, campaign, gridSize, offsetX, offsetY, scale } = req.body;
if (!name?.trim() || !campaign) return res.json({ status: 'error', msg: 'errors.missing-data' });
if (!(await userOwnsCampaign(campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
const map = await Map.create({
name: name.trim(), campaign,
image: req.file ? req.file.filename : '',
gridSize: toNumber(gridSize, 50),
offsetX: toNumber(offsetX, 0),
offsetY: toNumber(offsetY, 0),
scale: toNumber(scale, 5)
});
res.json({ status: 'ok', map });
} catch (err) {
console.error(err);
res.json({ status: 'error', msg: 'errors.internal' });
}
});
router.post('/update', upload.single('image'), async (req, res) => {
try {
const { id, name, gridSize, offsetX, offsetY, scale } = req.body;
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
const map = await Map.findById(id);
if (!map) return res.json({ status: 'error', msg: 'errors.notfound' });
if (!(await userOwnsCampaign(map.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
if (name !== undefined) map.name = String(name).trim();
if (gridSize !== undefined) map.gridSize = toNumber(gridSize, map.gridSize);
if (offsetX !== undefined) map.offsetX = toNumber(offsetX, map.offsetX);
if (offsetY !== undefined) map.offsetY = toNumber(offsetY, map.offsetY);
if (scale !== undefined) map.scale = toNumber(scale, map.scale);
if (req.file) map.image = req.file.filename;
await map.save();
res.json({ status: 'ok', map });
} catch (err) {
console.error(err);
res.json({ status: 'error', msg: 'errors.internal' });
}
});
router.post('/delete', async (req, res) => {
try {
const { id } = req.body;
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
const map = await Map.findById(id);
if (!map) return res.json({ status: 'error', msg: 'errors.notfound' });
if (!(await userOwnsCampaign(map.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
await map.deleteOne();
res.json({ status: 'ok' });
} catch (err) {
console.error(err);
res.json({ status: 'error', msg: 'errors.internal' });
}
});
module.exports = router;

View File

@@ -15,6 +15,8 @@ const notes = ref([]);
const folders = ref([]);
const actors = ref([]);
const items = ref([]);
const maps = ref([]);
const entryLists = { actor: actors, item: items, map: maps };
const loadingNotes = ref(false);
const loadingEntries = ref(false);
const notesError = ref('');
@@ -105,14 +107,16 @@ function handleFolderDeleted(folderId) {
function handleCampaignEntryCreated({ entityType, entry }) {
if (!entry || (entry.campaign && String(entry.campaign) !== String(campaignId.value))) return;
const list = entityType === 'actor' ? actors : items;
const list = entryLists[entityType];
if (!list) return;
list.value = [...list.value.filter((current) => current._id !== entry._id), entry]
.sort((a, b) => a.name.localeCompare(b.name));
}
function handleCampaignEntryUpdated({ entityType, entry }) {
if (!entry) return;
const list = entityType === 'actor' ? actors : items;
const list = entryLists[entityType];
if (!list) return;
list.value = list.value.map((current) => current._id === entry._id ? entry : current)
.sort((a, b) => a.name.localeCompare(b.name));
}
@@ -158,24 +162,34 @@ async function fetchCampaignNotes() {
}
}
function entryEntityType(section) {
if (section === 'actors') return 'actor';
if (section === 'items') return 'item';
if (section === 'maps') return 'map';
return null;
}
function isEntrySection(section) {
return entryEntityType(section) !== null;
}
async function fetchCampaignEntries(entityType = activeSection.value, silent = false) {
if (!campaignId.value || !['actors', 'items'].includes(entityType)) return;
const kind = entryEntityType(entityType);
const list = entryLists[kind];
if (!campaignId.value || !list) return;
if (!silent) {
loadingEntries.value = true;
entriesError.value = '';
}
try {
const collection = entityType === 'actors' ? 'actor' : 'item';
const response = await Server().get(`/${collection}/list`, { params: { campaign: campaignId.value } });
const response = await Server().get(`/${kind}/list`, { params: { campaign: campaignId.value } });
if (response.data.status !== 'ok') {
if (!silent) entriesError.value = response.data.msg ?? t('campaigns.errors.load');
return;
}
const kind = entityType === 'actors' ? 'actor' : 'item';
const list = entityType === 'actors' ? actors : items;
const previousById = new Map(list.value.map((entry) => [entry._id, entry]));
list.value = response.data[entityType];
list.value = response.data[entityType] ?? [];
// Tell open windows about Foundry changes landing behind them.
for (const entry of list.value) {
const previous = previousById.get(entry._id);
@@ -192,11 +206,15 @@ async function fetchCampaignEntries(entityType = activeSection.value, silent = f
function selectSection(section) {
activeSection.value = section;
if (section === 'actors' || section === 'items') fetchCampaignEntries(section);
if (isEntrySection(section)) fetchCampaignEntries(section);
}
function createEntry(entityType) {
if (!campaignId.value) return;
if (entityType === 'map') {
CreateWindow('create_map', { campaign: campaignId.value });
return;
}
CreateWindow('create_campaign_entry', { entityType, campaign: campaignId.value });
}
@@ -213,22 +231,37 @@ function itemSummary(item) {
return `${t(`campaigns.item.categories.${item.category}`)} · ${t(`campaigns.item.rarities.${item.rarity}`)} · ${t('campaigns.item.quantity-short')} ${item.quantity}`;
}
function mapSummary(map) {
return t('campaigns.map.summary', { size: map.gridSize, scale: map.scale });
}
function editItem(entry) {
if (!campaignId.value) return;
CreateWindow('create_campaign_entry', { entityType: 'item', campaign: campaignId.value, entry });
}
function editMap(map) {
if (!campaignId.value) return;
CreateWindow('create_map', { campaign: campaignId.value, entry: map });
}
function showEntryMenu(entry, entityType) {
const collection = entityType === 'actor' ? 'actor' : 'item';
const list = entryLists[entityType];
const menuItems = [];
// Characters are edited in their sheet; items get the entry window in edit mode.
if (entityType !== 'actor') {
// Characters are edited in their sheet; items and maps get their window in edit mode.
if (entityType === 'item') {
menuItems.push({
name: t('campaigns.actions.edit'),
icon: '/icons/iconoir/regular/edit.svg',
action: () => { HideContextMenu(); editItem(entry); }
});
} else if (entityType === 'map') {
menuItems.push({
name: t('campaigns.actions.edit'),
icon: '/icons/iconoir/regular/edit.svg',
action: () => { HideContextMenu(); editMap(entry); }
});
}
menuItems.push({
@@ -236,10 +269,9 @@ function showEntryMenu(entry, entityType) {
icon: '/icons/iconoir/regular/trash.svg',
action: async () => {
try {
const response = await Server().post(`/${collection}/delete`, { id: entry._id });
if (response.data.status === 'ok') {
if (entityType === 'actor') actors.value = actors.value.filter((actor) => actor._id !== entry._id);
else items.value = items.value.filter((item) => item._id !== entry._id);
const response = await Server().post(`/${entityType}/delete`, { id: entry._id });
if (response.data.status === 'ok' && list) {
list.value = list.value.filter((current) => current._id !== entry._id);
}
} catch (error) {} finally { HideContextMenu(); }
}
@@ -262,6 +294,15 @@ async function openCharacterSheet(actor) {
CreateWindow('character_sheet', { actor });
}
async function openMapViewer(map) {
const existingWindowId = GetFirstWindowId('map_viewer');
if (existingWindowId !== undefined) {
ClearWindow({ id: existingWindowId });
await nextTick();
}
CreateWindow('map_viewer', { map, campaign: campaignId.value });
}
function createNote() {
if (!Campaign.value) return;
@@ -282,13 +323,15 @@ watch(campaignId, (newVal) => {
if (newVal) {
actors.value = [];
items.value = [];
maps.value = [];
fetchCampaignNotes();
if (activeSection.value === 'actors' || activeSection.value === 'items') fetchCampaignEntries(activeSection.value);
if (isEntrySection(activeSection.value)) fetchCampaignEntries(activeSection.value);
} else {
notes.value = [];
folders.value = [];
actors.value = [];
items.value = [];
maps.value = [];
notesError.value = '';
entriesError.value = '';
}
@@ -375,6 +418,16 @@ onBeforeUnmount(() => {
>
<img class="sidebar-action-icon" src="/icons/iconoir/regular/box.svg" alt="" aria-hidden="true">
</button>
<button
class="sidebar-action"
:class="{ selected: activeSection === 'maps' }"
type="button" @click="selectSection('maps')"
:title="t('campaigns.sections.maps')" :aria-label="t('campaigns.sections.maps')"
:aria-pressed="(activeSection === 'maps').toString()"
>
<img class="sidebar-action-icon" src="/icons/iconoir/regular/map.svg" alt="" aria-hidden="true">
</button>
</nav>
<aside class="notes-sidebar" :class="{ collapsed: sidebarCollapsed }">
@@ -396,7 +449,7 @@ onBeforeUnmount(() => {
</button>
</template>
<template v-else>
<button class="sidebar-action" type="button" @click="createEntry(activeSection === 'actors' ? 'actor' : 'item')" :disabled="!Campaign" :title="t('campaigns.actions.create', { section: t(`campaigns.sections.${activeSection}`).toLowerCase() })" :aria-label="t('campaigns.actions.create', { section: t(`campaigns.sections.${activeSection}`).toLowerCase() })">
<button class="sidebar-action" type="button" @click="createEntry(entryEntityType(activeSection))" :disabled="!Campaign" :title="t('campaigns.actions.create', { section: t(`campaigns.sections.${activeSection}`).toLowerCase() })" :aria-label="t('campaigns.actions.create', { section: t(`campaigns.sections.${activeSection}`).toLowerCase() })">
<img class="sidebar-action-icon" src="/icons/iconoir/regular/plus.svg" alt="" aria-hidden="true">
</button>
<button class="sidebar-action" type="button" @click="fetchCampaignEntries(activeSection)" :disabled="!Campaign || loadingEntries" :title="t('campaigns.actions.refresh')" :aria-label="t('campaigns.actions.refresh')">
@@ -427,7 +480,7 @@ onBeforeUnmount(() => {
</div>
</template>
<template v-else>
<template v-else-if="activeSection === 'items'">
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
<div v-else-if="items.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-items') }}</div>
@@ -444,6 +497,17 @@ onBeforeUnmount(() => {
</template>
</div>
</template>
<template v-else>
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
<div v-else-if="maps.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-maps') }}</div>
<div v-for="map in maps" :key="map._id" class="entity-entry" role="button" tabindex="0" @click="openMapViewer(map)" @keydown.enter="openMapViewer(map)" @keydown.space.prevent="openMapViewer(map)" @contextmenu.prevent="showEntryMenu(map, 'map')">
<span class="entity-entry-name">{{ map.name }}</span>
<span class="entity-entry-meta">{{ mapSummary(map) }}</span>
<span v-if="!map.image" class="entity-entry-description">{{ t('campaigns.map.no-image') }}</span>
</div>
</template>
</div>
</aside>
</div>

View File

@@ -0,0 +1,184 @@
<script setup>
import { onBeforeUnmount, onMounted, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { SetupHandle, SetSize, ResetPosition, ClearWindow, Top } from '@/services/Windows';
import WindowHandle from './partials/WindowHandle.vue';
import Server, { getBaseUrl } from '~/services/Server';
import { emitter } from '~/services/Emitter';
const { t } = useI18n();
const props = defineProps(['data']);
const data = props.data;
const id = data.id;
const handle = ref(null);
const wrapper = ref(null);
const saving = ref(false);
const error = ref('');
const imageInput = ref(null);
// Passing an entry edits an existing map; otherwise this window creates one.
const editing = data.entry || null;
function initialForm() {
return {
name: editing?.name ?? '',
gridSize: Number(editing?.gridSize ?? 50),
offsetX: Number(editing?.offsetX ?? 0),
offsetY: Number(editing?.offsetY ?? 0),
scale: Number(editing?.scale ?? 5)
};
}
const form = ref(initialForm());
const selectedImage = ref(null);
let previewObjectUrl = null;
function serverImageUrl(image) {
if (!image) return '';
return /^(https?:|data:|\/\/)/i.test(image) ? image : `${getBaseUrl()}/public/${image}`;
}
const previewUrl = ref(serverImageUrl(editing?.image));
onMounted(() => {
Top(wrapper);
SetupHandle(id, handle);
SetSize(id, { width: 500, height: 600 });
ResetPosition(id, 'center');
});
onBeforeUnmount(() => {
ClearWindow({ type: 'create_map' });
if (previewObjectUrl) URL.revokeObjectURL(previewObjectUrl);
});
function pickImage() {
imageInput.value?.click();
}
function onImageSelected(event) {
const file = event.target.files?.[0];
event.target.value = '';
if (!file) return;
if (previewObjectUrl) URL.revokeObjectURL(previewObjectUrl);
previewObjectUrl = URL.createObjectURL(file);
selectedImage.value = file;
previewUrl.value = previewObjectUrl;
}
const numberFields = ['gridSize', 'offsetX', 'offsetY', 'scale'];
async function saveMap() {
if (!form.value.name.trim() || saving.value) return;
saving.value = true;
error.value = '';
try {
const body = new FormData();
body.append('name', form.value.name.trim());
if (editing) body.append('id', editing._id);
else body.append('campaign', data.campaign);
for (const field of numberFields) {
if (Number.isFinite(form.value[field])) body.append(field, String(form.value[field]));
}
if (selectedImage.value) body.append('image', selectedImage.value);
const response = await Server().post(editing ? '/map/update' : '/map/create', body, {
headers: { "Content-Type": "multipart/form-data" }
});
if (response.data.status !== 'ok') {
error.value = t('campaigns.map.save-error');
return;
}
emitter.emit(editing ? 'campaign-entry-updated' : 'campaign-entry-created', { entityType: 'map', entry: response.data.map });
ClearWindow({ id });
} catch (requestError) {
error.value = t('campaigns.map.save-error');
} finally {
saving.value = false;
}
}
</script>
<template>
<div class="window-wrapper" :id="'window-wrapper-' + id" ref="wrapper">
<WindowHandle :window="id" ref="handle" />
<div class="body">
<h3>{{ $t(editing ? 'campaigns.map.edit' : 'campaigns.map.new') }}</h3>
<div v-if="error" class="form-error">{{ error }}</div>
<form @submit.prevent="saveMap">
<label class="form-field">
<span>{{ $t('campaigns.fields.name') }}</span>
<input v-model="form.name" required autofocus autocomplete="off">
</label>
<div class="form-field">
<span>{{ $t('campaigns.map.photo') }}</span>
<div class="image-picker" :class="{ empty: !previewUrl }">
<img v-if="previewUrl" :src="previewUrl" :alt="$t('campaigns.map.photo')">
<button class="pick-image sound-click" type="button" :disabled="saving" @click="pickImage">
{{ $t(previewUrl ? 'campaigns.map.change-photo' : 'campaigns.map.upload-photo') }}
</button>
</div>
<small class="field-help">{{ $t('campaigns.map.photo-hint') }}</small>
<input ref="imageInput" class="image-input" type="file" accept="image/*" @change="onImageSelected">
</div>
<div class="form-grid">
<label class="form-field">
<span>{{ $t('campaigns.map.grid-size') }}</span>
<input v-model.number="form.gridSize" type="number" min="1" step="1">
</label>
<label class="form-field">
<span>{{ $t('campaigns.map.scale') }}</span>
<input v-model.number="form.scale" type="number" min="0.01" step="0.5">
</label>
<label class="form-field">
<span>{{ $t('campaigns.map.offset-x') }}</span>
<input v-model.number="form.offsetX" type="number" step="1">
</label>
<label class="form-field">
<span>{{ $t('campaigns.map.offset-y') }}</span>
<input v-model.number="form.offsetY" type="number" step="1">
</label>
</div>
<small class="field-help">{{ $t('campaigns.map.scale-help') }}</small>
<div class="form-actions">
<button class="btn-primary sound-click" type="submit" :disabled="saving">
{{ saving ? $t('campaigns.actions.saving') : $t('campaigns.actions.save') }}
</button>
</div>
</form>
</div>
</div>
</template>
<style scoped>
.window-wrapper { display: flex; align-items: center; flex-direction: column; }
.body { width: 100%; padding: 10px 18px 16px; overflow-y: auto; }
h3 { margin: 0 0 12px; font-family: MrEavesRemake; }
form { display: flex; flex-direction: column; gap: 10px; }
.form-field { min-width: 0; display: flex; flex-direction: column; gap: 4px; font-size: 13px; }
.form-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 10px; }
input {
box-sizing: border-box; width: 100%; padding: 7px 8px; border: 1px solid var(--color-border);
border-radius: 6px; background: var(--color-background-soft); color: var(--color-text); font: inherit;
}
input:focus { outline: none; border-color: var(--color-link); }
.image-picker {
min-height: 96px; display: flex; align-items: center; justify-content: center; overflow: hidden;
border: 1px solid var(--color-border); border-radius: 8px; background: var(--color-background-soft);
}
.image-picker.empty { border-style: dashed; }
.image-picker img { max-width: 100%; max-height: 180px; object-fit: contain; }
.pick-image {
border: 1px solid var(--color-border); border-radius: 6px; padding: 5px 10px; margin: 6px;
background: var(--color-background-light); color: var(--color-text); font-size: 12px; cursor: pointer;
}
.pick-image:hover { background: var(--color-button-hover); }
.pick-image:disabled { opacity: .55; cursor: wait; }
.image-input { display: none; }
.field-help { font-size: 11px; opacity: .72; }
.form-error { padding: 7px 10px; border-radius: 6px; color: var(--color-red); background: var(--color-background-soft); font-size: 12px; }
.form-actions { display: flex; justify-content: center; margin-top: 2px; }
.form-actions button { width: 100%; max-width: 220px; }
</style>

View File

@@ -0,0 +1,224 @@
<script setup>
import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
import { SetupHandle, SetSize, ResetPosition, ClearWindow, Top, CreateWindow } from '@/services/Windows';
import WindowHandle from './partials/WindowHandle.vue';
import { getBaseUrl } from '~/services/Server';
import { emitter } from '~/services/Emitter';
const props = defineProps(['data']);
const id = props.data.id;
const campaignId = props.data.campaign;
const handle = ref(null);
const wrapper = ref(null);
const map = ref(props.data.map ? { ...props.data.map } : null);
const viewport = ref(null);
const zoom = ref(1);
const pan = ref({ x: 0, y: 0 });
const imageSize = ref({ width: 0, height: 0 });
const showGrid = ref(true);
const dragging = ref(false);
const minZoom = 0.05;
const maxZoom = 8;
const imageUrl = computed(() => {
const image = map.value?.image;
if (!image) return '';
return /^(https?:|data:|\/\/)/i.test(image) ? image : `${getBaseUrl()}/public/${image}`;
});
const stageStyle = computed(() => ({
transform: `translate3d(${pan.value.x}px, ${pan.value.y}px, 0) scale(${zoom.value})`
}));
// The grid is drawn in screen space over the image so its lines stay one pixel wide at any zoom.
const gridStyle = computed(() => {
if (!showGrid.value || !imageSize.value.width) return { display: 'none' };
const cell = `${Math.max(1, Number(map.value?.gridSize) || 50) * zoom.value}px`;
return {
width: `${imageSize.value.width * zoom.value}px`,
height: `${imageSize.value.height * zoom.value}px`,
transform: `translate3d(${pan.value.x + (Number(map.value?.offsetX) || 0) * zoom.value}px, ${pan.value.y + (Number(map.value?.offsetY) || 0) * zoom.value}px, 0)`,
backgroundImage: `linear-gradient(to right, var(--color-link) 1px, transparent 1px), linear-gradient(to bottom, var(--color-link) 1px, transparent 1px)`,
backgroundSize: `${cell} ${cell}`
};
});
const zoomPercent = computed(() => `${Math.round(zoom.value * 100)}%`);
function clampZoom(value) {
if (!Number.isFinite(value)) return minZoom;
return Math.min(maxZoom, Math.max(minZoom, value));
}
function fitToWindow() {
const bounds = viewport.value?.getBoundingClientRect();
if (!bounds || !imageSize.value.width) return;
zoom.value = clampZoom(Math.min(bounds.width / imageSize.value.width, bounds.height / imageSize.value.height));
centerOn();
}
function centerOn() {
const bounds = viewport.value?.getBoundingClientRect();
if (!bounds || !imageSize.value.width) return;
pan.value = {
x: (bounds.width - imageSize.value.width * zoom.value) / 2,
y: (bounds.height - imageSize.value.height * zoom.value) / 2
};
}
function onImageLoaded(event) {
imageSize.value = { width: event.target.naturalWidth, height: event.target.naturalHeight };
fitToWindow();
}
// Zoom keeping the map point under `point` where it is.
function zoomAt(factor, point) {
const next = clampZoom(zoom.value * factor);
if (next === zoom.value) return;
const ratio = next / zoom.value;
pan.value = {
x: point.x - (point.x - pan.value.x) * ratio,
y: point.y - (point.y - pan.value.y) * ratio
};
zoom.value = next;
}
function onWheel(event) {
const bounds = viewport.value?.getBoundingClientRect();
if (!bounds) return;
zoomAt(event.deltaY < 0 ? 1.15 : 1 / 1.15, { x: event.clientX - bounds.left, y: event.clientY - bounds.top });
}
function zoomFromToolbar(incoming) {
const bounds = viewport.value?.getBoundingClientRect();
if (!bounds) return;
zoomAt(incoming ? 1.25 : 1 / 1.25, { x: bounds.width / 2, y: bounds.height / 2 });
}
let pointerId = null;
let lastPointer = { x: 0, y: 0 };
function onPointerDown(event) {
if (event.button !== 0 || !viewport.value) return;
dragging.value = true;
pointerId = event.pointerId;
lastPointer = { x: event.clientX, y: event.clientY };
viewport.value.setPointerCapture?.(event.pointerId);
}
function onPointerMove(event) {
if (!dragging.value || event.pointerId !== pointerId) return;
pan.value = { x: pan.value.x + (event.clientX - lastPointer.x), y: pan.value.y + (event.clientY - lastPointer.y) };
lastPointer = { x: event.clientX, y: event.clientY };
}
function onPointerUp(event) {
if (event.pointerId !== pointerId) return;
dragging.value = false;
pointerId = null;
viewport.value?.releasePointerCapture?.(event.pointerId);
}
function editMap() {
if (!map.value) return;
CreateWindow('create_map', { campaign: campaignId, entry: map.value });
}
function handleMapUpdated({ entityType, entry }) {
if (entityType !== 'map' || entry?._id !== map.value?._id) return;
const imageChanged = entry.image !== map.value.image;
map.value = { ...entry };
// A new image is fitted again by onImageLoaded; grid-only changes just move the overlay.
if (imageChanged) imageSize.value = { width: 0, height: 0 };
}
onMounted(() => {
Top(wrapper);
SetupHandle(id, handle);
SetSize(id, {
width: Math.max(480, Math.min(1100, window.innerWidth - 24)),
height: Math.max(360, Math.min(760, window.innerHeight - 32))
});
ResetPosition(id, 'center');
emitter.on('campaign-entry-updated', handleMapUpdated);
});
onBeforeUnmount(() => {
emitter.off('campaign-entry-updated', handleMapUpdated);
});
</script>
<template>
<div class="window-wrapper viewer-window" :id="'window-wrapper-' + id" ref="wrapper">
<WindowHandle :window="id" ref="handle" />
<div class="viewer-bar">
<div class="viewer-identity">
<strong>{{ map?.name }}</strong>
<span class="viewer-meta">{{ $t('campaigns.map.summary', { size: map?.gridSize, scale: map?.scale }) }}</span>
</div>
<div class="viewer-tools">
<button class="viewer-tool" :class="{ selected: showGrid }" type="button" :title="$t('campaigns.map.toggle-grid')"
:aria-label="$t('campaigns.map.toggle-grid')" :aria-pressed="showGrid.toString()" @click="showGrid = !showGrid">
<img class="tool-icon" src="/icons/iconoir/regular/view-grid.svg" alt="" aria-hidden="true">
</button>
<button class="viewer-tool" type="button" :title="$t('campaigns.map.zoom-out')" :aria-label="$t('campaigns.map.zoom-out')" @click="zoomFromToolbar(false)">
<img class="tool-icon" src="/icons/iconoir/regular/minus.svg" alt="" aria-hidden="true">
</button>
<span class="zoom-readout">{{ zoomPercent }}</span>
<button class="viewer-tool" type="button" :title="$t('campaigns.map.zoom-in')" :aria-label="$t('campaigns.map.zoom-in')" @click="zoomFromToolbar(true)">
<img class="tool-icon" src="/icons/iconoir/regular/plus.svg" alt="" aria-hidden="true">
</button>
<button class="viewer-tool" type="button" :title="$t('campaigns.map.fit')" :aria-label="$t('campaigns.map.fit')" @click="fitToWindow">
<img class="tool-icon" src="/icons/iconoir/regular/expand.svg" alt="" aria-hidden="true">
</button>
<button class="viewer-tool" type="button" :title="$t('campaigns.map.edit')" :aria-label="$t('campaigns.map.edit')" @click="editMap">
<img class="tool-icon" src="/icons/iconoir/regular/edit.svg" alt="" aria-hidden="true">
</button>
</div>
</div>
<div
ref="viewport"
class="map-viewport"
:class="{ dragging }"
@wheel.prevent="onWheel"
@pointerdown="onPointerDown"
@pointermove="onPointerMove"
@pointerup="onPointerUp"
@pointercancel="onPointerUp"
>
<template v-if="imageUrl">
<img class="map-image" :src="imageUrl" :style="stageStyle" :alt="map?.name" draggable="false" @load="onImageLoaded">
<div class="map-grid" :style="gridStyle" aria-hidden="true"></div>
</template>
<div v-else class="map-empty">
{{ $t('campaigns.map.no-image') }}
<button class="map-edit" type="button" @click="editMap">{{ $t('campaigns.map.upload-photo') }}</button>
</div>
</div>
</div>
</template>
<style scoped>
.viewer-window { min-width: 320px; min-height: 0; }
.viewer-bar { width: 100%; box-sizing: border-box; display: flex; align-items: center; justify-content: space-between; gap: 10px; padding: 8px 10px; border-bottom: 1px solid var(--color-border); background: var(--color-background-light); }
.viewer-identity { min-width: 0; display: flex; flex-direction: column; gap: 2px; }
.viewer-identity strong { font-family: MrEavesRemake; overflow-wrap: anywhere; }
.viewer-meta { font-size: 11px; opacity: .72; }
.viewer-tools { display: flex; align-items: center; gap: 4px; }
.viewer-tool { width: 30px; height: 30px; margin: 0; padding: 0; border: 1px solid var(--color-border); border-radius: 7px; background: var(--color-background-soft); display: flex; align-items: center; justify-content: center; cursor: pointer; }
.viewer-tool:hover { background: var(--color-button-hover); }
.viewer-tool.selected { border-color: var(--color-link); background: var(--color-button-hover); }
.tool-icon { width: 16px; height: 16px; filter: invert(var(--color-icon-invert)); }
.zoom-readout { min-width: 46px; text-align: center; font-size: 12px; }
.map-viewport { position: relative; width: 100%; flex: 1; min-height: 0; overflow: hidden; background-color: var(--color-background); cursor: grab; touch-action: none; }
.map-viewport.dragging { cursor: grabbing; }
.map-image { position: absolute; top: 0; left: 0; max-width: none; transform-origin: top left; user-select: none; }
.map-grid { position: absolute; top: 0; left: 0; opacity: .55; pointer-events: none; }
.map-empty { width: 100%; height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 8px; font-size: 13px; opacity: .8; }
.map-edit { border: 1px solid var(--color-border); border-radius: 7px; padding: 6px 11px; background: var(--color-background-soft); color: var(--color-text); font-size: 12px; cursor: pointer; }
.map-edit:hover { background: var(--color-button-hover); }
</style>

View File

@@ -70,6 +70,18 @@ const defWindows = {
component: () => import('~/components/windows/CharacterSheetWindow.vue'),
close: () => ClearWindow({type: 'character_sheet'}),
movable: true
},
create_map: {
title: 'windows.create-map',
component: () => import('~/components/windows/CreateMapWindow.vue'),
close: () => ClearWindow({type: 'create_map'}),
movable: true
},
map_viewer: {
title: 'windows.map-viewer',
component: () => import('~/components/windows/MapViewerWindow.vue'),
close: () => ClearWindow({type: 'map_viewer'}),
movable: true
}
}

View File

@@ -28,7 +28,7 @@
},
"sidebar-label": "Campanya",
"synced": "Sincronitzat",
"sections": { "notes": "Notes", "actors": "Actors i personatges", "items": "Objectes" },
"sections": { "notes": "Notes", "actors": "Actors i personatges", "items": "Objectes", "maps": "Mapes" },
"actions": {
"new-note": "Nota nova", "new-folder": "Carpeta nova", "refresh": "Actualitza",
"create": "Crea {section}", "submit": "Crea", "edit": "Edita", "save": "Desa", "delete": "Suprimeix", "saving": "Desant...",
@@ -36,7 +36,8 @@
},
"states": {
"loading": "Carregant...", "loading-notes": "Carregant notes...", "empty-notes": "Encara no hi ha notes en aquesta campanya.",
"empty-actors": "Encara no hi ha actors ni personatges.", "empty-items": "Encara no hi ha objectes en aquesta campanya."
"empty-actors": "Encara no hi ha actors ni personatges.", "empty-items": "Encara no hi ha objectes en aquesta campanya.",
"empty-maps": "Encara no hi ha mapes en aquesta campanya."
},
"errors": { "load": "No s'han pogut carregar les entrades de la campanya." },
"create-entry": "Crea una entrada de campanya",
@@ -57,6 +58,17 @@
},
"rarities": { "common": "Comuna", "uncommon": "Poc comuna", "rare": "Rara", "very-rare": "Molt rara", "legendary": "Llegendària", "artifact": "Artefacte" }
},
"map": {
"new": "Mapa nou", "edit": "Edita el mapa",
"photo": "Imatge del mapa", "upload-photo": "Pujar imatge", "change-photo": "Canviar imatge",
"photo-hint": "Una foto o una digitalització del mapa. Es manté la imatge actual si no en tries una de nova.",
"grid-size": "Mida de la quadrícula (px)", "offset-x": "Desplaçament X (px)", "offset-y": "Desplaçament Y (px)",
"scale": "Escala (distància per cel·la)", "scale-help": "La distància que representa una cel·la de la quadrícula, com ara 5 peus.",
"summary": "Quadrícula de {size} px · {scale} per cel·la",
"save-error": "No s'ha pogut desar aquest mapa.",
"no-image": "Aquest mapa encara no té imatge.",
"zoom-in": "Apropar", "zoom-out": "Allunyar", "fit": "Ajustar a la finestra", "toggle-grid": "Mostrar la quadrícula"
},
"character-sheet": {
"title": "Fitxa de personatge", "name": "Nom del personatge", "class": "Classe", "subclass": "Subclasse", "unset-class": "Classe sense definir",
"level": "Nivell", "species": "Espècie", "unset-species": "Espècie sense definir", "edit": "Edita la fitxa", "cancel": "Cancel·la",

View File

@@ -5,5 +5,7 @@
"example": "Finestra d'exemple",
"edit-profile": "Editar perfil",
"settings": "Configuració",
"create-campaign": "Crear campanya"
"create-campaign": "Crear campanya",
"create-map": "Crear mapa",
"map-viewer": "Mapa"
}

View File

@@ -32,7 +32,7 @@
},
"sidebar-label": "Campaign",
"synced": "Synced",
"sections": { "notes": "Notes", "actors": "Actors & Characters", "items": "Items" },
"sections": { "notes": "Notes", "actors": "Actors & Characters", "items": "Items", "maps": "Maps" },
"actions": {
"new-note": "New note", "new-folder": "New folder", "refresh": "Refresh",
"create": "Create {section}", "submit": "Create", "edit": "Edit", "save": "Save", "delete": "Delete", "saving": "Saving...",
@@ -40,7 +40,8 @@
},
"states": {
"loading": "Loading...", "loading-notes": "Loading notes...", "empty-notes": "No notes in this campaign yet.",
"empty-actors": "No actors or characters yet.", "empty-items": "No items in this campaign yet."
"empty-actors": "No actors or characters yet.", "empty-items": "No items in this campaign yet.",
"empty-maps": "No maps in this campaign yet."
},
"errors": { "load": "Unable to load campaign entries." },
"create-entry": "Create campaign entry",
@@ -61,6 +62,17 @@
},
"rarities": { "common": "Common", "uncommon": "Uncommon", "rare": "Rare", "very-rare": "Very rare", "legendary": "Legendary", "artifact": "Artifact" }
},
"map": {
"new": "New map", "edit": "Edit map",
"photo": "Map image", "upload-photo": "Upload image", "change-photo": "Change image",
"photo-hint": "A photo or scan of the map. The current image is kept when you do not pick a new one.",
"grid-size": "Grid size (px)", "offset-x": "Offset X (px)", "offset-y": "Offset Y (px)",
"scale": "Scale (distance per cell)", "scale-help": "How much distance one grid cell stands for, like 5 feet.",
"summary": "{size} px grid · {scale} per cell",
"save-error": "Unable to save this map.",
"no-image": "This map has no image yet.",
"zoom-in": "Zoom in", "zoom-out": "Zoom out", "fit": "Fit to window", "toggle-grid": "Show grid"
},
"character-sheet": {
"title": "Character Sheet", "name": "Character name", "class": "Class", "subclass": "Subclass", "unset-class": "Class not set",
"level": "Level", "species": "Species", "unset-species": "Species not set", "edit": "Edit sheet", "cancel": "Cancel",

View File

@@ -5,5 +5,7 @@
"example": "Example Window",
"edit-profile": "Edit Profile",
"settings": "Settings",
"create-campaign": "Create Campaign"
"create-campaign": "Create Campaign",
"create-map": "Create Map",
"map-viewer": "Map"
}

View File

@@ -28,7 +28,7 @@
},
"sidebar-label": "Campaña",
"synced": "Sincronizado",
"sections": { "notes": "Notas", "actors": "Actores y personajes", "items": "Objetos" },
"sections": { "notes": "Notas", "actors": "Actores y personajes", "items": "Objetos", "maps": "Mapas" },
"actions": {
"new-note": "Nueva nota", "new-folder": "Nueva carpeta", "refresh": "Actualizar",
"create": "Crear {section}", "submit": "Crear", "edit": "Editar", "save": "Guardar", "delete": "Eliminar", "saving": "Guardando...",
@@ -36,7 +36,8 @@
},
"states": {
"loading": "Cargando...", "loading-notes": "Cargando notas...", "empty-notes": "Aún no hay notas en esta campaña.",
"empty-actors": "Aún no hay actores ni personajes.", "empty-items": "Aún no hay objetos en esta campaña."
"empty-actors": "Aún no hay actores ni personajes.", "empty-items": "Aún no hay objetos en esta campaña.",
"empty-maps": "Aún no hay mapas en esta campaña."
},
"errors": { "load": "No se pudieron cargar las entradas de la campaña." },
"create-entry": "Crear entrada de campaña",
@@ -57,6 +58,17 @@
},
"rarities": { "common": "Común", "uncommon": "Poco común", "rare": "Raro", "very-rare": "Muy raro", "legendary": "Legendario", "artifact": "Artefacto" }
},
"map": {
"new": "Nuevo mapa", "edit": "Editar mapa",
"photo": "Imagen del mapa", "upload-photo": "Subir imagen", "change-photo": "Cambiar imagen",
"photo-hint": "Una foto o un escaneo del mapa. Se mantiene la imagen actual si no eliges una nueva.",
"grid-size": "Tamaño de la cuadrícula (px)", "offset-x": "Desplazamiento X (px)", "offset-y": "Desplazamiento Y (px)",
"scale": "Escala (distancia por celda)", "scale-help": "La distancia que representa una celda de la cuadrícula, como 5 pies.",
"summary": "Cuadrícula de {size} px · {scale} por celda",
"save-error": "No se pudo guardar este mapa.",
"no-image": "Este mapa aún no tiene imagen.",
"zoom-in": "Acercar", "zoom-out": "Alejar", "fit": "Ajustar a la ventana", "toggle-grid": "Mostrar cuadrícula"
},
"character-sheet": {
"title": "Hoja de personaje", "name": "Nombre del personaje", "class": "Clase", "subclass": "Subclase", "unset-class": "Clase sin definir",
"level": "Nivel", "species": "Especie", "unset-species": "Especie sin definir", "edit": "Editar hoja", "cancel": "Cancelar",

View File

@@ -5,5 +5,7 @@
"example": "Ventana de ejemplo",
"edit-profile": "Editar perfil",
"settings": "Configuración",
"create-campaign": "Crear campanya"
"create-campaign": "Crear campanya",
"create-map": "Crear mapa",
"map-viewer": "Mapa"
}