Merge master

package-lock.json

@@ -28,9 +28,9 @@
         "@types/react-router-dom": "^5.1.7",
         "axios": "^0.26.1",
         "ionicons": "^5.4.0",
+        "lodash.isequal": "^4.5.0",
         "pigeon-maps": "^0.21.0",
         "pullstate": "^1.24.0",
-        "lodash.isequal": "^4.5.0",
         "react": "^17.0.1",
         "react-dom": "^17.0.1",
         "react-google-places-autocomplete": "^3.3.4",

src/App.tsx

@@ -48,6 +48,7 @@ import { search, home, person } from 'ionicons/icons';
 import { useState, useContext } from 'react';
 import React from 'react';
 import MinhasVans from './pages/MinhasVans';
+import BuscarPassageiro from './pages/BuscarPassageiro/BuscarPassageiro';
 
 setupIonicReact();
 
@@ -64,6 +65,8 @@ const routes = (
   <Route exact path="/perfil/completar/documento" component={CompletarDocumento}></Route>
   <Route exact path="/perfil/completar/telefone" component={CompletarTelefone}></Route>
 
+  <Route exact path="/buscar-passageiro" component={BuscarPassageiro}></Route>
+
   <Route exact path="/usuario/:id" component={Perfil}></Route>
 
   <Route exact path="/cadastro-van" component={CadastroVan}></Route>

src/constants/routes/usersRoutes.ts

@@ -14,6 +14,10 @@ const usersRoutes = {
   },
   getSocialInfo: {
     url: `${usersRoutesDefault}/social`
+  },
+  // TODO, depois corrigir
+  getUsersSearching: {
+    url: `/search/inraio`
   }
 }
 

src/pages/MainPages.tsx

@@ -1,51 +0,0 @@
-import {
-  IonTabs,
-  IonTabBar,
-  IonTabButton,
-  IonLabel,
-  IonIcon,
-  IonRouterOutlet
-} from '@ionic/react';
-import { Redirect, Route } from 'react-router-dom';
-import { search, home, person } from 'ionicons/icons';
-
-import Home from './Home';
-import BuscarPassageiro from './BuscarPassageiro/BuscarPassageiro';
-import BuscarTransporte from './BuscarTransporte/BuscarTransporte';
-
-export const MainPages: React.FC = () => {
-
-  return (
-    <IonTabs>
-      <IonRouterOutlet>
-        <Route path="/home" exact={true}>
-          <Home />
-        </Route>
-        {/* <Route path="/buscar-passageiro" exact={true}>
-          <BuscarPassageiro />
-        </Route> */}
-        <Route path="/buscar-transporte" exact={true}>
-          <BuscarTransporte />
-        </Route>
-        <Route path="/mainpages" render={() => <Redirect to="/buscar-transporte" />} exact={true} />
-      </IonRouterOutlet>
-
-      <IonTabBar slot="bottom">
-        <IonTabButton tab="buscar" href="/buscar-transporte">
-          <IonIcon icon={search} />
-          <IonLabel>Buscar</IonLabel>
-        </IonTabButton>
-        <IonTabButton tab="home" href="/home">
-          <IonIcon icon={home} />
-          <IonLabel>Home</IonLabel>
-        </IonTabButton>
-        <IonTabButton tab="perfil" href="/perfil">
-          <IonIcon icon={person} />
-          <IonLabel>Perfil</IonLabel>
-        </IonTabButton>
-      </IonTabBar>
-    </IonTabs>
-  )
-}
-
-export default MainPages;

src/services/api/users.ts

@@ -4,6 +4,7 @@ import instance from './api';
 import userRoutes from '../../constants/routes/usersRoutes';
 import { AxiosRequestHeaders } from 'axios';
 import LocalStorage from '../../LocalStorage';
+import { setStore } from '../../store/RecordsStore';
 
 let token: string;
 let header: AxiosRequestHeaders;
@@ -87,3 +88,15 @@ export async function getSocialInfo(userId: string) {
   const response = await instance.get(userRoutes.getSocialInfo.url + `/${userId}`, { headers: header });
   return response.data;
 }
+
+export async function getUsersSearching(currentPoint: any) {
+  //	Replace lat/long with values from get current location.
+	//	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 response = await instance.post(`${userRoutes.getUsersSearching.url}`, currentPoint)
+	// const data = await response.json();
+  console.log(response.data)
+	setStore(response.data);
+}