Merge pull request #57 from yl-ang/clean-files

Clean files  & integrate

firebase.js

@@ -75,8 +75,8 @@ export function updateRunning(running_time) {
   )
 }
 
-export function updateIpptScore(ipptScore) {
-  updateDoc(doc(db, "users", auth.currentUser.uid), 
+export async function updateIpptScore(ipptScore) {
+  await updateDoc(doc(db, "users", auth.currentUser.uid), 
     {
       Ippt_Score: ipptScore
     }

frontend/compenents/ippt.js

@@ -6,6 +6,8 @@ const calculateIppt = (age, pushUpCount, sitUpCount, runTime) => {
 
     const ipptPoints = pushUpScore + sitUpScore + runScore;
 
+    console.log("wh" + ipptPoints);
+
     return ipptPoints;
   };
 

frontend/screens/homePage.js

@@ -24,6 +24,7 @@ export default HomePage = () => {
         navigation.navigate("Login");
     }
 
+
     useFocusEffect(
 
         useCallback(() => {

frontend/screens/ipptSubmissionPage.js

@@ -1,5 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import {useTailwind} from 'tailwind-rn';
+import { useFocusEffect } from "@react-navigation/native";
 import { Button, List, ListItem, Layout, Input, Text, Divider, Spinner  } from '@ui-kitten/components';
 import { setNestedObjectValues, useFormik } from "formik";
 import { Alert, Keyboard, TouchableWithoutFeedback, Image, View  } from "react-native";
@@ -10,6 +11,7 @@ import { MaterialCommunityIcons, FontAwesome5 } from '@expo/vector-icons';
 import { useNavigation } from "@react-navigation/native";
 import { ipptSchema } from "./validationSchema.js"
 import { calculateIppt } from '../compenents/ippt.js';
+import { updateIpptScore } from '../../firebase.js';
 
 export default SubmitIpptPage = () => {
     const tailwind = useTailwind();
@@ -30,6 +32,9 @@ export default SubmitIpptPage = () => {
 
         onSubmit: () => {
             //TODO: upload data to database
+            const runTime =
+            parseInt(values.runningMin) * 60 +
+            parseInt(values.runningSec);
             formSubmissionVerification()
         },
 
@@ -51,10 +56,20 @@ export default SubmitIpptPage = () => {
             parseInt(values.runningMin) * 60 +
             parseInt(values.runningSec);
 
-        const ipptPoints = calculateIppt(21, parseInt(values.pushup), parseInt(values.situp), runTime)
+        var ipptPoints = -1;
+
+        console.log("Received pushups: " + values.pushup);
+        console.log("Received situp: " + values.situp);
+        console.log("Received runTime: " + runTime);
+
+
+
+        ipptPoints = calculateIppt(25, parseInt(values.pushup), parseInt(values.situp), runTime, 'male');
+
         // update ipptPoints
         setValues({ ...values, ipptPoints})
-        console.log("This is the ippt score: " + values.ipptPoints)
+        console.log("This is the ippt score: " + values.ipptPoints);
+        updateIpptScore(values.ipptPoints);
     }
 
     const formSubmissionVerification = () => {
@@ -65,7 +80,7 @@ export default SubmitIpptPage = () => {
                 [
                     {
                         text: "Confirm",
-                        onPress: () => {console.log("Submitting to database!!"), getIpptScore(), handleNavigation()},
+                        onPress: () => {console.log("Submitting to database!!"), getIpptScore(), updateIpptScore(values.ipptPoints), handleNavigation()},
                     },
                     {
                         text: "Cancel",

frontend/screens/registrationPage.js

@@ -23,7 +23,7 @@ export default RegistrationPage = () => {
                 [
                     {
                         text: "Confirm",
-                        onPress: () => {handleSignUp},
+                        onPress: () => {handleSignUp()},
                     },
                     {
                         text: "Cancel",

tailwind.css

@@ -52,6 +52,16 @@
 
 .top-1 {
   top: 0.25rem
+
+}
+
+.left-3 {
+  left: 0.75rem
+}
+
+.left-4 {
+  left: 1rem
+
 }
 
 .left-3 {
@@ -86,6 +96,18 @@
   right: 4rem
 }
 
+
+.top-9 {
+  top: 2.25rem
+}
+
+.top-2 {
+  top: 0.5rem
+}
+
+.bottom-1 {
+  bottom: 0.25rem
+
 .right-32 {
   right: 8rem
 }
@@ -96,6 +118,7 @@
 
 .right-2 {
   right: 0.5rem
+
 }
 
 .mx-40 {
@@ -307,6 +330,8 @@
   padding: 1rem
 }
 
+
+
 .text-left {
   text-align: left
 }

tailwind.json

@@ -90,6 +90,12 @@
 		}
 	},
 	"top-2": {
+
+		"style": {
+			"top": 8
+		}
+	},
+	"bottom-1": {
 		"style": {
 			"top": 8
 		}
@@ -414,6 +420,7 @@
 			"paddingLeft": 16
 		}
 	},
+	"text-center": {
 	"text-left": {
 		"style": {
 			"textAlign": "left"
@@ -425,6 +432,7 @@
 		}
 	},
 	"text-start": {
+
 		"style": {
 			"textAlign": "start"
 		}