diff --git a/assets/css/custom.css b/assets/css/custom.css
index b3929add4068310af30884acae5b0cc658f22c19..5f145954724bd9448874030d27ce69714dd16e45 100755
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -246,8 +246,7 @@ card .formRegis{
}
.ui.segment.paginationCompany{
- margin-left: 10%;
- margin-right: 10%;
+ margin: 2% 7% 60px;
}
.admin-bar{
diff --git a/assets/js/CompanyPage.jsx b/assets/js/CompanyPage.jsx
index 161fe6e6cd26290d9085ba7d51fa2a89931e0673..8f00966959199f5091452afd7ea52675529131ed 100644
--- a/assets/js/CompanyPage.jsx
+++ b/assets/js/CompanyPage.jsx
@@ -19,9 +19,6 @@ export default class CompanyPage extends React.Component {
<div>
<div className="button-administrasi">
<Button onClick={this.handleClick} icon="dashboard" labelPosition="left" color="facebook" content="Buka Menu Administrasi" />
- </div>
-
- <div style={{ paddingLeft: '10px', paddingTop : '10px'}}>
<Button onClick={this.handleVacancy} icon="dashboard" labelPosition="left" color="facebook" content="Halaman Verifikasi Lowongan" />
</div>
@@ -29,7 +26,7 @@ export default class CompanyPage extends React.Component {
<Pagination
key={1}
url={`/companies/?status=${Company.COMPANY_STATUS.NEW}`}
- label="Baru"
+ label="Belum Diverifikasi"
child={
<CompanyList status={Company.COMPANY_STATUS.NEW} />
}
diff --git a/assets/js/VacancyPage.jsx b/assets/js/VacancyPage.jsx
index 7efdb932760d68ba97012c966ae0a801b36d2529..b2ef06639c65866ed81a8a76e0e411d850b7c5f2 100644
--- a/assets/js/VacancyPage.jsx
+++ b/assets/js/VacancyPage.jsx
@@ -1,5 +1,6 @@
import React from 'react';
-import { Segment } from 'semantic-ui-react';
+import { Segment, Item, Button } from 'semantic-ui-react';
+import { Link } from 'react-router';
import Tabs from './components/Tabs';
import Pane from './components/Pane';
import VacancyList from './components/VacancyList';
@@ -140,9 +141,28 @@ export default class VacancyPage extends React.Component {
);
}
+ companyHeader() {
+ if ((this.props.user.role === 'admin' && this.props.user.data.company != null) || this.props.user.role === 'company') {
+ return (
+ <div style={{ float: 'left' }}>
+ <Button as={Link} to="/pelamar" icon="eye" labelPosition="left" color="facebook" content="Lihat Semua Pendaftar" />
+ <Button as={Link} to="/buat-lowongan" icon="add" labelPosition="left" content="Tambah Lowongan Baru" color="teal" />
+ </div>
+ );
+ }
+
+ return '';
+ }
+
render() {
return (
<div className="applicant">
+ <div className="button-administrasi">
+ { this.companyHeader() }
+ {(this.props.user.role === 'admin' || this.props.user.role === 'supervisor') &&
+ <Button as={Link} to="/rekap" icon="dashboard" labelPosition="left" color="facebook" content="Rekap Pendaftaran"/>
+ }
+ </div>
{ this.generateVacancies() }
</div>
);
diff --git a/assets/js/components/AdminVacancy.jsx b/assets/js/components/AdminVacancy.jsx
index 3983a7cda5214da343393a2048edf5a1292ef428..d0a5d152ebb6c21d62962db86ee7616a657bd8f1 100644
--- a/assets/js/components/AdminVacancy.jsx
+++ b/assets/js/components/AdminVacancy.jsx
@@ -32,9 +32,10 @@ export default class AdminVacancy extends React.Component {
}
render() {
+ const defaultImage = 'http://semantic-ui.com/images/wireframe/image.png';
return (
<Item className="adminItems">
- <Item.Image src="http://semantic-ui.com/images/wireframe/image.png" size="small" />
+ <Item.Image src={this.props.data.company.logo ? this.props.data.company.logo : defaultImage} size="small" />
<Item.Content>
<Item.Header as="a">{this.props.data.name}</Item.Header>
<Grid.Row>
diff --git a/assets/js/components/TopMenu.jsx b/assets/js/components/TopMenu.jsx
index 33d483abb75393a81ebf55940e145d8f0d16ff9b..19691fc88d1ce4e009ce4b2f74ab55a9db518c12 100644
--- a/assets/js/components/TopMenu.jsx
+++ b/assets/js/components/TopMenu.jsx
@@ -65,8 +65,13 @@ export default class TopMenu extends React.Component {
<div>
{ this.props.user.data.is_staff && this.props.user.data.company && (
<div className="admin-bar">
- Anda login sebagai perusahaan: {this.props.user.data.company.name} (#{this.props.user.data.company.id}).
- Untuk keluar, silahkan klik <a href="#" onClick={this.logoutCompany}> link ini</a>
+ <br/>
+ <p>
+ Anda login sebagai perusahaan:
+ <b> {this.props.user.data.company.name}</b> (#{this.props.user.data.company.id}).
+ Untuk kembali menjadi admin, klik <a href="#" onClick={this.logoutCompany}> link ini</a>
+ </p>
+ <br/>
</div>
)}
<Menu color="blue" pointing secondary>
diff --git a/assets/js/components/VacancyList.jsx b/assets/js/components/VacancyList.jsx
index 39df62af210817f82c315104893f2f7c316705f0..865a841d8d2692ff2aa06211fac301011ffa83cb 100644
--- a/assets/js/components/VacancyList.jsx
+++ b/assets/js/components/VacancyList.jsx
@@ -18,7 +18,6 @@ export default class VacancyList extends React.Component {
items: [],
};
-
constructor(props) {
super(props);
/* istanbul ignore next */
@@ -64,51 +63,32 @@ export default class VacancyList extends React.Component {
/>
),
);
- }
- if ((this.props.user.role === 'admin' && this.props.user.data.supervisor != null) || this.props.user.role === 'supervisor') {
+ } else if ((this.props.user.role === 'admin' && this.props.user.data.company != null)
+ || this.props.user.role === 'company') {
return this.state.vacancies.map(vacancy => (
- <AdminVacancy
- key={vacancy.id}
- data={vacancy}
- updateStatus={this.updateStatus}
- />),
+ <Item.Group key={vacancy.id} relaxed style={{ width: '100%' }}>
+ <CompanyVacancy
+ key={vacancy.id}
+ data={vacancy}
+ deleteCallback={() => this.deleteVacancy(vacancy.id)}
+ />
+ </Item.Group>
+ ),
);
}
return this.state.vacancies.map(vacancy => (
- <Item.Group key={vacancy.id} relaxed style={{ width: '100%' }}>
- <CompanyVacancy
- key={vacancy.id}
- data={vacancy}
- deleteCallback={() => this.deleteVacancy(vacancy.id)}
- />
- </Item.Group>
- ),
+ <AdminVacancy
+ key={vacancy.id}
+ data={vacancy}
+ updateStatus={this.updateStatus}
+ />),
);
}
- companyHeader() {
- if (this.props.user.role === 'admin' || this.props.user.role === 'company') {
- return (
- <div>
- <Button size="tiny" as={Link} to="/pelamar" icon="eye" labelPosition="left" color="facebook" content="Lihat Semua Pendaftar" />
- <Button size="tiny" as={Link} to="/buat-lowongan" icon="add" labelPosition="left" content="Tambah Lowongan Baru" color="teal" />
- </div>
- );
- }
-
- return '';
- }
-
render = () => (
<div>
<Grid container columns="eleven" doubling>
- <Grid textAlign="center" style={{ paddingTop: '10px' }}>
- { this.companyHeader() }<br />
- {(this.props.user.role === 'admin' || this.props.user.role === 'supervisor') &&
- <Button size="tiny" as={Link} to="/rekap" icon="dashboard" labelPosition="left" color="facebook" content="Rekap Pendaftaran" />
- }
- </Grid>
<Item.Group relaxed style={{ width: '100%' }}>
{ this.generateVacancies() }
</Item.Group>