diff --git a/assets/js/EditProfile.jsx b/assets/js/EditProfile.jsx
index 525deebc19cda8426d2621346ab08bb8c4d54f49..5d4dfecedaeaadfd2d093437c34d063536c970d7 100644
--- a/assets/js/EditProfile.jsx
+++ b/assets/js/EditProfile.jsx
@@ -346,89 +346,6 @@ export default class EditProfile extends React.Component {
name="skills"
/>
</Form.Field>
- <Form.Field>
- <label htmlFor="latest_work">Latest Working Experience</label>
- <input
- onChange={this.handleChange}
- placeholder={
- this.state.latest_work === null
- ? 'Teaching Asssistant at Fasilkom UI'
- : this.state.latest_work
- }
- defaultValue={
- this.state.latest_work === null
- ? null
- : this.state.latest_work
- }
- name="latest_work"
- />
- </Form.Field>
- <Form.Field>
- <label htmlFor="latest_work_desc">
- Latest Working Experience Description
- </label>
- <input
- onChange={this.handleChange}
- placeholder={
- this.state.latest_work_desc === null
- ? 'Evaluate weekly assignment for 15 students'
- : this.state.latest_work_desc
- }
- defaultValue={
- this.state.latest_work_desc === null
- ? null
- : this.state.latest_work_desc
- }
- name="latest_work_desc"
- />
- </Form.Field>
- <Form.Field>
- <label htmlFor="awards">Awards and Achievements</label>
- <input
- onChange={this.handleChange}
- placeholder={
- this.state.awards === null
- ? 'Juara 2 UIUX Gemastik 2019'
- : this.state.awards
- }
- defaultValue={
- this.state.awards === null ? null : this.state.awards
- }
- name="awards"
- />
- </Form.Field>
- <Form.Field>
- <label htmlFor="projects">Projects</label>
- <input
- onChange={this.handleChange}
- placeholder={
- this.state.projects === null
- ? 'Ow-Jek - Android Mobile Project'
- : this.state.projects
- }
- defaultValue={
- this.state.projects === null ? null : this.state.projects
- }
- name="projects"
- />
- </Form.Field>
- <Form.Field>
- <label htmlFor="certification">Sertifikasi</label>
- <input
- onChange={this.handleChange}
- placeholder={
- this.state.certification === null
- ? 'TOEFL'
- : this.state.certification
- }
- defaultValue={
- this.state.certification === null
- ? null
- : this.state.certification
- }
- name="certification"
- />
- </Form.Field>
<Form.Field>
<label htmlFor="languages">Bahasa yang dikuasai</label>
<input
@@ -445,21 +362,6 @@ export default class EditProfile extends React.Component {
/>
</Form.Field>
- <Form.Field>
- <label htmlFor="seminar">Seminar dan Training</label>
- <input
- onChange={this.handleChange}
- placeholder={
- this.state.seminar === null
- ? 'Seminar CompFest'
- : this.state.seminar
- }
- defaultValue={
- this.state.seminar === null ? null : this.state.seminar
- }
- name="seminar"
- />
- </Form.Field>
<Form.Field>
<label htmlFor="interests">Interests</label>
@@ -515,14 +417,6 @@ export default class EditProfile extends React.Component {
name="intro"
/>
</Form.Field>
- <Form.Field>
- <label htmlFor="volunteer">Volunteering Experience</label>
- <input
- onChange={this.handleChange}
- placeholder="Ketua Organisasi A - 2020"
- name="volunteer"
- />
- </Form.Field>
<Form.Field>
<label htmlFor="intro">Status Pencarian Kerja</label>
<Form.Radio
@@ -604,6 +498,137 @@ export default class EditProfile extends React.Component {
</Form>
</Segment>
+ <Segment className="links-form">
+ <Header as="h3" textAlign="center">
+ <Icon name="edit" />
+ <Header.Content>Edit Experience</Header.Content>
+ </Header>
+ <Form
+ ref={(input) => {
+ this.form = input;
+ }}
+ key={this.state.refresh}
+ size="small"
+ onSubmit={this.handleSubmit}
+ >
+
+ <Form.Field>
+ <label htmlFor="latest_work">Latest Working Experience</label>
+ <input
+ onChange={this.handleChange}
+ placeholder={
+ this.state.latest_work === null
+ ? 'Teaching Asssistant at Fasilkom UI'
+ : this.state.latest_work
+ }
+ defaultValue={
+ this.state.latest_work === null
+ ? null
+ : this.state.latest_work
+ }
+ name="latest_work"
+ />
+ </Form.Field>
+
+ <Form.Field>
+ <label htmlFor="latest_work_desc">
+ Latest Working Experience Description
+ </label>
+ <input
+ onChange={this.handleChange}
+ placeholder={
+ this.state.latest_work_desc === null
+ ? 'Evaluate weekly assignment for 15 students'
+ : this.state.latest_work_desc
+ }
+ defaultValue={
+ this.state.latest_work_desc === null
+ ? null
+ : this.state.latest_work_desc
+ }
+ name="latest_work_desc"
+ />
+ </Form.Field>
+
+ <Form.Field>
+ <label htmlFor="awards">Awards and Achievements</label>
+ <input
+ onChange={this.handleChange}
+ placeholder={
+ this.state.awards === null
+ ? 'Juara 2 UIUX Gemastik 2019'
+ : this.state.awards
+ }
+ defaultValue={
+ this.state.awards === null ? null : this.state.awards
+ }
+ name="awards"
+ />
+ </Form.Field>
+
+ <Form.Field>
+ <label htmlFor="certification">Sertifikasi</label>
+ <input
+ onChange={this.handleChange}
+ placeholder={
+ this.state.certification === null
+ ? 'TOEFL'
+ : this.state.certification
+ }
+ defaultValue={
+ this.state.certification === null
+ ? null
+ : this.state.certification
+ }
+ name="certification"
+ />
+ </Form.Field>
+
+ <Form.Field>
+ <label htmlFor="projects">Projects</label>
+ <input
+ onChange={this.handleChange}
+ placeholder={
+ this.state.projects === null
+ ? 'Ow-Jek - Android Mobile Project'
+ : this.state.projects
+ }
+ defaultValue={
+ this.state.projects === null ? null : this.state.projects
+ }
+ name="projects"
+ />
+ </Form.Field>
+
+ <Form.Field>
+ <label htmlFor="volunteer">Volunteering Experience</label>
+ <input
+ onChange={this.handleChange}
+ placeholder="Ketua Organisasi A - 2020"
+ name="volunteer"
+ />
+ </Form.Field>
+
+ <Form.Field>
+ <label htmlFor="seminar">Seminar dan Training</label>
+ <input
+ onChange={this.handleChange}
+ placeholder={
+ this.state.seminar === null
+ ? 'Seminar CompFest'
+ : this.state.seminar
+ }
+ defaultValue={
+ this.state.seminar === null ? null : this.state.seminar
+ }
+ name="seminar"
+ />
+ </Form.Field>
+
+ </Form>
+ </Segment>
+
+
<Segment className="links-form">
<Header as="h3" textAlign="center">
<Icon name="edit" />
diff --git a/assets/js/ProfilePage.jsx b/assets/js/ProfilePage.jsx
index 754067d3a3a1ba64354444cf835e2e3d4c1b4a4b..7f53f751262f48d630c34c767522897ca58b4178 100755
--- a/assets/js/ProfilePage.jsx
+++ b/assets/js/ProfilePage.jsx
@@ -500,35 +500,6 @@ export default class ProfilePage extends ProfileHandler {
</Grid.Column>
</Grid>
</Segment>
- <Segment basic vertical>
- <Grid>
- <Grid.Column width={2}>
- <Icon name="suitcase" size="big" />
- </Grid.Column>
- <Grid.Column width={13}>
- <p>
- Latest working experience as:
- {' '}
- <span>
- <b>
- {' '}
- {this.state.latest_work || 'N/A'}
- {' '}
- </b>
- </span>
- </p>
- <p>
- Description:
- {' '}
- <span>
- {' '}
- {this.state.latest_work_desc || 'N/A'}
- {' '}
- </span>
- </p>
- </Grid.Column>
- </Grid>
- </Segment>
<Segment basic vertical>
<Grid>
@@ -545,62 +516,6 @@ export default class ProfilePage extends ProfileHandler {
</Grid>
</Segment>
- <Segment basic vertical>
- <Grid>
- <Grid.Column width={2}>
- <Icon name="hand peace outline" size="big" />
- </Grid.Column>
- <Grid.Column width={13}>
- <p>
- {' '}
- {this.state.volunteer || 'N/A'}
- {' '}
- </p>
- </Grid.Column>
- </Grid>
- </Segment>
-
- <Segment basic vertical>
- <Grid>
- <Grid.Column width={2}>
- <Icon name="trophy" size="big" />
- </Grid.Column>
- <Grid.Column width={13}>
- <p>
- {' '}
- {this.state.awards || 'Awards belum ditambahkan'}
- {' '}
- </p>
- </Grid.Column>
- </Grid>
- </Segment>
-
- <Segment basic vertical>
- <Grid>
- <Grid.Column width={2}>
- <Icon name="trophy" size="big" />
- </Grid.Column>
- <Grid.Column width={13}>
- {sertifikat_state}
- </Grid.Column>
- </Grid>
- </Segment>
-
- <Segment basic vertical>
- <Grid>
- <Grid.Column width={2}>
- <Icon name="folder open" size="big" />
- </Grid.Column>
- <Grid.Column width={13}>
- <p>
- {' '}
- {this.state.projects
- || 'Projects belum ditambahkan'}
- {' '}
- </p>
- </Grid.Column>
- </Grid>
- </Segment>
<Segment basic vertical>
<Grid>
@@ -632,22 +547,6 @@ export default class ProfilePage extends ProfileHandler {
</Grid>
</Segment>
- <Segment basic vertical>
- <Grid>
- <Grid.Column width={2}>
- <Icon name="slideshare" size="big" />
- </Grid.Column>
- <Grid.Column width={13}>
- <p>
- {' '}
- {this.state.seminar
- || 'Seminar dan Training kosong'}
- {' '}
- </p>
- </Grid.Column>
- </Grid>
- </Segment>
-
<Segment basic vertical>
<Grid>
<Grid.Column width={2}>
@@ -791,6 +690,7 @@ export default class ProfilePage extends ProfileHandler {
</Grid>
</Segment>
+
<Segment className="status-form">
<Header as="h3" textAlign="left">
<Icon name="search" />
@@ -820,6 +720,118 @@ export default class ProfilePage extends ProfileHandler {
</div>
</Segment>
+ <Segment className="links-form">
+ <h3>Experience</h3>
+ <Grid stackable>
+ <Grid.Column width={6}>
+ <Segment basic vertical>
+ <Grid>
+ <Grid.Column width={2}>
+ <Icon name="suitcase" size="big" />
+ </Grid.Column>
+ <Grid.Column width={13}>
+ <p>
+ Latest working experience as:
+ {' '}
+ <span>
+ <b>
+ {' '}
+ {this.state.latest_work || 'N/A'}
+ {' '}
+ </b>
+ </span>
+ </p>
+ <p>
+ Description:
+ {' '}
+ <span>
+ {' '}
+ {this.state.latest_work_desc || 'N/A'}
+ {' '}
+ </span>
+ </p>
+ </Grid.Column>
+ </Grid>
+ </Segment>
+
+ <Segment basic vertical>
+ <Grid>
+ <Grid.Column width={2}>
+ <Icon name="trophy" size="big" />
+ </Grid.Column>
+ <Grid.Column width={13}>
+ <p>
+ {' '}
+ {this.state.awards || 'Awards belum ditambahkan'}
+ {' '}
+ </p>
+ </Grid.Column>
+ </Grid>
+ </Segment>
+
+ <Segment basic vertical>
+ <Grid>
+ <Grid.Column width={2}>
+ <Icon name="trophy" size="big" />
+ </Grid.Column>
+ <Grid.Column width={13}>
+ {sertifikat_state}
+ </Grid.Column>
+ </Grid>
+ </Segment>
+
+ <Segment basic vertical>
+ <Grid>
+ <Grid.Column width={2}>
+ <Icon name="folder open" size="big" />
+ </Grid.Column>
+ <Grid.Column width={13}>
+ <p>
+ {' '}
+ {this.state.projects
+ || 'Projects belum ditambahkan'}
+ {' '}
+ </p>
+ </Grid.Column>
+ </Grid>
+ </Segment>
+
+ <Segment basic vertical>
+ <Grid>
+ <Grid.Column width={2}>
+ <Icon name="hand peace outline" size="big" />
+ </Grid.Column>
+ <Grid.Column width={13}>
+ <p>
+ {' '}
+ {this.state.volunteer || 'N/A'}
+ {' '}
+ </p>
+ </Grid.Column>
+ </Grid>
+ </Segment>
+
+ <Segment basic vertical>
+ <Grid>
+ <Grid.Column width={2}>
+ <Icon name="slideshare" size="big" />
+ </Grid.Column>
+ <Grid.Column width={13}>
+ <p>
+ {' '}
+ {this.state.seminar
+ || 'Seminar dan Training kosong'}
+ {' '}
+ </p>
+ </Grid.Column>
+ </Grid>
+ </Segment>
+ </Grid.Column>
+ </Grid>
+ </Segment>
+
+
+
<Segment className="links-form">
<h3>Links</h3>
<Grid stackable>