Merge branch 'main' into labor-hackathon-2026

Author: TechQuery

.env

@@ -11,7 +11,12 @@ NEXT_PUBLIC_ACTIVITY_TABLE_ID = tblREEMxDOECZZrK
 NEXT_PUBLIC_PROJECT_TABLE_ID = tblGnY6Hm0nTSBR9
 NEXT_PUBLIC_AWARD_TABLE_ID = tblmYd5V5BMngAp2
 
-NEXT_PUBLIC_STRAPI_API_HOST = https://china-ngo-db.onrender.com/api/
+NEXT_PUBLIC_STRAPI_API_HOST = https://test.nomad-home.cn/api/Lark/
+NEXT_PUBLIC_NGO_BASE_ID = Kfs0bHJZhaKtJLs3uBTcnynnnNf
+NEXT_PUBLIC_NGO_TABLE_ID = tbl3eTvwgMGukhqL
+NEXT_PUBLIC_NGO_YEAR_STATISTIC_TABLE_ID = tblNWHacXaiEYC50
+NEXT_PUBLIC_NGO_CITY_STATISTIC_TABLE_ID = tblFFyaTEpGAaZNl
+NEXT_PUBLIC_NGO_TYPE_STATISTIC_TABLE_ID = tblZeAOFqH6zX6Tr
 
 SMTP_HOST = smtp.feishu.cn
 SMTP_PORT = 465

.npmrc

@@ -1,3 +1 @@
 auto-install-peers = false
-//npm.pkg.github.com/:_authToken=${GH_PAT} 
-@open-source-bazaar:registry=https://npm.pkg.github.com

README.md

@@ -22,11 +22,8 @@
 ## 开始
 
 ```bash
-npm install
-npm run dev
-# or
-yarn install
-yarn dev
+pnpm install
+pnpm dev
 ```
 
 可访问 http://localhost:3000.

components/Activity/Hackathon/ActionHub.tsx

@@ -1,4 +1,4 @@
-import type { FC, PropsWithChildren } from 'react';
+import type { FC, PropsWithChildren, ReactNode } from 'react';
 import { Col, Container, Row } from 'react-bootstrap';
 
 import { HackathonHeroAction } from './Hero';
