From 6d857193a567bb2702b13fd7c4ffd1e99bc36c25 Mon Sep 17 00:00:00 2001 From: Manuel Vergara Date: Sun, 14 May 2023 13:22:02 +0200 Subject: [PATCH] Add structure of the 16th with the example web of the course --- .../src/proyecto/base/__init__.py | 0 .../src/proyecto/base/admin.py | 4 + .../src/proyecto/base/apps.py | 6 + .../proyecto/base/migrations/0001_initial.py | 30 ++++ .../src/proyecto/base/migrations/__init__.py | 0 .../src/proyecto/base/models.py | 20 +++ .../proyecto/base/templates/base/login.html | 18 +++ .../base/templates/base/principal.html | 150 ++++++++++++++++++ .../base/templates/base/registro.html | 25 +++ .../proyecto/base/templates/base/tarea.html | 1 + .../templates/base/tarea_confirm_delete.html | 17 ++ .../base/templates/base/tarea_form.html | 17 ++ .../base/templates/base/tarea_list.html | 48 ++++++ .../src/proyecto/base/tests.py | 3 + .../src/proyecto/base/urls.py | 12 ++ .../src/proyecto/base/views.py | 81 ++++++++++ .../web_Python_Total/src/proyecto/manage.py | 22 +++ .../src/proyecto/proyecto/__init__.py | 0 .../src/proyecto/proyecto/asgi.py | 16 ++ .../src/proyecto/proyecto/settings.py | 125 +++++++++++++++ .../src/proyecto/proyecto/urls.py | 22 +++ .../src/proyecto/proyecto/wsgi.py | 16 ++ 22 files changed, 633 insertions(+) create mode 100644 dia_16/web_Python_Total/src/proyecto/base/__init__.py create mode 100644 dia_16/web_Python_Total/src/proyecto/base/admin.py create mode 100644 dia_16/web_Python_Total/src/proyecto/base/apps.py create mode 100644 dia_16/web_Python_Total/src/proyecto/base/migrations/0001_initial.py create mode 100644 dia_16/web_Python_Total/src/proyecto/base/migrations/__init__.py create mode 100644 dia_16/web_Python_Total/src/proyecto/base/models.py create mode 100644 dia_16/web_Python_Total/src/proyecto/base/templates/base/login.html create mode 100644 dia_16/web_Python_Total/src/proyecto/base/templates/base/principal.html create mode 100644 dia_16/web_Python_Total/src/proyecto/base/templates/base/registro.html create mode 100644 dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea.html create mode 100644 dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_confirm_delete.html create mode 100644 dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_form.html create mode 100644 dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_list.html create mode 100644 dia_16/web_Python_Total/src/proyecto/base/tests.py create mode 100644 dia_16/web_Python_Total/src/proyecto/base/urls.py create mode 100644 dia_16/web_Python_Total/src/proyecto/base/views.py create mode 100644 dia_16/web_Python_Total/src/proyecto/manage.py create mode 100644 dia_16/web_Python_Total/src/proyecto/proyecto/__init__.py create mode 100644 dia_16/web_Python_Total/src/proyecto/proyecto/asgi.py create mode 100644 dia_16/web_Python_Total/src/proyecto/proyecto/settings.py create mode 100644 dia_16/web_Python_Total/src/proyecto/proyecto/urls.py create mode 100644 dia_16/web_Python_Total/src/proyecto/proyecto/wsgi.py diff --git a/dia_16/web_Python_Total/src/proyecto/base/__init__.py b/dia_16/web_Python_Total/src/proyecto/base/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dia_16/web_Python_Total/src/proyecto/base/admin.py b/dia_16/web_Python_Total/src/proyecto/base/admin.py new file mode 100644 index 0000000..e42272b --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/admin.py @@ -0,0 +1,4 @@ +from django.contrib import admin +from .models import Tarea + +admin.site.register(Tarea) diff --git a/dia_16/web_Python_Total/src/proyecto/base/apps.py b/dia_16/web_Python_Total/src/proyecto/base/apps.py new file mode 100644 index 0000000..60c0149 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class BaseConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'base' diff --git a/dia_16/web_Python_Total/src/proyecto/base/migrations/0001_initial.py b/dia_16/web_Python_Total/src/proyecto/base/migrations/0001_initial.py new file mode 100644 index 0000000..f9af154 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/migrations/0001_initial.py @@ -0,0 +1,30 @@ +# Generated by Django 4.0 on 2023-01-20 15:06 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='Tarea', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('titulo', models.CharField(max_length=200)), + ('descripcion', models.TextField(blank=True, null=True)), + ('completo', models.BooleanField(default=False)), + ('creado', models.DateTimeField(auto_now_add=True)), + ('usuario', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='auth.user')), + ], + options={ + 'ordering': ['completo'], + }, + ), + ] diff --git a/dia_16/web_Python_Total/src/proyecto/base/migrations/__init__.py b/dia_16/web_Python_Total/src/proyecto/base/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dia_16/web_Python_Total/src/proyecto/base/models.py b/dia_16/web_Python_Total/src/proyecto/base/models.py new file mode 100644 index 0000000..8e67046 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/models.py @@ -0,0 +1,20 @@ +from django.db import models +from django.contrib.auth.models import User + + +class Tarea(models.Model): + usuario = models.ForeignKey(User, + on_delete=models.CASCADE, + null=True, + blank=True) + titulo = models.CharField(max_length=200) + descripcion = models.TextField(null=True, + blank=True) + completo = models.BooleanField(default=False) + creado = models.DateTimeField(auto_now_add=True) + + def __str__(self): + return self.titulo + + class Meta: + ordering = ['completo'] \ No newline at end of file diff --git a/dia_16/web_Python_Total/src/proyecto/base/templates/base/login.html b/dia_16/web_Python_Total/src/proyecto/base/templates/base/login.html new file mode 100644 index 0000000..fea9a77 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/templates/base/login.html @@ -0,0 +1,18 @@ +{% extends 'base/principal.html' %} + +{% block content %} + +
+

