Merge branch 'feature-community' into comment/#138

nori-dongsan · Jul 21, 2022 · 35321c1 · 35321c1
2 parents 6a6abff + a484b1c
commit 35321c1
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 43 deletions.
diff --git a/components/community/ContentCard.tsx b/components/community/ContentCard.tsx
@@ -2,8 +2,6 @@ import styled from '@emotion/styled';
 import { IcReply, IcHeart, IcDot } from '../../public/assets/icons';
 import CommunityCategory from './CommunityCategory';
 import Router from 'next/router';
-import { useRouter } from 'next/router';
-import Link from 'next/link';
 
 interface ContentInfoProps {
   id: string;
@@ -41,7 +39,7 @@ export default function ContentCard(props: ContentInfoProps) {
         <StWriteInfo>
           <span>{userNickname}</span>
           <IcDot />
-          <span>{createdAt.split('T')[0]}</span>
+          <span>{createdAt?.split('T')[0]}</span>
         </StWriteInfo>
         <StReplyInfo>
           <IcHeart />

diff --git a/components/community/ReplyContent.tsx b/components/community/ReplyContent.tsx
@@ -6,11 +6,11 @@ interface ReplyContentProps {
   author: boolean;
   userNickname?: string;
   content: string;
-  createdAt: string;
+  createAt: string;
 }
 
 export default function ReplyContent(props: ReplyContentProps) {
-  const { userNickname, content, createdAt, author } = props;
+  const { userNickname, content, createAt, author } = props;
 
   return (
     <StReplyContentWrapper>
@@ -21,7 +21,7 @@ export default function ReplyContent(props: ReplyContentProps) {
       <StReplyContents>
         <p>{content}</p>
         <span>
-          {createdAt} · {author ? '삭제' : '신고'}
+          {createAt} · {author ? '삭제' : '신고'}
         </span>
       </StReplyContents>
     </StReplyContentWrapper>

diff --git a/components/community/ReplyList.tsx b/components/community/ReplyList.tsx
@@ -26,6 +26,10 @@ export default function ReplyList(props: ReplyListProps) {
   });
   const [currentPage, setCurrentPage] = useState<number>(1);
   const [pageReplyList, setPageReplyList] = useState<ReplyData[]>([]);
+  const [isFirst, setIsFirst] = useState<boolean>(true);
+
+  console.log('=========================');
+  console.log(replyList);
 
   const handleInputText = (e: React.ChangeEvent<HTMLInputElement>) => {
     setReplyText(e.target.value);
@@ -55,13 +59,17 @@ export default function ReplyList(props: ReplyListProps) {
   };
 
   useEffect(() => {
-    if (replyList) {
-      setPageReplyList(
-        replyList.filter(
-          (_, idx) => (currentPage - 1) * 10 <= idx && idx < currentPage * 10,
-        ),
-      );
-      window.scrollTo({ top: 750 });
+    if (!isFirst) {
+      if (replyList) {
+        setPageReplyList(
+          replyList.filter(
+            (_, idx) => (currentPage - 1) * 10 <= idx && idx < currentPage * 10,
+          ),
+        );
+        window.scrollTo({ top: 750 });
+      }
+    } else {
+      setIsFirst((prev) => !prev);
     }
   }, [replyList, currentPage]);
   return (
@@ -84,20 +92,18 @@ export default function ReplyList(props: ReplyListProps) {
         </StInputBtn>
       </StInputForm>
       <StReplyWrapper>
-        {pageReplyList.map(
-          ({ author, userNickname, content, createdAt }, idx) => (
-            <ReplyContent
-              key={idx}
-              author={author}
-              userNickname={userNickname}
-              content={content}
-              createdAt={createdAt}
-            />
-          ),
-        )}
+        {replyList.map(({ author, userNickname, content, createAt }, idx) => (
+          <ReplyContent
+            key={idx}
+            author={author}
+            userNickname={userNickname}
+            content={content}
+            createAt={createAt}
+          />
+        ))}
       </StReplyWrapper>
       <StReplyListNav>
-        {replyList && (
+        {pageReplyList && (
           <PageNavigation
             currentPage={currentPage}
             lastPage={Math.ceil(replyList.length / 10)}

diff --git a/core/axios.ts b/core/axios.ts
@@ -14,7 +14,7 @@ baseInstance.interceptors.request.use((config) => {
   const headers = {
     ...config.headers,
     accessToken:
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MzAsImlhdCI6MTY1ODM5MjA1NCwiZXhwIjoxNjU4Mzk5MjU0LCJpc3MiOiJub3JpIn0.-4zFiA6OVE5L86D0LWyEkyKf7RKvm7qlOG5NWCXcSYM',
+      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MzAsImlhdCI6MTY1ODQwNzIwMiwiZXhwIjoxNjU4NDE0NDAyLCJpc3MiOiJub3JpIn0.YdQo6BWChvNyqT8ptY8RwAN7bytNW38RUQOLASlpO0o',
     refreshToken:
       'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MzAsImlhdCI6MTY1ODM4NDEwMCwiZXhwIjoxNjU5NTkzNzAwLCJpc3MiOiJub3JpIn0.AeuhSmM1ZqItojeM3O0SwrELog-Qfq91r_ii0EMgPig',
   };

diff --git a/pages/community/[cid].tsx b/pages/community/[cid].tsx
@@ -48,7 +48,7 @@ export default function CommunityDetail({
       '삭제하시겠어요? 삭제 시, 해당 글과 댓글은 복구되지 않습니다.',
     );
 
-    if (val) {
+    if (val && cid) {
       const status = await deleteCommunity(cid);
       if (status === 200) router.push('/community');
     }
@@ -140,7 +140,7 @@ export const getServerSideProps: GetServerSideProps<Props, Params> = async ({
   const res = await getCommunityDetail(params!.cid);
   return {
     props: {
-      data: res.data.data,
+      data: { ...res.data.data, id: params!.cid },
     },
   };
 };

diff --git a/types/community.ts b/types/community.ts
@@ -3,7 +3,7 @@ export interface ReplyData {
   author: boolean;
   userNickname?: string;
   content: string;
-  createdAt: string;
+  createAt: string;
 }
 // 커뮤니티 데이터
 export interface CommunityData {
@@ -26,25 +26,12 @@ export interface PostCommunityBody {
   content: string;
   imageList?: FormData;
 }
-// 커뮤니티 수정 put body
-export interface PutCommunityBody {
-  category?: string;
-  title?: string;
-  content?: string;
-  imageList?: FormData;
-}
-// 커뮤니티 변경된 state 판단
-export interface IsChangeCommunity {
-  isChangeCategory: boolean;
-  isChangeTitle: boolean;
-  isChangeContent: boolean;
-  isChangeImageList: boolean;
-}
 // 커뮤니티 댓글
 export interface PostCommentBody {
   boardId?: string;
   content: string;
 }
+
 export interface GetCommunityList {
   communityList: CommunityData[];
   isLoading: boolean;