Revert "[FE] Deatil 페이지 및 OAuth 테스트용 뷰 추가 (#61)" (#62)

This reverts commit 2baf578.
Louie-03 · Apr 29, 2022 · 3bc6667 · 3bc6667
1 parent 2baf578
commit 3bc6667
Show file tree

Hide file tree

Showing 42 changed files with 226 additions and 1,175 deletions.
diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties
diff --git a/BE/src/test/java/sidedish/com/ComApplicationTests.java b/BE/src/test/java/sidedish/com/ComApplicationTests.java
diff --git a/FE/.env b/FE/.env
diff --git a/FE/.gitignore b/FE/.gitignore
@@ -14,7 +14,6 @@
 # misc
 .DS_Store
 
-
 .env
 
 .env.local

diff --git a/FE/package-lock.json b/FE/package-lock.json
diff --git a/FE/public/index.html b/FE/public/index.html
@@ -5,11 +5,13 @@
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Web site created using create-react-app" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
     <title>React App</title>
   </head>
   <body>
     <div id="root"></div>
-    <div id="root-modal"></div>
   </body>
 </html>
diff --git a/FE/src/App.jsx b/FE/src/App.jsx
@@ -1,14 +1,41 @@
-import React from "react";
-import Main from "pages/Main";
-import Header from "components/Header";
+import React, { useCallback, useEffect, useState } from "react";
+import axios from "axios";
+import BestMealContainer from "components/BestMealContainer";
+import MealContainer from "components/MealContainer";
+import { MOCK_SERVER_URL } from "constant";
 
-const App = () => {
+function App() {
+  const [meals, setMeals] = useState({
+    mealHeader: "",
+    mealCards: [],
+  });
+  const fetchCategoryMeal = useCallback(async () => {
+    try {
+      const { status, data } = await axios.get(`${MOCK_SERVER_URL}/api/products?meal=main`);
+      // TODO: status 코드 300번 구간도 포함해야하나 공부해보기
+      if (status >= 400) {
+        throw Error(`${status}: 데이터를 받아오는 도중 에러 발생`);
+      }
+      console.log(data);
+      setMeals({
+        mealHeader: "식탁을 풍성하게 하는 정갈한 밑반찬",
+        mealCards: data,
+      });
+    } catch (error) {
+      console.error(error);
+    }
+  }, []);
+
+  useEffect(() => {
+    fetchCategoryMeal();
+  }, []);
   return (
     <>
-      <Header />
-      <Main />
+      <BestMealContainer />
+      <MealContainer meals={meals} />
+      <div className="Modal"></div>
     </>
   );
-};
+}
 
 export default App;
diff --git a/FE/src/Pages/Main/index.jsx b/FE/src/Pages/Main/index.jsx
diff --git a/FE/src/Pages/Main/style.js b/FE/src/Pages/Main/style.js
diff --git a/FE/src/assets/angle-left.svg b/FE/src/assets/angle-left.svg
diff --git a/FE/src/assets/angle-right.svg b/FE/src/assets/angle-right.svg
diff --git a/FE/src/assets/cart.svg b/FE/src/assets/cart.svg
diff --git a/FE/src/assets/logo.svg b/FE/src/assets/logo.svg
diff --git a/FE/src/assets/man.svg b/FE/src/assets/man.svg
diff --git a/FE/src/assets/search.svg b/FE/src/assets/search.svg