Merge branch 'it18218640' into 'master'

It18218640

See merge request !147

API/app.py

@@ -68,22 +68,27 @@ def getColorActivitiesResult():
 @app.route("/predict", methods=["POST"])
 def predict():
 
-    data = request.get_json()
-    print((f"{data}"))
-
-    fileitem = data['uri']
-
-    # if fileitem.filename:
-    #     # strip the leading path from the file name
-    fn = os.path.basename(fileitem)
-    #
-    #     # open read and write the file into the server
-    open(fn, 'wb').write(fileitem.file.read())
-
-    resp = make_response(request.get_json())
-    resp.headers['Access-Control-Allow-Origin'] = '*'
-    resp.headers['Content-Type'] = 'application/json'
-    return resp
+    try:
+        data = request.get_json()
+
+        fileitem = data['uri']
+
+        colorName = data['colorNmae']
+        # print((f"{colorName}"))
+
+        # if fileitem.filename:
+        #     # strip the leading path from the file name
+        fn = os.path.basename(fileitem)
+        #
+        #     # open read and write the file into the server
+        # open(fn, 'wb').write(fileitem.file.read())
+
+        resp = make_response(request.get_json())
+        resp.headers['Access-Control-Allow-Origin'] = '*'
+        resp.headers['Content-Type'] = 'application/json'
+        return resp
+    except ValueError:
+        print(ValueError)
 
     # get audio file and save it
     # audio_file = request.files["file"]

frontend/src/screen/activity/Blue.js

@@ -94,25 +94,12 @@ export default function Blue(color) {
         const formData = new FormData();
 
         var obj = {
-            uri: `file://${audioFile}`,
+            uri: `file:${audioFile}`,
             type: 'audio/wav',
             name: 'color.wav',
             colorNmae: backColor
         }
 
-        // formData.append(
-        //     'file',
-        //     {
-        //         uri: `file://${audioFile}`,
-        //         type: 'audio/wav',
-        //         name: 'color.wav',
-        //     }
-        // );
-
-        // formData.append(
-        //     'name', backColor
-        // );
-
         var data = JSON.stringify(obj)
         console.log(data);