some changes

API/app.py

@@ -3,8 +3,8 @@ from flask import Flask, redirect, url_for, render_template, request, jsonify, m
 import random
 import os
 from API.model.colorModel import get_color_activities1, get_color_activities2, get_color_activity_result
-from API.model.readModel import get_reading_activities, save_activity_details
-from API.model.userModel import getUser, saveUserSession
+from API.model.readModel import get_reading_activities, save_activity_details, save_session_details
+from API.model.userModel import getUser, saveUserSession, logoutUser
 from API.model.colorModel import get_color_activities1, get_color_activities2, get_color_activity_result, storeResult
 from API.model.readModel import get_reading_activities
 from API.routers.router import funtion_one
@@ -108,9 +108,9 @@ def predict():
     # return jsonify("print")
     # return "Print"
 
+
 @app.route("/store", methods=["POST"])
 def store():
-
     req = request.get_json()
     value = req['value']
     date = req['date']
@@ -127,8 +127,9 @@ def store():
         print(e)
         return e
 
+
 # Read Function Route (IT)
-# Loging
+# Login
 @app.route("/login", methods=['POST'])
 def login():
     req = request.get_json()
@@ -156,6 +157,33 @@ def login():
     return make_response(body)
 
 
+@app.route("/logout", methods=['POST'])
+def logout():
+    req = request.get_json()
+    token = req['token']
+    if(logoutUser(token) == 1):
+        data = {
+            "message": "Success",
+            "status": 200
+        }
+    body = jsonify(data)
+    return make_response(body)
+
+
+@app.route("/readingSession", methods=['POST'])
+def reading_session():
+    req = request.get_json()
+    userId = req['userId']
+    token = save_session_details(userId, 1)
+    data = {
+        "token": token,
+        "message": "Success",
+        "status": 200
+    }
+    body = jsonify(data)
+    return make_response(body)
+
+
 @app.route("/reading", methods=['POST'])
 def reading():
     req = request.get_json()
@@ -165,9 +193,8 @@ def reading():
     level = req['level']
     triedCount = req['triedCount']
     result = save_activity_details(userId, word, token, level, triedCount)
-    print(result)
     body = jsonify(word)
     return make_response(body)
 
 if __name__ == "__main__":
-    app.run(host='192.168.8.101')
+    app.run(host='192.168.1.100')

API/db/dbConnection.py

@@ -12,7 +12,7 @@ def create_con():
         database="helply",
         host="127.0.0.1",
         user="root",
-        password="rp19970520"
+        password="12345678"
     )
     return db
 
@@ -32,7 +32,6 @@ def get_all_data(query):
     return result
 
 
-
 def insert_data_pandas_df(pd_df, table_name):
     db = create_con_pandas()
     pd_df.to_sql(name=table_name, con=db, if_exists='append', index=False)

API/model/readModel.py

 from API.db.dbConnection import get_all_data, insert
 from flask import jsonify
-
+from API.util.util import getUUID
 
 def get_reading_activities():
     data_dic = []
@@ -24,3 +24,11 @@ def save_activity_details(userId, word, token, level, triedCount):
     args = (userId, word, token, level, triedCount)
     result = insert(qry, args)
     return result
+
+
+def save_session_details(userId, status):
+    token = getUUID()
+    qry = 'INSERT INTO readingSession (id,userId,token,status) VALUES (NULL, %s, %s, %s)'
+    args = (userId, token, status)
+    insert(qry, args)
+    return token

API/model/userModel.py

-from API.db.dbConnection import get_data
-from API.db.dbConnection import insert
+from API.db.dbConnection import insert, update_data, get_data
 from API.util.util import getUUID
 from datetime import datetime
 
@@ -18,3 +17,8 @@ def saveUserSession(userId):
     args = (userId, token, loginTime, 1)
     insert(qry, args)
     return token
+
+
+def logoutUser(token):
+    qry = 'UPDATE userSession SET status = 0 WHERE token = "{}"'.format(token)
+    return update_data(qry)

frontend/android/gradle.properties

@@ -26,3 +26,6 @@ android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.99.0
+
+#AsyncStorage 
+AsyncStorage_db_size_in_MB=10
\ No newline at end of file

frontend/package-lock.json

@@ -8,6 +8,7 @@
       "name": "firstapp",
       "version": "0.0.1",
       "dependencies": {
+        "@react-native-async-storage/async-storage": "^1.17.3",
         "@react-native-community/netinfo": "^7.1.7",
         "@react-native-voice/voice": "^3.2.3",
         "@react-navigation/drawer": "^6.1.8",
@@ -2820,6 +2821,17 @@
         "react": "^16.8.0 || ^17.0.0-rc.1"
       }
     },
