Merge branch 'add-local-storage' into 'dev'

Merge Fix

See merge request !5

src/components/index.ts

@@ -4,15 +4,6 @@ export {default as Nav} from './Nav'
 export {default as OrderDetails} from './OrderDetails'
 export {default as SignUpForm} from './SignUpForm'
 export {default as OrderShowDetails} from './OrderShowDetails'
-<<<<<<< HEAD
-<<<<<<< HEAD
 export {default as SearchOrder} from './SearchOrder'
-=======
 export {default as Login} from './Login'
-export {default as Logout} from './Logout'
->>>>>>> :construction: quick commit for pull
-=======
-export {default as Login} from './Login'
-export {default as Logout} from './Logout'
-export {default as SearchOrder} from './SearchOrder'
->>>>>>> 16edc8e40082f2b2af4e3abbe09f0dedf53e25a2
+export {default as Logout} from './Logout'
\ No newline at end of file

src/pages/AccountPage.tsx

@@ -4,7 +4,6 @@ import {AccountForm} from 'components'
 const AccountPage = () => {
     const storage = window.localStorage
     const [userInfo, setUserInfo] = useState();
-    GoogleAuthService.checkGoogleToken(storage.tokenId).then((data) => setUserInfo(data))
 
 
 

src/pages/OrderShowPage.tsx

+import React, {useState, useEffect} from 'react'
 import { useParams } from 'react-router-dom';
 import {OrderShowDetails} from 'components';
 import { Order, Item } from 'Order';
-<<<<<<< HEAD
-<<<<<<< HEAD
 import { useOrder } from 'hooks'
-
-const OrderShowPage = () => {
-    const { id } = useParams<any>();
-    const { order} = useOrder(id)
-=======
-=======
->>>>>>> 16edc8e40082f2b2af4e3abbe09f0dedf53e25a2
 import { OrderService } from 'services'
 
+
+
 const OrderShowPage = (props: any) => {
+    // const { id } = useParams<any>();
+    // const { order } = useOrder(id)
     const location = props.match.params.id;
     const apiUrl = 'http://localhost:8080/api/orders/' + location;
     const [order, setOrder] = useState<Order>();
@@ -25,10 +21,7 @@ const OrderShowPage = (props: any) => {
             setItems(data.orderItems);
         })
     }, [apiUrl])
-<<<<<<< HEAD
->>>>>>> [AFP-87] :construction: Working on Local Storage and adding google info [@kkaminski]
-=======
->>>>>>> 16edc8e40082f2b2af4e3abbe09f0dedf53e25a2
+
 
     if (!order) {
         return(<></>);