everythin is updated part 2

client/.gitignore

@@ -10,4 +10,4 @@ npm-debug.*
 web-build/
 
 # macOS
-.DS_Store
+.DS_Store

client/App.js

@@ -1,113 +1,152 @@
+// import { StatusBar } from 'expo-status-bar';
+// import React, {useState} from 'react';
+// import { StyleSheet, Text, View } from 'react-native';
+// import * as Google from "expo-google-app-auth";
+// import {SocialIcon, socialIcon} from 'react-native-elements'
+// import {createDrawerNavigator} from '@react-navigation/drawer'
+// import { NavigationContainer } from '@react-navigation/native';
+// import * as SecureStore from 'expo-secure-store';
+
+// import HomeScreen from './Screens/HomeScreen'
+// import NotificationsScreen from './Screens/NotificationScreen'
+// import SettingScreen from './Screens/SettingScreen'
+// import AddTakenCourse from './Screens/AddTakenCourse'
+// import MyCurriculum from './Screens/MyCurriculum'
+// import EnrollNextSemester from './Screens/EnrollNextSemester'
+
+
+// const Drawer = createDrawerNavigator()
+
+// const IOS_CLIENT_ID =
+//   "116415331974-tf6sehooctplmmn7j0gt831mdf1oqipl.apps.googleusercontent.com";
+
+// export default function App() {
+//   const [hasToken, setHasToken] = useState(false)
+  
+//   const signInWithGoogle = async ()=>{
+//     try {
+//       const result = await Google.logInAsync({
+//         iosClientId: IOS_CLIENT_ID,
+//         scopes: ["profile", "email"]
+//       })
+
+//       if (result.type == "success"){
+//         console.log(result.accessToken)
+
+//         try {
+//           // login user in backend
+//           let response = await fetch('http://5ce95b6ddcbd.ngrok.io/rest-auth/google/', {
+//             method: 'POST',
+//             headers: {
+//               'content-type': 'application/json'
+//             }, 
+//             body: JSON.stringify({
+//               access_token: `${result.accessToken}`
+//             })
+//           })
+
+//           // storing our token
+//           let responseJson = await response.json()
+//           if (responseJson){
+//             if (responseJson.key){
+//               await SecureStore.setItemAsync('token', responseJson.key)
+//             }
+//           }
+
+//           const token = await SecureStore.getItemAsync('token')
+
+//           // storing our id
+//           let id = await fetch('http://5ce95b6ddcbd.ngrok.io/api/get_user_id', {
+//             method: 'GET',
+//             headers: {
+//               'content-type': 'application/json',
+//               Authorization: `Token ${token}`
+//             }
+//           })
+//           let idJson = await id.json()
+//           if (idJson){
+//             if(idJson.user_id){
+//               idJson = idJson.user_id
+//               let id = idJson.toString()
+//               await SecureStore.setItemAsync('id', id)
+//             }
+//           }
+
+//         } catch(error){
+//           console.log(error)
+//         }
+
+//         setHasToken(true) // update states and redirect
+//       }
+
+//       else {
+//         console.log("no")
+//       }
+//     } catch(error){
+//       console.log(error)
+//     }
+//   }
+//   if (!hasToken){
+//     return (
+//       <View style={styles.container}>
+//         <SocialIcon title="Login With Google" button={true} type={"google"} onPress={signInWithGoogle}/>
+//       </View>
+//     );
+//   }
+
+//   return (
+//     <NavigationContainer>
+//         <Drawer.Navigator initialRouteName="Home">
+//           <Drawer.Screen name="Home" component={HomeScreen}/>
+//           <Drawer.Screen name="Notifications" component={NotificationsScreen} />
+//           <Drawer.Screen name="Settings" component={SettingScreen} />
+//           <Drawer.Screen name="Add Taken Courses" component={AddTakenCourse} />
+//           <Drawer.Screen name="My Curriculum" component={MyCurriculum} />
+//           <Drawer.Screen name="Enroll Next Semester" component={EnrollNextSemester} />
+
+//         </Drawer.Navigator>
+//     </NavigationContainer>
+//   )
+  
+// }
+
+// const styles = StyleSheet.create({
+//   container: {
+//     flex: 1,
+//     backgroundColor: '#fff',
+//     alignItems: 'center',
+//     justifyContent: 'center',
+//   },
+// });
 import { StatusBar } from 'expo-status-bar';
 import React, {useState} from 'react';
-import { StyleSheet, Text, View, Platform } from 'react-native';
+import { StyleSheet, Text, View } from 'react-native';
 import * as Google from "expo-google-app-auth";
 import {SocialIcon, socialIcon} from 'react-native-elements'
 import {createDrawerNavigator} from '@react-navigation/drawer'
 import { NavigationContainer } from '@react-navigation/native';
+import { createStackNavigator } from '@react-navigation/stack';
 import * as SecureStore from 'expo-secure-store';
 
-import HomeScreen from './Screens/HomeScreen'
-import NotificationsScreen from './Screens/NotificationScreen'
-import SettingScreen from './Screens/SettingScreen'
-import AddTakenCourse from './Screens/AddTakenCourse'
-import MyCurriculum from './Screens/MyCurriculum'
+import Login from './Screens/Login'
+import Logout from './Screens/Logout'
+import HomeScreen from './Screens/HomeScreen';
 
-const Drawer = createDrawerNavigator()
 
-console.log(Platform.OS)
 
-const IOS_CLIENT_ID =
-  "116415331974-tf6sehooctplmmn7j0gt831mdf1oqipl.apps.googleusercontent.com";
 
