diff --git a/public/fonts/OFL.txt b/public/fonts/OFL.txt new file mode 100644 index 0000000..d832004 --- /dev/null +++ b/public/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2015 The Vazirmatn Project Authors (https://github.com/rastikerdar/vazirmatn) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/fonts/Vazirmatn-Regular.ttf b/public/fonts/Vazirmatn-Regular.ttf new file mode 100644 index 0000000..64e4a81 Binary files /dev/null and b/public/fonts/Vazirmatn-Regular.ttf differ diff --git a/src/app/events/[slug]/page.tsx b/src/app/events/[slug]/page.tsx index 7ec255d..b67b068 100644 --- a/src/app/events/[slug]/page.tsx +++ b/src/app/events/[slug]/page.tsx @@ -1,7 +1,8 @@ import type { Metadata } from "next"; import { notFound } from "next/navigation"; import EventDetail from "@/views/EventDetail"; -import { PublicApiError, getPublicEventBySlug } from "@/lib/public-api"; +import { getEventPath } from "@/lib/event-ui"; +import { PublicApiError, getPublicEventById, getPublicEventBySlug } from "@/lib/public-api"; import { getCmsPageContent, getCmsSiteContent } from "@/lib/content-cms"; import { organizationStructuredData, safeJsonLd } from "@/lib/seo"; import { apiBaseUrl, siteUrl, toAbsoluteUrl } from "@/lib/site"; @@ -16,7 +17,9 @@ function cleanText(value?: string | null) { async function loadEvent(slug: string) { try { - return await getPublicEventBySlug(slug); + return /^\d+$/.test(slug) + ? await getPublicEventById(Number(slug)) + : await getPublicEventBySlug(slug); } catch (error) { if (error instanceof PublicApiError && error.status === 404) { notFound(); @@ -32,6 +35,7 @@ export async function generateMetadata({ }): Promise { const { slug } = await params; const event = await loadEvent(slug); + const eventPath = getEventPath(event); const description = cleanText(event.description).slice(0, 160); const [siteContent, eventPageContent] = await Promise.all([ getCmsSiteContent(), @@ -50,12 +54,12 @@ export async function generateMetadata({ return { title: event.title, description, - alternates: { canonical: `/events/${event.slug}` }, + alternates: { canonical: eventPath }, robots: event.status === "draft" ? { index: false, follow: false } : undefined, openGraph: { title: event.title, description, - url: `${siteUrl}/events/${event.slug}`, + url: `${siteUrl}${eventPath}`, siteName: siteContent.official_name, type: "website", images: [image], @@ -81,6 +85,7 @@ export default async function EventDetailPage({ getCmsSiteContent(), getCmsPageContent("events"), ]); + const eventPath = getEventPath(event); const description = cleanText(event.description).slice(0, 160); const image = toAbsoluteUrl( @@ -112,10 +117,10 @@ export default async function EventDetailPage({ ? "https://schema.org/OfflineEventAttendanceMode" : "https://schema.org/MixedEventAttendanceMode", image: [image], - url: `${siteUrl}/events/${event.slug}`, + url: `${siteUrl}${eventPath}`, organizer: organizationStructuredData(siteContent), location: event.event_type === "online" - ? { "@type": "VirtualLocation", url: event.online_link || `${siteUrl}/events/${event.slug}` } + ? { "@type": "VirtualLocation", url: event.online_link || `${siteUrl}${eventPath}` } : { "@type": "Place", name: event.location || event.address || siteContent.official_name, @@ -123,7 +128,7 @@ export default async function EventDetailPage({ }, offers: { "@type": "Offer", - url: `${siteUrl}/events/${event.slug}`, + url: `${siteUrl}${eventPath}`, priceCurrency: "IRR", price: String(event.price ?? 0), ...(event.registration_start_date ? { validFrom: event.registration_start_date } : {}), diff --git a/src/app/events/[slug]/registration/page.tsx b/src/app/events/[slug]/registration/page.tsx new file mode 100644 index 0000000..c575f0b --- /dev/null +++ b/src/app/events/[slug]/registration/page.tsx @@ -0,0 +1,34 @@ +import type { Metadata } from "next"; +import EventRegistrationHub from "@/views/EventRegistrationHub"; + +type Params = Promise<{ slug: string }>; +type SearchParams = Promise>; + +function firstString(value?: string | string[]) { + return Array.isArray(value) ? value[0] : value; +} + +export const metadata: Metadata = { + title: "وضعیت ثبت‌نام رویداد", + robots: { index: false, follow: false }, +}; + +export default async function EventRegistrationPage({ + params, + searchParams, +}: { + params: Params; + searchParams: SearchParams; +}) { + const [{ slug }, query] = await Promise.all([params, searchParams]); + const requestedRegistrationId = firstString(query.registration_id); + const requestedPaymentId = firstString(query.payment_id); + + return ( + + ); +} diff --git a/src/app/events/[slug]/success/page.tsx b/src/app/events/[slug]/success/page.tsx deleted file mode 100644 index b3d4edf..0000000 --- a/src/app/events/[slug]/success/page.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import type { Metadata } from "next"; -import EventFreeSuccessPage from "@/views/EventFreeSuccessPage"; - -export const metadata: Metadata = { - title: "نتیجه ثبت‌نام رویداد", - robots: { index: false, follow: false }, -}; - -export default function EventSuccessPage() { - return ; -} diff --git a/src/app/events/page.tsx b/src/app/events/page.tsx index 4ca5cc4..e67d580 100644 --- a/src/app/events/page.tsx +++ b/src/app/events/page.tsx @@ -77,6 +77,7 @@ export default async function EventsPage({ content={content} initialPage={eventPage} initialFilters={parseEventCatalogParams(query, eventPage.price_ceiling)} + unmatchedPaymentCallback={firstString(resolved.payment_callback) === "unmatched"} /> ); diff --git a/src/app/payments/result/page.tsx b/src/app/payments/result/page.tsx deleted file mode 100644 index 565683f..0000000 --- a/src/app/payments/result/page.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { Suspense } from "react"; -import type { Metadata } from "next"; -import PaymentResult from "@/views/PaymentResult"; - -export const metadata: Metadata = { - title: "نتیجه پرداخت", - robots: { index: false, follow: false }, -}; - -export default function PaymentResultPage() { - return ( - - - - ); -} diff --git a/src/components/OutcomePage.tsx b/src/components/OutcomePage.tsx new file mode 100644 index 0000000..30dd91b --- /dev/null +++ b/src/components/OutcomePage.tsx @@ -0,0 +1,295 @@ +"use client"; + +import { Children, useState, type ReactNode } from "react"; +import Image from "next/image"; +import { + ArrowLeft, + BadgeCheck, + Ban, + Check, + Clock3, + Copy, + CircleHelp, + LoaderCircle, + Mail, + Send, + TicketCheck, + X, +} from "lucide-react"; +import { Link } from "@/lib/router"; +import { Button } from "@/components/ui/button"; + +export type OutcomeTone = "success" | "pending" | "failed" | "canceled" | "unknown" | "checking"; + +export type OutcomeAction = { + label: string; + href?: string; + onClick?: () => void; + disabled?: boolean; + loading?: boolean; +}; + +type OutcomeDetail = { label: string; value: ReactNode }; + +type OutcomePageProps = { + tone: OutcomeTone; + statusLabel: string; + title: string; + subtitle: string; + event?: { title: string; imageUrl?: string | null; href?: string; caption?: string }; + details?: OutcomeDetail[]; + reference?: string | null; + referenceLabel?: string; + support?: boolean; + supportDescription?: string; + refreshing?: boolean; + primaryAction?: OutcomeAction; + secondaryActions?: OutcomeAction[]; + receiptRef?: React.Ref; + children?: ReactNode; +}; + +const toneClasses: Record = { + success: { + badge: "border-emerald-200 bg-emerald-50 text-emerald-800 dark:border-emerald-900 dark:bg-emerald-950/50 dark:text-emerald-200", + halo: "text-emerald-600 dark:text-emerald-300", + card: "border-emerald-200/80 dark:border-emerald-900/80", + }, + pending: { + badge: "border-amber-200 bg-amber-50 text-amber-900 dark:border-amber-900 dark:bg-amber-950/40 dark:text-amber-200", + halo: "text-amber-600 dark:text-amber-300", + card: "border-amber-200/80 dark:border-amber-900/80", + }, + failed: { + badge: "border-destructive/25 bg-destructive/10 text-destructive", + halo: "text-destructive", + card: "border-destructive/20", + }, + canceled: { + badge: "border-destructive/25 bg-destructive/10 text-destructive", + halo: "text-destructive", + card: "border-destructive/20", + }, + unknown: { + badge: "border-primary/20 bg-primary/5 text-primary", + halo: "text-primary", + card: "border-border", + }, + checking: { + badge: "border-primary/20 bg-primary/5 text-primary", + halo: "text-primary", + card: "border-border", + }, +}; + +function ToneIcon({ tone, className = "size-5" }: { tone: OutcomeTone; className?: string }) { + if (tone === "success") return ; + if (tone === "pending") return ; + if (tone === "failed") return ; + if (tone === "canceled") return ; + if (tone === "checking") return ; + return ; +} + +function PaymentIllustration({ tone }: { tone: OutcomeTone }) { + const colors = toneClasses[tone]; + + return ( +