diff --git a/assets/js/ProfilePage.jsx b/assets/js/ProfilePage.jsx index 820fb3a905aeb920e53695bd89693f3c4e2aec0a..218bbc999e98476a73a7c9e708141739ba173b94 100755 --- a/assets/js/ProfilePage.jsx +++ b/assets/js/ProfilePage.jsx @@ -91,7 +91,7 @@ export default class ProfilePage extends React.Component { github_url: '', gitlab_url: '', awards: '', - sertifikat: '', + sertifikat:'', projects: '', certification: '', languages: '', @@ -202,15 +202,16 @@ export default class ProfilePage extends React.Component { '07': 'Juli', '08': 'Agustus', '09': 'September', - 10: 'Oktober', - 11: 'November', - 12: 'Desember', + '10': 'Oktober', + '11': 'November', + '12': 'Desember', }; const timeSt = dateTime.split('T'); - const dayMonthYear = timeSt[0].split('-'); - const newTime = `${dayMonthYear[2]} ${monthNameIndex[dayMonthYear[1]]} ${dayMonthYear[0]} | ${timeSt[1].substr(0, 5)}`; - console.log(newTime); + const date = new Date(dateTime); + + const newTime = `${date.getDate()} ${monthNameIndex[date.getMonth() + 1]} ${date.getFullYear()} | ${ + date.getHours() + timeSt[1].substr(2, 3)}`; return newTime; }; @@ -225,9 +226,9 @@ export default class ProfilePage extends React.Component { '07': 'Juli', '08': 'Agustus', '09': 'September', - 10: 'Oktober', - 11: 'November', - 12: 'Desember', + '10': 'Oktober', + '11': 'November', + '12': 'Desember', }; const dateIndexArray = dateIndex.split('-'); @@ -911,11 +912,11 @@ export default class ProfilePage extends React.Component { <Icon name="pencil alternate" size="big" /> </Grid.Column> <Grid.Column width={13}> - <a href={this.state.student_gpa}> + <p href={this.state.student_gpa}> {' '} {this.state.student_gpa || 'null'} {' '} - </a> + </p> </Grid.Column> </Grid> </Segment> @@ -928,7 +929,7 @@ export default class ProfilePage extends React.Component { <Grid.Column width={13}> <a href={this.state.dependants}> {' '} - {this.state.dependants || 'null'} + {this.state.dependants || 'N/A'} {' '} </a> </Grid.Column> @@ -1078,7 +1079,7 @@ export default class ProfilePage extends React.Component { </Grid> </Segment> - <Segment> + <Segment basic vertical> <Grid> <Grid.Column width={2}> <Icon name="hand peace outline" size="big" /> @@ -1117,7 +1118,6 @@ export default class ProfilePage extends React.Component { {sertifikat_state} </Grid.Column> </Grid> -x </Segment> <Segment basic vertical> @@ -1238,14 +1238,6 @@ x {this.state.region || 'N/A'} {' '} </p> - <h3>Intro</h3> - </Grid.Column> - <Grid.Column width={13}> - <p> - {' '} - {this.state.intro || 'N/A'} - {' '} - </p> </Grid.Column> </Grid> </Segment>