cloud/tcc-vamos-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrige diversos toasts

Browse Source
This commit is contained in:
Matheus Albino Brunhara
2022-09-03 16:20:57 -03:00
parent 41fd7ea0b6
commit df4fe0ffef
13 changed files with 147 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pages/Cadastro/Cadastro.tsx
View File

@@ -9,6 +9,7 @@ import * as UsersService from '../../services/api/users'
import LocalStorage from '../../LocalStorage';
import { UserContext } from '../../App';
import { Color } from '@ionic/core';
import { closeToast } from '../../services/utils';
const Cadastro: React.FC = () => {
const history = useHistory();
@@ -216,7 +217,7 @@ const Cadastro: React.FC = () => {
<IonToast
color={toastColor}
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={messageToast}
duration={2500}
/>

3
src/pages/CadastroCompletar/CadastroCompletar.tsx
View File

@@ -21,6 +21,7 @@ import { callOutline, documentTextOutline } from "ionicons/icons";
import '../Cadastro/Cadastro.css'
import { Color } from "@ionic/core";
import { closeToast } from "../../services/utils";
interface cardItem {
icon: string;
@@ -130,7 +131,7 @@ const CadastroCompletar: React.FC = () => {
position="top"
color={toastColor}
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={toastMessage}
duration={2500}
/>

3
src/pages/CadastroCompletar/CompletarDocumento.tsx
View File

@@ -28,6 +28,7 @@ import { saveOutline } from "ionicons/icons";
import * as usersRoutes from '../../services/api/users';
import validateCpf from '../../services/validateCpf'
import { closeToast } from "../../services/utils";
interface documentTypesInterface {
label: string;
@@ -206,7 +207,7 @@ const CompletarDocumento: React.FC = () => {
position="top"
color='danger'
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={messageToast}
duration={2500}
/>

3
src/pages/CadastroCompletar/CompletarTelefone.tsx
View File

@@ -25,6 +25,7 @@ import { saveOutline } from "ionicons/icons";
import * as usersRoutes from '../../services/api/users';
import { Color } from "@ionic/core";
import { closeToast } from "../../services/utils";
interface documentTypesInterface {
label: string;
@@ -156,7 +157,7 @@ const CompletarTelefone: React.FC = () => {
position="top"
color={toastColor}
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={messageToast}
duration={2500}
/>

3
src/pages/CadastroVan.tsx
View File

@@ -29,6 +29,7 @@ import * as vansRoutes from '../services/api/vans';
import "./CadastroVan.css";
import { Color } from "@ionic/core";
import { closeToast } from "../services/utils";
const CadastroVan: React.FC = () => {
const history = useHistory();
@@ -364,7 +365,7 @@ const CadastroVan: React.FC = () => {
position="top"
color={toastColor}
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={toastMessage}
duration={2500}
/>

5
src/pages/Home.tsx
View File

@@ -6,6 +6,7 @@ import { useHistory, useLocation } from 'react-router';
import { UserContext } from '../App';
import * as sessionRoutes from '../services/api/session';
import { closeToast } from '../services/utils';
interface LocationState {
redirectData?: {
@@ -59,7 +60,7 @@ const Home: React.FC = () => {
}
refreshUserToken()
}, [])
}, [location.state, user, history])
return (
<IonPage>
@@ -68,7 +69,7 @@ const Home: React.FC = () => {
position="top"
color={toastColor}
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={toastMessage}
duration={2500}
/>

119
src/pages/Itinerario.tsx Normal file
View File

@@ -0,0 +1,119 @@
import { IonBackButton, IonButtons, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonContent, IonHeader, IonIcon, IonItem, IonLabel, IonPage, IonTitle, IonToast, IonToolbar } from '@ionic/react';
import { Color } from '@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'
import { closeToast } from '../services/utils';
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 Itinerario: React.FC = () => {
const history = useHistory();
const [showToast, setShowToast] = useState(false);
const [toastMessage, setToastMessage] = useState('');
const [toastColor, setToastColor] = useState<Color>("primary");
const [userVans, setUserVans] = useState<VanInfo[]>();
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 (
<IonPage>
<IonHeader>
<IonToolbar>
<IonTitle>Minhas vans</IonTitle>
<IonButtons slot="start">
<IonBackButton defaultHref="/perfil" />
</IonButtons>
</IonToolbar>
</IonHeader>
<IonContent>
{ userVans ? userVans.map((van, index) => {
return (
<IonCard key={index}>
<IonCardHeader>
<IonCardTitle>{van.plate}</IonCardTitle>
<IonCardSubtitle>{van.brand} - {van.model}</IonCardSubtitle>
</IonCardHeader>
{ van.locator_name ?
<>
<IonCardContent>{van.seats_number} assentos - Locador: {van.locator_name}</IonCardContent>
</> :
<>
<IonCardContent>{van.seats_number} assentos - Não é alugado</IonCardContent>
</>
}
</IonCard>
)
}) : <></>}
<IonToast
position="top"
color={toastColor}
isOpen={showToast}
onDidDismiss={() => closeToast(setShowToast)}
message={toastMessage}
duration={2500}
/>
</IonContent>
</IonPage>
);
};
export default Itinerario;

3
src/pages/Login.tsx
View File

@@ -19,6 +19,7 @@ import * as sessionRoutes from '../services/api/session';
import LocalStorage from '../LocalStorage';
import { Action } from "../components/Action";
import { UserContext } from "../App";
import { closeToast } from "../services/utils";
const Page: React.FC = () => {
const [showToast, setShowToast] = useState(false);
@@ -162,7 +163,7 @@ const Page: React.FC = () => {
position="top"
color='danger'
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={messageToast}
duration={2500}
/>

3
src/pages/MinhasVans.tsx
View File

@@ -9,6 +9,7 @@ import { UserContext } from '../App';
import * as vansRoutes from '../services/api/vans';
import sessionsService from '../services/functions/sessionsService'
import { closeToast } from '../services/utils';
interface VanInfo {
plate: string;
@@ -106,7 +107,7 @@ const MinhasVans: React.FC = () => {
position="top"
color={toastColor}
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={toastMessage}
duration={2500}
/>

3
src/pages/Perfil.tsx
View File

@@ -40,6 +40,7 @@ import sessionsService from "../services/functions/sessionsService";
import usersService from "../services/functions/usersService";
import { UserContext } from "../App";
import { Color } from "@ionic/core";
import { closeToast } from "../services/utils";
interface ScanNewProps {
match: {
@@ -393,7 +394,7 @@ const Perfil: React.FC<ScanNewProps> = (props) => {
position="top"
color={toastColor}
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={toastMessage}
duration={2500}
/>

3
src/pages/PerfilEditar.tsx
View File

@@ -29,6 +29,7 @@ import * as usersRoutes from '../services/api/users';
import './Cadastro/Cadastro.css'
import { Color } from "@ionic/core";
import { closeToast } from "../services/utils";
interface userData {
name: string;
@@ -190,7 +191,7 @@ const PerfilEditar: React.FC = () => {
<IonToast
color={toastColor}
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={messageToast}
duration={2500}
/>

3
src/pages/Transportes/Transportes.tsx
View File

@@ -48,6 +48,7 @@ import { useHistory, useLocation } from "react-router";
import itinerariesService from "../../services/functions/itinerariesService";
import { createUserSearch } from "../../services/api/users";
import "./Transportes.css";
import { closeToast } from "../../services/utils";
interface InfoBusca {
addressFrom: any;
@@ -210,7 +211,7 @@ const Transportes: React.FC = () => {
// cssClass={"toast-notification"}
color={toastColor}
isOpen={showToast}
onDidDismiss={() => setShowToast(false)}
onDidDismiss={() => closeToast(setShowToast)}
message={messageToast}
duration={2500}
/>

5
src/services/utils.ts
View File

@@ -4,4 +4,9 @@ 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;
}
export async function closeToast(setShowToast: React.Dispatch<React.SetStateAction<boolean>>) {
setShowToast(false)
window.history.replaceState({}, document.title)
}