Ingresar

+
+ +
+
+ {% csrf_token %} + {{form.as_p}} + +
+

¿No tienes una cuenta? Regístrate

+
+ +{% endblock content %} \ No newline at end of file diff --git a/dia_16/web_Python_Total/src/proyecto/base/templates/base/principal.html b/dia_16/web_Python_Total/src/proyecto/base/templates/base/principal.html new file mode 100644 index 0000000..9adbd92 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/templates/base/principal.html @@ -0,0 +1,150 @@ + + + + + Lista de Pendientes + + + + + + + + + + +
+ {% block content %} + + {% endblock content %} +
+ + \ No newline at end of file diff --git a/dia_16/web_Python_Total/src/proyecto/base/templates/base/registro.html b/dia_16/web_Python_Total/src/proyecto/base/templates/base/registro.html new file mode 100644 index 0000000..3456fed --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/templates/base/registro.html @@ -0,0 +1,25 @@ +{% extends 'base/principal.html' %} + +{% block content %} + +
+

Registrarse

+
+ +
+
+ {% csrf_token %} + + {{form.username}} + + + {{form.password1}} + + + {{form.password2}} + +
+

¿Ya tienes una cuenta? Ingresa

+
+ +{% endblock content %} \ No newline at end of file diff --git a/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea.html b/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea.html new file mode 100644 index 0000000..2abf723 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea.html @@ -0,0 +1 @@ +

Tarea: {{tarea}}

\ No newline at end of file diff --git a/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_confirm_delete.html b/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_confirm_delete.html new file mode 100644 index 0000000..457dcc9 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_confirm_delete.html @@ -0,0 +1,17 @@ +{% extends 'base/principal.html' %} + +{% block content %} + +
+ 🡠 Volver +
+ +
+
+ {% csrf_token %} +

