@commonpub/layer 0.57.0 → 0.59.0

package/pages/admin/theme/index.vue

@@ -30,7 +30,7 @@ import { onMounted, ref, computed, watch } from 'vue';
 //   detectAppliedOverrides ← utils/themeDiscovery.ts
 
 definePageMeta({ layout: 'admin', middleware: 'auth' });
-useSeoMeta({ title: `Theme — Admin — ${useSiteName()}` });
+useSeoMeta({ title: `Theme, Admin, ${useSiteName()}` });
 
 const themesApi = useThemeAdmin();
 const router = useRouter();
@@ -121,7 +121,7 @@ async function duplicateTheme(themeId: string): Promise<void> {
     const detected = detectAppliedOverrides();
     seed = {
       id: nextAvailableId(themeId.replace(/^cpub-custom-/, '') + '-fork'),
-      name: `Custom — based on ${themeId}`,
+      name: `Custom, based on ${themeId}`,
       description: '',
       family: `custom-${themeId.replace(/^cpub-custom-/, '')}`,
       isDark: detected.isDark,
@@ -144,7 +144,7 @@ async function removeTheme(themeId: string): Promise<void> {
       method: 'DELETE',
     });
     await Promise.all([themesApi.refresh(), refreshSettings()]);
-    notify(res.resetDefault ? 'Theme deleted — default reset to Classic' : 'Theme deleted', 'success');
+    notify(res.resetDefault ? 'Theme deleted, default reset to Classic' : 'Theme deleted', 'success');
   } catch (err) {
     notify(err instanceof Error ? err.message : 'Failed to delete', 'error');
   } finally {
@@ -177,7 +177,7 @@ function captureCurrent(): void {
   const seed = {
     id: nextAvailableId(`captured-${new Date().toISOString().slice(0, 10)}`),
     name: 'Captured current site theme',
-    description: `Auto-captured from the live :root on ${new Date().toLocaleDateString()} — ${detected.count} tokens.`,
+    description: `Auto-captured from the live :root on ${new Date().toLocaleDateString()}, ${detected.count} tokens.`,
     family: 'captured',
     isDark: detected.isDark,
     parentTheme: detected.isDark ? 'dark' : 'base',
@@ -362,7 +362,7 @@ async function saveOverrides(overrides: Record<string, string>): Promise<void> {
         <h2 class="admin-theme-discovery-title">Your site has a custom theme</h2>
         <p class="admin-theme-discovery-desc">
           We detected <strong>{{ discovery.count }}</strong> CSS token{{ discovery.count === 1 ? '' : 's' }}
-          on <code>:root</code> that differ from the built-in defaults — probably from
+          on <code>:root</code> that differ from the built-in defaults, probably from
           a CSS file your layer app loads. Capture it into an editable custom theme so
           you can tweak it from this admin panel.
         </p>

package/pages/admin/users.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 definePageMeta({ layout: 'admin', middleware: 'auth' });
-useSeoMeta({ title: `Users — Admin — ${useSiteName()}` });
+useSeoMeta({ title: `Users, Admin, ${useSiteName()}` });
 
 const search = ref('');
 const toast = useToast();

package/pages/auth/forgot-password.vue

@@ -2,7 +2,7 @@
 definePageMeta({ layout: 'auth' });
 
 useSeoMeta({
-  title: `Forgot Password — ${useSiteName()}`,
+  title: `Forgot Password, ${useSiteName()}`,
   description: 'Reset your CommonPub account password.',
 });
 

package/pages/auth/login.vue

@@ -2,7 +2,7 @@
 definePageMeta({ layout: 'auth' });
 
 useSeoMeta({
-  title: `Log in — ${useSiteName()}`,
+  title: `Log in, ${useSiteName()}`,
   description: 'Log in to your CommonPub account.',
 });
 
@@ -241,7 +241,7 @@ function handleMastodonLogin(): void {
     </div>
 
     <!--
-      Mastodon-API login section (Phase 2b) — gated by features.identity.signInWithRemote.
+      Mastodon-API login section (Phase 2b), gated by features.identity.signInWithRemote.
       Works with any Mastodon-API-compatible host: Mastodon, Pleroma, Akkoma, GoToSocial,
       Firefish, and other CommonPub instances. On submit, parses the input to extract a
       host and navigates to /api/auth/mastodon/start, which registers our OAuth client at
@@ -257,7 +257,7 @@ function handleMastodonLogin(): void {
 
         <label for="mastodon-handle" class="field-label">
           Sign in with Mastodon
-          <span class="field-label-note">— or Pleroma, GoToSocial, Akkoma, Firefish</span>
+          <span class="field-label-note">- or Pleroma, GoToSocial, Akkoma, Firefish</span>
         </label>
         <div class="cpub-federated-input-group">
           <input

package/pages/auth/register.vue

@@ -2,7 +2,7 @@
 definePageMeta({ layout: 'auth' });
 
 useSeoMeta({
-  title: `Register — ${useSiteName()}`,
+  title: `Register, ${useSiteName()}`,
   description: 'Create your CommonPub account.',
 });
 

package/pages/auth/reset-password.vue

@@ -2,7 +2,7 @@
 definePageMeta({ layout: 'auth' });
 
 useSeoMeta({
-  title: `Reset Password — ${useSiteName()}`,
+  title: `Reset Password, ${useSiteName()}`,
   description: 'Set a new password for your CommonPub account.',
 });
 

package/pages/auth/verify-email.vue

@@ -2,7 +2,7 @@
 definePageMeta({ layout: 'auth' });
 
 useSeoMeta({
-  title: `Verify Email — ${useSiteName()}`,
+  title: `Verify Email, ${useSiteName()}`,
   description: 'Verify your CommonPub email address.',
 });
 

package/pages/cert/[code].vue

@@ -5,7 +5,7 @@ const code = route.params.code as string;
 const { data: certData } = useLazyFetch(`/api/cert/${code}`);
 
 useSeoMeta({
-  title: () => certData.value ? `Certificate — ${certData.value.path.title} — ${useSiteName()}` : `Certificate — ${useSiteName()}`,
+  title: () => certData.value ? `Certificate, ${certData.value.path.title}, ${useSiteName()}` : `Certificate, ${useSiteName()}`,
   description: () => certData.value ? `Certificate of completion for ${certData.value.path.title}` : '',
 });
 </script>

package/pages/contests/[slug]/edit.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { ContestStage } from '@commonpub/schema';
+import type { Serialized, ContestEntryItem } from '@commonpub/server';
 
 definePageMeta({ middleware: 'auth' });
 
@@ -11,7 +12,7 @@ const { user, isAdmin } = useAuth();
 
 const { data: contest, refresh } = useLazyFetch(`/api/contests/${slug}`);
 const isOwner = computed(() => isAdmin.value || !!(user.value?.id && contest.value?.createdById === user.value.id));
-useSeoMeta({ title: () => `Edit: ${contest.value?.title ?? 'Contest'} — ${useSiteName()}` });
+useSeoMeta({ title: () => `Edit: ${contest.value?.title ?? 'Contest'}, ${useSiteName()}` });
 
 const saving = ref(false);
 const title = ref('');
@@ -226,6 +227,35 @@ const statusAction = contestStatusAction;
 // Phase B2 — advancement cuts. Operates on the PERSISTED stages (contest.value),
 // not the editable `stages` ref, since it acts on real entries.
 const reviewStages = computed(() => (contest.value?.stages ?? []).filter((s) => s.kind === 'review'));
+
+// Entries (the cohort) — for the manual advancement picker. The eligible set is
+// everyone not already eliminated by a prior round's cut.
+const { data: entriesData, refresh: refreshEntries } = useLazyFetch<{ items: Serialized<ContestEntryItem>[] }>(`/api/contests/${slug}/entries`);
+const eligibleEntries = computed(() => (entriesData.value?.items ?? []).filter((e) => !e.eliminated));
+const advanceMode = ref<Record<string, 'topN' | 'manual'>>({});
+const manualPick = ref<Record<string, string[]>>({});
+function toggleManual(stageId: string, entryId: string): void {
+  const cur = manualPick.value[stageId] ?? [];
+  manualPick.value[stageId] = cur.includes(entryId) ? cur.filter((x) => x !== entryId) : [...cur, entryId];
+}
+async function advanceStageManual(stageId: string): Promise<void> {
+  const ids = manualPick.value[stageId] ?? [];
+  if (!ids.length) { toast.error('Select at least one entry to advance.'); return; }
+  if (!confirm(`Advance the ${ids.length} selected ${ids.length === 1 ? 'entry' : 'entries'}? The rest of the cohort is marked "not advanced" and drops out of later judging + final results.`)) return;
+  advancing.value = stageId;
+  try {
+    const r = await $fetch<{ advancedCount: number; eliminatedCount: number }>(`/api/contests/${slug}/advance`, {
+      method: 'POST',
+      body: { reviewStageId: stageId, mode: 'manual', advancedEntryIds: ids },
+    });
+    toast.success(`${r.advancedCount} advanced, ${r.eliminatedCount} not advanced.`);
+    await Promise.all([refresh(), refreshEntries()]);
+  } catch (err: unknown) {
+    toast.error(extractError(err));
+  } finally {
+    advancing.value = null;
+  }
+}
 async function advanceStage(stageId: string): Promise<void> {
   const topN = advanceN.value[stageId];
   if (!topN || topN < 1) { toast.error('Enter how many entries advance.'); return; }
@@ -237,7 +267,7 @@ async function advanceStage(stageId: string): Promise<void> {
       body: { reviewStageId: stageId, mode: 'topN', topN },
     });
     toast.success(`${r.advancedCount} advanced, ${r.eliminatedCount} not advanced.`);
-    await refresh();
+    await Promise.all([refresh(), refreshEntries()]);
   } catch (err: unknown) {
     toast.error(extractError(err));
   } finally {
@@ -284,7 +314,7 @@ async function transitionStatus(newStatus: string): Promise<void> {
         <div class="cpub-form-field">
           <label class="cpub-form-label">URL Slug</label>
           <input v-model="slugInput" type="text" class="cpub-form-input" @blur="slugInput = slugify(slugInput)" />
-          <p class="cpub-form-hint">The contest URL: <code>/contests/{{ slugify(slugInput) || 'your-contest' }}</code>. Changing it breaks old links — they won't redirect.</p>
+          <p class="cpub-form-hint">The contest URL: <code>/contests/{{ slugify(slugInput) || 'your-contest' }}</code>. Changing it breaks old links, they won't redirect.</p>
         </div>
         <div class="cpub-form-field">
           <label class="cpub-form-label">Subheading</label>
@@ -330,7 +360,8 @@ async function transitionStatus(newStatus: string): Promise<void> {
 
       <section class="cpub-form-section">
         <h2 class="cpub-form-section-title">Stages</h2>
-        <p class="cpub-form-hint">Optional. The standard flow (Submissions → Judging → Results) is derived from the schedule above. Add custom stages for multi-round contests — proposal rounds, a Top-N selection, a build sprint, multiple judging rounds, or a showcase event.</p>
+        <p class="cpub-form-hint">Optional. The standard flow (Submissions → Judging → Results) is derived from the schedule above. Add custom stages for multi-round contests, proposal rounds, a Top-N selection, a build sprint, multiple judging rounds, or a showcase event.</p>
+        <p class="cpub-form-hint">How the pieces fit: <strong>Stages</strong> are the public timeline entrants see. The <strong>Status</strong> control (right) is what's actually open right now (accepting entries / judging / completed). <strong>Advancement</strong> (below) runs each review round's Top-N cut. Mark a stage <strong>Current</strong> to point judges + the countdown at it.</p>
         <ContestStagesEditor
           v-model="stages"
           v-model:current-stage-id="currentStageIdRef"
@@ -343,15 +374,36 @@ async function transitionStatus(newStatus: string): Promise<void> {
       <section v-if="reviewStages.length" class="cpub-form-section">
         <h2 class="cpub-form-section-title">Advancement</h2>
         <p class="cpub-form-hint">Multi-round contests: after judging a review stage, advance the top entries to the next stage. Entries below the cut are marked "not advanced" and excluded from later judging + final results. Re-running re-computes the cut. (Save any stage changes above first.)</p>
-        <div v-for="rs in reviewStages" :key="rs.id" class="cpub-advance-row">
-          <span class="cpub-advance-name"><i class="fa-solid fa-gavel"></i> {{ rs.name }}</span>
-          <div class="cpub-advance-ctl">
+        <div v-for="rs in reviewStages" :key="rs.id" class="cpub-advance-block">
+          <div class="cpub-advance-row">
+            <span class="cpub-advance-name"><i class="fa-solid fa-gavel"></i> {{ rs.name }}</span>
+            <div class="cpub-advance-mode">
+              <label class="cpub-form-check"><input type="radio" :name="`mode-${rs.id}`" :checked="(advanceMode[rs.id] ?? 'topN') === 'topN'" @change="advanceMode[rs.id] = 'topN'" /> <span>Top N</span></label>
+              <label class="cpub-form-check"><input type="radio" :name="`mode-${rs.id}`" :checked="advanceMode[rs.id] === 'manual'" @change="advanceMode[rs.id] = 'manual'" /> <span>Pick manually</span></label>
+            </div>
+          </div>
+
+          <div v-if="(advanceMode[rs.id] ?? 'topN') === 'topN'" class="cpub-advance-ctl">
             <label class="cpub-form-label" :for="`adv-${rs.id}`">Advance top</label>
             <input :id="`adv-${rs.id}`" v-model.number="advanceN[rs.id]" type="number" min="1" class="cpub-form-input cpub-advance-n" placeholder="50" />
             <button type="button" class="cpub-btn cpub-btn-sm" :disabled="advancing === rs.id" @click="advanceStage(rs.id)">
               <i class="fa-solid fa-arrow-up-right-dots"></i> {{ advancing === rs.id ? 'Advancing…' : 'Advance' }}
             </button>
           </div>
+
+          <div v-else class="cpub-advance-manual">
+            <p v-if="!eligibleEntries.length" class="cpub-form-hint" style="margin: 0;">No entries in the current cohort to pick from yet.</p>
+            <template v-else>
+              <label v-for="e in eligibleEntries" :key="e.id" class="cpub-advance-pick">
+                <input type="checkbox" :checked="(manualPick[rs.id] ?? []).includes(e.id)" @change="toggleManual(rs.id, e.id)" />
+                <span class="cpub-advance-pick-title">{{ e.contentTitle }}</span>
+                <span v-if="e.score != null" class="cpub-advance-pick-score">{{ e.score }}</span>
+              </label>
+              <button type="button" class="cpub-btn cpub-btn-sm" :disabled="advancing === rs.id || !(manualPick[rs.id] ?? []).length" @click="advanceStageManual(rs.id)">
+                <i class="fa-solid fa-arrow-up-right-dots"></i> {{ advancing === rs.id ? 'Advancing…' : `Advance ${(manualPick[rs.id] ?? []).length} selected` }}
+              </button>
+            </template>
+          </div>
         </div>
       </section>
 
@@ -361,8 +413,8 @@ async function transitionStatus(newStatus: string): Promise<void> {
           <input v-model="showPrizes" type="checkbox" />
           <span>Show the Prizes tab on the contest page</span>
         </label>
-        <p v-if="!showPrizes" class="cpub-form-hint">The Prizes tab is hidden — any prizes below are saved but not shown to visitors.</p>
-        <p class="cpub-form-hint">Every field is optional. Use <strong>place</strong> for ranked prizes, a <strong>category</strong> for themed awards, or just a <strong>description</strong> — whatever fits. Cash value is optional.</p>
+        <p v-if="!showPrizes" class="cpub-form-hint">The Prizes tab is hidden, any prizes below are saved but not shown to visitors.</p>
+        <p class="cpub-form-hint">Every field is optional. Use <strong>place</strong> for ranked prizes, a <strong>category</strong> for themed awards, or just a <strong>description</strong>, whatever fits. Cash value is optional.</p>
         <div class="cpub-form-field">
           <label class="cpub-form-label">Prizes overview (optional)</label>
           <textarea v-model="prizesDescription" class="cpub-form-textarea" rows="3" placeholder="Intro shown above the prize cards. Supports Markdown." />
@@ -406,9 +458,9 @@ async function transitionStatus(newStatus: string): Promise<void> {
         <div class="cpub-form-field">
           <label class="cpub-form-label">Score Visibility</label>
           <select v-model="judgingVisibility" class="cpub-form-input">
-            <option value="judges-only">Judges only — scores hidden until results</option>
-            <option value="public">Public — show scores during judging</option>
-            <option value="private">Private — scores stay with organizers</option>
+            <option value="judges-only">Judges only, scores hidden until results</option>
+            <option value="public">Public, show scores during judging</option>
+            <option value="private">Private, scores stay with organizers</option>
           </select>
         </div>
         <label class="cpub-form-check">
@@ -444,9 +496,9 @@ async function transitionStatus(newStatus: string): Promise<void> {
         <div class="cpub-form-field">
           <label class="cpub-form-label">Who can see this contest</label>
           <select v-model="visibility" class="cpub-form-input">
-            <option value="public">Public — listed and visible to everyone</option>
-            <option value="unlisted">Unlisted — visible by direct link, hidden from listings</option>
-            <option value="private">Private — restricted</option>
+            <option value="public">Public, listed and visible to everyone</option>
+            <option value="unlisted">Unlisted, visible by direct link, hidden from listings</option>
+            <option value="private">Private, restricted</option>
           </select>
         </div>
         <div v-if="visibility === 'private'" class="cpub-form-field">
@@ -461,7 +513,7 @@ async function transitionStatus(newStatus: string): Promise<void> {
         <div class="cpub-subhead">
           <h3 class="cpub-form-subtitle">Reviewers</h3>
         </div>
-        <p class="cpub-form-hint">Reviewers can view this contest (even while it's private or in draft) without being a judge or an admin — view access scoped to this contest only. They can't edit or score entries.</p>
+        <p class="cpub-form-hint">Reviewers can view this contest (even while it's private or in draft) without being a judge or an admin, view access scoped to this contest only. They can't edit or score entries.</p>
         <ContestStakeholderManager :contest-slug="slug" />
       </section>
 
@@ -637,13 +689,20 @@ async function transitionStatus(newStatus: string): Promise<void> {
   border-top: 2px solid var(--border);
   box-shadow: var(--shadow-lg);
 }
-.cpub-advance-row { display: flex; align-items: center; justify-content: space-between; gap: 12px; flex-wrap: wrap; padding: 10px 0; border-top: var(--border-width-default) solid var(--border); }
-.cpub-advance-row:first-of-type { border-top: 0; }
+.cpub-advance-block { padding: 12px 0; border-top: var(--border-width-default) solid var(--border); }
+.cpub-advance-block:first-of-type { border-top: 0; }
+.cpub-advance-row { display: flex; align-items: center; justify-content: space-between; gap: 12px; flex-wrap: wrap; }
 .cpub-advance-name { font-size: 13px; font-weight: 600; display: inline-flex; align-items: center; gap: 8px; }
 .cpub-advance-name i { color: var(--accent); font-size: 11px; }
-.cpub-advance-ctl { display: inline-flex; align-items: center; gap: 8px; }
+.cpub-advance-mode { display: inline-flex; gap: 12px; }
+.cpub-advance-ctl { display: inline-flex; align-items: center; gap: 8px; margin-top: 10px; }
 .cpub-advance-ctl .cpub-form-label { margin: 0; }
 .cpub-advance-n { width: 80px; }
+.cpub-advance-manual { margin-top: 10px; display: flex; flex-direction: column; gap: 4px; }
+.cpub-advance-pick { display: flex; align-items: center; gap: 8px; font-size: 12px; color: var(--text-dim); padding: 4px 8px; border: var(--border-width-default) solid var(--border); background: var(--surface2); cursor: pointer; }
+.cpub-advance-pick-title { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.cpub-advance-pick-score { font-family: var(--font-mono); font-size: 11px; color: var(--accent); flex-shrink: 0; }
+.cpub-advance-manual .cpub-btn { align-self: flex-start; margin-top: 6px; }
 .cpub-edit-actionbar-status { font-size: 11px; font-family: var(--font-mono); text-transform: uppercase; letter-spacing: .06em; color: var(--text-faint); display: flex; align-items: center; gap: 8px; }
 .cpub-edit-actionbar-btns { display: flex; align-items: center; gap: 8px; }
 

package/pages/contests/[slug]/index.vue

@@ -12,8 +12,8 @@ const { data: apiEntriesData, refresh: refreshEntries } = useLazyFetch<{ items:
 const { data: judgesData, refresh: refreshJudges } = useLazyFetch<ContestJudgeItem[]>(`/api/contests/${slug}/judges`);
 
 useSeoMeta({
-  title: () => `${contest.value?.title || 'Contest'} — ${useSiteName()}`,
-  ogTitle: () => `${contest.value?.title || 'Contest'} — ${useSiteName()}`,
+  title: () => `${contest.value?.title || 'Contest'}, ${useSiteName()}`,
+  ogTitle: () => `${contest.value?.title || 'Contest'}, ${useSiteName()}`,
   ogImage: () => contest.value?.bannerUrl || '/og-default.png',
 });
 
@@ -43,8 +43,8 @@ const participants = computed<Participant[]>(() => {
 // Visibility banner shown to those who can see a non-public contest.
 const visibilityNote = computed(() => {
   if (!c.value || c.value.visibility === 'public') return null;
-  if (c.value.visibility === 'unlisted') return { icon: 'fa-link', text: 'Unlisted — visible by direct link only, hidden from listings.' };
-  return { icon: 'fa-lock', text: 'Private — visible only to you, reviewers, judges, and allowed roles.' };
+  if (c.value.visibility === 'unlisted') return { icon: 'fa-link', text: 'Unlisted, visible by direct link only, hidden from listings.' };
+  return { icon: 'fa-lock', text: 'Private, visible only to you, reviewers, judges, and allowed roles.' };
 });
 
 // Tabs ----------------------------------------------------------------------
@@ -199,7 +199,7 @@ async function withdrawEntry(entryId: string): Promise<void> {
         </div>
         <div class="cpub-submit-body">
           <p class="cpub-submit-hint">
-            Pick one of your published projects to enter — or start a new one.
+            Pick one of your published projects to enter, or start a new one.
             <template v-if="eligibleTypes.length"> This contest accepts: {{ eligibleTypes.join(', ') }}.</template>
           </p>
           <div class="cpub-submit-gallery" role="radiogroup" aria-label="Select a project to submit">
@@ -230,7 +230,7 @@ async function withdrawEntry(entryId: string): Promise<void> {
             </button>
           </div>
           <p v-if="submittableContent.length === 0" class="cpub-submit-hint" style="margin-top: 10px; margin-bottom: 0;">
-            No eligible published content yet — use “Create a new {{ newProjectType }}” above to start one.
+            No eligible published content yet, use “Create a new {{ newProjectType }}” above to start one.
           </p>
         </div>
         <div class="cpub-submit-footer">
@@ -311,7 +311,7 @@ async function withdrawEntry(entryId: string): Promise<void> {
             <div v-if="c?.status === 'active'" class="cpub-entries-cta">
               <div class="cpub-entries-cta-text">
                 <p class="cpub-entries-cta-title"><i class="fa-solid fa-trophy"></i> Enter this contest</p>
-                <p class="cpub-entries-cta-sub">Submit one of your published projects — or start a new one.</p>
+                <p class="cpub-entries-cta-sub">Submit one of your published projects, or start a new one.</p>
               </div>
               <button v-if="isAuthenticated" class="cpub-btn cpub-btn-primary cpub-btn-lg" @click="showSubmitDialog = true">
                 <i class="fa-solid fa-upload"></i> Submit Entry

package/pages/contests/[slug]/judge.vue

@@ -25,6 +25,18 @@ const currentReviewStage = computed(() => {
   return st && st.kind === 'review' ? st : null;
 });
 
+// The current review round's id — mirrors the server's per-round tagging exactly
+// (normalizeStages-aware, so classic contests resolve to the synthesized core-review).
+// Used to pre-fill ONLY this round's score, so a judge entering round 2 doesn't see
+// their round-1 score.
+const currentRoundId = computed<string | null>(() => {
+  const c = contest.value;
+  if (!c) return null;
+  const cid = currentStageId(c);
+  const st = normalizeStages(c).find((s) => s.id === cid);
+  return st && st.kind === 'review' ? st.id : null;
+});
+
 // Judging rubric: per-round criteria if the current review stage defines them,
 // else the contest-level rubric. Judges score each criterion (0..max); the overall
 // is the normalized weighted sum (computed server-side).
@@ -38,7 +50,7 @@ function critMax(i: number): number {
   return typeof w === 'number' && w > 0 ? w : 100;
 }
 
-useSeoMeta({ title: () => `Judge: ${contest.value?.title || 'Contest'} — ${useSiteName()}` });
+useSeoMeta({ title: () => `Judge: ${contest.value?.title || 'Contest'}, ${useSiteName()}` });
 
 // Judge authorization derives from the contest_judges table.
 const myJudge = computed(() => (judgesData.value ?? []).find((j) => j.userId === user.value?.id) ?? null);
@@ -66,7 +78,7 @@ const entryList = computed(() => {
   // surviving cohort (eliminated entries drop out of later rounds).
   const items = (entriesData.value?.items ?? []).filter((e) => !e.eliminated);
   return items.map((entry) => {
-    const myScore = entry.judgeScores?.find((s) => s.judgeId === user.value?.id);
+    const myScore = entry.judgeScores?.find((s) => s.judgeId === user.value?.id && (s.roundId ?? null) === currentRoundId.value);
     return {
       id: entry.id,
       contentId: entry.contentId,
@@ -158,7 +170,7 @@ async function submitScore(entryId: string): Promise<void> {
     await $fetch(`/api/contests/${slug}/judge`, { method: 'POST', body });
     success.value = 'Score submitted for entry.';
     await refreshEntries().catch(() => {
-      success.value = 'Score saved — refresh to see the updated totals.';
+      success.value = 'Score saved, refresh to see the updated totals.';
     });
   } catch (err: unknown) {
     error.value = (err as { data?: { message?: string } })?.data?.message || 'Failed to submit score.';

package/pages/contests/[slug]/results.vue

@@ -16,7 +16,7 @@ const shownEntries = computed(() => rankedEntries.value.length);
 const { data: votesData } = useLazyFetch<ContestEntryVoteInfo[]>(`/api/contests/${slug}/votes`);
 
 useSeoMeta({
-  title: () => `Results: ${contest.value?.title || 'Contest'} — ${useSiteName()}`,
+  title: () => `Results: ${contest.value?.title || 'Contest'}, ${useSiteName()}`,
 });
 
 // Community-vote tallies (only when the contest enabled community voting).
@@ -78,7 +78,7 @@ function medalColor(rank: number): string {
       </NuxtLink>
       <h1 class="cpub-results-title">
         <i class="fa-solid fa-ranking-star" style="color: var(--yellow);"></i>
-        {{ contest?.title || 'Contest' }} — Results
+        {{ contest?.title || 'Contest' }}, Results
       </h1>
     </header>
 
@@ -115,7 +115,7 @@ function medalColor(rank: number): string {
           </div>
           <NuxtLink :to="`/u/${entry.authorUsername}/${entry.contentType}/${entry.contentSlug}`" class="cpub-podium-title">{{ entry.contentTitle }}</NuxtLink>
           <NuxtLink :to="`/u/${entry.authorUsername}`" class="cpub-podium-author">{{ entry.authorName }}</NuxtLink>
-          <div class="cpub-podium-score">Score: {{ entry.score ?? '—' }}</div>
+          <div class="cpub-podium-score">Score: {{ entry.score ?? '-' }}</div>
           <template v-if="entry.rank && prizeForRank(entry.rank)">
             <div class="cpub-podium-prize">
               <i class="fa-solid fa-gift"></i> {{ prizeForRank(entry.rank)?.title }}
@@ -151,7 +151,7 @@ function medalColor(rank: number): string {
                 <span v-if="entry.rank && entry.rank <= 3" :style="{ color: medalColor(entry.rank) }">
                   <i class="fa-solid" :class="medalIcon(entry.rank)"></i>
                 </span>
-                {{ entry.rank ?? '—' }}
+                {{ entry.rank ?? '-' }}
               </td>
               <td>
                 <NuxtLink :to="`/u/${entry.authorUsername}/${entry.contentType}/${entry.contentSlug}`" class="cpub-lb-entry-link">{{ entry.contentTitle }}</NuxtLink>
@@ -159,7 +159,7 @@ function medalColor(rank: number): string {
               <td>
                 <NuxtLink :to="`/u/${entry.authorUsername}`" class="cpub-lb-author-link">{{ entry.authorName }}</NuxtLink>
               </td>
-              <td class="cpub-lb-score">{{ entry.score ?? '—' }}</td>
+              <td class="cpub-lb-score">{{ entry.score ?? '-' }}</td>
               <td v-if="votingEnabled" class="cpub-lb-votes"><i class="fa-solid fa-heart"></i> {{ voteCount(entry.id) }}</td>
             </tr>
           </tbody>

package/pages/contests/create.vue

@@ -3,7 +3,7 @@ import type { ContestStage } from '@commonpub/schema';
 
 definePageMeta({ middleware: 'auth' });
 
-useSeoMeta({ title: `Create Contest — ${useSiteName()}` });
+useSeoMeta({ title: `Create Contest, ${useSiteName()}` });
 
 const toast = useToast();
 const { extract: extractError } = useApiError();
@@ -187,12 +187,12 @@ function prizeLabel(prize: Prize): string {
         </div>
         <div class="cpub-form-field">
           <label for="contest-desc" class="cpub-form-label">Description</label>
-          <textarea id="contest-desc" v-model="description" class="cpub-form-textarea" rows="4" placeholder="Describe your contest. Supports Markdown — # headings, - lists, **bold**, [links](url)…" />
+          <textarea id="contest-desc" v-model="description" class="cpub-form-textarea" rows="4" placeholder="Describe your contest. Supports Markdown, # headings, - lists, **bold**, [links](url)…" />
           <p class="cpub-form-hint">Supports Markdown (headings, lists, bold, links) and inline HTML. Shown formatted on the contest page.</p>
         </div>
         <div class="cpub-form-field">
           <label for="contest-rules" class="cpub-form-label">Rules</label>
-          <textarea id="contest-rules" v-model="rules" class="cpub-form-textarea" rows="6" placeholder="Contest rules and requirements. Supports Markdown — one rule per line, or full Markdown." />
+          <textarea id="contest-rules" v-model="rules" class="cpub-form-textarea" rows="6" placeholder="Contest rules and requirements. Supports Markdown, one rule per line, or full Markdown." />
           <p class="cpub-form-hint">Supports Markdown. Plain one-rule-per-line text is rendered as a numbered list.</p>
         </div>
         <div class="cpub-form-field">
@@ -225,8 +225,8 @@ function prizeLabel(prize: Prize): string {
 
       <!-- Stages -->
       <section class="cpub-form-section">
-        <h2 class="cpub-form-section-title">Stages <span style="color: var(--text-faint); font-weight: 400; font-size: 0.75em; font-family: var(--font-mono);">— optional</span></h2>
-        <p class="cpub-form-hint">The standard flow (Submissions → Judging → Results) is derived from the schedule above. Add custom stages for multi-round contests — proposal rounds, a Top-N selection, a build sprint, multiple judging rounds, or a showcase event.</p>
+        <h2 class="cpub-form-section-title">Stages <span style="color: var(--text-faint); font-weight: 400; font-size: 0.75em; font-family: var(--font-mono);">- optional</span></h2>
+        <p class="cpub-form-hint">The standard flow (Submissions → Judging → Results) is derived from the schedule above. Add custom stages for multi-round contests, proposal rounds, a Top-N selection, a build sprint, multiple judging rounds, or a showcase event.</p>
         <ContestStagesEditor
           v-model="stages"
           v-model:current-stage-id="currentStageIdRef"
@@ -242,9 +242,9 @@ function prizeLabel(prize: Prize): string {
         <div class="cpub-form-field">
           <label for="visibility" class="cpub-form-label">Who can see this contest</label>
           <select id="visibility" v-model="visibility" class="cpub-form-input">
-            <option value="public">Public — listed and visible to everyone</option>
-            <option value="unlisted">Unlisted — visible by direct link, hidden from listings</option>
-            <option value="private">Private — restricted (you can publish it later)</option>
+            <option value="public">Public, listed and visible to everyone</option>
+            <option value="unlisted">Unlisted, visible by direct link, hidden from listings</option>
+            <option value="private">Private, restricted (you can publish it later)</option>
           </select>
         </div>
         <div v-if="visibility === 'private'" class="cpub-form-field">
@@ -285,9 +285,9 @@ function prizeLabel(prize: Prize): string {
         <div class="cpub-form-field">
           <label for="judging-visibility" class="cpub-form-label">Score Visibility</label>
           <select id="judging-visibility" v-model="judgingVisibility" class="cpub-form-input">
-            <option value="judges-only">Judges only — scores hidden until results</option>
-            <option value="public">Public — show scores during judging</option>
-            <option value="private">Private — scores stay with organizers</option>
+            <option value="judges-only">Judges only, scores hidden until results</option>
+            <option value="public">Public, show scores during judging</option>
+            <option value="private">Private, scores stay with organizers</option>
           </select>
         </div>
         <label class="cpub-form-check">
@@ -299,7 +299,7 @@ function prizeLabel(prize: Prize): string {
           <h3 class="cpub-form-subtitle">Judging Criteria <span v-if="criteriaTotal" class="cpub-form-hint-inline">{{ criteriaTotal }} pts</span></h3>
           <button type="button" class="cpub-btn cpub-btn-sm" @click="addCriterion"><i class="fa-solid fa-plus"></i> Add Criterion</button>
         </div>
-        <p v-if="!criteria.length" class="cpub-form-hint">Optional rubric shown to entrants and judges (e.g. Documentation — 20 pts).</p>
+        <p v-if="!criteria.length" class="cpub-form-hint">Optional rubric shown to entrants and judges (e.g. Documentation, 20 pts).</p>
         <div v-for="(crit, ci) in criteria" :key="ci" class="cpub-criterion-row">
           <div class="cpub-form-row">
             <div class="cpub-form-field" style="flex: 3">
@@ -321,7 +321,7 @@ function prizeLabel(prize: Prize): string {
       <!-- Prizes -->
       <section class="cpub-form-section">
         <div class="cpub-form-section-header">
-          <h2 class="cpub-form-section-title">Prizes <span style="color: var(--text-faint); font-weight: 400; font-size: 0.75em; font-family: var(--font-mono);">— optional</span></h2>
+          <h2 class="cpub-form-section-title">Prizes <span style="color: var(--text-faint); font-weight: 400; font-size: 0.75em; font-family: var(--font-mono);">- optional</span></h2>
           <button type="button" class="cpub-btn cpub-btn-sm" @click="addPrize">
             <i class="fa-solid fa-plus"></i> Add Prize
           </button>
@@ -331,9 +331,9 @@ function prizeLabel(prize: Prize): string {
           <input v-model="showPrizes" type="checkbox" />
           <span>Show the Prizes tab on the contest page</span>
         </label>
-        <p v-if="!showPrizes" class="cpub-form-hint">The Prizes tab is hidden — any prizes below are saved but not shown to visitors.</p>
+        <p v-if="!showPrizes" class="cpub-form-hint">The Prizes tab is hidden, any prizes below are saved but not shown to visitors.</p>
 
-        <p class="cpub-form-hint">Contests don't need prizes — leave this empty to skip them entirely. If you do add prizes, every field is optional: use <strong>place</strong> for ranked prizes (1st/2nd/3rd), a <strong>category</strong> for themed awards (e.g. "Best in Show"), or just a <strong>description</strong>. Cash value is optional.</p>
+        <p class="cpub-form-hint">Contests don't need prizes, leave this empty to skip them entirely. If you do add prizes, every field is optional: use <strong>place</strong> for ranked prizes (1st/2nd/3rd), a <strong>category</strong> for themed awards (e.g. "Best in Show"), or just a <strong>description</strong>. Cash value is optional.</p>
         <div class="cpub-form-field">
           <label for="prizes-desc" class="cpub-form-label">Prizes overview (optional)</label>
           <textarea id="prizes-desc" v-model="prizesDescription" class="cpub-form-textarea" rows="3" placeholder="Intro shown above the prize cards. Supports Markdown." />

package/pages/contests/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-useSeoMeta({ title: `Contests — ${useSiteName()}` });
+useSeoMeta({ title: `Contests, ${useSiteName()}` });
 
 const { data: contests } = await useFetch('/api/contests');
 const { isAuthenticated, isAdmin, user } = useAuth();
@@ -23,7 +23,7 @@ function coverFor(url: string | null | undefined): string | null {
     if (siteDomain && !url.includes(siteDomain)) {
       return `/api/image-proxy?url=${encodeURIComponent(url)}&w=600`;
     }
-  } catch { /* invalid URL — use as-is */ }
+  } catch { /* invalid URL, use as-is */ }
   return url;
 }
 

package/pages/cookies.vue

@@ -2,7 +2,7 @@
 const runtimeConfig = useRuntimeConfig();
 const siteName = computed(() => (runtimeConfig.public.siteName as string) || 'CommonPub');
 
-useSeoMeta({ title: `Cookie Policy — ${siteName.value}` });
+useSeoMeta({ title: `Cookie Policy, ${siteName.value}` });
 
 const { cookies, consentLevel, acceptAll, acceptEssential, resetConsent, hasConsented } = useCookieConsent();
 

package/pages/create.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { ContentType } from '@commonpub/server';
 
-useSeoMeta({ title: `Create — ${useSiteName()}` });
+useSeoMeta({ title: `Create, ${useSiteName()}` });
 definePageMeta({ middleware: 'auth' });
 
 const { isTypeEnabled } = useContentTypes();
@@ -27,7 +27,7 @@ const allTypes = [
     bg: 'var(--pink-bg)',
     border: 'var(--pink-border)',
     name: 'Blog',
-    desc: 'Write long-form content — articles, tutorials, deep dives, opinion pieces, or personal updates with rich formatting.',
+    desc: 'Write long-form content, articles, tutorials, deep dives, opinion pieces, or personal updates with rich formatting.',
   },
   {
     type: 'explainer',

package/pages/dashboard.vue

@@ -2,7 +2,7 @@
 definePageMeta({ middleware: 'auth' });
 
 useSeoMeta({
-  title: `Dashboard — ${useSiteName()}`,
+  title: `Dashboard, ${useSiteName()}`,
   description: 'Your personal CommonPub dashboard.',
 });
 

package/pages/docs/[siteSlug]/[...pagePath].vue

@@ -208,7 +208,7 @@ watch(selectedVersion, () => {
 const sidebarOpen = ref(false);
 
 useSeoMeta({
-  title: () => renderedPage.value ? `${renderedPage.value.title} — ${site.value?.name ?? 'Docs'}` : `Docs — ${useSiteName()}`,
+  title: () => renderedPage.value ? `${renderedPage.value.title}, ${site.value?.name ?? 'Docs'}` : `Docs, ${useSiteName()}`,
   description: () => renderedPage.value?.frontmatter?.description ?? '',
 });
 </script>