Merge pull request #1526 from 42organization/fix/#1465-myagenda-api-u…

…pdate [Fix] myagenda api 업데이트 된 부분 반영 #1465
42organization · Sep 3, 2024 · 3e54d12 · 3e54d12
2 parents b38bcdc + 4ca6df3
commit 3e54d12
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 68 deletions.
diff --git a/components/Pagination.tsx b/components/Pagination.tsx
@@ -22,7 +22,7 @@ function PageNation({
   const router = useRouter();
   return (
     <div className={router.pathname.includes('takgu') ? '' : styles.container}>
-      {!!totalPages && (
+      {totalPages && totalPages > 1 && (
         <Pagination
           activePage={curPage}
           itemsCountPerPage={1}

diff --git a/components/agenda/Form/AgendaForm.tsx b/components/agenda/Form/AgendaForm.tsx
@@ -39,6 +39,7 @@ const AgendaForm = ({
   tommorrow.setDate(today.getDate() + 1);
   tommorrow.setHours(0);
   tommorrow.setMinutes(0);
+  tommorrow.setSeconds(0);
   tommorrow.setMilliseconds(0);
   const startDate = new Date();
   const endDate = new Date();
@@ -99,6 +100,7 @@ const AgendaForm = ({
   const handleRecruitEnd = (e: React.ChangeEvent<HTMLInputElement>) => {
     if (!e.target.value) return;
     const newEnd = new Date(e.target.value);
+    console.log(newEnd);
     checkWarn(newEnd, 0);
     setRecruitEnd(new Date(e.target.value));
   };
@@ -124,6 +126,10 @@ const AgendaForm = ({
     const newWarning = [...dateWarn];
     const DateValues = [recruitEnd, dateRange[0], dateRange[1]];
     DateValues[index] = newDate;
+    tommorrow.setHours(0);
+    tommorrow.setMinutes(0);
+    tommorrow.setSeconds(0);
+    tommorrow.setMilliseconds(0);
     // 모집마감일 오류
     if (DateValues[0].getTime() < tommorrow.getTime()) {
       newWarning[0] = '내일 이후의 날짜를 선택해주세요';

diff --git a/components/agenda/Home/MyAgendaBtn.tsx b/components/agenda/Home/MyAgendaBtn.tsx
@@ -55,14 +55,7 @@ const MyAgendaBtn = () => {
       <div className={styles.myAgendaListContainer}>
         {myList.length > 0 ? (
           myList.map((myTeamInfo, idx) => (
-            <Link
-              href={`/agenda/${myTeamInfo.agendaKey}/${myTeamInfo.teamKey}`}
-              key={idx}
-            >
-              <div className={styles.myagendaItemContainer} key={idx}>
-                <MyTeamInfo myTeamInfo={myTeamInfo} key={idx} idx={idx} />
-              </div>
-            </Link>
+            <MyTeamInfo myTeamInfo={myTeamInfo} key={idx} idx={idx} />
           ))
         ) : (
           <div className={styles.noAgendaText}>There is no agenda</div>

diff --git a/components/agenda/Home/MyTeamInfo.tsx b/components/agenda/Home/MyTeamInfo.tsx
@@ -1,3 +1,4 @@
+import Link from 'next/link';
 import { MyTeamDataProps } from 'types/agenda/agendaDetail/agendaTypes';
 import { fillZero } from 'utils/handleTime';
 import AgendaTag from 'components/agenda/utils/AgendaTag';
@@ -15,39 +16,51 @@ const MyTeamInfo = ({
   if (!myTeamInfo) {
     return <div>참가중인 일정이 없습니다.</div>;
   }
-  // myTeamInfo.isOfficial = true; //css test
   const startDate = new Date(myTeamInfo.agendaStartTime as string);
-  //아래 주석달린 부분은 api 변경시 추가 예정입니다.
+
   return (
-    <div className={styles.Container} key={idx}>
-      <div className={agendastyles.agendaDateBox}>
-        <div className={agendastyles.agendaStartDateMonth}>
-          {fillZero(`${startDate.getMonth()}`, 2)}
-        </div>
+    <Link
+      href={`/agenda/${myTeamInfo.agendaKey}${
+        myTeamInfo.teamKey ? '/' + myTeamInfo.teamKey : ''
+      }`}
+      key={idx}
+    >
+      <div className={styles.Container} key={idx}>
+        <div className={agendastyles.agendaDateBox}>
+          <div className={agendastyles.agendaStartDateMonth}>
+            {fillZero(`${startDate.getMonth()}`, 2)}
+          </div>
 
-        <div className={agendastyles.agendaStartDateDay}>
-          {fillZero(`${startDate.getDate()}`, 2)}
-        </div>
-      </div>
-      <div className={styles.infoContainer}>
-        <div className={styles.teamInfoContainer}>
-          <h2 className={styles.teamTitle}>
-            팀이름 : {myTeamInfo.agendaTitle}
-          </h2>
-          {/* <div className={styles.agendaStatus}>
-          {myTeamInfo.isOfficial ? <AgendaTag tagName='공식' /> : ''}
-        </div> */}
+          <div className={agendastyles.agendaStartDateDay}>
+            {fillZero(`${startDate.getDate()}`, 2)}
+          </div>
         </div>
-        <div className={styles.agendaInfoContainer}>
-          <h3 className={styles.agendaTitle}>
-            아젠다 : {myTeamInfo.agendaTitle}
-          </h3>
-          <div className={styles.agendaTagBox}>
-            {myTeamInfo.isOfficial ? <AgendaTag tagName='공식' /> : ''}
+        <div className={styles.infoContainer}>
+          <div className={styles.teamInfoContainer}>
+            {myTeamInfo.teamName ? (
+              <>
+                <h2 className={styles.teamTitle}>{myTeamInfo.teamName}</h2>
+                <div className={styles.agendaTagBox}>
+                  {myTeamInfo.teamStatus === 'OPEN' ? (
+                    <AgendaTag tagName='모집중' />
+                  ) : (
+                    <AgendaTag tagName='확정팀' />
+                  )}
+                </div>
+              </>
+            ) : (
+              ''
+            )}
+          </div>
+          <div className={styles.agendaInfoContainer}>
+            <h3 className={styles.agendaTitle}>{myTeamInfo.agendaTitle}</h3>
+            <div className={styles.agendaTagBox}>
+              {myTeamInfo.isOfficial ? <AgendaTag tagName='공식' /> : ''}
+            </div>
           </div>
         </div>
       </div>
-    </div>
+    </Link>
   );
 };
 

diff --git a/components/agenda/Profile/CurrentList.tsx b/components/agenda/Profile/CurrentList.tsx
@@ -1,21 +1,25 @@
-import {
-  CurrentListProps,
-  CurrentItemProps,
-} from 'types/agenda/profile/currentListTypes';
+import Link from 'next/link';
+import { MyTeamDataProps } from 'types/agenda/agendaDetail/agendaTypes';
 import styles from 'styles/agenda/Profile/CurrentList.module.scss';
+import MyTeamInfo from '../Home/MyTeamInfo';
 
-const CurrentList = ({ currentListData, isHost }: CurrentListProps) => {
+const CurrentList = ({
+  currentListData,
+  isHost,
+}: {
+  currentListData: MyTeamDataProps[];
+  isHost: boolean;
+}) => {
   const listTitle = isHost ? '개최중 아젠다' : '참여중 아젠다';
   return (
     <div className={styles.currentListContainer}>
       <div className={styles.currentListTitle}>{listTitle}</div>
 
       <div className={styles.currentListItems}>
         {currentListData.length !== 0 ? (
-          currentListData.map((data: CurrentItemProps) => (
-            <div key={data.agendaId} className={styles.currentItemWrapper}>
-              <div className={styles.teamName}>{data.agendaTitle}</div>
-              <div className={styles.title}>{data.teamName}</div>
+          currentListData.map((data: MyTeamDataProps, idx: number) => (
+            <div className={styles.myagendaItemContainer} key={idx}>
+              <MyTeamInfo myTeamInfo={data} key={idx} idx={idx} />
             </div>
           ))
         ) : (

diff --git a/components/agenda/Ticket/Ticket.tsx b/components/agenda/Ticket/Ticket.tsx
@@ -13,8 +13,7 @@ const Ticket = ({ type }: { type: string }) => {
   const { openModal } = useModal();
 
   return (
-    <div className={styles.pageContainer}>
-      {' '}
+    <>
       {type === 'page' ? (
         <div className={styles.container}>
           <h1 className={styles.h1}>내 티켓</h1>
@@ -87,7 +86,7 @@ const Ticket = ({ type }: { type: string }) => {
           </div>
         </div>
       )}
-    </div>
+    </>
   );
 };
 

diff --git a/pages/agenda/profile/[intraId]/index.tsx b/pages/agenda/profile/[intraId]/index.tsx
@@ -1,5 +1,5 @@
 import { useRouter } from 'next/router';
-import { CurrentItemProps } from 'types/agenda/profile/currentListTypes';
+import { MyTeamDataProps } from 'types/agenda/agendaDetail/agendaTypes';
 import { HistoryItemProps } from 'types/agenda/profile/historyListTypes';
 import { ProfileDataProps } from 'types/agenda/profile/profileDataTypes';
 import AgendaUserSearchBar from 'components/agenda/Profile/AgendaUserSearchBar';
@@ -25,24 +25,28 @@ const AgendaProfile = () => {
       isMyProfile ? '/profile' : `/profile/${intraId}`
     );
 
+  // host current
   const {
     content: hostCurrentListData,
     PagaNationElementProps: PagaNationHostCurrent,
-  } = usePageNation<HistoryItemProps>({
+  } = usePageNation<MyTeamDataProps>({
     url: `/host/current/list/${intraId}`,
   });
 
-  const currentListData = useFetchGet<CurrentItemProps[]>(
+  // current team
+  const currentListData = useFetchGet<MyTeamDataProps[]>(
     '/profile/current/list'
   ).data;
 
+  // host history
   const {
     content: hostHistoryListData,
     PagaNationElementProps: PagaNationHostHistory,
   } = usePageNation<HistoryItemProps>({
     url: `/host/history/list/${intraId}`,
   });
 
+  // history
   const {
     content: historyListData,
     PagaNationElementProps: PagaNationHistory,

diff --git a/pages/agenda/ticket/index.tsx b/pages/agenda/ticket/index.tsx
@@ -1,7 +1,11 @@
 import Ticket from 'components/agenda/Ticket/Ticket';
-
+import styles from 'styles/agenda/Ticket/Ticket.module.scss';
 const ticket = () => {
-  return <Ticket type='page' />;
+  return (
+    <div className={styles.pageContainer}>
+      <Ticket type='page' />;
+    </div>
+  );
 };
 
 export default ticket;
diff --git a/styles/agenda/Home/MyTeamInfo.module.scss b/styles/agenda/Home/MyTeamInfo.module.scss
@@ -2,6 +2,12 @@
 
 .Container {
   display: flex;
+  max-width: 100%;
+  padding: 0.5rem 1rem;
+  background-color: var(--box-bg-1);
+  border: var(--default-border);
+  border-radius: $radius-medium;
+  box-shadow: var(--default-box-shadow);
   gap: 1rem;
 }
 

diff --git a/types/agenda/agendaDetail/agendaTypes.ts b/types/agenda/agendaDetail/agendaTypes.ts
@@ -34,8 +34,8 @@ export interface MyTeamDataProps {
   agendaTitle: string;
   agendaLocation: string; // ENUM 상단참고
   agendaStartTime?: Date | string;
-  teamStatus: string;
-  teamKey: string; // 내 팀 조회를 위한 key
+  teamStatus?: string;
+  teamKey?: string; // 내 팀 조회를 위한 key
   isOfficial: boolean; //공식대회여부
-  teamName: string; //fe 추가 0728 : 와이어프레임 참고
+  teamName?: string; //fe 추가 0728 : 와이어프레임 참고
 }
diff --git a/types/agenda/profile/currentListTypes.ts b/types/agenda/profile/currentListTypes.ts