From f6fb3a7753d79f2c301741a901915619663460ba Mon Sep 17 00:00:00 2001
From: JiPai <3956400+PaiJi@users.noreply.github.com>
Date: Sun, 28 Jan 2024 02:58:17 +0800
Subject: [PATCH] feat(everything): tiny issues (#143)

---
 next.config.js                     |  2 +-
 src/components/eventCard/index.tsx |  8 ++---
 src/components/layout/footer.tsx   | 12 ++++----
 src/components/layout/header.tsx   |  2 +-
 src/constants/staticConfig.ts      | 47 +++++++++++++++++++-----------
 src/pages/_document.tsx            |  6 ----
 src/pages/city.tsx                 |  2 +-
 src/pages/years.tsx                |  1 -
 src/utils/imageLoader.ts           |  7 ++++-
 src/utils/track.ts                 |  2 --
 10 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/next.config.js b/next.config.js
index 00c9937..99c1a79 100644
--- a/next.config.js
+++ b/next.config.js
@@ -44,7 +44,7 @@ const nextConfig = {
     config.plugins.push(
       new webpack.DefinePlugin({
         VERSION: JSON.stringify(gitRevisionPlugin.version()),
-        COMMITHASH: JSON.stringify(gitRevisionPlugin.commithash()),
+        COMMITHASH: JSON.stringify(gitRevisionPlugin.commithash().slice(0, 7)),
         BRANCH: JSON.stringify(gitRevisionPlugin.branch()),
         LASTCOMMITDATETIME: JSON.stringify(
           gitRevisionPlugin.lastcommitdatetime()
diff --git a/src/components/eventCard/index.tsx b/src/components/eventCard/index.tsx
index c616cf1..f33737e 100644
--- a/src/components/eventCard/index.tsx
+++ b/src/components/eventCard/index.tsx
@@ -7,6 +7,7 @@ import { BsCalendar2DateFill } from "react-icons/bs";
 import Image from "@/components/image";
 import clsx from "clsx";
 import { sendTrack } from "@/utils/track";
+import { getEventCoverUrl } from "@/utils/imageLoader";
 
 export default function EventCard({
   event,
@@ -17,10 +18,7 @@ export default function EventCard({
 }) {
   const [isWiderImage, setIsWiderImage] = useState(true);
 
-  const finalEventCoverImage =
-    event.coverUrl ||
-    event.posterUrl?.[0] ||
-    `https://images.furrycons.cn/fec-event-default-cover.png`;
+  const finalEventCoverImage = getEventCoverUrl(event);
   const isDefaultCover = finalEventCoverImage.includes(
     "fec-event-default-cover"
   );
@@ -116,7 +114,7 @@ export default function EventCard({
               <div className="flex items-center">
                 <IoLocation className="text-white mr-1" />
                 <span aria-label="活动地址" className="truncate">
-                  {event.address}
+                  {event.address || "尚未公布"}
                 </span>
               </div>
             </div>
diff --git a/src/components/layout/footer.tsx b/src/components/layout/footer.tsx
index 05003ee..81a60f0 100644
--- a/src/components/layout/footer.tsx
+++ b/src/components/layout/footer.tsx
@@ -9,9 +9,10 @@ export default function Footer({ isCNRegion }: { isCNRegion: boolean }) {
   return (
     <footer className="mt-8 bg-white rounded-t-xl p-6 text-sm text-center md:text-left">
       <h5 className="block text-gray-600 mb-4 text-sm flex flex-col md:flex-row">
-        <span className="font-bold mr-2">毛茸茸展会目录</span>
+        <span className="font-bold mr-2">FEC·兽展日历</span>
         <span className="">
-          FURRYEVENTCHINA.COM ©️{new Date().getFullYear()}
+          {isCNRegion ? "FURRYCONS.CN" : "FURRYEVENTCHINA.COM"} ©️
+          {new Date().getFullYear()}
         </span>
       </h5>
 
@@ -100,7 +101,7 @@ export function FriendSiteBlock() {
   return (
     <section className="bg-white p-6 rounded-xl mt-8 mx-1 lg:mx-0">
       <h3 className="font-bold text-gray-600 text-2xl">友情链接</h3>
-      <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mt-4">
+      <div className="grid grid-cols-1 md:grid-cols-3 gap-4 mt-4">
         {FriendSiteLinks.map((link) => (
           <Link
             href={link.link}
@@ -113,11 +114,12 @@ export function FriendSiteBlock() {
                 },
               })
             }
-            className="bg-white p-6 rounded-xl flex items-center justify-center border group hover:border-red-300 transition duration-300 relative"
+            className="bg-white p-6 rounded-xl flex flex-col border group hover:border-red-300 hover:bg-red-300 transition duration-300 relative"
           >
-            <h4 className="transition duration-300 text-center text-gray-600 group-hover:text-red-300 underline decoration-transparent group-hover:decoration-current decoration-wavy underline-offset-4">
+            <h4 className="text-xl font-bold mb-3 transition duration-300 text-gray-600 group-hover:text-white decoration-transparent group-hover:decoration-current decoration-wavy">
               {link.label}
             </h4>
+            <p className="group-hover:text-white transition duration-300 text-gray-600">{link.description}</p>
           </Link>
         ))}
       </div>
diff --git a/src/components/layout/header.tsx b/src/components/layout/header.tsx
index f6269b4..8aa71e7 100644
--- a/src/components/layout/header.tsx
+++ b/src/components/layout/header.tsx
@@ -32,7 +32,7 @@ export default function Header() {
     <header className="mb-6 rounded-b-xl bg-white flex justify-between max-sm:sticky max-sm:top-0 max-sm:z-20 max-sm:shadow">
       <div className="m-2 md:m-6 text-base md:text-4xl text-geraldine font-bold">
         <span className="block">FEC 🐺🐱🐯</span>
-        <span className="text-base mt-0 block">毛茸茸展会目录</span>
+        <span className="text-base mt-0 block">FEC·兽展日历 / 新年快乐！🏮</span>
       </div>
       <div
         className="block sm:hidden flex align-end justify-end mx-4 md:px-6 md:py-8 text-3xl text-red-400 items-center"
diff --git a/src/constants/staticConfig.ts b/src/constants/staticConfig.ts
index 1f0cd82..264310c 100644
--- a/src/constants/staticConfig.ts
+++ b/src/constants/staticConfig.ts
@@ -2,36 +2,49 @@ export const FriendSiteLinks = [
   {
     link: "https://www.wilddream.net/?utm_source=fec",
     label: "WildDream创作站",
+    description:
+      "WildDream 创作站（野梦）是一个以原创作品分享为主的中文兽、兽人、动物、奇幻生物主题创作与交流站点，自 2015 年 8 月以来，为兽主题作品提供托管与展示服务。",
   },
   {
     link: "https://www.kemono.games/?utm_source=fec",
     label: "兽人控游戏库 Kemono.Games",
+    description:"地表最强兽人控游戏索引！从传统角色扮演兽游到恋爱模拟，或是战略类兽人游戏，甚至更小众的选择，你都能在这里找到。"
   },
+  {
+    link: "https://novel.tigerkk.me/?utm_source=fec",
+    label: "兽人控小说站",
+    description:
+      "兽人控小说站是一个专为兽人控打造的聚合在线阅读平台。在这里，你可以找到和各种兽人相关的小说，随时享受阅读的乐趣，无需下载或安装任何软件。还可以自由切换翻译，选择你喜欢的阅读模式。",
+  },
+
   {
     link: "https://furcoder.org/?utm_source=fec",
     label: "FurCoder.org",
+    description: "FurryEventChina.COM 是 FurCoder 组织下的托管项目。",
   },
   {
     link: "https://m.nyanket.com/?utm_source=fec",
     label: "Nyanket 喵通贩",
+    description:
+      "Nyanket 喵通贩 是最早立足于提供 票务一体化解决方案 的服务商，我们与兽展的故事起源于兽夏祭。",
   },
 ];
 
 export const AboutUsLinks = [
-    {
-      link: "https://github.com/FurCoder/furry-event-china",
-      label: "GitHub",
-    },
-    {
-      link: "https://status.furryeventchina.com",
-      label: "Status 监控",
-    },
-    {
-      link: "https://docs.furryeventchina.com",
-      label: "帮助文档",
-    },
-    {
-      link: "mailto:contact@furryeventchina.com",
-      label: "邮件联系我们",
-    },
-  ];
\ No newline at end of file
+  {
+    link: "https://github.com/FurCoder/furry-event-china",
+    label: "GitHub",
+  },
+  {
+    link: "https://status.furryeventchina.com",
+    label: "Status 监控",
+  },
+  {
+    link: "https://docs.furryeventchina.com",
+    label: "帮助文档",
+  },
+  {
+    link: "mailto:contact@furryeventchina.com",
+    label: "邮件联系我们",
+  },
+];
diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
index 5c85b2e..9bfd58a 100644
--- a/src/pages/_document.tsx
+++ b/src/pages/_document.tsx
@@ -2,12 +2,6 @@ import { Html, Head, Main, NextScript } from "next/document";
 import Script from "next/script";
 
 const isEnableTrack = process.env.ENABLE_TRACK === "true";
-console.log(
-  "ENABLE_TRACK",
-  process.env.ENABLE_TRACK,
-  typeof process.env.ENABLE_TRACK,
-  isEnableTrack
-);
 
 export default function Document() {
   return (
diff --git a/src/pages/city.tsx b/src/pages/city.tsx
index 2a3c130..8d473b4 100644
--- a/src/pages/city.tsx
+++ b/src/pages/city.tsx
@@ -65,7 +65,7 @@ export default function City(props: { events: Event[] }) {
         </ul>
 
         <p className="text-gray-600 mt-4">
-          FurrrEventChina.com 共在 {cities.length} 个城市收录到 {events.length}{" "}
+          我们共在 {cities.length} 个城市收录到 {events.length}{" "}
           个活动，其中，举办活动次数最多的城市是{" "}
           <span className="font-bold">
             {groupByCityEventsSortByTotalCount[0]}市
diff --git a/src/pages/years.tsx b/src/pages/years.tsx
index b143483..308f278 100644
--- a/src/pages/years.tsx
+++ b/src/pages/years.tsx
@@ -18,7 +18,6 @@ export default function Years({ events }: { events: Event[] }) {
     <div className="">
       <div className="mb-4 border rounded-xl p-6 bg-white">
         <p className="text-gray-600">
-          FurryEventChina.com{" "}
           {years.filter((year) => year !== "no-date").length} 年共收录到{" "}
           {events.length} 个活动，历年活动数据如下：
         </p>
diff --git a/src/utils/imageLoader.ts b/src/utils/imageLoader.ts
index 8364121..5e6fdd7 100644
--- a/src/utils/imageLoader.ts
+++ b/src/utils/imageLoader.ts
@@ -2,12 +2,13 @@ import { ImageLoaderProps } from "next/image";
 import { EventRecord } from "@/xata/xata";
 
 const GLOBAL_AUTO_CDN_IMAGE_URL = "images.furrycons.cn";
+const GLOBAL_MANUAL_CDN_IMAGE_URL = "images.furryeventchina.com";
 
 export const getEventCoverUrl = (event: Partial<EventRecord>) => {
   return imageUrl(
     event.coverUrl ||
       event.posterUrl?.[0] ||
-      `https://images.furryeventchina.com/fec-event-default-cover.png`
+      `https://images.furrycons.cn/fec-event-default-cover.png`
   );
 };
 
@@ -18,6 +19,10 @@ export const imageUrl = (src: string) => {
     .replace("https://images.furrycons.cn/", "")
     .trim();
 
+  if (process.env.NODE_ENV === "development") {
+    return `https://${GLOBAL_MANUAL_CDN_IMAGE_URL}/${withoutDefaultHostSrc}`;
+  }
+
   return `https://${GLOBAL_AUTO_CDN_IMAGE_URL}/${withoutDefaultHostSrc}`;
 };
 
diff --git a/src/utils/track.ts b/src/utils/track.ts
index 677989f..f8e8d1c 100644
--- a/src/utils/track.ts
+++ b/src/utils/track.ts
@@ -8,14 +8,12 @@ export function sendTrack({
   if (process.env.NODE_ENV !== "production") {
     return console.info("Send Track", eventName, eventValue);
   }
-  window.umami?.track(eventName, eventValue);
   window.gtag && window.gtag("event", eventName, eventValue);
   window.mixpanel?.track(eventName, eventValue);
 }
 
 declare global {
   interface Window {
-    umami: { track: Function } | undefined;
     gtag: Function | undefined;
     mixpanel: { track: Function } | undefined;
     TMap: any | undefined;