Tabs agora aparecem somente para usuários logados
This commit is contained in:
74
src/App.tsx
74
src/App.tsx
@@ -1,12 +1,16 @@
|
|||||||
import { Redirect, Route } from 'react-router-dom';
|
import { Redirect, Route } from 'react-router-dom';
|
||||||
import {
|
import {
|
||||||
IonApp,
|
IonApp,
|
||||||
|
IonIcon,
|
||||||
|
IonLabel,
|
||||||
IonRouterOutlet,
|
IonRouterOutlet,
|
||||||
|
IonTabBar,
|
||||||
|
IonTabButton,
|
||||||
|
IonTabs,
|
||||||
setupIonicReact
|
setupIonicReact
|
||||||
} from '@ionic/react';
|
} from '@ionic/react';
|
||||||
import { IonReactRouter } from '@ionic/react-router';
|
import { IonReactRouter } from '@ionic/react-router';
|
||||||
import Cadastro from './pages/Cadastro/Cadastro';
|
import Cadastro from './pages/Cadastro/Cadastro';
|
||||||
import MainPages from './pages/MainPages';
|
|
||||||
|
|
||||||
// importação das páginas
|
// importação das páginas
|
||||||
import Login from './pages/Login';
|
import Login from './pages/Login';
|
||||||
@@ -31,15 +35,14 @@ import '@ionic/react/css/display.css';
|
|||||||
import './theme/variables.css';
|
import './theme/variables.css';
|
||||||
import Perfil from './pages/Perfil';
|
import Perfil from './pages/Perfil';
|
||||||
import PerfilEditar from './pages/PerfilEditar';
|
import PerfilEditar from './pages/PerfilEditar';
|
||||||
|
import { search, home, person } from 'ionicons/icons';
|
||||||
|
import { useState, useContext, useEffect } from 'react';
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
setupIonicReact();
|
setupIonicReact();
|
||||||
|
|
||||||
const App: React.FC = () => (
|
const routes = (
|
||||||
<IonApp>
|
<>
|
||||||
<IonReactRouter>
|
|
||||||
|
|
||||||
<IonRouterOutlet>
|
|
||||||
<Route exact path="/mainpages" component={MainPages}></Route>
|
|
||||||
<Route exact path="/cadastro" component={Cadastro}></Route>
|
<Route exact path="/cadastro" component={Cadastro}></Route>
|
||||||
<Route exact path="/login" component={Login}></Route>
|
<Route exact path="/login" component={Login}></Route>
|
||||||
<Route exact path="/perfil" component={Perfil}></Route>
|
<Route exact path="/perfil" component={Perfil}></Route>
|
||||||
@@ -47,10 +50,63 @@ const App: React.FC = () => (
|
|||||||
<Route exact path="/">
|
<Route exact path="/">
|
||||||
<Redirect to="/cadastro" />
|
<Redirect to="/cadastro" />
|
||||||
</Route>
|
</Route>
|
||||||
</IonRouterOutlet>
|
</>)
|
||||||
|
|
||||||
|
interface IUserManager {
|
||||||
|
setIsLoggedIn: Function;
|
||||||
|
}
|
||||||
|
|
||||||
|
const user: IUserManager = {
|
||||||
|
setIsLoggedIn: () => {}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const UserContext = React.createContext<IUserManager>(user);
|
||||||
|
|
||||||
|
const IonicApp: React.FC = () => {
|
||||||
|
const [isLoggedIn, setIsLoggedIn] = useState(false);
|
||||||
|
const user = useContext(UserContext);
|
||||||
|
|
||||||
|
user.setIsLoggedIn = setIsLoggedIn;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// TODO, verifica se usuário está logado
|
||||||
|
// fazer com serviço externo (evita duplicações)
|
||||||
|
})
|
||||||
|
|
||||||
|
return(
|
||||||
|
<IonApp>
|
||||||
|
<IonReactRouter>
|
||||||
|
{isLoggedIn ? (
|
||||||
|
<IonTabs>
|
||||||
|
<IonRouterOutlet>{routes}</IonRouterOutlet>
|
||||||
|
|
||||||
|
<IonTabBar slot="bottom">
|
||||||
|
<IonTabButton tab="buscar" href="/buscar">
|
||||||
|
<IonIcon icon={search} />
|
||||||
|
<IonLabel>Buscar</IonLabel>
|
||||||
|
</IonTabButton>
|
||||||
|
<IonTabButton tab="home" href="/home">
|
||||||
|
<IonIcon icon={home} />
|
||||||
|
<IonLabel>Home</IonLabel>
|
||||||
|
</IonTabButton>
|
||||||
|
<IonTabButton tab="perfil" href="/perfil">
|
||||||
|
<IonIcon icon={person} />
|
||||||
|
<IonLabel>Perfil</IonLabel>
|
||||||
|
</IonTabButton>
|
||||||
|
</IonTabBar>
|
||||||
|
</IonTabs>
|
||||||
|
) : (<IonRouterOutlet>{routes}</IonRouterOutlet>)}
|
||||||
</IonReactRouter>
|
</IonReactRouter>
|
||||||
</IonApp>
|
</IonApp>
|
||||||
);
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const App: React.FC = () => {
|
||||||
|
return (
|
||||||
|
<UserContext.Provider value={user}>
|
||||||
|
<IonicApp />
|
||||||
|
</UserContext.Provider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useEffect, useState } from 'react';
|
|||||||
import { useHistory, useParams } from 'react-router';
|
import { useHistory, useParams } from 'react-router';
|
||||||
import './Cadastro.css';
|
import './Cadastro.css';
|
||||||
import ModalExample from '../../components/Email';
|
import ModalExample from '../../components/Email';
|
||||||
import * as UsersService from '../../services/users'
|
import * as UsersService from '../../services/api/users'
|
||||||
|
|
||||||
const Cadastro: React.FC = () => {
|
const Cadastro: React.FC = () => {
|
||||||
const history = useHistory();
|
const history = useHistory();
|
||||||
@@ -114,7 +114,7 @@ const Cadastro: React.FC = () => {
|
|||||||
<IonHeader>
|
<IonHeader>
|
||||||
<IonToolbar>
|
<IonToolbar>
|
||||||
<IonButtons slot="start">
|
<IonButtons slot="start">
|
||||||
<IonBackButton text={''} icon={arrowBack} defaultHref='mainpages' />
|
<IonBackButton text={''} icon={arrowBack} defaultHref='login' />
|
||||||
</IonButtons>
|
</IonButtons>
|
||||||
</IonToolbar>
|
</IonToolbar>
|
||||||
</IonHeader>
|
</IonHeader>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import {
|
|||||||
IonTitle,
|
IonTitle,
|
||||||
IonToolbar
|
IonToolbar
|
||||||
} from "@ionic/react";
|
} from "@ionic/react";
|
||||||
import React, { useState } from "react";
|
import React, { useContext, useState } from "react";
|
||||||
import { IonGrid, IonRow, IonCol, IonToast } from "@ionic/react";
|
import { IonGrid, IonRow, IonCol, IonToast } from "@ionic/react";
|
||||||
import { useHistory } from "react-router-dom";
|
import { useHistory } from "react-router-dom";
|
||||||
import {
|
import {
|
||||||
@@ -15,9 +15,10 @@ import {
|
|||||||
IonButton,
|
IonButton,
|
||||||
} from "@ionic/react";
|
} from "@ionic/react";
|
||||||
|
|
||||||
import * as sessionRoutes from '../services/session';
|
import * as sessionRoutes from '../services/api/session';
|
||||||
import LocalStorage from '../LocalStorage';
|
import LocalStorage from '../LocalStorage';
|
||||||
import { Action } from "../components/Action";
|
import { Action } from "../components/Action";
|
||||||
|
import { UserContext } from "../App";
|
||||||
|
|
||||||
const Page: React.FC = () => {
|
const Page: React.FC = () => {
|
||||||
const [showToast, setShowToast] = useState(false);
|
const [showToast, setShowToast] = useState(false);
|
||||||
@@ -27,6 +28,8 @@ const Page: React.FC = () => {
|
|||||||
const [email, setEmail] = useState<string>("matheusalb3213@gmail.com");
|
const [email, setEmail] = useState<string>("matheusalb3213@gmail.com");
|
||||||
const [password, setPassword] = useState<string>("12345678");
|
const [password, setPassword] = useState<string>("12345678");
|
||||||
|
|
||||||
|
const user = useContext(UserContext);
|
||||||
|
|
||||||
function validateEmail(email: string) {
|
function validateEmail(email: string) {
|
||||||
const re =
|
const re =
|
||||||
// eslint-disable-next-line no-control-regex
|
// eslint-disable-next-line no-control-regex
|
||||||
@@ -84,6 +87,8 @@ const Page: React.FC = () => {
|
|||||||
|
|
||||||
LocalStorage.setToken(token);
|
LocalStorage.setToken(token);
|
||||||
|
|
||||||
|
user.setIsLoggedIn(true);
|
||||||
|
|
||||||
history.push({ pathname: '/home' });
|
history.push({ pathname: '/home' });
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
// if (!error.response) return
|
// if (!error.response) return
|
||||||
|
|||||||
@@ -1,3 +1,9 @@
|
|||||||
#avatar {
|
#avatar {
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
|
width: 64px;
|
||||||
|
height: 64px;
|
||||||
|
}
|
||||||
|
|
||||||
|
IonIcon {
|
||||||
|
color: blue;
|
||||||
}
|
}
|
||||||
@@ -3,11 +3,17 @@ import {
|
|||||||
IonCardContent,
|
IonCardContent,
|
||||||
IonCardHeader,
|
IonCardHeader,
|
||||||
IonCardTitle,
|
IonCardTitle,
|
||||||
|
IonChip,
|
||||||
IonContent,
|
IonContent,
|
||||||
IonFab,
|
IonFab,
|
||||||
IonFabButton,
|
IonFabButton,
|
||||||
|
IonGrid,
|
||||||
IonHeader,
|
IonHeader,
|
||||||
IonIcon,
|
IonIcon,
|
||||||
|
IonItem,
|
||||||
|
IonLabel,
|
||||||
|
IonList,
|
||||||
|
IonListHeader,
|
||||||
IonPage,
|
IonPage,
|
||||||
IonTitle,
|
IonTitle,
|
||||||
IonToast,
|
IonToast,
|
||||||
@@ -18,8 +24,8 @@ import React, { useState, useEffect, useReducer } from "react";
|
|||||||
import { IonRow, IonCol } from "@ionic/react";
|
import { IonRow, IonCol } from "@ionic/react";
|
||||||
import { createOutline } from "ionicons/icons";
|
import { createOutline } from "ionicons/icons";
|
||||||
|
|
||||||
import * as sessionRoutes from '../services/session';
|
import * as sessionRoutes from '../services/api/session';
|
||||||
import * as usersRoutes from '../services/users';
|
import * as usersRoutes from '../services/api/users';
|
||||||
|
|
||||||
import './Perfil.css'
|
import './Perfil.css'
|
||||||
import LocalStorage from "../LocalStorage";
|
import LocalStorage from "../LocalStorage";
|
||||||
@@ -137,6 +143,32 @@ const Perfil: React.FC = () => {
|
|||||||
</IonCardContent>
|
</IonCardContent>
|
||||||
</IonCard>
|
</IonCard>
|
||||||
|
|
||||||
|
<IonCard>
|
||||||
|
<IonCardContent>
|
||||||
|
<IonLabel>Status do perfil</IonLabel>
|
||||||
|
<IonChip>
|
||||||
|
<IonLabel color="primary">Passageiro</IonLabel>
|
||||||
|
</IonChip>
|
||||||
|
</IonCardContent>
|
||||||
|
</IonCard>
|
||||||
|
|
||||||
|
<IonList>
|
||||||
|
<IonListHeader>Dashboard</IonListHeader>
|
||||||
|
<IonItem>
|
||||||
|
<IonIcon></IonIcon>
|
||||||
|
<IonLabel>Confirmar perfil</IonLabel>
|
||||||
|
</IonItem>
|
||||||
|
<IonItem>
|
||||||
|
<IonLabel>Cadastrar Van</IonLabel>
|
||||||
|
</IonItem>
|
||||||
|
<IonItem>
|
||||||
|
<IonLabel>Pagamentos</IonLabel>
|
||||||
|
</IonItem>
|
||||||
|
<IonItem>
|
||||||
|
<IonLabel>Avaliações</IonLabel>
|
||||||
|
</IonItem>
|
||||||
|
</IonList>
|
||||||
|
|
||||||
<IonFab vertical="bottom" horizontal="end" slot="fixed">
|
<IonFab vertical="bottom" horizontal="end" slot="fixed">
|
||||||
<IonFabButton onClick={() => history.push({ pathname: '/perfil/editar', state: { userData: inputValues } })}>
|
<IonFabButton onClick={() => history.push({ pathname: '/perfil/editar', state: { userData: inputValues } })}>
|
||||||
<IonIcon icon={createOutline} />
|
<IonIcon icon={createOutline} />
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import { saveOutline } from "ionicons/icons";
|
|||||||
|
|
||||||
import isEqual from 'lodash.isequal';
|
import isEqual from 'lodash.isequal';
|
||||||
|
|
||||||
import * as usersRoutes from '../services/users';
|
import * as usersRoutes from '../services/api/users';
|
||||||
|
|
||||||
import './Cadastro/Cadastro.css'
|
import './Cadastro/Cadastro.css'
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import apiConfig from '../config/api.config';
|
import apiConfig from '../../config/api.config';
|
||||||
|
|
||||||
const instance = axios.create({
|
const instance = axios.create({
|
||||||
baseURL: apiConfig.getBaseUrl(),
|
baseURL: apiConfig.getBaseUrl(),
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import instance from '../services/api';
|
import instance from './api';
|
||||||
import sessionRoutes from '../constants/routes/sessionRoutes';
|
import sessionRoutes from '../../constants/routes/sessionRoutes';
|
||||||
import LocalStorage from '../LocalStorage';
|
import LocalStorage from '../../LocalStorage';
|
||||||
import { AxiosRequestHeaders } from 'axios';
|
import { AxiosRequestHeaders } from 'axios';
|
||||||
|
|
||||||
let token: string | null;
|
let token: string | null;
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
import instance from '../services/api';
|
import instance from './api';
|
||||||
// import LocalStorage from '../LocalStorage';
|
// import LocalStorage from '../LocalStorage';
|
||||||
|
|
||||||
import userRoutes from '../constants/routes/usersRoutes';
|
import userRoutes from '../../constants/routes/usersRoutes';
|
||||||
import { AxiosRequestHeaders } from 'axios';
|
import { AxiosRequestHeaders } from 'axios';
|
||||||
import LocalStorage from '../LocalStorage';
|
import LocalStorage from '../../LocalStorage';
|
||||||
|
|
||||||
let token: string;
|
let token: string;
|
||||||
let header: AxiosRequestHeaders;
|
let header: AxiosRequestHeaders;
|
||||||
Reference in New Issue
Block a user