astro-theme-popular 0.11.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-theme-popular",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Popular: a warm, community-first Astro theme for meetups, clubs and fan communities. Ships as an Astro integration.",
   "type": "module",
   "license": "MIT",

package/schemas.ts

@@ -49,6 +49,7 @@ const events = defineCollection({
     time: z.string().optional(),
     venue: z.string().optional(),
     venueWanted: z.boolean().default(false),
+    planning: z.boolean().default(false), // "Planning" badge instead of "Confirmed", and no RSVP button
     address: z.string().optional(),
     speaker: z.string().optional(), // one-liner fallback when no speaker profiles are referenced
     speakers: z.array(z.string()).default([]), // slugs of entries in the speakers collection

package/src/components/EventRow.astro

@@ -16,6 +16,10 @@ if (d.venueRef && !venuePage) console.warn(`events/${event.id}: venueRef "${d.ve
 const venueName = venuePage?.data.title ?? d.venue;
 const venueAddress = venuePage?.data.address ?? (venuePage ? undefined : d.address);
 const tbd = d.venueWanted || !venueName;
+/* Planning: the event is on the calendar but its details are not settled.
+   Wins over the venue-wanted badge, which is inferred, and hides the RSVP
+   button even when `rsvp` is already filled in. */
+const planning = d.planning;
 
 /* Speaker line: resolved speaker-profile names, falling back to the string. */
 const allSpeakers = d.speakers.length ? await safeCollection('speakers') : [];
@@ -57,10 +61,12 @@ const day = d.date.toLocaleDateString(SITE.locale, { month: 'short', day: 'numer
   <div class="g-event__aside">
     {d.cancelled
       ? <span class="g-badge g-badge--danger g-badge--soft">{STRINGS.eventCancelled}</span>
+      : planning
+      ? <span class="g-badge g-badge--soft">{STRINGS.eventPlanning}</span>
       : tbd
       ? <span class="g-badge g-badge--warning g-badge--soft">{STRINGS.venueWanted}</span>
       : <span class="g-badge g-badge--success g-badge--soft">{STRINGS.confirmed}</span>}
-    {d.rsvp && (
+    {!planning && d.rsvp && (
       <a class="g-btn g-btn--primary g-btn--sm" href={withBase(d.rsvp)}><i class="fa-solid fa-calendar" aria-hidden="true"></i>{STRINGS.rsvp}</a>
     )}
   </div>

package/src/lib/inline-md.ts

@@ -10,7 +10,7 @@ const escapeHtml = (s: string): string =>
 
 export function inlineMarkdown(src: string): string {
   let s = escapeHtml(src);
-  // [label](http(s)://… | /path) — only http(s) and root-relative targets
+  // [label](http(s)://… | /path): only http(s) and root-relative targets
   s = s.replace(
     /\[([^\]]+)\]\((https?:\/\/[^\s)]+|\/[^\s)]*)\)/g,
     (_m, label, href) =>

package/src/pages/events/[slug].astro

@@ -72,7 +72,7 @@ const eventLd = jsonld(buildEventLd({
           </a>
         </div>
         <span class="g-eyebrow">{dateStr}{d.time && ` · ${d.time}`}</span>
-        <h1 style="margin:.5rem 0 0">{d.title}{d.cancelled && <> <span class="g-badge g-badge--danger" style="vertical-align:middle;font-size:var(--text-sm)">{STRINGS.eventCancelled}</span></>}</h1>
+        <h1 style="margin:.5rem 0 0">{d.title}{d.cancelled ? <> <span class="g-badge g-badge--danger" style="vertical-align:middle;font-size:var(--text-sm)">{STRINGS.eventCancelled}</span></> : d.planning ? <> <span class="g-badge g-badge--soft" style="vertical-align:middle;font-size:var(--text-sm)">{STRINGS.eventPlanning}</span></> : null}</h1>
       </div>
     </header>
     <div class="g-container g-section--sm">
@@ -129,7 +129,8 @@ const eventLd = jsonld(buildEventLd({
         </>
       )}
 
-      {d.rsvp && (
+      {/* An event still being planned takes no RSVPs yet, even with `rsvp` set. */}
+      {!d.planning && d.rsvp && (
         <div class="g-row" style="margin-top:var(--space-4)">
           <a class="g-btn g-btn--primary g-btn--lg" href={withBase(d.rsvp)}><i class="fa-solid fa-calendar" aria-hidden="true"></i> {STRINGS.rsvpExternal}</a>
         </div>

package/src/pages/index.astro

@@ -115,7 +115,7 @@ const orgLd = jsonld(buildOrgLd({
           </div>
           {next.data.description && <p style="margin:0;color:var(--text-muted);max-width:34rem">{next.data.description}</p>}
           <div class="g-row">
-            {next.data.rsvp && <a class="g-btn g-btn--primary" href={withBase(next.data.rsvp)}><i class="fa-solid fa-calendar" aria-hidden="true"></i> {STRINGS.rsvpExternal}</a>}
+            {!next.data.planning && next.data.rsvp && <a class="g-btn g-btn--primary" href={withBase(next.data.rsvp)}><i class="fa-solid fa-calendar" aria-hidden="true"></i> {STRINGS.rsvpExternal}</a>}
             <a class="g-btn g-btn--outline" href={withBase('/events/')}>{STRINGS.allEvents}</a>
           </div>
         </div>