diff --git a/src/Routes/Login/Login.tsx b/src/Routes/Login/Login.tsx index b88bd00..60cea1f 100644 --- a/src/Routes/Login/Login.tsx +++ b/src/Routes/Login/Login.tsx @@ -66,10 +66,6 @@ export default function Login() { }} /> - - - Forgot Password? - { setUser({ diff --git a/src/Routes/UserInfo/UserInfo.tsx b/src/Routes/UserInfo/UserInfo.tsx index 54a42fe..9b605ec 100644 --- a/src/Routes/UserInfo/UserInfo.tsx +++ b/src/Routes/UserInfo/UserInfo.tsx @@ -1,26 +1,26 @@ -import * as React from 'react'; -import {View, Text} from 'react-native'; -import styles from '../../styles'; -import Background from '../../Components/Background/Background'; -import { SafeAreaView } from 'react-native-safe-area-context'; -import { UserInfo } from '../../Components/Api/Api'; -import { useQuery } from 'react-query'; -import { useSelector } from 'react-redux'; -import { RootState } from '../../Features/Redux/Store/Store'; +import * as React from "react"; +import { View, Text } from "react-native"; +import styles from "../../styles"; +import Background from "../../Components/Background/Background"; +import { SafeAreaView } from "react-native-safe-area-context"; +import { UserInfo } from "../../Components/Api/Api"; +import { useQuery } from "react-query"; +import { useSelector } from "react-redux"; +import { RootState } from "../../Features/Redux/Store/Store"; export default function UserPage() { - const { data, isLoading, error } = useQuery("user", UserInfo, { retry: 0, onSuccess: (data) => console.log(data) }); - const logged_in = useSelector( - (state: RootState) => state.logged_in.value - ); - const logged_in_user = useSelector( - (state: RootState) => state.logged_in_user.value - ); + const { data, isLoading, error } = useQuery("user", UserInfo, { + retry: 0, + onSuccess: (data) => console.log(data), + }); + const logged_in = useSelector((state: RootState) => state.logged_in.value); if (isLoading && !error) { return ( - Loading... + + Loading... + ); @@ -28,7 +28,9 @@ export default function UserPage() { return ( - An error has occured + + An error has occured + ); @@ -36,16 +38,16 @@ export default function UserPage() { return ( - - - - Username: {logged_in_user.username} - Email: {logged_in_user.email} - User ID: {logged_in_user.id} - - - + + Username: {data.username} + + + Email: {data.email} + + + User ID: {data.id} + ); -} \ No newline at end of file +}