@commonpub/layer 0.26.0 → 0.27.0

package/components/contest/ContestJudgeManager.vue

@@ -113,7 +113,7 @@ const roleLabels: Record<string, string> = {
             placeholder="Search by name or username..."
             @input="handleSearch"
           />
-          <select v-model="newJudgeRole" class="cpub-judges-input cpub-judges-select">
+          <select v-model="newJudgeRole" class="cpub-judges-input cpub-judges-select" aria-label="Judge role">
             <option value="lead">Lead</option>
             <option value="judge">Judge</option>
             <option value="guest">Guest</option>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonpub/layer",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "type": "module",
   "main": "./nuxt.config.ts",
   "files": [
@@ -53,16 +53,16 @@
     "vue": "^3.4.0",
     "vue-router": "^4.3.0",
     "zod": "^4.3.6",
+    "@commonpub/config": "0.15.0",
     "@commonpub/auth": "0.6.0",
     "@commonpub/docs": "0.6.3",
     "@commonpub/editor": "0.7.11",
+    "@commonpub/explainer": "0.7.15",
     "@commonpub/learning": "0.5.2",
     "@commonpub/protocol": "0.12.0",
-    "@commonpub/explainer": "0.7.15",
+    "@commonpub/server": "2.61.0",
     "@commonpub/ui": "0.9.1",
-    "@commonpub/schema": "0.19.0",
-    "@commonpub/server": "2.60.0",
-    "@commonpub/config": "0.15.0"
+    "@commonpub/schema": "0.20.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",

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

@@ -22,6 +22,15 @@ const judgingEndDate = ref('');
 const communityVotingEnabled = ref(false);
 const judgingVisibility = ref<'public' | 'judges-only' | 'private'>('judges-only');
 
+const { enabledTypeMeta } = useContentTypes();
+const eligibleContentTypes = ref<string[]>([]);
+const maxEntriesPerUser = ref<number | null>(null);
+function toggleType(type: string): void {
+  const i = eligibleContentTypes.value.indexOf(type);
+  if (i >= 0) eligibleContentTypes.value.splice(i, 1);
+  else eligibleContentTypes.value.push(type);
+}
+
 interface Prize { place: number | null; category: string; title: string; description: string; value: string }
 const prizes = ref<Prize[]>([]);
 
@@ -40,6 +49,8 @@ watch(contest, (c) => {
   judgingEndDate.value = c.judgingEndDate ? new Date(c.judgingEndDate).toISOString().slice(0, 16) : '';
   communityVotingEnabled.value = !!c.communityVotingEnabled;
   judgingVisibility.value = (c.judgingVisibility as typeof judgingVisibility.value) ?? 'judges-only';
+  eligibleContentTypes.value = [...(c.eligibleContentTypes ?? [])];
+  maxEntriesPerUser.value = c.maxEntriesPerUser ?? null;
   prizes.value = (c.prizes ?? []).map((p: { place?: number; category?: string; title: string; description?: string; value?: string }) => ({
     place: p.place ?? null,
     category: p.category ?? '',
@@ -117,6 +128,8 @@ async function handleSave(): Promise<void> {
         judgingEndDate: judgingEndDate.value ? new Date(judgingEndDate.value).toISOString() : undefined,
         communityVotingEnabled: communityVotingEnabled.value,
         judgingVisibility: judgingVisibility.value,
+        eligibleContentTypes: eligibleContentTypes.value,
+        maxEntriesPerUser: maxEntriesPerUser.value && maxEntriesPerUser.value > 0 ? maxEntriesPerUser.value : undefined,
         prizes: prizeData,
         judgingCriteria: criteriaData,
       },
@@ -197,6 +210,24 @@ async function transitionStatus(newStatus: string): Promise<void> {
         <p v-if="dateError" class="cpub-form-error" role="alert">{{ dateError }}</p>
       </section>
 
+      <section class="cpub-form-section">
+        <h2 class="cpub-form-section-title">Entries</h2>
+        <div class="cpub-form-field">
+          <span class="cpub-form-label">Eligible content types</span>
+          <p class="cpub-form-hint">Leave all unchecked to accept any published content the entrant owns.</p>
+          <div class="cpub-type-options" role="group" aria-label="Eligible content types">
+            <label v-for="t in enabledTypeMeta" :key="t.type" class="cpub-form-check">
+              <input type="checkbox" :checked="eligibleContentTypes.includes(t.type)" @change="toggleType(t.type)" />
+              <span>{{ t.label }}</span>
+            </label>
+          </div>
+        </div>
+        <div class="cpub-form-field">
+          <label class="cpub-form-label">Max entries per person</label>
+          <input v-model.number="maxEntriesPerUser" type="number" min="1" class="cpub-form-input" placeholder="Unlimited" style="max-width: 160px;" />
+        </div>
+      </section>
+
       <section class="cpub-form-section">
         <h2 class="cpub-form-section-title">Prizes</h2>
         <div v-for="(prize, i) in prizes" :key="i" class="cpub-prize-row">
@@ -335,6 +366,7 @@ async function transitionStatus(newStatus: string): Promise<void> {
 .cpub-form-error { font-size: 12px; color: var(--red); margin-top: 8px; }
 .cpub-form-check { display: flex; align-items: center; gap: 8px; font-size: 12px; color: var(--text-dim); cursor: pointer; }
 .cpub-form-check input { width: 14px; height: 14px; }
+.cpub-type-options { display: flex; gap: 16px; flex-wrap: wrap; margin-top: 6px; }
 .cpub-subhead { display: flex; align-items: center; justify-content: space-between; margin: 18px 0 10px; }
 .cpub-form-subtitle { font-size: 12px; font-weight: 700; font-family: var(--font-mono); text-transform: uppercase; letter-spacing: .06em; color: var(--text-dim); display: flex; align-items: center; gap: 8px; }
 .cpub-form-hint-inline { font-size: 10px; color: var(--accent); }

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

@@ -100,6 +100,14 @@ const { data: userContent } = useFetch('/api/content', {
 });
 const enteredContentIds = computed(() => new Set(entries.value.map((e) => e.contentId)));
 
+// Restrict the submit picker to the contest's eligible content types (if set).
+const eligibleTypes = computed<string[]>(() => (c.value?.eligibleContentTypes as string[] | undefined) ?? []);
+const submittableContent = computed(() => {
+  const items = (userContent.value?.items ?? []) as Array<{ id: string; title: string; type: string }>;
+  if (eligibleTypes.value.length === 0) return items;
+  return items.filter((i) => eligibleTypes.value.includes(i.type));
+});
+
 function copyLink(): void {
   if (typeof window !== 'undefined' && window.navigator?.clipboard) {
     window.navigator.clipboard.writeText(window.location.href);
@@ -154,11 +162,14 @@ async function withdrawEntry(entryId: string): Promise<void> {
           <button class="cpub-submit-close" aria-label="Close" @click="showSubmitDialog = false"><i class="fa-solid fa-times"></i></button>
         </div>
         <div class="cpub-submit-body">
-          <p class="cpub-submit-hint">Select one of your published projects to submit as an entry.</p>
+          <p class="cpub-submit-hint">
+            Select one of your published projects to submit as an entry.
+            <template v-if="eligibleTypes.length"> This contest accepts: {{ eligibleTypes.join(', ') }}.</template>
+          </p>
           <select v-model="submitContentId" class="cpub-submit-select" aria-label="Select a project to submit">
             <option value="">Select a project...</option>
             <option
-              v-for="item in (userContent?.items ?? [])"
+              v-for="item in submittableContent"
               :key="item.id"
               :value="item.id"
               :disabled="enteredContentIds.has(item.id)"
@@ -166,6 +177,9 @@ async function withdrawEntry(entryId: string): Promise<void> {
               {{ item.title }} ({{ item.type }}){{ enteredContentIds.has(item.id) ? ' — already entered' : '' }}
             </option>
           </select>
+          <p v-if="submittableContent.length === 0" class="cpub-submit-hint" style="margin-top: 10px; margin-bottom: 0;">
+            No eligible published content found.
+          </p>
         </div>
         <div class="cpub-submit-footer">
           <button class="cpub-btn cpub-btn-sm" @click="showSubmitDialog = false">Cancel</button>

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

@@ -105,7 +105,9 @@ async function submitScore(entryId: string): Promise<void> {
       },
     });
     success.value = 'Score submitted for entry.';
-    await refreshEntries();
+    await refreshEntries().catch(() => {
+      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.';
   } finally {

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

@@ -1,16 +1,37 @@
 <script setup lang="ts">
-import type { Serialized, ContestDetail, ContestEntryItem } from '@commonpub/server';
+import type { Serialized, ContestDetail, ContestEntryItem, ContestEntryVoteInfo } from '@commonpub/server';
 
 const route = useRoute();
 const slug = route.params.slug as string;
 
 const { data: contest } = useLazyFetch<Serialized<ContestDetail>>(`/api/contests/${slug}`);
 const { data: entriesData } = useLazyFetch<{ items: Serialized<ContestEntryItem>[]; total: number }>(`/api/contests/${slug}/entries`);
+const { data: votesData } = useLazyFetch<ContestEntryVoteInfo[]>(`/api/contests/${slug}/votes`);
 
 useSeoMeta({
   title: () => `Results: ${contest.value?.title || 'Contest'} — ${useSiteName()}`,
 });
 
+// Community-vote tallies (only when the contest enabled community voting).
+const votingEnabled = computed(() => !!contest.value?.communityVotingEnabled);
+const voteCounts = computed<Map<string, number>>(() => {
+  const m = new Map<string, number>();
+  for (const v of votesData.value ?? []) m.set(v.entryId, v.count);
+  return m;
+});
+function voteCount(entryId: string): number {
+  return voteCounts.value.get(entryId) ?? 0;
+}
+const communityChoice = computed(() => {
+  if (!votingEnabled.value) return null;
+  let best: { id: string; count: number } | null = null;
+  for (const [id, count] of voteCounts.value) {
+    if (count > 0 && (!best || count > best.count)) best = { id, count };
+  }
+  if (!best) return null;
+  return rankedEntries.value.find((e) => e.id === best!.id) ?? null;
+});
+
 const rankedEntries = computed(() => {
   const items = [...(entriesData.value?.items ?? [])];
   items.sort((a, b) => (a.rank ?? 999) - (b.rank ?? 999));
@@ -62,6 +83,13 @@ function medalColor(rank: number): string {
     </div>
 
     <template v-else-if="contest">
+      <!-- COMMUNITY CHOICE -->
+      <div v-if="communityChoice" class="cpub-community-choice">
+        <div class="cpub-cc-label"><i class="fa-solid fa-heart"></i> Community Choice</div>
+        <NuxtLink :to="`/u/${communityChoice.authorUsername}/${communityChoice.contentType}/${communityChoice.contentSlug}`" class="cpub-cc-title">{{ communityChoice.contentTitle }}</NuxtLink>
+        <span class="cpub-cc-meta">by {{ communityChoice.authorName }} · {{ voteCount(communityChoice.id) }} votes</span>
+      </div>
+
       <!-- PODIUM -->
       <div v-if="podium.length > 0" class="cpub-podium">
         <div
@@ -100,6 +128,7 @@ function medalColor(rank: number): string {
               <th>Entry</th>
               <th>Author</th>
               <th>Score</th>
+              <th v-if="votingEnabled">Votes</th>
             </tr>
           </thead>
           <tbody>
@@ -117,6 +146,7 @@ function medalColor(rank: number): string {
                 <NuxtLink :to="`/u/${entry.authorUsername}`" class="cpub-lb-author-link">{{ entry.authorName }}</NuxtLink>
               </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>
         </table>
@@ -166,6 +196,14 @@ function medalColor(rank: number): string {
 .cpub-lb-top3 { background: var(--surface2); }
 .cpub-lb-rank { font-family: var(--font-mono); font-weight: 700; display: flex; align-items: center; gap: 6px; }
 .cpub-lb-score { font-family: var(--font-mono); font-weight: 600; color: var(--accent); }
+.cpub-lb-votes { font-family: var(--font-mono); color: var(--red); }
+.cpub-lb-votes i { font-size: 10px; }
+
+.cpub-community-choice { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; padding: 12px 16px; margin-bottom: 24px; background: var(--red-bg); border: var(--border-width-default) solid var(--red-border); }
+.cpub-cc-label { font-family: var(--font-mono); font-size: 10px; font-weight: 700; text-transform: uppercase; letter-spacing: .08em; color: var(--red); display: flex; align-items: center; gap: 5px; }
+.cpub-cc-title { font-size: 14px; font-weight: 600; color: var(--text); text-decoration: none; }
+.cpub-cc-title:hover { color: var(--accent); }
+.cpub-cc-meta { font-size: 11px; color: var(--text-dim); font-family: var(--font-mono); }
 .cpub-lb-entry-link { color: var(--text); text-decoration: none; font-weight: 500; }
 .cpub-lb-entry-link:hover { color: var(--accent); }
 .cpub-lb-author-link { color: var(--text-dim); text-decoration: none; }

package/pages/contests/create.vue

@@ -17,6 +17,16 @@ const judgingEndDate = ref('');
 const communityVotingEnabled = ref(false);
 const judgingVisibility = ref<'public' | 'judges-only' | 'private'>('judges-only');
 
+// Entry rules
+const { enabledTypeMeta } = useContentTypes();
+const eligibleContentTypes = ref<string[]>([]); // empty = all types allowed
+const maxEntriesPerUser = ref<number | null>(null);
+function toggleType(type: string): void {
+  const i = eligibleContentTypes.value.indexOf(type);
+  if (i >= 0) eligibleContentTypes.value.splice(i, 1);
+  else eligibleContentTypes.value.push(type);
+}
+
 // Prizes
 interface Prize {
   place: number | null;
@@ -78,6 +88,8 @@ async function handleCreate(): Promise<void> {
         judgingEndDate: judgingEndDate.value ? new Date(judgingEndDate.value).toISOString() : undefined,
         communityVotingEnabled: communityVotingEnabled.value,
         judgingVisibility: judgingVisibility.value,
+        eligibleContentTypes: eligibleContentTypes.value.length ? eligibleContentTypes.value : undefined,
+        maxEntriesPerUser: maxEntriesPerUser.value && maxEntriesPerUser.value > 0 ? maxEntriesPerUser.value : undefined,
         prizes: prizes.value
           .filter(p => p.title.trim())
           .map(p => ({
@@ -159,6 +171,25 @@ function prizeLabel(prize: Prize, idx: number): string {
         <p v-if="dateError" class="cpub-form-error" role="alert">{{ dateError }}</p>
       </section>
 
+      <!-- Entry Rules -->
+      <section class="cpub-form-section">
+        <h2 class="cpub-form-section-title">Entries</h2>
+        <div class="cpub-form-field">
+          <span class="cpub-form-label">Eligible content types</span>
+          <p class="cpub-form-hint">Leave all unchecked to accept any published content the entrant owns.</p>
+          <div class="cpub-type-options" role="group" aria-label="Eligible content types">
+            <label v-for="t in enabledTypeMeta" :key="t.type" class="cpub-form-check">
+              <input type="checkbox" :checked="eligibleContentTypes.includes(t.type)" @change="toggleType(t.type)" />
+              <span>{{ t.label }}</span>
+            </label>
+          </div>
+        </div>
+        <div class="cpub-form-field">
+          <label for="max-entries" class="cpub-form-label">Max entries per person</label>
+          <input id="max-entries" v-model.number="maxEntriesPerUser" type="number" min="1" class="cpub-form-input" placeholder="Unlimited" style="max-width: 160px;" />
+        </div>
+      </section>
+
       <!-- Judging -->
       <section class="cpub-form-section">
         <h2 class="cpub-form-section-title">Judging</h2>
@@ -281,6 +312,7 @@ function prizeLabel(prize: Prize, idx: number): string {
 .cpub-form-error { font-size: 12px; color: var(--red); margin-top: 8px; }
 .cpub-form-check { display: flex; align-items: center; gap: 8px; font-size: 12px; color: var(--text-dim); cursor: pointer; margin-top: 4px; }
 .cpub-form-check input { width: 14px; height: 14px; }
+.cpub-type-options { display: flex; gap: 16px; flex-wrap: wrap; margin-top: 6px; }
 .cpub-form-subtitle { font-size: 12px; font-weight: 700; font-family: var(--font-mono); text-transform: uppercase; letter-spacing: .06em; color: var(--text-dim); display: flex; align-items: center; gap: 8px; }
 .cpub-form-hint-inline { font-size: 10px; color: var(--accent); }
 .cpub-form-hint { font-size: 11px; color: var(--text-faint); margin: 8px 0; line-height: 1.5; }

package/server/api/contests/[slug]/entries/[entryId].delete.ts

@@ -8,7 +8,7 @@ export default defineEventHandler(async (event): Promise<{ withdrawn: boolean }>
 
   const result = await withdrawContestEntry(db, entryId, user.id);
   if (!result.withdrawn) {
-    throw createError({ statusCode: 400, message: result.error ?? 'Cannot withdraw entry' });
+    throw createError({ statusCode: 400, statusMessage: result.error ?? 'Cannot withdraw entry' });
   }
   return { withdrawn: true };
 });

package/server/api/contests/[slug]/votes.get.ts

@@ -12,8 +12,9 @@ export default defineEventHandler(async (event): Promise<ContestEntryVoteInfo[]>
   const user = getOptionalUser(event);
 
   const contest = await getContestBySlug(db, slug);
-  if (!contest || contest.status === 'upcoming') throw createError({ statusCode: 404, statusMessage: 'Contest not found' });
-  if (!contest.communityVotingEnabled) return [];
+  if (!contest) throw createError({ statusCode: 404, statusMessage: 'Contest not found' });
+  // Voting disabled, or contest not yet open (no entries) → empty array, not an error.
+  if (!contest.communityVotingEnabled || contest.status === 'upcoming') return [];
 
   return getContestEntryVotes(db, contest.id, user?.id ?? null);
 });

package/server/api/contests/index.post.ts

@@ -1,4 +1,4 @@
-import { createContest } from '@commonpub/server';
+import { createContest, getContestBySlug } from '@commonpub/server';
 import type { ContestDetail, CreateContestInput } from '@commonpub/server';
 import { createContestSchema } from '@commonpub/schema';
 
@@ -9,7 +9,7 @@ function slugify(text: string): string {
     .replace(/\s+/g, '-')
     .replace(/-+/g, '-')
     .replace(/^-|-$/g, '')
-    .slice(0, 128);
+    .slice(0, 120);
 }
 
 export default defineEventHandler(async (event): Promise<ContestDetail> => {
@@ -19,7 +19,13 @@ export default defineEventHandler(async (event): Promise<ContestDetail> => {
   const config = useConfig();
   const input = await parseBody(event, createContestSchema);
 
-  const slug = slugify(input.title) || `contest-${Date.now()}`;
+  const base = slugify(input.title) || `contest-${Date.now()}`;
+  // Ensure slug uniqueness so a duplicate title returns a clean contest instead
+  // of a 500 from the unique-constraint violation.
+  let slug = base;
+  for (let n = 2; n <= 50 && (await getContestBySlug(db, slug)); n++) {
+    slug = `${base}-${n}`;
+  }
 
   return createContest(db, { ...input, slug, createdBy: user.id } as CreateContestInput, {
     userRole: user.role,