Fixes

Author: dantheli

app/api/invitations/route.ts

@@ -84,10 +84,10 @@ export async function POST(request: NextRequest) {
       return NextResponse.json({ error: "Forbidden" }, { status: 403 });
     }
 
-    const { email, firstName, lastName } = await request.json();
-    if (!email || !firstName || !lastName) {
+    const { email, firstName, lastName, graduated } = await request.json();
+    if (!email || !firstName || !lastName || graduated === undefined) {
       return NextResponse.json(
-        { error: "Email, firstName, and lastName are required" },
+        { error: "Email, firstName, lastName, and graduated are required" },
         { status: 400 },
       );
     }
@@ -109,6 +109,7 @@ export async function POST(request: NextRequest) {
       email,
       firstName,
       lastName,
+      graduated: Boolean(graduated),
       sentAt: Timestamp.now(),
       sentBy: tokens.decodedToken.uid,
     });

app/api/posts/route.ts

@@ -12,12 +12,14 @@ const isDev = process.env.NODE_ENV === "development";
 async function sendPostNotifications(
   subscribers: { email: string }[],
   title: string,
-  description: string
+  description: string,
+  authorName: string
 ) {
   const feedLink = `${APP_URL}/feed`;
 
   if (isDev) {
     console.log(`\n📬 [DEV] Post notification (not sent)`);
+    console.log(`   Author: ${authorName}`);
     console.log(`   Title:  ${title}`);
     console.log(`   To:     ${subscribers.map((u) => u.email).join(", ")}`);
     console.log(`   Link:   ${feedLink}\n`);
@@ -27,10 +29,11 @@ async function sendPostNotifications(
   const resend = new Resend(process.env.RESEND_API_KEY);
   await resend.batch.send(
     subscribers.map((u) => ({
-      from: "AppDev Alumni <noreply@alumni.cornellappdev.com>",
+      from: `${authorName} (via AppDev Alumni) <noreply@alumni.cornellappdev.com>`,
       to: u.email,
       subject: `New post: ${title}`,
       html: `
+        <p><strong>${authorName}</strong> posted:</p>
         <h2>${title}</h2>
         <p>${description}</p>
         <p><a href="${feedLink}">View in feed</a></p>
@@ -67,12 +70,15 @@ export async function POST(request: NextRequest) {
     });
 
     const usersSnap = await adminDb.collection("users").get();
-    const subscribers = usersSnap.docs
-      .map((d) => d.data())
-      .filter((u) => u.emailNotifications === true && u.email);
+    const allUsers = usersSnap.docs.map((d) => d.data());
+
+    const author = allUsers.find((u) => u.uid === tokens.decodedToken.uid);
+    const authorName = author ? `${author.firstName} ${author.lastName}` : "Someone";
+
+    const subscribers = allUsers.filter((u) => u.emailNotifications === true && u.email);
 
     if (subscribers.length > 0) {
-      await sendPostNotifications(subscribers as { email: string }[], title, description);
+      await sendPostNotifications(subscribers as { email: string }[], title, description, authorName);
     }
 
     return NextResponse.json({ ok: true });

app/api/user/complete/route.ts

@@ -20,6 +20,7 @@ export async function POST(request: NextRequest) {
     const isAdmin = email === SUPER_ADMIN_EMAIL;
 
     let invCode: string | null = null;
+    let invGraduated: boolean | undefined;
     if (!isAdmin) {
       const invSnap = await adminDb
         .collection("invitations")
@@ -32,6 +33,7 @@ export async function POST(request: NextRequest) {
         );
       }
       invCode = invSnap.docs[0].id;
+      invGraduated = invSnap.docs[0].data().graduated as boolean;
     }
 
     const profileData: Record<string, unknown> = {
@@ -50,7 +52,8 @@ export async function POST(request: NextRequest) {
     if (phoneNumber) profileData.phoneNumber = normalizePhone(phoneNumber) ?? phoneNumber;
     if (profilePictureUrl) profileData.profilePictureUrl = profilePictureUrl;
     if (cityId) profileData.cityId = cityId;
-    if (graduated !== undefined) profileData.graduated = graduated;
+    const resolvedGraduated = invGraduated !== undefined ? invGraduated : graduated;
+    if (resolvedGraduated !== undefined) profileData.graduated = resolvedGraduated;
     if (linkedinUrl) profileData.linkedinUrl = linkedinUrl;
     if (instagramUrl) profileData.instagramUrl = instagramUrl;
     if (isAdmin) profileData.role = "admin";

components/admin/InvitationList.tsx

@@ -2,7 +2,6 @@
 
 import { useEffect, useState } from "react";
 import { Invitation } from "@/types";
-import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { toast } from "sonner";
 
@@ -15,7 +14,7 @@ export function InvitationList({ refreshKey }: { refreshKey?: number }) {
     setLoading(true);
     fetch("/api/invitations")
       .then((r) => (r.ok ? r.json() : []))
-      .then(setInvitations)
+      .then((data: Invitation[]) => setInvitations(data.filter((i) => !i.usedAt)))
       .catch(console.error)
       .finally(() => setLoading(false));
   }, [refreshKey]);
@@ -58,20 +57,14 @@ export function InvitationList({ refreshKey }: { refreshKey?: number }) {
                 </p>
               </div>
               <div className="flex items-center gap-3 shrink-0">
-                {inv.usedAt ? (
-                  <Badge variant="secondary">Accepted</Badge>
-                ) : (
-                  <>
-                    <Badge variant="outline">Pending</Badge>
-                    <button
-                      className="text-sm underline text-muted-foreground hover:text-foreground disabled:opacity-50"
-                      disabled={revoking === inv.code}
-                      onClick={() => rescind(inv.code, `${inv.firstName} ${inv.lastName}`)}
-                    >
-                      {revoking === inv.code ? "Cancelling…" : "Cancel"}
-                    </button>
-                  </>
-                )}
+                <Badge variant="outline">Pending</Badge>
+                <button
+                  className="text-sm underline text-muted-foreground hover:text-foreground disabled:opacity-50"
+                  disabled={revoking === inv.code}
+                  onClick={() => rescind(inv.code, `${inv.firstName} ${inv.lastName}`)}
+                >
+                  {revoking === inv.code ? "Cancelling…" : "Cancel"}
+                </button>
               </div>
             </div>
           ))}

components/admin/InviteForm.tsx

@@ -7,12 +7,14 @@ import { z } from "zod";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { toast } from "sonner";
 
 const schema = z.object({
   firstName: z.string().min(1, "Required"),
   lastName: z.string().min(1, "Required"),
   email: z.string().email(),
+  graduated: z.enum(["true", "false"]),
 });
 
 type FormData = z.infer<typeof schema>;
@@ -24,6 +26,7 @@ export function InviteForm({ onSuccess }: { onSuccess?: () => void }) {
     register,
     handleSubmit,
     reset,
+    setValue,
     formState: { errors },
   } = useForm<FormData>({ resolver: zodResolver(schema) });
 
@@ -33,7 +36,7 @@ export function InviteForm({ onSuccess }: { onSuccess?: () => void }) {
       const res = await fetch("/api/invitations", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(data),
+        body: JSON.stringify({ ...data, graduated: data.graduated === "true" }),
       });
       if (!res.ok) {
         const body = await res.json();
@@ -84,6 +87,21 @@ export function InviteForm({ onSuccess }: { onSuccess?: () => void }) {
             <p className="text-sm text-destructive">{errors.email.message}</p>
           )}
         </div>
+        <div className="space-y-1">
+          <Label>Status</Label>
+          <Select onValueChange={(v) => setValue("graduated", v as "true" | "false")}>
+            <SelectTrigger>
+              <SelectValue placeholder="Select…" />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="true">Alumni (graduated)</SelectItem>
+              <SelectItem value="false">Student (current)</SelectItem>
+            </SelectContent>
+          </Select>
+          {errors.graduated && (
+            <p className="text-sm text-destructive">Required</p>
+          )}
+        </div>
         <Button type="submit" disabled={loading}>
           {loading ? "Sending…" : "Send invite"}
         </Button>

types/index.ts

@@ -59,6 +59,7 @@ export interface Invitation {
   email: string;
   firstName: string;
   lastName: string;
+  graduated: boolean;
   sentAt: string;
   usedAt?: string;
   sentBy: string;