Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amparo
Amparo-frontend
Commits
69a36740
Commit
69a36740
authored
1 year ago
by
Lucas Silveira Wolschick
Browse files
Options
Download
Email Patches
Plain Diff
Remoção do conflito app
parent
142224a6
component-buttonSalmom
1 merge request
!23
Finalização do componente, e fix no tamanho do icone
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/App.tsx
+1
-5
src/App.tsx
with
1 addition
and
5 deletions
+1
-5
src/App.tsx
View file @
69a36740
...
...
@@ -7,7 +7,6 @@ import ExamesPendentesVazio from './pages/ExamesPendentes/ExamesPendentesVazio';
import
{
CadastroPaciente
}
from
'
./pages/CadastroPaciente/CadastroPaciente
'
;
import
{
CadastroMedico
}
from
'
./pages/CadastroMedico/CadastroMedico
'
;
import
{
Identificacao
}
from
'
./pages/Identificacao/Identificacao
'
;
import
{
ButtonSalmon
}
from
'
./components/ButtonSalmon/ButtonSalmon
'
;
// Quando os componentes CadastroPaciente e EsqueceuSenha estiverem disponíveis, descomentar os imports abaixo.
...
...
@@ -20,8 +19,6 @@ function App() {
<
Routes
>
{
/*<Route path="/" element={<Login />} />*/
}
{
/* Descomente as linhas abaixo quando os componentes estiverem disponíveis */
}
<
Route
path
=
"/button-salmon"
element
=
{
<
ButtonSalmon
label
=
'Realizado'
onClick
=
{
()
=>
console
.
log
(
'
buttonSalmonClicado
'
)
}
icon
=
{
true
}
/>
}
/>
<
Route
path
=
"/button-salmon2"
element
=
{
<
ButtonSalmon
label
=
'imagens'
onClick
=
{
()
=>
console
.
log
(
'
buttonSalmonClicado
'
)
}
/>
}
/>
<
Route
path
=
"/home/paciente"
element
=
{
<
HomePaciente
/>
}
/>
<
Route
path
=
"/cadastro/paciente"
element
=
{
<
CadastroPaciente
/>
}
/>
<
Route
path
=
"/cadastro/medico"
element
=
{
<
CadastroMedico
/>
}
/>
...
...
@@ -30,8 +27,7 @@ function App() {
path
=
"/perfil/exames-pendentes-vazio"
element
=
{
<
ExamesPendentesVazio
/>
}
/>
{
/* <Route path="/esqueceu-senha" element={<EsqueceuSenha />} /> */
}
{
/* <Route path="/esqueceu-senha" element={<EsqueceuSenha />} /> */
}
<
Route
path
=
"*"
element
=
{
<
Login
/>
}
/>
<
Route
path
=
"/perfil/paciente"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help