App.tsx

@@ -1,5 +1,4 @@
 import "react-native-gesture-handler";
-import styles from "./src/styles";
 import { NavigationContainer } from "@react-navigation/native";
 import { createDrawerNavigator } from "@react-navigation/drawer";
 import { Provider } from "react-redux";
@@ -17,18 +16,9 @@ import Register from "./src/routes/Register/Register";
 import Onboarding from "./src/routes/Onboarding/Onboarding";
 import Revalidation from "./src/routes/Revalidation/Revalidation";
 import Activation from "./src/routes/Activation/Activation";
+import UserInfo from "./src/routes/UserInfo/UserInfo";
 import { useState, useEffect } from "react";
 import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
-import { StatusBar } from "expo-status-bar";
-import UserInfoPage from "./src/routes/UserInfoPage/UserInfoPage";
-import SubjectsPage from "./src/routes/SubjectsPage/SubjectsPage";
-import ConversationPage from "./src/routes/ConversationPage/ConversationPage";
-import Loading from "./src/routes/Loading/Loading";
-import StartStudying from "./src/routes/StartStudying/StartStudying";
-import { ToastProvider } from "react-native-toast-notifications";
-import InfoIcon from "./src/icons/InfoIcon/InfoIcon";
-import CreateGroup from "./src/routes/CreateGroup/CreateGroup";
-import BackgroundComponent from "./src/components/BackgroundTask/BackgroundTask";
 
 const Drawer = createDrawerNavigator();
 
@@ -36,7 +26,7 @@ const linking = {
   prefixes: [Linking.makeUrl("/")],
   config: {
     screens: {
-      Home: "",
+      Home: "home",
       Login: "login",
       Register: "register",
       Onboarding: "onboarding",
@@ -63,36 +53,24 @@ export default function App() {
     }
   }, [initialRoute]);
   return (
-    <ToastProvider
-      icon={<InfoIcon size={32} />}
-      textStyle={{ ...styles.text_white_tiny_bold }}
-    >
-      <BackgroundComponent />
-      <QueryClientProvider client={queryClient}>
     <Provider store={store}>
-          <StatusBar style="light" />
+      <QueryClientProvider client={queryClient}>
-
+        <NavigationContainer linking={linking}>
-          <NavigationContainer linking={linking} fallback={<Loading />}>
           <Drawer.Navigator
             initialRouteName="Revalidation"
             drawerContent={CustomDrawerContent}
             screenOptions={DrawerScreenSettings}
           >
+            <Drawer.Screen name="Home" component={Home} />
             <Drawer.Screen name="Login" component={Login} />
             <Drawer.Screen name="Register" component={Register} />
-              <Drawer.Screen name="Home" component={Home} />
             <Drawer.Screen name="Onboarding" component={Onboarding} />
             <Drawer.Screen name="Revalidation" component={Revalidation} />
             <Drawer.Screen name="Activation" component={Activation} />
-              <Drawer.Screen name="User Info" component={UserInfoPage} />
+          <Drawer.Screen name="UserInfo" component={UserInfo} />
-              <Drawer.Screen name="Subjects" component={SubjectsPage} />
-              <Drawer.Screen name="Start Studying" component={StartStudying} />
-              <Drawer.Screen name="Create Group" component={CreateGroup} />
-              <Drawer.Screen name="Conversation" component={ConversationPage} />
           </Drawer.Navigator>
         </NavigationContainer>
-        </Provider>
       </QueryClientProvider>
-    </ToastProvider>
+    </Provider>
   );
 }

app.json

@@ -1,6 +1,6 @@
 {
   "expo": {
-    "name": "StudE",
+    "name": "StudE_Frontend",
     "scheme": "stude",
     "slug": "StudE_Frontend",
     "version": "1.0.0",
@@ -10,7 +10,7 @@
     "splash": {
       "image": "./assets/splash.png",
       "resizeMode": "contain",
-      "backgroundColor": "#1C2C3F"
+      "backgroundColor": "#ffffff"
     },
     "assetBundlePatterns": [
       "**/*"
@@ -21,18 +21,7 @@
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
-        "backgroundColor": "#FFFF"
+        "backgroundColor": "#ffffff"
-      },
-      "package": "com.teamblackpink.stude",
-      "permissions": [
-        "android.permission.ACCESS_COARSE_LOCATION",
-        "android.permission.ACCESS_FINE_LOCATION",
-        "android.permission.FOREGROUND_SERVICE"
-      ],
-      "config":{
-        "googleMaps":{
-          "apiKey": "AIzaSyCw2Fhwe7nGUbGQATnjDfEYfoZFN6lXGeA"
-        }
       }
     },
     "web": {
@@ -42,20 +31,9 @@
       [
         "expo-location",
         {
-          "locationAlwaysAndWhenInUsePermission": "Allow StudE to use your location."
+          "locationAlwaysAndWhenInUsePermission": "Allow Stud-E to use your location."
-        }
-      ],
-      [        
-      "expo-image-picker",
-      {
-        "photosPermission": "Allow StudE to take and send photos for sharing in-app"
         }
       ]
-    ],
+    ]
-    "extra": {
-      "eas": {
-        "projectId": "614fd93f-345c-4d72-a9e7-592f1ba0c6e8"
-      }
-    }
   }
 }

eas.json

@@ -1,19 +0,0 @@
-{
-    "build": {
-      "preview": {
-        "android": {
-          "buildType": "apk"
-        }
-      },
-      "preview2": {
-        "android": {
-          "gradleCommand": ":app:assembleRelease"
-        }
-      },
-      "preview3": {
-        "developmentClient": true
-      },
-      "production": {}
-    }
-  }
-  

package.json

@@ -17,17 +17,13 @@
     "@tanstack/react-query": "^4.29.25",
     "axios": "^1.4.0",
     "expo": "~48.0.18",
-    "expo-file-system": "~15.2.2",
-    "expo-image-picker": "~14.1.1",
     "expo-intent-launcher": "~10.5.2",
     "expo-linking": "~4.0.1",
     "expo-location": "~15.1.1",
     "expo-status-bar": "~1.4.4",
-    "moment": "^2.29.4",
     "moti": "^0.25.3",
     "react": "18.2.0",
-    "react-native": "0.71.14",
+    "react-native": "0.71.8",
-    "react-native-bouncy-checkbox": "^3.0.7",
     "react-native-dropdown-picker": "^5.4.6",
     "react-native-gesture-handler": "~2.9.0",
     "react-native-image-picker": "^5.6.0",
@@ -38,18 +34,13 @@
     "react-native-screens": "~3.20.0",
     "react-native-select-dropdown": "^3.3.4",
     "react-native-svg": "13.4.0",
-    "react-native-toast-notifications": "^3.3.1",
     "react-query": "^3.39.3",
     "react-redux": "^8.1.1",
-    "redux": "^4.2.1",
+    "redux": "^4.2.1"
-    "expo-task-manager": "~11.1.1",
-    "expo-background-fetch": "~11.1.1",
-    "expo-notifications": "~0.18.1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@types/react": "~18.0.14",
-    "@types/react-native-fetch-blob": "^0.10.7",
     "typescript": "^4.9.4"
   },
   "private": true

src/components/AnimatedContainer/AnimatedContainer.tsx

