Update for custom CC-Django

This commit is contained in:
Alejandro Franco 2022-06-22 00:23:21 -05:00
parent 577c92248a
commit 05463f7b4b
7 changed files with 39 additions and 44 deletions

View File

@ -82,7 +82,7 @@
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<li class="nav-item"> <li class="nav-item">
{# URL provided by django-allauth/account/urls.py #} {# URL provided by django-allauth/account/urls.py #}
<a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% translate "My Profile" %}</a> <a class="nav-link" href="{% url 'users:detail' request.user.uuid %}">{% translate "My Profile" %}</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
{# URL provided by django-allauth/account/urls.py #} {# URL provided by django-allauth/account/urls.py #}

View File

@ -1,7 +1,7 @@
{% raw %}{% extends "base.html" %} {% raw %}{% extends "base.html" %}
{% load static %} {% load static %}
{% block title %}User: {{ object.username }}{% endblock %} {% block title %}User: {{ object }}{% endblock %}
{% block content %} {% block content %}
<div class="container"> <div class="container">
@ -9,10 +9,8 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<h2>{{ object.username }}</h2> <h2>{{ object }}</h2>
{% if object.name %} <p>{{ object.first_name }}</p>
<p>{{ object.name }}</p>
{% endif %}
</div> </div>
</div> </div>

View File

@ -1,10 +1,10 @@
{% raw %}{% extends "base.html" %} {% raw %}{% extends "base.html" %}
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% block title %}{{ user.username }}{% endblock %} {% block title %}{{ user }}{% endblock %}
{% block content %} {% block content %}
<h1>{{ user.username }}</h1> <h1>{{ user }}</h1>
<form class="form-horizontal" method="post" action="{% url 'users:update' %}"> <form class="form-horizontal" method="post" action="{% url 'users:update' %}">
{% csrf_token %} {% csrf_token %}
{{ form|crispy }} {{ form|crispy }}

View File

@ -7,8 +7,5 @@ User = get_user_model()
class UserSerializer(serializers.ModelSerializer): class UserSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = User model = User
fields = ["username", "first_name", "last_name", "url"] fields = ["email", "uuid", "first_name", "last_name", "url"]
extra_kwargs = {"url": {"view_name": "api:user-detail", "lookup_field": "uuid"}}
extra_kwargs = {
"url": {"view_name": "api:user-detail", "lookup_field": "uuid"}
}

View File

@ -1,9 +1,11 @@
from allauth.account.forms import SignupForm from django import forms
from allauth.socialaccount.forms import SignupForm as SocialSignupForm
from django.contrib.auth import forms as admin_forms from django.contrib.auth import forms as admin_forms
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.utils.translation import gettext_lazy as _ 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() User = get_user_model()
@ -34,6 +36,7 @@ class UserSignupForm(SignupForm):
Default fields will be added automatically. Default fields will be added automatically.
Check UserSocialSignupForm for accounts created from social. Check UserSocialSignupForm for accounts created from social.
""" """
first_name = forms.CharField( first_name = forms.CharField(
max_length=150, max_length=150,
label=_("first name").capitalize(), label=_("first name").capitalize(),

View File

@ -1,8 +1,9 @@
# Generated by Django 3.2.9 on 2021-11-20 11:23 # Generated by Django 3.2.13 on 2022-06-22 04:35
import django.contrib.auth.models
import django.contrib.auth.validators import acampemos.users.models
from django.db import migrations, models from django.db import migrations, models
import django.utils.timezone import django.utils.timezone
import uuid
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -41,27 +42,6 @@ class Migration(migrations.Migration):
verbose_name="superuser status", 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", "is_staff",
models.BooleanField( models.BooleanField(
@ -85,11 +65,25 @@ class Migration(migrations.Migration):
), ),
), ),
( (
"name", "email",
models.CharField( models.EmailField(
blank=True, max_length=255, verbose_name="Name of User" 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", "groups",
models.ManyToManyField( models.ManyToManyField(
@ -119,7 +113,7 @@ class Migration(migrations.Migration):
"abstract": False, "abstract": False,
}, },
managers=[ managers=[
("objects", django.contrib.auth.models.UserManager()), ('objects', {{ cookiecutter.project_slug }}.users.models.UserManager()),
], ],
), ),
] ]

View File

@ -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.contrib.auth.models import AbstractUser
from django.db.models import CharField from django.db import models
from django.urls import reverse from django.urls import reverse
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _