Merge pull request #307 from GDSC-PKNU-Official/feat/#306

Feat/#306: 채용공지사항 기능 추가
GDSC-PKNU-Official · Jan 7, 2024 · 7e2221c · 7e2221c
2 parents f64d6c3 + efaaf43
commit 7e2221c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/components/Card/AnnounceCard/index.tsx b/src/components/Card/AnnounceCard/index.tsx
@@ -6,26 +6,36 @@ import openLink from '@utils/router/openLink';
 
 interface AnnounceCardProps extends AnnounceItem {
   author?: string;
+  recruitment_period?: string;
 }
 
 const AnnounceCard = ({
   title,
   link,
   uploadDate,
+  recruitment_period,
   author,
 }: AnnounceCardProps) => {
   const { major } = useMajor();
 
-  uploadDate = uploadDate.slice(2);
+  const showDate = () => {
+    if (recruitment_period) return recruitment_period;
+    uploadDate = uploadDate.slice(2);
+    return `20${uploadDate}`;
+  };
 
   return (
     <Card onClick={() => openLink(link)} data-testid="card">
       <ContentContainer>
         <AnnounceTitle>{title}</AnnounceTitle>
         <SubContent>
-          <AnnounceDate>20{uploadDate}</AnnounceDate>
-          <VertialBoundaryLine />
-          <Source>{author ? author : major}</Source>
+          <AnnounceDate>{showDate()}</AnnounceDate>
+          {!recruitment_period && (
+            <>
+              <VertialBoundaryLine />
+              <Source>{author ? author : major}</Source>
+            </>
+          )}
         </SubContent>
       </ContentContainer>
       <HorizonBoundaryLine />

diff --git a/src/pages/Announcement/index.tsx b/src/pages/Announcement/index.tsx
@@ -44,6 +44,16 @@ const Announcement = () => {
           />
         }
       />
+      <Route
+        path={PATH.RECRUIT_ANNOUNCEMENT}
+        element={
+          <AnnounceContainer
+            title={ANNOUNCEMENT_TITLE.RECRUIT}
+            category={ANNOUNCEMENT_CATEGORY.RECRUIT}
+            endPoint={'/recruit'}
+          />
+        }
+      />
     </Routes>
   );
 };