From 05463f7b4b24f39421ef7d88d772b4fa972dd77f Mon Sep 17 00:00:00 2001 From: Alejandro Franco Date: Wed, 22 Jun 2022 00:23:21 -0500 Subject: [PATCH] Update for custom CC-Django --- .../templates/base.html | 2 +- .../templates/users/user_detail.html | 8 ++- .../templates/users/user_form.html | 4 +- .../users/api/serializers.py | 7 +-- .../users/forms.py | 7 ++- .../users/migrations/0001_initial.py | 50 ++++++++----------- .../users/models.py | 5 +- 7 files changed, 39 insertions(+), 44 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index 58aca7208..512a97b87 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -82,7 +82,7 @@ {% if request.user.is_authenticated %}
  • {# URL provided by django-allauth/account/urls.py #} - {% translate "My Profile" %} + {% translate "My Profile" %}
  • {# URL provided by django-allauth/account/urls.py #} diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html index eed39ca3a..2a044f3b7 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html @@ -1,7 +1,7 @@ {% raw %}{% extends "base.html" %} {% load static %} -{% block title %}User: {{ object.username }}{% endblock %} +{% block title %}User: {{ object }}{% endblock %} {% block content %}
    @@ -9,10 +9,8 @@
    -

    {{ object.username }}

    - {% if object.name %} -

    {{ object.name }}

    - {% endif %} +

    {{ object }}

    +

    {{ object.first_name }}

    diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html index 53e14a530..24111a7c6 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html @@ -1,10 +1,10 @@ {% raw %}{% extends "base.html" %} {% load crispy_forms_tags %} -{% block title %}{{ user.username }}{% endblock %} +{% block title %}{{ user }}{% endblock %} {% block content %} -

    {{ user.username }}

    +

    {{ user }}

    {% csrf_token %} {{ form|crispy }} diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py index fb9e6f7df..d4e492e83 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py @@ -7,8 +7,5 @@ User = get_user_model() class UserSerializer(serializers.ModelSerializer): class Meta: model = User - fields = ["username", "first_name", "last_name", "url"] - - extra_kwargs = { - "url": {"view_name": "api:user-detail", "lookup_field": "uuid"} - } + fields = ["email", "uuid", "first_name", "last_name", "url"] + extra_kwargs = {"url": {"view_name": "api:user-detail", "lookup_field": "uuid"}} diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py index 770199059..0f797f237 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py @@ -1,9 +1,11 @@ -from allauth.account.forms import SignupForm -from allauth.socialaccount.forms import SignupForm as SocialSignupForm +from django import forms from django.contrib.auth import forms as admin_forms from django.contrib.auth import get_user_model from django.utils.translation import gettext_lazy as _ +from allauth.account.forms import SignupForm +from allauth.socialaccount.forms import SignupForm as SocialSignupForm + User = get_user_model() @@ -34,6 +36,7 @@ class UserSignupForm(SignupForm): Default fields will be added automatically. Check UserSocialSignupForm for accounts created from social. """ + first_name = forms.CharField( max_length=150, label=_("first name").capitalize(), diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py index 4c4d6954c..02a715bf9 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py @@ -1,8 +1,9 @@ -# Generated by Django 3.2.9 on 2021-11-20 11:23 -import django.contrib.auth.models -import django.contrib.auth.validators +# Generated by Django 3.2.13 on 2022-06-22 04:35 + +import acampemos.users.models from django.db import migrations, models import django.utils.timezone +import uuid class Migration(migrations.Migration): @@ -41,27 +42,6 @@ class Migration(migrations.Migration): verbose_name="superuser status", ), ), - ( - "username", - models.CharField( - error_messages={ - "unique": "A user with that username already exists." - }, - help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.", - max_length=150, - unique=True, - validators=[ - django.contrib.auth.validators.UnicodeUsernameValidator() - ], - verbose_name="username", - ), - ), - ( - "email", - models.EmailField( - blank=True, max_length=254, verbose_name="email address" - ), - ), ( "is_staff", models.BooleanField( @@ -85,11 +65,25 @@ class Migration(migrations.Migration): ), ), ( - "name", - models.CharField( - blank=True, max_length=255, verbose_name="Name of User" + "email", + models.EmailField( + max_length=254, unique=True, verbose_name="email address" ), ), + ( + "uuid", + models.UUIDField( + db_index=True, default=uuid.uuid4, editable=False, unique=True + ), + ), + ( + "first_name", + models.CharField(max_length=150, verbose_name="first name"), + ), + ( + "last_name", + models.CharField(max_length=150, verbose_name="last name"), + ), ( "groups", models.ManyToManyField( @@ -119,7 +113,7 @@ class Migration(migrations.Migration): "abstract": False, }, managers=[ - ("objects", django.contrib.auth.models.UserManager()), + ('objects', {{ cookiecutter.project_slug }}.users.models.UserManager()), ], ), ] diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py index 00aa50e44..d65364bf4 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py @@ -1,5 +1,8 @@ +import uuid as uuid_lib + +from django.contrib.auth.base_user import BaseUserManager from django.contrib.auth.models import AbstractUser -from django.db.models import CharField +from django.db import models from django.urls import reverse from django.utils.translation import gettext_lazy as _