diff --git a/src/App.tsx b/src/App.tsx index 722f158..31596e2 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -103,7 +103,7 @@ const IonicApp: React.FC = () => { {routes} - + Buscar diff --git a/src/constants/routes/transportsRoutes.ts b/src/constants/routes/transportsRoutes.ts new file mode 100644 index 0000000..5bedf3b --- /dev/null +++ b/src/constants/routes/transportsRoutes.ts @@ -0,0 +1,14 @@ +const transportsRoutesDefault = '/transports'; +const transportsRoutes = { + create: { + url: `${transportsRoutesDefault}` + }, + get: { + url: `${transportsRoutesDefault}` + }, + update: { + url: `${transportsRoutesDefault}` + }, +} + +export default transportsRoutes; \ No newline at end of file diff --git a/src/pages/Perfil.tsx b/src/pages/Perfil.tsx index dd71854..f7290f7 100644 --- a/src/pages/Perfil.tsx +++ b/src/pages/Perfil.tsx @@ -293,10 +293,21 @@ const Perfil: React.FC = (props) => { Cadastrar Van - history.push({ pathname: '/minhas-vans'})}> - - Minhas Vans - + + { isDriver ? + <> + history.push({ pathname: '/minhas-vans'})}> + + Minhas Vans + + history.push({ pathname: '/buscar-passageiro'})}> + + Buscar passageiros + + + : <> + } + Pagamentos diff --git a/src/pages/Transportes/Transportes.tsx b/src/pages/Transportes/Transportes.tsx index f99a602..9853750 100644 --- a/src/pages/Transportes/Transportes.tsx +++ b/src/pages/Transportes/Transportes.tsx @@ -45,7 +45,7 @@ import { } from "ionicons/icons"; import { useEffect, useState } from "react"; import { useHistory, useLocation } from "react-router"; -import { getTransportes } from "../../services/transportes"; +import { getTransportes } from "../../services/functions/transportsService"; import { createUserSearch } from "../../services/api/users"; import "./Transportes.css"; diff --git a/src/services/api-client.service.ts b/src/services/api-client.service.ts deleted file mode 100644 index 970a8f3..0000000 --- a/src/services/api-client.service.ts +++ /dev/null @@ -1,18 +0,0 @@ -import axios from "axios"; - -export class ApiClient{ - private static api = axios.create({ - baseURL: "http://localhost:8080" - }); - - public static async doPost (url: string, body: any): Promise { - return await this.api - .post(url, body) - .then(res => { - console.log(res.data); - }) - .catch(error => { - console.log(error); - }); - }; -} \ No newline at end of file diff --git a/src/services/api/transports.ts b/src/services/api/transports.ts new file mode 100644 index 0000000..c9d2677 --- /dev/null +++ b/src/services/api/transports.ts @@ -0,0 +1,38 @@ +import instance from './api'; +// import LocalStorage from '../LocalStorage'; + +import transportsRoutes from '../../constants/routes/transportsRoutes'; +import { AxiosRequestHeaders } from 'axios'; +import LocalStorage from '../../LocalStorage'; +import { setStore } from '../../store/RecordsStore'; + +let token: string; +let header: AxiosRequestHeaders; + +function updateHeader() { + token = LocalStorage.getToken(); + + header = { + "Accept": 'application/json', + "Content-Type": 'application/json', + "Authorization": 'Bearer ' + token + } +} + +export interface getTransportsRequest { + coordinatesFrom: { + lat: number, + lng: number + }, + coordinatesTo: { + lat: number, + lng: number + } +} + +export async function get(coordinates: getTransportsRequest) { + updateHeader(); + + const response = await instance.get(transportsRoutes.get.url + `/${coordinates}`, { headers: header }); + return response.data; +} \ No newline at end of file diff --git a/src/services/functions/transportsService.ts b/src/services/functions/transportsService.ts new file mode 100644 index 0000000..611196a --- /dev/null +++ b/src/services/functions/transportsService.ts @@ -0,0 +1,20 @@ +import * as transportsRoutes from '../api/transports'; + +interface CoordinatesRequest { + coordinatesFrom:{ + lat: number, + lng: number + }, + coordinatesTo:{ + lat: number, + lng: number + } +} + +export async function getTransportes(request: CoordinatesRequest) : Promise { + try { + let res : any = await transportsRoutes.get(request); + } catch (error) { + + } +} diff --git a/src/services/transportes.ts b/src/services/transportes.ts deleted file mode 100644 index 7b5eddf..0000000 --- a/src/services/transportes.ts +++ /dev/null @@ -1,34 +0,0 @@ -import instance from "../services/api/api"; -import { setStore } from "../store/RecordsStore"; -// import LocalStorage from '../LocalStorage'; - -// let token:string; -let header: string; - -function updateHeader() { - // token = LocalStorage.getToken(); - header = `{ - "Accept": 'application/json', - "Content-Type": 'application/json', - "Authorization": 'Bearer ' + token - }`; -} - -interface CoordinatesRequest { - coordinatesFrom:{ - lat: number, - lng: number - }, - coordinatesTo:{ - lat: number, - lng: number - } -} - -export async function getTransportes(request: CoordinatesRequest) { - updateHeader(); - - console.log(request) - const response = await instance.post("http://localhost:3333/transportes/", request); - return response.data as []; -}