Corrige conflitos

This commit is contained in:
Matheus Albino Brunhara
2022-08-22 20:12:48 -03:00
17 changed files with 4469 additions and 6278 deletions

View File

@@ -50,6 +50,8 @@ import { search, home, person } from 'ionicons/icons';
import { useState, useContext } from 'react';
import React from 'react';
import MinhasVans from './pages/MinhasVans';
import MeusItinerarios from './pages/MeusItinerarios/MeusItinerarios';
import CadastrarItinerario from './pages/CadastrarItinerario/CadastrarItinerario';
setupIonicReact();
@@ -75,8 +77,8 @@ const routes = (
<Route exact path="/cadastro-van" component={CadastroVan}></Route>
<Route exact path="/minhas-vans" component={MinhasVans}></Route>
<Route exact path="/debug" component={Debug}></Route>
<Route exact path="/cadastrar-itinerario" component={CadastrarItinerario}></Route>
<Route exact path="/meus-itinerarios" component={MeusItinerarios}></Route>
<Route exact path="/">
<Redirect to="/login" />
</Route>
@@ -107,7 +109,7 @@ const IonicApp: React.FC = () => {
<IonRouterOutlet>{routes}</IonRouterOutlet>
<IonTabBar slot="bottom">
<IonTabButton tab="buscar" href="/buscar">
<IonTabButton tab="buscar" href="/buscar-transporte">
<IonIcon icon={search} />
<IonLabel>Buscar</IonLabel>
</IonTabButton>