Fakultas Ilmu Komputer UI

Commit 8f728f37 authored by Zulia Putri's avatar Zulia Putri 🤤
Browse files

resolve conflict

parent 11d7e977
Pipeline #25234 passed with stages
in 6 minutes and 34 seconds
......@@ -170,6 +170,12 @@ export default class ProfilePage extends React.Component {
);
}
isFromGithubLinkValid = () => {
var github_link = this.state.form.github_url;
if (github_link == null) return;
return github_link.includes('https://github.com/');
};
convertDateTime = (dateTime) => {
const monthNameIndex = {
'01': 'Januari',
......@@ -185,6 +191,7 @@ export default class ProfilePage extends React.Component {
'11': 'November',
'12': 'Desember',
};
let timeSt = dateTime.split('T');
let dayMonthYear = timeSt[0].split('-');
let newTime = `${dayMonthYear[2]} ${monthNameIndex[dayMonthYear[1]]} ${dayMonthYear[0]} | ${timeSt[1].substr(0, 5)}`;
......@@ -192,12 +199,6 @@ export default class ProfilePage extends React.Component {
return newTime;
};
isFromGithubLinkValid = () => {
var github_link = this.state.form.github_url;
if (github_link == null) return;
return github_link.includes('https://github.com/');
};
parseIndonesianDateFormat(dateIndex) {
const monthNameIndex = {
'01': 'Januari',
......@@ -306,7 +307,6 @@ export default class ProfilePage extends React.Component {
</Header>
<ModalAlert ref={(modal) => { this.modalAlert = modal; }} />
<Form.Field ref={(input) => { this.form = input; }} key={this.state.refresh} size="small" onSubmit={this.handleSubmit}>
<<<<<<< HEAD
<ModalAlert
ref={(modal) => {
this.modalAlert = modal;
......@@ -317,397 +317,6 @@ export default class ProfilePage extends React.Component {
this.form = input;
}}
key={this.state.refresh}
=======
<ModalAlert
ref={(modal) => {
this.modalAlert = modal;
}}
/>
<Form
ref={(input) => {
this.form = input;
}}
key={this.state.refresh}
size="small"
onSubmit={this.handleSubmit}
>
<Form.Field>
<label htmlFor="photo">Profile Picture</label>
<input
onChange={this.handleFile}
placeholder="Profile Photo.jpg"
name="photo"
type="File"
/>
</Form.Field>
<Form.Field>
<label htmlFor="email">Email</label>
<input
onChange={this.handleChange}
placeholder={
this.state.email === null
? 'jojon@email.com'
: this.state.email
}
defaultValue={
this.state.email === null ? null : this.state.email
}
name="email"
/>
</Form.Field>
<Form.Field>
<label htmlFor="phone_number">No. Hp</label>
<input
onChange={this.handleChange}
placeholder={
this.state.phone_number === null
? '08123456789'
: this.state.phone_number
}
defaultValue={
this.state.phone_number === null
? null
: this.state.phone_number
}
name="phone_number"
/>
</Form.Field>
<Form.Field>
<label htmlFor="gender">Jenis Kelamin</label>
<Form.Radio
label="Perempuan"
name="gender"
value="Perempuan"
onClick={this.handleRadioGender}
/>
<Form.Radio
label="Laki-laki"
name="gender"
value="Laki-laki"
onClick={this.handleRadioGender}
/>
</Form.Field>
<Form.Field>
<label htmlFor="self_description">Deskripsi Diri</label>
<input onChange={this.handleChange} maxlength="500" placeholder="Saya suka belajar" name="self_description" />
</Form.Field>
<Form.Field>
<label htmlFor="linkedin_url">URL Profile LinkedIn</label>
<input
onChange={this.handleChange}
placeholder={
this.state.linkedin_url === null
? 'https://www.linkedin.com/in/jojo/'
: this.state.linkedin_url
}
defaultValue={
this.state.linkedin_url === null
? null
: this.state.linkedin_url
}
name="linkedin_url"
/>
</Form.Field>
<Form.Field>
<label htmlFor="hackerrank_url">URL Profile Hackerrank</label>
<input
onChange={this.handleChange}
placeholder={
this.state.hackerrank_url === null
? 'https://www.hackerrank.com/james'
: this.state.hackerrank_url
}
defaultValue={
this.state.hackerrank_url === null
? null
: this.state.hackerrank_url
}
name="hackerrank_url"
/>
</Form.Field>
<Form.Field>
<label htmlFor="portfolio_link">Portfolio Link</label>
<input
onChange={this.handleChange}
placeholder={this.state.portfolio_link === null ? 'https://www.example.com/myproject/' :
this.state.portfolio_link}
defaultValue={this.state.portfolio_link === null ? null : this.state.portfolio_link}
placeholder={
this.state.portfolio_link === null
? 'https://www.example.com/myproject/'
: this.state.portfolio_link
}
defaultValue={
this.state.portfolio_link === null
? null
: this.state.portfolio_link
}
name="portfolio_link"
/>
</Form.Field>
<Form.Field>
<label htmlFor="website_url">Website URL</label>
<input
onChange={this.handleChange}
placeholder={
this.state.website_url === null
? 'https://www.example.com/'
: this.state.website_url
}
defaultValue={
this.state.website_url === null
? null
: this.state.website_url
}
name="website_url"
/>
</Form.Field>
<Form.Field>
<label htmlFor="linkedin_url">URL Profile Github</label>
<input
onChange={this.handleChange}
placeholder="https://github.com/bob"
name="github_url"
/>
</Form.Field>
<Form.Field>
<label htmlFor="alamat">Alamat</label>
<input
onChange={this.handleChange}
placeholder={
this.state.alamat === null ? 'Indonesia' : this.state.alamat
}
defaultValue={
this.state.alamat === null ? null : this.state.alamat
}
name="alamat"
/>
</Form.Field>
<Form.Field>
<label htmlFor="region">Region</label>
<input
onChange={this.handleChange}
placeholder={
this.state.region === null ? 'Indonesia' : this.state.region
}
defaultValue={
this.state.region === null ? null : this.state.region
}
name="region"
/>
</Form.Field>
<Form.Field>
<label htmlFor="skills">Skills</label>
<input
onChange={this.handleChange}
placeholder="Isi sesuai dengan keahlian anda"
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="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>
<input
onChange={this.handleChange}
placeholder={this.state.interests === null ? 'Machine Learning' : this.state.interests}
defaultValue={this.state.interests === null ? null : this.state.interests}
name="interests"
/>
</Form.Field>
<Form.Field>
<label htmlFor="resume">Resume</label>
<input
onChange={this.handleFile}
placeholder="Resume"
name="resume"
type="File"
/>
</Form.Field>
<Form.Field>
<label htmlFor="phone_number">Expected Salary</label>
<input
onChange={this.handleChange}
placeholder="2000000"
name="expected_salary"
/>
</Form.Field>
<Form.Field>
<label htmlFor="intro">Intro</label>
<input
onChange={this.handleChange}
placeholder={
this.state.intro === null
? 'Ceritakan dirimu secara singkat'
: this.state.intro
}
defaultValue={
this.state.intro === null ? null : this.state.intro
}
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
label="Aktif"
name="job_seeking_status"
value="Active"
onClick={this.handleRadio}
/>
<Form.Radio
label="Pasif"
name="job_seeking_status"
value="Passive"
onClick={this.handleRadio}
/>
</Form.Field>
<Form.Field>
<Checkbox
onChange={this.handleCheckbox}
checked={!!this.state.show_transcript}
label="Ijinkan perusahaan tempat saya mendaftar untuk melihat transkrip akademik saya"
name="show_transcript"
/>
</Form.Field>
<Form.Field>
<label htmlFor="student_gpa">GPA</label>
<input
onChange={this.handleChange}
placeholder={
this.state.student_gpa === null
? '3.50'
: this.state.student_gpa
}
defaultValue={
this.state.student_gpa === null
? null
: this.state.student_gpa
}
name="student_gpa"
/>
</Form.Field>
<Form.Field>
<label htmlFor="dependants">Dependants</label>
<input
onChange={this.handleChange}
placeholder={
this.state.dependants === null ? '0' : this.state.dependants
}
defaultValue={
this.state.dependants === null ? null : this.state.dependants
}
name="dependants"
/>
</Form.Field>
<Button
type="submit"
>>>>>>> origin
size="small"
onSubmit={this.handleSubmit}
>
......@@ -769,11 +378,7 @@ export default class ProfilePage extends React.Component {
</Form.Field>
<Form.Field>
<label htmlFor="self_description">Deskripsi Diri</label>
<input
onChange={this.handleChange}
placeholder="Saya suka belajar"
name="self_description"
/>
<input onChange={this.handleChange} maxlength="500" placeholder="Saya suka belajar" name="self_description" />
</Form.Field>
<Form.Field>
<label htmlFor="linkedin_url">URL Profile LinkedIn</label>
......@@ -1027,17 +632,6 @@ export default class ProfilePage extends React.Component {
name="intro"
/>
</Form.Field>
<Segment basic vertical>
<Grid>
<Grid.Column width={2}>
<h3 className="lastSeen">Last Seen</h3>
</Grid.Column>
<Grid.Column width={13}>
<p> {this.state.lastLoggedIn} </p>
</Grid.Column>
</Grid>
</Segment>
<Form.Field>
<label htmlFor="volunteer">Volunteering Experience</label>
<input
......@@ -1472,21 +1066,16 @@ export default class ProfilePage extends React.Component {
</Grid.Column>
</Grid>
</Segment>
<Segment basic vertical>
<Grid>
<Grid.Column width={2}>
<Icon name="time" size="big" />
<h3 className="lastSeen">Last Seen</h3>
</Grid.Column>
<Grid.Column width={13}>
<p>
{' '}
{this.state.lastLoggedIn}
</p>
<p> {this.state.lastLoggedIn} </p>
</Grid.Column>
</Grid>
</Segment>
<Segment basic vertical>
<Grid>
<Grid.Column width={2}>
......@@ -1600,4 +1189,4 @@ export default class ProfilePage extends React.Component {
</div>
);
}
}
}
\ No newline at end of file
Markdown is supported
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