From 4d2d3c4d1bfd627483c4ebfa70561373edd8a052 Mon Sep 17 00:00:00 2001 From: Zamil Majdy <z.majdy1996@gmail.com> Date: Tue, 25 Apr 2017 20:08:22 +0700 Subject: [PATCH] [#140652771] [#21] [Refactor] Delete unused file, unused import, refactor class name --- assets/js/Login.jsx | 17 ++++---- .../components/CompanyRegister-test.jsx | 13 ------ ...sterModal.jsx => CompanyRegisterModal.jsx} | 2 +- assets/js/components/CompanyVacancy.jsx | 40 +++++++++---------- assets/js/components/ModalAlert.jsx | 2 +- 5 files changed, 29 insertions(+), 45 deletions(-) delete mode 100644 assets/js/__test__/components/CompanyRegister-test.jsx rename assets/js/components/{RegisterModal.jsx => CompanyRegisterModal.jsx} (98%) diff --git a/assets/js/Login.jsx b/assets/js/Login.jsx index a2697280..0065df98 100644 --- a/assets/js/Login.jsx +++ b/assets/js/Login.jsx @@ -1,7 +1,7 @@ import React from 'react'; -import { Grid, Segment, Button, Header, Icon, Modal, Form, Input, TextArea, Card, Image} from 'semantic-ui-react'; +import { Grid, Segment, Header, Card, Image } from 'semantic-ui-react'; import LoginForm from './components/LoginForm'; -import RegisterModal from './components/RegisterModal'; +import CompanyRegisterModal from './components/CompanyRegisterModal'; export default class Login extends React.Component { @@ -17,18 +17,17 @@ export default class Login extends React.Component { }; render = () => ( - <div className="halamanLogin"> <div className="headerLogin"> - <Header as='h2' icon textAlign='center' > - <Image src='/assets/img/logo.png' size='medium' centered /> + <Header as="h2" icon textAlign="center" > + <Image src="/assets/img/logo.png" size="medium" centered /> <Header.Content > Kanal Akses Pendaftaran KP Elektronik </Header.Content> - </Header> + </Header> </div> - <Grid stackable columns={2} relaxed> + <Grid stackable columns={2} relaxed> <Grid.Column> <Segment basic> <LoginForm type="company" header="Company Login" imgSrc="logo.png" imgSize="small" /> @@ -43,13 +42,12 @@ export default class Login extends React.Component { <Header as="h3">New to us ?</Header> </Grid.Column> <Grid.Column> - <RegisterModal /> + <CompanyRegisterModal /> </Grid.Column> </Grid> </Card.Content> </Card> </div> - </Grid.Column> <Grid.Column> @@ -58,7 +56,6 @@ export default class Login extends React.Component { {this.props.children} </Segment> </Grid.Column> - </Grid> </div> ) diff --git a/assets/js/__test__/components/CompanyRegister-test.jsx b/assets/js/__test__/components/CompanyRegister-test.jsx deleted file mode 100644 index 0a46e09a..00000000 --- a/assets/js/__test__/components/CompanyRegister-test.jsx +++ /dev/null @@ -1,13 +0,0 @@ -// /* eslint-disable no-unused-expressions */ -// import React from 'react'; -// import ReactTestUtils from 'react-addons-test-utils'; -// import Vacancy from '../components/ComponentRegister'; -// -// describe('Vacancy', () => { -// it('renders without problem', () => { -// let companyRegister = ReactTestUtils.renderIntoDocument( -// <CompanyRegister />); -// expect(companyRegister).to.exist; -// -// }); -// }); \ No newline at end of file diff --git a/assets/js/components/RegisterModal.jsx b/assets/js/components/CompanyRegisterModal.jsx similarity index 98% rename from assets/js/components/RegisterModal.jsx rename to assets/js/components/CompanyRegisterModal.jsx index b5e583e4..cd85c3de 100644 --- a/assets/js/components/RegisterModal.jsx +++ b/assets/js/components/CompanyRegisterModal.jsx @@ -5,7 +5,7 @@ import ModalAlert from './../components/ModalAlert'; import Server from './../lib/Server'; import Storage from './../lib/Storage'; -export default class RegisterModal extends React.Component { +export default class CompanyRegisterModal extends React.Component { constructor(props) { super(props); diff --git a/assets/js/components/CompanyVacancy.jsx b/assets/js/components/CompanyVacancy.jsx index 3900bfe9..04fdadc1 100644 --- a/assets/js/components/CompanyVacancy.jsx +++ b/assets/js/components/CompanyVacancy.jsx @@ -1,49 +1,49 @@ import React from 'react'; import moment from 'moment'; -import { Button, Icon, Item, Segment } from 'semantic-ui-react'; +import { Button, Icon, Item, Grid } from 'semantic-ui-react'; import { Link } from 'react-router'; const defaultImage = 'http://semantic-ui.com/images/wireframe/image.png'; -export default class ApplicantList extends React.Component { +export default class CompanyVacancy extends React.Component { static propTypes = { data: React.PropTypes.object.isRequired, + deleteCallback: React.PropTypes.func.isRequired, }; constructor(props) { super(props); moment.locale('id'); + this.state = { deleteLoading: false }; } getLink = `/buat-lowongan/${this.props.data.id}`; render() { return ( - <Item className="applicantItems"> <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> - <Segment compact basic floated="right"> - {this.props.data.verified ? - (<h4> <Icon name="checkmark box" size="large" color="green" /> Terverifikasi </h4>) : - (<h4> <Icon name="remove circle" size="large" color="red" /> Belum Terverifikasi </h4>)} - <Button color="blue" floated="right" as={Link} to={this.getLink}> - Ubah <Icon name="right chevron" /> - </Button> - </Segment> - - - <Item.Extra> - <h3> 105 Pendaftar </h3> + <Grid.Row> + <Grid.Column floated="left"> + <h5> 105 Pendaftar </h5> Ditutup {moment(moment(this.props.data.close_time)).fromNow()} - </Item.Extra> - + </Grid.Column> + <Grid.Column floated="right"> + {this.props.data.verified ? + (<h4> <Icon name="checkmark box" size="large" color="green" /> Terverifikasi </h4>) : + (<h4> <Icon name="remove circle" size="large" color="red" /> Belum Terverifikasi </h4>)} + <Button color="blue" floated="right" as={Link} to={this.getLink}> + Ubah <Icon name="right chevron" /> + </Button> + <Button loading={this.state.deleteLoading} color="red" floated="right" onClick={() => { this.setState({ deleteLoading : true }); this.props.deleteCallback(); }} > + Hapus <Icon name="delete" /> + </Button> + </Grid.Column> + </Grid.Row> </Item.Content> - </Item> - ); } } diff --git a/assets/js/components/ModalAlert.jsx b/assets/js/components/ModalAlert.jsx index e5c723ab..10b7e0e6 100644 --- a/assets/js/components/ModalAlert.jsx +++ b/assets/js/components/ModalAlert.jsx @@ -32,7 +32,7 @@ export default class ModalAlert extends React.Component { }; render = () => { - const style = { 'white-space': 'pre-wrap' }; + const style = { whiteSpace: 'pre-wrap' }; return ( <Modal open={this.state.open} basic size="small"> <Header icon="warning sign" content={this.state.header} /> -- GitLab