fix conflict master

assets/js/ProfilePage.jsx

@@ -402,19 +402,37 @@ export default class ProfilePage extends React.Component {
       <div className="profilePage">
         <Segment className="biodata-section" >
           <Grid stackable columns={2}>
-            <Grid.Column>
-              <Header as="h2" icon textAlign="center">
-                <br />
-                <Image src={this.state.photo || defaultPicture} size="medium" />
-              </Header>
-            </Grid.Column>
+          <Grid.Column width={4} textAlign={"center"} style={{width: "5%"}}>
+            <Header as="h2" icon textAlign="center">
+              <br />
+              <Image src={this.state.photo || defaultPicture} size="small" />
+            </Header>
+          </Grid.Column>
+
 
-            <Grid.Column>
+            <Grid.Column width={12}>
               <Container textAlign="left" className="profile-biodata">
                 <div className="biodata">
-                  <Segment basic textAlign="center">
-                    <h1> {this.state.name} </h1>
-                  </Segment>
+                <Grid>
+                    <Grid.Column width={8}>
+                      <Segment basic textAlign="left" textJustify={"center"}>
+                        <br/>
+                        <h1> { this.state.name } </h1>
+                      </Segment>
+                    </Grid.Column>
+                    <Grid.Column width={8}>
+                      <Container textAlign="right">
+                        <div className="buttonProfile">
+                          <Button onClick={this.gotoStudentResume} disabled={!this.state.resume} primary size="small">Resume</Button>
+                          <Button onClick={this.gotoStudentTranscript} color="green" size="small">Transkrip</Button>
+                        </div>
+                        <br />
+                        <div>
+                          <h4> Bagikan Transkrip : { this.state.bagikanTranskrip ? 'Ya' : 'Tidak' }</h4>
+                        </div>
+                      </Container>
+                    </Grid.Column>
+                  </Grid> 
 
                   <Segment basic vertical>
                     <Grid>
@@ -638,7 +656,7 @@ export default class ProfilePage extends React.Component {
                     <p className="jumlahLamaran"> Jumlah lamaran dibaca perusahaan: {this.state.readNo || '0'}</p>
                   </Grid>
                 </Segment>
-                <Container textAlign="center">
+                {/* <Container textAlign="center">
                   <div className="buttonProfile">
                     <Button onClick={this.gotoStudentResume} disabled={!this.state.resume} primary size="small">Resume</Button>
                     <Button onClick={this.gotoStudentTranscript} color="green" size="small">Transkrip</Button>
@@ -647,7 +665,7 @@ export default class ProfilePage extends React.Component {
                   <div>
                     <h4> Bagikan Transkrip : {this.state.bagikanTranskrip ? 'Ya' : 'Tidak'}</h4>
                   </div>
-                </Container>
+                </Container> */}
               </Container>
             </Grid.Column>
           </Grid>

core/migrations/0020_merge_20191006_1354.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2019-10-06 06:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0019_merge_20191006_0852'),
+        ('core', '0017_vacancy_amount'),
+    ]
+
+    operations = [
+    ]

core/migrations/0056_merge_20191012_1158.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2019-10-12 04:58
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0020_merge_20191006_1354'),
+        ('core', '0055_merge_20191012_1043'),
+    ]
+
+    operations = [
+    ]

core/migrations/0058_merge_20191012_1417.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2019-10-12 07:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0056_merge_20191012_1158'),
+        ('core', '0057_auto_20191012_1312'),
+    ]
+
+    operations = [
+    ]