diff --git a/src/Routes/Login/Login.tsx b/src/Routes/Login/Login.tsx
index 90a8998..c73cd62 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 e755dba..9b605ec 100644
--- a/src/Routes/UserInfo/UserInfo.tsx
+++ b/src/Routes/UserInfo/UserInfo.tsx
@@ -1,39 +1,53 @@
-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 UserIcon from '../../Components/Icons/UserIcon/UserIcon';
-import {TouchableOpacity, TextInput} from "react-native";
-import { useState } from "react";
+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 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);
+ if (isLoading && !error) {
+ return (
+
+
+
+ Loading...
+
+
+
+ );
+ } else if (error) {
+ return (
+
+
+
+ An error has occured
+
+
+
+ );
+ }
return (
-
-
-
- USER INFO
-
-
-
-
- Username
-
-
-
- setIsEditable(!isEditable)}
- >
- {isEditable ? "Save" : "Edit Profile"}
-
+
+
+ Username: {data.username}
+
+
+ Email: {data.email}
+
+
+ User ID: {data.id}
+
-
);
}
diff --git a/src/styles.tsx b/src/styles.tsx
index a77b043..c0d07b8 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,
@@ -174,8 +174,6 @@ const styles = StyleSheet.create({
width: "80%",
height: 40,
marginTop: 20,
- alignItems: "center",
- justifyContent: "center",
},
addnotecont: {
marginTop: 30,
@@ -184,7 +182,7 @@ const styles = StyleSheet.create({
minHeight: 500,
width: 350,
borderRadius: 25,
- backgroundColor: "black",
+ backgroundColor: "#001018",
alignItems: "center",
justifyContent: "center",
},