Resolve Scan

Author: Loule95450

ios/Podfile.lock

@@ -1424,7 +1424,7 @@ SPEC CHECKSUMS:
   RNVectorIcons: 73ab573085f65a572d3b6233e68996d4707fd505
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   VisionCamera: 7a5c87805b13adaaa557132b44879ed1e1e39786
-  Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7
+  Yoga: 9e6a04eacbd94f97d94577017e9f23b3ab41cf6c
 
 PODFILE CHECKSUM: 0324d2f1bead3c67e34ad5270355479295c48a2e
 

src/screens/carrot/CarrotScreen.tsx

@@ -34,8 +34,8 @@ const CarrotScreen = () => {
       <TouchableOpacity onPress={() => handlePress(product)}>
         <ProductItem
           title={product.item.name ?? product.name}
-          subtitle="Blablatest"
-          badgeText="4/100 Mauvais"
+          subtitle={product.categories}
+          badgeText={product.nutriscore_score}
           defects={
             product.item.negative_nutrients ?? product.negative_nutrients
           }

src/screens/carrot/components/NutritionInfo.tsx

@@ -18,7 +18,7 @@ const NutritionInfo = ({data}) => {
       {item ? (
         <View style={styles.container}>
           <View style={styles.upperPartContainer}>
-            <Image style={styles.image} source={{uri: image}} />
+            <Image style={styles.image} source={{uri: item.image}} />
             <Text style={styles.title}>{item.name}</Text>
           </View>
           <View style={styles.subtitle}>

src/screens/imager/Imager.tsx

@@ -11,12 +11,12 @@ import {useNavigation} from '@react-navigation/native';
 import {useDispatch, useSelector} from 'react-redux';
 import {
   addProductToList,
+  removeProductFromList,
   setProduct,
 } from '../../service/redux/slices/productSlice';
 import {TAB_BAR_NAVIGATOR_ROUTES} from '../../components/navigators/TabBarNavigation/TabNavigator.interfaces.ts';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import {getProductByBarcode} from '../../service/apiCall';
-import { fakeBaseQuery } from '@reduxjs/toolkit/query';
 
 export const Imager = () => {
   var busy = false;
@@ -29,31 +29,34 @@ export const Imager = () => {
   const navigation = useNavigation();
 
   const {productList} = useSelector(state => state.product);
-  let productListToSave = productList;
 
   const codeScanner = useCodeScanner({
     codeTypes: ['qr', 'ean-13'],
     onCodeScanned: codes => {
       if (codes[0].type === 'ean-13') {
-        // setIsCameraActive(false);
-        if (!busy)
-        {
+        if (!busy) {
           busy = true;
           console.log(`Searching barcode ${codes[0].value}...`);
-          
-          getProductByBarcode(codes[0].value).then(async result => {
-            if(!result) return;
+
+          getProductByBarcode(codes[0].value).then(result => {
+            if (!result) return;
             console.log(`Product found : ${result.name}`);
             dispatch(setProduct(result));
-            // productListToSave.push(result);
+            if (productList.find(product => product.name === result.name)) {
+              console.log('Product already in list');
+
+              // Remove product from list if already in list and add it again on top
+              dispatch(removeProductFromList(result));
+            } else {
+              AsyncStorage.setItem('productList', JSON.stringify(productList));
+            }
+
+            // Add product to list if not already in list
             dispatch(addProductToList(result));
-            await AsyncStorage.setItem(
-              'productList',
-              JSON.stringify(productList),
-            );
+
             // @ts-ignore
-            busy = false;
             navigation.navigate(TAB_BAR_NAVIGATOR_ROUTES.CARROT);
+            busy = false;
           });
         }
       }

src/screens/register/RegisterScreen.tsx

@@ -12,17 +12,19 @@ import {useNavigation} from '@react-navigation/native';
 import {ACCOUNT_NAVIGATOR_ROUTES} from '../../components/navigators/AccountNavigator/AccountNavigator.interfaces.ts';
 import {logger} from 'react-native-logs';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import {TAB_BAR_NAVIGATOR_ROUTES} from '../../components/navigators/TabBarNavigation/TabNavigator.interfaces.ts';
 import {
   validateEmail,
   validateName,
   validatePassword,
   validateSurname,
 } from '../../utils/validationUtils.ts';
+import {login} from '../../service/redux/slices/userSlice.ts';
+import {useDispatch} from 'react-redux';
 
 const RegisterScreen = () => {
   const log = logger.createLogger();
   const navigation = useNavigation();
+  const dispatch = useDispatch();
   const [name, setName] = useState('');
   const [surname, setSurname] = useState('');
   const [email, setEmail] = useState('');
@@ -60,9 +62,14 @@ const RegisterScreen = () => {
       return;
     }
 
-    AsyncStorage.setItem('user', email).then(() => {
-      navigation.navigate(TAB_BAR_NAVIGATOR_ROUTES.CARROT);
-    });
+    AsyncStorage.setItem('user', email)
+      .then(() => {
+        log.info('User set to async storage');
+        dispatch(login({email, password}));
+      })
+      .catch(error => {
+        log.error('Error while setting user to async storage', error);
+      });
   }
 
   return (

src/service/redux/slices/productSlice.ts

@@ -3,32 +3,15 @@ import {createSlice} from '@reduxjs/toolkit';
 export const productSlice = createSlice({
   name: 'product',
   initialState: {
-    productList: [
-      {
-        name: 'Carotte',
-        categories: ['Légume', 'Bio'],
-        ingredients_text: 'Carotte, eau',
-        nutriments: {
-          carbohydrates: 54,
-          proteins: 7,
-          fat: 30,
-          sugars: 100,
-          salt: 0.2,
-        },
-        image_url:
-          'https://images.openfoodfacts.net/images/products/301/762/042/2003/front_en.610.100.jpg',
-        nutriscore_score: 3,
-        nutriscore_grade: 'c',
-        positive_nutrients: ['vitamin C', 'fiber'],
-        negative_nutrients: ['sugar'],
-      },
-    ],
+    productList: [],
     product: {},
     productSearch: {},
   },
   reducers: {
     addProductToList: (state, action) => {
-      state.productList.push(action.payload);
+      // state.productList.push(action.payload);
+      // Push on the top of the list
+      state.productList = [action.payload, ...state.productList];
     },
     setProductList: (state, action) => {
       state.productList = action.payload;
@@ -39,10 +22,20 @@ export const productSlice = createSlice({
     setProductSearch: (state, action) => {
       state.productSearch = action.payload;
     },
+    removeProductFromList: (state, action) => {
+      state.productList = state.productList.filter(
+        product => product.name !== action.payload.name,
+      );
+    },
   },
 });
 
-export const {addProductToList, setProduct, setProductList, setProductSearch} =
-  productSlice.actions;
+export const {
+  removeProductFromList,
+  addProductToList,
+  setProduct,
+  setProductList,
+  setProductSearch,
+} = productSlice.actions;
 
 export default productSlice.reducer;