From a63ae38d3ee939a3c925050d2ecb9b2d7a6629ea Mon Sep 17 00:00:00 2001 From: Charles Connell Date: Sat, 11 Jan 2014 12:47:53 -0500 Subject: [PATCH] Improving login experience --- .../0013_auto__chg_field_note_user.py | 6 ++-- karmaworld/apps/notes/models.py | 1 + karmaworld/apps/users/models.py | 29 +++++++++++++++++- karmaworld/assets/css/accounts.css | 14 ++------- karmaworld/assets/css/global.css | 8 +++-- karmaworld/assets/img/facebook.png | Bin 3919 -> 3848 bytes karmaworld/assets/img/google.png | Bin 0 -> 2470 bytes karmaworld/assets/img/twitter.png | Bin 0 -> 2830 bytes karmaworld/settings/common.py | 9 ++---- karmaworld/templates/account/base.html | 2 +- karmaworld/templates/account/login.html | 7 ++--- .../templates/courses/course_detail.html | 27 ---------------- karmaworld/templates/partial/filepicker.html | 12 +++++--- .../templates/socialaccount/connections.html | 2 -- .../socialaccount/snippets/provider_list.html | 4 +-- karmaworld/templates/user_profile.html | 23 +++++--------- 16 files changed, 61 insertions(+), 83 deletions(-) create mode 100644 karmaworld/assets/img/google.png create mode 100644 karmaworld/assets/img/twitter.png diff --git a/karmaworld/apps/notes/migrations/0013_auto__chg_field_note_user.py b/karmaworld/apps/notes/migrations/0013_auto__chg_field_note_user.py index 3eb44db..03d5126 100644 --- a/karmaworld/apps/notes/migrations/0013_auto__chg_field_note_user.py +++ b/karmaworld/apps/notes/migrations/0013_auto__chg_field_note_user.py @@ -114,12 +114,12 @@ class Migration(SchemaMigration): 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}) }, 'notes.note': { - 'Meta': {'ordering': "['-uploaded_at']", 'object_name': 'Note'}, + 'Meta': {'ordering': "['-uploaded_at']", 'unique_together': "(('fp_file', 'upstream_link'),)", 'object_name': 'Note'}, 'course': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['courses.Course']"}), 'file_type': ('django.db.models.fields.CharField', [], {'default': "'???'", 'max_length': '15', 'null': 'True', 'blank': 'True'}), 'flags': ('django.db.models.fields.IntegerField', [], {'default': '0'}), 'fp_file': ('django_filepicker.models.FPFileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'gdrive_url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'gdrive_url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'unique': 'True', 'null': 'True', 'blank': 'True'}), 'html': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}), @@ -133,7 +133,7 @@ class Migration(SchemaMigration): 'thanks': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), 'tweeted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow', 'null': 'True'}), - 'upstream_link': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'upstream_link': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'unique': 'True', 'null': 'True', 'blank': 'True'}), 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), 'year': ('django.db.models.fields.IntegerField', [], {'default': '2014', 'null': 'True', 'blank': 'True'}) }, diff --git a/karmaworld/apps/notes/models.py b/karmaworld/apps/notes/models.py index f9f281a..d284977 100644 --- a/karmaworld/apps/notes/models.py +++ b/karmaworld/apps/notes/models.py @@ -189,6 +189,7 @@ class Note(Document): class Meta: unique_together = ('fp_file', 'upstream_link') + ordering = ['-uploaded_at'] def __unicode__(self): return u"Note at {0} (from {1})".format(self.fp_file, self.upstream_link) diff --git a/karmaworld/apps/users/models.py b/karmaworld/apps/users/models.py index 42d9704..53106dc 100644 --- a/karmaworld/apps/users/models.py +++ b/karmaworld/apps/users/models.py @@ -1,9 +1,11 @@ #!/usr/bin/env python # -*- coding:utf8 -*- # Copyright (C) 2013 FinalsClub Foundation +import random from allauth.account.signals import user_logged_in from django.contrib.auth.models import User -from django.db.models.signals import post_save +from django.core.exceptions import ObjectDoesNotExist +from django.db.models.signals import post_save, pre_save from django.dispatch import receiver from django.db import models from karmaworld.apps.courses.models import School @@ -19,6 +21,31 @@ class UserProfile(models.Model): def __unicode__(self): return self.user.__unicode__() +def user_display_name(user): + """Return the best way to display a user's + name to them on the site.""" + if user.first_name or user.last_name: + return user.first_name + ' ' + user.last_name + else: + return user.username + + +@receiver(pre_save, sender=User, weak=True) +def assign_username(sender, instance, **kwargs): + # If a user does not have a username, they need + # one before we save to the database + if not instance.username: + if instance.email: + try: + # See if any other users have this email address + others = User.objects.get(email=instance.email) + except ObjectDoesNotExist: + instance.username = instance.email + else: + instance.username = 'user' + str(random.randint(10000, 100000)) + else: + instance.username = 'user' + str(random.randint(10000, 100000)) + @receiver(post_save, sender=User, weak=True) def create_user_profile(sender, instance, created, **kwargs): diff --git a/karmaworld/assets/css/accounts.css b/karmaworld/assets/css/accounts.css index 2d70e5c..ebb026d 100644 --- a/karmaworld/assets/css/accounts.css +++ b/karmaworld/assets/css/accounts.css @@ -24,16 +24,6 @@ ul list-style-type: none; } -button, -button:hover -{ - border: none; - background-color: white; - color: #f05a28; - cursor: pointer; - font: 30px/1.2em "MuseoSlab-300", serif; - margin: 1px; - text-align: center; - text-transform: uppercase; +.errorlist { + color: #c60f13 } - diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css index 502ef73..962c112 100644 --- a/karmaworld/assets/css/global.css +++ b/karmaworld/assets/css/global.css @@ -857,7 +857,9 @@ legend /* Social account integration */ -.facebook-login-btn -{ - content: url(../img/facebook.png); +ul.socialaccount_providers li { + list-style: none; + margin: 10px 0 5px 0; } + + diff --git a/karmaworld/assets/img/facebook.png b/karmaworld/assets/img/facebook.png index a9e2d57bd5618cdeaf3be13fbc97c05d8b301cda..8d0d202c68465148e12b10fef21c56c5df0630fa 100644 GIT binary patch delta 3109 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 Itu_+001Zm1^@s6c`Wgm00006VoOIv0RI60 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 literal 0 HcmV?d00001 diff --git a/karmaworld/settings/common.py b/karmaworld/settings/common.py index e7d55f7..4b20c2f 100644 --- a/karmaworld/settings/common.py +++ b/karmaworld/settings/common.py @@ -217,7 +217,6 @@ THIRD_PARTY_APPS = ( # ... include the providers you want to enable: 'allauth.socialaccount.providers.facebook', 'allauth.socialaccount.providers.google', - 'allauth.socialaccount.providers.openid', 'allauth.socialaccount.providers.twitter', ) @@ -255,13 +254,9 @@ ACCOUNT_USER_MODEL_EMAIL_FIELD = "email" ACCOUNT_USERNAME_REQUIRED = False SOCIALACCOUNT_EMAIL_REQUIRED = True SOCIALACCOUNT_EMAIL_VERIFICATION = "optional" +ACCOUNT_USER_DISPLAY = 'karmaworld.apps.users.models.user_display_name' -# You can't log in with a username, -# you must use an authenitcation provider -ACCOUNT_USER_MODEL_USERNAME_FIELD = None -ACCOUNT_USER_MODEL_EMAIL_FIELD = None - -AUTH_PROFILE_MODULE = 'accounts.UserProfile' +AUTH_PROFILE_MODULE = 'users.UserProfile' ######### END AUTHENTICATION diff --git a/karmaworld/templates/account/base.html b/karmaworld/templates/account/base.html index d9e59dc..ab64a01 100644 --- a/karmaworld/templates/account/base.html +++ b/karmaworld/templates/account/base.html @@ -44,7 +44,7 @@
-
+
{% block content %} {% endblock %}
diff --git a/karmaworld/templates/account/login.html b/karmaworld/templates/account/login.html index 83cf279..6857607 100644 --- a/karmaworld/templates/account/login.html +++ b/karmaworld/templates/account/login.html @@ -11,9 +11,8 @@

{% trans "Sign In" %}

{% if socialaccount.providers %} -

{% blocktrans with site.name as site_name %}Please sign in with one -of your existing third party accounts. Or, sign up -for a {{site_name}} account and sign in below:{% endblocktrans %}

+

You can sign in to KarmaNotes with any of the existing accounts you might have below. +Or, sign up for a KarmaNotes account and sign in below.

@@ -25,8 +24,6 @@ for a {{site_name}} account and sign in below:{% endblocktrans %}

-{% include "socialaccount/snippets/login_extra.html" %} - {% else %}

{% blocktrans %}If you have not created an account yet, then please sign up first.{% endblocktrans %}

diff --git a/karmaworld/templates/courses/course_detail.html b/karmaworld/templates/courses/course_detail.html index c5a1443..410d437 100644 --- a/karmaworld/templates/courses/course_detail.html +++ b/karmaworld/templates/courses/course_detail.html @@ -82,40 +82,13 @@ {% include 'partial/filepicker.html' %} - - {% if request.GET.thankyou == '' %} -
-
-
-

- Thank you for uploading - {{ request.GET.name }}. - Share another or take a - quick survey to help us make KarmaNotes even better. -

- - -
-
-
- {% endif %} - -
- -
- {% for note in note_set %} {% include 'notes/note_list_entry.html' with note=note %} {% endfor %} diff --git a/karmaworld/templates/partial/filepicker.html b/karmaworld/templates/partial/filepicker.html index d675074..c4580cc 100644 --- a/karmaworld/templates/partial/filepicker.html +++ b/karmaworld/templates/partial/filepicker.html @@ -3,7 +3,7 @@
-
+
We'd love to have you sign up so you can claim the notes you just uploaded, and build a reputation for uploading great notes.

-

- -

+
+
    + {% include "socialaccount/snippets/provider_list.html" with process="login" %} +
+ Sign up for a traditional account +
{% endif %}
@@ -146,6 +149,7 @@ } $('#success').show(); $('#save-btn').hide(); + $('#filepicker_row').hide(); $('#forms_container .inline-form').remove(); if (document.location.host === 'www.karmanotes.org' || document.location.host === 'karmanotes.org') { diff --git a/karmaworld/templates/socialaccount/connections.html b/karmaworld/templates/socialaccount/connections.html index def62e1..d24cf00 100644 --- a/karmaworld/templates/socialaccount/connections.html +++ b/karmaworld/templates/socialaccount/connections.html @@ -50,6 +50,4 @@ {% include "socialaccount/snippets/provider_list.html" with process="connect" %} -{% include "socialaccount/snippets/login_extra.html" %} - {% endblock %} diff --git a/karmaworld/templates/socialaccount/snippets/provider_list.html b/karmaworld/templates/socialaccount/snippets/provider_list.html index 202c5c2..4fd1ba8 100644 --- a/karmaworld/templates/socialaccount/snippets/provider_list.html +++ b/karmaworld/templates/socialaccount/snippets/provider_list.html @@ -7,13 +7,13 @@ {{brand.name}} + > {% endfor %} {% endif %}
  • {{provider.name}} + href="{% provider_login_url provider.id process=process %}">
    • {% endfor %} diff --git a/karmaworld/templates/user_profile.html b/karmaworld/templates/user_profile.html index 219a70b..39654aa 100644 --- a/karmaworld/templates/user_profile.html +++ b/karmaworld/templates/user_profile.html @@ -7,20 +7,11 @@ {% endblock %} {% block content %} -
    - -
    -
    -

    Hello there, {% user_display user %}.

    -

    Here are the notes that you've uploaded:

    - -
    -
    - - -
    +

    Hello there,
    {% user_display user %}.

    +

    Here are the notes that you've uploaded:

    + {% endblock %} -- 2.25.1