see gpa frontend and backend

client/App.js

@@ -1,6 +1,6 @@
 import { StatusBar } from 'expo-status-bar';
 import React, {useState} from 'react';
-import { StyleSheet, Text, View } from 'react-native';
+import { StyleSheet, Text, View, Platform } from 'react-native';
 import * as Google from "expo-google-app-auth";
 import {SocialIcon, socialIcon} from 'react-native-elements'
 import {createDrawerNavigator} from '@react-navigation/drawer'
@@ -15,9 +15,14 @@ import MyCurriculum from './Screens/MyCurriculum'
 
 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)
   
@@ -25,6 +30,7 @@ export default function App() {
     try {
       const result = await Google.logInAsync({
         iosClientId: IOS_CLIENT_ID,
+        androidClientId: ANDROID_CLIENT_ID,
         scopes: ["profile", "email"]
       })
 
@@ -33,7 +39,7 @@ export default function App() {
 
         try {
           // login user in backend
-          let response = await fetch('http://8ad793de242b.ngrok.io/rest-auth/google/', {
+          let response = await fetch('http://356b92b5f6b5.ngrok.io/rest-auth/google/', {
             method: 'POST',
             headers: {
               'content-type': 'application/json'
@@ -54,7 +60,7 @@ export default function App() {
           const token = await SecureStore.getItemAsync('token')
 
           // storing our id
-          let id = await fetch('http://8ad793de242b.ngrok.io/api/get_user_id', {
+          let id = await fetch('http://356b92b5f6b5.ngrok.io/api/get_user_id', {
             method: 'GET',
             headers: {
               'content-type': 'application/json',

client/Screens/AddTakenCourse.js

@@ -51,7 +51,7 @@ const AddTakenCourse = () => {
 
       let response = await axios({
         method: 'POST',
-        url: 'http://8ad793de242b.ngrok.io/api/add_taken_course',
+        url: 'http://356b92b5f6b5.ngrok.io/api/add_taken_course',
         headers: {
           'content-type': 'application/json',
           Authorization: `Token ${token}`
@@ -85,7 +85,7 @@ const AddTakenCourse = () => {
       const token = await SecureStore.getItemAsync('token')
       const response = await axios({
           method: 'GET',
-          url: `http://8ad793de242b.ngrok.io/api/find_course?code=${text}`,
+          url: `http://356b92b5f6b5.ngrok.io/api/find_course?code=${text}`,
           headers: {
             'content-type': 'application/json',
             Authorization: `Token ${token}`

client/Screens/HomeScreen.js

@@ -4,6 +4,8 @@ import * as SecureStore from 'expo-secure-store';
 import Axios from 'axios';
 
 
+
+
 function HomeScreen({ navigation }) {
   const credentials = async ()=>{
     const token = await SecureStore.getItemAsync('token')
@@ -11,7 +13,7 @@ function HomeScreen({ navigation }) {
     console.log(token, id)
 
     let response = await Axios({
-      url: 'http://8ad793de242b.ngrok.io/api/hello',
+      url: 'http://356b92b5f6b5.ngrok.io/api/hello',
       method: 'GET',
       headers: {
           Authorization: `Token ${token}`

client/Screens/MyCurriculum.js

@@ -7,12 +7,34 @@ import * as SecureStore from 'expo-secure-store';
 
 
 const MyCurriculum = () =>{
-    const [year, setYear] = useState(2)
+    const [year, setYear] = useState(1)
+    const [gpa, setGpa] = useState('')
     const [semester, setSemester] = useState(1)
     const [tableHead, setTableHead] = useState(['','Code', 'Title', 'Credits', 'Grade'])
     const [tableData, setTableData] = useState([])
     const [tableTitle, setTableTitle] = useState([])
 
+    const getMyGPA = async()=>{
+        const token = await SecureStore.getItemAsync('token')
+        let id = await SecureStore.getItemAsync('id')
+        let user_id = parseInt(id)
+
+        try {
+            let response = await axios('http://356b92b5f6b5.ngrok.io/api/see_gpa', {
+                method: 'POST',
+                headers: {
+                    Authorization: `Token ${token}`
+                },
+                data: {
+                    user_id: user_id
+                }
+            })
+            setGpa(response.data["gpa"][0])
+        } catch(e){
+            console.log(e)
+        }
+    }
+
     const getMyCurriculum = async()=>{
         const token = await SecureStore.getItemAsync('token')
         let id = await SecureStore.getItemAsync('id')
@@ -21,7 +43,7 @@ const MyCurriculum = () =>{
         let numbers = []
 
         try {
-            let response = await axios(`http://8ad793de242b.ngrok.io/api/get_all_courses_by_semester?user_id=${user_id}&year=${year}&semestre=${semester}`, {
+            let response = await axios(`http://356b92b5f6b5.ngrok.io/api/get_all_courses_by_semester?user_id=${user_id}&year=${year}&semestre=${semester}`, {
                 method: 'GET',
                 headers: {
                     'content-type': 'application/json',
@@ -51,11 +73,13 @@ const MyCurriculum = () =>{
     useEffect(()=>{
         console.log('dimelo')
         getMyCurriculum()
-    }, [year, semester])
+        getMyGPA()
+    }, [year, semester, gpa])
 
 
     return (
         <View style={styles.container}>
+            <Text>Total GPA: {gpa}</Text>
             <Table borderStyle={{borderWidth: 2, borderColor: '#0f0f0f'}}>
                 <Row data={tableHead} flexArr={[0.9, 3.5, 10, 2.3, 2.3]} style={styles.head} textStyle={styles.text}/>
                 <TableWrapper style={styles.wrapper}>

client/Screens/SettingScreen.js

@@ -15,7 +15,7 @@ export default function SettingScreen() {
         let user_id = parseInt(id)
 
        try {
-        let response = await axios(`http://8ad793de242b.ngrok.io/api/get_faculty_name?id=${user_id}`, {
+        let response = await axios(`http://356b92b5f6b5.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://8ad793de242b.ngrok.io/api/update_faculty',
+                url: 'http://356b92b5f6b5.ngrok.io/api/update_faculty',
                 headers: {
                     Authorization: `Token ${token}`
                 },

server/CompanionApp/urls.py

@@ -18,6 +18,7 @@ urlpatterns = [
     url(r'^api/get_user_id$', views.getUserId),
     url('api/get_faculty_name', views.getFacultyUser),
     url('api/get_all_courses_user_has_taken', views.getAllCoursesUserHasTaken),
-    url('api/get_all_courses_by_semester', views.getAllCoursesBySemester)
+    url('api/get_all_courses_by_semester', views.getAllCoursesBySemester),
+    url('api/see_gpa', views.seeGPA)
 ]
 

server/CompanionApp/views.py

@@ -1,6 +1,6 @@
 import sys
 import json
-sys.path.insert(1,'C:/Users/diego/Documents/companion_app_gh/organizar/')
+sys.path.insert(1,'C:/Users/diego/Documents/companion_app/organizar/')
 
 
 from organizar import files3
@@ -48,7 +48,7 @@ def insertarTodosLosCursos(request):
         i = 1
         for file in files3:
             check = file['file'].split('.')
-            path = "C:/Users/diego/Documents/companion_app_gh/segundo_sem" if check[0][-1] == '2' else "C:/Users/diego/Documents/companion_app_gh/primer_sem"
+            path = "C:/Users/diego/Documents/companion_app/segundo_sem" if check[0][-1] == '2' else "C:/Users/diego/Documents/companion_app/primer_sem"
             with open(path + '/' + file['file']) as f:
                 data = json.load(f)
                 fac_id = file['num']
@@ -242,6 +242,17 @@ def getAllCoursesBySemester(request):
             
         return JsonResponse({'list': courses}, status=status.HTTP_200_OK)
 
+@api_view(['POST',])
+def seeGPA(request):
+    if request.method == 'POST':
+        user_id = int(request.data['user_id'])
+        cursor = connection.cursor()
+        cursor.execute(f'SELECT gpa from "CompanionApp_user" where id={user_id}')
+        GPA = cursor.fetchone()
+        return JsonResponse({'gpa': GPA}, status = status.HTTP_200_OK)
+
+
+
 
 
 @api_view(['GET', 'POST'])