Merge branch 'it18257632' into 'master'

finished

See merge request !196

API/app.py

@@ -256,4 +256,4 @@ def predict_pronounce(FPFN):
 
 
 if __name__ == "__main__":
-    app.run(host='192.168.8.100')
+    app.run(host='192.168.1.101')

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
 

frontend/src/assets/read/data/ReadData.js

@@ -10,7 +10,7 @@ export const ImagePaths = {
   backgroundAdvancedDog: require('../image/dogbb.jpg'),
   backgroundAdvancedBird: require('../image/birdb.jpg'),
   backgroundAdvancedFish: require('../image/fishbb.jpg'),
-  resultBackground: require('../image/rersultBacground.jpeg'),
+  resultBackground: require('../image/table.jpeg'),
   no: require('../image/no.png'),
   go: require('../image/go.png'),
   he: require('../image/he.png'),

frontend/src/component/reading/TableList.js

@@ -35,7 +35,7 @@ export default function TableList() {
     Client.get('result/' + userId)
       .then(response => {
         setTableData({
-          tableHead: ['Word', 'Count', 'Level'],
+          tableHead: ['Word', 'Try Count', 'Level'],
           data: response.data.data,
         });
       })
@@ -54,14 +54,14 @@ export default function TableList() {
         <Table borderStyle={{borderWidth: 3, borderColor: '#fff'}}>
           <Row
             data={tableData.tableHead}
-            flexArr={[ 1, 1, 1.5]}
+            flexArr={[ 1, 1.4, 1.3]}
             style={styles.head}
             textStyle={styles.text}
           />
           <TableWrapper style={styles.wrapper}>
             <Rows
               data={tableData.data}
-              flexArr={[1, 1, 1.5]}
+              flexArr={[1, 1.4, 1.3]}
               style={styles.row}
               textStyle={styles.text}
             />
@@ -80,7 +80,7 @@ const styles = StyleSheet.create({
     paddingRight: 60,
     marginTop: 0,
   },
-  head: {height: 60, backgroundColor: '#f1f8ff'},
+  head: {height: 60, backgroundColor: 'green'},
   wrapper: {
     flexDirection: 'row',
     backgroundColor: '#f1f8ff',

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.100:5000/',
+  baseURL: 'http://192.168.1.101:5000/',
   timeout: 15000,
 });

frontend/src/screen/reading/basic/ReadActivityNo.js

@@ -274,34 +274,6 @@ export default function ReadActivityNo() {
         </Modal>
       )}
 
-      {modalVisible && (
-        <Modal
-          animationType="fade"
-          transparent={true}
-          hidden={true}
-          visible={true}
-          //   onRequestClose={() => {
-          //     setModalVisible2(!modalVisible2);
-          //       }}
-        >
-          <View style={styles.centeredView2}>
-            <View style={styles.modalView2}>
-              <Text style={styles.headStyle2}>Press The Button</Text>
-              <Text style={styles.head2Style2}>And Pronounce</Text>
-              <TouchableOpacity
-                style={[styles.buttonClose2]}
-                onPress={() => setModalVisible(false)}>
-                <Image
-                  source={ImagePaths.correct}
-                  resizeMode="contain"
-                  style={{width: 100, height: 70, marginBottom: -10}}
-                />
-              </TouchableOpacity>
-            </View>
-          </View>
-        </Modal>
-      )}
-
       <View style={{flexDirection: 'column'}}>
         <ImageBackground
           style={styles.image}

frontend/src/screen/reading/result/ReadResults.js

@@ -70,6 +70,9 @@ export default function ReadResults() {
             <TableList />
             {/* </View> */}
           </View>
+          <View>
+            <Image style={styles.temp} source={ImagePaths.chart}></Image>
+          </View>
         </ImageBackground>
       </View>
     </SafeAreaView>
@@ -114,4 +117,13 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     fontWeight: 'bold',
   },
+  temp: {
+    marginTop: 100,
+    marginLeft: 80,
+    // backgroundColor: '#00008B',
+    width: 220,
+    height: 200,
+    borderRadius: 50,
+    padding: 5,
+  },
 });