quick commit

src/components/index.ts

@@ -5,8 +5,14 @@ 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

src/pages/OrderShowPage.tsx

@@ -2,12 +2,15 @@ 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) => {
@@ -22,7 +25,10 @@ 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(<></>);