Merge pull request #47 from dsc-sookmyung/feature/translate

[#11] feat: implement api fetch
dsc-sookmyung · Mar 23, 2022 · 0ce5053 · 0ce5053
2 parents 74d8dbe + 8dd4bcd
commit 0ce5053
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 29 deletions.
diff --git a/react-native/components/BottomDrawer.tsx b/react-native/components/BottomDrawer.tsx
@@ -9,14 +9,13 @@ import { useAuth } from '../contexts/Auth';
 
 const highlight = (text: string, registered: boolean) =>
 	<Text fontFamily="body" fontWeight={700} fontStyle="normal" fontSize='md' pt={24} style={!registered ? styles.highlighted : styles.grayBackground}>{text}</Text>
-let date = new Date();
 
 function BottomDrawer(props: BottomDrawerProps) {
 	const [currentEvent, setCurrentEvent] = useState<number>(0);
 	const [openSaveForm, setOpenSaveForm] = useState<boolean>(false);
 	const [resultsTitle, setResultsTitle] = useState<string>('title');
 	const [openEventForm, setOpenEventForm] = useState<boolean>(false);	
-	const [eventForm, setEventForm] = useState<EventForm>({title: '', date: '', cId: 1, description: ''});
+	const [eventForm, setEventForm] = useState<EventForm>({cId: 1, title: '', date: '', description: ''});
 	// TEST: mockup data
 	const [user, setUser] = useState<UserData>({uid: 1, uprofileImg: 1, username: 'hee', ulanguage: 'ko', uchildren: [{cid: 1, cname: 'soo', color: 1}, {cid: 2, cname: 'joo', color: 3}]})
 	// const [user, setUser] = useState<UserData>();
@@ -47,19 +46,8 @@ function BottomDrawer(props: BottomDrawerProps) {
 	const closePopup = () => {
 		setCurrentEvent(0);
 	}
-
-	const handleOpenSaveForm = (prop?: string) => {
-		if (prop==='save') {
-			// TODO: fetch api
-			// data 보내고, success 라면, 서버에 저장된 제목 받아와서 보여주기!
-			let data = {
-				id: props?.results?.id,
-				title: resultsTitle,
-				date: date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()
-			}
-			console.log(data);
-			Alert.alert(`The result was saved in Search as [${resultsTitle}]`)
-		}
+
+	const handleOpenSaveForm = () => {
 		if (openSaveForm) {
 			setResultsTitle('title');
 		}
@@ -75,8 +63,22 @@ function BottomDrawer(props: BottomDrawerProps) {
 
 	const addEvent = () => {
 		// TODO: fetch api
-		// TEST
 		let status = "success";
+
+		if (auth?.authData?.jwt_token && eventForm) {
+			fetch("http://localhost:8080/notice/calendar", {
+				method: 'POST',
+				headers: {
+					'JWT_TOKEN': auth.authData.jwt_token
+				},
+				body: JSON.stringify(eventForm),
+				redirect: 'follow'
+			})
+			.then(response => response.json())
+			.then(data => status = data)
+			.catch(error => console.log('error', error));
+		}
+
 		switch (status) {
 			case "success": 
 				Alert.alert("The event has been successfully added to your calendar!");
@@ -129,9 +131,7 @@ function BottomDrawer(props: BottomDrawerProps) {
 									}}>
 										Cancel
 									</Button>
-									<Button onPress={() => {
-									handleOpenSaveForm('save')
-									}}>
+									<Button onPress={() => props?.saveResults && props.saveResults(resultsTitle)}>
 										Save
 									</Button>
 									</Button.Group>

diff --git a/react-native/screens/TranslateScreen.tsx b/react-native/screens/TranslateScreen.tsx
@@ -12,12 +12,15 @@ import { useToast, Box } from 'native-base';
 import mime from "mime";
 import * as ImagePicker from 'expo-image-picker';
 import { useAuth } from '../contexts/Auth';
+import { StackActions } from '@react-navigation/native';
 
 /* TODO:
     - 스크롤 내려가게 하기 (지금은 ScrollView의 스크롤이 안 먹음)
     - low highlight 주기 (지금은 텍스트 높이만큼 background에 색 줘서 highlight)
 */ 
 
+const date = new Date();
+
 export default function TranslateScreen({ navigation }: Navigation) {
     const [hasPermission, setHasPermission] = useState<boolean>(false);
     const [fontsLoaded, SetFontsLoaded] = useState<boolean>(false);
@@ -113,18 +116,26 @@ export default function TranslateScreen({ navigation }: Navigation) {
             if (auth?.authData?.jwt_token) {
                 fetch("http://localhost:8080/notice/ocr", {
                     method: 'POST',
-                    headers: { 'Authorization': auth.authData.jwt_token },
+                    headers: {
+                        'JWT_TOKEN': auth.authData.jwt_token
+                    },
                     body: formdata,
                     redirect: 'follow'
                 })
-                .then(response => response.text())	// TODO: response.json()
-                .then(data => console.log(data))    // TODO: setResults(data)
-                .catch(error => console.log('error', error));
+                .then(response => response.json())
+                .then(data => setResults(data))
+                .catch(function (error) {
+                    console.log(error.response.status) // 401
+                    console.log(error.response.data.error) //Please Authenticate or whatever returned from server
+                    if(error.response.status==401) {
+                        //redirect to login
+                        auth.signOut();
+                        navigation.dispatch(StackActions.popToTop())
+                    }
+                });
             }
-
             // TEST: mockup data
             setResults({
-                id: 1,
                 fullText: [
                     {id: 1, content: "1. Schedule of the closing ceremony and diploma presentation ceremony: Friday, January 4, 2019 at 9 o'clock for students to go to school.\n1) ", date: "", highlight: false, registered: false},
                     {id: 2, content: "Closing ceremony", date: "2022-01-04", highlight: true, registered: false},
@@ -148,9 +159,45 @@ export default function TranslateScreen({ navigation }: Navigation) {
         setShowKorean(!showKorean);
     }
 
-    const saveResults = (): void => {
+    const saveResults = (title: string): void => {
         // TODO: api
-        Alert.alert("The scanned result was saved in <Search>.");
+        // TODO: fetch api
+        // data 보내고, success 라면, 서버에 저장된 제목 받아와서 보여주기!
+        if (!title) {
+            Alert.alert("You must enter at least one character for the title.");
+            return;
+        }
+
+        if (imageUri) {
+            let FormData = require('form-data');
+            const formdata = new FormData();
+            formdata.append('uploadfile', {
+                uri : imageUri,
+                type: mime.getType(imageUri),
+                name: imageUri.split("/").pop()
+            });
+            let data = {
+                'title': title,
+                'date': date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate(),
+                'fullText': results?.fullText,
+                'korean': results?.korean
+            }
+            formdata.append('noticeRequestDTO', data);
+
+            if (auth?.authData?.jwt_token) {
+                fetch("http://localhost:8080/notice/ocr", {
+                    method: 'POST',
+                    headers: {
+                        'JWT_TOKEN': auth.authData.jwt_token
+                    },
+                    body: formdata,
+                    redirect: 'follow'
+                })
+                .then(response => response.json())
+                .then(data => Alert.alert(`The result was saved in Search as [${data?.title}]`))
+                .catch(error => console.log('error', error));
+            }
+        }
     }
 
     const closeResults = (): void => {

diff --git a/react-native/types.ts b/react-native/types.ts
@@ -66,7 +66,7 @@ interface Event {
 }
 
 interface Result {
-	id: number,
+	id?: number,
 	imageUri?: string,
 	fullText: Event[],
 	korean: string
@@ -86,7 +86,7 @@ interface BottomDrawerProps {
 	isFullDrawer?: boolean,
 	isTranslateScreen?: boolean,
 	handleKorean?: () => void,
-	saveResults?: () => void,
+	saveResults?: (title: string) => void,
 	closeResults?: () => void,
 	retakePicture?: () => void,
 }