From 905d27484d0232dcfb7f7b0c7948600d7c580ea5 Mon Sep 17 00:00:00 2001 From: Hugo Falcao Date: Sun, 29 May 2022 23:17:27 -0300 Subject: [PATCH] fix(buscar-passageiro): :sparkles: search passengers --- src/pages/BuscarPassageiro/BuscarPassageiro.tsx | 16 +++++++--------- src/services/users.ts | 8 +++++--- src/store/RecordsStore.js | 1 - 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/pages/BuscarPassageiro/BuscarPassageiro.tsx b/src/pages/BuscarPassageiro/BuscarPassageiro.tsx index 605dd89..0797394 100644 --- a/src/pages/BuscarPassageiro/BuscarPassageiro.tsx +++ b/src/pages/BuscarPassageiro/BuscarPassageiro.tsx @@ -34,10 +34,10 @@ const BuscarPassageiro: React.FC = () => { // getUsersSearching(currentPoint); // }); - const [ currentPoint, setCurrentPoint ] = useState({ latitude: 40.8264691, longitude: -73.9549618 }); + const [ currentPoint, setCurrentPoint ] = useState({ latitude: -22.907829, longitude: -47.062943 }); const records = RecordsStore.useState(fetchRecords); - const center = { latitude: 40.8264691, longitude: -73.9549618 }; + const center = { latitude: -22.907829, longitude: -47.062943 }; const [ results, setResults ] = useState([]); const [ zoom, setZoom ] = useState(14); @@ -68,7 +68,6 @@ const BuscarPassageiro: React.FC = () => { } const handleMap = (e:any) => { - console.log(e) setCurrentPoint({ latitude: e.center[0], longitude: e.center[1] }); } @@ -84,21 +83,20 @@ const BuscarPassageiro: React.FC = () => { handleMap(e)} defaultCenter={ [center.latitude, center.longitude] } defaultZoom={ zoom } provider={ maptilerProvider } touchEvents={ true }> { results.map((record:{latitude:any, longitude:any}, index) => { - - return + return })} - { results.map((record:{showInfo:boolean, latitude:any, longitude:any}, index) => { + {/* { results.map((record:{showInfo:boolean, latitude:any, longitude:any}, index) => { if (record.showInfo) { return ( - + */} {/* */} - + {/* ); } - })} + })} */} diff --git a/src/services/users.ts b/src/services/users.ts index 592c173..7654149 100644 --- a/src/services/users.ts +++ b/src/services/users.ts @@ -50,7 +50,9 @@ export async function getUsersSearching(currentPoint: any) { // Allow choosing of radius? // Offset could = amount loaded in an infinite scroll? var latitude = currentPoint.latitude, longitude = currentPoint.longitude, radius = 3000, offset = 0; - const response = await fetch(`http://localhost:4000/get-records?latitude=${ latitude }&longitude=${ longitude }&radius=${ radius }&offset=${ offset }`); - const data = await response.json(); - setStore(data); + // const response = await fetch(`http://localhost:4000/get-records?latitude=${ latitude }&longitude=${ longitude }&radius=${ radius }&offset=${ offset }`); + const response = await instance.post("http://localhost:3333/search/inraio", currentPoint) + // const data = await response.json(); + console.log(response.data) + setStore(response.data); } \ No newline at end of file diff --git a/src/store/RecordsStore.js b/src/store/RecordsStore.js index e6ba71e..76a9ae9 100644 --- a/src/store/RecordsStore.js +++ b/src/store/RecordsStore.js @@ -9,7 +9,6 @@ const RecordsStore = new Store({ export default RecordsStore; export const setStore = records => { - RecordsStore.update(state => { state.records = records.allRecords }); RecordsStore.update(state => { state.center = records.center }); } \ No newline at end of file