Skip to content

update: Adicionando rotas das Telas Aidiconadas #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guilhermefogacadev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update: Adicionando rotas das Telas Aidiconadas #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 42 additions & 30 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,58 @@
import React from 'react';
import { RouterProvider, createBrowserRouter } from 'react-router-dom';
import { Provider } from 'react-redux';
import { ToastContainer } from 'react-toastify';
import 'react-toastify/dist/ReactToastify.css';
import PrivateRoute from './components/PrivateRoute';
import store from './auth/store';
import Home from './pages/Home';
import HomePage from './pages/HomePage';
import MainLayout from './layouts/MainLayout';
import Login from './pages/Login';
import Cadastro from './pages/Cadastro';
import VerHorarios from './pages/VerHorarios';
import Perfil from './pages/Perfil';
import Cartao from './pages/Cartao';
import React from "react";
import { RouterProvider, createBrowserRouter } from "react-router-dom";
import { Provider } from "react-redux";
import { ToastContainer } from "react-toastify";
import "react-toastify/dist/ReactToastify.css";
import PrivateRoute from "./components/PrivateRoute";
import store from "./auth/store";
import Home from "./pages/Home";
import HomePage from "./pages/HomePage";
import MainLayout from "./layouts/MainLayout";
import Login from "./pages/Login";
import Cadastro from "./pages/Cadastro";
import VerHorarios from "./pages/VerHorarios";
import Perfil from "./pages/Perfil";
import Cartao from "./pages/Cartao";
import SolicitarCartao from "./pages/SolicitarCartao";
import Historico from "./pages/Historico";
import GerenciarNotificacao from "./pages/GerenciarNotificacao";
import GerenciarSolicitacao from "./pages/GerenciarSolicitacao";

const router = createBrowserRouter([
{
path: '/',
path: "/",
element: <MainLayout />,
children: [
{ path: '/', element: <HomePage /> },
{ path: '/login', element: <Login /> },
{ path: '/cadastro', element: <Cadastro /> },
{path: '', element: <PrivateRoute />, children: [
{ path: '/home', element: <Home /> },
{ path: '/perfil', element: <Perfil />},
{ path: '/verhorarios', element: <VerHorarios /> },
{ path: '/cartao', element: <Cartao />},
]},
{ path: "/", element: <HomePage /> },
{ path: "/login", element: <Login /> },
{ path: "/cadastro", element: <Cadastro /> },
{
path: "",
element: <PrivateRoute />,
children: [
{ path: "/home", element: <Home /> },
{ path: "/perfil", element: <Perfil /> },
{ path: "/verhorarios", element: <VerHorarios /> },
{ path: "/cartao", element: <Cartao /> },
{ path: "/solicitarcartao", element: <SolicitarCartao /> },
{ path: "/historico", element: <Historico /> },
{ path: "/gerenciarnotificacao", element: <GerenciarNotificacao /> },
{ path: "/gerenciarsolicitacao", element: <GerenciarSolicitacao /> },
],
},
],
},
]);

const App = () => {
return (
<>
<Provider store={store}>
<RouterProvider router={router} />
<ToastContainer />
</Provider>
<Provider store={store}>
<RouterProvider router={router} />
<ToastContainer />
</Provider>
</>
)
);
};

export default App;
1 change: 0 additions & 1 deletion src/pages/GerenciarNotificacao.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ const GerenciarNotificacoes = () => {
idUser: userInfo.data.id,
texto,
dataHora: formattedDataHora, // Envia a dataHora gerada
isRead: false,
});
setTexto("");
fetchNotificacoes(); // Atualiza a lista de notificações
Expand Down