@@ -13,23 +13,21 @@ export default function AnimatedContainer(props: props) {
       contentContainerStyle={styles.container}
       from={{
         borderRadius: 0,
-        opacity: 0,
+        backgroundColor: colors.orange_2,
-        backgroundColor: colors.secondary_2,
         paddingTop: 4,
         paddingBottom: 4,
         marginHorizontal: "4%",
-        marginVertical: "10%",
+        marginVertical: "5%",
       }}
       animate={{
         borderRadius: 15,
-        opacity: 1,
+        backgroundColor: colors.blue_2,
-        backgroundColor: colors.secondary_2,
         paddingTop: 16,
         paddingBottom: 16,
         marginHorizontal: "4%",
         marginVertical: "5%",
       }}
-      transition={{ type: "timing", duration: 700 }}
+      transition={{ type: "timing", duration: 300 }}
     >
       {props.children}
     </MotiScrollView>

src/components/AnimatedContainer/AnimatedContainerNoScroll.tsx

@@ -1,37 +0,0 @@
-import * as React from "react";
-import { View, Text, ScrollView } from "react-native";
-import styles from "../../styles";
-import { colors } from "../../styles";
-import { MotiView, MotiScrollView } from "moti";
-export interface props {
-  children: React.ReactNode;
-}
-
-export default function AnimatedContainerNoScroll(props: props) {
-  return (
-    <MotiView
-      style={styles.container}
-      from={{
-        borderRadius: 0,
-        opacity: 0,
-        backgroundColor: colors.secondary_2,
-        paddingTop: 4,
-        paddingBottom: 4,
-        marginHorizontal: "4%",
-        marginVertical: "10%",
-      }}
-      animate={{
-        borderRadius: 15,
-        opacity: 1,
-        backgroundColor: colors.secondary_2,
-        paddingTop: 16,
-        paddingBottom: 16,
-        marginHorizontal: "4%",
-        marginVertical: "5%",
-      }}
-      transition={{ type: "timing", duration: 700 }}
-    >
-      {props.children}
-    </MotiView>
-  );
-}

src/components/Api/Api.tsx

@@ -1,31 +1,18 @@
 import axios from "axios";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import {
-  ActivationType,
+  ActivationParams,
-  LocationType,
+  LoginParams,
-  LoginType,
+  OnboardingParams,
-  MessagePostType,
+  RegistrationParams,
-  OnboardingType,
-  PatchUserInfoType,
-  RegistrationType,
-  StudentStatusPatchType,
-  StudentStatusType,
-  StudyGroupCreateType,
-  StudyGroupType,
 } from "../../interfaces/Interfaces";
 
-export let backendURL = "https://stude.keannu1.duckdns.org";
+let debug = true;
-export let backendURLWebsocket = "ws://stude.keannu1.duckdns.org";
+export let backendURL = "";
-if (__DEV__) {
+if (debug) {
-  backendURL = "http://10.0.10.8:8083";
+  backendURL = "http://10.0.10.8:8000";
-  backendURLWebsocket = "ws://10.0.10.8:8083";
+} else {
-}
+  backendURL = "https://keannu125.pythonanywhere.com";
-
-// Switch this on if you wanna run production URLs while in development
-let use_production = true;
-if (__DEV__ && use_production) {
-  backendURL = "https://stude.keannu1.duckdns.org";
-  backendURLWebsocket = "ws://stude.keannu1.duckdns.org";
 }
 
 const instance = axios.create({
@@ -33,29 +20,8 @@ const instance = axios.create({
   timeout: 1000,
 });
 
-console.log("Using backend API:", backendURL);
-
-// 3rd Party APIs
-export const urlProvider =
-  "https://openstreetmap.keannu1.duckdns.org/tile/{z}/{x}/{y}.png?";
 // App APIs
 
-// Error Handling
-export function ParseError(error: any) {
-  if (error.response && error.response.data) {
-    return JSON.stringify(error.response.data)
-      .replaceAll(/[{}()"]/g, " ")
-      .replaceAll(/,/g, "\n")
-      .replaceAll("[", "")
-      .replaceAll("]", "")
-      .replaceAll(".", "")
-      .replaceAll(/"/g, "")
-      .replaceAll("non_field_errors", "")
-      .trim();
-  }
-  return "Unable to reach server";
-}
-
 // Token Handling
 export async function getAccessToken() {
   const accessToken = await AsyncStorage.getItem("access_token");
@@ -77,39 +43,40 @@ export async function setRefreshToken(refresh: string) {
   return true;
 }
 
-// Header Config Template for REST
-export async function GetConfig() {
-  const accessToken = await getAccessToken();
-  return {
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-    },
-  };
-}
-
 // User APIs
-export function UserRegister(register: RegistrationType) {
+export function UserRegister(register: RegistrationParams) {
+  console.log(JSON.stringify(register));
   return instance
     .post("/api/v1/accounts/users/", register)
     .then(async (response) => {
       return [true, response.status];
     })
     .catch((error) => {
-      let error_message = ParseError(error);
+      let error_message = "";
+      if (error.response) error_message = error.response.data;
+      else error_message = "Unable to reach servers";
       return [false, error_message];
     });
 }
 
-export function UserLogin(user: LoginType) {
+export function UserLogin(user: LoginParams) {
   return instance
     .post("/api/v1/accounts/jwt/create/", user)
     .then(async (response) => {
+      /*console.log(
+        "Access Token:",
+        response.data.access,
+        "\nRefresh Token:",
+        response.data.refresh
+      );*/
       setAccessToken(response.data.access);
       setRefreshToken(response.data.refresh);
       return [true];
     })
     .catch((error) => {
-      let error_message = ParseError(error);
+      let error_message = "";
+      if (error.response) error_message = error.response.data;
+      else error_message = "Unable to reach servers";
       return [false, error_message];
     });
 }
@@ -123,47 +90,47 @@ export async function TokenRefresh() {
     })
     .then(async (response) => {
       setAccessToken(response.data.access);
+      /*console.log(
+        "Token refresh success! New Access Token",
+        response.data.access
+      );*/
       return true;
     })
     .catch((error) => {
-      let error_message = ParseError(error);
+      let error_message = "";
+      if (error.response) error_message = error.response.data;
+      else error_message = "Unable to reach servers";
+      console.log("Token Refresh error:", error_message);
       return false;
     });
 }
-export async function GetUserInfo() {
+export async function UserInfo() {
-  const config = await GetConfig();
+  const accessToken = await getAccessToken();
   return instance
-    .get("/api/v1/accounts/users/me/", config)
+    .get("/api/v1/accounts/users/me/", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    })
     .then((response) => {
       // console.log(JSON.stringify(response.data));
       return [true, response.data];
     })
     .catch((error) => {
-      let error_message = ParseError(error);
+      let error_message = "";
+      if (error.response) error_message = error.response.data;
+      else error_message = "Unable to reach servers";
       return [false, error_message];
     });
 }
 
-export async function PatchUserInfo(info: PatchUserInfoType) {
+export function UserActivate(activation: ActivationParams) {
-  const config = await GetConfig();
-  return instance
-    .patch("/api/v1/accounts/users/me/", info, config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export function UserActivate(activation: ActivationType) {
   return instance
     .post("/api/v1/accounts/users/activation/", activation)
-    .then(() => {
+    .then(async (response) => {
       return true;
     })
-    .catch(() => {
+    .catch((error) => {
       return false;
     });
 }
@@ -180,11 +147,14 @@ export async function GetCourses() {
     })
     .then((response) => {
       // console.log(JSON.stringify(response.data));
-      return [true, response.data];
+      return response.data;
     })
     .catch((error) => {
-      let error_message = ParseError(error);
+      let error_message = "";
-      return [false, error_message];
+      if (error.response) error_message = error.response.data;
+      else error_message = "Unable to reach servers";
+      console.log("Error getting courses", error_message);
+      return false;
     });
 }
 
@@ -198,204 +168,54 @@ export async function GetSemesters() {
     })
     .then((response) => {
       // console.log(JSON.stringify(response.data));
-      return [true, response.data];
+      return response.data;
     })
     .catch((error) => {
-      let error_message = ParseError(error);
+      let error_message = "";
-      return [false, error_message];
+      if (error.response) error_message = error.response.data;
+      else error_message = "Unable to reach servers";
+      console.log("Error getting semesters", error_message);
+      return false;
     });
 }
 
 export async function GetYearLevels() {
-  const config = await GetConfig();
+  const accessToken = await getAccessToken();
   return instance
-    .get("/api/v1/year_levels/", config)
+    .get("/api/v1/year_levels/", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    })
     .then((response) => {
       // console.log(JSON.stringify(response.data));
-      return [true, response.data];
+      return response.data;
     })
     .catch((error) => {
-      let error_message = ParseError(error);
+      let error_message = "";
-      return [false, error_message];
+      if (error.response) error_message = error.response.data;
+      else error_message = "Unable to reach servers";
+      console.log("Error getting year levels", error_message);
+      return false;
     });
 }
 
-export async function GetSubjects() {
+export async function OnboardingUpdateStudentInfo(info: OnboardingParams) {
-  const config = await GetConfig();
+  const accessToken = await getAccessToken();
+  const headers = {
+    Authorization: `Bearer ${accessToken}`,
+  };
   return instance
-    .get("/api/v1/subjects/", config)
+    .patch("/api/v1/accounts/users/me/", info, { headers })
     .then((response) => {
+      console.log(JSON.stringify(response.data));
       return [true, response.data];
     })
     .catch((error) => {
-      let error_message = ParseError(error);
+      let error_message = "";
-      return [false, error_message];
+      if (error.response) error_message = error.response.data;
-    });
+      else error_message = "Unable to reach servers";
-}
+      console.log("Error updating onboarding info", error_message);
-
-export async function GetStudentStatus() {
-  const config = await GetConfig();
-  return instance
-    .get("/api/v1/student_status/self/", config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function PatchStudentStatus(info: StudentStatusPatchType) {
-  const config = await GetConfig();
-  return instance
-    .patch("/api/v1/student_status/self/", info, config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function GetStudentStatusList() {
-  const config = await GetConfig();
-  return instance
-    .get("/api/v1/student_status/list/", config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function GetStudentStatusListNear() {
-  const config = await GetConfig();
-  return instance
-    .get("/api/v1/student_status/near/", config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-// To-do
-export async function GetStudentStatusListFilteredCurrentLocation(
-  location: LocationType
-) {
-  const config = await GetConfig();
-  return instance
-    .post(
-      "/api/v1/student_status/near_current_location/",
-      {
-        location: location,
-      },
-      config
-    )
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function GetStudyGroupListFiltered() {
-  const config = await GetConfig();
-  return instance
-    .get("/api/v1/study_groups/near/", config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function GetStudyGroupList() {
-  const config = await GetConfig();
-  return instance
-    .get("/api/v1/study_groups/", config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function CreateStudyGroup(info: StudyGroupCreateType) {
-  const config = await GetConfig();
-  // console.log("Creating study group:", info);
-  return instance
-    .post("/api/v1/study_groups/create/", info, config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function GetStudyGroup(name: string) {
-  const config = await GetConfig();
-  return instance
-    .get(`/api/v1/study_groups/${name}`, config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function GetStudyGroupMessages() {
-  const config = await GetConfig();
-  return instance
-    .get(`/api/v1/messages/`, config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function GetStudyGroupMemberAvatars() {
-  const config = await GetConfig();
-  return instance
-    .get(`/api/v1/study_groups/member_avatars`, config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      let error_message = ParseError(error);
-      return [false, error_message];
-    });
-}
-
-export async function PostMessage(info: MessagePostType) {
-  const config = await GetConfig();
-  return instance
-    .post(`/api/v1/messages/`, info, config)
-    .then((response) => {
-      return [true, response.data];
-    })
-    .catch((error) => {
-      console.log("Error:", error.response.data);
-      let error_message = ParseError(error);
       return [false, error_message];
     });
 }

src/components/BackgroundTask/BackgroundTask.tsx

@@ -1,148 +0,0 @@
-import React, { useEffect } from "react";
-import { View } from "react-native";
-import * as BackgroundFetch from "expo-background-fetch";
-import * as TaskManager from "expo-task-manager";
-import * as Notifications from "expo-notifications";
-import {
-  GetStudentStatus,
-  GetStudyGroupListFiltered,
-  GetStudyGroupMessages,
-} from "../Api/Api";
-import { StudyGroupType } from "../../interfaces/Interfaces";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-
-const FETCH_STUDENT_STATUS = "STUDENT_STATUS_TASK";
-const FETCH_GROUP_MESSAGES = "GROUP_MESSAGES_TASK";
-
-TaskManager.defineTask(FETCH_GROUP_MESSAGES, async () => {
-  const data = await GetStudyGroupMessages();
-  if (data[0] && data[1]) {
-    let messages_prev = await JSON.parse(
-      (await AsyncStorage.getItem("messages")) || "[]"
-    );
-    await AsyncStorage.setItem("messages", JSON.stringify(data[1]));
-    let message_curr = data[1];
-    let difference: Array<any> = messages_prev
-      .filter(
-        (x: any) =>
-          !message_curr.some(
-            (y: any) => JSON.stringify(y) === JSON.stringify(x)
-          )
-      )
-      .concat(
-        message_curr.filter(
-          (x: any) =>
-            !messages_prev.some(
-              (y: any) => JSON.stringify(y) === JSON.stringify(x)
-            )
-        )
-      );
-
-    if (difference.length > 0) {
-      console.log(`${difference.length} unread messages`);
-      Notifications.scheduleNotificationAsync({
-        content: {
-          title: `${difference.length} unread messages`,
-          body: `${difference[0].user}: ${difference[0].message_content}`,
-        },
-        trigger: {
-          seconds: 1,
-        },
-      });
-    }
-  } else {
-    console.log(data[1].response.data);
-  }
-
-  return BackgroundFetch.BackgroundFetchResult.NewData;
-});
-
-TaskManager.defineTask(FETCH_STUDENT_STATUS, async () => {
-  const data = await GetStudyGroupListFiltered();
-  const student_status_data = await GetStudentStatus();
-  if (data[0] && data[1]) {
-    console.log("Fetching nearby study groups...");
-    const entryWithLeastDistance = data[1].reduce(
-      (prev: StudyGroupType, curr: StudyGroupType) => {
-        return prev.distance < curr.distance ? prev : curr;
-      }
-    );
-    // Only display a notification if a student isn't in a study group yet
-    if (
-      student_status_data[1].study_group == null ||
-      student_status_data[1].study_group == ""
-    ) {
-      console.log(
-        "User has no study group yet. Found nearby groups, pushing notification"
-      );
-      Notifications.scheduleNotificationAsync({
-        content: {
-          title: "Students are studying nearby",
-          body: `Nearest study group is ${Math.round(
-            entryWithLeastDistance.distance * 1000
-          )}m away`,
-        },
-        trigger: {
-          seconds: 1,
-        },
-      });
-    }
-  } else {
-    console.log(data[1].response.data);
-  }
-
-  return BackgroundFetch.BackgroundFetchResult.NewData;
-});
-
-const BackgroundComponent = () => {
-  const notification_debug = false;
-  const [Task1_isRegistered, Task1_setIsRegistered] = React.useState(false);
-  const [Task2_isRegistered, Task2_setIsRegistered] = React.useState(false);
-  const [status, setStatus] = React.useState<any>();
-  const checkStatusAsync = async () => {
-    let status = await BackgroundFetch.getStatusAsync();
-    setStatus(status);
-    let Task1_isRegistered = await TaskManager.isTaskRegisteredAsync(
-      FETCH_STUDENT_STATUS
-    );
-    let Task2_isRegistered = await TaskManager.isTaskRegisteredAsync(
-      FETCH_GROUP_MESSAGES
-    );
-    Task1_setIsRegistered(Task1_isRegistered);
-    Task2_setIsRegistered(Task2_isRegistered);
-  };
-
-  useEffect(() => {
-    const registerTasks = async () => {
-      try {
-        await checkStatusAsync();
-        // Nearby students task
-        if (!Task1_isRegistered) {
-          await BackgroundFetch.registerTaskAsync(FETCH_STUDENT_STATUS, {
-            minimumInterval: notification_debug ? 5 : 60 * 3, // Check every 5 seconds in dev & every 3 minutes in production builds
-          });
-          console.log("Task for nearby students check registered");
-        } else {
-          console.log("Task for nearby students check already registered");
-        }
-        // Message Checking Task
-        if (!Task2_isRegistered) {
-          await BackgroundFetch.registerTaskAsync(FETCH_GROUP_MESSAGES, {
-            minimumInterval: notification_debug ? 5 : 30, // Check every 5 seconds in dev & every 30 seconds in production builds
-          });
-          console.log("Task for group messages check registered");
-        } else {
-          console.log("Task for group messages check already registered");
-        }
-      } catch (err) {
-        console.log("Task Register failed:", err);
-      }
-    };
-
-    registerTasks();
-  }, []);
-
-  return <View />;
-};
-
-export default BackgroundComponent;

src/components/Button/Button.tsx

@@ -1,26 +1,30 @@
 import * as React from "react";
 import { Pressable, GestureResponderEvent } from "react-native";
 import styles from "../../styles";
-import { colors } from "../../styles";
+
 export interface props {
   children: React.ReactNode;
   onPress: (event: GestureResponderEvent) => void;
-  color?: string;
+  color: string;
   disabled?: boolean;
 }
 
 export default function Button({ disabled = false, ...props }: props) {
-  if (!props.color) {
+  const rgb = props.color.match(/\d+/g);
-    props.color = colors.secondary_3;
-  }
   return (
     <Pressable
       disabled={disabled}
       onPress={props.onPress}
-      style={({ pressed }) => [
+      style={{
-        styles.button_template,
+        ...styles.button_template,
-        { backgroundColor: pressed ? colors.primary_2 : props.color },
+        ...{
-      ]}
+          backgroundColor: disabled
+            ? rgb
+              ? `rgba(${rgb[0]}, ${rgb[1]}, ${rgb[2]}, 0.3)`
+              : "rgba(0, 0, 0, 0)"
+            : props.color,
+        },
+      }}
     >
       {props.children}
     </Pressable>

src/components/Button/DrawerButton.tsx

@@ -1,16 +1,21 @@
 import * as React from "react";
-import { Pressable } from "react-native";
+import { Text, Pressable, GestureResponderEvent } from "react-native";
 import styles from "../../styles";
-import { colors } from "../../styles";
 
-export default function DrawerButton({ color = colors.secondary_3, ...props }) {
+export interface props {
+  children: React.ReactNode;
+  onPress: (event: GestureResponderEvent) => void;
+  color: string;
+}
+
+export default function DrawerButton(props: props) {
   return (
     <Pressable
       onPress={props.onPress}
       style={{
         ...styles.button_template,
         ...{
-          backgroundColor: color,
+          backgroundColor: props.color,
           width: "95%",
           justifyContent: "flex-start",
         },

src/components/DrawerSettings/CustomDrawerContent.tsx

@@ -5,10 +5,7 @@ import { Text, View } from "react-native";
 import { colors } from "../../styles";
 import styles from "../../styles";
 
-import {
+import { RootDrawerParamList } from "../../interfaces/Interfaces";
-  RootDrawerParamList,
-  StudentStatusPatchType,
-} from "../../interfaces/Interfaces";
 import AppIcon from "../../icons/AppIcon/AppIcon";
 import HomeIcon from "../../icons/HomeIcon/HomeIcon";
 import LoginIcon from "../../icons/LoginIcon/LoginIcon";
@@ -20,49 +17,11 @@ import LogoutIcon from "../../icons/LogoutIcon/LogoutIcon";
 import { logout } from "../../features/redux/slices/StatusSlice/StatusSlice";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import UserIcon from "../../icons/UserIcon/UserIcon";
-import SubjectIcon from "../../icons/SubjectIcon/SubjectIcon";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { PatchStudentStatus } from "../Api/Api";
-import { useToast } from "react-native-toast-notifications";
-import MessageIcon from "../../icons/MessageIcon/MessageIcon";
 
 export default function CustomDrawerContent(props: {}) {
-  const debug = false;
   const navigation = useNavigation<RootDrawerParamList>();
   const status = useSelector((state: RootState) => state.status);
   const dispatch = useDispatch();
-  const queryClient = useQueryClient();
-  const toast = useToast();
-  const stop_studying_logout = useMutation({
-    mutationFn: async (info: StudentStatusPatchType) => {
-      const data = await PatchStudentStatus(info);
-      if (data[0] != true) {
-        return Promise.reject(new Error());
-      }
-      console.log("DEBUG", data);
-      return data;
-    },
-    onSuccess: async () => {
-      toast.show("Logged out. Stopped studying", {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-      queryClient.clear();
-      dispatch(logout());
-      await AsyncStorage.clear();
-      navigation.navigate("Login");
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
   if (status.logged_in && status.onboarding) {
     return (
       <DrawerContentScrollView {...props}>
@@ -72,23 +31,16 @@ export default function CustomDrawerContent(props: {}) {
             ...{ justifyContent: "center" },
           }}
         >
-          <AppIcon size={96} />
+          <AppIcon size={32} />
           <Text style={styles.text_white_medium}>Stud-E</Text>
         </View>
 
         <DrawerButton
+          color={colors.blue_2}
           onPress={async () => {
-            // We don't clear student statuses when logging out on debug
-            if (!debug) {
-              queryClient.clear();
             dispatch(logout());
             await AsyncStorage.clear();
             navigation.navigate("Login");
-            } else {
-              stop_studying_logout.mutate({
-                active: false,
-              });
-            }
           }}
         >
           <LogoutIcon size={32} />
@@ -105,10 +57,11 @@ export default function CustomDrawerContent(props: {}) {
             ...{ justifyContent: "center" },
           }}
         >
-          <AppIcon size={96} />
+          <AppIcon size={32} />
           <Text style={styles.text_white_medium}>Stud-E</Text>
         </View>
         <DrawerButton
+          color={colors.blue_3}
           onPress={() => {
             navigation.navigate("Home");
           }}
@@ -117,42 +70,20 @@ export default function CustomDrawerContent(props: {}) {
           <Text style={styles.text_white_medium}>Home</Text>
         </DrawerButton>
         <DrawerButton
+          color={colors.blue_2}
           onPress={() => {
-            navigation.navigate("User Info");
+            navigation.navigate("UserInfo");
           }}
         >
           <UserIcon size={32} />
-          <Text style={styles.text_white_medium}>User Info</Text>
+          <Text style={styles.text_white_medium}>UserInfo</Text>
-        </DrawerButton>
-        <DrawerButton
-          onPress={() => {
-            navigation.navigate("Subjects");
-          }}
-        >
-          <SubjectIcon size={32} />
-          <Text style={styles.text_white_medium}>Subjects</Text>
-        </DrawerButton>
-        <DrawerButton
-          onPress={() => {
-            navigation.navigate("Conversation");
-          }}
-        >
-          <MessageIcon size={32} />
-          <Text style={styles.text_white_medium}>Conversation</Text>
         </DrawerButton>
         <DrawerButton
+          color={colors.blue_2}
           onPress={async () => {
-            // We don't clear student statuses when logging out on debug
-            if (debug) {
-              queryClient.clear();
             dispatch(logout());
             await AsyncStorage.clear();
             navigation.navigate("Login");
-            } else {
-              stop_studying_logout.mutate({
-                active: false,
-              });
-            }
           }}
         >
           <LogoutIcon size={32} />
@@ -169,10 +100,11 @@ export default function CustomDrawerContent(props: {}) {
             ...{ justifyContent: "center" },
           }}
         >
-          <AppIcon size={96} />
+          <AppIcon size={32} />
           <Text style={styles.text_white_medium}>Stud-E</Text>
         </View>
         <DrawerButton
+          color={colors.blue_2}
           onPress={() => {
             navigation.navigate("Login");
           }}
@@ -181,6 +113,7 @@ export default function CustomDrawerContent(props: {}) {
           <Text style={styles.text_white_medium}>Login</Text>
         </DrawerButton>
         <DrawerButton
+          color={colors.blue_2}
           onPress={() => {
             navigation.navigate("Register");
           }}
@@ -188,10 +121,11 @@ export default function CustomDrawerContent(props: {}) {
           <SignupIcon size={32} />
           <Text style={styles.text_white_medium}>Register</Text>
         </DrawerButton>
+
         {/*
         Debug buttons for accessing revalidation and activation page
         <DrawerButton
-          color={colors.secondary_2}
+          color={colors.blue_2}
           onPress={() => {
             navigation.navigate("Revalidation");
           }}
@@ -199,7 +133,7 @@ export default function CustomDrawerContent(props: {}) {
           <Text style={styles.text_white_medium}>Revalidation</Text>
         </DrawerButton>
         <DrawerButton
-          color={colors.secondary_2}
+          color={colors.blue_2}
           onPress={() => {
             navigation.navigate("Activation");
           }}

src/components/DrawerSettings/DrawerScreenSettings.tsx

@@ -10,19 +10,21 @@ const DrawerScreenSettings: DrawerNavigationOptions = {
     fontSize: font_sizes.medium,
   },
   unmountOnBlur: true,
-  headerStyle: { backgroundColor: colors.primary_1 },
+  headerStyle: { backgroundColor: colors.login_color},
   headerTintColor: colors.text_default,
   drawerType: "slide",
   drawerLabelStyle: {
     color: colors.text_default,
   },
   drawerStyle: {
-    backgroundColor: colors.primary_1,
+    backgroundColor: colors.login_color,
     width: 260,
   },
   headerRight: () => (
-    <View style={{ flexDirection: "row", alignItems: "center" }}>
+    <View
-      <AppIcon size={96} />
+      style={{ flexDirection: "row", marginRight: 16, alignItems: "center" }}
+    >
+      <AppIcon size={32} />
     </View>
   ),
 };

src/components/GetDistance/GetDistanceFromUSTP.tsx

@@ -1,20 +0,0 @@
-import { LocationType } from "../../interfaces/Interfaces";
-import GetDistance from "./GetDistance";
-
-export default function GetDistanceFromUSTP(location: LocationType) {
-  const ustpCoords = {
-    latitude: 8.4857,
-    longitude: 124.6565,
-    latitudeDelta: 0.000235,
-    longitudeDelta: 0.000067,
-  };
-
-  let dist = GetDistance(
-    location.latitude,
-    location.longitude,
-    ustpCoords.latitude,
-    ustpCoords.longitude
-  );
-  dist = Math.round(dist * 100) / 100;
-  return dist;
-}

src/components/LoadingFeedback/LoadingFeedback.tsx

@@ -1,17 +0,0 @@
-import * as React from "react";
-import styles from "../../styles";
-import { View, Text, ActivityIndicator } from "react-native";
-import { colors } from "../../styles";
-import AnimatedContainer from "../AnimatedContainer/AnimatedContainer";
-
-export default function LoadingFeedback() {
-  return (
-    <View style={styles.background}>
-      <AnimatedContainer>
-        <View style={{ paddingVertical: 8 }} />
-        <ActivityIndicator size={128} color={colors.secondary_1} />
-        <Text style={styles.text_white_medium}>Loading...</Text>
-      </AnimatedContainer>
-    </View>
-  );
-}

src/components/MapRenderer/MapRendererFar.tsx

@@ -1,79 +0,0 @@
-import * as React from "react";
-import { View, Text } from "react-native";
-import MapView, { UrlTile, Callout, Marker } from "react-native-maps";
-import styles, { Viewport, colors } from "../../styles";
-import { urlProvider } from "../Api/Api";
-import { LocationType, RawLocationType } from "../../interfaces/Interfaces";
-import GetDistance from "../../components/GetDistance/GetDistance";
-
-type props = {
-  location: LocationType;
-  dist: any;
-};
-
-export default function MapRendererFar(props: props) {
-  return (
-    <>
-      <Text style={styles.text_white_medium}>
-        You are too far from USTP {"\n"}
-        Get closer to use Stud-E
-      </Text>
-      <MapView
-        style={{
-          height: Viewport.height * 0.5,
-          width: Viewport.width * 0.8,
-          alignSelf: "center",
-        }}
-        customMapStyle={[
-          {
-            featureType: "poi",
-            stylers: [
-              {
-                visibility: "off",
-              },
-            ],
-          },
-        ]}
-        mapType="none"
-        scrollEnabled={false}
-        zoomEnabled={false}
-        toolbarEnabled={false}
-        rotateEnabled={false}
-        minZoomLevel={18}
-        initialRegion={{
-          latitude: props.location.latitude,
-          longitude: props.location.longitude,
-          latitudeDelta: 0.0922,
-          longitudeDelta: 0.0421,
-        }}
-        loadingBackgroundColor={colors.secondary_2}
-      >
-        <UrlTile
-          urlTemplate={urlProvider}
-          shouldReplaceMapContent={true}
-          maximumZ={19}
-          flipY={false}
-          zIndex={1}
-        />
-        <Marker
-          coordinate={{
-            latitude: props.location.latitude,
-            longitude: props.location.longitude,
-          }}
-          pinColor={colors.primary_1}
-        >
-          <Callout>
-            <Text style={styles.text_black_tiny}>
-              You are here {"\n"}
-              X: {Math.round(props.location.longitude) + "\n"}
-              Z: {Math.round(props.location.latitude)}
-            </Text>
-          </Callout>
-        </Marker>
-      </MapView>
-      <Text style={styles.text_white_small}>
-        {props.dist}km away from USTP {"\n"}
-      </Text>
-    </>
-  );
-}

src/components/ParseError/ParseError.tsx

@@ -0,0 +1,24 @@
+export default function ParseError(text: string) {
+  if (text) {
+    return text
+      .replaceAll(/[{}()"]/g, " ")
+      .replaceAll(/,/g, "\n")
+      .replaceAll("[", "")
+      .replaceAll("]", "")
+      .replaceAll(".", "");
+  }
+  return "";
+}
+
+export function ParseLoginError(text: string) {
+  if (text) {
+    return text
+      .replaceAll(/[{}()"]/g, " ")
+      .replaceAll(/,/g, "\n")
+      .replaceAll("[", "")
+      .replaceAll("]", "")
+      .replaceAll(".", "")
+      .replaceAll("non_field_errors", "");
+  }
+  return "";
+}

src/icons/AppIcon/AppIcon.tsx

@@ -1,13 +1,20 @@
 import * as React from "react";
 import { IconProps } from "../../interfaces/Interfaces";
-import { Image } from "react-native";
+
+import { Svg, Path } from "react-native-svg";
+import { colors } from "../../styles";
+
 export default function AppIcon(props: IconProps) {
   return (
     <>
-      <Image
+      <Svg
-        style={{ height: props.size, width: props.size, marginHorizontal: -16 }}
+        fill={colors.icon_color}
-        source={require("../../img/app_icon_light.png")}
+        height={props.size + "px"}
-      />
+        width={props.size + "px"}
+        viewBox="0 0 375.775 375.775"
+      >
+        <Path d="M187.886,375.775c-16.216,0-29.409-13.193-29.409-29.411s13.193-29.412,29.409-29.412c16.218,0,29.412,13.194,29.412,29.412 S204.104,375.775,187.886,375.775z M187.886,332.952c-7.394,0-13.409,6.017-13.409,13.412c0,7.395,6.015,13.411,13.409,13.411 c7.395,0,13.412-6.017,13.412-13.411C201.298,338.969,195.281,332.952,187.886,332.952z M244.851,342.665 c-3.207,0-6.233-1.941-7.461-5.11c-1.597-4.12,0.449-8.754,4.568-10.351c40.127-15.554,71.73-47.612,86.706-87.957 c1.537-4.142,6.142-6.253,10.284-4.716s6.253,6.142,4.716,10.284c-16.568,44.633-51.531,80.101-95.924,97.307 C246.79,342.49,245.812,342.665,244.851,342.665z M130.671,342.665c-0.961,0-1.939-0.174-2.889-0.543 c-44.393-17.206-79.356-52.674-95.925-97.307c-1.538-4.143,0.574-8.746,4.716-10.284c4.144-1.538,8.746,0.573,10.284,4.716 c14.977,40.345,46.58,72.403,86.707,87.957c4.12,1.597,6.165,6.23,4.568,10.351C136.904,340.724,133.877,342.665,130.671,342.665z M196.589,305.682h-17.403c-25.12,0-36.188-20.112-42.33-35.241l-2.277-5.612c-1.661-4.095,0.312-8.76,4.406-10.421 c4.095-1.662,8.759,0.312,10.42,4.405l2.276,5.612c3.44,8.475,7.034,14.579,11.16,18.661l18.583-25.466 c1.506-2.063,3.907-3.284,6.462-3.284c2.555,0,4.956,1.22,6.462,3.284l18.585,25.465c4.126-4.082,7.719-10.187,11.159-18.662 l2.277-5.611c1.661-4.095,6.327-6.064,10.421-4.404c4.094,1.662,6.066,6.327,4.404,10.422l-2.277,5.611 C232.778,285.568,221.71,305.682,196.589,305.682z M177.857,289.652c0.438,0.02,0.88,0.029,1.329,0.029h17.402 c0.45,0,0.892-0.01,1.331-0.029l-10.031-13.745L177.857,289.652z M113.951,241.785c-1.002,0-2.02-0.189-3.005-0.589l-5.611-2.277 c-15.129-6.142-35.242-17.21-35.242-42.33v-17.401c0-25.12,20.113-36.189,35.241-42.33l5.612-2.278 c4.092-1.661,8.759,0.311,10.421,4.404c1.662,4.095-0.31,8.76-4.404,10.422l-5.611,2.277c-8.475,3.439-14.579,7.032-18.662,11.158 l25.467,18.585c2.064,1.506,3.284,3.907,3.284,6.462s-1.22,4.956-3.284,6.462l-25.467,18.584c4.082,4.126,10.187,7.72,18.662,11.159 l5.611,2.277c4.094,1.662,6.066,6.327,4.404,10.422C120.105,239.9,117.111,241.785,113.951,241.785z M86.123,177.855 c-0.02,0.438-0.03,0.881-0.03,1.33v17.403c0,0.449,0.01,0.893,0.03,1.33l13.747-10.031L86.123,177.855z M261.823,241.785 c-3.161,0-6.154-1.885-7.416-4.994c-1.661-4.094,0.311-8.76,4.405-10.421l5.612-2.277c8.475-3.44,14.579-7.033,18.661-11.159 l-25.467-18.584c-2.064-1.506-3.284-3.907-3.284-6.462s1.22-4.956,3.284-6.462l25.466-18.585 c-4.082-4.125-10.187-7.719-18.661-11.158l-5.611-2.277c-4.094-1.661-6.066-6.327-4.405-10.421s6.328-6.064,10.421-4.405 l5.612,2.277c15.129,6.142,35.242,17.21,35.242,42.329v17.403c0,25.12-20.112,36.188-35.241,42.329l-5.613,2.278 C263.843,241.596,262.825,241.785,261.823,241.785z M275.906,187.888l13.746,10.031c0.02-0.438,0.03-0.881,0.03-1.33v-17.401 c0-0.449-0.01-0.894-0.03-1.332L275.906,187.888z M346.363,217.299c-16.217,0-29.411-13.193-29.411-29.41 c0-16.218,13.194-29.412,29.411-29.412c16.218,0,29.412,13.194,29.412,29.412C375.775,204.105,362.581,217.299,346.363,217.299z M346.363,174.477c-7.395,0-13.411,6.017-13.411,13.412c0,7.395,6.016,13.41,13.411,13.41c7.395,0,13.412-6.016,13.412-13.41 C359.775,180.493,353.758,174.477,346.363,174.477z M29.411,217.299c-16.217,0-29.41-13.193-29.41-29.41 c0-16.218,13.193-29.412,29.41-29.412c16.217,0,29.411,13.194,29.411,29.412C58.822,204.105,45.628,217.299,29.411,217.299z M29.411,174.477c-7.395,0-13.41,6.017-13.41,13.412c0,7.395,6.016,13.41,13.41,13.41c7.395,0,13.411-6.016,13.411-13.41 C42.822,180.493,36.806,174.477,29.411,174.477z M336.165,140.768c-3.249,0-6.304-1.993-7.501-5.218 c-14.976-40.345-46.579-72.403-86.706-87.957c-4.12-1.597-6.165-6.23-4.568-10.351c1.596-4.119,6.231-6.168,10.351-4.567 c44.393,17.206,79.355,52.673,95.924,97.307c1.538,4.143-0.574,8.747-4.716,10.284C338.03,140.606,337.089,140.768,336.165,140.768z M39.356,140.768c-0.925,0-1.865-0.161-2.783-0.502c-4.142-1.538-6.253-6.143-4.716-10.284 c16.569-44.634,51.532-80.101,95.925-97.307c4.119-1.596,8.753,0.448,10.351,4.567c1.597,4.12-0.449,8.754-4.568,10.351 c-40.126,15.554-71.73,47.612-86.707,87.957C45.66,138.773,42.604,140.768,39.356,140.768z M141.99,121.957 c-1.001,0-2.02-0.189-3.004-0.589c-4.094-1.661-6.067-6.326-4.406-10.421l2.276-5.611c6.142-15.13,17.211-35.243,42.33-35.243 h17.402c25.121,0,36.189,20.113,42.33,35.242l2.277,5.611c1.662,4.095-0.31,8.76-4.404,10.422c-4.096,1.659-8.76-0.312-10.421-4.404 l-2.277-5.611c-3.44-8.476-7.033-14.58-11.159-18.663l-18.585,25.466c-1.506,2.063-3.907,3.284-6.462,3.284l0,0 c-2.555,0-4.957-1.221-6.462-3.284l-18.583-25.466c-4.126,4.082-7.72,10.188-11.16,18.663l-2.276,5.61 C148.145,120.071,145.15,121.957,141.99,121.957z M177.857,86.122l10.031,13.746l10.031-13.746c-0.438-0.02-0.881-0.029-1.33-0.029 h-17.403C178.737,86.093,178.294,86.103,177.857,86.122z M187.886,58.822c-16.216,0-29.409-13.193-29.409-29.411S171.67,0,187.886,0 c16.218,0,29.412,13.193,29.412,29.411S204.104,58.822,187.886,58.822z M187.886,16c-7.394,0-13.409,6.017-13.409,13.411 s6.015,13.411,13.409,13.411c7.395,0,13.412-6.017,13.412-13.411S195.281,16,187.886,16z"></Path>
+      </Svg>
     </>
   );
 }

src/icons/CaretLeftIcon/CaretLeftIcon.tsx

@@ -1,28 +0,0 @@
-import * as React from "react";
-import { IconProps } from "../../interfaces/Interfaces";
-import { Svg, Path } from "react-native-svg";
-import { colors } from "../../styles";
-
-export default function CaretRightIcon(props: IconProps) {
-  return (
-    <>
-      <Svg
-        height={props.size + "px"}
-        width={props.size + "px"}
-        viewBox="0 0 24 24"
-        stroke-width="2"
-        stroke={colors.icon_color}
-        fill="none"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      >
-        <Path stroke="none" d="M0 0h24v24H0z" fill="none"></Path>
-        <Path
-          d="M13.883 5.007l.058 -.005h.118l.058 .005l.06 .009l.052 .01l.108 .032l.067 .027l.132 .07l.09 .065l.081 .073l.083 .094l.054 .077l.054 .096l.017 .036l.027 .067l.032 .108l.01 .053l.01 .06l.004 .057l.002 .059v12c0 .852 -.986 1.297 -1.623 .783l-.084 -.076l-6 -6a1 1 0 0 1 -.083 -1.32l.083 -.094l6 -6l.094 -.083l.077 -.054l.096 -.054l.036 -.017l.067 -.027l.108 -.032l.053 -.01l.06 -.01z"
-          stroke-width="0"
-          fill={colors.icon_color}
-        ></Path>
-      </Svg>
-    </>
-  );
-}

src/icons/CaretRightIcon/CaretRightIcon.tsx

@@ -1,28 +0,0 @@
-import * as React from "react";
-import { IconProps } from "../../interfaces/Interfaces";
-import { Svg, Path } from "react-native-svg";
-import { colors } from "../../styles";
-
-export default function CaretRightIcon(props: IconProps) {
-  return (
-    <>
-      <Svg
-        height={props.size + "px"}
-        width={props.size + "px"}
-        viewBox="0 0 24 24"
-        stroke-width="2"
-        stroke={colors.icon_color}
-        fill="none"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      >
-        <Path stroke="none" d="M0 0h24v24H0z" fill="none"></Path>
-        <Path
-          d="M13.883 5.007l.058 -.005h.118l.058 .005l.06 .009l.052 .01l.108 .032l.067 .027l.132 .07l.09 .065l.081 .073l.083 .094l.054 .077l.054 .096l.017 .036l.027 .067l.032 .108l.01 .053l.01 .06l.004 .057l.002 .059v12c0 .852 -.986 1.297 -1.623 .783l-.084 -.076l-6 -6a1 1 0 0 1 -.083 -1.32l.083 -.094l6 -6l.094 -.083l.077 -.054l.096 -.054l.036 -.017l.067 -.027l.108 -.032l.053 -.01l.06 -.01z"
-          stroke-width="0"
-          fill={colors.icon_color}
-        ></Path>
-      </Svg>
-    </>
-  );
-}

src/icons/CaretUpIcon/CaretUpIcon.tsx

@@ -1,24 +0,0 @@
-import * as React from "react";
-import { IconProps } from "../../interfaces/Interfaces";
-import { Svg, Path } from "react-native-svg";
-import { colors } from "../../styles";
-
-export default function CaretUpIcon(props: IconProps) {
-  return (
-    <>
-      <Svg
-        height={props.size + "px"}
-        width={props.size + "px"}
-        viewBox="0 0 24 24"
-        stroke-width="2"
-        stroke={colors.icon_color}
-        fill="none"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      >
-        <Path stroke="none" d="M0 0h24v24H0z" fill="none"></Path>
-        <Path d="M18 14l-6 -6l-6 6h12"></Path>
-      </Svg>
-    </>
-  );
-}

src/icons/DropdownIcon/DropdownIcon.tsx

@@ -1,9 +1,11 @@
 import * as React from "react";
 import { IconProps } from "../../interfaces/Interfaces";
+
 import { Svg, Path } from "react-native-svg";
 import { colors } from "../../styles";
+import finalPropsSelectorFactory from "react-redux/es/connect/selectorFactory";
 
-export default function CaretDownIcon(props: IconProps) {
+export default function DropdownIcon(props: IconProps) {
   return (
     <>
       <Svg

src/icons/InfoIcon/InfoIcon.tsx

@@ -1,27 +0,0 @@
-import * as React from "react";
-import { IconProps } from "../../interfaces/Interfaces";
-
-import { Svg, Path } from "react-native-svg";
-import { colors } from "../../styles";
-
-export default function InfoIcon(props: IconProps) {
-  return (
-    <>
-      <Svg
-        width={props.size}
-        height={props.size}
-        viewBox="0 0 24 24"
-        strokeWidth="2"
-        stroke={colors.icon_color}
-        fill="none"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      >
-        <Path stroke="none" d="M0 0h24v24H0z" fill="none"></Path>
-        <Path d="M12 9h.01"></Path>
-        <Path d="M11 12h1v4h1"></Path>
-        <Path d="M12 3c7.2 0 9 1.8 9 9s-1.8 9 -9 9s-9 -1.8 -9 -9s1.8 -9 9 -9z"></Path>
-      </Svg>
-    </>
-  );
-}

src/icons/MessageIcon/MessageIcon.tsx

@@ -1,29 +0,0 @@
-import * as React from "react";
-import { IconProps } from "../../interfaces/Interfaces";
-
-import { Svg, Path } from "react-native-svg";
-import { colors } from "../../styles";
-
-export default function MessageIcon(props: IconProps) {
-  return (
-    <>
-      <Svg
-        width={props.size}
-        height={props.size}
-        viewBox="0 0 24 24"
-        strokeWidth="2"
-        stroke={colors.icon_color}
-        fill="none"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      >
-        <Path stroke="none" d="M0 0h24v24H0z" fill="none"></Path>
-        <Path d="M8 9h8"></Path>
-        <Path d="M8 13h6"></Path>
-        <Path d="M12.5 20.5l-.5 .5l-3 -3h-3a3 3 0 0 1 -3 -3v-8a3 3 0 0 1 3 -3h12a3 3 0 0 1 3 3v4"></Path>
-        <Path d="M21.121 20.121a3 3 0 1 0 -4.242 0c.418 .419 1.125 1.045 2.121 1.879c1.051 -.89 1.759 -1.516 2.121 -1.879z"></Path>
-        <Path d="M19 18v.01"></Path>
-      </Svg>
-    </>
-  );
-}

src/icons/RefreshIcon/RefreshIcon.tsx

@@ -1,26 +0,0 @@
-import * as React from "react";
-import { IconProps } from "../../interfaces/Interfaces";
-
-import { Svg, Path } from "react-native-svg";
-import { colors } from "../../styles";
-
-export default function RefreshIcon(props: IconProps) {
-  return (
-    <>
-      <Svg
-        width={props.size}
-        height={props.size}
-        viewBox="0 0 24 24"
-        strokeWidth="2"
-        stroke={colors.icon_color}
-        fill="none"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      >
-        <Path stroke="none" d="M0 0h24v24H0z" fill="none"></Path>
-        <Path d="M20 11a8.1 8.1 0 0 0 -15.5 -2m-.5 -4v4h4"></Path>
-        <Path d="M4 13a8.1 8.1 0 0 0 15.5 2m.5 4v-4h-4"></Path>
-      </Svg>
-    </>
-  );
-}

src/icons/SubjectIcon/SubjectIcon.tsx

@@ -1,27 +0,0 @@
-import * as React from "react";
-import { IconProps } from "../../interfaces/Interfaces";
-
-import { Svg, Path } from "react-native-svg";
-import { colors } from "../../styles";
-
-export default function SubjectIcon(props: IconProps) {
-  return (
-    <>
-      <Svg
-        width={props.size}
-        height={props.size}
-        viewBox="0 0 24 24"
-        strokeWidth="2"
-        stroke={colors.icon_color}
-        fill="none"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      >
-        <Path stroke="none" d="M0 0h24v24H0z" fill="none"></Path>
-        <Path d="M19 4v16h-12a2 2 0 0 1 -2 -2v-12a2 2 0 0 1 2 -2h12z"></Path>
-        <Path d="M19 16h-12a2 2 0 0 0 -2 2"></Path>
-        <Path d="M9 8h6"></Path>
-      </Svg>
-    </>
-  );
-}

src/interfaces/Interfaces.tsx

@@ -1,7 +1,3 @@
-import * as Location from "expo-location";
-import { GetStudentStatus } from "../components/Api/Api";
-import { Float } from "react-native/Libraries/Types/CodegenTypes";
-
 export interface IconProps {
   size: number;
 }
@@ -13,7 +9,6 @@ export interface ResponsiveIconProps {
 
 export interface RootDrawerParamList {
   navigate: any;
-  replace: any;
 }
 
 // Redux Interfaces
@@ -33,7 +28,7 @@ export interface LoggedInUserState {
 
 // API Interfaces
 
-export interface RegistrationType {
+export interface RegistrationParams {
   email: string;
   username: string;
   password: string;
@@ -42,199 +37,36 @@ export interface RegistrationType {
   student_id_number: string;
 }
 
-export interface LoginType {
+export interface LoginParams {
   username: string;
   password: string;
 }
 
-export interface ActivationType {
+export interface ActivationParams {
   uid: string;
   token: string;
 }
 
-export interface OptionType {
+export interface SemesterParams {
-  label: string;
-  value: string;
-}
-
-// Semester
-export interface SemesterType {
   id: string;
   name: string;
   shortname: string;
 }
 
-export type SemestersType = Array<SemesterType>;
+export interface YearLevelParams {
-
-export type SemesterReturnType = [boolean, SemestersType];
-
-// Year Level
-export interface YearLevelType {
   id: string;
   name: string;
   shortname: string;
 }
 
-export type YearLevelsType = Array<YearLevelType>;
+export interface CourseParams {
-
-export type YearLevelReturnType = [boolean, YearLevelsType];
-
-// Course
-export interface CourseType {
   id: string;
   name: string;
   shortname: string;
 }
-export type CoursesType = Array<CourseType>;
-export type CourseReturnType = [boolean, CoursesType];
 
-// Subject
+export interface OnboardingParams {
-export interface SubjectType {
-  id: number;
-  name: string;
-  code: string;
-  course: string;
-  year_level: string;
-  semester: string;
-}
-
-export type SubjectsType = Array<SubjectType>;
-export type SubjectsReturnType = [boolean, SubjectsType];
-
-export type AvatarType = {
-  uri: string;
-  type: string;
-  name: string;
-};
-// For dropdown menu
-
-export interface OnboardingType {
   year_level: string;
   course: string;
   semester: string;
 }
-
-export interface PatchUserInfoType {
-  course?: string;
-  first_name?: string;
-  last_name?: string;
-  semester?: string;
-  subjects?: string[];
-  year_level?: string;
-  irregular?: boolean;
-  avatar?: string;
-}
-
-export interface LocationType {
-  latitude: Float;
-  longitude: Float;
-}
-
-export interface StudentStatusType {
-  subject: string;
-  location: LocationType;
-  landmark: string | null;
-  active: boolean;
-  study_group: string;
-}
-
-export interface StudentStatusPatchType {
-  subject?: string;
-  location?: LocationType;
-  landmark?: string | null;
-  active?: boolean;
-  study_group?: string;
-}
-
-export interface StudentStatusFilterType {
-  active: boolean;
-  distance: number;
-  landmark: string | null;
-  location: LocationType;
-  study_group?: string;
-  subject: string;
-  user: string;
-  weight?: number;
-}
-
-export interface StudentStatusFilterTypeFlattened {
-  active: boolean;
-  distance: number;
-  landmark: string | null;
-  latitude: Float;
-  longitude: Float;
-  study_group?: string;
-  subject: string;
-  user: string;
-  weight?: number;
-}
-
-export interface StudyGroupType {
-  name: string;
-  students: string[];
-  distance: number;
-  landmark: string | null;
-  location: LocationType;
-  subject: string;
-  radius: number;
-}
-
-export interface StudyGroupCreateType {
-  name: string;
-  location: LocationType;
-  subject: string;
-}
-
-export interface MessageType {
-  id: number;
-  user: string;
-  study_group: string;
-  message_content: string;
-  timestamp: string;
-}
-
-export interface MessagePostType {
-  message_content: string;
-}
-
-export interface GroupMessageAvatarType {
-  username: string;
-  avatar: string;
-}
-
-export type GroupMessageAvatarListType = GroupMessageAvatarType[];
-export type GroupMessageAvatarReturnType = [boolean, GroupMessageAvatarType[]];
-export type MessageReturnType = [boolean, MessageType[]];
-export type StudyGroupDetailReturnType = [boolean, StudyGroupType];
-export type StudyGroupReturnType = [boolean, StudyGroupType[]];
-export type StudentStatusReturnType = [boolean, StudentStatusType];
-export type StudentStatusListType = Array<StudentStatusFilterType>;
-export type StudentStatusListReturnType = [boolean, StudentStatusListType];
-export type RawLocationType = Location.LocationObject;
-
-export interface UserInfoType {
-  first_name: string;
-  last_name: string;
-  email: string;
-  avatar: string;
-  student_id_number: string;
-  irregular: boolean;
-  semester: string;
-  semester_shortname: string;
-  course: string;
-  course_shortname: string;
-  year_level: string;
-  yearlevel_shortname: string;
-  subjects: string[];
-  username: string;
-}
-
-export type UserInfoReturnType = [boolean, UserInfoType];
-
-export type subjectUserMapType = {
-  subject: string;
-  users: string[];
-  latitude: Float;
-  longitude: Float;
-  radius: Float;
-};

src/routes/Activation/Activation.tsx

@@ -6,7 +6,6 @@ import { useNavigation, useRoute } from "@react-navigation/native";
 import { useEffect, useState } from "react";
 import { UserActivate } from "../../components/Api/Api";
 import { RootDrawerParamList } from "../../interfaces/Interfaces";
-import { useToast } from "react-native-toast-notifications";
 
 interface ActivationRouteParams {
   uid?: string;
@@ -17,7 +16,9 @@ export default function Activation() {
   const route = useRoute();
   const { uid, token } = (route.params as ActivationRouteParams) || "";
   const navigation = useNavigation<RootDrawerParamList>();
-  const toast = useToast();
+  const [state, setState] = useState(
+    "Activating with UID " + uid + " and Token " + token
+  );
   const [loading, setLoading] = useState(true);
 
   useEffect(() => {
@@ -27,22 +28,16 @@ export default function Activation() {
         token: String(token),
       });
       if (result) {
-        toast.show("Activation successful", {
+        setTimeout(() => {
-          type: "success",
+          setState("Activation successful!");
-          placement: "top",
+        }, 1000);
-          duration: 4000,
-          animationType: "slide-in",
-        });
         setTimeout(() => {
           navigation.navigate("Login");
         }, 2000);
       } else {
-        toast.show("Activation unsuccessful. Please contact support", {
+        setTimeout(() => {
-          type: "warning",
+          setState("Activation unsuccessful\nPlease contact support");
-          placement: "top",
+        }, 1000);
-          duration: 4000,
-          animationType: "slide-in",
-        });
       }
       setLoading(false);
     }
@@ -58,7 +53,7 @@ export default function Activation() {
             marginBottom: 16,
             borderRadius: 4,
             width: "90%",
-            backgroundColor: colors.secondary_1,
+            backgroundColor: colors.blue_1,
           }}
         />
         <Text style={styles.text_white_large}>Activation</Text>
@@ -66,11 +61,10 @@ export default function Activation() {
         <ActivityIndicator
           animating={loading}
           size={96}
-          color={colors.secondary_1}
+          color={colors.blue_1}
         />
-        <Text style={styles.text_white_medium}>
+        <Text style={styles.text_white_medium}>{state}</Text>
-          {"Activating with UID: " + uid + "\nToken: " + token}
+        <Text style={styles.text_white_tiny}>{uid + "\n" + token}</Text>
-        </Text>
       </AnimatedContainer>
     </View>
   );

src/routes/ConversationPage/ConversationPage.tsx

@@ -1,365 +0,0 @@
-import * as React from "react";
-import { ActivityIndicator, Image, Pressable } from "react-native";
-import styles from "../../styles";
-import {
-  View,
-  Text,
-  TextInput,
-  ScrollView,
-  NativeSyntheticEvent,
-  TextInputChangeEventData,
-} from "react-native";
-import { colors } from "../../styles";
-import { useRef, useState } from "react";
-import { useMutation, useQuery } from "@tanstack/react-query";
-import {
-  GetStudentStatus,
-  GetStudyGroup,
-  GetStudyGroupMemberAvatars,
-  GetStudyGroupMessages,
-  PostMessage,
-} from "../../components/Api/Api";
-import {
-  StudentStatusType,
-  StudentStatusReturnType,
-  StudyGroupType,
-  StudyGroupDetailReturnType,
-  MessageType,
-  MessageReturnType,
-  MessagePostType,
-  GroupMessageAvatarType,
-  GroupMessageAvatarReturnType,
-} from "../../interfaces/Interfaces";
-import { useToast } from "react-native-toast-notifications";
-import { useQueryClient } from "@tanstack/react-query";
-import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import { useSelector } from "react-redux";
-import { RootState } from "../../features/redux/Store/Store";
-import CaretRightIcon from "../../icons/CaretLeftIcon/CaretLeftIcon";
-
-export default function ConversationPage() {
-  const toast = useToast();
-  const user = useSelector((state: RootState) => state.user);
-  // Student Status
-  const [student_status, setStudentStatus] = useState<StudentStatusType>();
-  const StudentStatusQuery = useQuery({
-    queryKey: ["user_status"],
-    queryFn: async () => {
-      const data = await GetStudentStatus();
-      if (data[0] == false) {
-        return Promise.reject(new Error(JSON.stringify(data[1])));
-      }
-      return data;
-    },
-    onSuccess: (data: StudentStatusReturnType) => {
-      setStudentStatus(data[1]);
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // Study Group Detail
-  const [studygroup, setStudyGroup] = useState<StudyGroupType>();
-  const StudyGroupQuery = useQuery({
-    enabled:
-      student_status?.study_group != "" && student_status?.study_group != null,
-    queryKey: ["study_group"],
-    refetchInterval: 10000,
-    queryFn: async () => {
-      const data = await GetStudyGroup(student_status?.study_group || "");
-      if (data[0] == false) {
-        return Promise.reject(new Error(JSON.stringify(data[1])));
-      }
-      return data;
-    },
-    onSuccess: (data: StudyGroupDetailReturnType) => {
-      if (data[1]) {
-        setStudyGroup(data[1]);
-      }
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // Study Group Messages
-  const [messages, setMessages] = useState<MessageType[]>([]);
-  const MessageQuery = useQuery({
-    refetchInterval: 3000,
-    enabled:
-      !StudentStatusQuery.isLoading &&
-      (student_status?.study_group != null ||
-        student_status?.study_group != ""),
-    queryKey: ["study_group_messages"],
-    queryFn: async () => {
-      const data = await GetStudyGroupMessages();
-      if (data[0] == false) {
-        return Promise.reject(new Error(JSON.stringify(data[1])));
-      }
-      return data;
-    },
-    onSuccess: async (data: MessageReturnType) => {
-      if (data[1]) {
-        await AsyncStorage.setItem("messages", JSON.stringify(data[1]));
-        setMessages(data[1]);
-      }
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // Avatar List
-  const [users, setUsers] = useState<GroupMessageAvatarType[]>([]);
-  const AvatarsQuery = useQuery({
-    refetchInterval: 10000,
-    enabled:
-      student_status?.study_group != null ||
-      (student_status?.study_group != "" &&
-        studygroup != null &&
-        studygroup.students != null),
-    queryKey: ["study_group_avatars"],
-    queryFn: async () => {
-      const data = await GetStudyGroupMemberAvatars();
-      if (data[0] == false) {
-        return Promise.reject(new Error(JSON.stringify(data[1])));
-      }
-      return data;
-    },
-    onSuccess: (data: GroupMessageAvatarReturnType) => {
-      if (data[1]) {
-        setUsers(data[1]);
-      }
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-  const scrollViewRef = useRef<ScrollView>(null);
-  const queryClient = useQueryClient();
-  const [message, setMessage] = useState("");
-  const send_message = useMutation({
-    mutationFn: async (info: MessagePostType) => {
-      const data = await PostMessage(info);
-      if (data[0] != true) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["study_group_messages"] });
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  if (
-    !StudyGroupQuery.isLoading &&
-    !AvatarsQuery.isLoading &&
-    !MessageQuery.isLoading &&
-    student_status &&
-    studygroup &&
-    studygroup.students
-  ) {
-    return (
-      <View style={styles.background}>
-        <AnimatedContainer>
-          <View
-            style={{
-              padding: 15,
-              alignSelf: "flex-start",
-            }}
-          >
-            <View style={styles.flex_row}>
-              <Text style={{ ...styles.text_white_medium }}>
-                {`Group: ${studygroup?.name ? studygroup.name : "Loading..."}`}
-              </Text>
-            </View>
-            {studygroup.landmark ? (
-              <Text style={{...styles.text_white_tiny_bold,...{textAlign:'left'}}}>
-              {studygroup.landmark}
-              </Text>
-            ) : (
-              <></>
-            )}
-
-            <View style={{ ...styles.flex_row }}>
-              <Text
-                style={{
-                  ...styles.text_white_small,
-                  textAlign: "left",
-                  paddingRight: 4,
-                }}
-              >
-                {!StudyGroupQuery.isFetching
-                  ? studygroup.students.length + " studying"
-                  : "Loading"}
-              </Text>
-              {users.map((user: GroupMessageAvatarType, index: number) => {
-                if (index > 6) {
-                  return <React.Fragment key={index} />;
-                }
-                return (
-                  <React.Fragment key={index}>
-                    {user.avatar != null && user.avatar != "" ? (
-                      <Image
-                        source={{ uri: user.avatar }}
-                        style={styles.profile_mini}
-                      />
-                    ) : (
-                      <Image
-                        source={require("../../img/user_profile_placeholder.png")}
-                        style={styles.profile_mini}
-                      />
-                    )}
-                  </React.Fragment>
-                );
-              })}
-            </View>
-          </View>
-          <ScrollView
-            style={{ width: 320 }}
-            onContentSizeChange={() => scrollViewRef.current?.scrollToEnd()}
-            ref={scrollViewRef}
-          >
-            {messages.length > 0 ? (
-              messages.map((message: MessageType, index: number) => {
-                let avatar = "";
-                users.filter((user: GroupMessageAvatarType) => {
-                  if (user.username == message.user) {
-                    avatar = user.avatar;
-                  }
-                });
-                return (
-                  <View
-                    key={message.id}
-                    style={{
-                      ...styles.message_contentContainer,
-                      alignItems:
-                        message.user === user.user.username
-                          ? "flex-end"
-                          : "flex-start",
-                    }}
-                  >
-                    <View style={styles.flex_row}>
-                      {avatar != null && avatar != "" ? (
-                        <Image
-                          source={{ uri: avatar }}
-                          style={styles.profile_mini}
-                        />
-                      ) : (
-                        <Image
-                          source={require("../../img/user_profile_placeholder.png")}
-                          style={styles.profile_mini}
-                        />
-                      )}
-
-                      <Text style={styles.text_white_small}>
-                        {message.user}
-                      </Text>
-                      <Text
-                        style={{
-                          ...styles.text_white_tiny,
-                          ...{ marginLeft: 4, alignContent: "center" },
-                        }}
-                      >
-                        {message.timestamp}
-                      </Text>
-                    </View>
-
-                    <Text style={styles.text_white_small}>
-                      {message.message_content}
-                    </Text>
-                  </View>
-                );
-              })
-            ) : (
-              <Text style={styles.text_white_small}>There are no messages</Text>
-            )}
-          </ScrollView>
-          <View style={styles.flex_row}>
-            <TextInput
-              style={styles.chatbox}
-              placeholder="Send a message..."
-              placeholderTextColor="white"
-              value={message}
-              onChange={(
-                e: NativeSyntheticEvent<TextInputChangeEventData>
-              ): void => {
-                setMessage(e.nativeEvent.text);
-              }}
-              onSubmitEditing={() => {
-                send_message.mutate({
-                  message_content: message,
-                });
-                setMessage("");
-              }}
-            />
-            <Pressable
-              style={{
-                backgroundColor: colors.secondary_3,
-                borderRadius: 16,
-                alignSelf: "center",
-                marginLeft: 16,
-              }}
-              onPress={() => {
-                send_message.mutate({
-                  message_content: message,
-                });
-                setMessage("");
-              }}
-            >
-              <CaretRightIcon size={48} />
-            </Pressable>
-          </View>
-        </AnimatedContainer>
-      </View>
-    );
-  } else if (!student_status?.study_group) {
-    return (
-      <View style={styles.background}>
-        <AnimatedContainer>
-          <Text style={styles.text_white_medium}>
-            You are not in a study group. Join one to start a conversation!
-          </Text>
-        </AnimatedContainer>
-      </View>
-    );
-  }
-  return (
-    <View style={styles.background}>
-      <AnimatedContainer>
-        <ActivityIndicator size={96} color={colors.secondary_1} />
-        <Text style={styles.text_white_medium}>Loading...</Text>
-      </AnimatedContainer>
-    </View>
-  );
-}

src/routes/CreateGroup/CreateGroup.tsx

@@ -1,192 +0,0 @@
-import * as React from "react";
-import styles, { Viewport } from "../../styles";
-import {
-  View,
-  Text,
-  TextInput,
-  NativeSyntheticEvent,
-  TextInputChangeEventData,
-  Pressable,
-} from "react-native";
-import { useState } from "react";
-import {
-  RootDrawerParamList,
-  StudentStatusPatchType,
-  StudyGroupCreateType,
-} from "../../interfaces/Interfaces";
-import Button from "../../components/Button/Button";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { PatchStudentStatus, CreateStudyGroup } from "../../components/Api/Api";
-import { colors } from "../../styles";
-import AnimatedContainerNoScroll from "../../components/AnimatedContainer/AnimatedContainerNoScroll";
-import { urlProvider } from "../../components/Api/Api";
-import MapView, { UrlTile, Marker } from "react-native-maps";
-import { useNavigation } from "@react-navigation/native";
-import { useToast } from "react-native-toast-notifications";
-import CaretLeftIcon from "../../icons/CaretLeftIcon/CaretLeftIcon";
-import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
-
-export default function CreateGroup({ route }: any) {
-  const { location, subject } = route.params;
-  const queryClient = useQueryClient();
-  const navigation = useNavigation<RootDrawerParamList>();
-  const toast = useToast();
-
-  const [name, setName] = useState("");
-  const study_group_create = useMutation({
-    mutationFn: async (info: StudyGroupCreateType) => {
-      const data = await CreateStudyGroup(info);
-      if (data[0] != true) {
-        return Promise.reject(new Error());
-      }
-      return data;
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["user"] });
-      queryClient.invalidateQueries({ queryKey: ["user_status"] });
-      student_status_patch.mutate({
-        study_group: name,
-      });
-      toast.show("Created successfully", {
-        type: "success",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  const student_status_patch = useMutation({
-    mutationFn: async (info: StudentStatusPatchType) => {
-      const data = await PatchStudentStatus(info);
-      if (data[0] != true) {
-        return Promise.reject(new Error());
-      }
-      return data;
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["user"] });
-      queryClient.invalidateQueries({ queryKey: ["user_status"] });
-      queryClient.invalidateQueries({ queryKey: ["user_status_list"] });
-      queryClient.invalidateQueries({ queryKey: ["study_group_list"] });
-      toast.show(`Joined group ${name} successfully`, {
-        type: "success",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-      // Set a delay before going back to conversation page to hopefully let the queries refresh in time
-      setTimeout(() => {
-        navigation.navigate("Conversation");
-      }, 200);
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  if (location) {
-    return (
-      <View style={styles.background}>
-        <AnimatedContainer>
-          <View style={{ zIndex: -1 }}>
-            <View style={styles.padding} />
-            <View style={{ borderRadius: 16, overflow: "hidden" }}>
-              <MapView
-                style={{
-                  height: Viewport.height * 0.4,
-                  width: Viewport.width * 0.8,
-                  alignSelf: "center",
-                }}
-                customMapStyle={[
-                  {
-                    featureType: "poi",
-                    stylers: [
-                      {
-                        visibility: "off",
-                      },
-                    ],
-                  },
-                ]}
-                mapType="none"
-                scrollEnabled={false}
-                zoomEnabled={false}
-                toolbarEnabled={false}
-                rotateEnabled={false}
-                minZoomLevel={18}
-                initialRegion={{
-                  latitude: location.latitude,
-                  longitude: location.longitude,
-                  latitudeDelta: 0.0922,
-                  longitudeDelta: 0.0421,
-                }}
-                loadingBackgroundColor={colors.secondary_2}
-              >
-                <UrlTile
-                  urlTemplate={urlProvider}
-                  shouldReplaceMapContent={true}
-                  maximumZ={19}
-                  flipY={false}
-                  zIndex={1}
-                />
-                <Marker
-                  coordinate={{
-                    latitude: location.latitude,
-                    longitude: location.longitude,
-                  }}
-                  pinColor={colors.primary_1}
-                />
-              </MapView>
-            </View>
-            <View style={styles.padding} />
-          </View>
-          <TextInput
-            style={styles.text_input}
-            placeholder="Group Name"
-            placeholderTextColor="white"
-            autoCapitalize="none"
-            value={name}
-            onChange={(
-              e: NativeSyntheticEvent<TextInputChangeEventData>
-            ): void => {
-              setName(e.nativeEvent.text);
-            }}
-          />
-          <View style={styles.padding} />
-          <View style={styles.flex_row}>
-            <Pressable onPress={() => navigation.navigate("Home")}>
-              <CaretLeftIcon size={32} />
-            </Pressable>
-            <Button
-              onPress={() => {
-                study_group_create.mutate({
-                  name: name,
-                  location: location,
-                  subject: subject,
-                });
-              }}
-            >
-              <Text style={styles.text_white_small}>Start Studying</Text>
-            </Button>
-          </View>
-
-          <View style={styles.padding} />
-        </AnimatedContainer>
-      </View>
-    );
-  }
-  return <View />;
-}

src/routes/Loading/Loading.tsx

@@ -1,17 +0,0 @@
-import * as React from "react";
-import styles from "../../styles";
-import { View, Text, ActivityIndicator } from "react-native";
-import { colors } from "../../styles";
-import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
-
-export default function Loading() {
-  return (
-    <View style={styles.background}>
-      <AnimatedContainer>
-        <View style={{ paddingVertical: 8 }} />
-        <ActivityIndicator size={128} color={colors.secondary_1} />
-        <Text style={styles.text_white_medium}>Loading StudE...</Text>
-      </AnimatedContainer>
-    </View>
-  );
-}

src/routes/Login/Login.tsx

@@ -7,13 +7,15 @@ import {
   NativeSyntheticEvent,
   TextInputChangeEventData,
 } from "react-native";
-import { useDispatch, useSelector } from "react-redux";
+import { useDispatch } from "react-redux";
-import { useEffect, useState } from "react";
+import { colors } from "../../styles";
+import { useState } from "react";
 import LoginIcon from "../../icons/LoginIcon/LoginIcon";
 import Button from "../../components/Button/Button";
 import { useNavigation } from "@react-navigation/native";
 import { RootDrawerParamList } from "../../interfaces/Interfaces";
-import { GetUserInfo, UserLogin } from "../../components/Api/Api";
+import { UserInfo, UserLogin } from "../../components/Api/Api";
+import { ParseLoginError } from "../../components/ParseError/ParseError";
 import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
 import { setUser } from "../../features/redux/slices/UserSlice/UserSlice";
 import {
@@ -21,24 +23,15 @@ import {
   setOnboarding,
   unsetOnboarding,
 } from "../../features/redux/slices/StatusSlice/StatusSlice";
-import { useToast } from "react-native-toast-notifications";
-import { RootState } from "../../features/redux/Store/Store";
 
 export default function Login() {
   const navigation = useNavigation<RootDrawerParamList>();
-  const status = useSelector((state: RootState) => state.status);
-  const [logging_in, setLoggingIn] = useState(false);
   const dispatch = useDispatch();
   const [creds, setCreds] = useState({
     username: "",
     password: "",
+    error: "",
   });
-  const toast = useToast();
-  useEffect(() => {
-    if (status.logged_in) {
-      navigation.navigate("Home");
-    }
-  }, []);
   return (
     <View style={styles.background}>
       <AnimatedContainer>
@@ -47,7 +40,15 @@ export default function Login() {
           <Text style={styles.text_white_large}>Student Login</Text>
         </View>
         <View style={{ paddingVertical: 8 }} />
-        <View style={styles.padding} />
+        <View
+          style={{
+            paddingVertical: 4,
+            marginBottom: 16,
+            borderRadius: 4,
+            width: "90%",
+            backgroundColor: colors.head,
+          }}
+        />
         <TextInput
           style={styles.text_input}
           placeholder="Username"
@@ -67,24 +68,24 @@ export default function Login() {
           placeholderTextColor="white"
           secureTextEntry={true}
           value={creds.password}
-          autoCapitalize={"none"}
           onChange={(
             e: NativeSyntheticEvent<TextInputChangeEventData>
           ): void => {
             setCreds({ ...creds, password: e.nativeEvent.text });
           }}
         />
+        <View style={{ paddingVertical: 2 }} />
+        <Text style={styles.text_white_small}>{creds.error}</Text>
         <View style={{ paddingVertical: 4 }} />
         <Button
           onPress={async () => {
-            if (!logging_in) {
             await UserLogin({
               username: creds.username,
               password: creds.password,
             }).then(async (result) => {
               if (result[0]) {
                 setUser({ ...creds, username: "", password: "", error: "" });
-                  let user_info = await GetUserInfo();
+                let user_info = await UserInfo();
                 dispatch(login());
                 dispatch(setUser(user_info[1]));
                 // Redirect to onboarding if no year level, course, or semester specified
@@ -95,39 +96,27 @@ export default function Login() {
                 ) {
                   dispatch(setOnboarding());
                   navigation.navigate("Onboarding");
-                    toast.show("Successfully logged in", {
-                      type: "success",
-                      placement: "top",
-                      duration: 2000,
-                      animationType: "slide-in",
-                    });
                 } else {
                   dispatch(unsetOnboarding());
-                    toast.show("Successfully logged in", {
-                      type: "success",
-                      placement: "top",
-                      duration: 2000,
-                      animationType: "slide-in",
-                    });
                   navigation.navigate("Home");
                 }
                 console.log(JSON.stringify(user_info));
               } else {
-                  toast.show(JSON.stringify(result[1]), {
+                setUser({
-                    type: "warning",
+                  ...creds,
-                    placement: "top",
+                  error: ParseLoginError(JSON.stringify(result[1])),
-                    duration: 2000,
-                    animationType: "slide-in",
                 });
               }
-                setLoggingIn(false);
             });
-            }
           }}
+          color={colors.login_color}
         >
           <Text style={styles.text_white_small}>Login</Text>
         </Button>
-        <Button onPress={() => navigation.navigate("Register")}>
+        <Button
+          onPress={() => navigation.navigate("Register")}
+          color={colors.reg_color}
+        >
           <Text style={styles.text_white_small}>Register</Text>
         </Button>
       </AnimatedContainer>

src/routes/Onboarding/Onboarding.tsx

@@ -3,33 +3,32 @@ import styles from "../../styles";
 import { View, Text } from "react-native";
 import { useNavigation } from "@react-navigation/native";
 import {
+  CourseParams,
   RootDrawerParamList,
-  CourseType,
+  SemesterParams,
-  SemesterType,
+  YearLevelParams,
-  YearLevelType,
 } from "../../interfaces/Interfaces";
 import { colors } from "../../styles";
-import { MotiView } from "moti";
+import { AnimatePresence, MotiView } from "moti";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import Button from "../../components/Button/Button";
 import DropDownPicker from "react-native-dropdown-picker";
+import isStringEmpty from "../../components/IsStringEmpty/IsStringEmpty";
 import { useQuery } from "@tanstack/react-query";
 import {
   GetCourses,
   GetSemesters,
   GetYearLevels,
-  PatchUserInfo,
+  OnboardingUpdateStudentInfo,
 } from "../../components/Api/Api";
 import { useDispatch } from "react-redux";
 import { unsetOnboarding } from "../../features/redux/slices/StatusSlice/StatusSlice";
 import { setUser } from "../../features/redux/slices/UserSlice/UserSlice";
-import AnimatedContainerNoScroll from "../../components/AnimatedContainer/AnimatedContainerNoScroll";
-import { useToast } from "react-native-toast-notifications";
 export default function Onboarding() {
   const navigation = useNavigation<RootDrawerParamList>();
   const dispatch = useDispatch();
   // const creds = useSelector((state: RootState) => state.auth.creds);
-  const toast = useToast();
+  const [error, setError] = useState("");
   // Semesters
   const [selected_semester, setSelectedSemester] = useState("");
   const [semesterOpen, setSemesterOpen] = useState(false);
@@ -39,28 +38,14 @@ export default function Onboarding() {
   ]);
   const semester_query = useQuery({
     queryKey: ["semesters"],
-    queryFn: async () => {
+    queryFn: GetSemesters,
-      const data = await GetSemesters();
-      if (data[0] == false) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
     onSuccess: (data) => {
-      let semesters = data[1].map((item: SemesterType) => ({
+      let semesters = data.map((item: SemesterParams) => ({
         label: item.name,
         value: item.name,
       }));
       setSemesters(semesters);
     },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
   });
   // Year Level
   const [selected_yearlevel, setSelectedYearLevel] = useState("");
@@ -71,28 +56,14 @@ export default function Onboarding() {
   ]);
   const yearlevel_query = useQuery({
     queryKey: ["year_levels"],
-    queryFn: async () => {
+    queryFn: GetYearLevels,
-      const data = await GetYearLevels();
-      if (data[0] == false) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
     onSuccess: (data) => {
-      let year_levels = data[1].map((item: YearLevelType) => ({
+      let year_levels = data.map((item: YearLevelParams) => ({
         label: item.name,
         value: item.name,
       }));
       setYearLevels(year_levels);
     },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
   });
   // Course
   const [selected_course, setSelectedCourse] = useState("");
@@ -106,28 +77,14 @@ export default function Onboarding() {
   ]);
   const course_query = useQuery({
     queryKey: ["courses"],
-    queryFn: async () => {
+    queryFn: GetCourses,
-      const data = await GetCourses();
-      if (data[0] == false) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
     onSuccess: (data) => {
-      let courses = data[1].map((item: CourseType) => ({
+      let courses = data.map((item: CourseParams) => ({
         label: item.name,
         value: item.name,
       }));
       setCourses(courses);
     },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
   });
   if (yearlevel_query.error || semester_query.error || course_query.error) {
     return (
@@ -140,7 +97,7 @@ export default function Onboarding() {
   }
   return (
     <View style={styles.background}>
-      <AnimatedContainerNoScroll>
+      <View style={styles.container}>
         <MotiView
           from={{ opacity: 0 }}
           animate={{ opacity: 1 }}
@@ -155,7 +112,7 @@ export default function Onboarding() {
             marginBottom: 16,
             borderRadius: 4,
             width: "90%",
-            backgroundColor: colors.secondary_1,
+            backgroundColor: colors.blue_1,
           }}
         />
         <View style={{ paddingVertical: 4 }} />
@@ -187,50 +144,16 @@ export default function Onboarding() {
               setSemesterOpen(false);
               setYearLevelOpen(false);
             }}
-            style={styles.input}
             setValue={setSelectedCourse}
             placeholder="Choose your course"
-            containerStyle={{ zIndex: 3000 }}
+            containerStyle={{
-            textStyle={{
+              ...styles.dropdown_template,
-              ...styles.text_white_small_bold,
+              ...{ zIndex: 3000 },
-              ...{ textAlign: "center" },
             }}
-            modalContentContainerStyle={{
+            dropDownContainerStyle={{ backgroundColor: "white" }}
-              backgroundColor: colors.primary_2,
-              borderWidth: 0,
-              zIndex: 1000,
-            }}
-            dropDownDirection="BOTTOM"
-            listMode="MODAL"
           />
           <DropDownPicker
             zIndex={2000}
-            open={yearLevelOpen}
-            value={selected_yearlevel}
-            items={year_levels}
-            setOpen={(open) => {
-              setYearLevelOpen(open);
-              setSemesterOpen(false);
-              setCourseOpen(false);
-            }}
-            style={styles.input}
-            setValue={setSelectedYearLevel}
-            placeholder="Your Year Level"
-            containerStyle={{ zIndex: 2000 }}
-            textStyle={{
-              ...styles.text_white_small_bold,
-              ...{ textAlign: "center" },
-            }}
-            modalContentContainerStyle={{
-              backgroundColor: colors.primary_2,
-              borderWidth: 0,
-              zIndex: 1000,
-            }}
-            dropDownDirection="BOTTOM"
-            listMode="MODAL"
-          />
-          <DropDownPicker
-            zIndex={1000}
             open={semesterOpen}
             value={selected_semester}
             items={semesters}
@@ -239,44 +162,46 @@ export default function Onboarding() {
               setCourseOpen(false);
               setYearLevelOpen(false);
             }}
-            style={styles.input}
             setValue={setSelectedSemester}
             placeholder="Current semester"
-            containerStyle={{ zIndex: 1000 }}
+            containerStyle={{
-            textStyle={{
+              ...styles.dropdown_template,
-              ...styles.text_white_small_bold,
+              ...{ zIndex: 2000 },
-              ...{ textAlign: "center" },
             }}
-            modalContentContainerStyle={{
+            dropDownContainerStyle={{ backgroundColor: "white" }}
-              backgroundColor: colors.primary_2,
+          />
-              borderWidth: 0,
+          <DropDownPicker
-              zIndex: 1000,
+            zIndex={1000}
+            open={yearLevelOpen}
+            value={selected_yearlevel}
+            items={year_levels}
+            setOpen={(open) => {
+              setYearLevelOpen(open);
+              setSemesterOpen(false);
+              setCourseOpen(false);
             }}
-            dropDownDirection="BOTTOM"
+            setValue={setSelectedYearLevel}
-            listMode="MODAL"
+            placeholder="Your Year Level"
+            containerStyle={{
+              ...styles.dropdown_template,
+              ...{ zIndex: 1000 },
+            }}
+            dropDownContainerStyle={{ backgroundColor: "white" }}
           />
         </MotiView>
         <MotiView
-          from={{
+          from={{ opacity: 0 }}
-            opacity: 0,
+          animate={{ opacity: 1, zIndex: -1 }}
-            zIndex: -1,
-          }}
-          animate={{
-            opacity: 1,
-            zIndex: -1,
-          }}
           transition={{ type: "timing", duration: 400, delay: 1700 }}
-          style={{
+          style={styles.button_template}
-            ...styles.button_template,
-            ...{ padding: 0, backgroundColor: colors.secondary_3 },
-          }}
         >
+          <Text style={styles.text_white_small}>{error}</Text>
           <Button
             disabled={
               !selected_yearlevel || !selected_course || !selected_semester
             }
             onPress={async () => {
-              let result = await PatchUserInfo({
+              let result = await OnboardingUpdateStudentInfo({
                 semester: selected_semester,
                 course: selected_course,
                 year_level: selected_yearlevel,
@@ -286,32 +211,19 @@ export default function Onboarding() {
                 setSelectedCourse("");
                 setSelectedYearLevel("");
                 setSelectedSemester("");
+                setError("Success!");
                 dispatch(setUser(result[1]));
-                toast.show("Changes applied successfully", {
-                  type: "success",
-                  placement: "top",
-                  duration: 2000,
-                  animationType: "slide-in",
-                });
                 navigation.navigate("Home");
               } else {
-                dispatch(setUser(result[1]));
+                setError(result[1]);
-                toast.show(
-                  "An error has occured\nChanges have not been saved",
-                  {
-                    type: "warning",
-                    placement: "top",
-                    duration: 2000,
-                    animationType: "slide-in",
-                  }
-                );
               }
             }}
+            color={colors.blue_3}
           >
             <Text style={styles.text_white_small}>Proceed</Text>
           </Button>
         </MotiView>
-      </AnimatedContainerNoScroll>
+      </View>
     </View>
   );
 }

src/routes/Register/Register.tsx

@@ -15,16 +15,13 @@ import { RootDrawerParamList } from "../../interfaces/Interfaces";
 import SignupIcon from "../../icons/SignupIcon/SignupIcon";
 import { UserRegister } from "../../components/Api/Api";
 import IsNumber from "../../components/IsNumber/IsNumber";
+import ParseError from "../../components/ParseError/ParseError";
 import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
-import { useToast } from "react-native-toast-notifications";
-import { ScrollView } from "react-native-gesture-handler";
 
 export default function Register() {
   const navigation = useNavigation<RootDrawerParamList>();
-  const toast = useToast();
   // const dispatch = useDispatch();
   // const creds = useSelector((state: RootState) => state.auth.creds);
-  const [registering, setRegistering] = useState(false);
   const [user, setUser] = useState({
     first_name: "",
     last_name: "",
@@ -32,7 +29,7 @@ export default function Register() {
     username: "",
     email: "",
     password: "",
-    confirm_password: "",
+    feedback: "",
   });
   return (
     <View style={styles.background}>
@@ -40,13 +37,22 @@ export default function Register() {
       <View style={styles.flex_row}>
           <SignupIcon size={32} />
           <Text style={styles.text_white_large}>Student Signup</Text>
-          <View style={{ paddingVertical: 8 }} />
+          <View style={{ paddingVertical: 8, }} />
         </View>
-        <View style={styles.padding} />
+        <View
+          style={{
+            paddingVertical: 4,
+            marginBottom: 16,
+            marginTop: 8,
+            borderRadius: 4,
+            width: "90%",
+            backgroundColor: colors.head,
+          }}
+        />
         <TextInput
           style={styles.text_input}
           placeholder="First Name"
-          placeholderTextColor={colors.text_default}
+          placeholderTextColor="white"
           value={user.first_name}
           onChange={(
             e: NativeSyntheticEvent<TextInputChangeEventData>
@@ -58,7 +64,7 @@ export default function Register() {
         <TextInput
           style={styles.text_input}
           placeholder="Last Name"
-          placeholderTextColor={colors.text_default}
+          placeholderTextColor="white"
           value={user.last_name}
           onChange={(
             e: NativeSyntheticEvent<TextInputChangeEventData>
@@ -70,7 +76,7 @@ export default function Register() {
         <TextInput
           style={styles.text_input}
           placeholder="USTP ID Number"
-          placeholderTextColor={colors.text_default}
+          placeholderTextColor="white"
           value={user.student_id_number}
           onChange={(
             e: NativeSyntheticEvent<TextInputChangeEventData>
@@ -87,7 +93,7 @@ export default function Register() {
         <TextInput
           style={styles.text_input}
           placeholder="Username"
-          placeholderTextColor={colors.text_default}
+          placeholderTextColor="white"
           autoCapitalize={"none"}
           value={user.username}
           onChange={(
@@ -100,7 +106,7 @@ export default function Register() {
         <TextInput
           style={styles.text_input}
           placeholder="Email"
-          placeholderTextColor={colors.text_default}
+          placeholderTextColor="white"
           autoCapitalize={"none"}
           value={user.email}
           onChange={(
@@ -113,10 +119,9 @@ export default function Register() {
         <TextInput
           style={styles.text_input}
           placeholder="Password"
-          placeholderTextColor={colors.text_default}
+          placeholderTextColor="white"
           secureTextEntry={true}
           value={user.password}
-          autoCapitalize={"none"}
           onChange={(
             e: NativeSyntheticEvent<TextInputChangeEventData>
           ): void => {
@@ -124,25 +129,10 @@ export default function Register() {
           }}
         />
         <View style={{ paddingVertical: 4 }} />
-        <TextInput
+        <Text style={styles.text_white_small}>{user.feedback}</Text>
-          style={styles.text_input}
-          placeholder="Confirm Password"
-          placeholderTextColor={colors.text_default}
-          secureTextEntry={true}
-          value={user.confirm_password}
-          autoCapitalize={"none"}
-          onChange={(
-            e: NativeSyntheticEvent<TextInputChangeEventData>
-          ): void => {
-            setUser({ ...user, confirm_password: e.nativeEvent.text });
-          }}
-        />
         <View style={{ paddingVertical: 4 }} />
         <Button
           onPress={async () => {
-            if (!registering) {
-              if (user.password === user.confirm_password) {
-                setRegistering(true);
             await UserRegister({
               username: user.username,
               email: user.email,
@@ -150,7 +140,7 @@ export default function Register() {
               student_id_number: user.student_id_number,
               first_name: user.first_name,
               last_name: user.last_name,
-                }).then((result: any) => {
+            }).then((result) => {
               console.log(result);
               if (result[0]) {
                 setUser({
@@ -161,42 +151,23 @@ export default function Register() {
                   username: "",
                   email: "",
                   password: "",
-                    });
+                  feedback:
-                    toast.show(
                     "Success! An email has been sent to activate your account",
-                      {
+                });
-                        type: "success",
-                        placement: "top",
-                        duration: 6000,
-                        animationType: "slide-in",
-                      }
-                    );
                 setTimeout(() => {
                   navigation.navigate("Login");
                 }, 10000);
               } else {
-                    toast.show(JSON.parse(JSON.stringify(result[1])), {
+                setUser({
-                      type: "warning",
+                  ...user,
-                      placement: "top",
+                  feedback: ParseError(JSON.stringify(result[1])),
-                      duration: 6000,
-                      animationType: "slide-in",
                 });
               }
-                  setRegistering(false);
             });
-              } else {
-                toast.show(
-                  "Password does not match confirm password. Please try again"
-                ),
             {
-                    type: "warning",
-                    placement: "top",
-                    duration: 6000,
-                    animationType: "slide-in",
-                  };
-              }
             }
           }}
+          color={colors.reg_color}
         >
           <Text style={styles.text_white_small}>Register</Text>
         </Button>

src/routes/Revalidation/Revalidation.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import styles from "../../styles";
 import { View, Text, ActivityIndicator } from "react-native";
-import { TokenRefresh, GetUserInfo } from "../../components/Api/Api";
+import { TokenRefresh, UserInfo } from "../../components/Api/Api";
 import { useDispatch } from "react-redux";
 import { colors } from "../../styles";
 import { useEffect, useState } from "react";
@@ -15,55 +15,37 @@ import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContai
 import { setUser } from "../../features/redux/slices/UserSlice/UserSlice";
 import { setOnboarding } from "../../features/redux/slices/StatusSlice/StatusSlice";
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import { useToast } from "react-native-toast-notifications";
 
 export default function Revalidation() {
   const dispatch = useDispatch();
   const navigation = useNavigation<RootDrawerParamList>();
   const [state, setState] = useState("Checking for existing session");
-  const toast = useToast();
   useEffect(() => {
     setState("Previous session found");
     TokenRefresh().then(async (response) => {
-      let user_info = await GetUserInfo();
+      let user_info = await UserInfo();
       if (response && user_info[0]) {
         dispatch(login());
         dispatch(setUser(user_info[1]));
         if (
-          !user_info[1].year_level ||
+          !(
-          !user_info[1].course ||
+            user_info[1].year_level ||
-          !user_info[1].semester
+            user_info[1].course ||
+            user_info[1].semester
+          )
         ) {
           dispatch(setOnboarding());
-          toast.show("Previous session restored", {
-            type: "success",
-            placement: "top",
-            duration: 2000,
-            animationType: "slide-in",
-          });
           await setTimeout(() => {
             navigation.navigate("Onboarding");
           }, 700);
         } else {
           dispatch(unsetOnboarding());
-          toast.show("Previous session restored", {
-            type: "success",
-            placement: "top",
-            duration: 2000,
-            animationType: "slide-in",
-          });
           await setTimeout(() => {
             navigation.navigate("Home");
           }, 700);
         }
       } else {
         await setState("Session expired");
-        toast.show("Session expired. Please login again", {
-          type: "warning",
-          placement: "top",
-          duration: 2000,
-          animationType: "slide-in",
-        });
         await setTimeout(() => {
           AsyncStorage.clear();
           navigation.navigate("Login");
@@ -76,7 +58,7 @@ export default function Revalidation() {
     <View style={styles.background}>
       <AnimatedContainer>
         <View style={{ paddingVertical: 8 }} />
-        <ActivityIndicator size={96} color={colors.secondary_1} />
+        <ActivityIndicator size={96} color={colors.blue_1} />
         <Text style={styles.text_white_medium}>{state}</Text>
       </AnimatedContainer>
     </View>

src/routes/StartStudying/StartStudying.tsx

@@ -1,234 +0,0 @@
-import * as React from "react";
-import styles, { Viewport } from "../../styles";
-import {
-  View,
-  Text,
-  ToastAndroid,
-  Pressable,
-  ActivityIndicator,
-} from "react-native";
-import { useState } from "react";
-import {
-  UserInfoReturnType,
-  OptionType,
-  RootDrawerParamList,
-  StudentStatusType,
-  StudentStatusReturnType,
-  StudentStatusPatchType,
-} from "../../interfaces/Interfaces";
-import Button from "../../components/Button/Button";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import {
-  PatchStudentStatus,
-  GetUserInfo,
-  ParseError,
-} from "../../components/Api/Api";
-import { colors } from "../../styles";
-import DropDownPicker from "react-native-dropdown-picker";
-import AnimatedContainerNoScroll from "../../components/AnimatedContainer/AnimatedContainerNoScroll";
-import { urlProvider } from "../../components/Api/Api";
-import MapView, { UrlTile, Marker } from "react-native-maps";
-import { useNavigation } from "@react-navigation/native";
-import { useToast } from "react-native-toast-notifications";
-import CaretLeftIcon from "../../icons/CaretLeftIcon/CaretLeftIcon";
-import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
-
-export default function StartStudying({ route }: any) {
-  const { location } = route.params;
-  const queryClient = useQueryClient();
-  const navigation = useNavigation<RootDrawerParamList>();
-  const toast = useToast();
-
-  // Subject choices
-  const [selected_subject, setSelectedSubject] = useState("");
-  const [subjectsOpen, setSubjectsOpen] = useState(false);
-  const [subjects, setSubjects] = useState<OptionType[]>([]);
-  const StudentInfo = useQuery({
-    queryKey: ["user"],
-    queryFn: async () => {
-      const data = await GetUserInfo();
-      if (data[0] == false) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
-    onSuccess: (data: UserInfoReturnType) => {
-      let subjects = data[1].subjects.map((subject: string) => ({
-        label: subject,
-        value: subject,
-      }));
-      setSubjects(subjects);
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  const mutation = useMutation({
-    mutationFn: async (info: StudentStatusPatchType) => {
-      const data = await PatchStudentStatus(info);
-      if (data[0] == false) {
-        return Promise.reject(new Error(JSON.stringify(data[1])));
-      }
-      return data;
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["user"] });
-      queryClient.invalidateQueries({ queryKey: ["user_status"] });
-      queryClient.invalidateQueries({ queryKey: ["user_status_list"] });
-      queryClient.invalidateQueries({ queryKey: ["study_group_list"] });
-      toast.show("You are now studying  \n" + selected_subject, {
-        type: "success",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-      // Set a delay before going back to homepage to hopefully let the queries refresh in time
-      setTimeout(() => {
-        navigation.navigate("Home");
-      }, 200);
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  if (StudentInfo.isLoading) {
-    return (
-      <View style={styles.background}>
-        <AnimatedContainer>
-          <View style={{ paddingVertical: 8 }} />
-          <ActivityIndicator size={96} color={colors.secondary_1} />
-          <Text style={styles.text_white_medium}>Loading...</Text>
-        </AnimatedContainer>
-      </View>
-    );
-  }
-  if (location && location.coords) {
-    return (
-      <View style={styles.background}>
-        <AnimatedContainerNoScroll>
-          <View style={{ zIndex: -1 }}>
-            <View style={styles.padding} />
-            <View style={{ borderRadius: 16, overflow: "hidden" }}>
-              <MapView
-                style={{
-                  height: Viewport.height * 0.4,
-                  width: Viewport.width * 0.8,
-                  alignSelf: "center",
-                }}
-                customMapStyle={[
-                  {
-                    featureType: "poi",
-                    stylers: [
-                      {
-                        visibility: "off",
-                      },
-                    ],
-                  },
-                ]}
-                mapType="none"
-                scrollEnabled={false}
-                zoomEnabled={false}
-                toolbarEnabled={false}
-                rotateEnabled={false}
-                minZoomLevel={18}
-                initialRegion={{
-                  latitude: location.coords.latitude,
-                  longitude: location.coords.longitude,
-                  latitudeDelta: 0.0922,
-                  longitudeDelta: 0.0421,
-                }}
-                loadingBackgroundColor={colors.secondary_2}
-              >
-                <UrlTile
-                  urlTemplate={urlProvider}
-                  shouldReplaceMapContent={true}
-                  maximumZ={19}
-                  flipY={false}
-                  zIndex={1}
-                />
-                <Marker
-                  coordinate={{
-                    latitude: location.coords.latitude,
-                    longitude: location.coords.longitude,
-                  }}
-                  pinColor={colors.primary_1}
-                />
-              </MapView>
-            </View>
-            <View style={styles.padding} />
-          </View>
-          <DropDownPicker
-            zIndex={1000}
-            max={16}
-            open={subjectsOpen}
-            value={selected_subject}
-            items={subjects}
-            setOpen={(open) => {
-              setSubjectsOpen(open);
-            }}
-            setValue={setSelectedSubject}
-            placeholderStyle={{
-              ...styles.text_white_tiny_bold,
-              ...{ textAlign: "left" },
-            }}
-            placeholder="Select subject"
-            multipleText="Select subject"
-            style={styles.input}
-            textStyle={{
-              ...styles.text_white_tiny_bold,
-              ...{ textAlign: "left" },
-            }}
-            modalContentContainerStyle={{
-              backgroundColor: colors.primary_2,
-              borderWidth: 0,
-              zIndex: 1000,
-            }}
-            autoScroll
-            dropDownDirection="BOTTOM"
-            listMode="MODAL"
-          />
-          <View style={styles.padding} />
-          <View style={styles.flex_row}>
-            <Pressable onPress={() => navigation.navigate("Home")}>
-              <CaretLeftIcon size={32} />
-            </Pressable>
-            <Button
-              onPress={() => {
-                console.log({
-                  subject: selected_subject,
-                  location: {
-                    latitude: location.coords.latitude,
-                    longitude: location.coords.longitude,
-                  },
-                });
-                mutation.mutate({
-                  active: true,
-                  subject: selected_subject,
-                  location: {
-                    latitude: location.coords.latitude,
-                    longitude: location.coords.longitude,
-                  },
-                });
-              }}
-            >
-              <Text style={styles.text_white_small}>Start Studying</Text>
-            </Button>
-          </View>
-        </AnimatedContainerNoScroll>
-      </View>
-    );
-  }
-  return <View />;
-}

src/routes/SubjectsPage/SubjectsPage.tsx

@@ -1,261 +0,0 @@
-import * as React from "react";
-import styles from "../../styles";
-import { View, Text, ActivityIndicator } from "react-native";
-import { useState } from "react";
-import {
-  UserInfoReturnType,
-  SubjectsReturnType,
-  SubjectType,
-  OptionType,
-  StudentStatusType,
-  PatchUserInfoType,
-  StudentStatusPatchType,
-} from "../../interfaces/Interfaces";
-import Button from "../../components/Button/Button";
-import { Image } from "react-native";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import {
-  GetSubjects,
-  PatchUserInfo,
-  GetUserInfo,
-  PatchStudentStatus,
-} from "../../components/Api/Api";
-import { colors } from "../../styles";
-import DropDownPicker from "react-native-dropdown-picker";
-import AnimatedContainerNoScroll from "../../components/AnimatedContainer/AnimatedContainerNoScroll";
-import { useSelector } from "react-redux";
-import { RootState } from "../../features/redux/Store/Store";
-import { useToast } from "react-native-toast-notifications";
-import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
-import Loading from "../Loading/Loading";
-import LoadingFeedback from "../../components/LoadingFeedback/LoadingFeedback";
-
-export default function SubjectsPage() {
-  const logged_in_user = useSelector((state: RootState) => state.user.user);
-  const queryClient = useQueryClient();
-  const toast = useToast();
-
-  // Student Status
-  const studentstatus_mutation = useMutation({
-    mutationFn: async (info: StudentStatusPatchType) => {
-      const data = await PatchStudentStatus(info);
-      if (data[0] != true) {
-        return Promise.reject(new Error());
-      }
-      return data;
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["user"] });
-      queryClient.invalidateQueries({ queryKey: ["user_status"] });
-    },
-    onError: () => {
-      toast.show("An error has occured\nChanges have not been saved", {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // User Info
-  const [user, setUser] = useState({
-    first_name: "",
-    last_name: "",
-    year_level: "",
-    yearlevel_shortname: "",
-    semester: "",
-    semester_shortname: "",
-    course: "",
-    course_shortname: "",
-    avatar: "",
-    student_id_number: "",
-    subjects: [] as string[],
-  });
-  const StudentInfo = useQuery({
-    queryKey: ["user"],
-    queryFn: async () => {
-      const data = await GetUserInfo();
-      if (data[0] == false) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
-    onSuccess: (data: UserInfoReturnType) => {
-      setUser({
-        ...user,
-        first_name: data[1].first_name,
-        last_name: data[1].last_name,
-        year_level: data[1].year_level,
-        semester: data[1].semester,
-        course: data[1].course,
-        avatar: data[1].avatar,
-        student_id_number: data[1].student_id_number,
-        subjects: data[1].subjects,
-      });
-      setSelectedSubjects(data[1].subjects);
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-  const mutation = useMutation({
-    mutationFn: async (info: PatchUserInfoType) => {
-      const data = await PatchUserInfo(info);
-      if (data[0] != true) {
-        return Promise.reject(new Error());
-      }
-      return data;
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["user"] });
-      queryClient.invalidateQueries({ queryKey: ["subjects"] });
-      setSelectedSubjects([]);
-      // Reset student status when changing user info to prevent bugs
-      studentstatus_mutation.mutate({
-        active: false,
-      });
-      toast.show("Changes applied successfully.\nStudent status reset", {
-        type: "success",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // Subjects
-
-  const [selected_subjects, setSelectedSubjects] = useState<any>([]);
-  const [subjectsOpen, setSubjectsOpen] = useState(false);
-  const [subjects, setSubjects] = useState<OptionType[]>([]);
-
-  const Subjects = useQuery({
-    enabled: StudentInfo.isFetched,
-    queryKey: ["subjects"],
-    queryFn: async () => {
-      const data = await GetSubjects();
-      if (data[0] == false) {
-        return Promise.reject(new Error(JSON.stringify(data[1])));
-      }
-      return data;
-    },
-    onSuccess: (data: SubjectsReturnType) => {
-      if (data[1]) {
-        let subjects = data[1].map((subject: SubjectType) => ({
-          label: subject.name,
-          value: subject.name,
-        }));
-
-        setSubjects(subjects);
-      }
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // Profile photo
-  function Avatar() {
-    if (user.avatar) {
-      return <Image source={{ uri: user.avatar }} style={styles.profile} />;
-    } else {
-      return (
-        <Image
-          source={require("../../img/user_profile_placeholder.png")}
-          style={{ ...styles.profile, ...{ marginRight: 48 } }}
-        />
-      );
-    }
-  }
-  if (StudentInfo.isLoading || Subjects.isLoading) {
-    return <LoadingFeedback />;
-  }
-  return (
-    <View style={styles.background}>
-      <AnimatedContainerNoScroll>
-        <View style={styles.flex_row}>
-          <Avatar />
-          <Text style={{ ...styles.text_white_small, ...{ marginLeft: 16 } }}>
-            {(logged_in_user.first_name || "Undefined") +
-              " " +
-              (logged_in_user.last_name || "User") +
-              "\n" +
-              user.student_id_number}
-          </Text>
-        </View>
-
-        <View style={styles.padding} />
-        <View style={styles.flex_row}>
-          <View style={{ flex: 1 }}>
-            <Text style={styles.text_white_small_bold}>Subjects</Text>
-          </View>
-          <View style={{ flex: 3 }}>
-            <DropDownPicker
-              zIndex={1000}
-              multiple={true}
-              max={16}
-              open={subjectsOpen}
-              value={selected_subjects}
-              items={subjects}
-              setOpen={(open) => {
-                setSubjectsOpen(open);
-              }}
-              setValue={setSelectedSubjects}
-              placeholderStyle={{
-                ...styles.text_white_tiny_bold,
-                ...{ textAlign: "left" },
-              }}
-              placeholder="Select subjects"
-              multipleText="Select subjects"
-              style={styles.input}
-              textStyle={{
-                ...styles.text_white_tiny_bold,
-                ...{ textAlign: "left" },
-              }}
-              modalContentContainerStyle={{
-                backgroundColor: colors.primary_2,
-                borderWidth: 0,
-                zIndex: 1000,
-              }}
-              autoScroll
-              dropDownDirection="BOTTOM"
-              listMode="MODAL"
-            />
-          </View>
-        </View>
-        <View style={{ zIndex: -1 }}>
-          <View style={styles.padding} />
-          <Button
-            onPress={() => {
-              mutation.mutate({
-                subjects: selected_subjects,
-              });
-            }}
-          >
-            <Text style={styles.text_white_small}>Save Changes</Text>
-          </Button>
-          <View style={styles.padding} />
-        </View>
-      </AnimatedContainerNoScroll>
-    </View>
-  );
-}

src/routes/UserInfo/UserInfo.tsx

@@ -0,0 +1,216 @@
+import * as React from "react";
+import styles from "../../styles";
+import {
+  View,
+  Text,
+  TextInput,
+  NativeSyntheticEvent,
+  TextInputChangeEventData,
+} from "react-native";
+import { colors } from "../../styles";
+import { useState, useEffect } from "react";
+import Button from "../../components/Button/Button";
+import { useNavigation } from "@react-navigation/native";
+import { RootDrawerParamList } from "../../interfaces/Interfaces";
+import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
+import { TouchableOpacity, Image } from "react-native";
+import { ScrollView } from "react-native-gesture-handler";
+import SelectDropdown from "react-native-select-dropdown";
+import DropdownIcon from "../../icons/DropdownIcon/DropdownIcon";
+import { useQuery } from "react-query";
+import { UserInfo as GetUserInfo } from "../../components/Api/Api";
+import { err } from "react-native-svg/lib/typescript/xml";
+
+export default function UserInfo() {
+  const navigation = useNavigation<RootDrawerParamList>();
+  const [isEditable, setIsEditable] = useState(false);
+  const options = ["", "", "", ""];
+  const [isActive, setIsActive] = useState(false);
+  const toggleUserActive = () => {
+    setIsActive(!isActive);
+  };
+  //const dispatch = useDispatch();
+  // const creds = useSelector((state: RootState) => state.auth.creds);
+  const [user, setUser] = useState({
+    first_name: "",
+    last_name: "",
+    year_level: "",
+    semester: "",
+    course: "",
+  });
+  const { data, isLoading, error } = useQuery("user", UserInfo, {
+    retry: 0,
+    onSuccess: (data) => console.log(data),
+  });
+  if (!isLoading && !error) {
+    return (
+      <ScrollView style={styles.background}>
+        <AnimatedContainer>
+          <Text style={{ ...styles.text_white_medium, ...{ fontSize: 32 } }}>
+            Kurt Toledo
+          </Text>
+          <View>
+            <Image
+              source={require("./image/3135715.png")}
+              style={styles.profile}
+            />
+            <TouchableOpacity onPress={toggleUserActive} style={styles.button}>
+              <Text
+                style={[
+                  styles.text,
+                  isActive ? styles.activeText : styles.inactiveText,
+                ]}
+              >
+                Student {isActive ? "Active" : "Inactive"}
+              </Text>
+            </TouchableOpacity>
+          </View>
+          <View
+            style={{
+              paddingVertical: 4,
+              marginBottom: 16,
+              marginTop: 8,
+              borderRadius: 4,
+              width: "90%",
+              backgroundColor: colors.head,
+            }}
+          />
+          <View style={styles.formGroup}>
+            <View style={{ width: 70 }}>
+              <Text style={styles.text}>First Name</Text>
+            </View>
+            <View style={{ flex: 1 }}>
+              <TextInput
+                style={[styles.input, !isEditable && styles.input]}
+                editable={isEditable}
+                onChange={(
+                  e: NativeSyntheticEvent<TextInputChangeEventData>
+                ): void => {
+                  setUser({ ...user, first_name: e.nativeEvent.text });
+                }}
+              />
+            </View>
+          </View>
+          <View style={styles.formGroup}>
+            <View style={{ width: 70 }}>
+              <Text style={styles.text}>Last Name</Text>
+            </View>
+            <View style={{ flex: 1 }}>
+              <TextInput
+                style={[styles.input, !isEditable && styles.input]}
+                editable={isEditable}
+                onChange={(
+                  e: NativeSyntheticEvent<TextInputChangeEventData>
+                ): void => {
+                  setUser({ ...user, first_name: e.nativeEvent.text });
+                }}
+              />
+            </View>
+          </View>
+          <View
+            style={{
+              paddingVertical: 4,
+              marginBottom: 16,
+              marginTop: 8,
+              borderRadius: 4,
+              width: "90%",
+              backgroundColor: colors.head,
+            }}
+          />
+          <View style={styles.formGroup}>
+            <View style={{ width: 70 }}>
+              <Text style={styles.text}>Year Level</Text>
+            </View>
+            <View style={{ flex: 1 }}>
+              <TextInput
+                style={[styles.input, !isEditable && styles.input]}
+                editable={isEditable}
+                onChange={(
+                  e: NativeSyntheticEvent<TextInputChangeEventData>
+                ): void => {
+                  setUser({ ...user, first_name: e.nativeEvent.text });
+                }}
+              />
+            </View>
+          </View>
+          <View style={styles.formGroup}>
+            <View style={{ width: 70 }}>
+              <Text style={styles.text}>Semester</Text>
+            </View>
+            <View style={{ flex: 1 }}>
+              <TextInput
+                style={[styles.input, !isEditable && styles.input]}
+                editable={isEditable}
+                onChange={(
+                  e: NativeSyntheticEvent<TextInputChangeEventData>
+                ): void => {
+                  setUser({ ...user, first_name: e.nativeEvent.text });
+                }}
+              />
+            </View>
+          </View>
+          <View style={styles.formGroup}>
+            <View style={{ width: 70 }}>
+              <Text style={styles.text}>Course</Text>
+            </View>
+            <View style={{ flex: 1 }}>
+              <TextInput
+                style={[styles.input, !isEditable && styles.input]}
+                editable={isEditable}
+                onChange={(
+                  e: NativeSyntheticEvent<TextInputChangeEventData>
+                ): void => {
+                  setUser({ ...user, first_name: e.nativeEvent.text });
+                }}
+              />
+            </View>
+          </View>
+          <View
+            style={{
+              paddingVertical: 4,
+              marginBottom: 16,
+              marginTop: 8,
+              borderRadius: 4,
+              width: "90%",
+              backgroundColor: colors.head,
+            }}
+          />
+          <View style={styles.formGroup}>
+            <View style={{ width: 80 }}>
+              <Text style={styles.text}>Subject</Text>
+            </View>
+            <View style={{ flex: 1 }}>
+              <SelectDropdown
+                onSelect={(selectedItem, index) => {
+                  console.log(selectedItem, index);
+                }}
+                renderDropdownIcon={() => <DropdownIcon size={32} />}
+                buttonTextStyle={{
+                  color: "white",
+                }}
+                dropdownStyle={{
+                  backgroundColor: "#E3963E",
+                }}
+                data={options}
+                buttonStyle={{
+                  width: "90%",
+                  marginLeft: 10,
+                  backgroundColor: "#E3963E",
+                  borderRadius: 8,
+                }}
+              />
+            </View>
+          </View>
+          <TouchableOpacity
+            style={styles.button_template}
+            onPress={() => setIsEditable(!isEditable)}
+          >
+            <Text style={styles.text_white_small}>
+              {isEditable ? "Save" : "Edit Profile"}
+            </Text>
+          </TouchableOpacity>
+        </AnimatedContainer>
+      </ScrollView>
+    );
+  }
+}

src/routes/UserInfoPage/UserInfoPage.tsx

@@ -1,489 +0,0 @@
-import * as React from "react";
-import styles from "../../styles";
-import {
-  View,
-  Text,
-  TextInput,
-  NativeSyntheticEvent,
-  TextInputChangeEventData,
-  Pressable,
-  ActivityIndicator,
-} from "react-native";
-import { useState } from "react";
-import {
-  SemesterReturnType,
-  UserInfoReturnType,
-  SemesterType,
-  YearLevelType,
-  CourseType,
-  OptionType,
-  StudentStatusType,
-  PatchUserInfoType,
-  StudentStatusPatchType,
-} from "../../interfaces/Interfaces";
-import Button from "../../components/Button/Button";
-import { Image } from "react-native";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import {
-  GetCourses,
-  GetSemesters,
-  GetYearLevels,
-  PatchStudentStatus,
-  PatchUserInfo,
-  GetUserInfo,
-} from "../../components/Api/Api";
-import { colors } from "../../styles";
-import DropDownPicker from "react-native-dropdown-picker";
-import AnimatedContainerNoScroll from "../../components/AnimatedContainer/AnimatedContainerNoScroll";
-import BouncyCheckbox from "react-native-bouncy-checkbox";
-import { useSelector } from "react-redux";
-import { RootState } from "../../features/redux/Store/Store";
-import { useDispatch } from "react-redux";
-import { setUser as setUserinState } from "../../features/redux/slices/UserSlice/UserSlice";
-import * as ImagePicker from "expo-image-picker";
-import * as FileSystem from "expo-file-system";
-import { useToast } from "react-native-toast-notifications";
-import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
-import Loading from "../Loading/Loading";
-import LoadingFeedback from "../../components/LoadingFeedback/LoadingFeedback";
-
-export default function UserInfoPage() {
-  const logged_in_user = useSelector((state: RootState) => state.user.user);
-  const dispatch = useDispatch();
-  const queryClient = useQueryClient();
-  const toast = useToast();
-
-  // Student Status
-  const studentstatus_mutation = useMutation({
-    mutationFn: async (info: StudentStatusPatchType) => {
-      const data = await PatchStudentStatus(info);
-      if (data[0] != true) {
-        return Promise.reject(new Error());
-      }
-      return data;
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["user"] });
-      queryClient.invalidateQueries({ queryKey: ["user_status"] });
-    },
-    onError: () => {
-      toast.show("An error has occured\nChanges have not been saved", {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // User Info
-  const [user, setUser] = useState({
-    first_name: "",
-    last_name: "",
-    year_level: "",
-    yearlevel_shortname: "",
-    semester: "",
-    semester_shortname: "",
-    course: "",
-    course_shortname: "",
-    avatar: "",
-    student_id_number: "",
-    irregular: false,
-  });
-  const StudentInfo = useQuery({
-    queryKey: ["user"],
-    queryFn: async () => {
-      const data = await GetUserInfo();
-      if (data[0] == false) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
-    onSuccess: (data: UserInfoReturnType) => {
-      //  console.log(data[1]);
-      setUser({
-        ...user,
-        first_name: data[1].first_name,
-        last_name: data[1].last_name,
-        year_level: data[1].year_level,
-        semester: data[1].semester,
-        course: data[1].course,
-        student_id_number: data[1].student_id_number,
-        irregular: data[1].irregular,
-        avatar: data[1].avatar,
-      });
-      setSelectedCourse(data[1].course);
-      setSelectedSemester(data[1].semester);
-      setSelectedYearLevel(data[1].year_level);
-      dispatch(setUserinState(data[1]));
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  const mutation = useMutation({
-    mutationFn: async (info: PatchUserInfoType) => {
-      const data = await PatchUserInfo(info);
-      if (data[0] == false) {
-        return Promise.reject(new Error());
-      }
-      return data;
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["user"] });
-      queryClient.invalidateQueries({ queryKey: ["subjects"] });
-      // Reset student status when changing user info to prevent bugs
-      studentstatus_mutation.mutate({
-        active: false,
-      });
-      toast.show("Changes applied successfully.\nStudent status reset", {
-        type: "success",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-      dispatch(setUserinState(user));
-    },
-    onError: () => {
-      toast.show("An error has occured\nChanges have not been saved", {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // Semester
-  const [selected_semester, setSelectedSemester] = useState("");
-  const [semesterOpen, setSemesterOpen] = useState(false);
-  const [semesters, setSemesters] = useState<OptionType[]>([]);
-  const Semesters = useQuery({
-    queryKey: ["semesters"],
-    queryFn: async () => {
-      const data = await GetSemesters();
-      if (data[0] == false) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
-    onSuccess: (data: SemesterReturnType) => {
-      let semestersData = data[1].map((semester: SemesterType) => ({
-        label: semester.name,
-        value: semester.name,
-        shortname: semester.shortname,
-      }));
-      // Update the 'semesters' state
-      setSemesters(semestersData);
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // Year Level
-  const [selected_yearlevel, setSelectedYearLevel] = useState("");
-  const [yearLevelOpen, setYearLevelOpen] = useState(false);
-  const [year_levels, setYearLevels] = useState<OptionType[]>([]);
-  const yearlevel_query = useQuery({
-    queryKey: ["year_levels"],
-    queryFn: async () => {
-      const data = await GetYearLevels();
-      if (data[0] == false) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
-    onSuccess: (data) => {
-      let year_levels = data[1].map((yearlevel: YearLevelType) => ({
-        label: yearlevel.name,
-        value: yearlevel.name,
-      }));
-      setYearLevels(year_levels);
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // Course
-  const [selected_course, setSelectedCourse] = useState("");
-  const [courseOpen, setCourseOpen] = useState(false);
-  const [courses, setCourses] = useState<OptionType[]>([]);
-  const course_query = useQuery({
-    queryKey: ["courses"],
-    queryFn: async () => {
-      const data = await GetCourses();
-      if (data[0] == false) {
-        return Promise.reject(new Error(data[1]));
-      }
-      return data;
-    },
-    onSuccess: (data) => {
-      let courses = data[1].map((course: CourseType) => ({
-        label: course.name,
-        value: course.name,
-      }));
-      setCourses(courses);
-    },
-    onError: (error: Error) => {
-      toast.show(String(error), {
-        type: "warning",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
-    },
-  });
-
-  // Profile photo
-  const pickImage = async () => {
-    // No permissions request is necessary for launching the image library
-    let result = await ImagePicker.launchImageLibraryAsync({
-      mediaTypes: ImagePicker.MediaTypeOptions.All,
-      allowsEditing: true,
-      aspect: [4, 3],
-      quality: 1,
-    });
-    if (!result.canceled) {
-      const encodedImage = await FileSystem.readAsStringAsync(
-        result.assets[0].uri,
-        { encoding: "base64" }
-      );
-      mutation.mutate({
-        avatar: encodedImage,
-      });
-    }
-  };
-  function Avatar() {
-    if (user.avatar) {
-      return (
-        <Pressable onPress={pickImage}>
-          <Image source={{ uri: user.avatar }} style={styles.profile} />
-        </Pressable>
-      );
-    } else {
-      return (
-        <Pressable onPress={pickImage}>
-          <Image
-            source={require("../../img/user_profile_placeholder.png")}
-            style={{ ...styles.profile, ...{ marginRight: 48 } }}
-          />
-        </Pressable>
-      );
-    }
-  }
-  if (
-    StudentInfo.isLoading ||
-    Semesters.isLoading ||
-    yearlevel_query.isLoading ||
-    course_query.isLoading
-  ) {
-    return <LoadingFeedback />;
-  }
-  return (
-    <View style={styles.background}>
-      <AnimatedContainerNoScroll>
-        <View style={styles.flex_row}>
-          <Avatar />
-          <Text style={{ ...styles.text_white_small, ...{ marginLeft: 16 } }}>
-            {(logged_in_user.first_name || "Undefined") +
-              " " +
-              (logged_in_user.last_name || "User") +
-              "\n" +
-              user.student_id_number}
-          </Text>
-        </View>
-
-        <View style={styles.padding} />
-        <View style={styles.flex_row}>
-          <View style={{ flex: 1 }}>
-            <Text style={styles.text_white_small_bold}>First Name</Text>
-          </View>
-          <View style={{ flex: 3 }}>
-            <TextInput
-              style={styles.input}
-              onChange={(
-                e: NativeSyntheticEvent<TextInputChangeEventData>
-              ): void => {
-                setUser({ ...user, first_name: e.nativeEvent.text });
-              }}
-              value={user.first_name}
-            />
-          </View>
-        </View>
-        <View style={styles.flex_row}>
-          <View style={{ flex: 1 }}>
-            <Text style={styles.text_white_small_bold}>Last Name</Text>
-          </View>
-          <View style={{ flex: 3 }}>
-            <TextInput
-              style={styles.input}
-              onChange={(
-                e: NativeSyntheticEvent<TextInputChangeEventData>
-              ): void => {
-                setUser({ ...user, last_name: e.nativeEvent.text });
-              }}
-              value={user.last_name}
-            />
-          </View>
-        </View>
-        <View style={styles.flex_row}>
-          <View style={{ flex: 1 }}>
-            <Text style={styles.text_white_small_bold}>Year Level</Text>
-          </View>
-          <View style={{ flex: 3 }}>
-            <DropDownPicker
-              zIndex={1000}
-              open={yearLevelOpen}
-              value={selected_yearlevel}
-              items={year_levels}
-              setOpen={(open) => {
-                setYearLevelOpen(open);
-                setSemesterOpen(false);
-                setCourseOpen(false);
-              }}
-              setValue={setSelectedYearLevel}
-              placeholder={user.year_level}
-              placeholderStyle={{
-                ...styles.text_white_tiny_bold,
-                ...{ textAlign: "left" },
-              }}
-              style={styles.input}
-              textStyle={{
-                ...styles.text_white_tiny_bold,
-                ...{ textAlign: "left" },
-              }}
-              dropDownContainerStyle={{
-                backgroundColor: colors.primary_2,
-                zIndex: 1000,
-                borderWidth: 0,
-              }}
-              dropDownDirection="TOP"
-            />
-          </View>
-        </View>
-        <View style={styles.flex_row}>
-          <View style={{ flex: 1 }}>
-            <Text style={styles.text_white_small_bold}>Semester</Text>
-          </View>
-          <View style={{ flex: 3 }}>
-            <DropDownPicker
-              zIndex={2000}
-              open={semesterOpen}
-              value={selected_semester}
-              items={semesters}
-              setOpen={(open) => {
-                setYearLevelOpen(false);
-                setSemesterOpen(open);
-                setCourseOpen(false);
-              }}
-              setValue={setSelectedSemester}
-              placeholder={user.semester}
-              placeholderStyle={{
-                ...styles.text_white_tiny_bold,
-                ...{ textAlign: "left" },
-              }}
-              style={styles.input}
-              textStyle={{
-                ...styles.text_white_tiny_bold,
-                ...{ textAlign: "left" },
-              }}
-              dropDownContainerStyle={{
-                backgroundColor: colors.primary_2,
-                zIndex: 2000,
-                borderWidth: 0,
-              }}
-              dropDownDirection="TOP"
-            />
-          </View>
-        </View>
-        <View style={styles.flex_row}>
-          <View style={{ flex: 1 }}>
-            <Text style={styles.text_white_small_bold}>Course</Text>
-          </View>
-          <View style={{ flex: 3 }}>
-            <DropDownPicker
-              zIndex={3000}
-              open={courseOpen}
-              value={selected_course}
-              items={courses}
-              setOpen={(open) => {
-                setYearLevelOpen(false);
-                setSemesterOpen(false);
-                setCourseOpen(open);
-              }}
-              setValue={setSelectedCourse}
-              placeholder={user.course}
-              placeholderStyle={{
-                ...styles.text_white_tiny_bold,
-                ...{ textAlign: "left" },
-              }}
-              style={styles.input}
-              textStyle={{
-                ...styles.text_white_tiny_bold,
-                ...{ textAlign: "left" },
-              }}
-              dropDownContainerStyle={{
-                backgroundColor: colors.primary_2,
-                zIndex: 3000,
-                borderWidth: 0,
-              }}
-              dropDownDirection="TOP"
-            />
-          </View>
-        </View>
-        <View style={styles.padding} />
-        <View style={{ zIndex: -1 }}>
-          <View style={{ ...styles.flex_row, ...{ alignSelf: "center" } }}>
-            <BouncyCheckbox
-              onPress={() => {
-                mutation.mutate({
-                  irregular: !user.irregular,
-                });
-                setUser({ ...user, irregular: !user.irregular });
-              }}
-              isChecked={user.irregular}
-              disableBuiltInState
-              fillColor={colors.secondary_3}
-            />
-            <Text style={styles.text_white_small}>Irregular </Text>
-          </View>
-          <Button
-            onPress={() => {
-              setYearLevelOpen(false);
-              setSemesterOpen(false);
-              setCourseOpen(false);
-              mutation.mutate({
-                first_name: user.first_name,
-                last_name: user.last_name,
-                course: selected_course,
-                semester: selected_semester,
-                year_level: selected_yearlevel,
-              });
-            }}
-          >
-            <Text style={styles.text_white_small}>Save Changes</Text>
-          </Button>
-          <View style={styles.padding} />
-        </View>
-      </AnimatedContainerNoScroll>
-    </View>
-  );
-}

src/styles.tsx

@@ -1,40 +1,39 @@
 import { StyleSheet, Dimensions } from "react-native";
 
-export const Viewport = {
+const width = Dimensions.get("window").width;
-  width: Dimensions.get("window").width,
+const height = Dimensions.get("window").height;
-  height: Dimensions.get("window").height,
+
-};
+const containerWidth = width - width * 0.08;
+const containerHeight = height - height * 0.01;
 
 export const colors = {
-  primary_1: "#1C2C3F",
+  orange_1: "#FFDEAD",
-  primary_2: "#445467",
+  orange_2: "#FFE2C1",
-  primary_3: "#606F81",
+  orange_3: "#C07624",
-  primary_4: "#b4d0f3",
+  blue_1: "#E3963E",
-  secondary_1: "#1E1F3D",
+  blue_2: "#FFAC1C",
-  secondary_2: "#626297",
+  blue_3: "#FFAC1C",
-  secondary_3: "#7a7abd",
+  text_default: "white",
-  secondary_4: "#FFE9CE",
-  secondary_5: "#FFF5E9",
-  text_default: "#FFFF",
-  text_dark: "black",
   text_error: "#e32d1e",
-  text_success: "#2ecc71",
+  text_success: "green",
-  icon_color: "#FFFF",
+  icon_color: "white",
-  head: "#FFFF",
+  login_color: "#0047AB",
+  reg_color: "#0096FF",
+  head: "white",
+  blue_disabled: "#C07624",
 };
 
 export const font_sizes = {
   tiny: 12,
   small: 16,
   medium: 24,
-  medium_large: 30,
   large: 36,
   xl: 48,
 };
 
 const styles = StyleSheet.create({
   background: {
-    backgroundColor: colors.secondary_1,
+    backgroundColor: colors.orange_1,
     height: "100%",
     width: "100%",
   },
@@ -44,9 +43,8 @@ const styles = StyleSheet.create({
     justifyContent: "center",
     display: "flex",
     flexDirection: "column",
-    flexGrow: 1,
+    flex: 1,
     paddingHorizontal: 4,
-    paddingVertical: 32,
   },
   flex_row: {
     display: "flex",
@@ -77,12 +75,6 @@ const styles = StyleSheet.create({
     fontWeight: "bold",
     textAlign: "center",
   },
-  text_white_medium_large: {
-    color: colors.text_default,
-    fontSize: font_sizes.medium_large,
-    fontWeight: "bold",
-    textAlign: "center",
-  },
   text_white_large: {
     color: colors.text_default,
     fontSize: font_sizes.large,
@@ -95,54 +87,6 @@ const styles = StyleSheet.create({
     fontWeight: "bold",
     textAlign: "center",
   },
-  text_white_small_bold: {
-    color: colors.text_default,
-    fontSize: font_sizes.small,
-    fontWeight: "bold",
-    textAlign: "center",
-  },
-  text_white_tiny_bold: {
-    color: colors.text_default,
-    fontSize: font_sizes.tiny,
-    fontWeight: "bold",
-    textAlign: "center",
-  },
-  text_black_tiny: {
-    color: colors.text_dark,
-    fontSize: font_sizes.tiny,
-    fontWeight: "bold",
-    textAlign: "center",
-  },
-  text_black_small: {
-    color: colors.text_dark,
-    fontSize: font_sizes.small,
-    fontWeight: "bold",
-    textAlign: "center",
-  },
-  text_black_medium: {
-    color: colors.text_dark,
-    fontSize: font_sizes.medium,
-    fontWeight: "bold",
-    textAlign: "center",
-  },
-  text_black_medium_large: {
-    color: colors.text_dark,
-    fontSize: font_sizes.medium_large,
-    fontWeight: "bold",
-    textAlign: "center",
-  },
-  text_black_large: {
-    color: colors.text_dark,
-    fontSize: font_sizes.large,
-    fontWeight: "bold",
-    textAlign: "center",
-  },
-  text_black_xl: {
-    color: colors.text_dark,
-    fontSize: font_sizes.xl,
-    fontWeight: "bold",
-    textAlign: "center",
-  },
   button_template: {
     justifyContent: "center",
     alignSelf: "center",
@@ -154,94 +98,63 @@ const styles = StyleSheet.create({
     marginHorizontal: 8,
     padding: 8,
     borderRadius: 16,
-    width: Viewport.width * 0.4,
+    width: width * 0.4,
   },
   text_input: {
     color: colors.text_default,
-    backgroundColor: colors.primary_2,
+    backgroundColor: colors.blue_1,
-    borderColor: colors.primary_4,
-    borderWidth: 1,
     padding: 10,
     borderRadius: 8,
-    width: Viewport.width * 0.5,
+    width: width * 0.5,
   },
   dropdown_template: {
-    backgroundColor: colors.primary_2,
+    borderRadius: 16,
-    containerStyle: colors.primary_2,
-    borderRadius: 8,
     width: "70%",
+    marginVertical: 6,
   },
   map: {
-    marginVertical: 4,
+    flex: 1,
-    height: Viewport.height * 0.7,
+    height: containerHeight,
-    width: Viewport.width * 0.8,
+    width: containerWidth,
     alignSelf: "center",
   },
   profile: {
-    height: 64,
+    height: 80,
-    width: 64,
+    width: 80, 
-    alignSelf: "center",
+    alignSelf: 'center',
-    borderRadius: 150 / 2,
-    overflow: "hidden",
-    padding: 0,
-    borderColor: colors.primary_2,
-    borderWidth: 3,
-  },
-  profile_mini: {
-    height: 32,
-    width: 32,
-    alignSelf: "center",
-    borderRadius: 150 / 2,
-    overflow: "hidden",
-    padding: 0,
-    borderColor: colors.primary_2,
-    borderWidth: 3,
   }, 
   input: {
-    paddingHorizontal: 8,
+    height: 40,
-    marginVertical: 2,
+    margin: 12,
+    marginRight: 30,
     borderWidth: 1,
     color: colors.text_default,
-    backgroundColor: colors.primary_2,
+    backgroundColor: colors.blue_1,
     borderRadius: 8,
-    borderColor: colors.primary_3,
+    borderColor: '#FFAC1C',
+    padding: 8, 
   },
-  padding: {
+  formGroup: {
-    paddingVertical: 8,
+    display: "flex",
+    flexDirection: "row",
+    alignItems: "center",
   },
-  calloutContainer: {
+  text: {
-    backgroundColor: colors.secondary_1,
+    marginLeft: 5,
-    padding: 0,
-    border: 0,
-  },
-  chatbox: {
-    paddingHorizontal: 8,
-    height: 50,
-    marginVertical: 10,
-    borderWidth: 1,
     color: colors.text_default,
-    backgroundColor: colors.primary_2,
+    fontSize: font_sizes.small,
-    borderRadius: 20,
+    fontWeight: "bold", 
-    borderColor: colors.primary_3,
-    width: 256,
   }, 
-  messageScrollViewContainer: {
+  button: {
-    backgroundColor: colors.secondary_1,
-    padding: 15,
-  },
-  message_contentContainer: {
-    backgroundColor: "#00000038",
-    margin: 5,
     padding: 10,
-    borderRadius: 20,
+    backgroundColor: colors.blue_2,
+    borderRadius: 5,
   },
-  badge: {
+  activeText: {
-    height: 16,
+    color: 'green',
-    width: 16,
+  },
-    justifyContent: "center",
+  inactiveText: {
-    borderRadius: 10,
+    color: 'white',
-    marginLeft: 4,
-    marginRight: 4,
   },
 });
 export default styles;