Merge pull request #29 from Wayfinder-CS262-2020/code-touch-ups

Touched up the code in preparation for a final release

Author: Jrmuys

App.js

@@ -1,23 +1,18 @@
-import { StatusBar } from "expo-status-bar";
 import React, { useState } from "react";
 import {
   StyleSheet,
   View,
   TouchableWithoutFeedback,
   Keyboard,
-  Text,
 } from "react-native";
 import * as Font from "expo-font";
 
 import { NavigationContainer } from "@react-navigation/native";
-import { createStackNavigator } from "@react-navigation/stack";
-
-import Header from "./components/header";
-import Content from "./components/content";
 
 import Navigator from "./routes/homeStack";
 import { AppLoading } from "expo";
 
+// Load the fonts
 const getFonts = () =>
   Font.loadAsync({
     "lusitana-bold": require("./assets/fonts/Lusitana/Lusitana-Bold.ttf"),
@@ -35,23 +30,12 @@ export default function App() {
           Keyboard.dismiss();
         }}
       >
-        {/* Make a view for the background and open screens with navigator */}
-
+        {/* View for the background and open screens with navigator */}
         <View style={styles.container}>
           <NavigationContainer>
             <Navigator />
           </NavigationContainer>
         </View>
-
-        {/*
-    
-      Home
-      <View style={styles.content}>
-        Content
-        <LoginScreen />
-      </View>
-    </View>
-    */}
       </TouchableWithoutFeedback>
     );
   } else {
@@ -64,6 +48,5 @@ export default function App() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    // backgroundColor: "yellow", //"#2D2D2D",
   },
 });

routes/homeStack.js

@@ -13,6 +13,7 @@ import { Icon } from "react-native-elements";
 const Stack = createStackNavigator();
 export default function HomeStack() {
   return (
+    // Login Screen
     <Stack.Navigator>
       <Stack.Screen
         name="Login"
@@ -22,13 +23,17 @@ export default function HomeStack() {
           headerShown: false,
         }}
       />
+
+      {/* Map Screen */}
       <Stack.Screen
         name="Map"
         component={MapScreen}
         options={{
           headerShown: false,
         }}
       />
+
+      {/* Interior Screen */}
       <Stack.Screen
         name="Interior"
         component={InteriorScreen}
@@ -37,6 +42,7 @@ export default function HomeStack() {
           headerBackImage: () => (
             <Icon name="keyboard-arrow-left" size={32} color="white" />
           ),
+          // This code customizes the header to display the building/room
           headerTitle: (props) => (
             <Text
               {...props}
@@ -50,6 +56,8 @@ export default function HomeStack() {
           ),
         })}
       />
+
+      {/* Sign up screen */}
       <Stack.Screen
         name="Sign Up"
         component={SignUpScreen}
@@ -68,6 +76,8 @@ export default function HomeStack() {
           ),
         })}
       />
+
+      {/* Info Screen */}
       <Stack.Screen
         name="Info"
         component={InfoScreen}

screens/infoScreen.js

@@ -1,7 +1,6 @@
 import React from "react";
 import { StyleSheet, Text, View, Image, ScrollView } from "react-native";
 
-//eslint ignore
 <link rel="stylesheet" href="https://use.typekit.net/spw7ajb.css"></link>;
 
 export default function InfoScreen({ navigation }) {

screens/interiorScreen.js

@@ -15,9 +15,15 @@ import { useRoute } from "@react-navigation/native";
 const assets = require("../assets/assets.js");
 
 export default function interiorScreen(navigation, route) {
+  const debug = false;
+
   // Route fix
   route = useRoute();
+
+  // Grabe the building code from the provided pamrameters
   const buildingCode = route.params.code;
+
+  // Set the initial floor to the provided floor number if it exists, otherwise set it to 1
   const [currentFloor, setCurrentFloor] = useState(
     String(buildingCode) +
       (route.params.floor !== undefined ? String(route.params.floor) : "1")
@@ -48,12 +54,19 @@ export default function interiorScreen(navigation, route) {
       setCurrentFloor(newFloor);
     }
   };
-  useEffect(() => {
-    console.log(currentFloor.substring(2, 3));
-    console.log(route.params.floor);
-    console.log(route.params.floor <= parseInt(currentFloor.substring(2, 3)));
-  });
-  console.log(route.params.xCoord - 64, route.params.yCoord - 32);
+
+  debug &&
+    useEffect(() => {
+      debug && console.log(currentFloor.substring(2, 3));
+      debug && console.log(route.params.floor);
+      debug &&
+        console.log(
+          route.params.floor <= parseInt(currentFloor.substring(2, 3))
+        );
+    });
+
+  debug && console.log(route.params.xCoord - 64, route.params.yCoord - 32);
+
   return (
     // Main interior screen
     <View style={styles.main}>
@@ -93,7 +106,6 @@ export default function interiorScreen(navigation, route) {
         </View>
 
         {/* Up button */}
-        {/* <View style={styles.button, route.params.floor <= parseInt(currentFloor.substring(2, 3)) ? styles.dark : styles.light}> */}
         <View style={styles.button}>
           <TouchableOpacity onPress={() => goUp()}>
             <Icon
@@ -140,7 +152,6 @@ const styles = StyleSheet.create({
   buttonContainer: {
     marginLeft: Dimensions.get("window").width * 0.8,
     marginTop: Dimensions.get("window").height * 0.65,
-    // justifyContent: "space-around",
     position: "absolute",
   },
   button: {
@@ -164,7 +175,6 @@ const styles = StyleSheet.create({
     marginBottom: 10,
   },
   chip: {
-    // justify: "center",
     color: "white",
     padding: 14,
     paddingLeft: 20,

screens/loginScreen.js

@@ -15,10 +15,11 @@ import {
 } from "react-native";
 import { Icon } from "react-native-elements";
 
-//eslint ignore
 <link rel="stylesheet" href="https://use.typekit.net/spw7ajb.css"></link>;
 
 export default function LoginScreen({ navigation }) {
+  const debug = false;
+
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
 
@@ -41,17 +42,22 @@ export default function LoginScreen({ navigation }) {
           password: password,
         }),
       };
+
+      // Fetch the login information from the service
       await fetch(
         "https://wayfinder-service.herokuapp.com/auth/login/",
         requestOptions
       )
         .then((request) => request.json())
+
+        // Log user in if they have a valid access token
         .then((data) => {
-          console.log(data);
+          debug && console.log(data);
           if (data.accessToken !== undefined) {
             navigation.navigate("Map");
           }
         })
+        // User does not have a valid access token
         .catch((err) =>
           Alert.alert(
             "Error",
@@ -60,6 +66,7 @@ export default function LoginScreen({ navigation }) {
           )
         );
     } else {
+      // User did not input a valid username/password
       setUsername(username.toLowerCase());
       Alert.alert(
         "Error",