-const ANDROID_CLIENT_ID = 
-  "116415331974-72n6g689k4me386dod763gi31vpuh71a.apps.googleusercontent.com";
-  // 116415331974-72n6g689k4me386dod763gi31vpuh71a.apps.googleusercontent.com
 export default function App() {
-  const [hasToken, setHasToken] = useState(false)
-  
-  const signInWithGoogle = async ()=>{
-    try {
-      const result = await Google.logInAsync({
-        iosClientId: IOS_CLIENT_ID,
-        androidClientId: ANDROID_CLIENT_ID,
-        scopes: ["profile", "email"]
-      })
-
-      if (result.type == "success"){
-        console.log(result.accessToken)
-
-        try {
-          // login user in backend
-          let response = await fetch('http://8c4029a33a9a.ngrok.io/rest-auth/google/', {
-            method: 'POST',
-            headers: {
-              'content-type': 'application/json'
-            }, 
-            body: JSON.stringify({
-              access_token: `${result.accessToken}`
-            })
-          })
-
-          // storing our token
-          let responseJson = await response.json()
-          if (responseJson){
-            if (responseJson.key){
-              await SecureStore.setItemAsync('token', responseJson.key)
-            }
-          }
-
-          const token = await SecureStore.getItemAsync('token')
-
-          // storing our id
-          let id = await fetch('http://8c4029a33a9a.ngrok.io/api/get_user_id', {
-            method: 'GET',
-            headers: {
-              'content-type': 'application/json',
-              Authorization: `Token ${token}`
-            }
-          })
-          let idJson = await id.json()
-          if (idJson){
-            if(idJson.user_id){
-              idJson = idJson.user_id
-              let id = idJson.toString()
-              await SecureStore.setItemAsync('id', id)
-            }
-          }
-
-        } catch(error){
-          console.log(error)
-        }
-
-        setHasToken(true) // update states and redirect
-      }
-
-      else {
-        console.log("no")
-      }
-    } catch(error){
-      console.log(error)
-    }
-  }
-  if (!hasToken){
-    return (
-      <View style={styles.container}>
-        <SocialIcon title="Login With Google" button={true} type={"google"} onPress={signInWithGoogle}/>
-      </View>
-    );
-  }
-
+  const Stack = createStackNavigator();
   return (
-    <NavigationContainer>
-        <Drawer.Navigator initialRouteName="Home">
-          <Drawer.Screen name="Home" component={HomeScreen}/>
-          <Drawer.Screen name="Notifications" component={NotificationsScreen} />
-          <Drawer.Screen name="Settings" component={SettingScreen} />
-          <Drawer.Screen name="Add Taken Courses" component={AddTakenCourse} />
-          <Drawer.Screen name="My Curriculum" component={MyCurriculum} />
-        </Drawer.Navigator>
-    </NavigationContainer>
+   <NavigationContainer>
+      <Stack.Navigator
+        screenOptions={{headerShown: false}}
+        initialRouteName = "Login"
+    >
+        <Stack.Screen name = "Login" component={Login}/>
+        <Stack.Screen name = "Logout" component={Logout}/>
+     </Stack.Navigator>
+   </NavigationContainer>
   )
   
 }

client/Screens/AddTakenCourse.js

@@ -1,6 +1,6 @@
 import axios from "axios";
 import React, { useState } from "react";
-import { FlatList, StatusBar, StyleSheet, Text, TouchableOpacity, TextInput, View, Button, ActivityIndicator } from "react-native";
+import { FlatList, StatusBar, StyleSheet, Text, TouchableOpacity, TextInput, View, Button, ActivityIndicator, Alert } from "react-native";
 import * as SecureStore from 'expo-secure-store';
 import Modal from 'react-native-modal';
 import {Picker} from '@react-native-community/picker';
