Merge pull request #28 from ReflectionsProjections/dev/Bahl-Aryan/hom…

…e-page

Dev/bahl aryan/home page

Components/Text.tsx

@@ -12,10 +12,10 @@ const StyledText = styled(Text,
                     textAlign: 'center'
                 }, 
                 profileText: {
-                    fontSize: 60,
+                    fontSize: 40,
                     fontWeight: "$bold",
                     textAlign: 'center',
-                    fontFamily: "Kufam_700Bold_Italic"
+                    fontFamily: "Kufam_700Bold"
                 },
                 basic: {
                     fontSize: "$md",
@@ -27,7 +27,7 @@ const StyledText = styled(Text,
                     fontWeight: "$semibold",
                     textAlign: "center",
                     color: "$black",
-                    fontFamily: "Kufam_700Bold_Italic"
+                    fontFamily: "Kufam_700Bold"
                 }
             },
         },

api/getCurrentNextEvent.tsx

@@ -2,9 +2,9 @@ import axios from "axios";
 
 export const getCurrentOrNext = async (token: string) => {
     try{
-        const response = await axios.get('https://api.reflectionsprojections.org/events/currentOrNext', {
+        const response = await axios.get('https://api.reflectionsprojections.org/events/currentOrNext/', {
             headers: {
-                Authorization: token
+
             }
         });
         return response.data;

api/getPoints.tsx

@@ -0,0 +1,15 @@
+import axios from "axios";
+
+export const getPoints = async (token: string) => {
+    try{
+        const response = await axios.get('https://api.reflectionsprojections.org/attendee/points/', {
+            headers: {
+                Authorization: token
+            }
+        });
+        return response.data;
+    } catch (error) {
+        console.error("Error in catching events:", error);
+        throw error;
+    }
+}

eas.json

@@ -7,6 +7,13 @@
       "developmentClient": true,
       "distribution": "internal"
     },
+    "development-simulator": {
+      "developmentClient": true,
+      "distribution": "internal",
+      "ios": {
+        "simulator": true
+      }
+    },
     "preview": {
       "distribution": "internal"
     },

navigation/Navigation.tsx

@@ -105,7 +105,7 @@ const AppNavigator: React.FC = () => {
         component={Events}
         options={{ tabBarLabel: () => null }}
       />
-      {roles.includes('STAFF') || roles.includes('ADMIN') ? (
+      {roles.includes('STAFF') ? (
         <Tab.Screen
         name="AdminScanner"
         component={AdminScanner}

package.json

@@ -13,7 +13,6 @@
     "@expo-google-fonts/inter": "^0.2.3",
     "@expo-google-fonts/kufam": "^0.2.3",
     "@expo-google-fonts/press-start-2p": "^0.2.3",
-    "@expo-google-fonts/press-start-2p": "^0.2.3",
     "@gluestack-style/react": "^1.0.52",
     "@gluestack-ui/config": "^1.1.18",
     "@gluestack-ui/themed": "^1.1.30",
@@ -27,9 +26,11 @@
     "@reduxjs/toolkit": "^2.2.5",
     "@types/react": "~18.2.45",
     "axios": "^1.7.2",
+    "date-fns": "^3.6.0",
     "expo": "latest",
     "expo-app-loading": "^1.1.2",
     "expo-camera": "^15.0.11",
+    "expo-dev-client": "~4.0.25",
     "expo-font": "~12.0.9",
     "expo-linking": "^6.3.1",
     "expo-splash-screen": "~0.27.5",
@@ -50,6 +51,7 @@
     "react-native-safe-area-context": "4.10.1",
     "react-native-screens": "3.31.1",
     "react-native-svg": "^15.3.0",
+    "react-native-svg-transformer": "^1.5.0",
     "react-native-svg-uri": "^0.0.1",
     "react-native-tab-view": "^3.5.2",
     "react-native-webview": "^13.12.0",
@@ -65,8 +67,7 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.6",
-    "react-native-svg-transformer": "^1.4.0"
+    "eslint-plugin-react-refresh": "^0.4.6"
   },
   "private": true
 }

screens/Home.tsx

@@ -8,6 +8,7 @@ import { getCurrentOrNext } from "../api/getCurrentNextEvent";
 import { RootState } from "../redux/store";
 import CurrentEventCard from "../Components/CurrentEventCard";
 import Colors from "../constants/Colors";
+import { Text } from "@gluestack-ui/themed";
 
 const { width, height } = Dimensions.get("window");
 
@@ -67,6 +68,7 @@ const Home: React.FC = () => {
             <Text style={styles.noEventText}>No current or upcoming events</Text>
           </View>
         )}
+
       </View>
     </SafeAreaView>
   );