From 2e8bf6f7fc2c3ccc580b2bf2559064ab44cbe970 Mon Sep 17 00:00:00 2001
From: Ahmedsebit <Ahmed.yusuf@andela.com>
Date: Thu, 4 May 2017 16:30:51 +0300
Subject: [PATCH] Social authentication setting on setting-global.py, url.py,
 login.html

---
 -u                                            |  65 ++++++++++++++++++
 .DS_Store                                     | Bin 6148 -> 8196 bytes
 requirements.txt                              |  21 ++++++
 wger/config.py                                |   5 ++
 .../migrations/0002_auto_20170502_2341.py     |  20 ++++++
 .../migrations/0010_auto_20170502_2341.py     |  20 ++++++
 wger/core/templates/index.html                |   4 +-
 wger/core/templates/user/login.html           |   3 +
 wger/core/views/user.py                       |   3 -
 .../migrations/0002_auto_20170502_2341.py     |  25 +++++++
 .../migrations/0004_auto_20170502_2341.py     |  45 ++++++++++++
 .../gym/migrations/0007_auto_20170502_2341.py |  34 +++++++++
 .../migrations/0008_auto_20170502_2341.py     |  21 ++++++
 .../migrations/0002_auto_20170502_2341.py     |  30 ++++++++
 wger/urls.py                                  |  10 +++
 15 files changed, 300 insertions(+), 6 deletions(-)
 create mode 100644 -u
 create mode 100644 wger/config.py
 create mode 100644 wger/config/migrations/0002_auto_20170502_2341.py
 create mode 100644 wger/core/migrations/0010_auto_20170502_2341.py
 create mode 100644 wger/email/migrations/0002_auto_20170502_2341.py
 create mode 100644 wger/exercises/migrations/0004_auto_20170502_2341.py
 create mode 100644 wger/gym/migrations/0007_auto_20170502_2341.py
 create mode 100644 wger/manager/migrations/0008_auto_20170502_2341.py
 create mode 100644 wger/nutrition/migrations/0002_auto_20170502_2341.py

