Merge branch 'develop' of https://github.com/JayJayleee/CoverFlow-FE …

…into feat/#285-ui-check-list

src/asset/sass/etc/header/userInfoHeader.scss

@@ -100,8 +100,9 @@ img.loginuser {
 
     border-radius: 10px;
     border-color: #d9d9d9;
-    margin-left: 82%;
-    margin-top: -3%;
+    // margin-left: 82%;
+    // margin-top: -3%;
+    left: 78%;
   }
 
   .dropdown-item {

src/asset/sass/etc/question/answer.scss

@@ -9,7 +9,6 @@
   border-radius: 10px;
 
   :nth-child(1) {
-    font-weight: bold;
     margin: 0px 6px 0 0;
   }
 
@@ -129,4 +128,7 @@
 .answer-container-info {
   display: flex;
   justify-content: space-between;
+  img {
+    cursor: pointer;
+  }
 }

src/components/pages/postPage/questionDetailPage.tsx

@@ -49,7 +49,7 @@ const QuestionTitle = styled.div`
     text-align: start;
     padding: 1% 0 1% 1.5%;
     color: #000000;
-    margin: 1rem 0 2% 3%;
+    margin: 2% 0 -1.5% 3%;
     overflow: visible;
     white-space: normal;
     width: 500px;
@@ -59,6 +59,7 @@ const QuestionTitle = styled.div`
   align-items: flex-start;
   img {
     cursor: pointer;
+    margin: 3.7% 0 0 2%;
   }
 `;
 
@@ -203,8 +204,7 @@ function QuestionDetailPage() {
     const res = await fetchAPI('/api/member/me', 'GET');
 
     if (res.data.nickname === questionerNickname) {
-      setIsShowEdit(true);
-      setIsShowReport(false);
+      setIsShowEdit((isShow) => !isShow);
     } else if (res.data.nickname !== questionerNickname) {
       setIsShowReport((showReport) => !showReport);
     }

src/components/pages/searchPage/companyInfoPage.tsx

@@ -106,8 +106,9 @@ export interface CompanInfoProps {
 function CompanyInfoPage() {
   const navigate = useNavigate();
   const [companyData, setCompanyData] = useState<CompanInfoProps>();
+
   const { companyId } = useParams();
-  const [questionsCount, setQuestionCount] = useState(0);
+  const [questionsCount, setQuestionsCount] = useState(0);
 
   const [currentPage, setCurrentPage] = useState(0);
   const [totalPages, setTotalPages] = useState(0);
@@ -138,24 +139,30 @@ function CompanyInfoPage() {
       setSelectedCategories(
         selectedCategories.filter((item) => item !== category),
       );
-    } else {
-      setSelectedCategories([category]);
-    }
-
-    try {
+      // 같은 카테고리를 중복해서 클릭했을 때는 `${BASE_URL}/api/company/${companyId}?pageNo=0&criterion=createdAt`으로 전체 질문 조회
       const { data } = await axios.get(
-        `${BASE_URL}/api/company/${companyId}?pageNo=0&criterion=createdAt&questionTag=${selectedCategory}`,
+        `${BASE_URL}/api/company/${companyId}?pageNo=0&criterion=createdAt`,
       );
 
-      if (data) {
-        setCompanyData(data.data);
-        setQuestionCount(data.data.totalElements);
-      } else {
-        throw new Error('데이터가 존재하지 않습니다.');
+      setQuestionsCount(data.data.questionCount);
+    } else {
+      setSelectedCategories([...selectedCategories, category]);
+
+      try {
+        const { data } = await axios.get(
+          `${BASE_URL}/api/company/${companyId}?pageNo=0&criterion=createdAt&questionTag=${selectedCategory}`,
+        );
+
+        if (data) {
+          setCompanyData(data.data);
+          setQuestionsCount(data.data.totalElements);
+        } else {
+          throw new Error('데이터가 존재하지 않습니다.');
+        }
+      } catch (error) {
+        if (error instanceof Error) showErrorToast(error.message);
+        navigate(-1);
       }
-    } catch (error) {
-      if (error instanceof Error) showErrorToast(error.message);
-      navigate(-1);
     }
   };
 
@@ -181,7 +188,7 @@ function CompanyInfoPage() {
         if (data) {
           setCompanyData(data.data);
           setTotalPages(data.data.totalPages);
-          setQuestionCount(data.data.questionCount);
+          setQuestionsCount(data.data.questionCount);
         } else {
           throw new Error('데이터가 존재하지 않습니다.');
         }