Merge branch 'it18257632' into 'master'

It18257632

See merge request !168

API/app.py

@@ -155,14 +155,14 @@ def login():
     userId = user[0]
     if userId == 0:
         data = {
-            "body": [],
+            "userId": [],
             "message": "Failed",
             "status": 404
         }
     else:
         token = saveUserSession(userId)
         data = {
-            "body": user,
+            "body": userId,
             "token": token,
             "message": "Success",
             "status": 200
@@ -176,11 +176,11 @@ def logout():
     req = request.get_json()
     token = req['token']
     if(logoutUser(token) == 1):
-        data = {
+        response = {
             "message": "Success",
             "status": 200
         }
-    body = jsonify(data)
+    body = jsonify(response)
     return make_response(body)
 
 @app.route("/readingSession", methods=['POST'])
@@ -188,25 +188,30 @@ def reading_session():
     req = request.get_json()
     userId = req['userId']
     token = save_session_details(userId, 1)
-    data = {
+    response = {
         "token": token,
         "message": "Success",
         "status": 200
     }
-    body = jsonify(data)
+    body = jsonify(response)
     return make_response(body)
 
 
-@app.route("/reading", methods=['POST'])
-def reading():
+@app.route("/reading/<readingToken>", methods=['POST'])
+def reading(readingToken):
+    assert readingToken == request.view_args['readingToken']
+    token = readingToken
     req = request.get_json()
     word = req['word']
     userId = req['userId']
-    token = req['token']
     level = req['level']
     triedCount = req['triedCount']
     result = save_activity_details(userId, word, token, level, triedCount)
-    body = jsonify(word)
+    response = {
+        "message": "Success",
+        "status": 200
+    }
+    body = jsonify(response)
     return make_response(body)
 
 if __name__ == "__main__":

frontend/src/component/reading/ReadCategory.js

@@ -33,11 +33,10 @@ const ReadCategory = props => {
           console.log(res.data);
           const token = res.data.token;
           try {
-            AsyncStorage.setItem('token', token);
+            AsyncStorage.setItem('readingSession', token);
           } catch (error) {
             console.log(error);
           }
-
           navigation.navigate(path);
         }
       })

frontend/src/router/router.js

@@ -3,11 +3,11 @@ import {NavigationContainer} from '@react-navigation/native';
 import {createNativeStackNavigator} from '@react-navigation/native-stack';
 import Colors from '../constants/Colors';
 
-import Home from '../screen/home';
+import Home from '../screen/Home';
 import Start from '../screen/Start';
 import Register from '../screen/auth/Register';
 import Login from '../screen/auth/Login';
-import Splash from '../screen/splash/splash';
+import Splash from '../screen/splash/Splash';
 import Color from '../screen/Color';
 import Blue from '../screen/activity/Blue';
 import Blue2 from '../screen/activity/Blue2';

frontend/src/screen/Read.js

@@ -51,19 +51,16 @@ export default function Read() {
         </View> */}
         <TouchableOpacity style={styles.screen}>
           <ReadCategory
-            id={1}
             title={'Basic'}
             image={ImagePaths.roundOne}
             path={'ReadActivity'}
           />
           <ReadCategory
-            id={1}
             title={'Advanced'}
             image={ImagePaths.roundTwo}
             path={'ReadActivityBird'}
           />
           <ReadCategory
-            id={1}
             title={'Result & Summery'}
             image={ImagePaths.summery}
             path={'ReadActivity'}

frontend/src/screen/Start.js

 import React from "react";
-import { SafeAreaView, ScrollView, View, Text } from "react-native";
+import {SafeAreaView, ScrollView, View, Text, Button} from 'react-native';
 import { NavigationContainer } from "@react-navigation/native";
 import { createDrawerNavigator, DrawerItem } from "@react-navigation/drawer";
 import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';
 
-import Home from "./home";
-import profile from "./profile";
-import report from "./report";
+import Home from "./Home";
+import profile from "./Profile";
+import report from "./Report";
+import Login from "./auth/Login";
 
 const Drawer = createDrawerNavigator();
 
 function Start() {
 
     return (
-
-        <Drawer.Navigator
+      <Drawer.Navigator
         initialRouteName="Home"
         screenOptions={{
           hearderTitleAlign: 'right',
           alignItems: 'center',
           justifyContent: 'center',
-          headerStyle:{
-            backgroundColor: '#1DCE92'
+          headerStyle: {
+            backgroundColor: '#1DCE92',
           },
-          headerTintColor: '#ffffff'
+          headerTintColor: '#ffffff',
         }}>
-  
-          <Drawer.Screen name="Home"
-            component={Home}
-            options={{
-              title: 'Home',
-              drawerIcon: ({focused}) => (
-                <FontAwesome5
-                  name="home"
-                  size={focused ? 25:20} 
-                  color={focused ? '#1DCE92' : '#0096FF'} 
-                />
-              )
-            }}
-          />
+        <Drawer.Screen
+          name="Home"
+          component={Home}
+          options={{
+            title: 'Home',
+            drawerIcon: ({focused}) => (
+              <FontAwesome5
+                name="home"
+                size={focused ? 25 : 20}
+                color={focused ? '#1DCE92' : '#0096FF'}
+              />
+            ),
+          }}
+        />
 
-          <Drawer.Screen name="Profile"
-            component={profile}
-            options={{
-              title: 'Profile',
-              drawerIcon: ({focused}) => (
-                <FontAwesome5
-                  name="users"
-                  size={focused ? 25:20} 
-                  color={focused ? '#1DCE92' : '#0096FF'} 
-                />
-              )
-            }}
-          />
-  
-          <Drawer.Screen name="Report"
-            component={report}
-            options={{
-              title: 'Report',
-              drawerIcon: ({focused}) => (
-                <FontAwesome5
-                  name="chart-line"
-                  size={focused ? 25:20}
-                  color={focused ? '#1DCE92' : '#0096FF'} 
-                />
-              )
-            }}
-          />
-  
-  
-        </Drawer.Navigator>
+        <Drawer.Screen
+          name="Profile"
+          component={profile}
+          options={{
+            title: 'Profile',
+            drawerIcon: ({focused}) => (
+              <FontAwesome5
+                name="users"
+                size={focused ? 25 : 20}
+                color={focused ? '#1DCE92' : '#0096FF'}
+              />
+            ),
+          }}
+        />
+
+        <Drawer.Screen
+          name="Report"
+          component={report}
+          options={{
+            title: 'Report',
+            drawerIcon: ({focused}) => (
+              <FontAwesome5
+                name="chart-line"
+                size={focused ? 25 : 20}
+                color={focused ? '#1DCE92' : '#0096FF'}
+              />
+            ),
+          }}
+        />
 
+      </Drawer.Navigator>
     );
   
   }

frontend/src/screen/auth/Login.js

@@ -98,7 +98,9 @@ const Login = () => {
         }
         if (response.data.status == 200) {
           const userToken = res.data.token;
+          const userId = res.data.userId;
           AsyncStorage.setItem('userToken', userToken);
+          AsyncStorage.setItem('userId', userId);
           return navigation.navigate('Start');
         }
       })