+    "node_modules/@react-native-async-storage/async-storage": {
+      "version": "1.17.3",
+      "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.17.3.tgz",
+      "integrity": "sha512-2dxdlGwBjBP2qYu6F72U7cRRFshISYiNEWCaQNOJtxUERCMaYRWcniYqhL248KSbGUMpRhFCEtliztsiGoYYMA==",
+      "dependencies": {
+        "merge-options": "^3.0.4"
+      },
+      "peerDependencies": {
+        "react-native": "^0.0.0-0 || 0.60 - 0.68 || 1000.0.0"
+      }
+    },
     "node_modules/@react-native-community/cli": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-6.1.0.tgz",
@@ -8428,6 +8440,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -10808,6 +10828,17 @@
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "peer": true
     },
+    "node_modules/merge-options": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz",
+      "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==",
+      "dependencies": {
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -17601,6 +17632,14 @@
         "clsx": "^1.1.1"
       }
     },
+    "@react-native-async-storage/async-storage": {
+      "version": "1.17.3",
+      "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.17.3.tgz",
+      "integrity": "sha512-2dxdlGwBjBP2qYu6F72U7cRRFshISYiNEWCaQNOJtxUERCMaYRWcniYqhL248KSbGUMpRhFCEtliztsiGoYYMA==",
+      "requires": {
+        "merge-options": "^3.0.4"
+      }
+    },
     "@react-native-community/cli": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-6.1.0.tgz",
@@ -21898,6 +21937,11 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="
+    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -23719,6 +23763,14 @@
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "peer": true
     },
+    "merge-options": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz",
+      "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==",
+      "requires": {
+        "is-plain-obj": "^2.1.0"
+      }
+    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",

frontend/package.json

@@ -10,6 +10,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
+    "@react-native-async-storage/async-storage": "^1.17.3",
     "@react-native-community/netinfo": "^7.1.7",
     "@react-native-voice/voice": "^3.2.3",
     "@react-navigation/drawer": "^6.1.8",

frontend/src/component/reading/ReadCategory.js

@@ -8,21 +8,59 @@ import {
   TouchableNativeFeedback,
   Platform,
 } from 'react-native';
