Skip to content

Commit

Permalink
fix: corrigindo problemas de merge
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielRogs committed Aug 24, 2024
1 parent fd9b6e8 commit 6b1b384
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions riso_frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ import { BrowserRouter as Router, Route, Routes} from 'react-router-dom';
import Autentication from './pages/Autentication';
import HomePage from './pages/HomePage';
import RegisterUnit from './pages/CadastroEmpresa';
import addUnityModal from './components/addUnityModal/index';

function App() {
return (
<Router>
<Routes>
<Route path='/' element={<addUnityModal />} />
{/*<Route path='/' element={<Autentication />} />*/}
<Route path='/' element={<Autentication />} />
<Route path='/homePage' element={<HomePage />} />
<Route path='/registerUnit' element={<RegisterUnit/>}/>
</Routes>
Expand Down
2 changes: 1 addition & 1 deletion riso_frontend/src/pages/Autentication/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ function Autentication() {
<div style={{height: 10}}></div>
)}

<a class="password" href="/CadastroEmpresa">Esqueci minha senha?</a>
<a class="password" href="/RegisterUnit">Esqueci minha senha?</a>
<button class="btn btn-second" onClick={login}>Entrar</button>
</form>
</div>
Expand Down

0 comments on commit 6b1b384

Please sign in to comment.