componentsDjangoType 2.0.31__tar.gz → 2.0.33__tar.gz

{componentsdjangotype-2.0.31/componentsDjangoType.egg-info → componentsdjangotype-2.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: componentsDjangoType
-Version: 2.0.31
+Version: 2.0.33
 Summary: Comandos para crear archivos html, css y js
 Home-page: https://github.com/jose-CR/componentsDjangoType
 Author: Alejandro

{componentsdjangotype-2.0.31 → componentsdjangotype-2.0.33}/componentsDjangoType/management/commands/createApp.py

@@ -36,29 +36,22 @@ class Command(BaseCommand):
         # Paso 4: Crear la carpeta services y el archivo authentication.py en Home
         creation.creation_auth(self.stdout)
 
-        creation.create_views_urls(self. stdout)
+        # Paso 5: crea el urls.py y modifica el archivo views.py
+        creation.create_views_urls(self.stdout)
 
-        # Paso 8: Crear la carpeta templates y estatic y los archivos HTML CSS y JS
+        # Paso 6: Crear la carpeta templates y estatic y los archivos HTML CSS y JS
         templates_dir = os.path.join(app_name, 'templates')
-        static_dir = os.path.join(app_name, 'static')
 
         # creacion de sub carpetas
         layouts_dir = os.path.join(templates_dir, 'layouts')
-        js_dir = os.path.join(static_dir, 'js')
-        css_dir = os.path.join(static_dir, 'css')
 
         # Crear las carpetas principales y subcarpetas
         os.makedirs(templates_dir, exist_ok=True)
-        os.makedirs(static_dir, exist_ok=True)
         os.makedirs(layouts_dir, exist_ok=True)
-        os.makedirs(js_dir, exist_ok=True)
-        os.makedirs(css_dir, exist_ok=True)
 
-        # creacion de los archivos
-
-        js_file_path = os.path.join(js_dir, 'alertErrors.js')
+        creation.creation_utils(self.stdout)
 
-        css_file_path = os.path.join(css_dir, 'authentication.css')
+        # creacion de los archivos
 
         layout_files_path = os.path.join(layouts_dir, 'index.html')
 
@@ -148,231 +141,6 @@ class Command(BaseCommand):
             write_file(template_file_path, content)
 
         # escritura de los archivos
-
-        # escritura del archivos js
-        write_file(js_file_path, """function closeAlert() {
-    const alert = document.getElementById('alert');
-        if (alert) {
-            alert.remove();
-        }
-    }
-    """)
-
-        # escritura del archivo css
-        write_file(css_file_path, """   
-/* Navbar */
-.navbar {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 10px 20px;
-    background-color: #333; /* Color de fondo */
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-}
-
-/* Logo */
-.navbar .logo a {
-    color: #ffffff;
-    font-size: 1.5em;
-    text-decoration: none;
-    transition: color 0.3s ease;
-}
-                   
-.navbar .logo a:hover {
-    color: #4a90e2; /* Hover del logo */
-}
-
-/* Links de navegación */
-.nav-links {
-    display: flex;
-    gap: 15px;
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-.nav-links .nav-item {
-    color: #ffffff;
-    font-size: 1em;
-    text-decoration: none;
-    padding: 8px 15px;
-    border-radius: 5px;
-    transition: background-color 0.3s ease, color 0.3s ease;
-}
-
-.nav-links .nav-item:hover {
-    background-color: #4a90e2; /* Hover */
-    color: #ffffff;
-}
-
-/* Estilos para dispositivos móviles */
-.menu-toggle {
-    display: none;
-}
-
-@media (max-width: 768px) {
-    .menu-toggle {
-        display: inline-block;
-        font-size: 1.5em;
-        color: #ffffff;
-        cursor: pointer;
-        padding: 8px 15px;
-    }
-
-    .nav-links {
-        flex-direction: column;
-        position: absolute;
-        top: 100%;
-        right: 0;
-        width: 100%;
-        background-color: #333;
-        max-height: 0;
-        overflow: hidden;
-        transition: max-height 0.3s ease;
-    }
-
-    /* Activar menú desplegable */
-    .nav-links.active {
-        max-height: 300px; /* Ajustar altura */
-    }
-
-    .nav-links .nav-item {
-        padding: 10px 20px;
-    }
-}
-
-/*  formularios  */
-/* Contenedor para centrar el formulario */
-.form-wrapper {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 50px;
-}
-
-/* Contenedor del formulario */
-.form-container {
-    padding: 20px;
-    background: black; /* Fondo azul con transparencia */
-    border-radius: 8px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-    color: white;
-    text-align: center;
-    max-width: 400px;
-    width: 100%;
-}
-
-/* Estilo del formulario */
-.form-control {
-    display: flex;
-    flex-direction: column;
-    gap: 15px;
-}
-
-/* Estilo para las etiquetas */
-label {
-    font-size: 0.9em;
-    color: #d1d5db; /* Color gris claro */
-    margin-bottom: 5px;
-    text-align: left;
-}
-
-/* Estilo para los campos de entrada */
-input[type="text"],
-input[type="password"] {
-    padding: 10px;
-    background: rgba(255, 255, 255, 0.2);
-    border: 1px solid rgba(255, 255, 255, 0.3);
-    border-radius: 5px;
-    color: #ffffff;
-    outline: none;
-    font-size: 1em;
-    transition: background 0.3s ease, box-shadow 0.3s ease;
-}
-
-input[type="text"]:focus,
-input[type="password"]:focus {
-    background: rgba(255, 255, 255, 0.4);
-    box-shadow: 0 0 5px rgba(255, 255, 255, 0.5);
-}
-
-/* Estilo del botón */
-button[type="submit"] {
-    padding: 10px;
-    background: #4a90e2;
-    color: white;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-    transition: background 0.3s ease;
-}
-
-button[type="submit"]:hover {
-    background: #357ab8;
-}
-            
-/* alert */
-
-/* Estilos para la alerta */
-.alert {
-    max-width: 400px;
-    background-color: #333;
-    color: #ffffff;
-    border-radius: 8px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-    margin: 0 auto;
-    position: relative;
-    top: 20px;
-    padding: 15px;
-}
-
-.alert-content {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.close-btn {
-    background: none;
-    border: none;
-    cursor: pointer;
-    color: #ffffff;
-    transition: color 0.3s ease;
-}
-
-.close-btn:hover {
-    color: #ff6b6b;
-}
-
-.close-icon {
-    width: 16px;
-    height: 16px;
-}
-
-/* logged */
-
-/* Estilos para el contenedor del bloque */
-.layout-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100vh;
-    background-color: #f0f4f8;
-    font-family: Arial, sans-serif;
-}                   
-
-/* Estilos para el título */
-.layout-container h1 {
-    font-size: 2.5rem;
-    color: #4a90e2;
-    font-weight: bold;
-    text-align: center;
-    padding: 20px;
-    border-radius: 8px;
-    background: #ffffff;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-""")
         # escritura del archivos que estan en la carpeta layouts
         write_file(layout_files_path, """{% load static %}
 <!DOCTYPE html>

{componentsdjangotype-2.0.31 → componentsdjangotype-2.0.33/componentsDjangoType.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: componentsDjangoType
-Version: 2.0.31
+Version: 2.0.33
 Summary: Comandos para crear archivos html, css y js
 Home-page: https://github.com/jose-CR/componentsDjangoType
 Author: Alejandro

{componentsdjangotype-2.0.31 → componentsdjangotype-2.0.33}/componentsDjangoType.egg-info/SOURCES.txt

@@ -18,5 +18,10 @@ componentsDjangoType/management/commands/__pycache__/__init__.cpython-312.pyc
 componentsDjangoType/management/commands/__pycache__/createApp.cpython-312.pyc
 services/__init__.py
 services/authenticator_configurator.py
+services/copy_source.py
 services/authentication/__init__.py
-services/authentication/auth.py
+services/authentication/auth.py
+services/authentication/forms.py
+services/utils/__init__.py
+services/utils/css/__init__.py
+services/utils/js/__init__.py

{componentsdjangotype-2.0.31 → componentsdjangotype-2.0.33}/services/authentication/auth.py

@@ -1,64 +1,61 @@
 from django.shortcuts import render, redirect
-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
-from django.contrib.auth.models import User
-from django.contrib.auth import login, logout, authenticate
+from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth import login, logout
 from django.db import IntegrityError
+from forms import customUserCreationform
+
 class Authentication:
     @staticmethod
     def get_signup(request):
         if request.method == 'GET':
             return render(request, 'signup.html', {
-                'form': UserCreationForm()
+              'form': customUserCreationform  
             })
         elif request.method == 'POST':
-            if request.POST['password1'] == request.POST['password2']:
+            form = customUserCreationform(request.POST)
+            if form.is_valid():
                 try:
-                    # Register user\n"
-                    user = User.objects.create_user(
-                        username=request.POST['username'], password=request.POST['password2'])
-                    user.save()
+                    user = form.save()
                     login(request, user)
                     return redirect('logged')
                 except IntegrityError:
                     return render(request, 'signup.html', {
-                        'form': UserCreationForm(),
-                        'error': 'User already exists'
+                        'form': form,
+                        'error': 'Unable to register. Please try again later.'
                     })
+        else:
             return render(request, 'signup.html', {
-                'form': UserCreationForm(),
-                'error': 'Passwords do not match'
-            })
+                    'form': form,
+                    'error': 'Please correct the errors below.'
+                })
+        
     @staticmethod
     def get_signout(request):
         logout(request)
         return redirect('home')
+    
     @staticmethod
     def get_signing(request):
         if request.method == 'GET':
             return render(request, 'login.html', {
-                'form': AuthenticationForm,
+                'form': AuthenticationForm()
             })
         elif request.method == 'POST':
-            try:
-                User.objects.get(username=request.POST['username'])
-            except User.DoesNotExist:
-                return render(request, 'login.html', {
-                    'form': AuthenticationForm,
-                    'error': 'User does not exist in the database'
-                })
-            user = authenticate(
-                request, username=request.POST['username'], password=request.POST['password'])
-            if user is None:
-                return render(request, 'login.html', {
-                    'form': AuthenticationForm,
-                    'error': 'username or password is incorrect'
-                })
-            else:
+            form = AuthenticationForm(data=request.POST)
+            if form.is_valid():
+                user = form.get_user()
                 login(request, user)
                 return redirect('logged')
+            else:
+                return render(request, 'login.html', {
+                    'form': form,
+                    'error': 'Invalid username or password. Please try again.'
+                })
+
     @staticmethod
     def get_logged(request):
         return render(request, 'logged.html')
+    
     def dispatch(self, request, *args, **kwargs):
         match request.path:
             case "/signup":

componentsdjangotype-2.0.33/services/authentication/forms.py

@@ -0,0 +1,15 @@
+from django import forms
+from django.contrib.auth.forms import UserCreationForm
+from django.contrib.auth.models import User
+
+class customUserCreationform(UserCreationForm):
+    class Meta:
+       model = User
+       fields = ['username', 'password1', 'password2']
+
+    def clean_username(self):
+        username = self.cleaned_data['username']
+
+        if not username.isalnum():
+            raise forms.ValidationError("El nombre de usuario solo puede contener letras y números.")
+        return username

{componentsdjangotype-2.0.31 → componentsdjangotype-2.0.33}/services/authenticator_configurator.py

@@ -1,6 +1,6 @@
 import os
 import ast
-from django.core.management.base import BaseCommand
+from services.copy_source import copy_static_file
 from django.core.management import call_command
 from services.authentication import auth
 
@@ -89,31 +89,44 @@ path('', include('home.urls'))
 
             updated = False
 
-            # Verificar si la ruta de 'Home.urls' está en 'urlpatterns'
-            if "include('Home.urls')" not in urls_content:
-                stdout.write("Agregando ruta para 'home.urls'.\n")
-                
-                # Agregar importación de 'include'
-                urls_content = urls_content.replace(
-                    "from django.urls import path",
-                    "from django.urls import path, include"
-                )
-                
-                # Agregar 'Home.urls' a 'urlpatterns'
-                if "urlpatterns = [" in urls_content:
-                    urls_content = urls_content.replace(
-                        "urlpatterns = [",
-                        "urlpatterns = [\n    path('admin/', admin.site.urls),\n    path('', include('Home.urls')),\n"
-                    )
+            # Verificar si el archivo ya incluye 'include' y 'Home.urls'
+            if "include('Home.urls')" not in urls_content or "from django.urls import include" not in urls_content:
+                stdout.write("Actualizando el archivo 'urls.py' para incluir 'Home.urls'.\n")
+
+                # Sobrescribir el contenido del archivo con la estructura deseada
+                urls_content = '''"""
+URL configuration for myproject project.
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/5.1/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+from django.contrib import admin
+from django.urls import path, include
+
+urlpatterns = [
+    path('admin/', admin.site.urls),
+    path('', include('Home.urls')),
+]
+        '''
                 updated = True
 
-            # Escribir los cambios si se modificó algo
+            # Sobrescribir el archivo solo si se actualizó algo
             if updated:
                 with open(project_urls_path, 'w') as f:
                     f.write(urls_content)
-                stdout.write(f"El archivo '{project_urls_path}' fue actualizado.\n")
+                stdout.write(f"El archivo '{project_urls_path}' ha sido actualizado.\n")
             else:
-                stdout.write(f"No fue necesario realizar cambios en '{project_urls_path}'.\n")
+                stdout.write(f"No se realizaron cambios en '{project_urls_path}'.\n")
 
     def creation_auth(self, stdout):
         services_dir = os.path.join(self.app_name, 'services')
@@ -121,7 +134,7 @@ path('', include('home.urls'))
         os.makedirs(authentication_dir, exist_ok=True)
 
         # Ruta para el nuevo archivo a crear
-        authentication_path = os.path.join(authentication_dir, 'authentication.py')
+        authentication_path = os.path.join(authentication_dir, 'auth.py')
 
         # Usar el atributo __file__ del módulo 'auth' para obtener la ruta del archivo fuente
         auth_source_path = os.path.abspath(auth.__file__)
@@ -162,7 +175,7 @@ path('', include('home.urls'))
 
         # Sobrescribir o crear el archivo views.py
         views_code = '''from django.shortcuts import render
-from Home.services.authentication import Authentication
+from services.authentication.auth import Authentication
 
 def home(request):
     return render(request, 'home.html')
@@ -201,29 +214,31 @@ urlpatterns = [
             stdout.write(f"El archivo '{urls_path}' ha sido creado.\n")
         else:
             stdout.write(f"El archivo '{urls_path}' ya existe.\n")
+        
 
+    def creation_utils(self, stdout):
 
+        app_name = self.app_name
+        #creacion de los directorios
+        static_dir = os.path.join(app_name, 'static')
 
+        #creacin de subcarpetas
+        js_dir = os.path.join(static_dir, 'js')
+        css_dir = os.path.join(static_dir, 'css')
 
+        # Crear las carpetas principales y subcarpetas
+        os.makedirs(static_dir, exist_ok=True)
+        os.makedirs(js_dir, exist_ok=True)
+        os.makedirs(css_dir, exist_ok=True)      
 
+        stdout.write("Estructura de carpetas creada.\n")
 
+        files_to_copy = [
+            ("services/utils/js/alertErrors.js", os.path.join(js_dir, "alertErrors.js")),
+            ("services/utils/css/authentication.css", os.path.join(css_dir, "authentication.css"))    
+        ]
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+        for source_path, destination_path in files_to_copy:
+            copy_static_file(source_path, destination_path, stdout)
+        
+        stdout.write("Archivos estáticos copiados.\n")

componentsdjangotype-2.0.33/services/copy_source.py

@@ -0,0 +1,32 @@
+import os
+import shutil
+import sys
+
+def copy_static_file(source_path, destination_path, stdout=sys.stdout):
+    """
+    Copia un archivo estático (HTML, CSS, JS) a una ruta de destino.
+
+    :param source_path: Ruta completa del archivo fuente.
+    :param destination_path: Ruta completa del archivo destino.
+    :param stdout: Salida estándar para mensajes (por defecto usa sys.stdout).
+    """
+    try:
+        # Verificar si el archivo fuente existe
+        if not os.path.exists(source_path):
+            stdout.write(f"El archivo fuente '{source_path}' no existe.\n")
+            return
+
+        # Crear el directorio de destino si no existe
+        os.makedirs(os.path.dirname(destination_path), exist_ok=True)
+
+        # Verificar si el archivo de destino ya existe
+        if os.path.exists(destination_path):
+            stdout.write(f"El archivo '{destination_path}' ya existe.\n")
+            return
+
+        # Copiar el archivo al destino
+        shutil.copy(source_path, destination_path)
+        stdout.write(f"El archivo '{source_path}' fue copiado a '{destination_path}'.\n")
+
+    except Exception as e:
+        stdout.write(f"Error al copiar el archivo: {e}\n")

{componentsdjangotype-2.0.31 → componentsdjangotype-2.0.33}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='componentsDjangoType',
-    version='2.0.31',
+    version='2.0.33',
     packages=find_packages(),
     include_package_data=True,
     license='MIT',