+import {useNavigation} from '@react-navigation/native';
+import Client from '../../screen/client/Client';
+import AsyncStorage from '@react-native-async-storage/async-storage';
 
 const ReadCategory = props => {
-  const {title, image, id, color, onSelectGame, path} = props;
+  const {title, image, id, color, path} = props;
+
+  const navigation = useNavigation();
+
+  const getReadingSession = () => {
+    const data = {
+      userId: 1,
+    };
+    Client.post('readingSession', JSON.stringify(data), {
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+    })
+      .then(res => {
+        console.log(res.data);
+        if (res.status == 200) {
+          console.log(res.data);
+          const token = res.data.token;
+          try {
+            AsyncStorage.setItem('token', token);
+          } catch (error) {
+            console.log(error);
+          }
+
+          navigation.navigate(path);
+        }
+      })
+      .catch(error => {
+        console.log(error);
+      });
+  };
+
   return (
     <View style={styles.gameItem}>
-      <TouchableOpacity onPress={onSelectGame}>
+      <TouchableOpacity
+        onPress={() => {
+          getReadingSession();
+        }}>
         <View>
           {/* <View style={{...styles.gameItemRow, ...styles.gameItemHeader}}> */}
-            <ImageBackground style={styles.bgImage} source={image}>
-              <View style={styles.titleContainer}>
-                <Text style={styles.title} numberOfLines={1}>
-                  {title}
-                </Text>
-              </View>
-            </ImageBackground>
+          <ImageBackground style={styles.bgImage} source={image}>
+            <View style={styles.titleContainer}>
+              <Text style={styles.title} numberOfLines={1}>
+                {title}
+              </Text>
+            </View>
+          </ImageBackground>
           {/* </View> */}
         </View>
       </TouchableOpacity>
@@ -32,7 +70,6 @@ const ReadCategory = props => {
 
 const styles = StyleSheet.create({
   gameItem: {
-    
     height: 300,
     width: '100%',
     backgroundColor: '#ccc',
@@ -55,7 +92,6 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   bgImage: {
-    
     height: '100%',
     width: '100%',
     justifyContent: 'flex-end',

frontend/src/screen/Read.js

@@ -22,25 +22,12 @@ import ButtonView from '../component/buttonView';
 import ReadCategory from '../component/reading/ReadCategory';
 import {ImagePaths} from '../assets/read/data/ReadData';
 
-const webUrel = 'http://127.0.0.1:5000/reading';
-
 export default function Read() {
   const [activity, setActivity] = useState([]);
 
   const navigation = useNavigation();
 
-  function getColorActivities() {
-    axios
-      .get(webUrel)
-      .then(response => {
-        setActivity(response.data);
-        console.log('response.data');
-      })
-      .catch(err => {});
-  }
-
   React.useEffect(() => {
-    getColorActivities();
     const unsubscribe = navigation.addListener('focus', () => {
       // The screen is focused
       // Call any action
@@ -67,25 +54,19 @@ export default function Read() {
             id={1}
             title={'Basic'}
             image={ImagePaths.roundOne}
-            onSelectGame={() => {
-              navigation.navigate('ReadActivity');
-            }}
+            path={'ReadActivity'}
           />
           <ReadCategory
             id={1}
             title={'Advanced'}
             image={ImagePaths.roundTwo}
-            onSelectGame={() => {
-              navigation.navigate('ReadActivityBird');
-            }}
+            path={'ReadActivityBird'}
           />
           <ReadCategory
             id={1}
             title={'Result & Summery'}
             image={ImagePaths.summery}
-            onSelectGame={() => {
-              navigation.navigate('ReadActivity');
-            }}
+            path={'ReadActivity'}
           />
         </TouchableOpacity>
       </ScrollView>

frontend/src/screen/auth/AuthenticateUser.js

+import {useNavigation} from '@react-navigation/native';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+export function Authorize() {
+  const navigation = useNavigation();
+
+  AsyncStorage.getItem('userToken')
+    .then(value => {
+      console.log(value);
+      if (value) {
+        return value;
+      } else {
+        alert('Please Login.......');
+        navigation.navigate('Login');
+      }
+    })
+    .catch(error => {
+      console.log(error);
+    });
+}

frontend/src/screen/auth/Login.js

@@ -12,7 +12,7 @@ import {
   TouchableOpacity,
   Image,
 } from 'react-native';
-
+import AsyncStorage from '@react-native-async-storage/async-storage';
 import client from '../client/Client';
 
 const isValidObjectField = obj => {
@@ -97,6 +97,8 @@ const Login = () => {
           return updateError('Please register our system', setError);
         }
         if (response.data.status == 200) {
+          const userToken = res.data.token;
+          AsyncStorage.setItem('userToken', userToken);
           return navigation.navigate('Start');
         }
       })

frontend/src/screen/client/Client.js

@@ -2,6 +2,6 @@ import axios from 'axios';
 
 // export default axios.create({ baseURL: 'http://192.168.8.102:5000/', timeout: 15000, });
 export default axios.create({
-  baseURL: 'http://192.168.8.101:5000/',
+  baseURL: 'http://192.168.1.100:5000/',
   timeout: 15000,
 });

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

@@ -17,14 +17,19 @@ import Voice from '@react-native-voice/voice';
 import {DummyReadResult} from '../../../assets/read/data/ReadData';
 import AudioRecord from 'react-native-audio-record';
 import Client from '../../client/Client';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import {Authorize} from '../../auth/AuthenticateUser';
 
 export default function ReadActivityBird() {
-  const [pitch, setPitch] = useState('');
+  const userToken = Authorize();
   const [error, setError] = useState('');
   const [readingData, setReadingData] = useState({activity: ''});
-  const [started, setStarted] = useState('');
-  const [results, setResults] = useState([]);
-  const [partialResults, setPartialResults] = useState([]);
+  const readToken = AsyncStorage.getItem('readingSession');
+
+  // useEffect(() => {
+  //   if (Authorize) {
+  //   }
+  // }, []);
 
   useEffect(() => {
     Voice.onSpeechStart = onSpeechStartHandler;
@@ -37,6 +42,16 @@ export default function ReadActivityBird() {
     };
   }, []);
 
+  useEffect(() => {
+    AsyncStorage.getItem('token')
+      .then(value => {
+        console.log(value);
+      })
+      .catch(error => {
+        console.log(error);
+      });
+  }, []);
+
   const onSpeechStartHandler = e => {
     console.log('start handler =>> ', e);
   };
@@ -56,10 +71,13 @@ export default function ReadActivityBird() {
     const data = {
       word: 'bird',
       userId: 1,
+      token: readToken,
+      level: 1,
+      triedCount: 1,
     };
     if (result.includes('hello')) {
       setReadingData(data);
-      console.log(data);
+      console.log(localStorage.getItem('readingSession'));
       sendRedingData(data);
     }
   };