Merge branch 'feature-community' of https://github.com/nori-dongsan/n…

…ori-client into feature-community
nori-dongsan · Jul 21, 2022 · a484b1c · a484b1c
2 parents 6960398 + 1585959
commit a484b1c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 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}</span>
+          <span>{createdAt?.split('T')[0]}</span>
         </StWriteInfo>
         <StReplyInfo>
           <IcHeart />

diff --git a/components/community/ReplyList.tsx b/components/community/ReplyList.tsx
@@ -26,6 +26,7 @@ export default function ReplyList(props: ReplyListProps) {
   });
   const [currentPage, setCurrentPage] = useState<number>(1);
   const [pageReplyList, setPageReplyList] = useState<ReplyData[]>([]);
+  const [isFirst, setIsFirst] = useState<boolean>(true);
 
   const handleInputText = (e: React.ChangeEvent<HTMLInputElement>) => {
     setReplyText(e.target.value);
@@ -55,13 +56,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 (

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.eyJpZCI6MzAsImlhdCI6MTY1ODM4NDEwMCwiZXhwIjoxNjU4MzkxMzAwLCJpc3MiOiJub3JpIn0.ZNRxtGPFJpVCHJzlK0HdcgPcZWvkkCt3FZ_VHu8sz7M',
+      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MzAsImlhdCI6MTY1ODM5MjA1NCwiZXhwIjoxNjU4Mzk5MjU0LCJpc3MiOiJub3JpIn0.-4zFiA6OVE5L86D0LWyEkyKf7RKvm7qlOG5NWCXcSYM',
     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/pages/community/index.tsx b/pages/community/index.tsx
@@ -17,7 +17,6 @@ const limit = 20;
 
 export const getServerSideProps: GetServerSideProps = async () => {
   const res = await getCommunity();
-  // const data: CommunityData[] = communityMockData;
   return {
     props: res.data,
   };