setServerResponse fix and key duplication fix

Author: feguare

client/src/FindRoute.js

@@ -23,8 +23,6 @@ export default function FindRouteScreen({ navigation }) {
 
   const [selectedMode, setSelectedMode] = useState(null);
 
-  const [setServerResponse] = useState('');
-
   const isFormValid = start.trim() !== '' && destination.trim() !== '';
 
   const fetchRoutes = async () => {
@@ -57,10 +55,6 @@ export default function FindRouteScreen({ navigation }) {
       const data = await response.json();
       console.log('Server response:', data);
 
-      setServerResponse('Data has been queried successfully!');
-      // await new Promise(resolve => setTimeout(resolve, 3000));
-      // setServerResponse("")
-
       // Navigate to SelectRouteScreen with the response data
       navigation.navigate('SelectRouteScreen', {
         origin: start,

client/src/LogIn.js

@@ -11,7 +11,6 @@ import { handleLogin } from './utils/accountUtils';
 import styles from './components/styles/Login.styles';
 
 export default function LoginScreen({ navigation }) {
-  const [setServerResponse] = useState('');
   const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
   const ref2 = React.useRef(null);
@@ -39,7 +38,7 @@ export default function LoginScreen({ navigation }) {
         <TouchableOpacity
           style={styles.TouchableOpacity}
           onPress={() =>
-            handleLogin(username, password, setServerResponse, navigation)
+            handleLogin(username, password, navigation)
           }
           color="#841584"
         >

client/src/SelectRoute.js

@@ -102,9 +102,8 @@ export default function SelectRouteScreen({ navigation, route }) {
           </MapView>
           <View>
             {routes.map((routeOption, index) => {
-              const uniquekey = `${routeOption.summary}-${routeOption.overview_polyline.points}`;
               return (
-                <View key={uniquekey} style={selectRouteStyles.routeContainer}>
+                <View key={index} style={selectRouteStyles.routeContainer}>
                   <TouchableOpacity
                     onPress={() => displaySelectedRoute(index)}
                     style={selectRouteStyles.routeButton}

client/src/SignUp.js

@@ -13,7 +13,6 @@ import textInputStyles from './components/common/textInput';
 import containerStyles from './components/common/commonContainer';
 
 export default function SignUpScreen({ navigation }) {
-  const [setServerResponse] = useState('');
   const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
   const ref2 = React.useRef(null);
@@ -41,7 +40,7 @@ export default function SignUpScreen({ navigation }) {
         <TouchableOpacity
           style={buttonStyles.button}
           onPress={() =>
-            handleSignup(username, password, setServerResponse, navigation)
+            handleSignup(username, password, navigation)
           }
           color="#841584"
         >

client/src/utils/accountUtils.js

@@ -4,7 +4,6 @@ import { storeData, retrieveData, removeData, updateData } from '../caching';
 export const handleLogin = async (
   username,
   password,
-  setServerResponse,
   navigation,
 ) => {
   if (username === '' || password === '') {
@@ -47,18 +46,15 @@ export const handleLogin = async (
       // if the data is "success", then cache details
 
       console.log('Server response:', data);
-      setServerResponse(data.message);
     } catch (error) {
       console.error('Error details:', error);
-      setServerResponse(`Error: ${error.message}`);
     }
   }
 };
 
 export const handleSignup = async (
   username,
   password,
-  setServerResponse,
   navigation,
 ) => {
   if (username === '' || password === '') {
@@ -101,10 +97,8 @@ export const handleSignup = async (
       }
 
       console.log('Server response:', data);
-      setServerResponse(data.message);
     } catch (error) {
       console.error('Error details:', error);
-      setServerResponse(`Error: ${error.message}`);
     }
   }
 };

server/src/main.py

@@ -1,14 +1,13 @@
 from fastapi import FastAPI, Request, WebSocket, WebSocketDisconnect
 
-# from src.wayfinding import router  # Import the API routes
-from wayfinding import router  # Import the API routes
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
 import logging
 import uvicorn
 import sys
 from src.signup import Signup
 from src.login import Login
+from src.wayfinding import router  # Import the API routes
 from src.weatherApi import weatherAPI
 from src.preferences import Preferences
 from src.networking import Networking