From 13003f0ccbd3fa854951dce91976f289b76de3b6 Mon Sep 17 00:00:00 2001 From: Alejandro Franco Date: Fri, 13 Oct 2023 14:03:51 -0600 Subject: [PATCH] Adapts project version --- .../config/settings/test.py | 2 +- .../requirements/base.txt | 2 +- .../requirements/local.txt | 2 +- .../templates/base.html | 2 +- .../templates/users/user_detail.html | 25 +++++++++++-------- .../users/tests/test_admin.py | 2 ++ .../users/tests/test_drf_views.py | 4 ++- .../users/tests/test_managers.py | 10 ++++++++ 8 files changed, 33 insertions(+), 16 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index 68126182e..4d64c63f2 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -32,7 +32,7 @@ TEMPLATES[0]["OPTIONS"]["debug"] = True # type: ignore # noqa: F405 # MEDIA # ------------------------------------------------------------------------------ # https://docs.djangoproject.com/en/dev/ref/settings/#media-url -MEDIA_URL = 'http://media.testserver' +MEDIA_URL = "http://media.testserver" {%- if cookiecutter.frontend_pipeline == 'Webpack' %} # django-webpack-loader diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 60a841bad..b02a55507 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -52,4 +52,4 @@ django-webpack-loader==2.0.1 # https://github.com/django-webpack/django-webpack # Project # ------------------------------------------------------------------------------ fontawesomefree==6.4.2 # https://github.com/FortAwesome/Font-Awesome -django-import-export==3.2.0 # https://github.com/django-import-export/django-import-export +django-import-export==3.3.1 # https://github.com/django-import-export/django-import-export diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 826d4b87b..cab524bd3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -25,7 +25,7 @@ djangorestframework-stubs[compatible-mypy]==3.14.3 # https://github.com/typeddj # ------------------------------------------------------------------------------ sphinx==7.2.6 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild -sphinx-rtd-theme==1.2.0 # https://pypi.org/project/sphinx-rtd-theme/ +sphinx-rtd-theme==1.3.0 # https://pypi.org/project/sphinx-rtd-theme/ # Code quality # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index 9a27af50b..74c4b23da 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -136,7 +136,7 @@ {% if request.user.is_authenticated %}
  • {% translate "My Profile" %} + href="{% endraw %}{% raw %}{% url 'users:detail' request.user.uuid %}{% endraw %}{% raw %}">{% 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 de32e7e6d..21c4c606c 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 @@ -2,19 +2,22 @@ {% load static %} -{% block title %}User: {{ object }}{% endblock title %} - +{% block title %} + User: {% endraw %} + {% raw %}{{ object.first_name }}{% endraw %} + {% raw %} +{% endblock title %} {% block content %} -
    - -
    -
    - -

    {{ object }}

    -

    {{ object.first_name }}

    +
    +
    +
    +

    + {% endraw %} + {% raw %}{{ object.first_name }}{% endraw %} +

    - {%- raw %} + {% raw %} {% if object == request.user %}
    @@ -30,4 +33,4 @@ {% endif %}
    {% endblock content %} -{%- endraw %} +{% endraw %} diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py index c7e957570..37d00516e 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py @@ -22,6 +22,8 @@ class TestUserAdmin: response = admin_client.post( url, data={ + "first_name": "New", + "last_name": "Admin", "email": "new-admin@example.com", "password1": "My_R@ndom-P@ssw0rd", "password2": "My_R@ndom-P@ssw0rd", diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py index 3757b18bf..0f2a5d913 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py @@ -29,7 +29,9 @@ class TestUserViewSet: response = view.me(request) # type: ignore assert response.data == { - "email": user.uuid, + "email": user.email, + "uuid": str(user.uuid), "first_name": user.first_name, + "last_name": user.last_name, "url": f"http://testserver/api/users/{user.uuid}/", } diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py index f25af4ee2..d937879f3 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py @@ -10,6 +10,8 @@ from {{ cookiecutter.project_slug }}.users.models import User class TestUserManager: def test_create_user(self): user = User.objects.create_user( + first_name="John", + last_name="Doe", email="john@example.com", password="something-r@nd0m!", ) @@ -21,6 +23,8 @@ class TestUserManager: def test_create_superuser(self): user = User.objects.create_superuser( + first_name="Admin", + last_name="User", email="admin@example.com", password="something-r@nd0m!", ) @@ -31,6 +35,8 @@ class TestUserManager: def test_create_superuser_username_ignored(self): user = User.objects.create_superuser( + first_name="Test", + last_name="User", email="test@example.com", password="something-r@nd0m!", ) @@ -45,6 +51,10 @@ def test_createsuperuser_command(): "createsuperuser", "--email", "henry@example.com", + "--first_name", + "Henry", + "--last_name", + "Ford", interactive=False, stdout=out, )