@@ -38,6 +38,7 @@ const AddTakenCourse = () => {
 
   const toggle = ()=>{
     setModalVisible(!modalVisible)
+    setSelectedId(null)
   }
 
   const addCourse = async ()=>{
@@ -51,7 +52,7 @@ const AddTakenCourse = () => {
 
       let response = await axios({
         method: 'POST',
-        url: 'http://8c4029a33a9a.ngrok.io/api/add_taken_course',
+        url: 'http://da0406585426.ngrok.io/api/add_taken_course',
         headers: {
           'content-type': 'application/json',
           Authorization: `Token ${token}`
@@ -65,7 +66,7 @@ const AddTakenCourse = () => {
         }
       })
 
-      console.log(response.data)
+      console.log(response.data.msg)
 
       setAnimating(true)
 
@@ -73,8 +74,14 @@ const AddTakenCourse = () => {
         setAnimating(false)
         setModalVisible(false)
         setSelectedId(null)
-        setData([])
+        setData([]) // courses will disappear because data would be empty
       }, 3000)
+
+      setTimeout(()=>{
+        Alert.alert(response.data.msg)
+     }, 5000)
+
+
   }
 
 
@@ -85,7 +92,7 @@ const AddTakenCourse = () => {
       const token = await SecureStore.getItemAsync('token')
       const response = await axios({
           method: 'GET',
-          url: `http://8c4029a33a9a.ngrok.io/api/find_course?code=${text}`,
+          url: `http://da0406585426.ngrok.io/api/find_course?code=${text}`,
           headers: {
             'content-type': 'application/json',
             Authorization: `Token ${token}`
@@ -172,7 +179,6 @@ const AddTakenCourse = () => {
                     onValueChange={(itemValue, itemIndex) => setSemester(itemValue) }>
                     <Picker.Item label="1" value="1" />
                     <Picker.Item label="2" value="2" />
-                    <Picker.Item label="3" value="3" />
                 </Picker>
             </View>
            <View style={{flex: 1, justifyContent: 'center'}}>

client/Screens/CurrentCourses.js

@@ -0,0 +1,260 @@
+import React, {useState, useEffect} from 'react';
+import { FlatList, StatusBar, StyleSheet, Text, TouchableOpacity, TextInput, View, Button, ActivityIndicator, Alert, ScrollView, RefreshControl } from "react-native";
+import axios from 'axios'
+import * as SecureStore from 'expo-secure-store';
+import Modal from 'react-native-modal';
+
+const Item = ({ item, onPress, style }) => (
+    <TouchableOpacity onPress={onPress} style={[styles.item, style]}>
+      <Text style={styles.title}>{`${item.code}`}</Text>
+    </TouchableOpacity>
+);
+  
+ // separates results, taken from https://stackoverflow.com/questions/60350768/how-to-make-search-bar-with-dropdown-list-in-react-native
+const renderSeparator = () => {
+    return (
+      <View
+        style={{
+          height: 1,
+          width: '100%',
+          backgroundColor: '#CED0CE',
+        }}
+      />
+    );
+};
+
+
+
+const CurrentCourses = () =>{
+    const [courses, setCourses] = useState(null)
+    const [refreshing, setRefreshing] = useState(false)
+    const [selectedId, setSelectedId] = useState(null); // course_id
+    const [animating, setAnimating] = useState('')
+    const [modalVisible, setModalVisible] = useState(false)
+    const [code, setCode] = useState(null)
+    const [days, setDays] = useState(null)
+    const [courseName, setCourseName] = useState(null)
+    const [prof, setProf] = useState(null)
+    const [rooms, setRooms] = useState(null)
+    const [section, setSection] = useState(null)
+    const [hours, setHours] = useState(null)
+    const [year, setYear] = useState(null)
+    const [semestre, setSemestre] = useState(null)
+
+    
+    const toggle = ()=>{
+        setModalVisible(!modalVisible)
+        setSelectedId(null)
+    }
+
+
+    const getMyCurrentCourses = async()=>{
+        const token = await SecureStore.getItemAsync('token')
+        let id = await SecureStore.getItemAsync('id')
+        let user_id = parseInt(id)
+
+        try {
+            let response = await axios(`http://da0406585426.ngrok.io/api/get_current_courses`, {
+                method: 'POST',
+                headers: {
+                    'content-type': 'application/json',
+                    Authorization: `Token ${token}`
+                },
+                data:{
+                    user_id: user_id
+                }
+            })
+
+            
+            if(response.data.list){
+                setCourses(response.data.list)
+            }
+            else{
+                setCourses(response.data.msg)
+            }
+             console.log(courses)
+           } catch(error){
+               console.log(error)
+           }
+    }
+
+    const deleteOneCourse = async()=>{
+        const token = await SecureStore.getItemAsync('token')
+        let id = await SecureStore.getItemAsync('id')
+        let user_id = parseInt(id)
+        console.log(semestre)
+        console.log(year)
+
+        try {
+            let response = await axios(`http://da0406585426.ngrok.io/api/delete_course`, {
+                method: 'DELETE',
+                headers: {
+                    'content-type': 'application/json',
+                    Authorization: `Token ${token}`
+                },
+                data:{
+                    user_id: user_id,
+                    course_id: selectedId,
+                    year: year,
+                    semestre: semestre
+                }
+            })
+
+            setAnimating(true)
+      
+            // after 3 seconds, the courses, the modal and the activity indicator will disappear
+            setTimeout(()=>{
+                setAnimating(false)
+                setModalVisible(false)
+                setSelectedId(null)
+            }, 3000)
+
+            setTimeout(()=>{
+                Alert.alert(response.data.msg)
+            }, 5000) 
+
+            getMyCurrentCourses() // get current courses again
+            setSection(null)
+            setDays(null)
+            setHours(null)
+            setRooms(null)
+            setProf(null)
+            
+           
+           } catch(error){
+               console.log(error)
+        }
+
+    }
+
+    const onRefresh = React.useCallback(async ()=>{
+        setRefreshing(true)
+        getMyCurrentCourses()
+        setRefreshing(false)
+
+    }, [refreshing])
+
+
+
+
+    useEffect(()=>{
+        console.log('dimelo')
+        getMyCurrentCourses()
+    },[])
+
+    const renderItem = ({ item }) => {
+        const backgroundColor = item.id === selectedId ? "#e60505" : "#fafbfc";
+        return (
+          <Item
+            item={item}
+            onPress={() => {
+              setSelectedId(item.id)
+              if(item.section === undefined){
+                setCourseName(item.name)
+                setCode(item.code)
+                setYear(item.year)
+                setSemestre(item.semestre)
+                setModalVisible(true)
+              }
+              else{
+                setCourseName(item.name)
+                setCode(item.code)
+                setYear(item.year)
+                setSemestre(item.semestre)
+                setSection(item.section)
+                setDays(item.dias)
+                setHours(item.horarios)
+                setRooms(item.salones)
+                setProf(item.prof)
+                setModalVisible(true)
+              }
+            }}
+            style={{ backgroundColor }}
+          />
+        );
+      };
+
+    // if student does not have courses currently, return this
+    if(courses === null || courses === 'No tienes cursos'){
+        return (
+          <ScrollView
+          refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh}/>}
+          >
+              <Text>No tienes cursos</Text>
+          </ScrollView>    
+        )
+    }
+    return (
+        <View style={styles.container}>
+           <FlatList
+                    data={courses}
+                    renderItem={renderItem}
+                    keyExtractor={(item) => item.id.toString()}
+                    extraData={selectedId}
+                    ItemSeparatorComponent={renderSeparator}
+                    refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh}/>}
+            />
+            <Modal isVisible={modalVisible} 
+            >
+            <View style={styles.modalItem}>
+                <Text></Text>
+                <Text style={styles.course_info}>Name: {courseName}</Text>
+                <Text style={styles.course_info}>Code: {code}</Text>
+                <Text style={styles.course_info}>{section === null ? '' : 'Section '+ section} </Text>
+                <Text style={styles.course_info}>{prof === null ? '' : 'Prof:' + prof} </Text>
+                <Text style={styles.course_info}>{days === null ? '' : 'Days: ' + days} </Text>
+                <Text style={styles.course_info}>{hours === null ? '' : 'Hours: '+ hours} </Text>
+                <Text style={styles.course_info}>{rooms === null ? '' : 'Rooms: ' + rooms} </Text>
+                <ActivityIndicator size="small" color="0000ff" animating={animating}/>
+                <Button title="Delete Course" onPress={deleteOneCourse}/>
+                <Button title="Close" onPress={toggle}/>
+            </View>
+        </Modal>
+            
+
+        </View>
+    );
+}
+
+export default CurrentCourses
+
+const styles = StyleSheet.create({
+    container: {
+      flex: 1,
+      marginTop: StatusBar.currentHeight || 0,
+    },
+    item: {
+      padding: 10,
+      marginVertical: 8,
+      marginHorizontal: 16,
+    },
+    title: {
+      fontSize: 15,
+    },
+    searchBar: {
+      height: 40, 
+      borderColor: '#000', 
+      borderWidth: 1 
+    },
+    modalItem: {
+      // width: '30%', // is 30% of container width
+      margin: 60, // 300
+      backgroundColor: 'white',
+      borderRadius:20,
+      height: 270
+    },
+    course_info: {
+        fontWeight: 'bold',
+        fontSize: 13
+    }
+    
+  });
+
+// const styles = StyleSheet.create({
+//     container: { flex: 1, padding: 16, paddingTop: 30, backgroundColor: '#fff' },
+//     head: {  height: 40,  backgroundColor: '#e82020'  },
+//     wrapper: { flexDirection: 'row' },
+//     title: { flex: 1, backgroundColor: '#e82020' },
+//     row: {  height: 28  },
+//     text: { textAlign: 'center', fontSize:10 },
+//   });

client/Screens/EditGrades.js

@@ -0,0 +1,268 @@
+import React, {useState, useEffect} from 'react';
+import { FlatList, StatusBar, StyleSheet, Text, TouchableOpacity, TextInput, View, Button, ActivityIndicator, Alert, ScrollView, RefreshControl } from "react-native";
+import axios from 'axios'
+import * as SecureStore from 'expo-secure-store';
+import Modal from 'react-native-modal';
+import {Picker} from '@react-native-community/picker';
+
+const Item = ({ item, onPress, style }) => (
+    <TouchableOpacity onPress={onPress} style={[styles.item, style]}>
+      <Text style={styles.title}>{`${item.code}: ${item.grade}`}</Text>
+    </TouchableOpacity>
+);
+  
+ // separates results, taken from https://stackoverflow.com/questions/60350768/how-to-make-search-bar-with-dropdown-list-in-react-native
+const renderSeparator = () => {
+    return (
+      <View
+        style={{
+          height: 1,
+          width: '100%',
+          backgroundColor: '#CED0CE',
+        }}
+      />
+    );
+};
+
+
+
+const CurrentCourses = () =>{
+    const [courses, setCourses] = useState(null)
+    const [refreshing, setRefreshing] = useState(false)
+    const [selectedId, setSelectedId] = useState(null); // course_id
+    const [animating, setAnimating] = useState('')
+    const [modalVisible, setModalVisible] = useState(false)
+    const [year, setYear] = useState(null)
+    const [semestre, setSemestre] = useState(null)
+    const [grade, setGrade] = useState('A')
+
+    
+    const toggle = ()=>{
+        setModalVisible(!modalVisible)
+        setSelectedId(null)
+    }
+
+
+    const getAllMyCourses = async()=>{
+        const token = await SecureStore.getItemAsync('token')
+        let id = await SecureStore.getItemAsync('id')
+        let user_id = parseInt(id)
+        console.log(user_id)
+
+        try {
+            let response = await axios(`http://da0406585426.ngrok.io/api/get_all_courses_user_has_taken?user_id=${user_id}`, {
+                method: 'GET',
+                headers: {
+                    'content-type': 'application/json',
+                    Authorization: `Token ${token}`
+                }
+            })
+
+            // console.log(response.data.list)
+            setCourses(response.data.list)
+
+           } catch(error){
+               console.log(error)
+           }
+    }
+
+    const deleteOneCourse = async()=>{
+        const token = await SecureStore.getItemAsync('token')
+        let id = await SecureStore.getItemAsync('id')
+        let user_id = parseInt(id)
+
+        try {
+            let response = await axios(`http://da0406585426.ngrok.io/api/delete_course`, {
+                method: 'DELETE',
+                headers: {
+                    'content-type': 'application/json',
+                    Authorization: `Token ${token}`
+                },
+                data:{
+                    user_id: user_id,
+                    course_id: selectedId,
+                    year: year,
+                    semestre: semestre
+                }
+            })
+
+            setAnimating(true)
+      
+            // after 3 seconds, the courses, the modal and the activity indicator will disappear
+            setTimeout(()=>{
+                setAnimating(false)
+                setModalVisible(false)
+                setSelectedId(null)
+            }, 3000)
+
+            setTimeout(()=>{
+                Alert.alert(response.data.msg)
+            }, 5000) 
+
+            getAllMyCourses() // get current courses again
+            
+            
+           
+           } catch(error){
+               console.log(error)
+        }
+
+    }
+
+    const updateGrade = async()=>{
+        const token = await SecureStore.getItemAsync('token')
+        let id = await SecureStore.getItemAsync('id')
+        let user_id = parseInt(id)
+        console.log(semestre)
+        console.log(year)
+
+        try {
+            let response = await axios(`http://da0406585426.ngrok.io/api/update_grade_and_gpa`, {
+                method: 'PATCH',
+                headers: {
+                    'content-type': 'application/json',
+                    Authorization: `Token ${token}`
+                },
+                data:{
+                    user_id: user_id,
+                    course_id: selectedId,
+                    year: year,
+                    semestre: semestre,
+                    grade: grade
+                }
+            })
+
+            setAnimating(true)
+      
+            // after 3 seconds, the courses, the modal and the activity indicator will disappear
+            setTimeout(()=>{
+                setAnimating(false)
+                setModalVisible(false)
+                setSelectedId(null)
+            }, 3000)
+
+            setTimeout(()=>{
+                Alert.alert(response.data.msg)
+            }, 5000) 
+
+            getAllMyCourses() // get current courses again
+            
+            
+           
+           } catch(error){
+               console.log(error)
+        }
+
+    }
+
+    const onRefresh = React.useCallback(async ()=>{
+        setRefreshing(true)
+        getAllMyCourses()
+        setRefreshing(false)
+
+    }, [refreshing])
+
+
+
+
+    useEffect(()=>{
+        getAllMyCourses()
+    },[])
+
+    const renderItem = ({ item }) => {
+        const backgroundColor = item.course_id === selectedId ? "#e60505" : "#fafbfc";
+        return (
+          <Item
+            item={item}
+            onPress={() => {
+              setModalVisible(true)
+              setSelectedId(item.course_id)
+              setYear(item.year)
+              setSemestre(item.semestre)
+              setGrade(item.grade)
+            }}
+            style={{ backgroundColor }}
+          />
+        );
+      };
+
+    // if student does not have courses currently, return this
+    if(courses === null || courses.length === 0){
+        return (
+            <ScrollView
+            refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh}/>}
+            >
+                <Text>No tienes cursos</Text>
+            </ScrollView>    
+        )
+    }
+    // console.log(grade)
+    return (
+        <View style={styles.container}>
+           <FlatList
+                    data={courses}
+                    renderItem={renderItem}
+                    keyExtractor={(item) => item.course_id.toString()}
+                    extraData={selectedId}
+                    ItemSeparatorComponent={renderSeparator}
+                    refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh}/>}
+            />
+            <Modal isVisible={modalVisible} 
+            >
+            <View style={styles.modalItem}>
+                <Button title= "Update grade" onPress={updateGrade} />
+                <Picker
+                    selectedValue={grade}
+                    style={{ width: 50}}
+                    onValueChange={(itemValue, itemIndex) => setGrade(itemValue) }>
+                    <Picker.Item label="A" value="A" />
+                    <Picker.Item label="B" value="B" />
+                    <Picker.Item label="C" value="C" />
+                    <Picker.Item label="D" value="D" />
+                    <Picker.Item label="F" value="F" />
+                </Picker>
+                <ActivityIndicator size="small" color="0000ff" animating={animating}/>
+                <Button title="Delete Course" onPress={deleteOneCourse}/>
+                <Button title="Close" onPress={toggle}/>
+            </View>
+        </Modal>
+            
+
+        </View>
+    );
+}
+
+export default CurrentCourses
+
+const styles = StyleSheet.create({
+    container: {
+      flex: 1,
+      marginTop: StatusBar.currentHeight || 0,
+    },
+    item: {
+      padding: 10,
+      marginVertical: 8,
+      marginHorizontal: 16,
+    },
+    title: {
+      fontSize: 15,
+    },
+    searchBar: {
+      height: 40, 
+      borderColor: '#000', 
+      borderWidth: 1 
+    },
+    modalItem: {
+      // width: '30%', // is 30% of container width
+      margin: 60, // 300
+      backgroundColor: 'white',
+      borderRadius:20,
+      height: 340
+    },
+    course_info: {
+        fontWeight: 'bold',
+        fontSize: 13
+    }
+    
+  });
+

