diff --git a/bco_be/migrations/0001_initial.py b/bco_be/migrations/0001_initial.py
index 08e2022..9a2235f 100644
--- a/bco_be/migrations/0001_initial.py
+++ b/bco_be/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2 on 2020-01-22 20:45
+# Generated by Django 2.2.10 on 2020-09-15 20:24
from django.conf import settings
import django.contrib.auth.models
@@ -48,11 +48,12 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('first_name', models.CharField(max_length=255)),
('last_name', models.CharField(max_length=255)),
- ('phone_number', models.CharField(max_length=255)),
- ('address', models.CharField(max_length=255)),
- ('city', models.CharField(max_length=255)),
- ('state', models.CharField(max_length=255)),
- ('picture', models.CharField(max_length=255)),
+ ('phone_number', models.CharField(blank=True, max_length=255, null=True)),
+ ('address', models.CharField(blank=True, max_length=255, null=True)),
+ ('city', models.CharField(blank=True, max_length=255, null=True)),
+ ('state', models.CharField(blank=True, max_length=255, null=True)),
+ ('picture', models.CharField(blank=True, max_length=255, null=True)),
+ ('orcid', models.CharField(blank=True, max_length=255, null=True)),
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)),
],
),
diff --git a/bco_be/migrations/0002_auto_20200122_2113.py b/bco_be/migrations/0002_auto_20200122_2113.py
deleted file mode 100644
index 7bae7c6..0000000
--- a/bco_be/migrations/0002_auto_20200122_2113.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Generated by Django 2.2 on 2020-01-22 21:13
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('bco_be', '0001_initial'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='userprofile',
- name='address',
- field=models.CharField(blank=True, max_length=255, null=True),
- ),
- migrations.AlterField(
- model_name='userprofile',
- name='city',
- field=models.CharField(blank=True, max_length=255, null=True),
- ),
- migrations.AlterField(
- model_name='userprofile',
- name='phone_number',
- field=models.CharField(blank=True, max_length=255, null=True),
- ),
- migrations.AlterField(
- model_name='userprofile',
- name='picture',
- field=models.CharField(blank=True, max_length=255, null=True),
- ),
- migrations.AlterField(
- model_name='userprofile',
- name='state',
- field=models.CharField(blank=True, max_length=255, null=True),
- ),
- ]
diff --git a/bco_be/migrations/__pycache__/0001_initial.cpython-36.pyc b/bco_be/migrations/__pycache__/0001_initial.cpython-36.pyc
index be2a569..5c26914 100644
Binary files a/bco_be/migrations/__pycache__/0001_initial.cpython-36.pyc and b/bco_be/migrations/__pycache__/0001_initial.cpython-36.pyc differ
diff --git a/bco_be/migrations/__pycache__/0002_auto_20200122_2113.cpython-36.pyc b/bco_be/migrations/__pycache__/0002_auto_20200122_2113.cpython-36.pyc
deleted file mode 100644
index 9a24e31..0000000
Binary files a/bco_be/migrations/__pycache__/0002_auto_20200122_2113.cpython-36.pyc and /dev/null differ
diff --git a/bco_be/models.py b/bco_be/models.py
index 3ce9959..1abfeec 100755
--- a/bco_be/models.py
+++ b/bco_be/models.py
@@ -28,7 +28,7 @@ class UserProfile(models.Model):
city = models.CharField(max_length=255,blank=True, null=True,)
state = models.CharField(max_length=255,blank=True, null=True,)
picture = models.CharField(max_length=255,blank=True, null=True,)
-
+ orcid = models.CharField(max_length=255,blank=True, null=True,)
def __str__(self):
return "%s's profile" % self.user
diff --git a/bco_be/serializers.py b/bco_be/serializers.py
index c62385c..97a6654 100755
--- a/bco_be/serializers.py
+++ b/bco_be/serializers.py
@@ -61,7 +61,7 @@ def update(self, instance, validated_data):
class UserProfileSerializer(origin_serializers.ModelSerializer):
class Meta:
model = UserProfile
- fields = ('phone_number', 'address', 'city', 'state', 'picture')
+ fields = ('phone_number', 'address', 'city', 'state', 'picture', 'orcid')
class UserSerializer(origin_serializers.HyperlinkedModelSerializer):
profile = UserProfileSerializer(required=True)
@@ -100,6 +100,7 @@ def update(self, instance, validated_data):
profile.city = profile_data.get('city', profile.city)
profile.state = profile_data.get('state', profile.state)
profile.picture = profile_data.get('picture', profile.picture)
+ profile.orcid = profile_data.get('orcid', profile.orcid)
profile.save()
return instance
diff --git a/frontend/src/views/Account/components/AccountDetails/AccountDetails.js b/frontend/src/views/Account/components/AccountDetails/AccountDetails.js
index 2c785dd..38ca636 100755
--- a/frontend/src/views/Account/components/AccountDetails/AccountDetails.js
+++ b/frontend/src/views/Account/components/AccountDetails/AccountDetails.js
@@ -30,7 +30,8 @@ const AccountDetails = props => {
city: '',
phone_number: '',
state: '',
- country: 'USA'
+ country: 'USA',
+ orcid: ''
});
useEffect(() => {
@@ -45,7 +46,8 @@ const AccountDetails = props => {
city: data.profile.city,
phone_number: data.profile.phone_number,
state: data.profile.state,
- country: 'USA'
+ country: 'USA',
+ orcid: data.profile.orcid
});
}
}, [props.data])
@@ -58,7 +60,7 @@ const AccountDetails = props => {
};
const onSave = () => {
- let data = {...values, profile: { address: values.address, city: values.city, phone_number: values.phone_number, state: values.state }};
+ let data = {...values, profile: { address: values.address, city: values.city, phone_number: values.phone_number, state: values.state, orcid: values.orcid }};
props.update(data);
}
@@ -208,6 +210,21 @@ const AccountDetails = props => {
variant="outlined"
/>
+
+
+
diff --git a/frontend/src/views/Detail/.Detail.js.swp b/frontend/src/views/Detail/.Detail.js.swp
deleted file mode 100644
index ba21cb2..0000000
Binary files a/frontend/src/views/Detail/.Detail.js.swp and /dev/null differ
diff --git a/frontend/src/views/SignIn/SignIn.js b/frontend/src/views/SignIn/SignIn.js
index 1f85782..b87fa86 100755
--- a/frontend/src/views/SignIn/SignIn.js
+++ b/frontend/src/views/SignIn/SignIn.js
@@ -60,9 +60,9 @@ const useStyles = makeStyles(theme => ({
justifyContent: 'center',
alignItems: 'center',
backgroundImage: 'url(https://biocomputeobject.org/images/landing.5.png)',
- backgroundSize: 'cover',
+ backgroundSize: '700px',
backgroundRepeat: 'no-repeat',
- backgroundPosition: 'center'
+ backgroundPosition: 'right center'
},
quoteInner: {
textAlign: 'center',