diff --git a/src/App.tsx b/src/App.tsx index 6581e8f..722f158 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -21,6 +21,9 @@ import CadastroVan from './pages/CadastroVan'; import CadastroCompletar from './pages/CadastroCompletar/CadastroCompletar'; import CompletarDocumento from './pages/CadastroCompletar/CompletarDocumento'; import CompletarTelefone from './pages/CadastroCompletar/CompletarTelefone'; +import Transportes from './pages/Transportes/Transportes'; +import BuscarPassageiro from './pages/BuscarPassageiro/BuscarPassageiro'; +import BuscarTransporte from './pages/BuscarTransporte/BuscarTransporte'; /* Core CSS required for Ionic components to work properly */ import '@ionic/react/css/core.css'; @@ -40,15 +43,12 @@ import '@ionic/react/css/display.css'; /* Theme variables */ import './theme/variables.css'; -import BuscarPassageiro from './pages/BuscarPassageiro/BuscarPassageiro'; -import Transportes from './pages/Transportes/Transportes'; -import BuscarTransporte from './pages/BuscarTransporte/BuscarTransporte'; + // import Tabs from './components/Tabs'; 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(); @@ -65,7 +65,9 @@ const routes = ( + + diff --git a/src/constants/routes/usersRoutes.ts b/src/constants/routes/usersRoutes.ts index 20d385e..eeceedc 100644 --- a/src/constants/routes/usersRoutes.ts +++ b/src/constants/routes/usersRoutes.ts @@ -18,7 +18,10 @@ const usersRoutes = { // TODO, depois corrigir getUsersSearching: { url: `/search/inraio` - } + }, + createUserSearch: { + url: `${usersRoutesDefault}/search` + }, } export default usersRoutes; \ No newline at end of file diff --git a/src/pages/BuscarPassageiro/BuscarPassageiro.tsx b/src/pages/BuscarPassageiro/BuscarPassageiro.tsx index 7c79b9f..b03819d 100644 --- a/src/pages/BuscarPassageiro/BuscarPassageiro.tsx +++ b/src/pages/BuscarPassageiro/BuscarPassageiro.tsx @@ -8,7 +8,7 @@ import { useEffect, useState } from 'react'; import RecordsStore from '../../store/RecordsStore'; import { fetchRecords } from '../../store/Selectors'; -import { getUsersSearching } from '../../services/users'; +import { getUsersSearching } from '../../services/api/users'; import { UserSearchInfos } from '../../components/UserSearchInfos/UserSearchInfos'; const maptilerProvider = maptiler('d5JQJPLLuap8TkJJlTdJ', 'streets'); diff --git a/src/pages/BuscarTransporte/BuscarTransporte copy.tsx b/src/pages/BuscarTransporte/BuscarTransporte copy.tsx deleted file mode 100644 index dfd977a..0000000 --- a/src/pages/BuscarTransporte/BuscarTransporte copy.tsx +++ /dev/null @@ -1,182 +0,0 @@ -import { - IonContent, - IonPage, - IonIcon, - IonCard, - IonInput, - IonRow, - IonCardContent, - IonButton, - IonSearchbar, - IonModal, - IonProgressBar, -} from "@ionic/react"; -import { - arrowBack, - arrowForwardOutline, - chevronForwardOutline, - locateOutline, - locationOutline, - timeOutline, -} from "ionicons/icons"; -import "./BuscarTransporte.css"; - -import { useEffect, useState } from "react"; -import { autoCompleteAddress } from "../../services/utils"; -import { useHistory } from "react-router"; - -const BuscarTransporte: React.FC = () => { - const history = useHistory(); - const [addressFrom, setAddressFrom] = useState(""); - const [coordinatesFrom, setCoordinatesFrom] = useState("") - const [addressTo, setAddressTo] = useState(""); - const [coordinatesTo, setCoordinatesTo] = useState("") - const [showModalEnd, setShowModalEnd] = useState(false); - const [addressResults, setAddressResults] = useState([]); - const [inputActive, setInputActive] = useState(""); - - const optionsAddress = async (inputValue: any) => { - let results = await autoCompleteAddress(inputValue) - .then((res) => { - return res.map((item: any) => { - return { - value: - item.geometry.coordinates[0] + "," + item.geometry.coordinates[1], - label: item.properties.formatted, - }; - }); - }) - .catch((err) => { - console.log("Erro ao buscar endereço:", err); - }); - setAddressResults(results); - }; - - function setInputActiveOpenModal(input: string) { - setInputActive(input); - setShowModalEnd(true); - } - - function setAddress(div: any) { - if (inputActive === "from") { - setAddressFrom(div.target.attributes[2].value); - setCoordinatesFrom(div.target.attributes[1].value); - }else{ - setAddressTo(div.target.attributes[2].value) - setCoordinatesTo(div.target.attributes[1].value) - } - setShowModalEnd(false) - } - - return ( - - - - -
- - setInputActiveOpenModal("from")} - value={addressFrom} - placeholder="R. José Paulino, 1234 - Centro, Campinas - SP, 13013-001" - /> -
-
- - setInputActiveOpenModal("to")} - value={addressTo} - placeholder="PUC Campinas" - /> -
-
- history.push("/transportes")}>Buscar -
-
-
- - -
- Rua Tal Tal, 154, São Paulo - SP - - USP -
- Há 1 hora -
- -
- - -
- Taquaral - - PUC-Campinas -
- Há 2 hora -
- -
- - -
- setShowModalEnd(false)} - /> - optionsAddress(e.detail.value)} - placeholder="R. José Paulino, 1234 - Centro, Campinas - SP, 13013-001" - className="search-modal" - /> -
- {addressResults.length > 0 ? ( - addressResults.map((item: any) => { - return ( -
setAddress(e)} - > - {item.label} - -
- ); - }) - ) : ( - <> - -
- - )} -
-
-
-
- ); -}; - -export default BuscarTransporte; diff --git a/src/pages/Transportes/Transportes.tsx b/src/pages/Transportes/Transportes.tsx index 37984aa..f99a602 100644 --- a/src/pages/Transportes/Transportes.tsx +++ b/src/pages/Transportes/Transportes.tsx @@ -46,7 +46,7 @@ import { import { useEffect, useState } from "react"; import { useHistory, useLocation } from "react-router"; import { getTransportes } from "../../services/transportes"; -import { createUserSearch } from "../../services/users"; +import { createUserSearch } from "../../services/api/users"; import "./Transportes.css"; interface InfoBusca { diff --git a/src/services/api/users.ts b/src/services/api/users.ts index c973e3f..20c1246 100644 --- a/src/services/api/users.ts +++ b/src/services/api/users.ts @@ -99,4 +99,11 @@ export async function getUsersSearching(currentPoint: any) { // const data = await response.json(); console.log(response.data) setStore(response.data); +} + +export async function createUserSearch(latitude_from: any, longitude_from: any, addres_to: any) { + const response = await instance.post(`${userRoutes.createUserSearch.url}`, { latitude_from, longitude_from, addres_to }); + + console.log(response) + setStore(response); } \ No newline at end of file