@@ -14,7 +14,7 @@ export interface HackathonActionHubEntry {
 
 export interface HackathonActionHubProps {
   entries: HackathonActionHubEntry[];
-  facts: string[];
+  facts: ReactNode[];
   primaryAction?: HackathonHeroAction;
   primaryDescription: string;
   primaryTitle: string;
@@ -90,8 +90,8 @@ export const HackathonActionHub: FC<PropsWithChildren<HackathonActionHubProps>>
             </nav>
 
             <ul className={`list-unstyled ${styles.regFacts} d-flex flex-wrap gap-2 mt-4`}>
-              {facts.map(fact => (
-                <li key={fact}>{fact}</li>
+              {facts.map((fact, index) => (
+                <li key={index}>{fact}</li>
               ))}
             </ul>
           </div>

components/Activity/Hackathon/AgendaCountdown.module.less

@@ -0,0 +1,63 @@
+@import './theme.less';
+
+.wrap {
+  display: grid;
+  gap: 0.75rem;
+  max-width: 520px;
+}
+
+.label {
+  margin: 0;
+  color: @muted;
+  font-size: 0.72rem;
+  font-family: @heading;
+  letter-spacing: 0.1em;
+  text-transform: uppercase;
+}
+
+.grid {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 0.8rem;
+
+  .item {
+    gap: 0.7rem;
+    box-shadow:
+      inset 0 0 0 1px rgba(255, 255, 255, 0.03),
+      0 0 26px rgba(44, 232, 255, 0.08);
+    border: 1px solid rgba(44, 232, 255, 0.26);
+    border-radius: 18px;
+    background: linear-gradient(180deg, rgba(44, 232, 255, 0.08), rgba(44, 232, 255, 0.03));
+    min-height: 120px;
+
+    strong {
+      color: #fff;
+      font-size: clamp(2.3rem, 4vw, 3.8rem);
+      line-height: 1;
+      font-family: @heading;
+      letter-spacing: 0.08em;
+    }
+
+    span {
+      color: rgba(255, 255, 255, 0.72);
+      font-size: 0.82rem;
+      font-family: @heading;
+      letter-spacing: 0.2em;
+      text-transform: uppercase;
+    }
+  }
+}
+
+@media (max-width: 767px) {
+  .grid {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+
+    li {
+      min-height: 96px;
+
+      strong {
+        font-size: 2rem;
+      }
+    }
+  }
+}

components/Activity/Hackathon/AgendaCountdown.tsx

@@ -0,0 +1,50 @@
+import { TableCellValue } from 'mobx-lark';
+import { observer } from 'mobx-react';
+import { FC, useContext, useState } from 'react';
+import { Countdown, TimeUnit } from 'idea-react';
+
+import { Agenda } from '../../../models/Hackathon';
+import { I18nContext } from '../../../models/Translation';
+import styles from './AgendaCountdown.module.less';
+import { agendaTypeLabelOf, resolveCountdownState } from './utility';
+
+export interface AgendaCountdownProps {
+  agendaItems: Agenda[];
+  endTime?: TableCellValue;
+  startTime?: TableCellValue;
+  units: TimeUnit[];
+}
+
+const AgendaCountdown: FC<AgendaCountdownProps> = observer(
+  ({ agendaItems, endTime, startTime, units }) => {
+    const { t } = useContext(I18nContext);
+    const [referenceTime, setReferenceTime] = useState(Date.now());
+    const { nextItem: nextAgendaItem, countdownTo } = resolveCountdownState(
+      agendaItems,
+      referenceTime,
+      startTime,
+      endTime,
+    );
+
+    if (!countdownTo) return null;
+
+    const countdownLabel = nextAgendaItem
+      ? agendaTypeLabelOf(nextAgendaItem.type, t, t('agenda'))
+      : t('event_duration');
+
+    return (
+      <div className={styles.wrap}>
+        {countdownLabel && <p className={styles.label}>{countdownLabel}</p>}
+
+        <Countdown
+          className={styles.grid}
+          itemClassName={`${styles.item} d-flex flex-column align-items-center justify-content-center`}
+          endTime={countdownTo}
+          onEnd={() => setReferenceTime(Date.now())}
+          units={units}
+        />
+      </div>
+    );
+  },
+);
+export default AgendaCountdown;

components/Activity/Hackathon/Hero.module.less

@@ -179,54 +179,10 @@
   }
 }
 
-.countdownWrap {
-  display: grid;
-  gap: 0.75rem;
-  max-width: 520px;
-}
-
-.countdownLabel {
-  color: @muted;
-  font-size: 0.72rem;
-  font-family: @heading;
-  letter-spacing: 0.1em;
-  text-transform: uppercase;
-}
-
-.countdownGrid {
-  display: grid;
-  grid-template-columns: repeat(4, minmax(0, 1fr));
-  gap: 0.8rem;
-}
-
-.countdownCell {
-  gap: 0.7rem;
-  box-shadow:
-    inset 0 0 0 1px rgba(255, 255, 255, 0.03),
-    0 0 26px rgba(44, 232, 255, 0.08);
-  border: 1px solid rgba(44, 232, 255, 0.26);
-  border-radius: 18px;
-  background: linear-gradient(180deg, rgba(44, 232, 255, 0.08), rgba(44, 232, 255, 0.03));
-  min-height: 120px;
-
-  strong {
-    color: #fff;
-    font-size: clamp(2.3rem, 4vw, 3.8rem);
-    line-height: 1;
-    font-family: @heading;
-    letter-spacing: 0.08em;
-  }
-
-  span {
-    color: rgba(255, 255, 255, 0.72);
-    font-size: 0.82rem;
-    font-family: @heading;
-    letter-spacing: 0.2em;
-    text-transform: uppercase;
-  }
-}
-
 .actionButton {
+  // prettier-ignore
+  .button-primary();
+
   box-shadow: 0 0 28px rgba(44, 232, 255, 0.14);
   border-color: rgba(44, 232, 255, 0.48);
   background: rgba(44, 232, 255, 0.08);
@@ -240,6 +196,9 @@
 }
 
 .actionButtonGhost {
+  // prettier-ignore
+  .button-ghost();
+
   border-color: rgba(255, 255, 255, 0.16);
   background: rgba(255, 255, 255, 0.03);
   color: rgba(255, 255, 255, 0.82);
@@ -442,16 +401,4 @@
   .heroBadge {
     font-size: 0.72rem;
   }
-
-  .countdownGrid {
-    grid-template-columns: repeat(2, minmax(0, 1fr));
-  }
-
-  .countdownCell {
-    min-height: 96px;
-
-    strong {
-      font-size: 2rem;
-    }
-  }
 }