style: clean up code with prettier and eslint
This commit is contained in:
@@ -1,58 +1,52 @@
|
||||
import { notFound, redirect } from 'next/navigation'
|
||||
import { AdminBreadcrumb } from '@/components/admin/admin-breadcrumb'
|
||||
import { Badge } from '@/components/ui/badge'
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
||||
import { canAccess, getAdminContext, PERMS } from '@/lib/permissions'
|
||||
import { prisma } from '@/lib/prisma'
|
||||
import { PollForm } from '../poll-form'
|
||||
import { PollQuestionsManager } from './poll-questions'
|
||||
import { PollResultsView } from './poll-results'
|
||||
import { notFound, redirect } from "next/navigation";
|
||||
import { AdminBreadcrumb } from "@/components/admin/admin-breadcrumb";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { PollForm } from "../poll-form";
|
||||
import { PollQuestionsManager } from "./poll-questions";
|
||||
import { PollResultsView } from "./poll-results";
|
||||
|
||||
export default async function PollDetailPage({
|
||||
params,
|
||||
}: {
|
||||
params: Promise<{ locale: string; id: string }>
|
||||
params: Promise<{ locale: string; id: string }>;
|
||||
}) {
|
||||
const { id } = await params
|
||||
const { session, permissions } = await getAdminContext()
|
||||
const { id } = await params;
|
||||
const { session, permissions } = await getAdminContext();
|
||||
if (!canAccess(permissions, PERMS.POLLS_EDIT, session.user.rank)) {
|
||||
redirect('/admin/polls')
|
||||
redirect("/admin/polls");
|
||||
}
|
||||
|
||||
const pollId = parseInt(id, 10)
|
||||
if (Number.isNaN(pollId)) notFound()
|
||||
const pollId = parseInt(id, 10);
|
||||
if (Number.isNaN(pollId)) notFound();
|
||||
|
||||
const poll = await prisma.websitePoll.findUnique({
|
||||
where: { id: pollId },
|
||||
include: {
|
||||
questions: {
|
||||
orderBy: { sortOrder: 'asc' },
|
||||
orderBy: { sortOrder: "asc" },
|
||||
include: {
|
||||
votes: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
});
|
||||
|
||||
if (!poll) notFound()
|
||||
if (!poll) notFound();
|
||||
|
||||
const totalVoters = new Set(poll.questions.flatMap((q) => q.votes.map((v) => v.userId))).size
|
||||
const totalVoters = new Set(poll.questions.flatMap((q) => q.votes.map((v) => v.userId))).size;
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
<div>
|
||||
<AdminBreadcrumb
|
||||
items={[{ label: 'Polls', href: '/admin/polls' }, { label: poll.title }]}
|
||||
/>
|
||||
<AdminBreadcrumb items={[{ label: "Polls", href: "/admin/polls" }, { label: poll.title }]} />
|
||||
<div className="flex items-center gap-3">
|
||||
<h1 className="text-3xl font-bold tracking-tight">{poll.title}</h1>
|
||||
<Badge
|
||||
variant={
|
||||
poll.status === 'active'
|
||||
? 'default'
|
||||
: poll.status === 'closed'
|
||||
? 'outline'
|
||||
: 'secondary'
|
||||
poll.status === "active" ? "default" : poll.status === "closed" ? "outline" : "secondary"
|
||||
}
|
||||
>
|
||||
{poll.status}
|
||||
@@ -97,7 +91,7 @@ export default async function PollDetailPage({
|
||||
id: poll.id,
|
||||
title: poll.title,
|
||||
description: poll.description,
|
||||
status: poll.status as 'draft' | 'active' | 'closed',
|
||||
status: poll.status as "draft" | "active" | "closed",
|
||||
showResults: poll.showResults,
|
||||
multipleChoice: poll.multipleChoice,
|
||||
startsAt: poll.startsAt,
|
||||
@@ -129,5 +123,5 @@ export default async function PollDetailPage({
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,71 +1,65 @@
|
||||
'use client'
|
||||
"use client";
|
||||
|
||||
import { GripVertical, Pencil, Plus, Trash2 } from 'lucide-react'
|
||||
import { useState } from 'react'
|
||||
import { addPollQuestion, deletePollQuestion, updatePollQuestion } from '@/actions/polls'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from '@/components/ui/select'
|
||||
import { useServerAction } from '@/hooks/use-server-action'
|
||||
import { GripVertical, Pencil, Plus, Trash2 } from "lucide-react";
|
||||
import { useState } from "react";
|
||||
import { addPollQuestion, deletePollQuestion, updatePollQuestion } from "@/actions/polls";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
||||
import { useServerAction } from "@/hooks/use-server-action";
|
||||
|
||||
interface Question {
|
||||
id: number
|
||||
question: string
|
||||
type: string
|
||||
sortOrder: number
|
||||
options: string
|
||||
id: number;
|
||||
question: string;
|
||||
type: string;
|
||||
sortOrder: number;
|
||||
options: string;
|
||||
}
|
||||
|
||||
interface Props {
|
||||
pollId: number
|
||||
questions: Question[]
|
||||
pollId: number;
|
||||
questions: Question[];
|
||||
}
|
||||
|
||||
export function PollQuestionsManager({ pollId, questions }: Props) {
|
||||
const { run, isPending } = useServerAction()
|
||||
const [showForm, setShowForm] = useState(false)
|
||||
const [editingId, setEditingId] = useState<number | null>(null)
|
||||
const { run, isPending } = useServerAction();
|
||||
const [showForm, setShowForm] = useState(false);
|
||||
const [editingId, setEditingId] = useState<number | null>(null);
|
||||
const [form, setForm] = useState({
|
||||
question: '',
|
||||
type: 'single',
|
||||
question: "",
|
||||
type: "single",
|
||||
sortOrder: questions.length,
|
||||
options: '',
|
||||
})
|
||||
options: "",
|
||||
});
|
||||
|
||||
function resetForm() {
|
||||
setForm({ question: '', type: 'single', sortOrder: questions.length, options: '' })
|
||||
setEditingId(null)
|
||||
setShowForm(false)
|
||||
setForm({ question: "", type: "single", sortOrder: questions.length, options: "" });
|
||||
setEditingId(null);
|
||||
setShowForm(false);
|
||||
}
|
||||
|
||||
function handleEdit(q: Question) {
|
||||
setForm({ question: q.question, type: q.type, sortOrder: q.sortOrder, options: q.options })
|
||||
setEditingId(q.id)
|
||||
setShowForm(true)
|
||||
setForm({ question: q.question, type: q.type, sortOrder: q.sortOrder, options: q.options });
|
||||
setEditingId(q.id);
|
||||
setShowForm(true);
|
||||
}
|
||||
|
||||
function handleSubmit(e: React.FormEvent) {
|
||||
e.preventDefault()
|
||||
e.preventDefault();
|
||||
if (editingId) {
|
||||
// biome-ignore lint/suspicious/noExplicitAny: explicitly chosen here, see surrounding code
|
||||
run(() => updatePollQuestion({ id: editingId, ...form } as any), {
|
||||
successMessage: 'Question updated!',
|
||||
})
|
||||
successMessage: "Question updated!",
|
||||
});
|
||||
} else {
|
||||
// biome-ignore lint/suspicious/noExplicitAny: explicitly chosen here, see surrounding code
|
||||
run(() => addPollQuestion({ pollId, ...form } as any), {
|
||||
successMessage: 'Question added!',
|
||||
})
|
||||
successMessage: "Question added!",
|
||||
});
|
||||
}
|
||||
resetForm()
|
||||
resetForm();
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -75,8 +69,8 @@ export function PollQuestionsManager({ pollId, questions }: Props) {
|
||||
<Button
|
||||
size="sm"
|
||||
onClick={() => {
|
||||
resetForm()
|
||||
setShowForm(!showForm)
|
||||
resetForm();
|
||||
setShowForm(!showForm);
|
||||
}}
|
||||
>
|
||||
<Plus className="h-4 w-4 mr-1" /> Add Question
|
||||
@@ -122,7 +116,7 @@ export function PollQuestionsManager({ pollId, questions }: Props) {
|
||||
className="w-full rounded-md border bg-transparent px-3 py-2 text-sm min-h-[80px]"
|
||||
value={form.options}
|
||||
onChange={(e) => setForm({ ...form, options: e.target.value })}
|
||||
placeholder={'Option A\nOption B\nOption C'}
|
||||
placeholder={"Option A\nOption B\nOption C"}
|
||||
/>
|
||||
</div>
|
||||
<div className="flex gap-2 justify-end">
|
||||
@@ -130,7 +124,7 @@ export function PollQuestionsManager({ pollId, questions }: Props) {
|
||||
Cancel
|
||||
</Button>
|
||||
<Button type="submit" size="sm" disabled={isPending}>
|
||||
{editingId ? 'Update' : 'Add'}
|
||||
{editingId ? "Update" : "Add"}
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -155,13 +149,10 @@ export function PollQuestionsManager({ pollId, questions }: Props) {
|
||||
{q.options && (
|
||||
<div className="mt-1 text-xs text-muted-foreground">
|
||||
{q.options
|
||||
.split('\n')
|
||||
.split("\n")
|
||||
.filter(Boolean)
|
||||
.map((opt) => (
|
||||
<span
|
||||
key={opt}
|
||||
className="inline-block mr-2 bg-muted px-1.5 py-0.5 rounded mb-1"
|
||||
>
|
||||
<span key={opt} className="inline-block mr-2 bg-muted px-1.5 py-0.5 rounded mb-1">
|
||||
{opt}
|
||||
</span>
|
||||
))}
|
||||
@@ -169,12 +160,7 @@ export function PollQuestionsManager({ pollId, questions }: Props) {
|
||||
)}
|
||||
</div>
|
||||
<div className="flex gap-1 shrink-0">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className="h-7 w-7"
|
||||
onClick={() => handleEdit(q)}
|
||||
>
|
||||
<Button variant="ghost" size="icon" className="h-7 w-7" onClick={() => handleEdit(q)}>
|
||||
<Pencil className="h-3.5 w-3.5" />
|
||||
</Button>
|
||||
<Button
|
||||
@@ -183,7 +169,7 @@ export function PollQuestionsManager({ pollId, questions }: Props) {
|
||||
className="h-7 w-7"
|
||||
onClick={() =>
|
||||
run(() => deletePollQuestion({ id: q.id }), {
|
||||
successMessage: 'Question deleted',
|
||||
successMessage: "Question deleted",
|
||||
})
|
||||
}
|
||||
>
|
||||
@@ -195,5 +181,5 @@ export function PollQuestionsManager({ pollId, questions }: Props) {
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
'use client'
|
||||
"use client";
|
||||
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
|
||||
interface QuestionResult {
|
||||
id: number
|
||||
question: string
|
||||
options: string
|
||||
votes: string[] // array of answer strings
|
||||
id: number;
|
||||
question: string;
|
||||
options: string;
|
||||
votes: string[]; // array of answer strings
|
||||
}
|
||||
|
||||
interface Props {
|
||||
questions: QuestionResult[]
|
||||
questions: QuestionResult[];
|
||||
}
|
||||
|
||||
export function PollResultsView({ questions }: Props) {
|
||||
@@ -21,14 +21,14 @@ export function PollResultsView({ questions }: Props) {
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-6">
|
||||
{questions.map((q) => {
|
||||
const options = q.options.split('\n').filter(Boolean)
|
||||
const totalVotes = q.votes.length
|
||||
const options = q.options.split("\n").filter(Boolean);
|
||||
const totalVotes = q.votes.length;
|
||||
|
||||
// Count votes per option
|
||||
const voteCounts = new Map<string, number>()
|
||||
for (const opt of options) voteCounts.set(opt, 0)
|
||||
const voteCounts = new Map<string, number>();
|
||||
for (const opt of options) voteCounts.set(opt, 0);
|
||||
for (const vote of q.votes) {
|
||||
voteCounts.set(vote, (voteCounts.get(vote) ?? 0) + 1)
|
||||
voteCounts.set(vote, (voteCounts.get(vote) ?? 0) + 1);
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -37,8 +37,8 @@ export function PollResultsView({ questions }: Props) {
|
||||
{options.length > 0 ? (
|
||||
<div className="space-y-2">
|
||||
{options.map((opt) => {
|
||||
const count = voteCounts.get(opt) ?? 0
|
||||
const pct = totalVotes > 0 ? Math.round((count / totalVotes) * 100) : 0
|
||||
const count = voteCounts.get(opt) ?? 0;
|
||||
const pct = totalVotes > 0 ? Math.round((count / totalVotes) * 100) : 0;
|
||||
return (
|
||||
<div key={opt}>
|
||||
<div className="flex justify-between text-xs mb-1">
|
||||
@@ -54,21 +54,19 @@ export function PollResultsView({ questions }: Props) {
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
) : (
|
||||
<div className="text-sm text-muted-foreground">
|
||||
{totalVotes} free-text responses
|
||||
</div>
|
||||
<div className="text-sm text-muted-foreground">{totalVotes} free-text responses</div>
|
||||
)}
|
||||
<p className="text-xs text-muted-foreground mt-2">
|
||||
{totalVotes} total vote{totalVotes !== 1 ? 's' : ''}
|
||||
{totalVotes} total vote{totalVotes !== 1 ? "s" : ""}
|
||||
</p>
|
||||
</div>
|
||||
)
|
||||
);
|
||||
})}
|
||||
</CardContent>
|
||||
</Card>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user