diff --git a/src/Routes/UserInfo/UserInfo.tsx b/src/Routes/UserInfo/UserInfo.tsx index e755dba..54a42fe 100644 --- a/src/Routes/UserInfo/UserInfo.tsx +++ b/src/Routes/UserInfo/UserInfo.tsx @@ -3,37 +3,49 @@ 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 UserIcon from '../../Components/Icons/UserIcon/UserIcon'; -import {TouchableOpacity, TextInput} from "react-native"; -import { useState } from "react"; +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 UserInfo() { - const [isEditable, setIsEditable] = useState(false); +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 + ); + if (isLoading && !error) { + return ( + + + Loading... + + + ); + } else if (error) { + return ( + + + An error has occured + + + ); + } return ( - - - - USER INFO - - - - - Username - - - - setIsEditable(!isEditable)} - > - {isEditable ? "Save" : "Edit Profile"} - + + + + + Username: {logged_in_user.username} + Email: {logged_in_user.email} + User ID: {logged_in_user.id} + + + - ); -} +} \ No newline at end of file diff --git a/src/styles.tsx b/src/styles.tsx index 7b212a1..c90d7a5 100644 --- a/src/styles.tsx +++ b/src/styles.tsx @@ -64,7 +64,7 @@ const styles = StyleSheet.create({ height: 50, alignItems: "center", justifyContent: "center", - backgroundColor: "#0dbc6a", + backgroundColor: "lightgreen", }, registerbtn: { width: "80%", @@ -73,7 +73,7 @@ const styles = StyleSheet.create({ alignItems: "center", justifyContent: "center", marginTop: 40, - backgroundColor: "#e2b465", + backgroundColor: "orange", }, loginText: { color: "white", @@ -150,7 +150,7 @@ const styles = StyleSheet.create({ alignItems: "center", }, typehere: { - backgroundColor: "#00293e", + backgroundColor: "black", borderRadius: 10, width: "75%", height: 300, @@ -173,8 +173,6 @@ const styles = StyleSheet.create({ width: "80%", height: 40, marginTop: 20, - alignItems: "center", - justifyContent: "center", }, addnotecont: { marginTop: 30, @@ -182,7 +180,7 @@ const styles = StyleSheet.create({ height: 500, width: 350, borderRadius: 25, - backgroundColor: "black", + backgroundColor: "#001018", alignItems: "center", justifyContent: "center", },