diff --git a/essenza/db.sqlite3 b/essenza/db.sqlite3 index 979deb7..682e0b4 100644 Binary files a/essenza/db.sqlite3 and b/essenza/db.sqlite3 differ diff --git a/essenza/essenza/settings.py b/essenza/essenza/settings.py index f1a04d8..640d38b 100644 --- a/essenza/essenza/settings.py +++ b/essenza/essenza/settings.py @@ -123,3 +123,9 @@ # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +# ----------------------------------------------------------------- +# SOLUCIÓN AL ERROR E304 +# Especifica que nuestro modelo 'Usuario' en la app 'user' +# es el modelo de autenticación oficial. +# ----------------------------------------------------------------- +AUTH_USER_MODEL = 'user.Usuario' \ No newline at end of file diff --git a/essenza/product/models.py b/essenza/product/models.py index a095a5c..b2cfaaf 100644 --- a/essenza/product/models.py +++ b/essenza/product/models.py @@ -13,7 +13,7 @@ class Product(models.Model): categoria = models.CharField(max_length=20, choices=Category.choices) brand = models.CharField(max_length=255) price = models.DecimalField(max_digits=10, decimal_places=2) - foto = models.URLField(blank=True, null=True) + foto = models.ImageField(upload_to='profile_pics/', null=True, blank=True) stock = models.IntegerField() is_active = models.BooleanField(default=False) diff --git a/essenza/profile_pics/img1.jpg b/essenza/profile_pics/img1.jpg new file mode 100644 index 0000000..64ca02d Binary files /dev/null and b/essenza/profile_pics/img1.jpg differ diff --git a/essenza/profile_pics/user1.avif b/essenza/profile_pics/user1.avif new file mode 100644 index 0000000..9c6e5cd Binary files /dev/null and b/essenza/profile_pics/user1.avif differ diff --git a/essenza/profile_pics/user2.avif b/essenza/profile_pics/user2.avif new file mode 100644 index 0000000..319b52c Binary files /dev/null and b/essenza/profile_pics/user2.avif differ diff --git a/essenza/profile_pics/user3.avif b/essenza/profile_pics/user3.avif new file mode 100644 index 0000000..3e2938c Binary files /dev/null and b/essenza/profile_pics/user3.avif differ diff --git a/essenza/static/images/img2.avif b/essenza/static/images/img2.avif new file mode 100644 index 0000000..5df7da0 Binary files /dev/null and b/essenza/static/images/img2.avif differ diff --git a/essenza/user/models.py b/essenza/user/models.py index 9eb3d23..334e657 100644 --- a/essenza/user/models.py +++ b/essenza/user/models.py @@ -1,21 +1,14 @@ from django.db import models +from django.contrib.auth.models import AbstractUser -# Create your models here. class Role(models.TextChoices): ADMIN = 'admin', 'Admin' USER = 'user', 'User' - -class Usuario(models.Model): - name = models.CharField(max_length=255) - email = models.EmailField(max_length=255, unique=True) - foto = models.URLField(blank=True, null=True) - password = models.CharField(max_length=255) +class Usuario(AbstractUser): + foto = models.ImageField(upload_to='images/', null=True, blank=True) role = models.CharField(max_length=10, choices=Role.choices, default=Role.USER) + def __str__(self): - return self.email - -# user1@example.com, user -# user2@example.com, user -# admin1@example.com, admin \ No newline at end of file + return self.username \ No newline at end of file