Merge branch 'it18257632' into 'master'

some changes

See merge request !105

.idea/21_22j-38.iml

@@ -4,6 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
       <excludeFolder url="file://$MODULE_DIR$/API/venv" />
+      <excludeFolder url="file://$MODULE_DIR$/backend/IT18257632/venv" />
     </content>
     <orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

API/app.py

@@ -45,6 +45,11 @@ def abc():
 
 
 if __name__ == "__main__":
+<<<<<<< HEAD
+
+    app.run(host='192.168.8.102')
+=======
     app.run(host='192.168.8.101')
     # app.run(host='192.168.8.100,port='5000', debug=True)
     # app.run(debug=True)
+>>>>>>> ef01cf5d3888e989084c7d61dff42b160793ac0a

backend/IT18257632/pronounce_spotting_service.py

@@ -9,19 +9,16 @@ class _Keyword_Spotting_Service:
 
     model = None
     _mappings = [
-        "bed",
-        "bird",
-        "dog",
-        "eight",
+
         "go",
-        "left",
-        "nine",
         "no",
-        "one",
-        "seven",
-        "tree",
+        "yes",
         "wow",
-        "yes"
+        "dog",
+        "bed",
+        "bird",
+        "left",
+        "eight"
     ]
     _instance = None
 

frontend/package-lock.json

@@ -288,9 +288,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -15923,9 +15923,9 @@
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="
     },
     "@babel/helper-remap-async-to-generator": {
       "version": "7.16.0",

frontend/src/router/router.js

@@ -16,7 +16,7 @@ const Stack = createNativeStackNavigator();
 const AppRouter = () => {
   return (
     <NavigationContainer>
-      <Stack.Navigator initialRouteName="Color">
+      <Stack.Navigator initialRouteName="Login">
         <Stack.Screen
           options={{headerShown: false}}
           name="Home"

frontend/src/screen/Read.js

@@ -69,7 +69,7 @@ export default function Read() {
 
         <ButtonView title="First Round" color="#00008B"></ButtonView>
         <ButtonView title="Second Round" color="#00008B"></ButtonView>
-        <ButtonView title="Third Round" color="#00008B"></ButtonView>
+        {/* <ButtonView title="Third Round" color="#00008B"></ButtonView> */}
       </ScrollView>
     </SafeAreaView>
   );

frontend/src/screen/activity/readActivity.js

@@ -94,7 +94,7 @@ const styles = StyleSheet.create({
     marginTop: 150,
     marginLeft: 95,
     backgroundColor: '#00008B',
-    width: 200,
+    width: 150,
     borderRadius: 50,
     padding: 5,
   },