updates

packages/ReverseFood/app/_layout.tsx

@@ -1,5 +1,4 @@
 import { Stack } from "expo-router/stack";
-import "react-native-reanimated";
 
 export default function Layout() {
   return (

packages/ReverseFood/app/info.js

@@ -2,48 +2,44 @@ import {View , Text } from "react-native";
 import { our_styles } from "../styles/styles.jsx";
 import { useLocalSearchParams } from "expo-router";
 import Table from "../components/table.js";
-import SecureStore from "expo-secure-store";
+import * as SecureStore from "expo-secure-store";
 import { useEffect, useState } from "react";
 
-const URL = "http://localhost:18000/image";
+const URL = "http:/10.144.207.193:3000/image";
 
 
 
 
-export default function info (){
-
-    const [myData , setData] = useState({ name : 0, description : 0, foodCategory : 0, ingredients : 0, nutrients : []})
-
+export default info = () => {
+    const [myData , setData] = useState({ name : "Loading", description : "Loading", foodCategory : "Loading", ingredients : "Loading", nutrients : []})
 
-    useEffect(() => {
-    const p  = useLocalSearchParams();
-    fetchData(p)
-    ;});
 
-
-    const fetchData = (params) => {SecureStore.getItemAsync("token").then((token) => {
+    async function fetchData () { await SecureStore.getItemAsync("token").then((token) => {
+        const params = useLocalSearchParams();
         if (token === undefined) {
             console.log("No token found");
         }
-    fetch(URL + {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-            "Authorization": token,     
-        },
-        body: JSON.stringify({
+        let searchData = {
             image: params.image,
             foodName: params.foodName,
             ingredients: params.ingredients,
             description: params.description,
-        }),
+        };
+        console.log(searchData.foodName, searchData.ingredients, searchData.description);
+    fetch(URL, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+            "Authorization": `Bearer ${token}`,     
+        },
+        body: JSON.stringify(searchData),
     }).then((response) => {
         if (response.status === 200) {
             response.json().then((myData) => {
-                setData(myData);
+                return myData
             });
         } else {
-            return null;
+           console.log("Error: " + response.status);
         }
     }).catch((error) => {
         console.log(error);
@@ -53,13 +49,21 @@ export default function info (){
     console.log(error);
     return null;
 }})};
+
+    useEffect(() => {
+    fetchData().then((data) => {setData({
+        name : data.name, description : (data.name === undefined), foodCategory : data.foodCategory, ingredients : data.ingredients, nutrients : data.nutrients
+    })}).catch((error) => console.log(error))
+    ;}, []);
+
+
+
 
 return <View style={our_styles.center_container}>
-<Text style={our_styles.heading}>{(myData === 0) ? "Loading" : myData.name}</Text>
+<Text style={our_styles.heading}>{(myData.name === 0) ? "Loading" : myData.name}</Text>
 <Text></Text>
-<Text style={our_styles.subheading}>{(myData === 0) ? "Loading" : myData.description}</Text>
-<Text style={our_styles.subheading}>[(myData === 0) ? "Loading" : myData.foodCategory]</Text>
-<Text style={our_styles.body}>[(myData === 0) ? "Loading" : myData.ingredients]</Text>
-<Table data={(myData === 0) ? "Loading" : myData.nutrients}/>
+<Text style={our_styles.subheading}>{myData.name}</Text>
+<Text style={our_styles.subheading}>{myData.foodCategory}</Text>
+<Text style={our_styles.body}>{myData.ingredients}</Text>
 </View>
 }  

packages/ReverseFood/components/FoodInput.js

@@ -16,6 +16,9 @@ import { colors, ourStyles } from "../styles/styles.jsx";
 import { router } from "expo-router";
 import SecureStore from "expo-secure-store";
 
+function swutchPages(image, foodName, ingredients, desc){
+  router.push({pathname: "info", params: {image: image, foodName: foodName, ingredients: ingredients, description: desc}})
+}
 
 
 export default function FoodInput() {
@@ -71,9 +74,7 @@ export default function FoodInput() {
           value={desc}
         ></TextInput>
       </View>
-      <Button title="Submit" onPress={
-        router.push({pathname: "info", params: {image: image, foodName: foodName, ingredients: ingredients, description: desc}})
-      } />
+      <Button title="Submit" onPress={()=>swutchPages(image,foodName,ingredients,desc)}/>
     </View>
   );
 }

packages/ReverseFood/components/table.js

@@ -2,7 +2,6 @@ import {View, Text, ScrollView} from "react-native";
 import {our_styles,table_styles} from "../styles/styles.jsx";
 
 function TableHeader(text1, text2, text3,text4) {
-    console.log(text1 + " " + text2 + " " + text3 + " " + text4);
     return <View style={our_styles.tablbleRow}>
         <Text style={table_styles.tableHeaderCell}>{text1}</Text>
         <Text style={table_styles.tableHeaderCell}>{text2}</Text>
@@ -13,7 +12,7 @@ function TableHeader(text1, text2, text3,text4) {
 
 function TableCell(text1, text2, text3,text4) {
     console.log(text1 + " " + text2 + " " + text3 + " " + text4);
-    return <View style={our_styles.tablbleRow}>
+    return <View style={our_styles.tablbleRow} key={text1}>
         <Text style={table_styles.tableCell}>{text1}</Text>
         <Text style={table_styles.tableCell}>{text2}</Text>
         <Text style={table_styles.tableCell}>{text3}</Text>

packages/backend/api/authHandler.js

@@ -5,7 +5,6 @@ import { userModel } from "../models/user.js";
 
 export function register(req, res){
     const { username, password } = req.body;
-    console.log(username, password);
     if (!username || !password) {
         res.status(400).send("Bad request: Invalid input data.");
     }

packages/backend/api/foodHandler.js

@@ -17,7 +17,7 @@ export async function submitFood(req, res){
         return;
     }
 
-    const foodFacts = await fetch(`http://localhost:18000/foodFacts?foodName=${imgData ? imgData.dish : foodName}`, {method: "GET"}).then((response) => {return response.json()});
+    const foodFacts = await fetch(`http://localhost:3000/foodFacts?foodName=${imgData ? imgData.dish : foodName}`, {method: "GET"}).then((response) => {return response.json()});
 
     try {
         const newFoodItem = await new foodModel({

packages/backend/api/images.js

@@ -85,15 +85,15 @@ export async function getFoodFacts(req, res) {
                     let foodData = data.foods[0];
                     foodData = {
                         name: food,
-                        description: (foodData.description === undefined) ? "Unknown" : changeCase.capitalCase(foodData.description),
-                        foodCategory: (foodData.foodCategory === undefined) ? "Unknown" : changeCase.capitalCase(foodData.foodCategory),
-                        ingredients: (foodData.ingredients === undefined) ? "Unknown"  : changeCase.capitalCase(foodData.ingredients),
+                        description: changeCase.capitalCase(foodData.description),
+                        foodCategory: changeCase.capitalCase(foodData.foodCategory),
+                        ingredients: changeCase.capitalCase(foodData.ingredients),
                         nutrients: foodData.foodNutrients.map((nutrient) => {
                             return {
                                 name: nutrient.nutrientName,
                                 unit: nutrient.unitName,
                                 value: nutrient.value,
-                                dailyValue: nutrient.percentDailyValue === undefined ? 0 : nutrient.percentDailyValue,
+                                dailyValue: nutrient.dailyValue,
                             };
                         }),
                         image: null,

packages/backend/index.js

@@ -4,13 +4,6 @@ import multer from "multer";
 import { connect } from './services/mongo.js';
 import { addRoutes } from './route.js';
 import { addAuthRoutes } from './authroutes.js';
-import serverless from "serverless-http";
-import dot from "dotenv";
-
-
-// Set port
-dot.config();
-const port = process.env.PORT || 3000;
 
 const app = express();
 const router = express.Router();
@@ -27,19 +20,6 @@ app.use("/auth", router);
 // Connect to mongo DB
 connect("test");
 
-
-// Binds socket to port
-const server = async () =>
-    app.listen(port, () => {
-        console.log(`REST API  is listening at ${port}`);
-    });
-
-// Starts server
-server();
-
-// Lambda handler
-const handler = serverless(app);
-export async function handleStart(context, req) {
-    const res = await handler(context, req);
-    return res;
-}
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});

packages/backend/package.json

@@ -19,8 +19,7 @@
     "express": "^4.19.2",
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.4.0",
-    "multer": "^1.4.5-lts.1",
-    "serverless-http": "^3.2.0"
+    "multer": "^1.4.5-lts.1"
   },
   "devDependencies": {
     "@types/node": "^20.12.12",

packages/backend/services/mongo.js

@@ -9,7 +9,6 @@ function getMongoURL(dbname) {
   const MONGO_PASS = process.env.MONGO_PASS;
   let connection_string = `mongodb+srv://${MONGO_USER}:${MONGO_PASS}@cluster0.yomgmem.mongodb.net/${dbname}?retryWrites=true&w=majority`;
   if (MONGO_USER && MONGO_PASS) {
-    console.log("Ok...");
     console.log(
       "Connecting to MongoDB at",
       `mongodb+srv://${MONGO_USER}:<password>@cluster0.yomgmem.mongodb.net/${dbname}`