Vas a eliminar esta tarea: "{{tarea}}"

+ +
+
+ +{% endblock content %} \ No newline at end of file diff --git a/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_form.html b/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_form.html new file mode 100644 index 0000000..a31fd68 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_form.html @@ -0,0 +1,17 @@ +{% extends 'base/principal.html' %} + +{% block content %} + +
+ 🡠 Volver +
+ +
+
+ {% csrf_token %} + {{form.as_p}} + +
+
+ +{% endblock content %} \ No newline at end of file diff --git a/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_list.html b/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_list.html new file mode 100644 index 0000000..3b6dde3 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/templates/base/tarea_list.html @@ -0,0 +1,48 @@ +{% extends 'base/principal.html' %} + +{% block content %} + +
+
+

Hola {{request.user|title}}

+

Tienes {{count}} tarea{{count|pluralize}} incompleta{{count|pluralize}}

+
+ {% if request.user.is_authenticated %} + Salir + {% else %} + Ingresar +{% endif %} +
+ +
+
+ + +
+ 🞥 +
+ +
+ {% for tarea in tareas %} +
+ {% if tarea.completo %} +
+
+ {{tarea}} +
+ ⨯ + {% else %} +
+
+ {{tarea}} +
+ ⨯ + {% endif %} +
+ + {% empty %} +

No hay elementos en esta lista

