diff --git a/package.json b/package.json index cc3aaa1..5e3a3bc 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "check:fix": "biome check --write --unsafe" }, "dependencies": { - "@polinetwork/backend": "^0.18.0", + "@polinetwork/backend": "^1.1.0", "@radix-ui/react-accordion": "^1.2.12", "@radix-ui/react-select": "^2.2.6", "@radix-ui/react-separator": "^1.1.8", @@ -60,4 +60,4 @@ "engines": { "node": ">=24.5.2" } -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aefeaa2..c1c77f3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@polinetwork/backend': - specifier: ^0.18.0 - version: 0.18.0 + specifier: ^1.1.0 + version: 1.1.0 '@radix-ui/react-accordion': specifier: ^1.2.12 version: 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) @@ -447,8 +447,8 @@ packages: cpu: [x64] os: [win32] - '@polinetwork/backend@0.18.0': - resolution: {integrity: sha512-B/4JNI9RB0bsPXDFHm0jkCLDEzqoydvZOz/G7bsR/9qti5cpFIUNaIbGPIRIjDGmVB5bO3DFVU6xM3iLc5eQ9A==} + '@polinetwork/backend@1.1.0': + resolution: {integrity: sha512-fc8XwXEODcD9jhENGLaxG1VRJQp91OGnfmMaw1lGR+qiTsNAW1qX9GWdfRoUMxrcZuL4Xx7FU713TlAr4V8dZA==} '@radix-ui/number@1.1.1': resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==} @@ -1972,7 +1972,7 @@ snapshots: '@next/swc-win32-x64-msvc@15.5.21': optional: true - '@polinetwork/backend@0.18.0': {} + '@polinetwork/backend@1.1.0': {} '@radix-ui/number@1.1.1': {} diff --git a/src/app/groups/layout.tsx b/src/app/groups/layout.tsx new file mode 100644 index 0000000..957b823 --- /dev/null +++ b/src/app/groups/layout.tsx @@ -0,0 +1,11 @@ +import type { ReactNode } from "react" +import { ReportFab } from "@/components/groups/report/fab" + +export default function GroupsLayout({ children }: { children: ReactNode }) { + return ( + <> + {children} + + + ) +} diff --git a/src/components/card-course-group.tsx b/src/components/card-course-group.tsx index f1d5532..2813272 100644 --- a/src/components/card-course-group.tsx +++ b/src/components/card-course-group.tsx @@ -47,7 +47,7 @@ export function CardCourseGroup({ {groupName} -
+
{waLink && ( diff --git a/src/components/groups/constants.ts b/src/components/groups/constants.ts index d9479db..a2e702a 100644 --- a/src/components/groups/constants.ts +++ b/src/components/groups/constants.ts @@ -1,3 +1,5 @@ +import { FiBox } from "react-icons/fi" +import type { GradientIconType } from "@/components/gradient-icon" import type { Level, School } from "@/components/groups/types" export const SCHOOLS: School[] = [ @@ -7,6 +9,15 @@ export const SCHOOLS: School[] = [ { slug: "design", name: "Scuola di Design" }, ] +export const SCHOOL_ICONS: Record = { + "ingegneria-industriale-informazione": "/icons/ingegneria.png", + auic: "/icons/architettura.png", + "ingegneria-civile-ambientale-territoriale": "/icons/civile.png", + design: "/icons/design.png", +} + +export const DEFAULT_SCHOOL_ICON: GradientIconType = FiBox + export const LEVELS: Level[] = [ { slug: "triennale", name: "Triennale" }, { slug: "magistrale", name: "Magistrale" }, diff --git a/src/components/groups/groups-result.tsx b/src/components/groups/groups-result.tsx index ebfee8a..ba15d7f 100644 --- a/src/components/groups/groups-result.tsx +++ b/src/components/groups/groups-result.tsx @@ -3,7 +3,8 @@ import { notFound } from "next/navigation" import { FiArrowLeft, FiX } from "react-icons/fi" import { CardCourseGroup } from "@/components/card-course-group" import { getLevel, getSchool } from "@/components/groups/constants" -import { getVisibleGroups, type VisibleGroup } from "@/queries/groups" +import { getVisibleGroups } from "@/queries/groups" +import type { VisibleGroup } from "@/queries/types" import { cohortLabelText, courseCohortFromLabels, diff --git a/src/components/groups/report/broken-link-flow.tsx b/src/components/groups/report/broken-link-flow.tsx new file mode 100644 index 0000000..c5e5738 --- /dev/null +++ b/src/components/groups/report/broken-link-flow.tsx @@ -0,0 +1,32 @@ +import { GroupSearch, type SearchGroup } from "@/components/home/group-search" +import { DialogDescription, DialogHeader } from "@/components/ui/dialog" +import type { BrokenGroupLinkReportInput } from "@/queries/types" + +export function ReportBrokenLinkFlow({ + onBack, + onSelect, +}: { + onBack: () => void + onSelect: (report: BrokenGroupLinkReportInput, groupName: string) => void +}) { + function selectGroup(group: SearchGroup) { + onSelect( + { + groupId: group.telegramId, + type: group.type, + reportType: "broken_link", + reportedLink: group.link, + }, + group.title + ) + } + + return ( + <> + + Cerca il gruppo a cui si riferisce la segnalazione. + + + + ) +} diff --git a/src/components/groups/report/fab.tsx b/src/components/groups/report/fab.tsx new file mode 100644 index 0000000..32dbc07 --- /dev/null +++ b/src/components/groups/report/fab.tsx @@ -0,0 +1,21 @@ +"use client" + +import { FiFlag } from "react-icons/fi" +import { ButtonIcon } from "@/components/button-icon" +import { ReportFinderDialog } from "@/components/groups/report/finder-dialog" + +export function ReportFab() { + return ( + + } + /> + ) +} diff --git a/src/components/groups/report/finder-dialog.tsx b/src/components/groups/report/finder-dialog.tsx new file mode 100644 index 0000000..19f661f --- /dev/null +++ b/src/components/groups/report/finder-dialog.tsx @@ -0,0 +1,139 @@ +"use client" + +import { type ReactNode, useRef, useState } from "react" +import { FiAlertCircle, FiCheckCircle, FiLink } from "react-icons/fi" +import { ButtonIcon } from "@/components/button-icon" +import { ReportBrokenLinkFlow } from "@/components/groups/report/broken-link-flow" +import { ReportMissingLinkFlow } from "@/components/groups/report/missing-link" +import { SelectableCardIcon } from "@/components/groups/report/selectable-card-icon" +import { Button } from "@/components/ui/button" +import { Card, CardAction, CardContent } from "@/components/ui/card" +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTrigger, +} from "@/components/ui/dialog" +import { reportGroupLink } from "@/queries/groups" +import type { BrokenGroupLinkReportInput, MissingGroupLinkReportInput } from "@/queries/types" + +type View = "problem" | "broken" | "missing" | "confirmation" | "done" + +export function ReportFinderDialog({ trigger }: { trigger: ReactNode }) { + const [open, setOpen] = useState(false) + const [view, setView] = useState("problem") + const [report, setReport] = useState(null) + const [groupName, setGroupName] = useState("") + const [status, setStatus] = useState<"idle" | "submitting" | "error">("idle") + const inFlightRef = useRef(false) + const requestIdRef = useRef(0) + + function reset() { + requestIdRef.current++ + inFlightRef.current = false + setView("problem") + setReport(null) + setGroupName("") + setStatus("idle") + } + + function handleOpenChange(next: boolean) { + setOpen(next) + if (!next) reset() + } + + async function submit(input: BrokenGroupLinkReportInput | MissingGroupLinkReportInput) { + if (inFlightRef.current) return + inFlightRef.current = true + const requestId = ++requestIdRef.current + + setStatus("submitting") + const result = await reportGroupLink(input) + if (requestId !== requestIdRef.current) return // dialog was reset/closed meanwhile + + inFlightRef.current = false + if (result.ok) { + setView("done") + setStatus("idle") + return + } + + setStatus("error") + } + + return ( + + {trigger} + + {view === "done" ? ( + <> + + Grazie, la verificheremo al più presto. + + + + + + ) : view === "confirmation" && report ? ( + <> + { + setView("broken") + setStatus("idle") + }} + > + Controlla i dettagli prima di inviarla. + + + + + Il link {report.type === "tg" ? "Telegram" : "WhatsApp"} di “{groupName}” non funziona. + + + {status === "error" && ( +

+ Non è stato possibile inviare la segnalazione. Riprova tra qualche minuto. +

+ )} + + void submit(report)} + /> + + + ) : view === "broken" ? ( + { + setReport(selectedReport) + setGroupName(selectedGroupName) + setView("confirmation") + }} + /> + ) : view === "missing" ? ( + void submit(missingReport)} + status={status} + /> + ) : ( + <> + +
+ setView("broken")} /> + setView("missing")} /> +
+ + )} + + + ) +} diff --git a/src/components/groups/report/missing-link/category-step.tsx b/src/components/groups/report/missing-link/category-step.tsx new file mode 100644 index 0000000..9e4cbe0 --- /dev/null +++ b/src/components/groups/report/missing-link/category-step.tsx @@ -0,0 +1,24 @@ +import { FiBook, FiStar } from "react-icons/fi" +import { SelectableCardIcon } from "@/components/groups/report/selectable-card-icon" +import { DialogDescription, DialogHeader } from "@/components/ui/dialog" +import type { ReportMissingLinkCategory } from "./types" + +export function CategoryStep({ + onBack, + onSelect, +}: { + onBack: () => void + onSelect: (category: ReportMissingLinkCategory) => void +}) { + return ( + <> + + Che tipo di gruppo manca? + +
+ onSelect("didattica")} /> + onSelect("extra")} /> +
+ + ) +} diff --git a/src/components/groups/report/missing-link/course-step.tsx b/src/components/groups/report/missing-link/course-step.tsx new file mode 100644 index 0000000..b5f0105 --- /dev/null +++ b/src/components/groups/report/missing-link/course-step.tsx @@ -0,0 +1,54 @@ +import { CardCourse } from "@/components/card-course" +import { Spinner } from "@/components/spinner" +import { Button } from "@/components/ui/button" +import { DialogDescription, DialogFooter, DialogHeader } from "@/components/ui/dialog" +import { humanizeSlug } from "@/utils/labels" + +export function CourseStep({ + path, + courses, + onBack, + onSelectCourse, + onSpecifyMissing, +}: { + path: string + courses: string[] | null + onBack: () => void + onSelectCourse: (course: string) => void + onSpecifyMissing: () => void +}) { + return ( + <> + + {path} + +
+ {courses ? ( + courses.length > 0 ? ( + courses.map((course) => ( + + )) + ) : ( +

Nessun corso disponibile al momento.

+ ) + ) : ( +
+ +
+ )} +
+ + + + + ) +} diff --git a/src/components/groups/report/missing-link/details-step.tsx b/src/components/groups/report/missing-link/details-step.tsx new file mode 100644 index 0000000..b906708 --- /dev/null +++ b/src/components/groups/report/missing-link/details-step.tsx @@ -0,0 +1,61 @@ +import { FiCheckCircle } from "react-icons/fi" +import { ButtonIcon } from "@/components/button-icon" +import { Glass } from "@/components/glass" +import { DialogDescription, DialogFooter, DialogHeader } from "@/components/ui/dialog" +import type { ReportMissingLinkCategory } from "./types" + +export function DetailsStep({ + path, + category, + details, + status, + onBack, + onChangeDetails, + onSubmit, +}: { + path: string + category: ReportMissingLinkCategory | null + details: string + status: "idle" | "submitting" | "error" + onBack: () => void + onChangeDetails: (value: string) => void + onSubmit: () => void +}) { + return ( + <> + + {path} + +