8000 Aryan by aryansinha1908 · Pull Request #2 · aryansinha1908/pcon · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions app/admin/(panel)/blogs/[id]/edit/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { notFound } from "next/navigation";
import { requirePageRole } from "@/lib/auth-guards";
import { prisma } from "@/lib/prisma";
import { getBlogCategories, getBlogAuthors } from "@/lib/blogs-db";
import { getBlogCategories, getBlogAuthors, getBlogByIdForAdmin } from "@/lib/blogs-db";
import { updateBlogAction } from "../../../../_actions/blogs";
import { BlogForm } from "../../../../_components/blog-form";
import { PageHeader } from "../../../../_components/page-header";
Expand All @@ -20,10 +19,7 @@ export default async function EditBlogPage({
if (isNaN(blogId)) notFound();

const [blog, categories, authors] = await Promise.all([
prisma.blog.findUnique({
where: { id: blogId },
include: { category: true, author: true },
}),
getBlogByIdForAdmin(blogId),
getBlogCategories(),
getBlogAuthors(),
]);
Expand All @@ -43,6 +39,7 @@ export default async function EditBlogPage({
coverImageUrl: blog.coverImageUrl || "",
coverImageAlt: blog.coverImageAlt || "",
categoryId: blog.categoryId,
categoryIds: blog.categoryIds && blog.categoryIds.length > 0 ? blog.categoryIds : [blog.categoryId],
authorId: blog.authorId,
status: blog.status as "draft" | "published",
isFeatured: blog.isFeatured,
Expand Down
1 change: 1 addition & 0 deletions app/admin/(panel)/blogs/new/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export default async function NewBlogPage() {
authors={authorList}
defaults={{
categoryId: categories[0]?.id ?? 1,
categoryIds: [categories[0]?.id ?? 1],
authorId: userAuthor.id,
}}
submitLabel="Publish / Save post"
Expand Down
3 changes: 2 additions & 1 deletion app/admin/(panel)/events/[id]/edit/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default async function EditEventPage({ params }: { params: Promise<{ id:
defaults={{
title: event.title,
description: event.description,
type: event.type,
location: event.location ?? "",
posterUrl: event.posterUrl ?? "",
registrationUrl: event.registrationUrl ?? "",
Expand All @@ -32,4 +33,4 @@ export default async function EditEventPage({ params }: { params: Promise<{ id:
/>
</>
);
}
}
42 changes: 40 additions & 2 deletions app/admin/_actions/blogs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,33 @@ export async function createBlogAction(_prev: FormState, formData: FormData): Pr
return toFormError(e);
}

let categoryIds: number[] = [];
const multi = formData.getAll("categoryIds");
if (multi.length > 0) {
categoryIds = multi.map(Number).filter((n) => !isNaN(n) && n > 0);
}
const catIdsStr = formData.get("categoryIdsString") as string;
if (catIdsStr) {
const fromStr = catIdsStr
.split(",")
.map((s) => Number(s.trim()))
.filter((n) => !isNaN(n) && n > 0);
categoryIds = Array.from(new Set([...categoryIds, ...fromStr]));
}
const primaryCategoryId = Number(formData.get("categoryId")) || categoryIds[0] || 1;
if (!categoryIds.includes(primaryCategoryId)) {
categoryIds.unshift(primaryCategoryId);
}

const raw = {
title: str(formData, "title"),
slug: str(formData, "slug"),
excerpt: str(formData, "excerpt"),
content: str(formData, "content"),
coverImageUrl: str(formData, "coverImageUrl"),
coverImageAlt: str(formData, "coverImageAlt"),
categoryId: Number(formData.get("categoryId")),
categoryId: primaryCategoryId,
categoryIds,
authorId: Number(formData.get("authorId")),
status: str(formData, "status") || (formData.get("published") === "on" ? "published" : "draft"),
isFeatured: formData.get("isFeatured") === "on" || formData.get("isFeatured") === "true",
Expand Down Expand Up @@ -77,14 +96,33 @@ export async function updateBlogAction(id: number, _prev: FormState, formData: F
return toFormError(e);
}

let categoryIds: number[] = [];
const multi = formData.getAll("categoryIds");
if (multi.length > 0) {
categoryIds = multi.map(Number).filter((n) => !isNaN(n) && n > 0);
}
const catIdsStr = formData.get("categoryIdsString") as string;
if (catIdsStr) {
const fromStr = catIdsStr
.split(",")
.map((s) => Number(s.trim()))
.filter((n) => !isNaN(n) && n > 0);
categoryIds = Array.from(new Set([...categoryIds, ...fromStr]));
}
const primaryCategoryId = Number(formData.get("categoryId")) || categoryIds[0] || 1;
if (!categoryIds.includes(primaryCategoryId)) {
categoryIds.unshift(primaryCategoryId);
}

const raw = {
title: str(formData, "title"),
slug: str(formData, "slug"),
excerpt: str(formData, "excerpt"),
content: str(formData, "content"),
coverImageUrl: str(formData, "coverImageUrl"),
coverImageAlt: str(formData, "coverImageAlt"),
categoryId: Number(formData.get("categoryId")),
categoryId: primaryCategoryId,
categoryIds,
authorId: Number(formData.get("authorId")),
status: str(formData, "status") || (formData.get("published") === "on" ? "published" : "draft"),
isFeatured: formData.get("isFeatured") === "on" || formData.get("isFeatured") === "true",
Expand Down
3 changes: 2 additions & 1 deletion app/admin/_actions/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ function parse(formData: FormData) {
return eventSchema.safeParse({
title: str(formData, "title"),
description: str(formData, "description"),
type: str(formData, "type"),
location: str(formData, "location"),
posterUrl: str(formData, "posterUrl"),
registrationUrl: str(formData, "registrationUrl"),
Expand Down Expand Up @@ -65,4 +66,4 @@ export async function deleteEvent(id: string): Promise<FormState> {
await prisma.event.deleteMany({ where: { id } });
refresh();
return { ok: "Event deleted." };
}
}
11 changes: 7 additions & 4 deletions app/admin/_components/admin-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import Link from "next/link";
import { usePathname } from "next/navigation";
import { useEffect, useState } from "react";
import { useState } from "react";

export type NavItem = { href: string; label: string };

Expand All @@ -27,10 +27,13 @@ export function AdminTopbar({
const pathname = usePathname();
const [open, setOpen] = useState(false);

// Close the mobile menu whenever the route changes.
useEffect(() => {
// Close the mobile menu whenever the route changes. Done during render (React's
// "adjust state when a prop changes" pattern) rather than in an effect.
const [lastPath, setLastPath] = useState(pathname);
if (pathname !== lastPath) {
setLastPath(pathname);
setOpen(false);
}, [pathname]);
}

return (
<header className="adm-topbar">
Expand Down
106 changes: 88 additions & 18 deletions app/admin/_components/blog-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export type BlogFormValues = {
coverImageUrl?: string | null;
coverImageAlt?: string | null;
categoryId: number;
categoryIds?: number[];
authorId: number;
status: "draft" | "published";
isFeatured: boolean;
Expand All @@ -28,6 +29,7 @@ const EMPTY: BlogFormValues = {
coverImageUrl: "",
coverImageAlt: "",
categoryId: 1,
categoryIds: [1],
authorId: 1,
status: "draft",
isFeatured: false,
Expand Down Expand Up @@ -62,7 +64,11 @@ export function BlogForm({

// Category state & inline creation
const [categories, setCategories] = useState<CategoryOption[]>(initialCategories);
const [selectedCatId, setSelectedCatId] = useState<number>(defaults.categoryId || (initialCategories[0]?.id ?? 1));
const initialCategoryIds =
defaults.categoryIds && defaults.categoryIds.length > 0
? defaults.categoryIds
: [defaults.categoryId || (initialCategories[0]?.id ?? 1)];
const [selectedCatIds, setSelectedCatIds] = useState<number[]>(initialCategoryIds);
const [showNewCat, setShowNewCat] = useState(false);
const [newCatName, setNewCatName] = useState("");
const [newCatHue, setNewCatHue] = useState(160);
Expand Down Expand Up @@ -167,7 +173,7 @@ export function BlogForm({
const data = await res.json();
if (!res.ok) throw new Error(data.error || "Failed to create category");
setCategories((prev) => [...prev, data]);
setSelectedCatId(data.id);
setSelectedCatIds((prev) => [...prev, data.id]);
setShowNewCat(false);
setNewCatName("");
} catch (err) {
Expand Down Expand Up @@ -248,21 +254,10 @@ export function BlogForm({

{/* Category Select & Add New */}
<div className="adm-field">
<label className="adm-field__label">Category</label>
<div style={{ display: "flex", gap: "10px", alignItems: "center" }}>
<select
name="categoryId"
value={selectedCatId}
=> setSelectedCatId(Number(e.target.value))}
className="adm-select"
style={{ flex: 1 }}
>
{categories.map((c) => (
<option key={c.id} value={c.id}>
{c.name} (Hue {c.hue})
</option>
))}
</select>
<div style={{ display: "flex", justifyContent: "space-between", alignItems: "baseline", marginBottom: "6px" }}>
<label className="adm-field__label" style={{ marginBottom: 0 }}>
Topics / Categories <span style={{ color: "var(--adm-muted)", fontWeight: "normal", fontSize: "11px" }}>(Select one or more, e.g. Web Dev + ML)</span>
</label>
<button
type="button"
className="adm-btn adm-btn--ghost adm-btn--sm"
Expand All @@ -272,6 +267,81 @@ export function BlogForm({
</button>
</div>

{/* Multi-select category pills */}
<div
style={{
display: "flex",
flexWrap: "wrap",
gap: "8px",
padding: "12px",
background: "var(--adm-surface-2)",
borderRadius: "6px",
border: "1px solid var(--adm-line)",
}}
role="group"
aria-label="Select topics"
>
{categories.map((c) => {
const isSelected = selectedCatIds.includes(c.id);
return (
<button
key={c.id}
type="button"
=> {
setSelectedCatIds((prev) => {
if (prev.includes(c.id)) {
if (prev.length <= 1) return prev;
return prev.filter((id) => id !== c.id);
}
return [...prev, c.id];
});
}}
className="adm-topic-chip"
style={{
display: "inline-flex",
alignItems: "center",
gap: "6px",
padding: "6px 12px",
borderRadius: "20px",
fontSize: "12px",
fontFamily: "var(--mono)",
cursor: "pointer",
transition: "all 0.15s ease",
border: isSelected
? `1px solid hsl(${c.hue}, 80%, 45%)`
: "1px solid var(--adm-line-strong)",
background: isSelected
? `hsl(${c.hue}, 80%, 15%)`
: "rgba(255, 255, 255, 0.03)",
color: isSelected
? `hsl(${c.hue}, 85%, 70%)`
: "var(--adm-muted)",
}}
>
<span>{isSelected ? "✓" : "+"}</span>
<span>{c.name}</span>
</button>
);
})}
</div>

{/* Hidden inputs to send selected categories in FormData */}
<input type="hidden" name="categoryId" value={selectedCatIds[0] || 1} />
<input type="hidden" name="categoryIdsString" value={selectedCatIds.join(",")} />
{selectedCatIds.map((id) => (
<input key={id} type="hidden" name="categoryIds" value={id} />
))}

<div style={{ marginTop: "6px", fontSize: "11.5px", color: "var(--adm-muted)" }}>
Selected topics:{" "}
<strong style={{ color: "var(--mint)" }}>
{categories
.filter((c) => selectedCatIds.includes(c.id))
.map((c) => c.name)
.join(", ") || "None"}
</strong>
</div>

{/* Inline Category Creator */}
{showNewCat && (
<div style={{ marginTop: "10px", padding: "14px", background: "var(--adm-surface-2)", borderRadius: "4px", border: "1px dashed var(--adm-line-strong)", display: "flex", flexDirection: "column", gap: "10px" }}>
Expand All @@ -296,7 +366,7 @@ export function BlogForm({
>
disabled={isSavingCat || !newCatName.trim()}
>
{isSavingCat ? "Saving..." : "Add"}
{isSavingCat ? "Saving..." : "Add & Select"}
</button>
</div>
</div>
Expand Down
12 changes: 12 additions & 0 deletions app/admin/_components/event-form.tsx
FCA8
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

import Link from "next/link";
import { useActionState, useRef, useState } from "react";
import { EVENT_TYPES, EVENT_TYPE_LABELS, type EventType } from "@/lib/event-types";
import type { FormState } from "@/lib/validation";
import { Field, FormMessage, SubmitButton, useKeepValuesSubmit } from "./form-bits";

export type EventFormValues = {
title: string;
description: string;
type: EventType;
location: string;
posterUrl: string;
registrationUrl: string;
Expand All @@ -18,6 +20,7 @@ export type EventFormValues = {
const EMPTY: EventFormValues = {
title: "",
description: "",
type: "OTHER",
location: "",
posterUrl: "",
registrationUrl: "",
Expand Down Expand Up @@ -72,6 +75,15 @@ export function EventForm({
<Field label="Description" name="description" state={state}>
<textarea name="description" defaultValue={defaults.description} rows={6} required />
</Field>
<Field label="Type" name="type" state={state}>
<select name="type" defaultValue={defaults.type} required>
{EVENT_TYPES.map((t) => (
<option key={t} value={t}>
{t === "OTHER" ? "Other" : EVENT_TYPE_LABELS[t]}
</option>
))}
</select>
</Field>
<div className="adm-form__row">
<Field label="Starts (IST)" name="startDate" state={state}>
<input type="datetime-local" name="startDate" defaultValue={defaults.startDate} required />
Expand Down
4 changes: 2 additions & 2 deletions app/blogs/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default async function BlogPostDetailPage({
const dateStr = formatPostDate(post.publishedAt || post.createdAt);

return (
<>
<div className="blog-wrap">
<ReadingProgressBar />

<Link className="blog-back" href="/blogs">
Expand Down Expand Up @@ -172,7 +172,7 @@ export default async function BlogPostDetailPage({
</div>
</section>
)}
</>
</div>
);
}

Loading
Loading
0