Skip to content

Commit

Permalink
Edit files to integrate frontend and backend
Browse files Browse the repository at this point in the history
Related to issue #4

Signed-off-by: Luiz Guilherme Silva <[email protected]>
Signed-off-by: Marcelo Oliveira <[email protected]>
  • Loading branch information
luizguilherme5 committed Apr 18, 2017
1 parent 4ffb9fc commit e3fdc3c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { jsonServerRestClient, Admin, Resource } from 'admin-on-rest';
import { Delete } from 'admin-on-rest/lib/mui';
import { PostList, PostEdit, PostCreate } from './Categories/Example';
import { UserList, UserEdit, UserCreate } from './Categories/Users';
import { OwnerList, OwnerCreate, OwnerEdit} from './Categories/Owners';
import { OwnerList, OwnerCreate, OwnerEdit } from './Categories/Owners';
import { PatientList } from './Categories/Patients';
import { AttendenceList } from './Categories/Attendences';
import { HospitalizationList } from './Categories/Hospitalizations';
Expand All @@ -24,7 +24,7 @@ import { BathAndGroomingList, BathAndGroomingEdit, BathAndGroomingCreate } from
import { FinancialReportList } from './Categories/FinancialReports';
import Dashboard from './Dashboard';
import authClient from './authClient';
import CustomTheme from './CustomTheme';
import CustomTheme from './CustomTheme';

const App = () => (
<Admin
Expand All @@ -38,7 +38,7 @@ const App = () => (
name="post" options={{ label: 'Exemplo' }} list={PostList} edit={PostEdit}
create={PostCreate} remove={Delete} icon={PostIcon}
/>
<Resource name="user" options={{ label: 'Usuários' }} list={UserList} edit={UserEdit} create={UserCreate} remove={Delete} icon={UserIcon} />
<Resource name="users" options={{ label: 'Usuários' }} list={UserList} edit={UserEdit} create={UserCreate} remove={Delete} icon={UserIcon} />
<Resource name="owners" options={{ label: 'Proprietários' }} list={OwnerList} edit={OwnerEdit} create={OwnerCreate} icon={OwnerIcon} />
<Resource name="patient" options={{ label: 'Pacientes' }} list={PatientList} icon={PatientIcon} />
<Resource name="attendence" options={{ label: 'Consultas' }} list={AttendenceList} icon={AttendenceIcon} />
Expand Down
5 changes: 2 additions & 3 deletions src/Categories/Users.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { List, Responsive, SimpleList, Edit, Create, Datagrid, TextField, Filter

const UserFilter = props => (
<Filter {...props}>
<TextInput label="Pesquisar" source="q" alwaysOn />
<ReferenceInput label="Usuário" source="id" reference="user" allowEmpty>
<TextInput label="Pesquisar" source="userFullName" alwaysOn />
<ReferenceInput label="Usuário" source="id" reference="users" allowEmpty>
<SelectInput source="id" optionText="userName" />
</ReferenceInput>
</Filter>
Expand Down Expand Up @@ -50,7 +50,6 @@ export const UserEdit = props => (
export const UserCreate = props => (
<Create {...props}>
<SimpleForm>
<TextInput source="id" label="ID" />
<TextInput source="userFullName" label="Nome Completo" />
<TextInput source="userName" label="Nome de Usuário" />
<TextInput type="password" source="userPassword" label="Senha" />
Expand Down

0 comments on commit e3fdc3c

Please sign in to comment.