Merge pull request #23 from lemeow125/feature/userinfo

Feature/userinfo

src/Routes/Login/Login.tsx

@@ -66,10 +66,6 @@ export default function Login() {
               }}
             />
           </View>
-
-          <TouchableOpacity>
-            <Text style={styles.forgot_button}>Forgot Password?</Text>
-          </TouchableOpacity>
           <TouchableOpacity
             onPress={async () => {
               setUser({

src/Routes/UserInfo/UserInfo.tsx

@@ -1,39 +1,53 @@
-import * as React from 'react';
+import * as React from "react";
-import {View, Text} from 'react-native';
+import { View, Text } from "react-native";
-import styles from '../../styles';
+import styles from "../../styles";
-import Background from '../../Components/Background/Background';
+import Background from "../../Components/Background/Background";
-import { SafeAreaView } from 'react-native-safe-area-context';
+import { SafeAreaView } from "react-native-safe-area-context";
-import UserIcon from '../../Components/Icons/UserIcon/UserIcon';
+import { UserInfo } from "../../Components/Api/Api";
-import {TouchableOpacity, TextInput} from "react-native";
+import { useQuery } from "react-query";
-import { useState } from "react";
+import { useSelector } from "react-redux";
+import { RootState } from "../../Features/Redux/Store/Store";
 
-export default function UserInfo() {
+export default function UserPage() {
-  const [isEditable, setIsEditable] = useState(false);
+  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 (
+      <View style={styles.background}>
+        <View style={styles.addnotecont}>
+          <Text style={{ ...styles.text_white, ...{ fontSize: 25 } }}>
+            Loading...
+          </Text>
+        </View>
+      </View>
+    );
+  } else if (error) {
+    return (
+      <View style={styles.background}>
+        <View style={styles.addnotecont}>
+          <Text style={{ ...styles.text_white, ...{ fontSize: 25 } }}>
+            An error has occured
+          </Text>
+        </View>
+      </View>
+    );
+  }
   return (
     <Background>
-      <Text style={{...styles.text_white, ...{fontSize: 32}}}></Text>
+      <View style={styles.addnotecont}>
-      <SafeAreaView>
+        <Text style={{ ...styles.text_white, ...{ fontSize: 25 } }}>
-      <View style={styles.userinfocont}>  
+          Username: {data.username}
-        <Text style ={styles.userlabel} > <UserIcon size={32} color="white"/> USER INFO</Text>
+        </Text>
-
+        <Text style={{ ...styles.text_white, ...{ fontSize: 25 } }}>
-        </View>
+          Email: {data.email}
-      <View style={styles.form}>
+        </Text>
-        <View style={styles.inputRow}>
+        <Text style={{ ...styles.text_white, ...{ fontSize: 25 } }}>
-          <Text style={styles.label}>Username</Text>
+          User ID: {data.id}
-          <TextInput
+        </Text>
-            style={[styles.inputUser, !isEditable && styles.disabledInput]}
-            editable={isEditable}
-          />
-          
-        </View>
-        <TouchableOpacity
-          style={styles.editButton}
-          onPress={() => setIsEditable(!isEditable)}
-        >
-          <Text style={styles.buttonText}>{isEditable ? "Save" : "Edit Profile"}</Text>
-        </TouchableOpacity>
       </View>
-      </SafeAreaView>
     </Background>
   );
 }

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",
   },