feat(campaign): show announcements

thematters · Aug 19, 2024 · 0a989c9 · 0a989c9
1 parent c048621
commit 0a989c9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/src/definitions/index.d.ts b/src/definitions/index.d.ts
@@ -203,6 +203,7 @@ export type CampaignDetail = CampaignDigest & {
       application: GQLCampaignApplication
     }[]
   }
+  announcements: Array<ArticleDigest>
   articles: Connection<ArticleDigest>
 }
 

diff --git a/src/gql/fragments/campaign/detail.gql b/src/gql/fragments/campaign/detail.gql
@@ -21,6 +21,9 @@ fragment CampaignDetail on WritingChallenge {
       end
     }
   }
+  announcements {
+    ...ArticleDigest
+  }
   participants(input: { first: null, oss: true }) {
     edges {
       application {

diff --git a/src/pages/CampaignDetail/index.tsx b/src/pages/CampaignDetail/index.tsx
@@ -74,12 +74,6 @@ class CampaignDetail extends React.Component<CampaignDetailChildProps> {
             <DateTime date={campaign.writingPeriod?.end} dateOnly />
           </Description>
 
-          <Description term="活動公告">
-            <a href={campaign.link} target="_blank" rel="noreferrer">
-              {campaign.link}
-            </a>
-          </Description>
-
           <Description term="站內連結">
             <a
               href={`${SITE_DOMIAN}/e/${campaign.shortHash}`}
@@ -98,29 +92,36 @@ class CampaignDetail extends React.Component<CampaignDetailChildProps> {
             <Cover cover={campaign.cover} />
           </Description>
         </DescriptionList>
+
+        <DescriptionList size="large" title="活動公告">
+          <Description term="规则公告連結">
+            <a href={campaign.link} target="_blank" rel="noreferrer">
+              {campaign.link}
+            </a>
+          </Description>
+
+          <Col span={24} style={{ marginBottom: 16 }}>
+            <ArticleDigestList data={campaign.announcements} />
+          </Col>
+        </DescriptionList>
         <Divider size="large" />
 
         <DescriptionList size="large" title="投稿選項" col={1}>
           <Table bordered dataSource={campaign.stages}>
             <ColumnGroup title="繁">
-              <Column title="名稱" dataIndex="name" key="name" width="5" />
+              <Column title="名稱" dataIndex="name" key="name" />
               <Column title="簡介" dataIndex="description" key="description" />
             </ColumnGroup>
             <ColumnGroup title="英">
-              <Column title="名稱" dataIndex="nameEn" key="nameEn" width="5" />
+              <Column title="名稱" dataIndex="nameEn" key="nameEn" />
               <Column
                 title="簡介"
                 dataIndex="descriptionEn"
                 key="descriptionEn"
               />
             </ColumnGroup>
             <ColumnGroup title="簡">
-              <Column
-                title="名稱"
-                dataIndex="nameZhHans"
-                key="nameZhHans"
-                width="5"
-              />
+              <Column title="名稱" dataIndex="nameZhHans" key="nameZhHans" />
               <Column
                 title="簡介"
                 dataIndex="descriptionZhHans"
-Original file line number
+Diff line change
@@ Expand Up / @@ -203,6 +203,7 @@ export type CampaignDetail = CampaignDigest & { @@
           application: GQLCampaignApplication
         }[]
       }
+      announcements: Array<ArticleDigest>
       articles: Connection<ArticleDigest>
     }
@@ Expand Down @@