Dev/bahl aryan/log in

App.tsx

@@ -68,7 +68,6 @@ const App = (props) => {
       const searchParams = new URL(event.url).searchParams;
       const token = searchParams.get('token');
       if (token) {
-        dispatch(setToken(token))
         const decoded = decodeToken(token);
         console.log("token", token, "decoded token", decoded);
         console.log(decoded.roles);
@@ -83,6 +82,7 @@ const App = (props) => {
           setDeepLinkHandled(false);
         } else {
           console.log('dispatched')
+          dispatch(setToken(token));
           dispatch(setRoles(decoded.roles));
           setDeepLinkHandled(true);
         }

api/postCheckIn.tsx

@@ -3,7 +3,7 @@ import axios from "axios";
 export const postCheckIn = async(token, eventId, qrCode) => {
     const payload = { eventId, qrCode }
     try {
-        const response = await axios.post('https://api.reflectionsprojections.org/staff/scan/', payload, {
+        const response = await axios.post('https://api.reflectionsprojections.org/scan/staff/', payload, {
             headers: {
                 Authorization: token
             }

navigation/Navigation.tsx

@@ -64,7 +64,7 @@ const AppNavigator: React.FC = () => {
             case "AdminScanner":
               return (
                 <MaterialCommunityIcons
-                  name="camera"
+                  name="qrcode-scan"
                   color={focused ? ACTIVE_COLOR : INACTIVE_COLOR}
                   size={35}
                 />

screens/Login.tsx

@@ -12,6 +12,7 @@ import { NavigationProp, ParamListBase } from "@react-navigation/native";
 import { useAppSelector } from "../redux/hooks";
 import { RootState } from "../redux/store";
 import Colors from "../constants/Colors";
+import { useState } from "react";
 
 import ScreenImage from "../assets/SVGs/login/LoginScreen.svg";
 
@@ -27,28 +28,32 @@ const { width, height } = Dimensions.get("window");
 const Login: React.FC<LoginProps> = ({ navigation }) => {
   const token = useAppSelector((state: RootState) => state.token);
   const roles = useAppSelector((state: RootState) => state.roles);
+  const [loggedIn, setLoggedIn] = useState(false);
 
   useEffect(() => {
     if (token && roles.includes('USER')) {
-      navigation.navigate("Main");
+      setLoggedIn(true);
     }
-  }, [token, navigation]);
+  }, [token, roles, navigation]);
 
   const handleLoginPress = () => {
-    WebBrowser.openAuthSessionAsync(
-      `${authUrl}?redirect_uri=${redirectURL}`,
-      redirectURL
-    )
-      .then((result) => {
-        if (result.type === "success") {
-          console.log("opening url for log in ")
-          Linking.openURL(result.url);
-        }
-      })
-      .catch((err) => {
-        console.error("Failed to open URL:", err.message);
-        alert("Failed to open URL");
-      });
+    if(loggedIn) {
+      navigation.navigate("Main");
+    } else {
+      WebBrowser.openAuthSessionAsync(
+        `${authUrl}?redirect_uri=${redirectURL}`,
+        redirectURL
+      )
+        .then((result) => {
+          if (result.type === "success") {
+            Linking.openURL(result.url);
+          }
+        })
+        .catch((err) => {
+          console.error("Failed to open URL:", err.message);
+          alert("Failed to open URL");
+        });
+    }
   };
 
   return (

screens/Profile.tsx

@@ -128,7 +128,7 @@ const Profile: React.FC = () => {
     <SafeAreaView style={styles.safeArea}>
       <Background style={styles.background} height={height} width={width} preserveAspectRatio="none"/>
       <Logout style={styles.logout} width={'35%'} height={'5%'} preserveAspectRatio="none" onPress={handleLogOut}/>
-      {attendee && qrcode &&
+      {(attendee && qrcode) ? (
       <View style={styles.qrContainer}>
         <View style={styles.qrFrameContainer}>
           {foodWave == 1 ? (
@@ -145,7 +145,12 @@ const Profile: React.FC = () => {
         </View>
         <StyledText variant="profileText" color={Colors.WHITE} style={styles.profileText}>{attendee.name}</StyledText>
         <FoodWaveSVG foodWave={foodWave} />
-      </View>}
+      </View>):
+      (
+        <View style={styles.qrContainer}>
+          <StyledText variant="profileText" color={Colors.WHITE} fontSize={24}>Please register on the R|P Website!</StyledText>
+        </View>
+      )}
     </SafeAreaView>
   );
 };

screens/Shop.tsx

@@ -47,7 +47,7 @@ const Shop: React.FC = () => {
           <Text style={styles.points}>Your Points:</Text>
           <Image
             source={require("../assets/pixel.png")}
-            style={styles.tokenImage}
+            style={styles.tokenImage2}
           />
           <Text style={styles.myPoints}>x{userPoints}</Text>
         </View>
@@ -119,6 +119,7 @@ const styles = StyleSheet.create({
     alignItems: "center",
     justifyContent: "center",
     marginBottom: 20,
+
   },
   points: {
     fontSize: 17,
@@ -132,10 +133,16 @@ const styles = StyleSheet.create({
     fontFamily: "PressStart2P_400Regular",
     color: Colors.YELLOW,
   },
+  tokenImage2: {
+    width: 30,
+    height: 30,
+    marginRight: 5,
+  },
   tokenImage: {
     width: 30,
     height: 30,
     marginRight: 5,
+    marginLeft: 10
   },
   photoContainer: {
     flex: 1,