client/Screens/EnrollNextSemester.js

@@ -0,0 +1,205 @@
+import axios from "axios";
+import React, { useState } from "react";
+import { FlatList, StatusBar, StyleSheet, Text, TouchableOpacity, TextInput, View, Button, ActivityIndicator, Alert } from "react-native";
+import * as SecureStore from 'expo-secure-store';
+import Modal from 'react-native-modal';
+
+
+const Item = ({ item, onPress, style }) => (
+  <TouchableOpacity onPress={onPress} style={[styles.item, style]}>
+    <Text style={styles.title}>{`${item.code}-${item.section}`}</Text>
+  </TouchableOpacity>
+);
+
+// separates results, taken from https://stackoverflow.com/questions/60350768/how-to-make-search-bar-with-dropdown-list-in-react-native
+const renderSeparator = () => {
+    return (
+      <View
+        style={{
+          height: 1,
+          width: '100%',
+          backgroundColor: '#CED0CE',
+        }}
+      />
+    );
+};
+
+
+const EnrollNextSemester = () => {
+  const [text, setText] = useState('')
+  const [selectedId, setSelectedId] = useState(null);
+  const [data, setData] = useState([])
+  const [modalVisible, setModalVisible] = useState(false)
+  const [animating, setAnimating] = useState('')
+  const [isSummer, setIsSummer] = useState('false')
+  const [code, setCode] = useState('')
+  const [creditos, setCreditos] = useState('')
+  const [days, setDays] = useState('')
+  const [courseName, setCourseName] = useState('')
+  const [prof, setProf] = useState('')
+  const [rooms, setRooms] = useState('')
+  const [section, setSection] = useState('')
+  const [hours, setHours] = useState('')
+
+  const toggle = ()=>{
+    setModalVisible(!modalVisible)
+    setSelectedId(null)
+  }
+
+  // add course (enroll) to your next semester
+  const enrollCourse = async ()=>{
+      const token = await SecureStore.getItemAsync('token')
+      let id = await SecureStore.getItemAsync('id')
+      let user_id = parseInt(id)
+
+
+      let response = await axios({
+        method: 'POST',
+        url: 'http://da0406585426.ngrok.io/api/matricular_prox_semestre',
+        headers: {
+          'content-type': 'application/json',
+          Authorization: `Token ${token}`
+        },
+        data: {
+          user_id: user_id,
+          course_id: selectedId,
+          isSummer: isSummer
+        }
+      })
+      console.log(response.data.msg)
+    //   setMsg(response.data.msg)
+
+      setAnimating(true)
+      
+      // after 3 seconds, the courses, the modal and the activity indicator will disappear
+      setTimeout(()=>{
+        setAnimating(false)
+        setModalVisible(false)
+        setSelectedId(null)
+        setData([]) // courses will disappear because data would be empty
+      }, 3000)
+
+      setTimeout(()=>{
+          Alert.alert(response.data.msg)
+      }, 5000)
+
+  }
+
+
+
+  const searchCourses = async(text)=>{
+      let courses = []
+      setText(text)
+      const token = await SecureStore.getItemAsync('token')
+      const response = await axios({
+          method: 'GET',
+          url: `http://da0406585426.ngrok.io/api/select_course_prox_semestre?code=${text}`,
+          headers: {
+            'content-type': 'application/json',
+            Authorization: `Token ${token}`
+          }
+
+      })
+      // looping through our response data and creating a course object to append it to the courses array
+      response.data.list.map((course)=>{
+        let oneCourse = {'id': course.id, 'name': course.name,'code': course.code, 'creditos': course.creditos, 'prof': course.prof, 'section': course.section, 'hours': course.hours, 'days': course.days, 'rooms': course.rooms}
+        courses.push(oneCourse)
+      })
+
+      setData(courses)
+    //   console.log(courses)
+  }
+
+  const renderItem = ({ item }) => {
+    const backgroundColor = item.id === selectedId ? "#e60505" : "#fafbfc";
+    return (
+      <Item
+        item={item}
+        onPress={() => {
+          setSelectedId(item.id)
+          setCourseName(item.name)
+          setCode(item.code)
+          setCreditos(item.creditos)
+          setSection(item.section)
+          setDays(item.days)
+          setHours(item.hours)
+          setRooms(item.rooms)
+          setProf(item.prof)
+          setModalVisible(true)
+        }}
+        style={{ backgroundColor }}
+      />
+    );
+  };
+
+
+  return (
+    <View style={{flex: 1, padding: 10}}>
+       <TextInput
+        style={styles.searchBar}
+        placeholder="Search for a course that you want to enroll for next semester"
+        onChangeText={text=>searchCourses(text)}
+        // onChangeText={text=>setText(text)}
+      />
+      <FlatList
+        data={data}
+        renderItem={renderItem}
+        keyExtractor={(item) => item.id.toString()}
+        extraData={selectedId}
+        ItemSeparatorComponent={renderSeparator}
+      />
+      <Modal isVisible={modalVisible} 
+        >
+            <View style={styles.modalItem}>
+                <Text></Text>
+                <Text style={styles.course_info}>Name: {courseName}</Text>
+                <Text style={styles.course_info}>Code: {code}</Text>
+                <Text style={styles.course_info}>Credits: {creditos}</Text>
+                <Text style={styles.course_info}>Section: {section}</Text>
+                <Text style={styles.course_info}>Prof: {prof}</Text>
+                <Text style={styles.course_info}>Days: {days}</Text>
+                <Text style={styles.course_info}>Hours: {hours}</Text>
+                <Text style={styles.course_info}>Rooms: {rooms}</Text>
+                <ActivityIndicator size="small" color="0000ff" animating={animating}/>
+                <Button title="Enroll" onPress={enrollCourse}/>
+                <Button title="Close" onPress={toggle}/>
+            </View>
+        </Modal>
+    </View>
+  );
+};
+
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    marginTop: StatusBar.currentHeight || 0,
+  },
+  item: {
+    padding: 10,
+    marginVertical: 8,
+    marginHorizontal: 16,
+  },
+  title: {
+    fontSize: 15,
+  },
+  searchBar: {
+    height: 40, 
+    borderColor: '#000', 
+    borderWidth: 1 
+  },
+  modalItem: {
+    // width: '30%', // is 30% of container width
+    margin: 60, // 300
+    backgroundColor: 'white',
+    borderRadius:20,
+    height: 270
+  },
+  course_info: {
+      fontWeight: 'bold',
+      fontSize: 13
+  }
+  
+});
+
+export default EnrollNextSemester;

