Merge branch 'main' into feat/#9

DEPthes · Aug 22, 2023 · 9913257 · 9913257
2 parents 7ca6b42 + 97757dc
commit 9913257
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 43 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "react-native-screens": "~3.22.0",
     "react-native-svg": "13.9.0",
     "react-native-web": "~0.19.6",
-    "react-native-webview": "13.2.2",
+    "react-native-webview": "^13.2.2",
     "styled-components": "^6.0.7"
   },
   "devDependencies": {

diff --git a/pages/Diary/DiaryAnswer.tsx b/pages/Diary/DiaryAnswer.tsx
@@ -7,45 +7,44 @@ import MolButton from "../../components/atom/Button/MolButton";
 import axios from "axios";
 import AfterAnswerWidget from "@/components/organisms/widget/AfterAnswerWidget";
 import EvolvingWidget from "@/components/organisms/widget/EvolvingWidget";
+import { useAuth } from "@/context/AuthContext";
 
 type ownProps = {
   navigation: any;
   route: any;
 };
 
 const DiaryAnswer = (props: ownProps) => {
+  const { token } = useAuth();
   const { navigation, route } = props;
   const { emotionId, myCrystalCount, inputContent, answerType } = route.params;
   const [chatResponse, setChatResponse] = useState<string>("");
   const [isModalShown, setIsModalShown] = useState(false);
   const [isAfterAnswer, setIsAfterAnswer] = useState(false);
   const [isWaterChange, setIsWaterChange] = useState(false);
   const [isWaterEvolving, setIsWaterEvolving] = useState(false);
-
+  const headers = {
+    Authorization: `Bearer ${token}`,
+    "Content-Type": "application/json",
+  };
   useEffect(() => {
-    // const apiUrl = `http://3.36.4.36:8080/comment/${answerType}`;
-    // const requestBody = {
-    //   diary: inputContent,
-    // };
-
-    // // API 요청 헤더 설정
-    // const headers = {
-    //   Authorization:
-    //     "Bearer mA5GsYhjZhxhsoHn2R4rzEY-kYgbRQniiCBLtNntCiolUAAAAYoTwGNw",
-    //   "Content-Type": "application/json",
-    // };
-
-    // // POST 요청 보내기
-    // axios
-    //   .post(apiUrl, requestBody, { headers })
-    //   .then((response) => {
-    //     console.log("API 요청 성공:", response.data);
-    //     setChatResponse(response.data.data);
-    //   })
-    //   .catch((error) => {
-    //     console.error("API 요청 실패:", error);
-    //   });
-    setChatResponse("sival");
+    const apiUrl = `http://3.36.4.36:8080/comment/${answerType}`;
+    const requestBody = {
+      diary: inputContent,
+    };
+
+    // API 요청 헤더 설정
+
+    // POST 요청 보내기
+    axios
+      .post(apiUrl, requestBody, { headers })
+      .then((response) => {
+        console.log("API 요청 성공:", response.data);
+        setChatResponse(response.data.data);
+      })
+      .catch((error) => {
+        console.error("API 요청 실패:", error);
+      });
   }, []);
 
   const CloseButtonHandler = () => {
@@ -57,11 +56,6 @@ const DiaryAnswer = (props: ownProps) => {
     };
 
     // API 요청 헤더 설정
-    const headers = {
-      Authorization:
-        "Bearer mA5GsYhjZhxhsoHn2R4rzEY-kYgbRQniiCBLtNntCiolUAAAAYoTwGNw",
-      "Content-Type": "application/json",
-    };
 
     // POST 요청 보내기
     axios
@@ -80,13 +74,6 @@ const DiaryAnswer = (props: ownProps) => {
     setIsAfterAnswer(false);
     const apiUrl = `http://3.36.4.36:8080/crystal/comments`;
 
-    // API 요청 헤더 설정
-    const headers = {
-      Authorization:
-        "Bearer mA5GsYhjZhxhsoHn2R4rzEY-kYgbRQniiCBLtNntCiolUAAAAYoTwGNw",
-      "Content-Type": "application/json",
-    };
-
     // POST 요청 보내기
     axios
       .get(apiUrl, { headers })
@@ -103,6 +90,8 @@ const DiaryAnswer = (props: ownProps) => {
         ) {
           console.log("분기점이다!");
           setIsWaterChange(true);
+        } else {
+          navigation.navigate("Home");
         }
       })
       .catch((error) => {
@@ -153,9 +142,10 @@ const DiaryAnswer = (props: ownProps) => {
                 <MolText
                   label={chatResponse}
                   size="17"
-                  weight="regular"
+                  weight="bold"
                   align="left"
                   color="black"
+                  mt="-40"
                 />
               </ScrollViewContainer>
             </DiaryWritingBox>

diff --git a/pages/Diary/DiaryWriting.tsx b/pages/Diary/DiaryWriting.tsx
@@ -12,8 +12,10 @@ import MolText from "../../components/atom/Text/Text";
 import MolButton from "../../components/atom/Button/MolButton";
 import Widget from "../../components/organisms/widget/Widget";
 import axios from "axios";
+import { useAuth } from "@/context/AuthContext";
 
 export const DiaryWriting = ({ navigation }: { navigation: any }) => {
+  const { token } = useAuth();
   const [onWidget, setOnWidget] = useState<boolean>(false);
 
   const [inputContent, setInputContent] = useState("");
@@ -33,8 +35,7 @@ export const DiaryWriting = ({ navigation }: { navigation: any }) => {
 
     // API 요청 헤더 설정
     const headers = {
-      Authorization:
-        "Bearer KvOxVva9xKjsl2mZ44aLt8Wa_bJCvhWaBDQcqEVfCiolTgAAAYoSco7Z",
+      Authorization: `Bearer ${token}`,
       "Content-Type": "application/json",
     };
 

diff --git a/pages/Home.tsx b/pages/Home.tsx
@@ -5,10 +5,12 @@ import styled from "styled-components/native";
 import { LinearGradient } from "expo-linear-gradient";
 import { useIsFocused } from "@react-navigation/native";
 import axios from "axios";
+import { useAuth } from "@/context/AuthContext";
 
 const Home = ({ navigation }: { navigation: any }) => {
   const isFocused = useIsFocused();
   const [answerCount, setAnswerCount] = useState(0);
+  const { token } = useAuth();
 
   const waters = {
     first: require("@/assets/png/water01.png"),
@@ -24,8 +26,7 @@ const Home = ({ navigation }: { navigation: any }) => {
       const apiUrl = `http://3.36.4.36:8080/crystal/comments`;
       // API 요청 헤더 설정
       const headers = {
-        Authorization:
-          "Bearer mA5GsYhjZhxhsoHn2R4rzEY-kYgbRQniiCBLtNntCiolUAAAAYoTwGNw",
+        Authorization: `Bearer ${token}`,
         "Content-Type": "application/json",
       };
       // POST 요청 보내기