+ {% endfor %} +
+ +{% endblock content %} \ No newline at end of file diff --git a/dia_16/web_Python_Total/src/proyecto/base/tests.py b/dia_16/web_Python_Total/src/proyecto/base/tests.py new file mode 100644 index 0000000..de8bdc0 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/dia_16/web_Python_Total/src/proyecto/base/urls.py b/dia_16/web_Python_Total/src/proyecto/base/urls.py new file mode 100644 index 0000000..68388c7 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/urls.py @@ -0,0 +1,12 @@ +from django.urls import path +from .views import ListaPendientes, DetalleTarea, CrearTarea, EditarTarea, EliminarTarea, Logueo, PaginaRegistro +from django.contrib.auth.views import LogoutView + +urlpatterns = [path('', ListaPendientes.as_view(), name='tareas'), + path('login/', Logueo.as_view(), name='login'), + path('registro/', PaginaRegistro.as_view(), name='registro'), + path('logout/', LogoutView.as_view(next_page='login'), name='logout'), + path('tarea/', DetalleTarea.as_view(), name='tarea'), + path('crear-tarea/', CrearTarea.as_view(), name='crear-tarea'), + path('editar-tarea/', EditarTarea.as_view(), name='editar-tarea'), + path('eliminar-tarea/', EliminarTarea.as_view(), name='eliminar-tarea')] diff --git a/dia_16/web_Python_Total/src/proyecto/base/views.py b/dia_16/web_Python_Total/src/proyecto/base/views.py new file mode 100644 index 0000000..729bf2d --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/base/views.py @@ -0,0 +1,81 @@ +from django.shortcuts import render, redirect +from django.views.generic.list import ListView +from django.views.generic.detail import DetailView +from django.views.generic.edit import CreateView, UpdateView, DeleteView, FormView +from django.contrib.auth.forms import UserCreationForm +from django.contrib.auth import login +from django.contrib.auth.views import LoginView +from django.contrib.auth.mixins import LoginRequiredMixin +from django.urls import reverse_lazy +from .models import Tarea + + +class Logueo(LoginView): + template_name = 'base/login.html' + fields = '__all__' + redirect_authenticated_user = True + + def get_success_url(self): + return reverse_lazy('tareas') + + +class PaginaRegistro(FormView): + template_name = 'base/registro.html' + form_class = UserCreationForm + redirect_authenticated_user = True + success_url = reverse_lazy('tareas') + + def form_valid(self, form): + usuario = form.save() + if usuario is not None: + login(self.request, usuario) + return super(PaginaRegistro, self).form_valid(form) + + def get(self, *args, **kwargs): + if self.request.user.is_authenticated: + return redirect('tareas') + return super(PaginaRegistro, self).get(*args, **kwargs) + + +class ListaPendientes(LoginRequiredMixin, ListView): + model = Tarea + context_object_name = 'tareas' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['tareas'] = context['tareas'].filter(usuario=self.request.user) + context['count'] = context['tareas'].filter(completo=False).count() + + valor_buscado = self.request.GET.get('area-buscar') or '' + if valor_buscado: + context['tareas'] = context['tareas'].filter(titulo__icontains=valor_buscado) + context['valor_buscado'] = valor_buscado + return context + + +class DetalleTarea(LoginRequiredMixin, DetailView): + model = Tarea + context_object_name = 'tarea' + template_name = 'base/tarea.html' + + +class CrearTarea(LoginRequiredMixin, CreateView): + model = Tarea + fields = ['titulo', 'descripcion', 'completo'] + success_url = reverse_lazy('tareas') + + def form_valid(self, form): + form.instance.usuario = self.request.user + return super(CrearTarea, self).form_valid(form) + + +class EditarTarea(LoginRequiredMixin, UpdateView): + model = Tarea + fields = ['titulo', 'descripcion', 'completo'] + success_url = reverse_lazy('tareas') + + +class EliminarTarea(LoginRequiredMixin, DeleteView): + model = Tarea + context_object_name = 'tarea' + success_url = reverse_lazy('tareas') diff --git a/dia_16/web_Python_Total/src/proyecto/manage.py b/dia_16/web_Python_Total/src/proyecto/manage.py new file mode 100644 index 0000000..a8a82f5 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'proyecto.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/dia_16/web_Python_Total/src/proyecto/proyecto/__init__.py b/dia_16/web_Python_Total/src/proyecto/proyecto/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dia_16/web_Python_Total/src/proyecto/proyecto/asgi.py b/dia_16/web_Python_Total/src/proyecto/proyecto/asgi.py new file mode 100644 index 0000000..f00929b --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/proyecto/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for proyecto project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.1/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'proyecto.settings') + +application = get_asgi_application() diff --git a/dia_16/web_Python_Total/src/proyecto/proyecto/settings.py b/dia_16/web_Python_Total/src/proyecto/proyecto/settings.py new file mode 100644 index 0000000..1c09afd --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/proyecto/settings.py @@ -0,0 +1,125 @@ +""" +Django settings for proyecto project. + +Generated by 'django-admin startproject' using Django 4.1.5. + +For more information on this file, see +https://docs.djangoproject.com/en/4.1/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/4.1/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure--2@=j91puhc+fc(fbn%@-+_f%0c5df6-eh$-uvi25_6=_6ekd3' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'base.apps.BaseConfig', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'proyecto.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': ["C:\\Users\\Win10\\Desktop\\Mis_entornos\\mi_web\\src\\proyecto\\base\\templates"], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'proyecto.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/4.1/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/4.1/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/4.1/topics/i18n/ + +LANGUAGE_CODE = 'es-ar' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + +LOGIN_URL = 'login' + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/4.1/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/dia_16/web_Python_Total/src/proyecto/proyecto/urls.py b/dia_16/web_Python_Total/src/proyecto/proyecto/urls.py new file mode 100644 index 0000000..86d772e --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/proyecto/urls.py @@ -0,0 +1,22 @@ +"""proyecto URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/4.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('base.urls')), +] diff --git a/dia_16/web_Python_Total/src/proyecto/proyecto/wsgi.py b/dia_16/web_Python_Total/src/proyecto/proyecto/wsgi.py new file mode 100644 index 0000000..9296d25 --- /dev/null +++ b/dia_16/web_Python_Total/src/proyecto/proyecto/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for proyecto project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.1/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'proyecto.settings') + +application = get_wsgi_application()