resolved conflicts

HackArchive · Jan 7, 2023 · fe1550e · fe1550e
1 parent c7b4989
commit fe1550e
Show file tree

Hide file tree

Showing 9 changed files with 409 additions and 126 deletions.
diff --git a/App.js b/App.js
@@ -25,21 +25,21 @@ export default function App() {
   const [barcode,setBarcode] = useState('');
   const [searchQuery,setSearchQuery] = useState('');
   const [isLoggedIn,setIsLoggedIn] = useState(false);
-  const [email,setEmail] = useState(null);
-  const [password, setPassword] = useState(null);
+  const [userDetails,setUserDetails] = useState(null);
+  const [products,setProducts] = useState([]);
 
   const contextValue = {
     barcode,
     searchQuery,
-    email,
-    password,
     isLoggedIn,
+    userDetails,
+    products,
 
+    setProducts,
     setBarcode,
     setSearchQuery,
-    setEmail,
-    setPassword,
-    setIsLoggedIn
+    setIsLoggedIn,
+    setUserDetails
   }
 
   const [routes] = useState([