Merge pull request #64 from PNU-AID/dev

Dev: 헤더 수정 및 스터디 데이터 수정
PNU-AID · Feb 25, 2024 · 174ffda · 174ffda
2 parents 1111bc9 + d7a8e3d
commit 174ffda
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/src/components/common/Header.tsx b/src/components/common/Header.tsx
@@ -102,7 +102,7 @@ function Header() {
             isDropdownExpanded ? '' : 'overflow-hidden',
           ].join(' ')}
         >
-          <a href={import.meta.env.VITE_AID_NOTION_NEWS_URL} target="_blank">
+          {/* <a href={import.meta.env.VITE_AID_NOTION_NEWS_URL} target="_blank">
             <Button
               className={[
                 !isDarkPage(location.pathname)
@@ -114,7 +114,7 @@ function Header() {
               label="About Us"
               size="large"
             />
-          </a>
+          </a> */}
           {headerData.map((item) => {
             if (item.label === 'Login') {
               if (authState.isAuthenticated) {
@@ -182,7 +182,7 @@ function Header() {
                       : 'text-black',
                 ].join(' ')}
               >
-                Contack Us
+                About Us
               </button>
               <IoIosArrowDown
                 className={[

diff --git a/src/components/studypage/Modal.tsx b/src/components/studypage/Modal.tsx
@@ -38,12 +38,20 @@ export default function Modal({ isOpen, onClose, selectedItem }: ModalProps) {
             )}
             <div className="mb-4 text-base text-gray-600">
               <p>
-                <AiOutlineCalendar className="inline-block mr-2" /> 시작일:{' '}
-                {selectedItem.study_start.split('T')[0]}
+                {selectedItem.study_start && (
+                  <span>
+                    <AiOutlineCalendar className="inline-block mr-2" /> 시작일:{' '}
+                    {selectedItem.study_start.split('T')[0]}
+                  </span>
+                )}
               </p>
               <p>
-                <AiOutlineCalendar className="inline-block mr-2" /> 종료일:{' '}
-                {selectedItem.study_end.split('T')[0]}
+                {selectedItem.study_end && (
+                  <span>
+                    <AiOutlineCalendar className="inline-block mr-2" /> 종료일:{' '}
+                    {selectedItem.study_end.split('T')[0]}
+                  </span>
+                )}
               </p>
               <p>
                 <AiOutlineUser className="inline-block mr-2" />

diff --git a/src/components/studypage/Posts.tsx b/src/components/studypage/Posts.tsx
@@ -138,7 +138,9 @@ export default function Posts({ studyList }: { studyList: StudyItem[] }) {
             >
               <div className="flex justify-between mb-3 text-sm font-bold text-gray-400 border-b-2">
                 <span>{'study_name' in item ? '스터디' : '프로젝트'}</span>
-                <span>~{item.study_end.split('T')[0]}</span>
+                <span>
+                  {item.study_end ? `~${item.study_end.split('T')[0]}` : ''}
+                </span>
               </div>
               <div className="flex items-center justify-center h-40 mb-5">
                 <img

diff --git a/src/types/study.ts b/src/types/study.ts
@@ -12,8 +12,8 @@ export interface StudyItem {
   participants: string[];
   img_url: string;
   created_at: string;
-  study_start: string;
-  study_end: string;
+  study_start?: string;
+  study_end?: string;
 }
 
 export interface OptionProps {