Merge pull request #214 from 42-world/hotfix

Hotfix : 배포 전 발견한 에러 수정. 익명 게시판 주석 처리.
42-world · Mar 12, 2022 · c40fddc · c40fddc
2 parents 8850ed3 + fe5ff63
commit c40fddc
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 20 deletions.
diff --git a/src/Network/APIType.js b/src/Network/APIType.js
@@ -3,18 +3,18 @@ import axios from 'axios';
 export function url(path) {
   // const version = 'v1'; // process.env.REACT_APP_API_VERSION
 
-  // return `https://api.42world.kr${path}`; // 실제 배포 API 서버
-  return `http://api-alpha.42world.kr:8888${path}`; // 개발용 서버, 토큰 하드코딩으로 들어있어야 함.
+  return `https://api.42world.kr${path}`; // 실제 배포 API 서버
+  // return `http://api-alpha.42world.kr:8888${path}`; // 개발용 서버, 토큰 하드코딩으로 들어있어야 함.
   // return `http://localhost:8888${path}`; // Live share 할 때 서버
 }
 
 export function AXIOS(option) {
   return axios({
     ...option,
     withCredentials: true,
-    headers: {
-      // https://api-alpha.42world.kr 로 요청 시 필요. 배포 시에는 주석화
-      Authorization: process.env.REACT_APP_MASTER_ACCESS_TOKEN, // 루트에 .env 파일 만든 후 REACT_APP_MASTER_ACCESS_TOKEN을 가져옴.
-    },
+    // headers: {
+    //   // https://api-alpha.42world.kr 로 요청 시 필요. 배포 시에는 주석화
+    //   Authorization: process.env.REACT_APP_MASTER_ACCESS_TOKEN, // 루트에 .env 파일 만든 후 REACT_APP_MASTER_ACCESS_TOKEN을 가져옴.
+    // },
   });
 }
diff --git a/src/Network/ArticleService.js b/src/Network/ArticleService.js
@@ -92,6 +92,25 @@ const ArticleService = {
    * `200` : success \
    * `401` : fail
    */
+  getAllArticles: async (categoryId, page) => {
+    const method = 'GET';
+    const url = articleUrl('');
+    const take = 1000;
+    // const take = 3;
+    const params = { categoryId, page, take };
+
+    let response;
+    try {
+      response = await API.AXIOS({
+        params,
+        method,
+        url,
+      });
+    } catch (error) {
+      alert(error);
+    }
+    return response.data;
+  },
   getArticles: async (categoryId, page) => {
     const method = 'GET';
     const url = articleUrl('');

diff --git a/src/Pages/CategoryPage/Components/CategoryBody.jsx b/src/Pages/CategoryPage/Components/CategoryBody.jsx
@@ -65,7 +65,7 @@ const CategoryBody = () => {
 
   // 존재하지 않는 categortId 일 경우의 예외 처리, 하드 코딩.
   useEffect(() => {
-    if (categoryId > 3) {
+    if (categoryId > 3 || categoryId == 2) {
       navi('/error');
     }
     setArticles([]);
@@ -98,6 +98,7 @@ const CategoryBody = () => {
               }}
             >
               {cateList.map((cate, idx) => {
+                if (idx === 1) return;
                 return <option value={idx}>{cate}</option>;
               })}
             </NativeSelect>

diff --git a/src/Pages/CreateArticlePage/Components/CreateArticleBody.jsx b/src/Pages/CreateArticlePage/Components/CreateArticleBody.jsx
@@ -18,7 +18,7 @@ const CreateArticleBody = () => {
   const [title, setTitle] = useState('');
   const [content, setContent] = useState('');
   const [curCate, setCurCate] = useState(0);
-  const cateList = ['자유 게시판', '익명 게시판'];
+  const cateList = ['자유 게시판'];
   const [isSending, setIsSending] = useState(false);
   const [anchorEl, setAnchorEl] = useState(null);
 

diff --git a/src/Pages/MainPage/Components/Community.jsx b/src/Pages/MainPage/Components/Community.jsx
@@ -14,11 +14,7 @@ const Community = ({
 }) => {
   return (
     <>
-      <List
-        disablePadding={true}
-        component="nav"
-        aria-label="mailbox folders"
-      >
+      <List disablePadding={true} component="nav" aria-label="mailbox folders">
         {bestArticles &&
           bestArticles.map(article => {
             return (
@@ -61,8 +57,8 @@ const Community = ({
             );
           })}
       </Styled.StyledList>
-      <Styled.ListDivider /> {/*  margin="0.4rem"  */}
-      <Styled.StyledList
+      <Styled.ListDivider />
+      {/* <Styled.StyledList
         disablePadding={true}
         component="nav"
         aria-label="mailbox folders"
@@ -86,7 +82,7 @@ const Community = ({
               />
             );
           })}
-      </Styled.StyledList>
+      </Styled.StyledList> */}
     </>
   );
 };

diff --git a/src/Pages/MainPage/Components/MainBody.jsx b/src/Pages/MainPage/Components/MainBody.jsx
@@ -41,17 +41,17 @@ const MainBody = () => {
 
   useEffect(() => {
     const getFreeArticles = async () => {
-      const response = await ArticleService.getArticles(1);
+      const response = await ArticleService.getAllArticles(1);
       setFreeArticles(response.data);
     };
 
     const getAnonyArticles = async () => {
-      const response = await ArticleService.getArticles(2);
+      const response = await ArticleService.getAllArticles(2);
       setAnonyArticles(response.data);
     };
 
     const getNotiArticles = async () => {
-      const response = await ArticleService.getArticles(3);
+      const response = await ArticleService.getAllArticles(3);
       setNotiArticles(response.data);
     };
 
@@ -61,7 +61,7 @@ const MainBody = () => {
     };
     getBestArticles();
     getFreeArticles();
-    getAnonyArticles();
+    // getAnonyArticles();
     getNotiArticles();
   }, []);