client/Screens/HomeScreen.js

@@ -2,8 +2,7 @@ import * as React from 'react';
 import { Button, View } from 'react-native';
 import * as SecureStore from 'expo-secure-store';
 import Axios from 'axios';
-
-
+import Logout from './Logout'
 
 
 function HomeScreen({ navigation }) {
@@ -13,7 +12,7 @@ function HomeScreen({ navigation }) {
     console.log(token, id)
 
     let response = await Axios({
-      url: 'http://8c4029a33a9a.ngrok.io/api/hello',
+      url: 'http://da0406585426.ngrok.io/api/hello',
       method: 'GET',
       headers: {
           Authorization: `Token ${token}`
@@ -27,6 +26,7 @@ function HomeScreen({ navigation }) {
   
     return (
       <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
+        {/* <Text>Welcome to Companion App!</Text> */}
         <Button
           onPress={() => navigation.navigate('Notifications')}
           title="Go to notifications"

client/Screens/Login.js

@@ -0,0 +1,126 @@
+import { StatusBar } from 'expo-status-bar';
+import React, {useState} from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+import * as Google from "expo-google-app-auth";
+import {SocialIcon, socialIcon} from 'react-native-elements'
+import {createDrawerNavigator} from '@react-navigation/drawer'
+import { NavigationContainer } from '@react-navigation/native';
+import * as SecureStore from 'expo-secure-store';
+
+import HomeScreen from './HomeScreen'
+import NotificationsScreen from './NotificationScreen'
+import SettingScreen from './SettingScreen'
+import AddTakenCourse from './AddTakenCourse'
+import MyCurriculum from './MyCurriculum'
+import EnrollNextSemester from './EnrollNextSemester'
+import Logout from './Logout'
+import CurrentCourses from './CurrentCourses'
+import EditGrades from './EditGrades'
+import UpdateSemYear from './UpdateSemYear'
+
+
+const Drawer = createDrawerNavigator()
+
+const IOS_CLIENT_ID =
+  "116415331974-tf6sehooctplmmn7j0gt831mdf1oqipl.apps.googleusercontent.com";
+
+export default function Login() {
+  const [hasToken, setHasToken] = useState(false)
+  
+  const signInWithGoogle = async ()=>{
+    try {
+      const result = await Google.logInAsync({
+        iosClientId: IOS_CLIENT_ID,
+        scopes: ["profile", "email"]
+      })
+
+      if (result.type == "success"){
+        console.log(result.accessToken)
+
+        try {
+          // login user in backend
+          let response = await fetch('http://da0406585426.ngrok.io/rest-auth/google/', {
+            method: 'POST',
+            headers: {
+              'content-type': 'application/json'
+            }, 
+            body: JSON.stringify({
+              access_token: `${result.accessToken}`
+            })
+          })
+
+          // storing our token
+          let responseJson = await response.json()
+          if (responseJson){
+            if (responseJson.key){
+              await SecureStore.setItemAsync('token', responseJson.key)
+            }
+          }
+
+          const token = await SecureStore.getItemAsync('token')
+
+          // storing our id
+          let id = await fetch('http://da0406585426.ngrok.io/api/get_user_id', {
+            method: 'GET',
+            headers: {
+              'content-type': 'application/json',
+              Authorization: `Token ${token}`
+            }
+          })
+          let idJson = await id.json()
+          if (idJson){
+            if(idJson.user_id){
+              idJson = idJson.user_id
+              let id = idJson.toString()
+              await SecureStore.setItemAsync('id', id)
+            }
+          }
+
+        } catch(error){
+          console.log(error)
+        }
+
+        setHasToken(true) // update states and redirect
+      }
+
+      else {
+        console.log("no")
+      }
+    } catch(error){
+      console.log(error)
+    }
+  }
+  if (!hasToken){
+    return (
+      <View style={styles.container}>
+        <SocialIcon title="Login With Google" button={true} type={"google"} onPress={signInWithGoogle}/>
+      </View>
+    );
+  }
+
+  return (
+    <Drawer.Navigator initialRouteName="Home">
+      <Drawer.Screen name="Home" component={HomeScreen}/>
+      <Drawer.Screen name="Notifications" component={NotificationsScreen} />
+      {/* <Drawer.Screen name="Settings" component={SettingScreen} /> */}
+      <Drawer.Screen name="Add Taken Courses" component={AddTakenCourse} />
+      <Drawer.Screen name="My Curriculum" component={MyCurriculum} />
+      <Drawer.Screen name="Enroll Next Semester" component={EnrollNextSemester} />
+      <Drawer.Screen name="Update Grades" component={EditGrades} />
+      <Drawer.Screen name="Current Courses" component={CurrentCourses} />
+      <Drawer.Screen name="Set your semester and year" component={UpdateSemYear} />
+      <Drawer.Screen name="Logout" component={Logout} />
+
+   </Drawer.Navigator>
+  )
+  
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+});

client/Screens/Logout.js

@@ -0,0 +1,21 @@
+import * as React from 'react';
+import { Button, View } from 'react-native';
+import * as SecureStore from 'expo-secure-store';
+
+function Logout({ navigation }) {
+  return (
+    <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
+      <Button onPress={
+        ()=>{
+          SecureStore.deleteItemAsync('token')
+          SecureStore.deleteItemAsync('id')
+          navigation.push('Login')
+
+        }
+      } title="LOGOUT" />
+    </View>
+  );
+}
+export default Logout
+
+// navigation.navigate('Login', {screen: 'Login'})

client/Screens/MyCurriculum.js

@@ -1,7 +1,7 @@
 import React, {useState, useEffect} from 'react';
-import { View, StyleSheet, Text } from 'react-native';
+import { View, StyleSheet, Text, TouchableOpacity } from 'react-native';
 import axios from 'axios'
-import { Table, Row, Rows, TableWrapper, Col } from 'react-native-table-component';
+import { Table, Row, Rows, TableWrapper, Col, Cell } from 'react-native-table-component';
 import {Picker} from '@react-native-community/picker'
 import * as SecureStore from 'expo-secure-store';
 
@@ -20,7 +20,7 @@ const MyCurriculum = () =>{
         let user_id = parseInt(id)
 
         try {
-            let response = await axios('http://8c4029a33a9a.ngrok.io/api/see_gpa', {
+            let response = await axios('http://da0406585426.ngrok.io/api/see_gpa', {
                 method: 'POST',
                 headers: {
                     Authorization: `Token ${token}`
@@ -43,7 +43,7 @@ const MyCurriculum = () =>{
         let numbers = []
 
         try {
-            let response = await axios(`http://8c4029a33a9a.ngrok.io/api/get_all_courses_by_semester?user_id=${user_id}&year=${year}&semestre=${semester}`, {
+            let response = await axios(`http://da0406585426.ngrok.io/api/get_all_courses_by_semester?user_id=${user_id}&year=${year}&semestre=${semester}`, {
                 method: 'GET',
                 headers: {
                     'content-type': 'application/json',
@@ -70,6 +70,9 @@ const MyCurriculum = () =>{
            }
     }
 
+
+
+
     useEffect(()=>{
         console.log('dimelo')
         getMyCurriculum()
@@ -127,5 +130,5 @@ const styles = StyleSheet.create({
     wrapper: { flexDirection: 'row' },
     title: { flex: 1, backgroundColor: '#e82020' },
     row: {  height: 28  },
-    text: { textAlign: 'center', fontSize:10 }
+    text: { textAlign: 'center', fontSize:10 },
   });

client/Screens/SettingScreen.js

@@ -15,7 +15,7 @@ export default function SettingScreen() {
         let user_id = parseInt(id)
 
        try {
-        let response = await axios(`http://8c4029a33a9a.ngrok.io/api/get_faculty_name?id=${user_id}`, {
+        let response = await axios(`http://0e86feab4a8f.ngrok.io/api/get_faculty_name?id=${user_id}`, {
             method: 'GET',
             headers: {
                 'content-type': 'application/json',
@@ -43,7 +43,7 @@ export default function SettingScreen() {
         try {
             let response = await axios({
                 method: 'PATCH',
-                url: 'http://8c4029a33a9a.ngrok.io/api/update_faculty',
+                url: 'http://0e86feab4a8f.ngrok.io/api/update_faculty',
                 headers: {
                     Authorization: `Token ${token}`
                 },
@@ -61,7 +61,6 @@ export default function SettingScreen() {
     console.log(faculty)
     return(
         <View style={styles.container}>
-            {/* <DisplayFaculty/> */}
             <View style={{textAlignVertical: 'top'}}>
                 <Text style={{ fontSize: 12, fontWeight: "bold" , height:30 }}>
                     You currently belong to the faculty: {currentFaculty}

client/Screens/UpdateSemYear.js

@@ -0,0 +1,144 @@
+import axios from "axios";
+import React, { useState, useEffect } from "react";
+import { StatusBar, StyleSheet, Text, View, Button, Alert } from "react-native";
+import * as SecureStore from 'expo-secure-store';
+import Modal from 'react-native-modal';
+import {Picker} from '@react-native-community/picker';
+
+
+
+const UpdateSemYear = () => {
+  
+  const [year, setYear] = useState('1')
+  const [semester, setSemester] = useState('1')
+  const [modalVisible, setModalVisible] = useState(false)
+  
+    const updateSemesterAndYear = async()=>{
+        const token = await SecureStore.getItemAsync('token')
+        let id = await SecureStore.getItemAsync('id')
+        let user_id = parseInt(id)
+    
+
+        let response = await axios({
+        method: 'PATCH',
+        url: 'http://da0406585426.ngrok.io/api/update_year_and_semester',
+        headers: {
+            'content-type': 'application/json',
+            Authorization: `Token ${token}`
+        },
+        data: {
+            user_id: user_id,
+            year: year,
+            semester: semester
+        }
+        })
+        console.log(response.data)
+
+        getSemesterAndYear()
+        toggle()
+
+    }
+ 
+
+  const getSemesterAndYear = async ()=>{
+      const token = await SecureStore.getItemAsync('token')
+      let id = await SecureStore.getItemAsync('id')
+      let user_id = parseInt(id)
+     
+
+      let response = await axios({
+        method: 'POST',
+        url: 'http://da0406585426.ngrok.io/api/get_year_and_semester',
+        headers: {
+          'content-type': 'application/json',
+          Authorization: `Token ${token}`
+        },
+        data: {
+          user_id: user_id,
+        }
+      })
+
+      setYear(response.data.msg.year)
+      setSemester(response.data.msg.semestre)
+
+
+  }
+
+  const toggle = ()=>{
+    setModalVisible(!modalVisible)
+  }
+
+  useEffect(()=>{
+    getSemesterAndYear()
+},[])
+
+
+  console.log(year)
+  return (
+    <View style={{flex: 1, padding: 10}}>
+       <Text style={styles.title}>Your current year is {year} and current semester is {semester}</Text>
+       <Button title="Change Year and Semester" onPress={toggle}/>
+       <Modal 
+            isVisible={modalVisible}
+        >
+        <View style={styles.modalItem}>
+                    <Text>Year</Text>
+                    <Picker
+                        selectedValue={year}
+                        style={{ width: 50}}
+                        onValueChange={(itemValue, itemIndex) => setYear(itemValue) }>
+                        <Picker.Item label="1" value="1" />
+                        <Picker.Item label="2" value="2" />
+                        <Picker.Item label="3" value="3" />
+                        <Picker.Item label="4" value="4" />
+                        <Picker.Item label="5" value="5" />
+                        <Picker.Item label="6" value="6" />
+                    </Picker>
+                </View>
+                <View style={styles.modalItem}>
+                    <Text>Semester</Text>
+                    <Picker
+                        selectedValue={semester}
+                        style={{ width: 50}}
+                        onValueChange={(itemValue, itemIndex) => setSemester(itemValue) }>
+                        <Picker.Item label="1" value="1" />
+                        <Picker.Item label="2" value="2" />
+                    </Picker>
+            </View>
+            <Button title="Submit" onPress={updateSemesterAndYear}/>
+            <Button title="Close" onPress={toggle}/>
+
+       </Modal>
+    </View>
+  );
+};
+
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    marginTop: StatusBar.currentHeight || 0,
+  },
+  item: {
+    padding: 10,
+    marginVertical: 8,
+    marginHorizontal: 16,
+  },
+  title: {
+    fontSize: 15,
+    fontWeight: 'bold'
+  },
+  searchBar: {
+    height: 40, 
+    borderColor: '#000', 
+    borderWidth: 1 
+  },
+  modalItem: {
+    // width: '30%', // is 30% of container width
+    margin: 8, // 300
+    backgroundColor: 'white'
+}
+  
+});
+
+export default UpdateSemYear;

client/debug.log

@@ -1 +1,2 @@
-[1130/124344.155:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
+[1117/174912.971:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
+[1214/193105.148:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)

organizar/organizar.py

@@ -1,7 +1,6 @@
 import os, sys
 import json
 
-
 path1 = "C:/Users/diego/Documents/companion_app/primer_sem"
 path2 = "C:/Users/diego/Documents/companion_app/segundo_sem"
 path3 = "C:/Users/diego/Documents/companion_app/Miupi Parser"
@@ -33,7 +32,6 @@ def orderFiles3(files1, files2, files3):
         files3.append({'file': files2[i]['file'], 'num': files1[i]['num']})
     return files3
 
-
 def orderFilesProxSemestre(files):
     """ 
     Organizing all the files from Miupi Parser to a single array. The array will contain each directory of each file
@@ -51,3 +49,10 @@ files3 = []
 files3 = orderFiles3(files1, files2, files3)
 proxSemFiles = orderFilesProxSemestre([])
 
+
+
+
+
+               
+            
+