Merge branch 'it18218640' into 'master'

It18218640

See merge request !183

API/app.py

@@ -3,8 +3,8 @@ from flask import Flask, render_template, request, jsonify, make_response
 from API.model.color.colorModel import save_color_session_details, sendPredictData
 from API.model.readModel import save_activity_details, save_session_details
 from API.model.userModel import getUser, saveUserSession, logoutUser
-from API.model.color.colorModel import get_color_activities1, get_color_activities2, get_color_activity_result, \
-    storeResult, save_color_session_details
+from API.model.color.colorModel import *
+from API.model.color.colorModel import *
 from flask import Flask, redirect, url_for, render_template, request, jsonify, make_response
 import random
 import os
@@ -45,9 +45,9 @@ def getColorActivitiesResult():
     userId = req['userId']
     # print("data_dic")
 
-    result = get_color_activity_result(userId)
+    # result = get_color_activity_result(userId)
 
-    return result
+    return userId
 
 
 # Predict route

frontend/src/screen/Home.js

@@ -12,7 +12,7 @@ export default function Home({ navigation }){
 
     React.useEffect(() => {
 
-      AsyncStorage.removeItem('colorToken');
+      // AsyncStorage.removeItem('colorToken');
 
       const unsubscribe = navigation.addListener("focus", () => {
         Orientation.unlockAllOrientations();