diff --git a/-u b/-u
new file mode 100644
index 0000000..f7e5a17
--- /dev/null
+++ b/-u
@@ -0,0 +1,65 @@
+alabaster==0.7.10
+appdirs==1.4.3
+Babel==2.4.0
+bleach==2.0.0
+coverage==4.3.4
+defusedxml==0.5.0
+dj-database-url==0.4.2
+dj-static==0.0.6
+Django==1.9.13
+django-appconf==1.0.2
+django-bootstrap-breadcrumbs==0.8.2
+django-bower==5.2.0
+django-compressor==2.1.1
+django-cors-headers==2.0.2
+django-debug-toolbar==1.7
+django-filter==1.0.2
+django-formtools==1.0
+django-mobile==0.7.0
+django-recaptcha==1.3.0
+django-sortedm2m==1.3.3
+django-tastypie==0.13.3
+djangorestframework==3.2.5
+docutils==0.13.1
+easy-thumbnails==2.4.1
+future==0.16.0
+gunicorn==19.7.1
+html5lib==0.999999999
+icalendar==3.11.3
+imagesize==0.7.1
+invoke==0.16.3
+Jinja2==2.9.6
+Markdown==2.6.8
+MarkupSafe==1.0
+oauthlib==2.0.2
+olefile==0.44
+packaging==16.8
+pep8==1.7.0
+Pillow==4.1.0
+psycopg2==2.7.1
+pycryptodomex==3.4.5
+Pygments==2.2.0
+pyjwkest==1.3.2
+PyJWT==1.5.0
+pyparsing==2.2.0
+python-dateutil==2.6.0
+python-decouple==3.0
+python-mimeparse==1.6.0
+python-social-auth==0.3.6
+python3-openid==3.1.0
+pytz==2017.2
+rcssmin==1.0.6
+reportlab==3.4.0
+requests==2.13.0
+requests-oauthlib==0.8.0
+rjsmin==1.0.12
+six==1.10.0
+snowballstemmer==1.2.1
+social-auth-app-django==1.1.0
+social-auth-core==1.2.0
+Sphinx==1.5.5
+sqlparse==0.2.3
+static3==0.7.0
+Unipath==1.1
+webencodings==0.5.1
+whitenoise==3.3.0
diff --git a/.DS_Store b/.DS_Store
index 273f9ddfc4b5106225db9554a2a485a8aeb10db0..f873150a9a6d0310a415a7ef82d54af18bc0b1d9 100644
GIT binary patch
literal 8196
zcmeHMU1%It6h7Z3X=XawOrkYO>$01sZAy(KsWnn7VUyjc`D<d6n51gk-JLNVoXl)@
zb~mj>TtQJ()F*$@3ce^RDp(PJKvev}2SGxyqKGdAe;+DpUlh-sI|)hCh;J4<7v_F*
z&pqefz2AIy?w(yDLQm1?AZj2Yg)f1+#?@Jh=oi<r5(zAojNo`OysVvZU3-~lXb2ey
z83-8&83-8&88}xM;4@nkWrcHJ_J(!HK*+#($$)r2#Q74K2(T>Ce|2!>rvQv11@H^s
z>*9tn9$+HCvPACT0vXCELlLAHkl}2P2Y!hF%MxWcAxJ(D%#0vIfj>KsANSn}35j7H
zG7vJboB^?YDruIc$)x<^{C&Y_d!=N?b~C)$Ph@ho<rUi7ze1#<vT9YeqOR7o3!?*r
zL%W7Y_UU@jGk2SIx?q*eRJve#`}7*`fIHilb)AvCS+dO8iL7fEXB_US&8F>ak)6$M
z+a9%Um)_aDYuh8PXB8~hnVKw^hYF%k478+ca*yZc3rT;lNsGsqUUg!Q;hYHeZZz{A
zqpH5RrarcD%jMgyx~BWuxf;E;?xKq|ZI5M`PQkj>GV|lJmQgq`mG-ixV_44gM9K23
zjBSoN=^3*&a!OU_Y8o2Xt-mxHUCDK_n6VBPt-@iwSyATd^x7J&DcY>+$CR55Ug3~y
zh?xw(C)yNkQIwm6J()MTmS$~hv{lv9%9zLNl|!^?9jflBW4BpO5V~FKRCGffx6>KZ
zmZR;^b}IUSI#H6#mBubDq12*Poy@v3GrUeunv>C9MgK(EE9M?ddxhbg>G1Sob=NgT
zqf^4(Z5XDZC`xmp`#oPT&512iH_Z}=d}5jt?Xs<lcXyQ9sfYS$FXiYkJwT7rQF@(@
z(HrzWeMZOWYdT54(6976{XwSzRHGJ+*no}Lgw1F}JGS8pB+!R`3}6ELkwz8<Eac&#
zh!T$AZrp==aUUMSV|W}-;we0bm+&%P#cOyAAK*iLgpY9?-{O1xfFJP_e#2jp>c|C=
zwepijg2RJum|sa?uV-8=_*@|PXU{J9*!6w=1B0n^R`4g*NR_X>q&~iBYuol6UC9L@
zobl`z%g|Szl$I~Kc}e+?d#R4)cF<zutW5LJO1na@78+FMgm=@1SWFk<lg-U7+>G%4
zkj=|lW13#U>Q{Z|_6{wkSFzA#@0FdJrdRS#kiA#$<la@Rd1Y>W<GKbdq4lU@o9g5T
zr&@R{DC)mg@IUJJQ~H9wqo3&%ou)rgh1IA>oHg5uPIR$ilSrW#yD);?7{wTF!9Lb*
zhSh7sK@JC5!AEch?nD`P;eI^G`h6IW;0f06(|86)@jPDeb^Hq6WF5backnJN`Ez`U
zZ_d!|&{Eyv<YL{HM)QvCI@4^M*ZETSuoW_}n1Kq}Xb|~-@5;abFAfRsLk2<y{$~uJ
zGBuj&;YF=<Y=~St&ewjvL=k>viGB!Iemc(Rr{jzZe;D$8oLxmsBEYglws84xeh66l
Q4K_Ug{YMd2=Me*c1Mo4+xBvhE

delta 105
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGpJ5X6lP?c%p)Md1LQG*gn)o?W59NPL1qX?
mfE!4=0<r4G#P7_L`DGM=8cb!hd4Q@x=75Z5*c{I@hZz8=Qw>i5

diff --git a/requirements.txt b/requirements.txt
index 1311a01..909db69 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,8 @@ alabaster==0.7.10
 appdirs==1.4.3
 Babel==2.4.0
 bleach==2.0.0
+coverage==4.3.4
+defusedxml==0.5.0
 dj-database-url==0.4.2
 dj-static==0.0.6
 Django==1.9.13
@@ -10,6 +12,7 @@ django-bootstrap-breadcrumbs==0.8.2
 django-bower==5.2.0
 django-compressor==2.1.1
 django-cors-headers==2.0.2
+django-debug-toolbar==1.7
 django-filter==1.0.2
 django-formtools==1.0
 django-mobile==0.7.0
@@ -17,34 +20,52 @@ django-recaptcha==1.3.0
 django-sortedm2m==1.3.3
 django-tastypie==0.13.3
 djangorestframework==3.2.5
+docker==2.2.1
+docker-pycreds==0.2.1
 docutils==0.13.1
 easy-thumbnails==2.4.1
+future==0.16.0
 gunicorn==19.7.1
 html5lib==0.999999999
+httplib2==0.10.3
 icalendar==3.11.3
 imagesize==0.7.1
 invoke==0.16.3
 Jinja2==2.9.6
 Markdown==2.6.8
 MarkupSafe==1.0
+oauth2==1.9.0.post1
+oauthlib==2.0.2
 olefile==0.44
+optional-django==0.1.0
 packaging==16.8
+pep8==1.7.0
 Pillow==4.1.0
 psycopg2==2.7.1
+pycryptodomex==3.4.5
 Pygments==2.2.0
+pyjwkest==1.3.2
+PyJWT==1.5.0
 pyparsing==2.2.0
 python-dateutil==2.6.0
 python-decouple==3.0
 python-mimeparse==1.6.0
+python-social-auth==0.3.6
+python3-openid==3.1.0
 pytz==2017.2
 rcssmin==1.0.6
 reportlab==3.4.0
 requests==2.13.0
+requests-oauthlib==0.8.0
 rjsmin==1.0.12
 six==1.10.0
 snowballstemmer==1.2.1
+social-auth-app-django==1.1.0
+social-auth-core==1.2.0
 Sphinx==1.5.5
+sqlparse==0.2.3
 static3==0.7.0
 Unipath==1.1
 webencodings==0.5.1
+websocket-client==0.40.0
 whitenoise==3.3.0
diff --git a/wger/config.py b/wger/config.py
new file mode 100644
index 0000000..5313cc2
--- /dev/null
+++ b/wger/config.py
@@ -0,0 +1,5 @@
+SOCIAL_AUTH_FACEBOOK_KEY = '860742220731257'  # App ID
+SOCIAL_AUTH_FACEBOOK_SECRET = '469f8c1b55a1ef1b95b672eb4f1a17e5'
+
+SOCIAL_AUTH_LOGIN_REDIRECT_URL = '/dashboard/'
+SOCIAL_AUTH_LOGIN_URL = '/'
diff --git a/wger/config/migrations/0002_auto_20170502_2341.py b/wger/config/migrations/0002_auto_20170502_2341.py
new file mode 100644
index 0000000..9221442
--- /dev/null
+++ b/wger/config/migrations/0002_auto_20170502_2341.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-05-02 20:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('config', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='languageconfig',
+            name='item',
+            field=models.CharField(choices=[('1', 'Exercises'), ('2', 'Ingredients')], editable=False, max_length=2),
+        ),
+    ]
diff --git a/wger/core/migrations/0010_auto_20170502_2341.py b/wger/core/migrations/0010_auto_20170502_2341.py
new file mode 100644
index 0000000..bcc3903
--- /dev/null
+++ b/wger/core/migrations/0010_auto_20170502_2341.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-05-02 20:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0009_auto_20160303_2340'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='license',
+            name='full_name',
+            field=models.CharField(help_text='If a license has been localized, e.g. the Creative Commons licenses for the different countries, add them as separate entries here.', max_length=60, verbose_name='Full name'),
+        ),
+    ]
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index ab79a06..3e8c2cd 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -9,9 +9,7 @@
 {% block header %}
 <script src="{% static 'js/weight.js' %}"></script>
 {% endblock %}
-
-
-
+{{ user.username }}
 {% block content %}
 {% if current_workout %}
 <div class="modal fade" id="calendar-day-select-popup">
diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.html
index 47636db..52be4c5 100644
--- a/wger/core/templates/user/login.html
+++ b/wger/core/templates/user/login.html
@@ -33,4 +33,7 @@ <h4>{% trans "Forgot password?" %}</h4>
         {% trans "Reset password" %}
     </a>
 </p>
+<a href="{% url 'social:begin' 'twitter' %}?next={{ request.GET.next}}">Login with Twitter</a>
+<br><a href="{% url 'social:begin' 'google-oauth2' %}?next={{ request.GET.next}}">Google+</a>
+<br><a href="{% url 'social:begin' 'facebook' %}?next={{ request.GET.next}}">Login with Facebook</a>
 {% endblock %}
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index f335a81..87c63d4 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -86,7 +86,6 @@ def login(request):
 def delete(request, user_pk=None):
     '''
     Delete a user account and all his data, requires password confirmation first
-
     If no user_pk is present, the user visiting the URL will be deleted, otherwise
     a gym administrator is deleting a different user
     '''
@@ -389,7 +388,6 @@ class UserEditView(WgerFormMixin,
     def dispatch(self, request, *args, **kwargs):
         '''
         Check permissions
-
         - Managers can edit members of their own gym
         - General managers can edit every member
         '''
@@ -456,7 +454,6 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, De
     def dispatch(self, request, *args, **kwargs):
         '''
         Check permissions
-
         - Only managers for this gym can access the members
         - General managers can access the detail page of all users
         '''
diff --git a/wger/email/migrations/0002_auto_20170502_2341.py b/wger/email/migrations/0002_auto_20170502_2341.py
new file mode 100644
index 0000000..058ac4b
--- /dev/null
+++ b/wger/email/migrations/0002_auto_20170502_2341.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-05-02 20:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('email', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='log',
+            options={'ordering': ['-date']},
+        ),
+        migrations.AlterField(
+            model_name='log',
+            name='gym',
+            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='email_log', to='gym.Gym'),
+        ),
+    ]
diff --git a/wger/exercises/migrations/0004_auto_20170502_2341.py b/wger/exercises/migrations/0004_auto_20170502_2341.py
new file mode 100644
index 0000000..b4fc2d5
--- /dev/null
+++ b/wger/exercises/migrations/0004_auto_20170502_2341.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-05-02 20:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exercises', '0003_auto_20160921_2000'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exercise',
+            name='equipment',
+            field=models.ManyToManyField(blank=True, to='exercises.Equipment', verbose_name='Equipment'),
+        ),
+        migrations.AlterField(
+            model_name='exercise',
+            name='muscles',
+            field=models.ManyToManyField(blank=True, to='exercises.Muscle', verbose_name='Primary muscles'),
+        ),
+        migrations.AlterField(
+            model_name='exercise',
+            name='muscles_secondary',
+            field=models.ManyToManyField(blank=True, related_name='secondary_muscles', to='exercises.Muscle', verbose_name='Secondary muscles'),
+        ),
+        migrations.AlterField(
+            model_name='exercise',
+            name='status',
+            field=models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')], default='1', editable=False, max_length=2),
+        ),
+        migrations.AlterField(
+            model_name='exerciseimage',
+            name='is_main',
+            field=models.BooleanField(default=False, help_text='Tick the box if you want to set this image as the main one for the exercise (will be shown e.g. in the search). The first image is automatically marked by the system.', verbose_name='Main picture'),
+        ),
+        migrations.AlterField(
+            model_name='exerciseimage',
+            name='status',
+            field=models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined')], default='1', editable=False, max_length=2),
+        ),
+    ]
diff --git a/wger/gym/migrations/0007_auto_20170502_2341.py b/wger/gym/migrations/0007_auto_20170502_2341.py
new file mode 100644
index 0000000..19bb744
--- /dev/null
+++ b/wger/gym/migrations/0007_auto_20170502_2341.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-05-02 20:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gym', '0006_auto_20160214_1013'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='gym',
+            options={'ordering': ['name'], 'permissions': (('gym_trainer', 'Trainer: can see the users for a gym'), ('manage_gym', 'Admin: can manage users for a gym'), ('manage_gyms', 'Admin: can administrate the different gyms'))},
+        ),
+        migrations.AlterField(
+            model_name='contract',
+            name='options',
+            field=models.ManyToManyField(blank=True, to='gym.ContractOption', verbose_name='Options'),
+        ),
+        migrations.AlterField(
+            model_name='gymadminconfig',
+            name='overview_inactive',
+            field=models.BooleanField(default=True, help_text='Receive email overviews of inactive members', verbose_name='Overview of inactive members'),
+        ),
+        migrations.AlterField(
+            model_name='gymconfig',
+            name='weeks_inactive',
+            field=models.PositiveIntegerField(default=4, help_text='Number of weeks since the last time a user logged his presence to be considered inactive', verbose_name='Reminder of inactive members'),
+        ),
+    ]
diff --git a/wger/manager/migrations/0008_auto_20170502_2341.py b/wger/manager/migrations/0008_auto_20170502_2341.py
new file mode 100644
index 0000000..9977f73
--- /dev/null
+++ b/wger/manager/migrations/0008_auto_20170502_2341.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-05-02 20:41
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('manager', '0007_auto_20160311_2258'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='setting',
+            name='reps',
+            field=models.IntegerField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(600)], verbose_name='Amount'),
+        ),
+    ]
diff --git a/wger/nutrition/migrations/0002_auto_20170502_2341.py b/wger/nutrition/migrations/0002_auto_20170502_2341.py
new file mode 100644
index 0000000..6e58548
--- /dev/null
+++ b/wger/nutrition/migrations/0002_auto_20170502_2341.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-05-02 20:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nutrition', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ingredient',
+            name='status',
+            field=models.CharField(choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined'), ('4', 'Submitted by administrator'), ('5', 'System ingredient')], default='1', editable=False, max_length=2),
+        ),
+        migrations.AlterField(
+            model_name='meal',
+            name='order',
+            field=models.IntegerField(blank=True, editable=False, verbose_name='Order'),
+        ),
+        migrations.AlterField(
+            model_name='mealitem',
+            name='order',
+            field=models.IntegerField(blank=True, editable=False, verbose_name='Order'),
+        ),
+    ]
diff --git a/wger/urls.py b/wger/urls.py
index 3bf632d..5d8011c 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -42,6 +42,12 @@
 from wger.nutrition.api import views as nutrition_api_views
 from wger.weight.api import views as weight_api_views
 
+
+from django.contrib import admin
+from django.contrib.auth import views as auth_views
+
+from wger.core import views as core_views
+
 #
 # REST API
 #
@@ -144,6 +150,10 @@
     url(r'config/', include('wger.config.urls', namespace='config', app_name='config')),
     url(r'gym/', include('wger.gym.urls', namespace='gym', app_name='gym')),
     url(r'email/', include('wger.email.urls', namespace='email')),
+    url(r'^oauth/', include('social_django.urls', namespace='social')),
+    url(r'^login/$', auth_views.login, name='login'),
+    url(r'^logout/$', auth_views.logout, name='logout'),
+
     url(r'^sitemap\.xml$',
         sitemap,
         {'sitemaps': sitemaps},