frontend/src/screen/profile.js

 import React from "react";
 import { StyleSheet, View, Text, Pressable } from 'react-native';
 
-export default function profile({ navigation }){
+export default function Pofile({ navigation }){
 
     const onPressHandler = () => {
         navigation.navigate('Start');

frontend/src/screen/reading/ReadActivity.js

@@ -24,6 +24,10 @@ export default function ReadActivity() {
   const [results, setResults] = useState([]);
   const [partialResults, setPartialResults] = useState([]);
 
+  useEffect(() => {
+    Voice.destroy().then(Voice.removeAllListeners);
+  }, []);
+
   useEffect(() => {
     Voice.onSpeechStart = onSpeechStartHandler;
     Voice.onSpeechEnd = onSpeechEndHandler;

frontend/src/screen/reading/advanced/ReadActivityBird.js

@@ -21,11 +21,12 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
 import {Authorize} from '../../auth/AuthenticateUser';
 
 export default function ReadActivityBird() {
-  const userToken = Authorize();
+  // const userToken = Authorize();
+  const navigation = useNavigation();
+  
   const [error, setError] = useState('');
   const [readingData, setReadingData] = useState({activity: ''});
-  const readToken = AsyncStorage.getItem('readingSession');
-
+  // let user = AsyncStorage.getItem('readingSession');
   // useEffect(() => {
   //   if (Authorize) {
   //   }
@@ -42,15 +43,33 @@ export default function ReadActivityBird() {
     };
   }, []);
 
-  useEffect(() => {
-    AsyncStorage.getItem('token')
-      .then(value => {
-        console.log(value);
+  const getToken = data => {
+    AsyncStorage.getItem('readingSession')
+      .then(readingSession => {
+      
+        sendRedingData(data, readingSession);
       })
       .catch(error => {
         console.log(error);
       });
-  }, []);
+  };
+
+  const sendRedingData = (data, readingSession) => {
+    console.log('itemValue', data);
+    Client.post('reading/'+readingSession, JSON.stringify(data), {
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+    })
+      .then(res => {
+        console.log(res.data);
+        navigation.navigate('ReadActivity');
+      })
+      .catch(error => {
+        console.log(error);
+      });
+  };
 
   const onSpeechStartHandler = e => {
     console.log('start handler =>> ', e);
@@ -65,20 +84,19 @@ export default function ReadActivityBird() {
   };
 
   const onSpeechError = e => {
-    console.log('onSpeechError: ', e);
     setError(JSON.stringify(e.error));
     const result = DummyReadResult.value;
     const data = {
       word: 'bird',
       userId: 1,
-      token: readToken,
       level: 1,
       triedCount: 1,
     };
     if (result.includes('hello')) {
       setReadingData(data);
-      console.log(localStorage.getItem('readingSession'));
-      sendRedingData(data);
+      console.log('data', getToken());
+      console.log('readingData:', readingData);
+      getToken(data);
     }
   };
 
@@ -90,21 +108,6 @@ export default function ReadActivityBird() {
     }
   };
 
-  const sendRedingData = data => {
-    Client.post('reading', JSON.stringify(data), {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-    })
-      .then(res => {
-        console.log(res.data);
-      })
-      .catch(error => {
-        console.log(error);
-      });
-  };
-
   return (
     <SafeAreaView>
       <View style={{flexDirection: 'column'}}>

frontend/src/screen/report.js

@@ -9,7 +9,7 @@ export default function report({ navigation }){
 
     return (
         <View>
-            <Text>report</Text>
+           
         </View>
     )
 

frontend/src/screen/sideMenu.js

@@ -8,8 +8,8 @@ import {
   Image,
 } from "react-native";
 
-import home from "./home";
-import profile from "./profile";
+import Home from "./Home";
+import Profile from "./Profile";
 
 import { NavigationContainer } from "@react-navigation/native";
 import { createDrawerNavigator } from "@react-navigation/drawer";
@@ -22,11 +22,11 @@ function sideMenu(){
     <NavigationContainer>
       <Drawer.Navigator>
         <Drawer.Screen name="home"
-          component={home}
+          component={Home}
         />
 
         <Drawer.Screen name="profile"
-          component={profile}
+          component={Profile}
         />
       </Drawer.Navigator>
     </NavigationContainer>