Merge branch 'develop' of https://github.com/kusitms-28th-Meetup-E/FE …

…into feat/#83/mypage-api
kusitms-28th-Meetup-E · Nov 23, 2023 · 6e93228 · 6e93228
2 parents 3c2bcc6 + 2ab2b7d
commit 6e93228
Show file tree

Hide file tree

Showing 49 changed files with 1,068 additions and 370 deletions.
diff --git a/src/apis/index.ts b/src/apis/index.ts
@@ -6,6 +6,7 @@ const GwangjangAxios = axios.create({
   baseURL: "https://api.gwang-jang.co.kr",
 });
 
+//로그인 및 회원가입
 export const postLocalLogin = async ({ id, pw }: loginType) => {
   const res = await GwangjangAxios.post("/member/auth/signIn", { id, pw });
   return res;
@@ -77,16 +78,107 @@ export const putKakaoRegister = async ({
   return res;
 };
 
+// 메인페이지
+export const getMainBubbleChart = async () => {
+  const res = await GwangjangAxios.get("/keyword/main");
+  return res;
+};
+
+// 디테일페이지
+export const getDetailOneLineIntro = async () => {
+  const res = await GwangjangAxios.get(`/keyword/topic/issueDetail/all`);
+  return res;
+};
+
+export const getDetailLineGraph = async (name: string) => {
+  const res = await GwangjangAxios.get(`/keyword/trend/${name}`);
+  return res;
+};
+
+export const getDetailSubscribeCount = async (issueId: number) => {
+  const res = await GwangjangAxios.get(`/member/subscribe/issue/${issueId}`);
+  return res;
+};
+
+export const getDetailBubbleGraph = async (name: string) => {
+  const res = await GwangjangAxios.get(`/contents/bubbleChart/${name}`);
+  return res;
+};
+
+export const getKeywordArticle = async (keyword: string) => {
+  const res = await GwangjangAxios.get(`/contents/keyword/${keyword}/NAVER`);
+  return res;
+};
+export const getKeywordYoutube = async (keyword: string) => {
+  const res = await GwangjangAxios.get(`/contents/keyword/${keyword}/YOUTUBE`);
+  return res;
+};
+export const getTopicArticle = async (issue: string) => {
+  const res = await GwangjangAxios.get(`/contents/issueTitle/${issue}/NAVER`);
+  return res;
+};
+export const getTopicYoutube = async (issue: string) => {
+  const res = await GwangjangAxios.get(`/contents/issueTitle/${issue}/YOUTUBE`);
+  return res;
+};
+
+// 커뮤니티 페이지
 export const getCommunityAllData = async () => {
-  const res = await GwangjangAxios.get("/community");
+  const res = await GwangjangAxios.get("/community/");
   return res;
 };
 
-export const getCommunityAreaData = async (topicId: number) => {
+export const getCommunityAreaData = async (topicId: string) => {
   const res = await GwangjangAxios.get(`/community/topic/${topicId}`);
   return res;
 };
 
+export const postCommunityItem = async (
+  contentsId: number,
+  writeText: string,
+  accessToken: string
+) => {
+  const res = await GwangjangAxios.post(
+    `/community/contents/${contentsId}`,
+    {
+      communityText: writeText,
+    },
+    {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    }
+  );
+  return res;
+};
+
+export const getSubscribeTop5 = async () => {
+  const res = await GwangjangAxios.get("/member/subscribe/issue");
+  return res;
+};
+
+export const getCommunityDetailData = async (topicId: number, communityId: number) => {
+  const res = await GwangjangAxios.get(`/community/topic/${topicId}/community/${communityId}`);
+  return res;
+};
+
+export const getCommunityTop5 = async () => {
+  const res = await GwangjangAxios.get("/community/?sortBy=ALL/");
+  return res;
+};
+
+//검색 페이지
+
+export const getSearch = async (keyword: string) => {
+  const res = await GwangjangAxios.get(`/keyword/search/${keyword}`);
+  return res;
+};
+
+export const getSearchCommunity = async (keyword: string) => {
+  const res = await GwangjangAxios.get(`/community/search/ALL/${keyword}`);
+  return res;
+};
+
 //내가 구독한 주제
 export const getMySubscribeData = async (accessToken: string) => {
   const res = await GwangjangAxios.get("/member/subscribe", {

diff --git a/src/components/atoms/button/index.tsx b/src/components/atoms/button/index.tsx
@@ -136,20 +136,13 @@ export const LikeBorderButton = ({
   );
 };
 
-export const QuotBorderButton = ({
-  onClick,
-  quotCount,
-}: {
-  onClick?: () => void;
-  quotCount: number;
-}) => {
+export const QuotBorderButton = ({ onClick }: { onClick?: () => void }) => {
   //인용 버튼 클릭 시 모달창 오픈
 
   return (
     <>
       <BorderStyleButton onClick={onClick}>
         <div>인용</div>
-        <p>{quotCount}</p>
       </BorderStyleButton>
     </>
   );

diff --git a/src/components/atoms/oneLine/style.ts b/src/components/atoms/oneLine/style.ts
@@ -4,15 +4,16 @@ export const Container = styled.div`
   display: flex;
   border-radius: 5px;
   background: var(--Gray3_200, #eee);
-  width: fit-content;
+  /* width: fit-content; */
   height: 20px;
-  padding: 17px 20px;
+  padding: 22px 20px;
   line-height: 27px;
   align-items: center;
   .title {
     display: flex;
     align-items: center;
     color: var(--Gray6_500, #959595);
+    width: 80px;
   }
   .title::after {
     content: "";
@@ -26,6 +27,7 @@ export const Container = styled.div`
 
   .text {
     color: var(--Gray9_800, #424242);
+    width: 900px;
   }
 
   @media (max-width: 650px) {

diff --git a/src/components/atoms/tag/index.tsx b/src/components/atoms/tag/index.tsx
@@ -1,9 +1,9 @@
 import { Keyword, Tag } from "./style";
 
-export const TopicTag = ({ category }: { category: string }) => {
+export const TopicTag = ({ category }: { category: string | undefined }) => {
   return <Tag $category={category}>{category}</Tag>;
 };
 
-export const KeywordTag = ({ category }: { category: string }) => {
-  return <Keyword $category={category}>{category}</Keyword>;
+export const KeywordTag = ({ category, children }: { category: string; children: string }) => {
+  return <Keyword $category={category}>{children}</Keyword>;
 };
diff --git a/src/components/atoms/tag/style.ts b/src/components/atoms/tag/style.ts
@@ -1,19 +1,21 @@
 import styled from "styled-components";
 
-export const Tag = styled.div<{ $category: string }>`
+export const Tag = styled.div<{ $category: string | undefined }>`
   display: inline-flex;
   padding: 5px 10px;
   justify-content: center;
   align-items: center;
   border-radius: 55px;
   background: ${(props) =>
-    props.$category === "일자리·노동"
+    props.$category === "일자리-노동"
       ? "var(--Main_Blue)"
-      : props.$category === "주거"
+      : props.$category === "주거-사회안전망"
       ? "var(--Sub_Purple)"
       : props.$category === "환경"
       ? "var(--Main_NeonGreen)"
-      : "var(--Sub_Orange)"};
+      : props.$category === "교육"
+      ? "var(--Sub_Orange)"
+      : "white"};
 
   //text
   color: var(--Gray1_50, #fafafa);
@@ -31,9 +33,9 @@ export const Keyword = styled.div<{ $category: string }>`
   align-items: center;
   border-radius: 55px;
   color: ${(props) =>
-    props.$category === "일자리·노동"
+    props.$category === "일자리-노동"
       ? "var(--Main_Blue)"
-      : props.$category === "주거"
+      : props.$category === "주거-사회안전망"
       ? "var(--Sub_Purple)"
       : props.$category === "환경"
       ? "var(--Main_NeonGreen)"

diff --git a/src/components/molecules/PreviewCommunityBox/index.tsx b/src/components/molecules/PreviewCommunityBox/index.tsx
@@ -20,7 +20,7 @@ export const PreviewCommunityBox = ({ data }: { data: CommunityItemProps }) => {
           </div>
           <div className="top-second-wrapper">
             <div>
-              <KeywordTag category={data.area} />
+              <KeywordTag category={data.area}>{data.keyword}</KeywordTag>
             </div>
             <div className="button-wrapper">
               <LikeBorderButton
@@ -33,7 +33,7 @@ export const PreviewCommunityBox = ({ data }: { data: CommunityItemProps }) => {
         </div>
         <div className="bottom-content">
           <div>인용한 콘텐츠</div>
-          <p>{data.quotText}</p>
+          <p>{data.contentsTitle}</p>
         </div>
       </CommunityDetailContainer>
     </>