From 4fe512feba5f6b97cb5ab3902945d8940838c390 Mon Sep 17 00:00:00 2001 From: "M. Reza Qorib" <rezaqorib96@gmail.com> Date: Wed, 29 Mar 2017 12:57:10 +0700 Subject: [PATCH] [#140654507] #12 on progress to make cancel applicancy --- assets/js/Index.jsx | 2 +- assets/js/VacancyPage.jsx | 2 +- assets/js/components/ModalAlert.jsx | 5 ++++- assets/js/components/Vacancy.jsx | 2 +- assets/js/components/VacancyList.jsx | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/assets/js/Index.jsx b/assets/js/Index.jsx index 7568e11d..f5b1a192 100644 --- a/assets/js/Index.jsx +++ b/assets/js/Index.jsx @@ -38,7 +38,7 @@ export default class App extends React.Component { <Route path="/login" component={Login} /> <Route path="/register" component={CompanyRegister} /> <Route component={Dashboard} onEnter={this.handleAuth}> - <Route path="/" component={Profile} /> + <Route path="/" component={VacancyPage} /> <Route path="/profile" component={Profile} /> <Route path="/lowongan" component={VacancyPage} /> <Route path="/users" component={Profile} /> diff --git a/assets/js/VacancyPage.jsx b/assets/js/VacancyPage.jsx index 66886b55..e1164609 100644 --- a/assets/js/VacancyPage.jsx +++ b/assets/js/VacancyPage.jsx @@ -29,7 +29,7 @@ export default class VacancyPage extends React.Component { <VacancyList key={1} studentId={student.id} url="/vacancies/" /> </Pane> <Pane label="Lamaran saya" > - <VacancyList key={2} studentId={student.id} url={`/students/${student.id}/applied-vacancies/`} /> + <VacancyList key={2} status="batal" studentId={student.id} url={`/students/${student.id}/applied-vacancies/`} /> </Pane> <Pane label="Lamaran Ditandai" > <VacancyList key={3} studentId={student.id} url={`/students/${student.id}/bookmarked-vacancies/`} /> diff --git a/assets/js/components/ModalAlert.jsx b/assets/js/components/ModalAlert.jsx index e03d10c8..b7a90bbd 100644 --- a/assets/js/components/ModalAlert.jsx +++ b/assets/js/components/ModalAlert.jsx @@ -10,6 +10,9 @@ export default class ModalAlert extends React.Component { coverLetter: React.PropTypes.string.isRequired, }; + static successResponse = 'Pendaftaran anda berhasil direkam. Harap menunggu kabar selanjutnya dari pihak yang terkait\n'; + static failedResponse = 'Maaf pendaftaran yang anda lakukan gagal. Harap ulangi pendaftaran atau hubungi administrator\n'; + constructor(props) { super(props); /* istanbul ignore next */ @@ -53,7 +56,7 @@ export default class ModalAlert extends React.Component { onClose={this.close} size="small" basic - trigger={<Button color="blue" onClick={this.handleOpen}> Proceed <Icon name="right chevron" /></Button>} + trigger={<Button color="blue" onClick={this.handleOpen}> Daftar <Icon name="right chevron" /></Button>} > <Modal.Header>{this.state.header}</Modal.Header> <Modal.Content> diff --git a/assets/js/components/Vacancy.jsx b/assets/js/components/Vacancy.jsx index 45167281..9c7a1c35 100644 --- a/assets/js/components/Vacancy.jsx +++ b/assets/js/components/Vacancy.jsx @@ -50,7 +50,7 @@ export default class Vacancy extends React.Component { <ApplyModal id={this.props.data.id} data={{ header: this.props.data.name, - description: this.props.data.description }} buttonTitle="Daftar" + description: this.props.data.description }} buttonTitle="Detail" /> </Item.Extra> diff --git a/assets/js/components/VacancyList.jsx b/assets/js/components/VacancyList.jsx index 92bcc964..c2e12720 100644 --- a/assets/js/components/VacancyList.jsx +++ b/assets/js/components/VacancyList.jsx @@ -8,10 +8,12 @@ export default class VacancyList extends React.Component { static propTypes = { url: React.PropTypes.string.isRequired, studentId: React.PropTypes.number.isRequired, + status: React.PropTypes.string, }; static defaultProps = { bookmarkList: false, + status: "daftar", }; constructor(props) { -- GitLab