- { props.message }
-
+ {record.record.user.name}
+ {/* { record.record.addressFrom } */}
+
+ {record.record.user.star_rating
+ ? `${record.record.user.star_rating} estrelas`
+ : "Sem avaliações"}
+
+
+
+
+
+ Ver mais informações →
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/src/config/api.config.ts b/src/config/api.config.ts
index c30fbd8..172c67e 100644
--- a/src/config/api.config.ts
+++ b/src/config/api.config.ts
@@ -1,7 +1,7 @@
import environment from "../environments/environment";
-function getBaseUrl() {
- const { hostname } = window.location;
+const getBaseUrl = (): string => {
+ // const { hostname } = window.location;
const { url } = environment;
let apiUrl = null;
diff --git a/src/constants/routes/carsRoutes.ts b/src/constants/routes/carsRoutes.ts
new file mode 100644
index 0000000..9c6f85d
--- /dev/null
+++ b/src/constants/routes/carsRoutes.ts
@@ -0,0 +1,8 @@
+const carsRoutesDefault = '/cars';
+const carsRoutes = {
+ list: {
+ url: `${carsRoutesDefault}/list`
+ }
+}
+
+export default carsRoutes;
\ No newline at end of file
diff --git a/src/constants/routes/sessionRoutes.ts b/src/constants/routes/sessionRoutes.ts
new file mode 100644
index 0000000..11717b1
--- /dev/null
+++ b/src/constants/routes/sessionRoutes.ts
@@ -0,0 +1,11 @@
+const sessionRoutesDefault = '/sessions';
+const sessionRoutes = {
+ create: {
+ url: `${sessionRoutesDefault}/`
+ },
+ refresh: {
+ url: `${sessionRoutesDefault}/refresh`
+ }
+}
+
+export default sessionRoutes;
\ No newline at end of file
diff --git a/src/constants/routes/usersRoutes.ts b/src/constants/routes/usersRoutes.ts
new file mode 100644
index 0000000..eeceedc
--- /dev/null
+++ b/src/constants/routes/usersRoutes.ts
@@ -0,0 +1,27 @@
+const usersRoutesDefault = '/users';
+const usersRoutes = {
+ create: {
+ url: `${usersRoutesDefault}`
+ },
+ get: {
+ url: `${usersRoutesDefault}`
+ },
+ update: {
+ url: `${usersRoutesDefault}/edit`
+ },
+ checkIfUserIsDriver: {
+ url: `${usersRoutesDefault}/isDriver`
+ },
+ getSocialInfo: {
+ url: `${usersRoutesDefault}/social`
+ },
+ // TODO, depois corrigir
+ getUsersSearching: {
+ url: `/search/inraio`
+ },
+ createUserSearch: {
+ url: `${usersRoutesDefault}/search`
+ },
+}
+
+export default usersRoutes;
\ No newline at end of file
diff --git a/src/constants/routes/vansLocatorsRoutes.ts b/src/constants/routes/vansLocatorsRoutes.ts
new file mode 100644
index 0000000..1f57945
--- /dev/null
+++ b/src/constants/routes/vansLocatorsRoutes.ts
@@ -0,0 +1,17 @@
+const vansRoutesDefault = '/vans/locator';
+const vansRoutes = {
+ list: {
+ url: `${vansRoutesDefault}/list`
+ },
+ getById: {
+ url: `${vansRoutesDefault}/`
+ },
+ create: {
+ url: `${vansRoutesDefault}/`
+ },
+ update: {
+ url: `${vansRoutesDefault}/edit`
+ }
+}
+
+export default vansRoutes;
\ No newline at end of file
diff --git a/src/constants/routes/vansRoutes.ts b/src/constants/routes/vansRoutes.ts
new file mode 100644
index 0000000..7bfcd2d
--- /dev/null
+++ b/src/constants/routes/vansRoutes.ts
@@ -0,0 +1,20 @@
+const vansRoutesDefault = '/vans';
+const vansRoutes = {
+ list: {
+ url: `${vansRoutesDefault}/list`
+ },
+ getByPlate: {
+ url: `${vansRoutesDefault}/plate`
+ },
+ getByUserId: {
+ url: `${vansRoutesDefault}/user`
+ },
+ create: {
+ url: `${vansRoutesDefault}/`
+ },
+ update: {
+ url: `${vansRoutesDefault}/`
+ }
+}
+
+export default vansRoutes;
\ No newline at end of file
diff --git a/src/models/van.model.ts b/src/models/van.model.ts
new file mode 100644
index 0000000..ae90e2b
--- /dev/null
+++ b/src/models/van.model.ts
@@ -0,0 +1,8 @@
+export type Van = {
+ id: number;
+ carPlate: string;
+ carBrand: string;
+ carModel: string;
+ maxPassengers: number;
+ isRent: string;
+};
diff --git a/src/pages/BuscarPassageiro/BuscarPassageiro.css b/src/pages/BuscarPassageiro/BuscarPassageiro.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/BuscarPassageiro/BuscarPassageiro.tsx b/src/pages/BuscarPassageiro/BuscarPassageiro.tsx
new file mode 100644
index 0000000..b03819d
--- /dev/null
+++ b/src/pages/BuscarPassageiro/BuscarPassageiro.tsx
@@ -0,0 +1,127 @@
+import { IonContent, IonPage, IonFab, IonFabButton, IonIcon } from '@ionic/react';
+import { search } from 'ionicons/icons';
+import './BuscarPassageiro.css';
+
+import { Map, Marker, Overlay } from "pigeon-maps";
+import { maptiler } from 'pigeon-maps/providers';
+import { useEffect, useState } from 'react';
+
+import RecordsStore from '../../store/RecordsStore';
+import { fetchRecords } from '../../store/Selectors';
+import { getUsersSearching } from '../../services/api/users';
+import { UserSearchInfos } from '../../components/UserSearchInfos/UserSearchInfos';
+
+const maptilerProvider = maptiler('d5JQJPLLuap8TkJJlTdJ', 'streets');
+
+const BuscarPassageiro: React.FC = () => {
+
+ // UNCOMMENT THESE TO USE CURRENT LOCATION.
+
+ // const [ currentPoint, setCurrentPoint ] = useState(false);
+
+ // useEffect(() => {
+
+ // const getCurrentLocation = async () => {
+
+ // const fetchedLocation = await getLocation();
+ // setCurrentPoint(fetchedLocation.currentLocation);
+ // }
+
+ // getCurrentLocation();
+ // }, []);
+
+ // useIonViewWillEnter(() => {
+
+ // getUsersSearching(currentPoint);
+ // });
+
+ const [ currentPoint, setCurrentPoint ] = useState({ latitude: -22.907829, longitude: -47.062943 });
+
+ const records = RecordsStore.useState(fetchRecords);
+ const center = { latitude: -22.907829, longitude: -47.062943 };
+
+ const [ results, setResults ] = useState([]);
+ const [ zoom, setZoom ] = useState(14);
+
+ const [ moveMode, setMoveMode ] = useState(false);
+
+ // useEffect(() => {
+
+ // const getData = async () => {
+
+ // await getUsersSearching(currentPoint);
+ // }
+
+ // getData();
+ // }, [ currentPoint ]);
+
+ useEffect(() => {
+
+ setResults(records);
+ }, [ records ]);
+
+ const hideMarkers = () => {
+ console.log('entrou')
+ const tempRecords = JSON.parse(JSON.stringify(results));
+ tempRecords.forEach((tempRecord:any) => tempRecord.showInfo = false);
+ console.log(tempRecords)
+ setResults(tempRecords);
+ }
+
+ const handleMap = (e:any) => {
+ setCurrentPoint({ latitude: e.center[0], longitude: e.center[1] });
+ }
+
+ const searchResults = async () => {
+ await getUsersSearching(currentPoint);
+ }
+
+ const showMarkerInfo = (e:any, index:any) => {
+
+ const tempRecords = JSON.parse(JSON.stringify(results));
+
+ // Hide all current marker infos
+ !tempRecords[index].showInfo && tempRecords.forEach((tempRecord:any) => tempRecord.showInfo = false);
+ tempRecords[index].showInfo = !tempRecords[index].showInfo;
+
+ console.log(tempRecords)
+ setResults(tempRecords);
+ }
+
+ return (
+
+
+
+ setInputActiveOpenModal("from")}
+ value={addressFrom}
+ placeholder="R. José Paulino, 1234 - Centro, Campinas - SP, 13013-001"
+ /> */}
+
+
+ setInputActiveOpenModal("to")}
+ value={addressTo}
+ placeholder="PUC Campinas"
+ /> */}
+
+
+ buscaTransporte()}
+ >
+ Buscar
+
+
+
+ Rua Tal Tal, 154, São Paulo - SP
+
+ Há 1 hora +
+ + Há 1 hora +
+ Taquaral
+
+ Há 2 hora +
+ + 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}
+
+ );
+ })
+ ) : (
+ <>
+ + + )} +
@@ -151,7 +161,7 @@ const Cadastro: React.FC = () => {
Sobrenome
setLastName(e.target.value)}
+ onIonChange={(e: any) => setLastName(e.target.value)}
>
@@ -162,7 +172,7 @@ const Cadastro: React.FC = () => {
setEmail(e.target.value)}
+ onIonChange={(e: any) => setEmail(e.target.value)}
>
@@ -171,7 +181,7 @@ const Cadastro: React.FC = () => {
Data de nascimento
setBirthDate(e.target.value)}
+ onIonChange={(e: any) => setBirthDate(e.target.value)}
>
@@ -181,7 +191,7 @@ const Cadastro: React.FC = () => {
setPassword(e.target.value)}
+ onIonChange={(e: any) => setPassword(e.target.value)}
>
@@ -189,7 +199,7 @@ const Cadastro: React.FC = () => {
setConfirmPassword(e.target.value)}
+ onIonChange={(e: any) => setConfirmPassword(e.target.value)}
>
@@ -202,9 +212,9 @@ const Cadastro: React.FC = () => {
*/} + setShowToast(false)}
message={messageToast}
diff --git a/src/pages/CadastroCompletar/CadastroCompletar.tsx b/src/pages/CadastroCompletar/CadastroCompletar.tsx
new file mode 100644
index 0000000..de2c677
--- /dev/null
+++ b/src/pages/CadastroCompletar/CadastroCompletar.tsx
@@ -0,0 +1,142 @@
+import {
+IonBackButton,
+IonButtons,
+IonCard,
+IonCardContent,
+IonContent,
+IonHeader,
+IonIcon,
+IonItem,
+IonLabel,
+IonPage,
+IonTitle,
+IonToast,
+IonToolbar
+} from "@ionic/react";
+import React, { useEffect, useReducer, useState } from "react";
+
+import '../Perfil.css'
+import { useHistory, useLocation } from "react-router";
+import { callOutline, documentTextOutline } from "ionicons/icons";
+
+import '../Cadastro/Cadastro.css'
+import { Color } from "@ionic/react/node_modules/@ionic/core";
+
+interface cardItem {
+ icon: string;
+ label: string;
+ description: string;
+ url: string;
+ required: boolean;
+}
+
+interface userData {
+ name: string;
+ lastname: string;
+ email: string;
+ phone_number: string;
+ birth_date: string;
+ bio: string;
+ document_type: string;
+ document: string;
+}
+
+interface LocationState {
+ userData: userData;
+
+ redirectData?: {
+ showToastMessage: boolean;
+ toastColor: Color;
+ toastMessage: string;
+ }
+}
+
+let items: cardItem[] = [
+ {
+ icon: documentTextOutline,
+ label: 'Documento',
+ description: 'Cadastre seu documento para que seu perfil possa ser verificado',
+ url: '/perfil/completar/documento',
+ required: false
+ },
+ {
+ icon: callOutline,
+ label: 'Informações de contato',
+ description: 'Cadastre seu número de telefone celular que para possam contatar você',
+ url: '/perfil/completar/telefone',
+ required: false
+ }
+]
+
+const CadastroCompletar: React.FC = () => {
+ const history = useHistory();
+ const location = useLocation();
+
+ const [showToast, setShowToast] = useState(false);
+ const [toastMessage, setToastMessage] = useState('');
+ const [toastColor, setToastColor] = useState("primary");
+
+ const handleCardClick = (item: cardItem) => {
+ if (!item.required) return
+
+ history.push({ pathname: item.url, state: { userData: location.state.userData } });
+ }
+
+ useEffect(() => {
+ if (!location.state || !location.state.userData) {
+ history.push({ pathname: '/perfil' })
+ }
+
+ if (location.state && location.state.redirectData) {
+ const redirectData = location.state.redirectData
+
+ if (redirectData.showToastMessage) {
+ setToastColor(redirectData.toastColor)
+ setToastMessage(redirectData.toastMessage)
+ setShowToast(true)
+ }
+ }
+
+ if (!location.state.userData.document) items[0].required = true
+ if (!location.state.userData.phone_number) items[1].required = true
+ }, []);
+
+ return (
+
+
+
+ Completar cadastro
+
+
+
+
+
+
+ { items.map((item, index) => {
+ return (
+ { handleCardClick(item) }}>
+
+ {item.label}
+
+
+ {item.description}
+
+ )
+ })}
+
+ setShowToast(false)}
+ message={toastMessage}
+ duration={2500}
+ />
+
+
+ );
+};
+
+export default CadastroCompletar;
diff --git a/src/pages/CadastroCompletar/CompletarDocumento.tsx b/src/pages/CadastroCompletar/CompletarDocumento.tsx
new file mode 100644
index 0000000..5fc9a8c
--- /dev/null
+++ b/src/pages/CadastroCompletar/CompletarDocumento.tsx
@@ -0,0 +1,219 @@
+import {
+ IonBackButton,
+ IonButtons,
+ IonContent,
+ IonFab,
+ IonFabButton,
+ IonHeader,
+ IonIcon,
+ IonList,
+ IonPage,
+ IonSelect,
+ IonSelectOption,
+ IonTitle,
+ IonToast,
+ IonToolbar
+} from "@ionic/react";
+import React, { useEffect, useState } from "react";
+import { IonGrid, IonRow, IonCol } from "@ionic/react";
+import { useHistory, useLocation } from "react-router-dom";
+import {
+ IonItem,
+ IonLabel,
+ IonInput,
+} from "@ionic/react";
+
+import { saveOutline } from "ionicons/icons";
+
+import * as usersRoutes from '../../services/api/users';
+
+import validateCpf from '../../services/validateCpf'
+
+interface documentTypesInterface {
+ label: string;
+ name: string;
+}
+
+interface userData {
+ name: string;
+ lastname: string;
+ email: string;
+ phone_number: string;
+ birth_date: string;
+ bio: string;
+ document_type: string;
+ document: string;
+}
+
+interface LocationState {
+ userData: userData;
+}
+
+const CompletarDocumento: React.FC = () => {
+ const location = useLocation();
+
+ const [hasChangedSinceInitialState, setHasChangedSinceInitialState] = useState(false);
+
+ const [documentTypes, setDocumentTypes] = useState([]);
+
+ const [document, setDocument] = useState('');
+ const [documentType, setDocumentType] = useState('');
+
+ const [documentMaxLength, setDocumentMaxLength] = useState(0);
+
+ const [showToast, setShowToast] = useState(false);
+ const [messageToast, setMessageToast] = useState('');
+
+ const history = useHistory();
+
+ const validateform = () => {
+ if (isNaN((Number)(document))) {
+ setMessageToast('Documento pode conter apenas números!')
+ setShowToast(true)
+ return false
+ }
+
+ if (documentType === 'cpf' && !validateCpf(document)) {
+ setMessageToast('CPF inválido!')
+ setShowToast(true)
+ return false
+ }
+
+ return true
+ }
+
+ const handleUpdateUserDocuments = async () => {
+ if (!validateform()) {
+ return
+ }
+
+ usersRoutes.update({ document_type: documentType, document: document }).then(response => {
+ if (response.status === 'error') {
+ setMessageToast(response.message);
+ setShowToast(true);
+
+ return
+ }
+
+ history.push({ pathname: '/perfil', state: {
+ redirectData: {
+ showToastMessage: true,
+ toastColor: "success",
+ toastMessage: response.message,
+ }
+ }})
+ }).catch((err) => {
+ setMessageToast(err);
+ setShowToast(true);
+ })
+ };
+
+ const handleChangeDocumentType = (document_type: string) => {
+ switch(document_type) {
+ case 'cpf':
+ setDocumentType('cpf') // workaround para o problema de setState para valores vindos de um evento sendo triggerado por um ion-select
+ setDocumentMaxLength(11)
+ break;
+ case 'cnh':
+ setDocumentType('cnh') // workaround para o problema de setState para valores vindos de um evento sendo triggerado por um ion-select
+ setDocumentMaxLength(11)
+ break;
+ case 'rg':
+ setDocumentType('rg') // workaround para o problema de setState para valores vindos de um evento sendo triggerado por um ion-select
+ setDocumentMaxLength(9)
+ break;
+ }
+ }
+
+ useEffect(() => {
+ if (!location.state.userData) {
+ history.push({ pathname: '/perfil', state: {
+ redirectData: {
+ showToastMessage: true,
+ toastColor: "warning",
+ toastMessage: "Houve um erro. Por favor, tente novamente.",
+ }, userData: location.state.userData
+ }})
+ }
+
+ setDocumentTypes([
+ {
+ name: 'cpf',
+ label: 'CPF',
+ },
+ {
+ name: 'rg',
+ label: 'RG',
+ },
+ {
+ name: 'cnh',
+ label: 'CNH',
+ },
+ ])
+ }, [])
+
+ return (
+
+
+
+ Completar cadastro
+
+
+
+
+
+
+
+
+ Completar cadastro
+
+
+
+
+
+
+
+
+ Tipo de documento
+ { handleChangeDocumentType(e.detail.value) } }>
+ { documentTypes ? documentTypes.map((document, index) => {
+ return ({document.label} )
+ }) : <> }
+
+
+
+ Documento
+ { setDocument(e.target.value); setHasChangedSinceInitialState(true) }}
+ >
+
+
+
+
+
+
+
+
+
+
+
+ setShowToast(false)}
+ message={messageToast}
+ duration={2500}
+ />
+
+
+ );
+};
+
+export default CompletarDocumento;
+
\ No newline at end of file
diff --git a/src/pages/CadastroCompletar/CompletarTelefone.tsx b/src/pages/CadastroCompletar/CompletarTelefone.tsx
new file mode 100644
index 0000000..f739146
--- /dev/null
+++ b/src/pages/CadastroCompletar/CompletarTelefone.tsx
@@ -0,0 +1,169 @@
+import {
+ IonBackButton,
+ IonButtons,
+ IonContent,
+ IonFab,
+ IonFabButton,
+ IonHeader,
+ IonIcon,
+ IonList,
+ IonPage,
+ IonTitle,
+ IonToast,
+ IonToolbar
+} from "@ionic/react";
+import React, { useState, useEffect } from "react";
+import { IonGrid, IonRow, IonCol } from "@ionic/react";
+import { useHistory, useLocation } from "react-router-dom";
+import {
+ IonItem,
+ IonLabel,
+ IonInput,
+} from "@ionic/react";
+
+import { saveOutline } from "ionicons/icons";
+
+import * as usersRoutes from '../../services/api/users';
+import { Color } from "@ionic/react/node_modules/@ionic/core";
+
+interface documentTypesInterface {
+ label: string;
+ name: string;
+}
+
+interface userData {
+ name: string;
+ lastname: string;
+ email: string;
+ phone_number: string;
+ birth_date: string;
+ bio: string;
+ document_type: string;
+ document: string;
+}
+
+interface LocationState {
+ userData: userData;
+}
+
+const CompletarTelefone: React.FC = () => {
+ const location = useLocation();
+
+ const [hasChangedSinceInitialState, setHasChangedSinceInitialState] = useState(false);
+
+ const [phone, setPhone] = useState('');
+
+ const [showToast, setShowToast] = useState(false);
+ const [messageToast, setMessageToast] = useState('');
+ const [toastColor, setToastColor] = useState("primary");
+
+ const history = useHistory();
+
+ const validateform = () => {
+ if (isNaN((Number)(phone))) {
+ setMessageToast('O telefone pode conter apenas números!')
+ setShowToast(true)
+ return false
+ }
+
+ return true
+ }
+
+ const handleUpdateUserDocuments = async () => {
+ if (!validateform()) {
+ return
+ }
+
+ usersRoutes.update({ phone_number: phone }).then(response => {
+ if (response.status === 'error') {
+ setToastColor("warning")
+ setMessageToast(response.message);
+ setShowToast(true);
+
+ return
+ }
+
+ const userDataObj = location.state.userData
+
+ history.push({ pathname: '/perfil', state: {
+ redirectData: {
+ showToastMessage: true,
+ toastColor: "success",
+ toastMessage: response.message,
+ },
+ }})
+ }).catch((err) => {
+ setMessageToast(err);
+ setShowToast(true);
+ })
+ };
+
+ useEffect(() => {
+ if (!location.state.userData) {
+ history.push({ pathname: '/perfil', state: {
+ redirectData: {
+ showToastMessage: true,
+ toastColor: "warning",
+ toastMessage: "Houve um erro. Por favor, tente novamente.",
+ }
+ }})
+ }
+ }, [])
+
+ return (
+
+
+
+ Completar cadastro
+
+
+
+
+
+
+
+
+ Completar cadastro
+
+
+
+
+
+
+
+
+ Telefone
+ { setPhone(e.target.value); setHasChangedSinceInitialState(true) }}
+ >
+
+
+
+
+
+
+
+
+
+
+
+ setShowToast(false)}
+ message={messageToast}
+ duration={2500}
+ />
+
+
+ );
+};
+
+export default CompletarTelefone;
+
\ No newline at end of file
diff --git a/src/pages/CadastroVan.css b/src/pages/CadastroVan.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/CadastroVan.tsx b/src/pages/CadastroVan.tsx
new file mode 100644
index 0000000..7091ce7
--- /dev/null
+++ b/src/pages/CadastroVan.tsx
@@ -0,0 +1,355 @@
+import {
+ IonToast,
+ IonItem,
+ IonLabel,
+ IonInput,
+ IonBackButton,
+ IonButton,
+ IonButtons,
+ IonContent,
+ IonHeader,
+ IonPage,
+ IonToolbar,
+ IonTitle,
+ IonList,
+ IonCheckbox,
+ IonListHeader,
+ IonSelect,
+ IonSelectOption,
+} from "@ionic/react";
+
+import React, { useEffect, useReducer, useState } from "react";
+import { useHistory } from "react-router-dom";
+
+// import * as yup from 'yup';
+
+import carsService from '../services/functions/carsService'
+
+import * as vansRoutes from '../services/api/vans';
+
+import "./CadastroVan.css";
+import { Color } from "@ionic/react/node_modules/@ionic/core";
+
+const CadastroVan: React.FC = () => {
+ const history = useHistory();
+
+ const [showToast, setShowToast] = useState(false);
+ const [toastMessage, setToastMessage] = useState("");
+ const [toastColor, setToastColor] = useState("primary");
+
+ const [carModels, setCarModels] = useState([{
+ id_model: '',
+ name: ''
+ }]);
+
+ const [inputValues, setInputValues] = useReducer(
+ (state: any, newState: any) => ({ ...state, ...newState }),
+ {
+ carPlate: '',
+ carBrand: '',
+ carModel: '',
+ seats_number: 1,
+ isRented: false,
+ locator_name: '',
+ locator_address: '',
+ locator_complement: '',
+ locator_city: '',
+ locator_state: '',
+ }
+ );
+
+ const clearRentalData = () => {
+ setInputValues({
+ carRentalName: '',
+ complement: '',
+ city: '',
+ state: '',
+ })
+ };
+
+ const validateForm = (): boolean => {
+ const vanForm = {
+ carPlate: inputValues.carPlate,
+ carBrand: inputValues.carBrand,
+ carModel: inputValues.carModel,
+ seats_number: inputValues.seats_number,
+ isRented: inputValues.isRented,
+ };
+
+ if (
+ !vanForm.carPlate ||
+ vanForm.carPlate.length !== 7 ||
+ !vanForm.carPlate.match(/([A-z0-9]){7}/g)
+ ) {
+ setToastMessage("Placa do veículo inválida!");
+ setShowToast(true);
+ return false;
+ }
+
+ if (!vanForm.carBrand) {
+ setToastMessage("Marca do veículo é obrigatório");
+ setShowToast(true);
+ return false;
+ }
+
+ if (!vanForm.carModel) {
+ setToastMessage("Modelo do veículo é obrigatório");
+ setShowToast(true);
+ return false;
+ }
+
+ if (!vanForm.seats_number || !parseInt(`${vanForm.seats_number}`)) {
+ setToastMessage("Número de passageiros inválido");
+ setShowToast(true);
+ return false;
+ }
+
+ if ((Number)(vanForm.seats_number) < 1) {
+ setToastMessage("Número de passageiros deve ser positivo!");
+ setShowToast(true);
+ return false;
+ }
+
+ if (vanForm.isRented) {
+ return validateRentalForm();
+ } else {
+ clearRentalData();
+ }
+
+ return true;
+ };
+
+ const validateRentalForm = (): boolean => {
+ const locatorForm = {
+ locator_name: inputValues.locator_name,
+ locator_address: inputValues.locator_address,
+ locator_complement: inputValues.locator_complement,
+ locator_city: inputValues.locator_city,
+ locator_state: inputValues.locator_state,
+ }
+
+ if (!locatorForm.locator_name) {
+ setToastMessage("Nome do Locador é obrigatório");
+ setShowToast(true);
+ return false;
+ }
+
+ if (
+ !locatorForm.locator_city ||
+ !locatorForm.locator_city.match(/([A-zà-úÀ-Ú])/g)
+ ) {
+ setToastMessage("Cidade inválida");
+ setShowToast(true);
+ return false;
+ }
+
+ if (
+ !locatorForm.locator_state ||
+ !locatorForm.locator_state.match(/([A-zà-úÀ-Ú])/g)
+ ) {
+ setToastMessage("Estado inválido");
+ setShowToast(true);
+ return false;
+ }
+
+ return true;
+ };
+
+ const handleSubmit = async () => {
+ if (!validateForm()) {
+ return
+ }
+
+ // cria registro da van
+ await vansRoutes.create({
+ plate: inputValues.carPlate,
+ brand: inputValues.carBrand,
+ model: inputValues.carModel,
+ seats_number: inputValues.seats_number,
+ locator_name: inputValues.locator_name,
+ locator_address: inputValues.locator_address,
+ locator_complement: inputValues.locator_complement,
+ locator_city: inputValues.locator_city,
+ locator_state: inputValues.locator_state
+ }).then(response => {
+ if (response.status === 'error') {
+ setToastMessage(response.message);
+ setShowToast(true);
+
+ return
+ }
+
+ history.push({ pathname: '/perfil', state: {
+ redirectData: {
+ showToastMessage: true,
+ toastColor: "success",
+ toastMessage: response.message,
+ },
+ }})
+ }).catch((err) => {
+ setToastColor("danger")
+ setToastMessage(err);
+ setShowToast(true);
+ })
+ };
+
+ useEffect(() => {
+ let isMounted = true
+
+ const getCarsModels = async () => {
+ const carModelsRes = await carsService.getAllCarModels()
+
+ if (carModelsRes.error) {
+ setToastColor("danger")
+ setToastMessage(carModelsRes.error.errorMessage);
+ setShowToast(true);
+ return
+ }
+
+ if (carModelsRes.data) {
+ if (isMounted) {
+ setCarModels(carModelsRes.data)
+ }
+ }
+ }
+
+ getCarsModels()
+
+ return () => { isMounted = false }
+ }, [])
+
+ return (
+
+
+
+ Cadastro de veículo
+
+
+
+
+
+
+
+
+ Informações do veículo
+
+
+ Placa
+ setInputValues({ carPlate: e.target.value })}
+ />
+
+
+ {/* TODO, problema de setState para valores vindos de um evento sendo triggerado por um ion-select */}
+
+ Marca
+ { setInputValues({ carBrand: e.detail.value }) }}>
+ { carModels ? carModels.map((carModel, index) => {
+ return ({carModel.name} )
+ }) : <> }
+
+
+
+
+ Modelo
+ setInputValues({ carModel: e.target.value })}
+ />
+
+
+
+
+ Número de assentos
+
+ setInputValues({ seats_number: e.target.value })}
+ />
+
+
+
+
+
+ Informações do locador
+
+
+
+ O veículo é alugado?
+ setInputValues({ isRented: e.detail.checked })} />
+
+
+ {inputValues.isRented && (
+
+
+ setShowToast(false)}
+ message={toastMessage}
+ duration={2500}
+ />
+
+
+ );
+};
+
+export default CadastroVan;
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index 2169533..1306fd4 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -1,56 +1,74 @@
-import { IonItem, IonLabel, IonInput, IonButton, IonCardTitle, IonCol, IonContent, IonGrid, IonPage, IonRow } from '@ionic/react';
-import { Action } from '../components/Action';
+import { IonContent, IonPage, IonToast } from '@ionic/react';
+import { Color } from '@ionic/react/node_modules/@ionic/core';
+import { useContext, useEffect, useState } from 'react';
+import { useLocation } from 'react-router';
+
+import { UserContext } from '../App';
+
+import * as sessionRoutes from '../services/api/session';
+
+interface LocationState {
+ redirectData?: {
+ showToastMessage: boolean;
+ toastColor: Color;
+ toastMessage: string;
+ }
+}
const Home: React.FC = () => {
+ const location = useLocation();
+
+ const user = useContext(UserContext);
+
+ const [showToast, setShowToast] = useState(false);
+ const [toastMessage, setToastMessage] = useState('');
+ const [toastColor, setToastColor] = useState("primary");
+
+ useEffect(() => {
+ if (location.state && location.state.redirectData) {
+ const redirectData = location.state.redirectData
+
+ if (redirectData.showToastMessage) {
+ setToastColor(redirectData.toastColor)
+ setToastMessage(redirectData.toastMessage)
+ setShowToast(true)
+ }
+ }
+
+ const refreshUserToken = async () => {
+ await sessionRoutes.refresh().then(response => {
+ if (response.status === 'error') {
+ // setMessageToast(response.message);
+ // setShowToast(true);
+
+ return
+ }
+
+ user.setIsLoggedIn(true);
+ }).catch(error => {
+ // if (!error.response) return
+
+ // se o backend retornou uma mensagem de erro customizada
+ // if (error.response.data.message) {
+ console.dir('Houve um erro: ', { error })
+ alert('Houve um erro')
+ })
+ }
+
+ refreshUserToken()
+ }, [])
+
return (
-
-
-
-
- Como você deseja se cadastrar?
-
-
-
-
-
- E-mail
-
-
-
- Data de nascimento
-
-
-
- Senha
-
-
- Confirme a senha
-
-
- Cadastrar-se
-
-
-
- Ao se cadastrar, você aceita nossos Termos e Condições e nossa Política de Privacidade.
-
-
+
+ setShowToast(false)}
+ message={toastMessage}
+ duration={2500}
+ />
);
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
new file mode 100644
index 0000000..da97644
--- /dev/null
+++ b/src/pages/Login.tsx
@@ -0,0 +1,174 @@
+import {
+ IonContent,
+ IonHeader,
+ IonPage,
+ IonTitle,
+ IonToolbar
+} from "@ionic/react";
+import React, { useContext, useState } from "react";
+import { IonGrid, IonRow, IonCol, IonToast } from "@ionic/react";
+import { useHistory } from "react-router-dom";
+import {
+ IonItem,
+ IonLabel,
+ IonInput,
+ IonButton,
+} from "@ionic/react";
+
+import * as sessionRoutes from '../services/api/session';
+import LocalStorage from '../LocalStorage';
+import { Action } from "../components/Action";
+import { UserContext } from "../App";
+
+const Page: React.FC = () => {
+ const [showToast, setShowToast] = useState(false);
+ const [messageToast, setMessageToast ] = useState('');
+
+ const history = useHistory();
+ const [email, setEmail] = useState('');
+ const [password, setPassword] = useState('');
+
+ const user = useContext(UserContext);
+
+ function validateEmail(email: string) {
+ const re =
+ // eslint-disable-next-line no-control-regex
+ /^((?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\]))$/;
+ return re.test(String(email).toLowerCase());
+ }
+
+ const validateForm = () => {
+ if (!email) {
+ setMessageToast("Por favor, informe o e-mail");
+ setShowToast(true);
+ return false;
+ }
+
+ if (!validateEmail(email)) {
+ setMessageToast("E-mail inválido");
+ setShowToast(true);
+ return false;
+ }
+
+ if (!password) {
+ setMessageToast("Por favor, digite a sua senha");
+ setShowToast(true);
+ return false;
+ }
+
+ if(password.length < 7 || password.length > 12) {
+ setMessageToast("A senha deve conter entre 7 e 12 dígitos");
+ setShowToast(true);
+ return false;
+ }
+
+ return true;
+ }
+
+ const handleLogin = async () => {
+ if (!validateForm()) {
+ return
+ }
+
+ const singinForm = {
+ login: email,
+ password: password,
+ };
+
+ await sessionRoutes.create(singinForm).then(response => {
+ if (response.status === 'error') {
+ setMessageToast(response.message);
+ setShowToast(true);
+
+ return
+ }
+
+ const { token } = response.token
+
+ LocalStorage.setToken(token);
+
+ user.setIsLoggedIn(true);
+
+ history.push({ pathname: '/home', state: { redirectData: {
+ showToastMessage: true,
+ toastColor: "success",
+ toastMessage: "Usuário autenticado com sucesso!",
+ }}})
+ }).catch(error => {
+ // if (!error.response) return
+
+ // se o backend retornou uma mensagem de erro customizada
+ // if (error.response.data.message) {
+ console.dir('Houve um erro: ', { error })
+ alert('Houve um erro')
+ })
+ };
+
+ return (
+
+
+
+ Login
+
+
+
+
+
+
+ Login
+
+
+
+
+
+
+
+ Email
+ setEmail(e.detail.value!)}
+ >
+
+
+
+
+
+
+
+ Senha
+ setPassword(e.detail.value!)}
+ >
+
+
+
+
+
+
+
+ Login
+
+
+
+
+
+ setShowToast(false)}
+ message={messageToast}
+ duration={2500}
+ />
+
+
+ );
+};
+
+export default Page;
diff --git a/src/pages/MainPages.tsx b/src/pages/MainPages.tsx
deleted file mode 100644
index 3803212..0000000
--- a/src/pages/MainPages.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { useState, useRef } from 'react';
-import {
- IonTabs,
- IonTabBar,
- IonTabButton,
- IonLabel,
- IonPage,
- IonIcon,
- IonRouterOutlet
-} from '@ionic/react';
-import { Redirect, Route } from 'react-router-dom';
-import { IonReactRouter } from '@ionic/react-router';
-import { search, home, person } from 'ionicons/icons';
-
-import Home from './Home';
-
-export const MainPages: React.FC = () => {
-
- return (
-
-
-
-
-
-
-
-
- Buscar
-
-
- Home
-
-
- Perfil
-
-
-
- )
-}
-
-export default MainPages;
\ No newline at end of file
diff --git a/src/pages/MinhasVans.tsx b/src/pages/MinhasVans.tsx
new file mode 100644
index 0000000..904478c
--- /dev/null
+++ b/src/pages/MinhasVans.tsx
@@ -0,0 +1,118 @@
+import { IonBackButton, IonButtons, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonContent, IonHeader, IonIcon, IonItem, IonLabel, IonPage, IonTitle, IonToast, IonToolbar } from '@ionic/react';
+import { Color } from '@ionic/react/node_modules/@ionic/core';
+import { carOutline } from 'ionicons/icons';
+import { useContext, useEffect, useState } from 'react';
+import { useHistory, useLocation } from 'react-router';
+
+import { UserContext } from '../App';
+
+import * as vansRoutes from '../services/api/vans';
+
+import sessionsService from '../services/functions/sessionsService'
+
+interface VanInfo {
+ plate: string;
+ brand: string;
+ model: string;
+ seats_number: string;
+ document_status: boolean,
+ locator_name: string;
+ locator_address: string;
+ locator_complement: string;
+ locator_city: string;
+ locator_state: string;
+}
+
+const MinhasVans: React.FC = () => {
+ const history = useHistory();
+
+ const [showToast, setShowToast] = useState(false);
+ const [toastMessage, setToastMessage] = useState('');
+ const [toastColor, setToastColor] = useState("primary");
+
+ const [userVans, setUserVans] = useState();
+
+ const redirectUserToLogin = () => {
+ history.push({ pathname: '/login' });
+ }
+
+ useEffect(() => {
+ const getUserVans = async () => {
+ let userId = ''
+
+ const refreshSessionRes = await sessionsService.refreshSession()
+
+ if (refreshSessionRes.error) {
+ redirectUserToLogin()
+ return
+ }
+
+ if (refreshSessionRes.userId) {
+ userId = refreshSessionRes.userId
+ }
+
+ vansRoutes.getByUserId(userId).then(response => {
+ if (response.status === 'error') {
+ setToastColor("danger")
+ setToastMessage(response.message);
+ setShowToast(true);
+
+ return
+ }
+
+ setUserVans(response.data)
+ }).catch((err) => {
+ setToastColor("danger")
+ setToastMessage(err);
+ setShowToast(true);
+ })
+ }
+
+ getUserVans()
+ }, [])
+
+ return (
+
+
+
+ Minhas vans
+
+
+
+
+
+
+ { userVans ? userVans.map((van, index) => {
+ return (
+
+
+ {van.plate}
+ {van.brand} - {van.model}
+
+ { van.locator_name ?
+ <>
+ {van.seats_number} assentos - Locador: {van.locator_name}
+ :
+ <>
+ {van.seats_number} assentos - Não é alugado
+
+ }
+
+ )
+ }) : <>}
+
+ setShowToast(false)}
+ message={toastMessage}
+ duration={2500}
+ />
+
+
+ );
+};
+
+export default MinhasVans;
diff --git a/src/pages/Perfil.css b/src/pages/Perfil.css
new file mode 100644
index 0000000..1efc84d
--- /dev/null
+++ b/src/pages/Perfil.css
@@ -0,0 +1,16 @@
+#avatar {
+ border-radius: 50%;
+ width: 100px;
+ height: 100px;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+#profile-status {
+ text-align: center;
+}
+
+IonIcon {
+ color: blue;
+}
\ No newline at end of file
diff --git a/src/pages/Perfil.tsx b/src/pages/Perfil.tsx
new file mode 100644
index 0000000..3661c11
--- /dev/null
+++ b/src/pages/Perfil.tsx
@@ -0,0 +1,328 @@
+import {
+ IonBackButton,
+ IonBadge,
+ IonButtons,
+ IonCard,
+ IonCardContent,
+ IonCardHeader,
+ IonCardTitle,
+ IonChip,
+ IonContent,
+ IonHeader,
+ IonIcon,
+ IonItem,
+ IonLabel,
+ IonList,
+ IonListHeader,
+ IonPage,
+ IonTitle,
+ IonToast,
+ IonToolbar,
+} from "@ionic/react";
+import { useHistory, useLocation } from "react-router-dom";
+import React, { useState, useEffect, useReducer, useContext } from "react";
+import { callOutline, cardOutline, carOutline, createOutline, exitOutline, logoFacebook, logoWhatsapp, personOutline, shieldCheckmarkOutline, starOutline } from "ionicons/icons";
+
+import './Perfil.css'
+import LocalStorage from "../LocalStorage";
+
+import sessionsService from '../services/functions/sessionsService'
+import usersService from '../services/functions/usersService'
+import { UserContext } from "../App";
+import { Color } from "@ionic/react/node_modules/@ionic/core";
+
+interface ScanNewProps {
+ match: {
+ params: {
+ id: string;
+ }
+ }
+}
+
+interface LocationState {
+ redirectData?: {
+ showToastMessage: boolean;
+ toastColor: Color;
+ toastMessage: string;
+ }
+}
+
+const Perfil: React.FC = (props) => {
+ const user = useContext(UserContext);
+
+ const history = useHistory();
+ const location = useLocation();
+
+ const [isVisitor, setIsVisitor] = useState(true)
+ const [isDriver, setIsDriver] = useState(false)
+
+ const [incompleteProfile, setIncompleteProfile] = useState(false)
+ const [incompleteProfileCounter, setIncompleteProfileCounter] = useState(0)
+
+ const [showToast, setShowToast] = useState(false);
+ const [toastMessage, setToastMessage] = useState('');
+ const [toastColor, setToastColor] = useState("primary");
+
+ const [inputValues, setInputValues] = useReducer(
+ (state: any, newState: any) => ({ ...state, ...newState }),
+ {
+ id: '',
+ name: '',
+ lastname: '',
+ email: '',
+ phone_number: '',
+ birth_date: '',
+ bio: '',
+ document_type: '',
+ document: '',
+ }
+ );
+
+ const redirectUserToLogin = () => {
+ history.push({ pathname: '/login' });
+ setToastMessage("Por favor, autentique-se!");
+ setShowToast(true);
+ }
+
+ const logoff = () => {
+ LocalStorage.clearToken()
+ user.setIsLoggedIn(false);
+ history.push({ pathname: '/login' });
+ }
+
+ useEffect(() => {
+ if (location.state && location.state.redirectData) {
+ const redirectData = location.state.redirectData
+
+ if (redirectData.showToastMessage) {
+ setToastColor(redirectData.toastColor)
+ setToastMessage(redirectData.toastMessage)
+ setShowToast(true)
+ }
+ }
+
+ const loadUserData = async () => {
+ let userId = ''
+
+ // verify if user is authenticated
+ if (props.match.params.id) {
+ userId = props.match.params.id
+ } else {
+ const refreshSessionRes = await sessionsService.refreshSession()
+
+ if (refreshSessionRes.error) {
+ redirectUserToLogin()
+ return
+ }
+
+ if (refreshSessionRes.userId) {
+ userId = refreshSessionRes.userId
+ }
+ }
+
+ // get user info by ID
+ const getByIdRes = await usersService.getById(userId)
+
+ if (getByIdRes.error) {
+ if (isVisitor && props.match.params.id) {
+ setToastMessage('Usuário não existe!')
+ setShowToast(true)
+ history.push({ pathname: '/home' })
+ } else {
+ setToastMessage(getByIdRes.error.errorMessage)
+ setShowToast(true)
+ }
+
+ return
+ }
+
+ // check if user is driver (if they have vans)
+ const userIsDriverRes = await usersService.checkIfUserIsDriver(userId)
+
+ // if (userIsDriverRes.error) {
+ // setToastColor('warning')
+ // setToastMessage(userIsDriverRes.error.errorMessage)
+ // setShowToast(true)
+ // return
+ // }
+
+ if (!userIsDriverRes.error && userIsDriverRes.result !== undefined) {
+ setIsDriver(userIsDriverRes.result)
+ }
+
+ if (getByIdRes.userData) {
+ const userData = getByIdRes.userData
+
+ if (isMounted) {
+ setInputValues({
+ 'id': userId,
+ 'name': userData.name,
+ 'lastname': userData.lastname,
+ 'email': userData.email,
+ 'phone_number': userData.phone_number,
+ 'birth_date': userData.birth_date,
+ 'bio': userData.bio,
+ 'document_type': userData.document_type,
+ 'document': userData.document
+ });
+
+ if (!props.match.params.id) {
+ setIsVisitor(false)
+ }
+
+ if (!userData.document || !userData.phone_number) {
+ setIncompleteProfile(true)
+
+ let counter = 0
+
+ if (!userData.document) counter++
+ if (!userData.phone_number) counter++
+
+ setIncompleteProfileCounter(counter)
+ }
+ }
+ }
+ }
+
+ let isMounted = true;
+
+ const userToken = LocalStorage.getToken()
+
+ if (!userToken) {
+ redirectUserToLogin()
+ }
+
+ loadUserData()
+
+ return () => { isMounted = false };
+ }, []);
+
+ return (
+
+
+
+ Seu perfil
+
+
+
+
+
+
+
+
+ Seu perfil
+
+
+
+
+
+ 
+ {/* 
*/}
+
+ {inputValues.name} {inputValues.lastname}
+
+
+
+
+
+
+
+ Biografia
+
+
+ {inputValues.bio ? inputValues.bio : 'Sem biografia.' }
+
+
+
+
+
+ Informações de contato
+
+
+ { !inputValues.phone_number ?
+ <>Sem informações de contato.
+ : <>
+ {
+ inputValues.phone_number ?
+ <>
+
+ {inputValues.phone_number}
+
+ : <>
+ }
+
+ }
+
+
+
+ { !isVisitor ?
+
+ Configurações
+ history.push({ pathname: '/perfil/editar', state: { userData: inputValues } })}>
+ Editar perfil
+
+
+ { incompleteProfile ?
+ <>
+ history.push({ pathname: '/perfil/completar', state: { userData: inputValues } })}>
+ Completar cadastro
+ {incompleteProfileCounter}
+
+
+ : <> }
+
+ history.push({ pathname: '/cadastro-van'})}>
+ Cadastrar Van
+
+ history.push({ pathname: '/minhas-vans'})}>
+ Minhas Vans
+
+
+ Pagamentos
+
+
+ Avaliações
+
+
+ Sair da conta
+
+ : <>
+ }
+
+ setShowToast(false)}
+ message={toastMessage}
+ duration={2500}
+ />
+
+
+ );
+};
+
+export default Perfil;
diff --git a/src/pages/PerfilEditar.tsx b/src/pages/PerfilEditar.tsx
new file mode 100644
index 0000000..d3fa677
--- /dev/null
+++ b/src/pages/PerfilEditar.tsx
@@ -0,0 +1,200 @@
+import {
+ IonBackButton,
+ IonButtons,
+ IonContent,
+ IonFab,
+ IonFabButton,
+ IonGrid,
+ IonHeader,
+ IonIcon,
+ IonInput,
+ IonItem,
+ IonLabel,
+ IonPage,
+ IonTextarea,
+ IonTitle,
+ IonToast,
+ IonToolbar
+} from "@ionic/react";
+import React, { useEffect, useReducer, useState } from "react";
+import { IonRow, IonCol } from "@ionic/react";
+
+import './Perfil.css'
+import { useHistory, useLocation } from "react-router";
+import { saveOutline } from "ionicons/icons";
+
+import isEqual from 'lodash.isequal';
+
+import * as usersRoutes from '../services/api/users';
+
+import './Cadastro/Cadastro.css'
+import { Color } from "@ionic/react/node_modules/@ionic/core";
+
+interface userData {
+ name: string;
+ lastname: string;
+ email: string;
+ birth_date: string;
+ bio: string;
+}
+
+interface LocationState {
+ userData: userData
+}
+
+const PerfilEditar: React.FC = () => {
+ const history = useHistory();
+ const location = useLocation();
+
+ const [showToast, setShowToast] = useState(false);
+ const [messageToast, setMessageToast] = useState('');
+ const [toastColor, setToastColor] = useState("primary");
+
+ const [userData, setUserData] = useState({
+ name: '',
+ lastname: '',
+ email: '',
+ birth_date: '',
+ bio: '',
+ });
+
+ const [inputValues, setInputValues] = useReducer(
+ (state: any, newState: any) => ({ ...state, ...newState }),
+ {
+ name: '',
+ lastname: '',
+ email: '',
+ birth_date: '',
+ bio: '',
+ }
+ );
+
+ useEffect(() => {
+ if (!location.state) {
+ history.push({ pathname: '/perfil' })
+ }
+
+ let userData = location.state.userData
+
+ setUserData(location.state.userData)
+ setInputValues({
+ 'name': userData.name,
+ 'lastname': userData.lastname,
+ 'email': userData.email,
+ 'birth_date': userData.birth_date,
+ 'bio': userData.bio
+ });
+ }, [userData]);
+
+ const handleUpdateUserData = () => {
+ usersRoutes.update(inputValues).then(response => {
+ if (response.status === 'error') {
+ setToastColor("danger")
+ setMessageToast(response.message);
+ setShowToast(true);
+
+ return
+ }
+
+ history.push({ pathname: '/perfil', state: {
+ redirectData: {
+ showToastMessage: true,
+ toastColor: "success",
+ toastMessage: response.message,
+ },
+ }})
+ }).catch((err) => {
+ setToastColor("danger")
+ setMessageToast(err);
+ setShowToast(true);
+ })
+ }
+
+ const hasChangedSinceInitialState = () => {
+ return isEqual(userData, inputValues)
+ }
+
+ return (
+
+
+
+ Editar perfil
+
+
+
+
+
+
+
+
+
+
+ Email
+ setInputValues({'email': e.detail.value!})}
+ >
+
+
+
+ Data de nascimento
+ setInputValues({'birth_date': e.detail.value!})}
+ >
+
+
+
+
+ Biografia
+ setInputValues({'bio': e.detail.value!})}
+ >
+
+
+
+
+
+
+
+
+
+
+ setShowToast(false)}
+ message={messageToast}
+ duration={2500}
+ />
+
+
+ );
+};
+
+export default PerfilEditar;
diff --git a/src/pages/Transportes/Transportes.css b/src/pages/Transportes/Transportes.css
new file mode 100644
index 0000000..966beea
--- /dev/null
+++ b/src/pages/Transportes/Transportes.css
@@ -0,0 +1,78 @@
+.header-page{
+ background-color: var(--ion-item-background);
+ border-bottom: 1px solid var(--ion-color-step-150, #dadada);
+ height: 3.5rem;
+ display: flex;
+ padding: 0.5rem;
+}
+
+.icon-return{
+ font-size: 1.5rem;
+}
+
+.span-info-back{
+ background-color: var(--ion-color-step-150, #dadada);
+ border-radius: 0.5rem;
+ padding: 0.5rem;
+ display: flex;
+ width: 100%;
+}
+
+.address-from-to{
+ /* display: block; */
+ margin-top: -0.2rem;
+ font-size: 0.8rem;
+ white-space: nowrap;
+ overflow: hidden;
+ max-width: 100%;
+}
+
+/* .address-from-to span{
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ width: 1rem!important;
+} */
+
+.address-from-to ion-icon{
+ margin-inline: 0.2rem;
+}
+
+.address-from-to small{
+ display: block;
+}
+
+.header-tabs{
+ background-color: var(--ion-color-step-150,#dadada);
+ height: 5.5rem;
+ padding: 0.5rem;
+}
+
+.header-tabs h5{
+ margin: 0;
+}
+
+.header-tabs .card-transporte{
+ margin: 0;
+}
+
+.content-filter-modal{
+ margin: 0.5rem;
+}
+
+.header-filter-modal{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.button-criar-alerta{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 1rem 0 5.5rem 0;
+}
+
+.msg-not-found{
+ margin: 1.5rem;
+}
\ No newline at end of file
diff --git a/src/pages/Transportes/Transportes.tsx b/src/pages/Transportes/Transportes.tsx
new file mode 100644
index 0000000..f99a602
--- /dev/null
+++ b/src/pages/Transportes/Transportes.tsx
@@ -0,0 +1,222 @@
+import {
+ IonContent,
+ IonPage,
+ IonFab,
+ IonFabButton,
+ IonIcon,
+ IonCard,
+ IonInput,
+ IonRow,
+ IonCol,
+ IonCardContent,
+ IonButton,
+ IonHeader,
+ IonToolbar,
+ IonButtons,
+ IonBackButton,
+ IonTabs,
+ IonTabBar,
+ IonTabButton,
+ IonLabel,
+ IonBadge,
+ IonRouterOutlet,
+ IonSlides,
+ IonSlide,
+ IonModal,
+ IonList,
+ IonRadioGroup,
+ IonListHeader,
+ IonItem,
+ IonRadio,
+ IonCheckbox,
+ IonFooter,
+ IonToast,
+} from "@ionic/react";
+import {
+ arrowBack,
+ arrowBackOutline,
+ arrowForwardOutline,
+ chevronBackOutline,
+ chevronForwardOutline,
+ closeOutline,
+ locateOutline,
+ locationOutline,
+ timeOutline,
+} from "ionicons/icons";
+import { useEffect, useState } from "react";
+import { useHistory, useLocation } from "react-router";
+import { getTransportes } from "../../services/transportes";
+import { createUserSearch } from "../../services/api/users";
+import "./Transportes.css";
+
+interface InfoBusca {
+ addressFrom: any;
+ addressTo: any;
+ coordinatesFrom: any;
+ coordinatesTo: any;
+}
+
+const Transportes: React.FC = () => {
+ const history = useHistory();
+ const location = useLocation();
+ const props = location.state as InfoBusca;
+ const [transportes, setTransportes] = useState([]);
+ const [showModalFilters, setShowModalFilters] = useState(false);
+ const [showToast, setShowToast] = useState(false);
+ const [messageToast, setMessageToast ] = useState('');
+ const [toastColor, setToastColor] = useState('success');
+
+ useEffect(() => {
+ if (props) {
+ buscaTransportes();
+ }
+ }, [props]);
+
+ async function buscaTransportes() {
+ let data = (await getTransportes(props)) as any;
+ setTransportes(data);
+ }
+
+ function criaAlerta(){
+ createUserSearch(props.coordinatesFrom.lat, props.coordinatesFrom.lng, props.addressTo.label).then(() => {
+ setMessageToast('Alerta criado com sucesso!');
+ setShowToast(true);
+ }).catch((err:any) => {
+ setMessageToast('Não foi possível criar o alerta!');
+ setToastColor('danger');
+ setShowToast(true);
+ })
+ }
+
+ return (
+
+
+
+
+ {transportes && transportes.length > 0? (
+
+
+
+
+ );
+ })}
+
+ setShowModalFilters(true)}
+ vertical="bottom"
+ horizontal="center"
+ slot="fixed"
+ >
+ Filtros
+
+
+
+
+
+
+
+ setShowModalFilters(false)}
+ >
+ Aplicar Filtros
+
+
+
+ setShowToast(false)}
+ message={messageToast}
+ duration={2500}
+ />
+
+
+ );
+};
+
+export default Transportes;
diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx
deleted file mode 100644
index ee3adcd..0000000
--- a/src/pages/login/Login.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import {
- IonContent,
- IonHeader,
- IonPage,
- IonTitle,
- IonToolbar,
- IonButtons,
-} from "@ionic/react";
-import React, { useState } from "react";
-import axios from "axios";
-import { IonGrid, IonRow, IonCol } from "@ionic/react";
-import { personCircle } from "ionicons/icons";
-import { useHistory } from "react-router-dom";
-import {
- IonItem,
- IonLabel,
- IonInput,
- IonButton,
- IonIcon,
- IonAlert,
-} from "@ionic/react";
-
-function validateEmail(email: string) {
- const re =
- /^((?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\]))$/;
- return re.test(String(email).toLowerCase());
-}
-
-const Page: React.FC = () => {
- const history = useHistory();
- const [email, setEmail] = useState("matheusalb3213@gmail.com");
- const [password, setPassword] = useState("1234");
- const [isError, setIsError] = useState(false);
- const [message, setMessage] = useState("");
-
- const handleLogin = () => {
- // validação de inputs
- if (!email) {
- setMessage("Por favor, informe um e-mail válido");
- setIsError(true);
- return;
- }
-
- if (validateEmail(email) === false) {
- setMessage("E-mail inválido");
- setIsError(true);
- return;
- }
-
- if (!password || password.length < 6) {
- setMessage("Por favor, digite a sua senha");
- setIsError(true);
- return;
- }
-
- const loginData = {
- email: email,
- password: password,
- };
-
- const api = axios.create({
- baseURL: `https://625dc16c4c36c7535779792c.mockapi.io/api/v1`,
- });
-
- api
- // .post("/login", loginData)
- .get("/users/2")
- .then((res) => {
- // login bem-sucedido
- history.push("/dashboard/" + email);
- })
- .catch((error) => {
- setMessage("Falha na autenticação! Por favor, crie uma conta");
- setIsError(true);
- });
- };
-
- return (
-
-
-
- Login
-
-
-
-
-
-
-
-
-
-
-
- Login
-
-
-
-
-
-
- setIsError(false)}
- cssClass="my-custom-class"
- header={"Error!"}
- message={message}
- buttons={["Dismiss"]}
- />
-
-
-
-
-
-
- Email
- setEmail(e.detail.value!)}
- >
-
-
-
-
-
-
-
- Senha
- setPassword(e.detail.value!)}
- >
-
-
-
-
-
-
-
- Login
-
-
-
-
-
-
- );
-};
-
-export default Page;
diff --git a/src/services/api-client.service.ts b/src/services/api-client.service.ts
new file mode 100644
index 0000000..970a8f3
--- /dev/null
+++ b/src/services/api-client.service.ts
@@ -0,0 +1,18 @@
+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.ts b/src/services/api/api.ts
similarity index 71%
rename from src/services/api.ts
rename to src/services/api/api.ts
index 909f183..70062b2 100644
--- a/src/services/api.ts
+++ b/src/services/api/api.ts
@@ -1,5 +1,5 @@
import axios from 'axios';
-import apiConfig from '../config/api.config';
+import apiConfig from '../../config/api.config';
const instance = axios.create({
baseURL: apiConfig.getBaseUrl(),
diff --git a/src/services/api/cars.ts b/src/services/api/cars.ts
new file mode 100644
index 0000000..b81cc93
--- /dev/null
+++ b/src/services/api/cars.ts
@@ -0,0 +1,25 @@
+import instance from './api';
+
+import carsRoutes from '../../constants/routes/carsRoutes';
+import { AxiosRequestHeaders } from 'axios';
+import LocalStorage from '../../LocalStorage';
+
+let token: string;
+let header: AxiosRequestHeaders;
+
+function updateHeader() {
+ token = LocalStorage.getToken();
+
+ header = {
+ "Accept": 'application/json',
+ "Content-Type": 'application/json',
+ "Authorization": 'Bearer ' + token
+ }
+}
+export async function list() {
+ updateHeader();
+
+ const response = await instance.get(carsRoutes.list.url, { headers: header });
+
+ return response.data;
+}
\ No newline at end of file
diff --git a/src/services/api/session.ts b/src/services/api/session.ts
new file mode 100644
index 0000000..ba8118a
--- /dev/null
+++ b/src/services/api/session.ts
@@ -0,0 +1,33 @@
+import instance from './api';
+import sessionRoutes from '../../constants/routes/sessionRoutes';
+import LocalStorage from '../../LocalStorage';
+import { AxiosRequestHeaders } from 'axios';
+
+let token: string | null;
+let header: AxiosRequestHeaders;
+
+interface createData {
+ login: string,
+ password: string,
+}
+
+function updateHeader() {
+ token = LocalStorage.getToken();
+ header = {
+ "Accept": 'application/json',
+ "Content-Type": 'application/json',
+ "Authorization": 'Bearer ' + token
+ }
+}
+
+export async function create(data: createData) {
+ const response = await instance.post(sessionRoutes.create.url, data);
+ return response.data;
+}
+
+export async function refresh() {
+ updateHeader();
+
+ let response = await instance.post(sessionRoutes.refresh.url, { token }, { headers: header });
+ return response.data;
+}
\ No newline at end of file
diff --git a/src/services/api/users.ts b/src/services/api/users.ts
new file mode 100644
index 0000000..20c1246
--- /dev/null
+++ b/src/services/api/users.ts
@@ -0,0 +1,109 @@
+import instance from './api';
+// import LocalStorage from '../LocalStorage';
+
+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;
+
+function updateHeader() {
+ token = LocalStorage.getToken();
+
+ header = {
+ "Accept": 'application/json',
+ "Content-Type": 'application/json',
+ "Authorization": 'Bearer ' + token
+ }
+}
+
+export interface CadastroResponse {
+ message?: string;
+
+ token?: {
+ token: string;
+ };
+
+ error?: string;
+}
+
+export interface CadastroRequest {
+ name: string;
+ lastname: string;
+ email: string;
+ birth_date: string;
+ password: string;
+}
+
+export interface UpdateUserRequest {
+ name?: string;
+ email?: string;
+ bio?: string;
+ document_type?: string;
+ document?: string;
+ phone_number?: string;
+}
+
+// export async function get(cpf) {
+// updateHeader();
+
+// const response = await instance.get(userRoutes.get.url + `/${cpf}`, { headers: header });
+// return response.data;
+// }
+
+export async function create(CadastroRequest: any) {
+ updateHeader();
+
+ const response = await instance.post(userRoutes.create.url, CadastroRequest);
+ return response.data;
+}
+
+export async function getById(userId: string) {
+ updateHeader();
+
+ const response = await instance.get(userRoutes.get.url + `/${userId}`, { headers: header });
+ return response.data;
+}
+
+export async function update(userData: UpdateUserRequest) {
+ updateHeader();
+
+ const response = await instance.patch(userRoutes.update.url, userData, { headers: header });
+ return response.data;
+}
+
+export async function checkIfUserIsDriver(id_user: string) {
+ updateHeader();
+
+ const response = await instance.get(userRoutes.checkIfUserIsDriver.url + `/${id_user}`, { headers: header });
+ return response.data;
+}
+
+// TODO, continuar
+export async function getSocialInfo(userId: string) {
+ updateHeader();
+
+ 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);
+}
+
+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
diff --git a/src/services/api/vans.ts b/src/services/api/vans.ts
new file mode 100644
index 0000000..f4b5fd3
--- /dev/null
+++ b/src/services/api/vans.ts
@@ -0,0 +1,73 @@
+import instance from "./api";
+
+import vansRoutes from "../../constants/routes/vansRoutes";
+import { AxiosRequestHeaders } from "axios";
+import LocalStorage from "../../LocalStorage";
+
+let token: string;
+let header: AxiosRequestHeaders;
+
+function updateHeader() {
+ token = LocalStorage.getToken();
+
+ header = {
+ Accept: "application/json",
+ "Content-Type": "application/json",
+ Authorization: "Bearer " + token,
+ };
+}
+
+export async function getByPlate(vanId: string) {
+ updateHeader();
+
+ const response = await instance.get(vansRoutes.getByPlate.url + `/${vanId}`, {
+ headers: header,
+ });
+
+ return response.data;
+}
+
+export async function getByUserId(userId: string) {
+ updateHeader();
+
+ const response = await instance.get(vansRoutes.getByUserId.url + `/${userId}`, {
+ headers: header,
+ });
+
+ return response.data;
+}
+
+interface CreateVanBody {
+ plate: string;
+ brand: string;
+ model: string;
+ seats_number: string;
+ locator_name: string;
+ locator_address: string;
+ locator_complement: string;
+ locator_city: string;
+ locator_state: string;
+}
+
+export async function create(CreateVanBody: CreateVanBody) {
+ updateHeader();
+
+ const response = await instance.post(vansRoutes.create.url, CreateVanBody, { headers: header });
+ return response.data;
+}
+
+interface UpdateVanBody {
+ brand?: string;
+ model?: string;
+ seats_number?: string;
+}
+
+export async function update(vanData: UpdateVanBody) {
+ updateHeader();
+
+ const response = await instance.patch(vansRoutes.update.url, vanData, {
+ headers: header,
+ });
+
+ return response.data;
+}
diff --git a/src/services/functions/carsService.ts b/src/services/functions/carsService.ts
new file mode 100644
index 0000000..e46855e
--- /dev/null
+++ b/src/services/functions/carsService.ts
@@ -0,0 +1,51 @@
+import * as carsRoutes from "../api/cars";
+
+interface getAllCarModelsReturn {
+ data?: {
+ id_model: string;
+ name: string;
+ }[];
+
+ error?: {
+ errorMessage: string;
+ }
+}
+
+interface getAllCarModelsRes {
+ status?: string;
+
+ message: string
+
+ data?: {
+ id_model: string;
+ name: string;
+ }[];
+
+
+}
+
+const getAllCarModels = async (): Promise => {
+ try {
+ let res: getAllCarModelsRes = await carsRoutes.list();
+
+ if (res.status === "error") {
+ return {
+ error: {
+ errorMessage: res.message,
+ },
+ };
+ }
+
+ return {
+ data: res.data,
+ };
+ } catch (err) {
+ return {
+ error: {
+ errorMessage: "Por favor, autentique-se.",
+ },
+ };
+ }
+};
+
+export default { getAllCarModels };
diff --git a/src/services/functions/sessionsService.ts b/src/services/functions/sessionsService.ts
new file mode 100644
index 0000000..5685c19
--- /dev/null
+++ b/src/services/functions/sessionsService.ts
@@ -0,0 +1,46 @@
+import * as sessionRoutes from "../api/session";
+
+interface refreshSessionReturn {
+ userId?: string;
+ error?: boolean;
+ errorMessage?: string;
+}
+
+interface refreshSessionResponse {
+ status?: string;
+ message?: string;
+ userId?: string;
+}
+
+const refreshSession = async (): Promise => {
+ try {
+ let res: refreshSessionResponse = await sessionRoutes.refresh()
+
+ if (res.status === "error") {
+ return {
+ error: true,
+ errorMessage: res.message,
+ };
+ }
+
+ return {
+ userId: res.userId,
+ };
+ } catch(err) {
+ return {
+ error: true,
+ errorMessage: "Por favor, autentique-se.",
+ };
+ }
+ // catch (err: any) {
+ // if (err.response) {
+ // // The client was given an error response (5xx, 4xx)
+ // } else if (err.request) {
+ // // The client never received a response, and the request was never left
+ // } else {
+ // // Anything else
+ // }
+// }
+};
+
+export default { refreshSession }
\ No newline at end of file
diff --git a/src/services/functions/usersService.ts b/src/services/functions/usersService.ts
new file mode 100644
index 0000000..87b4f40
--- /dev/null
+++ b/src/services/functions/usersService.ts
@@ -0,0 +1,135 @@
+import * as usersRoutes from "../api/users";
+
+interface getByIdReturn {
+ userData?: {
+ name: string;
+ lastname: string;
+ email: string;
+ phone_number: string;
+ birth_date: string;
+ bio: string;
+ document_type: string;
+ document: string;
+ },
+ error?: {
+ errorMessage: string;
+ }
+}
+
+interface getByIdRes {
+ status: string;
+ message: string;
+ userId?: string;
+ data: {
+ name: string;
+ lastname: string;
+ email: string;
+ phone_number: string;
+ birth_date: string;
+ bio: string;
+ document_type: string;
+ document: string;
+ },
+}
+
+const getById = async (userId: string): Promise => {
+ try {
+ let res: getByIdRes = await usersRoutes.getById(userId)
+
+ if (res.status === "error") {
+ return {
+ error: {
+ errorMessage: res.message,
+ }
+ };
+ }
+
+ return {
+ userData: res.data,
+ };
+ } catch(err) {
+ return {
+ error: {
+ errorMessage: "Por favor, autentique-se.",
+ }
+ };
+ }
+};
+
+interface getByIdReturn {
+ data?: {
+ phone: '',
+ whatsapp: '',
+ facebook: '',
+ telegram: '',
+ },
+ error?: {
+ errorMessage: string;
+ }
+}
+
+const getUserSocialInfo = async (userId: string): Promise => {
+ try {
+ let res: getByIdRes = await usersRoutes.getSocialInfo(userId)
+
+ if (res.status === "error") {
+ return {
+ error: {
+ errorMessage: res.message,
+ }
+ };
+ }
+
+ return {
+ userData: res.data,
+ };
+ } catch(err) {
+ return {
+ error: {
+ errorMessage: "Por favor, autentique-se.",
+ }
+ };
+ }
+};
+
+interface checkIfUserIsDriverReturn {
+ result?: boolean;
+ error?: {
+ errorMessage: string;
+ }
+}
+
+interface checkIfUserIsDriverResponse {
+ status: string;
+ message: string;
+ result?: boolean;
+ error?: {
+ errorMessage: string;
+ }
+}
+
+const checkIfUserIsDriver = async (id_user: string): Promise => {
+ try {
+ let res: checkIfUserIsDriverResponse = await usersRoutes.checkIfUserIsDriver(id_user)
+
+ if (res.status === "error") {
+ return {
+ error: {
+ errorMessage: res.message,
+ }
+ };
+ }
+
+ return {
+ result: res.result,
+ };
+ } catch(err) {
+ return {
+ error: {
+ errorMessage: "Por favor, autentique-se.",
+ }
+ };
+ }
+};
+
+export default { getById, getUserSocialInfo, checkIfUserIsDriver }
\ No newline at end of file
diff --git a/src/services/transportes.ts b/src/services/transportes.ts
new file mode 100644
index 0000000..7b5eddf
--- /dev/null
+++ b/src/services/transportes.ts
@@ -0,0 +1,34 @@
+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 [];
+}
diff --git a/src/services/users.ts b/src/services/users.ts
deleted file mode 100644
index 73440e1..0000000
--- a/src/services/users.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import instance from '../services/api';
-// 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
- }`
-}
-
-export interface CadastroResponse {
- message?: string;
-
- token?: {
- token: string;
- };
-
- error?: string;
-}
-
-export interface CadastroRequest {
- name: string;
- email: string;
- birth_date: string;
- password: string;
-}
-
-// export async function get(cpf) {
-// updateHeader();
-
-// const response = await instance.get(userRoutes.get.url + `/${cpf}`, { headers: header });
-// return response.data;
-// }
-
-export async function create(CadastroRequest: any) {
- updateHeader();
-
- const response = await instance.post("http://localhost:3333/users/", CadastroRequest);
- return response.data;
-}
\ No newline at end of file
diff --git a/src/services/utils.ts b/src/services/utils.ts
new file mode 100644
index 0000000..8827557
--- /dev/null
+++ b/src/services/utils.ts
@@ -0,0 +1,7 @@
+import instance from '../services/api/api';
+
+export async function autoCompleteAddress(address:string) {
+
+ const response = await instance.get(`https://api.geoapify.com/v1/geocode/autocomplete?text=${address}&apiKey=ee574aacff6f440a84378bbbf7e2f20d`);
+ return response.data.features;
+}
\ No newline at end of file
diff --git a/src/services/validateCpf.ts b/src/services/validateCpf.ts
new file mode 100644
index 0000000..d713b68
--- /dev/null
+++ b/src/services/validateCpf.ts
@@ -0,0 +1,25 @@
+export default function validateCpf(cpf: string): Boolean {
+ let soma = 0, resto;
+
+ if (cpf === "00000000000") return false;
+
+ for (let i = 1; i <= 9; i++)
+ soma = soma + parseInt(cpf.substring(i - 1, i)) * (11 - i);
+
+ resto = (soma * 10) % 11;
+
+ if (resto === 10 || resto === 11) resto = 0;
+ if (resto !== parseInt(cpf.substring(9, 10))) return false;
+
+ soma = 0;
+ for (let i = 1; i <= 10; i++)
+ soma = soma + parseInt(cpf.substring(i - 1, i)) * (12 - i);
+
+ resto = (soma * 10) % 11;
+
+ if (resto === 10 || resto === 11) resto = 0;
+
+ if (resto !== parseInt(cpf.substring(10, 11))) return false;
+
+ return true;
+};
\ No newline at end of file
diff --git a/src/store/RecordsStore.js b/src/store/RecordsStore.js
new file mode 100644
index 0000000..76a9ae9
--- /dev/null
+++ b/src/store/RecordsStore.js
@@ -0,0 +1,14 @@
+import { Store } from 'pullstate';
+
+const RecordsStore = new Store({
+
+ records: [],
+ center : []
+});
+
+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
diff --git a/src/store/Selectors.js b/src/store/Selectors.js
new file mode 100644
index 0000000..c83e9f6
--- /dev/null
+++ b/src/store/Selectors.js
@@ -0,0 +1,15 @@
+import { createSelector } from 'reselect';
+
+const getState = state => state;
+
+// General getters
+export const fetchRecords = createSelector(getState, state => state.records);
+
+// More specific getters
+export const fetchRecord = recordId => createSelector(getState, state => {
+
+ return state.records.filter(record => record.id === recordId)[0];
+});
+// export const getPoll = pollId => createSelector(getState, state => state.polls.filter(poll => poll.id === parseInt(pollId))[0]);
+// export const getChat = contactId => createSelector(getState, state => state.chats.filter(c => parseInt(c.contact_id) === parseInt(contactId))[0].chats);
+// export const getContact = contactId => createSelector(getState, state => state.contacts.filter(c => parseInt(c.id) === parseInt(contactId))[0]);
*/} +
+
+ setInputValues({ locator_name: e.target.value })}
+ />
+
+ setInputValues({ locator_address: e.target.value })}
+ />
+ setInputValues({ locator_complement: e.target.value })}
+ />
+ setInputValues({ locator_city: e.target.value })}
+ />
+ setInputValues({ locator_state: e.target.value })}
+ />
+
+
+ )}
+
+
+
+ Salvar
+
+
+
-
- Nome
-
-
- Sobrenome
-
-
-
-
+
+ {/* */}
+
+ { isDriver ?
+ <>
+
+ Motorista
+
+ : <>
+ }
+
+ Passageiro
+
+
+
+
+ Nome
+ setInputValues({'name': e.detail.value!})}
+ >
+
+
+
+ Sobrenome
+ setInputValues({'lastname': e.detail.value!})}
+ >
+
+
+
+
+ {/*
+ */}
+
+
+
+ {props.addressFrom.label}
+
+
+
+
+
+
+ Seu João
+
+
+
+
+ Seu Zé
+
+
+
+
+ )
+ :
+ (Mais barata
+Melhor avaliação
+Não foi encontrado nenhum transporte que atenda essa rota.
)} + {transportes && + transportes.map((record: any, index: any) => { + return ( +Motorista: {record.motorista}
+Avaliação: {record.avaliacao}
+ Valor: {record.valor}
+ Lugares disponíveis: {record.lugares}
+
+ criaAlerta()}>Criar Alerta
+
+
+
+ setShowModalFilters(false)}
+ />
+
+ + Limpar +
+
+
+
+ Menor preço
+
+
+
+ Avaliação
+
+
+
+ Lugares disponíveis
+
+
+
+ Vaga avulsa
+
+
+ Ar condicionado
+
+
+ Filtrar
+Ordernar por
+Preferências
+- Clicando no botão de "LOGIN", você concorda com a nossa{" "} - política de termos e serviços -
-- Ainda não possui uma conta? Cadastre-se aqui! -
-