- {event.posterUrl.map((cover, index) => (
+ {event.poster?.all?.map((cover, index) => (
({
+ paths: validResult.data?.map((event) => ({
params: { organization: event.organization?.slug, slug: event.slug },
})),
fallback: "blocking", // can also be true or 'blocking'
@@ -419,13 +437,30 @@ export async function getStaticPaths() {
}
export async function getStaticProps(context: GetStaticPropsContext) {
- const event = await xata.db.event
- .filter({
- slug: context.params?.slug as string,
- "organization.slug": context.params?.organization as string,
+ // const event = await xata.db.event
+ // .filter({
+ // slug: context.params?.slug as string,
+ // "organization.slug": context.params?.organization as string,
+ // })
+ // .select(["*", "organization"])
+ // .getFirst();
+
+ const response = await wfetch
+ .query({
+ slug: context.params?.slug,
+ organization: context.params?.organization,
})
- .select(["*", "organization"])
- .getFirst();
+ .get("/event/detail")
+ .json();
+
+ const validResult = EventSchema.safeParse(response);
+ const event = validResult.data;
+
+ if (validResult.error) {
+ console.log(`Error in render ${context?.params?.slug}`);
+ }
+
+ validResult.error && console.log(JSON.stringify(validResult.error));
if (!event) {
return {
@@ -434,30 +469,30 @@ export async function getStaticProps(context: GetStaticPropsContext) {
}
const metaDes =
- event?.startDate && event.endDate
+ event.startAt && event.endAt
? `欢迎来到FEC·兽展日历！FEC·兽展日历提供关于“${
event?.name
}”的详细信息：这是由“${
event?.organization?.name
}”举办的兽展，将于${format(
- event?.startDate!,
+ event?.startAt!,
"yyyy年MM月dd日"
- )}至${format(event?.endDate!, "yyyy年MM月dd日")}在“${event?.city}${
- event?.address
- }”举办，喜欢的朋友记得关注开始售票时间～`
- : `欢迎来到FEC·兽展日历！FEC·兽展日历提供关于“${event?.name}”的详细信息：这是由“${event?.organization?.name}”举办的兽展，将在“${event?.city}${event?.address}”举办，喜欢的朋友记得关注开始售票时间～`;
+ )}至${format(event?.endAt!, "yyyy年MM月dd日")}在“${
+ event?.addressExtra?.city
+ }${event?.address}”举办，喜欢的朋友记得关注开始售票时间～`
+ : `欢迎来到FEC·兽展日历！FEC·兽展日历提供关于“${event?.name}”的详细信息：这是由“${event?.organization?.name}”举办的兽展，将在“${event?.addressExtra?.city}${event?.address}”举办，喜欢的朋友记得关注开始售票时间～`;
return {
props: {
- event,
+ event: validResult.data,
headMetas: {
title: `${event?.name}-${event?.organization?.name}`,
keywords: keywordgenerator({
page: "event",
event: {
name: event?.name,
- startDate: event?.startDate,
- city: event?.city,
+ startDate: event?.startAt,
+ city: event?.addressExtra?.city || undefined,
},
}),
des: metaDes,
@@ -492,8 +527,8 @@ export async function getStaticProps(context: GetStaticPropsContext) {
"@context": "https://schema.org",
"@type": "Event",
name: event?.name,
- startDate: event?.startDate,
- endDate: event?.endDate,
+ startDate: event?.startAt,
+ endDate: event?.endAt,
eventStatus:
EventStatusSchema[event?.status || EventStatus.EventScheduled],
eventAttendanceMode: "https://schema.org/OfflineEventAttendanceMode",
@@ -503,7 +538,7 @@ export async function getStaticProps(context: GetStaticPropsContext) {
address: {
"@type": "PostalAddress",
streetAddress: event?.address,
- addressLocality: event?.city,
+ addressLocality: event?.addressExtra?.city,
// postalCode: "19019",
// addressRegion: event?.city,
addressCountry: "CN",
@@ -530,8 +565,8 @@ export async function getStaticProps(context: GetStaticPropsContext) {
},
},
imageObject: [
- ...(event?.coverUrl ? [event.coverUrl] : []),
- ...(event?.posterUrl || []),
+ ...(event?.thumbnail ? [event.thumbnail] : []),
+ ...(event?.poster?.all || []),
].map((image) => ({
"@context": "https://schema.org/",
"@type": "ImageObject",
diff --git a/src/pages/[organization]/index.tsx b/src/pages/[organization]/index.tsx
index 9987049..05541a9 100644
--- a/src/pages/[organization]/index.tsx
+++ b/src/pages/[organization]/index.tsx
@@ -1,7 +1,6 @@
import EventCard from "@/components/eventCard";
import OrganizationStatus from "@/components/organizationStatus";
import styles from "@/styles/Organization.module.css";
-import { Event, Organization, XataClient } from "@/xata/xata";
import clsx from "clsx";
import Image from "@/components/image";
import { GetStaticPropsContext } from "next/types";
@@ -10,10 +9,15 @@ import toast from "react-hot-toast";
import { FaPaw, FaQq, FaTwitter, FaWeibo } from "react-icons/fa";
import { MdOutlineContentCopy } from "react-icons/md";
import { SiBilibili } from "react-icons/si";
-import { formatDistanceToNowStrict } from "date-fns";
+import { formatDistanceToNowStrict, isBefore } from "date-fns";
import { zhCN } from "date-fns/locale";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
import { useTranslation } from "next-i18next";
+import wfetch from "@/api";
+import { z } from "zod";
+import { format } from "date-fns";
+import { EventType } from "@/types/event";
+import { OrganizationType } from "@/types/organization";
// import {
// WebsiteButton,
// QQGroupButton,
@@ -24,18 +28,17 @@ import { useTranslation } from "next-i18next";
// WikifurButton,
// } from "@/components/OrganizationLinkButton";
-const xata = new XataClient();
export default function OrganizationDetail(props: {
- events: Event[];
- organization: Organization;
+ events: EventType[];
+ organization: OrganizationType;
}) {
const { t } = useTranslation();
const { organization, events } = props;
const formattedFirstEventTime = useMemo(() => {
const theBeginningEvent = events[events.length - 1];
- if (theBeginningEvent && theBeginningEvent.startDate) {
- const date = new Date(theBeginningEvent.startDate);
+ if (theBeginningEvent && theBeginningEvent.startAt) {
+ const date = new Date(theBeginningEvent.startAt);
return {
year: date.getUTCFullYear(),
@@ -252,47 +255,101 @@ export default function OrganizationDetail(props: {
}
export async function getStaticPaths() {
- const organizations = await xata.db.organization.select(["*"]).getAll();
+ const organizations = await wfetch.get("/organization/all").json();
+
+ const organizationSchema = z.array(
+ z.object({
+ slug: z.string().min(1),
+ })
+ );
+
+ const validOrganizations = organizationSchema.safeParse(organizations);
+
return {
- paths: organizations.map((organization) => ({
+ paths: validOrganizations?.data?.map((organization) => ({
params: { organization: organization.slug },
})),
- fallback: "blocking", // can also be true or 'blocking'
+ fallback: "blocking",
};
}
export async function getStaticProps(context: GetStaticPropsContext) {
- const organizationPromise = xata.db.organization
- .filter({
- slug: context.params?.organization as string,
- })
- .select(["*"])
- .getFirst();
+ const response = await wfetch
+ .query({ slug: context.params?.organization })
+ .get("/organization/detail")
+ .json();
- const eventPromise = xata.db.event
- .filter({
- "organization.slug": context.params?.organization as string,
+ const organizationSchema = z.object({
+ id: z.string().uuid(), // 假设 id 是一个 UUID
+ slug: z.string().min(1), // slug 至少有一个字符
+ name: z.string().min(1), // name 至少有一个字符
+ description: z.string().nullable(), // description 至少有一个字符
+ status: z.enum(["active", "inactive"]), // 假设 status 只能是 'active' 或 'inactive'
+ type: z.string().nullable(), // type 可以是字符串或 null
+ logoUrl: z.string().nullable(), // logoUrl 应该是一个有效的 URL
+ richMediaConfig: z.any().nullable(), // richMediaConfig 可以是任意类型或 null
+ contactMail: z.string().email().nullable(), // contactMail 应该是一个有效的邮箱地址
+ website: z.string().url().nullable(), // website 应该是一个有效的 URL
+ twitter: z.string().url().nullable(), // twitter 可以是有效的 URL 或 null
+ weibo: z.string().url().nullable(), // weibo 可以是有效的 URL 或 null
+ qqGroup: z.string().nullable(), // qqGroup 可以是字符串或 null
+ bilibili: z.string().url().nullable(), // bilibili 可以是有效的 URL 或 null
+ wikifur: z.string().url().nullable(), // wikifur 可以是有效的 URL 或 null
+ creationTime: z
+ .string()
+ .refine((date) => !isNaN(Date.parse(date)), {
+ message: "Invalid date format",
+ })
+ .nullable(), // creationTime 应该是一个有效的日期字符串
+ });
+
+ const eventSchema = z.object({
+ name: z.string(),
+ address: z.string().nullable(),
+ addressExtra: z.object({ city: z.string().nullable() }).nullable(),
+ thumbnail: z.string().nullable(),
+ startAt: z.string().datetime().nullable(),
+ endAt: z.string().datetime().nullable(),
+ slug: z.string(),
+ });
+
+ const validResult = z
+ .object({
+ organization: organizationSchema,
+ events: z.array(eventSchema),
})
- .select(["*", "organization.name", "organization.slug"])
- .sort("startDate", "desc")
- .getAll();
+ .safeParse(response);
- const [organization, events] = await Promise.all([
- organizationPromise,
- eventPromise,
- ]);
+ const validOrganization = validResult.data?.organization;
+ const validEvents = validResult.data?.events
+ ?.map((e) => ({
+ ...e,
+ organization: {
+ name: validOrganization?.name,
+ slug: validOrganization?.slug,
+ logoUrl: validOrganization?.logoUrl,
+ },
+ }))
+ .sort((a, b) => {
+ if (a.startAt && b.startAt) {
+ return isBefore(a.startAt, b.startAt) ? 1 : -1;
+ }
+ return 0;
+ });
+ const slug = context?.params?.organization;
+ if (validResult.error) {
+ console.log(
+ `Error in render ${slug},reason:${JSON.stringify(
+ validResult.error
+ )}`
+ );
+ }
- const date = events?.[0]?.startDate && new Date(events[0].startDate);
- const dateObj = date && {
- year: date.getFullYear(),
- month: date.getUTCMonth() + 1,
- day: date.getUTCDate(),
- };
- const dateString = date
- ? `${dateObj?.year}年${dateObj?.month}月${dateObj?.day}日`
+ const dateString = validEvents?.[0]?.startAt
+ ? format(validEvents?.[0].startAt, "yyyy年MM月dd日")
: "未知时间线";
- if (!organization) {
+ if (!response) {
return {
notFound: true,
};
@@ -300,22 +357,22 @@ export async function getStaticProps(context: GetStaticPropsContext) {
return {
props: {
- organization,
- events,
+ organization: validOrganization,
+ events: validEvents,
headMetas: {
- title: `${organization?.name}`,
+ title: `${validOrganization?.name}`,
des: `欢迎来到FEC·兽展日历！FEC·兽展日历提供关于 ${
- organization?.name
+ validOrganization?.name
} 的有关信息，这家展商已累计举办 ${
- events.length
+ validEvents?.length
} 场兽展，最近的一场在${dateString}，${
- organization?.description
- ? `他们是这样介绍自己的：“${organization?.description}”。`
+ validOrganization?.description
+ ? `他们是这样介绍自己的：“${validOrganization?.description}”。`
: "不过他们没怎么介绍自己。"
}`,
- keywords: `${organization?.name}, ${organization?.name} 兽展, ${organization?.name} 兽聚`,
- url: `https://www.furryeventchina.com/${organization?.slug}`,
- cover: organization?.logoUrl,
+ keywords: `${validOrganization?.name}, ${validOrganization?.name} 兽展, ${validOrganization?.name} 兽聚`,
+ url: `https://www.furryeventchina.com/${validOrganization?.slug}`,
+ cover: validOrganization?.logoUrl,
},
structuredData: {
breadcrumb: {
@@ -331,7 +388,7 @@ export async function getStaticProps(context: GetStaticPropsContext) {
{
"@type": "ListItem",
position: 2,
- name: organization?.name,
+ name: validOrganization?.name,
},
],
},
diff --git a/src/pages/city.tsx b/src/pages/city.tsx
index 726c88b..b6a65e7 100644
--- a/src/pages/city.tsx
+++ b/src/pages/city.tsx
@@ -1,27 +1,23 @@
import { eventGroupByYear } from "@/utils/event";
import { sendTrack } from "@/utils/track";
-import { Event, XataClient } from "@/xata/xata";
import groupBy from "lodash-es/groupBy";
import Link from "next/link";
-import { useMemo, useState } from "react";
+import { useMemo } from "react";
import { getEventCoverImgPath } from "@/utils/imageLoader";
import { format } from "date-fns";
import Image from "@/components/image";
import { titleGenerator } from "@/utils/meta";
-import {
- Collapsible,
- CollapsibleContent,
- CollapsibleTrigger,
-} from "@/components/ui/collapsible";
-import { Button } from "@headlessui/react";
-import { FaAngleDown, FaLink } from "react-icons/fa6";
+import { FaLink } from "react-icons/fa6";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
+import { EventSchema, EventType } from "@/types/event";
+import wfetch from "@/api";
+import { z } from "zod";
-export default function City(props: { events: Event[] }) {
+export default function City(props: { events: EventType[] }) {
const { events } = props;
const groupByCityEvents = useMemo(() => {
- return groupBy(events, (event) => event.city);
+ return groupBy(events, (event) => event.addressExtra?.city);
}, [events]);
const cities = useMemo(() => {
@@ -106,10 +102,6 @@ export default function City(props: { events: Event[] }) {
{yearGroup.year === "no-date" ? "暂未定档" : yearGroup.year}
- {/* */}
))}
{events.map((event) => (
@@ -149,15 +141,12 @@ function CityYearSelection({ events }: { events: Event[] }) {