Merge feature/cadastro-feature/login

This commit is contained in:
Matheus Albino Brunhara
2022-05-02 19:42:31 -05:00
16 changed files with 451 additions and 318 deletions

View File

@@ -1,8 +1,12 @@
import { IonApp, IonRouterOutlet, IonSplitPane, setupIonicReact } from '@ionic/react';
import { IonReactRouter } from '@ionic/react-router';
import { Redirect, Route } from 'react-router-dom';
import Menu from './components/Menu';
import Page from './pages/Page';
import {
IonApp,
IonRouterOutlet,
setupIonicReact
} from '@ionic/react';
import { IonReactRouter } from '@ionic/react-router';
import Cadastro from './pages/Cadastro/Cadastro';
import MainPages from './pages/MainPages';
// importação das páginas
import Login from './pages/Login';
@@ -25,36 +29,25 @@ import '@ionic/react/css/display.css';
/* Theme variables */
import './theme/variables.css';
import Tabs from './components/Tabs';
// import Tabs from './components/Tabs';
setupIonicReact();
const App: React.FC = () => {
return (
<IonApp>
<IonReactRouter>
<IonSplitPane contentId="main">
<Menu />
<IonRouterOutlet id="main">
<Route path="/" exact={true}>
<Redirect to="/page/Inbox" />
</Route>
<Route path="/page/:name" exact={true}>
<Page />
</Route>
{/* Login page */}
<Route path="/login" exact={true}>
<Login />
</Route>
</IonRouterOutlet>
</IonSplitPane>
{/* <Tabs /> */}
</IonReactRouter>
</IonApp>
);
};
const App: React.FC = () => (
<IonApp>
<IonReactRouter>
<IonRouterOutlet>
<Route exact path="/mainpages" component={MainPages}></Route>
<Route exact path="/cadastro" component={Cadastro}></Route>
<Route exact path="/login" component={Login}></Route>
<Route exact path="/">
<Redirect to="/cadastro" />
</Route>
</IonRouterOutlet>
</IonReactRouter>
</IonApp>
);
export default App;