Merge branch 'fix/feature'

src/components/common/Card.tsx

@@ -12,7 +12,7 @@ import { ShortBtn } from './Button';
 import { CategoryLabel } from 'components/Category/CategoryLabel';
 import { questionType } from 'types';
 import { Ref, forwardRef } from 'react';
-import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { useSetRecoilState } from 'recoil';
 import { questionState } from 'store/recoil/atom';
 
 interface cardProps {
@@ -67,13 +67,6 @@ export const AnsButtonCard = forwardRef(
         height={270}
         ref={ref}
         justifyContent="space-between"
-        onClick={() => {
-          //질문 내용을 저장 후 클릭시 이어지는 상세 페이지에서 사용
-          setWriteState({
-            title: question.title,
-            content: question.content,
-          });
-        }}
       >
         <InnerBox gap={10}>
           <Tag tagType={'question'}>
@@ -88,9 +81,7 @@ export const AnsButtonCard = forwardRef(
   },
 );
 
-export const QDetailCard = () => {
-  const question = useRecoilValue(questionState);
-
+export const QDetailCard = ({ question }: { question: questionType }) => {
   return (
     <QDContainer color={Palette.Sub.blue} gap={20}>
       <Row gap={10}>

src/network/apis/question.ts

@@ -28,7 +28,7 @@ export const getQuestionApi = async ({
   page,
 }: {
   category: string;
-  page: number;
+  page: number | null;
 }) => {
   try {
     let res = await publicInstance.get('/questions', {

src/pages/Answer/WriteAnswer/index.tsx

@@ -5,10 +5,35 @@ import { Header } from 'components/common/Header';
 import WriteConfirmBar from 'components/common/WriteConfirmBar';
 import { Palette } from 'styles/Palette';
 import { useParams } from 'react-router-dom';
+import { useEffect, useState } from 'react';
+import { getQuestionApi } from 'network/apis/question';
+import { questionType } from 'types';
 
 const WriteAnswer = () => {
   const { idx } = useParams();
   const idxNum = idx ? parseInt(idx) : null;
+  const [question, setQuestion] = useState<questionType>();
+
+  useEffect(() => {
+    const fetchQuestion = async () => {
+      try {
+        let res = await getQuestionApi({
+          category: '',
+          page: null,
+        });
+        const question: questionType = res.result.content.find(
+          (item: questionType) => item.postIdx === idxNum,
+        );
+        if (question !== undefined) {
+          setQuestion(question);
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    };
+
+    fetchQuestion();
+  }, []);
 
   return (
     <Column>
@@ -20,7 +45,7 @@ const WriteAnswer = () => {
         style={{ height: 'calc(100dvh - 119px)' }}
       >
         <Column gap={22} alignItems="center">
-          <QDetailCard />
+          {question !== undefined && <QDetailCard question={question} />}
           <WriteInputBox
             minHeight={203}
             placeholder="시니어님의 경험을 바탕으로 답변을 작성해주세요."

src/pages/Mypage/MyQna/index.tsx

@@ -28,8 +28,6 @@ export const MyQna = () => {
   const [myQnaCount, setMyQnaCount] = useState<number>();
   const [page, setPage] = useState<number>(2);
 
-  console.log(myQnaData);
-
   const { ref, inView } = useInView();
 
   if (userType === 'Juni') {

src/styles/Palette.tsx

@@ -1,7 +1,7 @@
 import { rgba } from 'polished';
 
 const userType = window.localStorage.getItem('userType');
-console.log(userType);
+
 const orange = '#FF8267';
 const blue = '#3F6EFF';
 const main: string = userType === 'Juni' ? orange : blue;