Merge pull request #208 from Scot3004/user-bio-phone

Agregados campos phone y bio a "Usuario"

temii/templates/users/user_detail.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static %}
+{% load static i18n %}
 
 {% block title %}User: {{ object.username }}{% endblock %}
 
@@ -8,11 +8,17 @@
 
   <div class="row">
     <div class="col-sm-12">
-
       <h2>{{ object.username }}</h2>
+      <img class="img-fluid" src="{{ object.image.url }}">
       {% if object.name %}
         <p>{{ object.name }}</p>
       {% endif %}
+      {% if object.bio %}
+        <p>{% translate "Bio" %}: {{ object.bio }}</p>
+      {% endif %}
+      {% if object.phone %}
+        <p>{% translate "Phone" %}: {{ object.phone }}</p>
+      {% endif %}
     </div>
   </div>
 
@@ -21,8 +27,8 @@ <h2>{{ object.username }}</h2>
 <div class="row">
 
   <div class="col-sm-12">
-    <a class="btn btn-primary" href="{% url 'users:update' %}" role="button">My Info</a>
-    <a class="btn btn-primary" href="{% url 'account_email' %}" role="button">E-Mail</a>
+    <a class="btn btn-primary" href="{% url 'users:update' %}" role="button">{% translate "Update" %}</a>
+    <a class="btn btn-primary" href="{% url 'account_email' %}" role="button">{% translate "E-Mail" %}</a>
     <!-- Your Stuff: Custom user template urls -->
   </div>
 

temii/templates/users/user_form.html

@@ -1,16 +1,16 @@
 {% extends "base.html" %}
-{% load crispy_forms_tags %}
+{% load crispy_forms_tags i18n %}
 
 {% block title %}{{ user.username }}{% endblock %}
 
 {% block content %}
   <h1>{{ user.username }}</h1>
-  <form class="form-horizontal" method="post" action="{% url 'users:update' %}">
+  <form class="form-horizontal" method="post" action="{% url 'users:update' %}" enctype="multipart/form-data">
     {% csrf_token %}
     {{ form|crispy }}
     <div class="control-group">
       <div class="controls">
-        <button type="submit" class="btn btn-primary">Update</button>
+        <button type="submit" class="btn btn-primary">{% translate "Save" %}</button>
       </div>
     </div>
   </form>

temii/users/admin.py

@@ -14,7 +14,7 @@ class UserAdmin(auth_admin.UserAdmin):
     add_form = UserAdminCreationForm
     fieldsets = (
         (None, {"fields": ("username", "password")}),
-        (_("Personal info"), {"fields": ("name", "email")}),
+        (_("Personal info"), {"fields": ("name", "email", "phone", "bio", "image")}),
         (
             _("Permissions"),
             {

temii/users/forms.py

@@ -1,5 +1,6 @@
 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 _
@@ -32,6 +33,18 @@ class UserSignupForm(SignupForm):
     Check UserSocialSignupForm for accounts created from social.
     """
 
+    phone = forms.CharField(max_length=20, label=_("Phone"), required=False)
+    bio = forms.CharField(max_length=255, label=_("Bio"), required=False)
+    image = forms.ImageField(label=_("Image"), required=False)
+
+    def save(self, request):
+        user = super().save(request)
+        user.phone = self.cleaned_data["phone"]
+        user.bio = self.cleaned_data["bio"]
+        user.image = self.cleaned_data["image"]
+        user.save()
+        return user
+
 
 class UserSocialSignupForm(SocialSignupForm):
     """

temii/users/migrations/0002_user_bio_user_image_user_phone.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.1.8 on 2023-08-12 16:41
+
+from django.db import migrations, models
+import temii.users.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="bio",
+            field=models.CharField(blank=True, max_length=255, verbose_name="Bio"),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="image",
+            field=models.ImageField(
+                default="default.jpg", upload_to=temii.users.models.upload_to, verbose_name="Image"
+            ),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="phone",
+            field=models.CharField(blank=True, max_length=50, verbose_name="Phone"),
+        ),
+    ]

temii/users/models.py

@@ -1,9 +1,13 @@
 from django.contrib.auth.models import AbstractUser
-from django.db.models import CharField
+from django.db.models import CharField, ImageField
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 
+def upload_to(instance, filename):
+    return f"profile_pics/{instance.username}/{filename}"
+
+
 class User(AbstractUser):
     """
     Default custom user model for temii.
@@ -15,6 +19,9 @@ class User(AbstractUser):
     name = CharField(_("Name of User"), blank=True, max_length=255)
     first_name = None  # type: ignore
     last_name = None  # type: ignore
+    phone = CharField(_("Phone"), blank=True, max_length=50)
+    bio = CharField(_("Bio"), blank=True, max_length=255)
+    image = ImageField(_("Image"), default="default.jpg", upload_to=upload_to)
 
     def get_absolute_url(self) -> str:
         """Get URL for user's detail view.

temii/users/tests/factories.py

@@ -2,14 +2,18 @@
 from typing import Any
 
 from django.contrib.auth import get_user_model
-from factory import Faker, post_generation
-from factory.django import DjangoModelFactory
+from django.core.files.base import ContentFile
+from factory import Faker, LazyAttribute, post_generation
+from factory.django import DjangoModelFactory, ImageField
 
 
 class UserFactory(DjangoModelFactory):
     username = Faker("user_name")
     email = Faker("email")
     name = Faker("name")
+    phone = Faker("phone_number")
+    bio = Faker("text")
+    image = LazyAttribute(lambda _: ContentFile(ImageField()._make_data({"width": 300, "height": 300}), "example.jpg"))
 
     @post_generation
     def password(self, create: bool, extracted: Sequence[Any], **kwargs):

temii/users/views.py

@@ -19,7 +19,7 @@ class UserDetailView(LoginRequiredMixin, DetailView):
 
 class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
     model = User
-    fields = ["name"]
+    fields = ["name", "phone", "bio", "image"]
     success_message = _("Information successfully updated")
 
     def get_success_url(self):