Merge branch 'feature/user_update' into dev

apps/user/migrations/0002_auto_20180129_0537.py

@@ -0,0 +1,53 @@
+# Generated by Django 2.0.1 on 2018-01-29 05:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='photo',
+            field=models.ImageField(blank=True, null=True, upload_to='users', verbose_name='Фото'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='about',
+            field=models.CharField(default='', max_length=1000, verbose_name='О себе'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='city',
+            field=models.CharField(default='', max_length=85, verbose_name='Город'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='country',
+            field=models.CharField(default='', max_length=50, verbose_name='Страна'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='gender',
+            field=models.CharField(choices=[('n', 'не указан'), ('m', 'Мужчина'), ('f', 'Женщина')], max_length=1, verbose_name='Пол'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_email_proved',
+            field=models.BooleanField(default=False, verbose_name='Верифицирован по email'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='role',
+            field=models.PositiveSmallIntegerField(choices=[(0, 'пользователь'), (1, 'автор'), (2, 'администратор')], default=0, verbose_name='Роль'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='vkontakte',
+            field=models.URLField(default='', verbose_name='ВКонтакте'),
+        ),
+    ]

apps/user/models.py

@@ -30,6 +30,7 @@ class User(AbstractUser):
     fb_id = models.PositiveIntegerField(null=True, blank=True, unique=True)
     fb_data = pgfields.JSONField(default={})
     is_email_proved = models.BooleanField('Верифицирован по email', default=False)
+    photo = models.ImageField('Фото', null=True, blank=True, upload_to='users')
 
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = ['username']