Fakultas Ilmu Komputer UI

Commit 524213be authored by M. Reza Qorib's avatar M. Reza Qorib
Browse files

#144502159] [Refactor] #49 Resolve merge conflict

parents 94f7a533 6c5a3e96
......@@ -244,6 +244,10 @@ card .formRegis{
margin-right: 10%;
}
.ui.segment.paginationCompany{
margin-left: 10%;
margin-right: 10%;
}
.admin-bar{
margin: 0;
......
import React from 'react';
import { Container } from 'semantic-ui-react';
import { Segment } from 'semantic-ui-react';
import Tabs from './components/Tabs';
import Pane from './components/Pane';
import VacancyList from './components/VacancyList';
......@@ -78,9 +78,8 @@ export default class VacancyPage extends React.Component {
);
} else if (this.props.user.role === 'company' || this.props.user.role === 'admin') {
return (
<Container className="vacancies">
<Segment className="paginationCompany">
<Pagination
key={1}
url={`/companies/${this.state.id}/vacancies/`}
child={
<VacancyList
......@@ -91,7 +90,7 @@ export default class VacancyPage extends React.Component {
}
error="Anda belum diverifikasi. Harap hubungi admin"
/>
</Container>
</Segment>
);
}
......
......@@ -28,6 +28,7 @@ export default class CompanyVacancy extends React.Component {
render() {
return (
<Item className="applicantItems">
<Item.Image src={this.props.data.company.logo ? this.props.data.company.logo : defaultImage} size="small" />
<Item.Content verticalAlign="middle" style={{ wordWrap: 'break-word', width: '100%' }} >
......
import React from 'react';
import { Item, Button, Grid } from 'semantic-ui-react';
import { Item, Button, Grid, Segment } from 'semantic-ui-react';
import { Link } from 'react-router';
import Vacancy from './Vacancy';
import CompanyVacancy from './CompanyVacancy';
......@@ -54,11 +54,17 @@ export default class VacancyList extends React.Component {
);
}
return this.state.vacancies.map(vacancy => (<CompanyVacancy
key={vacancy.id}
data={vacancy}
deleteCallback={() => this.deleteVacancy(vacancy.id)}
/>),
return this.state.vacancies.map(vacancy => (
<Item.Group relaxed style={{ width: '100%' }}>
<CompanyVacancy
key={vacancy.id}
data={vacancy}
deleteCallback={() => this.deleteVacancy(vacancy.id)}
/>
</Item.Group>
),
);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment