Se establece el inicio de sesion del Presentador

cata_system/settings.py

@@ -68,7 +68,8 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
-    'tecnicas.middlewares.LoginTesterMiddleware',
+    'tecnicas.middlewares.PresenterAccessMiddleware',
+    'tecnicas.middlewares.TesterAccessMiddleware',
 ]
 
 if DEBUG:

cata_system/views.py

@@ -2,4 +2,4 @@ from django.http import HttpRequest
 from django.shortcuts import redirect
 
 def home(req: HttpRequest):
-    return redirect('/cata/')
+    return redirect('/cata/presenter/')

tecnicas/decorators/__init__.py

@@ -0,0 +1 @@
+from .required_presenter import required_presenter

tecnicas/decorators/required_presenter.py

@@ -0,0 +1,15 @@
+from django.shortcuts import redirect
+from django.urls import reverse
+from django.core.exceptions import PermissionDenied
+
+
+def required_presenter(view_func):
+    def wrapper(request, *args, **kwargs):
+        if not request.user.is_authenticated:
+            return redirect("cata_system:autenticacion")
+        
+        if not hasattr(request.user, "presentador"):
+            raise PermissionDenied(
+                "Solo los presentadores pueden acceder a esta vista")
+        return view_func(request, *args, **kwargs)
+    return wrapper

tecnicas/middlewares/__init__.py

@@ -1 +1,2 @@
-from .login_tester_middleware import LoginTesterMiddleware
+from .tester_middleware import TesterAccessMiddleware
+from .presenter_middleware import PresenterAccessMiddleware

tecnicas/middlewares/login_tester_middleware.py

@@ -1,25 +0,0 @@
-from django.http import HttpRequest
-
-
-class LoginTesterMiddleware():
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, req: HttpRequest):
-        base_url_protected = "/cata/testers/"
-
-        if req.path.startswith(base_url_protected):
-            if not "cata_username" in req.session:
-                id_participacion = req.COOKIES.get("id_participacion")
-                if id_participacion:
-                    from tecnicas.controllers import ParticipacionController
-                    ParticipacionController.outSession(id_participacion)
-                from django.shortcuts import redirect
-                from django.urls import reverse
-                response = redirect(reverse("cata_system:catador_login"))
-                response.delete_cookie("id_participacion")
-                return response
-
-        response = self.get_response(req)
-
-        return response

tecnicas/middlewares/presenter_middleware.py

@@ -0,0 +1,18 @@
+from django.core.exceptions import PermissionDenied
+
+class PresenterAccessMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        path = request.path_info
+        
+        if path.startswith('/cata/presenter/'):
+            if not request.user.is_authenticated:
+                from django.shortcuts import redirect
+                return redirect("cata_system:autenticacion")
+
+            if not hasattr(request.user, 'user_presentador'):
+                raise PermissionDenied("Solo los Presentadores pueden acceder a esta sección.")
+
+        return self.get_response(request)

tecnicas/middlewares/tester_middleware.py

@@ -0,0 +1,47 @@
+# usuarios/middleware/catador_middleware.py
+from django.core.exceptions import PermissionDenied
+
+
+class TesterAccessMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        path = request.path_info
+
+        if path.startswith('/cata/tester/'):
+            if not request.user.is_authenticated:
+                from django.shortcuts import redirect
+                return redirect("cata_system:catador_login")
+
+            if not hasattr(request.user, 'catador'):
+                raise PermissionDenied(
+                    "Solo los Catadores pueden acceder a esta sección.")
+
+        return self.get_response(request)
+
+# from django.http import HttpRequest
+
+
+# class LoginTesterMiddleware():
+#     def __init__(self, get_response):
+#         self.get_response = get_response
+
+#     def __call__(self, req: HttpRequest):
+#         base_url_protected = "/cata/testers/"
+
+#         if req.path.startswith(base_url_protected):
+#             if not "cata_username" in req.session:
+#                 id_participacion = req.COOKIES.get("id_participacion")
+#                 if id_participacion:
+#                     from tecnicas.controllers import ParticipacionController
+#                     ParticipacionController.outSession(id_participacion)
+#                 from django.shortcuts import redirect
+#                 from django.urls import reverse
+#                 response = redirect(reverse("cata_system:catador_login"))
+#                 response.delete_cookie("id_participacion")
+#                 return response
+
+#         response = self.get_response(req)
+
+#         return response

tecnicas/migrations/0020_remove_catador_apellido_remove_catador_correo_and_more.py

@@ -0,0 +1,93 @@
+# Generated by Django 5.2.1 on 2025-10-18 23:34
+
+import django.db.models.deletion
+import shortuuid.main
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tecnicas', '0019_rename_repecion_tecnica_repeticion_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='catador',
+            name='apellido',
+        ),
+        migrations.RemoveField(
+            model_name='catador',
+            name='correo',
+        ),
+        migrations.RemoveField(
+            model_name='catador',
+            name='fechaNacimiento',
+        ),
+        migrations.RemoveField(
+            model_name='catador',
+            name='nombre',
+        ),
+        migrations.RemoveField(
+            model_name='catador',
+            name='usuarioCatador',
+        ),
+        migrations.RemoveField(
+            model_name='presentador',
+            name='apellido',
+        ),
+        migrations.RemoveField(
+            model_name='presentador',
+            name='contrasena',
+        ),
+        migrations.RemoveField(
+            model_name='presentador',
+            name='nombre',
+        ),
+        migrations.RemoveField(
+            model_name='presentador',
+            name='nombre_usuario',
+        ),
+        migrations.AddField(
+            model_name='catador',
+            name='genero',
+            field=models.CharField(blank=True, choices=[('Hombre', 'Hombre'), ('Mujer', 'Mujer')], default='Hombre', max_length=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='catador',
+            name='nacimiento',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='catador',
+            name='user',
+            field=models.OneToOneField(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user_catador', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='presentador',
+            name='fecha_nacimiento',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='presentador',
+            name='telefono',
+            field=models.BigIntegerField(default=555),
+        ),
+        migrations.AddField(
+            model_name='presentador',
+            name='user',
+            field=models.OneToOneField(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user_presentador', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='catador',
+            name='telefono',
+            field=models.BigIntegerField(default=555),
+        ),
+        migrations.AlterField(
+            model_name='sesionsensorial',
+            name='codigo_sesion',
+            field=models.CharField(default=shortuuid.main.ShortUUID.uuid, editable=False, max_length=22, primary_key=True, serialize=False),
+        ),
+    ]

tecnicas/models/catador.py

@@ -1,12 +1,17 @@
+from django.contrib.auth.models import User
 from django.db import models
 
+
 class Catador(models.Model):
-    usuarioCatador = models.CharField(max_length=255, unique=True)
-    nombre = models.CharField(max_length=255)
-    apellido = models.CharField(max_length=255)
-    telefono = models.BigIntegerField()
-    correo = models.EmailField()
-    fechaNacimiento = models.DateField()
+    user = models.OneToOneField(
+        User, on_delete=models.CASCADE, related_name='user_catador', default=None, null=True)
+    nacimiento = models.DateField(null=True, blank=True)
+    telefono = models.BigIntegerField(default=555)
+    genero = models.CharField(
+        max_length=10,
+        choices=[('Hombre', 'Hombre'), ('Mujer', 'Mujer')],
+        null=True, blank=True, default="Hombre"
+    )
 
     def __str__(self):
-        return self.usuarioCatador
+        return f"Catador: {self.user.username}"

tecnicas/models/presentador.py

@@ -1,10 +1,12 @@
+from django.contrib.auth.models import User
 from django.db import models
 
+
 class Presentador(models.Model):
-    nombre = models.CharField(max_length=255)
-    apellido = models.CharField(max_length=255)
-    nombre_usuario = models.CharField(max_length=255, unique=True)
-    contrasena = models.CharField(max_length=255)
+    user = models.OneToOneField(
+        User, on_delete=models.CASCADE, related_name='user_presentador', default=None, null=True)
+    fecha_nacimiento = models.DateField(null=True, blank=True)
+    telefono = models.BigIntegerField(default=555)
 
     def __str__(self):
-        return self.nombre
+        return f"Presentador: {self.user.username}"

tecnicas/templates/tecnicas/auth.html

@@ -6,26 +6,33 @@
 <article class="cts-container-main">
     <article class="cts-wrap-content">
         <form action="" method="post" class="p-8 rounded-xl text-black">
-            <header class="text-center">
+            <header class="text-center mb-2">
                 <h1 class="text-5xl max-sm:text-3xl font-bold">Cata System</h1>
                 <p class="text-2xl max-sm:text-xl font-semibold mt-3">Presentador</p>
             </header>
+
+            {% if error %}
+            {% include "./components/error-message.html" with message=error %}
+            {% endif %}
+            {% if message %}
+            {% include "./components/error-message.html" with message=message %}
+            {% endif %}
+
             <section class="flex flex-col gap-6 items-center w-full mt-5">
-                <label for="id">
-                    <input type="text" name="id" id="id" placeholder="Ingrese Indentifiacion"
+                <label for="username">
+                    <input type="text" name="username" id="username" placeholder="Ingrese Nombre de Usuario"
                         class="placeholder:text-gray-400 placeholder:font-semibold text-xl max-sm:text-base bg-surface-ligt py-3 px-6 rounded-xl lg:w-sm border-b-2 border-surface-sweet"
                         required>
                 </label>
 
-                <label for="id">
-                    <input type="text" name="id" id="id" placeholder="Ingrese Contraseña"
+                <label for="password">
+                    <input type="text" name="password" id="password" placeholder="Ingrese Contraseña"
                         class="placeholder:text-gray-400 placeholder:font-semibold text-xl max-sm:text-base bg-surface-ligt py-3 px-6 rounded-xl lg:w-sm border-b-2 border-surface-sweet"
                         required>
                 </label>
 
                 <section class="flex flex-row flex-wrap gap-4 w-f ull justify-center">
-                    <button type="submit"
-                        class="cts-btn-general cts-btn-primary btn-push uppercase lg:w-sm">
+                    <button type="submit" class="cts-btn-general cts-btn-primary btn-push uppercase lg:w-sm">
                         Ingresar
                     </button>
                 </section>

tecnicas/urls.py

@@ -5,73 +5,73 @@ from . import views
 
 app_name = "cata_system"
 urlpatterns = [
-    path("", views.mainPanel, name="index"),
-
     # Atentificacion
     path("autenticacion",
          views.autentication,
          name="autenticacion"),
 
+    path("catador-login",
+         views.testerLogin,
+         name="catador_login"),
+
+    # Pantalla principal Presetador
+    path("presenter/", views.mainPanel, name="index"),
 
     # Gestion de catadores
-    path("panel-catadores",
+    path("presenter/panel-catadores",
          views.testerMenu,
          name="panel_catadores"),
 
-    path("crear-catador",
+    path("presenter/crear-catador",
          views.testerCreate,
          name="crear_catador"),
 
-    path("buscar-catador",
+    path("presenter/buscar-catador",
          views.testerSearch,
          name="buscar_catador"),
 
 
     # Creacion de sessiones sensoriales
-    path("seleccion-tecnica",
+    path("presenter/seleccion-tecnica",
          views.selecionTecnica,
          name="seleccion_tecnica"),
 
-    path("panel-configuracion-basic",
+    path("presenter/panel-configuracion-basic",
          views.configurationPanelBasic,
          name="panel_configuracion_basic"),
 
-    path("panel-configuracion-tags",
+    path("presenter/panel-configuracion-tags",
          views.configurationPanelTags,
          name="panel_configuracion_tags"),
 
-    path("panel-configuracion-codes",
+    path("presenter/panel-configuracion-codes",
          views.configurationPanelCodes,
          name="panel_configuracion_codes"),
 
-    path("panel-configuracion-words",
+    path("presenter/panel-configuracion-words",
          views.configurationPanelWords,
          name="panel_configuracion_words"),
 
-    path("creando-sesion",
+    path("presenter/creando-sesion",
          views.createSession,
          name="creando_sesion"),
 
 
     # Gestion de sesiones sensoriales
-    path("panel-sesiones/<int:page>",
+    path("presenter/panel-sesiones/<int:page>",
          views.sesionsPanel,
          name="panel_sesiones"),
 
-    path("detalles-sesion/<str:session_code>",
+    path("presenter/detalles-sesion/<str:session_code>",
          views.sessionDetails,
          name="detalles_sesion"),
 
-    path("monitor/<str:session_code>",
+    path("presenter/monitor/<str:session_code>",
          views.sessionMonitor,
          name="monitor_sesion"),
 
 
     # Vistas para catadores
-    path("catador-login",
-         views.testerLogin,
-         name="catador_login"),
-
     path("testers/catador-main",
          views.mainTesterForm,
          name="catador_main"),
@@ -81,7 +81,7 @@ urlpatterns = [
          name="session_convencional"),
 
     # APIs
-    path("nueva-etiqueta",
+    path("api/nueva-etiqueta",
          views.newTag,
          name="nueva_etiqueta"),
 

tecnicas/views/autentication.py

@@ -1,4 +1,29 @@
-from django.shortcuts import render
+from django.contrib.auth import authenticate, login
+from django.http import HttpRequest, JsonResponse
+from django.views.decorators.csrf import csrf_exempt
+from django.shortcuts import render, redirect
+from tecnicas.utils import general_error
+from tecnicas.models import Presentador
 
-def autentication(req):
-    return render(req, "tecnicas/auth.html")
+@csrf_exempt
+def autentication(req: HttpRequest):
+    context_view = {}
+
+    if req.method == "GET":
+        return render(req, "tecnicas/auth.html")
+    elif req.method == "POST":
+        username = req.POST.get("username")
+        password = req.POST.get("password")
+
+        user = authenticate(username=username, password=password)
+
+        if user is not None and hasattr(user, "user_presentador"):
+            login(req, user)
+            return redirect("cata_system:index")
+        else:
+            return JsonResponse({
+                "success": False,
+                "error": "Credenciales inválidas o no es un Presentador"
+            })
+    else:
+        return general_error("Método no permitido")

tecnicas/views/main_panel.py

@@ -4,7 +4,6 @@ def mainPanel(req):
     pres = Presente("1233MMAS092222", "Juan Mendez Salazar")
     return render(req, "tecnicas/main-panel.html", context={"presentador":pres})
 
-# Auxiliar classes
 class Presente():
     def __init__(self, id, nombre):
         self.id = id