Skip to content

Commit 065e068

Browse files
committed
setServerResponse fix and key duplication fix
1 parent 5d6d1c9 commit 065e068

6 files changed

Lines changed: 4 additions & 20 deletions

File tree

client/src/FindRoute.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ export default function FindRouteScreen({ navigation }) {
2323

2424
const [selectedMode, setSelectedMode] = useState(null);
2525

26-
const [setServerResponse] = useState('');
27-
2826
const isFormValid = start.trim() !== '' && destination.trim() !== '';
2927

3028
const fetchRoutes = async () => {
@@ -57,10 +55,6 @@ export default function FindRouteScreen({ navigation }) {
5755
const data = await response.json();
5856
console.log('Server response:', data);
5957

60-
setServerResponse('Data has been queried successfully!');
61-
// await new Promise(resolve => setTimeout(resolve, 3000));
62-
// setServerResponse("")
63-
6458
// Navigate to SelectRouteScreen with the response data
6559
navigation.navigate('SelectRouteScreen', {
6660
origin: start,

client/src/LogIn.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { handleLogin } from './utils/accountUtils';
1111
import styles from './components/styles/Login.styles';
1212

1313
export default function LoginScreen({ navigation }) {
14-
const [setServerResponse] = useState('');
1514
const [username, setUsername] = useState('');
1615
const [password, setPassword] = useState('');
1716
const ref2 = React.useRef(null);
@@ -39,7 +38,7 @@ export default function LoginScreen({ navigation }) {
3938
<TouchableOpacity
4039
style={styles.TouchableOpacity}
4140
onPress={() =>
42-
handleLogin(username, password, setServerResponse, navigation)
41+
handleLogin(username, password, navigation)
4342
}
4443
color="#841584"
4544
>

client/src/SelectRoute.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,8 @@ export default function SelectRouteScreen({ navigation, route }) {
102102
</MapView>
103103
<View>
104104
{routes.map((routeOption, index) => {
105-
const uniquekey = `${routeOption.summary}-${routeOption.overview_polyline.points}`;
106105
return (
107-
<View key={uniquekey} style={selectRouteStyles.routeContainer}>
106+
<View key={index} style={selectRouteStyles.routeContainer}>
108107
<TouchableOpacity
109108
onPress={() => displaySelectedRoute(index)}
110109
style={selectRouteStyles.routeButton}

client/src/SignUp.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import textInputStyles from './components/common/textInput';
1313
import containerStyles from './components/common/commonContainer';
1414

1515
export default function SignUpScreen({ navigation }) {
16-
const [setServerResponse] = useState('');
1716
const [username, setUsername] = useState('');
1817
const [password, setPassword] = useState('');
1918
const ref2 = React.useRef(null);
@@ -41,7 +40,7 @@ export default function SignUpScreen({ navigation }) {
4140
<TouchableOpacity
4241
style={buttonStyles.button}
4342
onPress={() =>
44-
handleSignup(username, password, setServerResponse, navigation)
43+
handleSignup(username, password, navigation)
4544
}
4645
color="#841584"
4746
>

client/src/utils/accountUtils.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { storeData, retrieveData, removeData, updateData } from '../caching';
44
export const handleLogin = async (
55
username,
66
password,
7-
setServerResponse,
87
navigation,
98
) => {
109
if (username === '' || password === '') {
@@ -47,18 +46,15 @@ export const handleLogin = async (
4746
// if the data is "success", then cache details
4847

4948
console.log('Server response:', data);
50-
setServerResponse(data.message);
5149
} catch (error) {
5250
console.error('Error details:', error);
53-
setServerResponse(`Error: ${error.message}`);
5451
}
5552
}
5653
};
5754

5855
export const handleSignup = async (
5956
username,
6057
password,
61-
setServerResponse,
6258
navigation,
6359
) => {
6460
if (username === '' || password === '') {
@@ -101,10 +97,8 @@ export const handleSignup = async (
10197
}
10298

10399
console.log('Server response:', data);
104-
setServerResponse(data.message);
105100
} catch (error) {
106101
console.error('Error details:', error);
107-
setServerResponse(`Error: ${error.message}`);
108102
}
109103
}
110104
};

server/src/main.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
from fastapi import FastAPI, Request, WebSocket, WebSocketDisconnect
22

3-
# from src.wayfinding import router # Import the API routes
4-
from wayfinding import router # Import the API routes
53
from fastapi.middleware.cors import CORSMiddleware
64
from pydantic import BaseModel
75
import logging
86
import uvicorn
97
import sys
108
from src.signup import Signup
119
from src.login import Login
10+
from src.wayfinding import router # Import the API routes
1211
from src.weatherApi import weatherAPI
1312
from src.preferences import Preferences
1413
from src.networking import Networking

0 commit comments

Comments
 (0)