diff --git a/JugarAlPadel/gestion_reservas/db.sqlite3 b/JugarAlPadel/gestion_reservas/db.sqlite3 index 42a7b85..106c0fe 100644 Binary files a/JugarAlPadel/gestion_reservas/db.sqlite3 and b/JugarAlPadel/gestion_reservas/db.sqlite3 differ diff --git a/JugarAlPadel/gestion_reservas/eventos/templates/eventos/index.html b/JugarAlPadel/gestion_reservas/eventos/templates/eventos/index.html deleted file mode 100644 index b8b4a4e..0000000 --- a/JugarAlPadel/gestion_reservas/eventos/templates/eventos/index.html +++ /dev/null @@ -1 +0,0 @@ -hola \ No newline at end of file diff --git a/JugarAlPadel/gestion_reservas/eventos/templates/eventos/lista_eventos.html b/JugarAlPadel/gestion_reservas/eventos/templates/eventos/lista_eventos.html deleted file mode 100644 index 37ddc2f..0000000 --- a/JugarAlPadel/gestion_reservas/eventos/templates/eventos/lista_eventos.html +++ /dev/null @@ -1,7 +0,0 @@ -{% for evento in eventos %} -

{{ evento.nombre }}

-

{{ evento.descripcion }}

-

Fecha: {{ evento.fecha }}

-

Plazas restantes: {{ evento.plazas_restantes }}

- Reservar -{% endfor %} diff --git a/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py b/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py index d5f058f..6846c83 100644 --- a/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py +++ b/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py @@ -126,6 +126,7 @@ L10N = True DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' + # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/5.1/howto/static-files/ @@ -143,12 +144,6 @@ LOGOUT_REDIRECT_URL = 'principal' AUTH_USER_MODEL = "reymotausers.ReyMotaUser" -AACCOUNT_AUTHENTICATION_METHOD = 'email' -ACCOUNT_EMAIL_REQUIRED = True -ACCOUNT_UNIQUE_EMAIL = True -ACCOUNT_USER_MODEL_USERNAME_FIELD = None -ACCOUNT_USERNAME_REQUIRED = False - MEDIA_ROOT = BASE_DIR / "mediafiles" MEDIA_URL = '/media/' @@ -156,4 +151,3 @@ if DEBUG is False: CSRF_TRUSTED_ORIGINS = os.environ.get("CSRF_TRUSTED_ORIGINS").split(" ") CSRF_TRUSTED_ORIGINS = os.environ.get("CSRF_TRUSTED_ORIGINS").split(" ") - diff --git a/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py b/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py index cb4a529..7d1aa9c 100644 --- a/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py +++ b/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py @@ -16,9 +16,19 @@ Including another URLconf """ from django.contrib import admin from django.urls import path, include +from django.conf.urls.static import static +from django.conf import settings +from django.views.generic.base import TemplateView # new urlpatterns = [ path('obreros/', admin.site.urls), - path("", include('eventos.urls')), # new -] + + path("eventos/", include('eventos.urls')), + + path("accounts/", include("accounts.urls")), # new + path("accounts/", include("django.contrib.auth.urls")), + + path("", TemplateView.as_view(template_name="index.html"), + name="principal"), # new +] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw.jpg b/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw.jpg deleted file mode 100644 index 88723ad..0000000 Binary files a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw.jpg and /dev/null differ diff --git a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw.png b/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw.png deleted file mode 100644 index e6e2c25..0000000 Binary files a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw.png and /dev/null differ diff --git a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_PMjCK7Q.png b/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_PMjCK7Q.png deleted file mode 100644 index e6e2c25..0000000 Binary files a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_PMjCK7Q.png and /dev/null differ diff --git a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_cSbhRuf.png b/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_cSbhRuf.png deleted file mode 100644 index e6e2c25..0000000 Binary files a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_cSbhRuf.png and /dev/null differ diff --git a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_x00n9W7.png b/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_x00n9W7.png deleted file mode 100644 index e6e2c25..0000000 Binary files a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_x00n9W7.png and /dev/null differ diff --git a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_yVyuq4g.jpg b/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_yVyuq4g.jpg deleted file mode 100644 index 88723ad..0000000 Binary files a/JugarAlPadel/gestion_reservas/mediafiles/vehiculos/bmw_yVyuq4g.jpg and /dev/null differ diff --git a/JugarAlPadel/gestion_reservas/templates/_branding.html b/JugarAlPadel/gestion_reservas/templates/_branding.html index 29ce214..752a075 100644 --- a/JugarAlPadel/gestion_reservas/templates/_branding.html +++ b/JugarAlPadel/gestion_reservas/templates/_branding.html @@ -3,6 +3,6 @@ {% load filtros_de_entorno %}
- +
diff --git a/JugarAlPadel/gestion_reservas/templates/base.html b/JugarAlPadel/gestion_reservas/templates/base.html index dfba4e8..3a487bd 100644 --- a/JugarAlPadel/gestion_reservas/templates/base.html +++ b/JugarAlPadel/gestion_reservas/templates/base.html @@ -106,9 +106,7 @@ diff --git a/JugarAlPadel/gestion_reservas/templates/index.html b/JugarAlPadel/gestion_reservas/templates/index.html index dae2a76..f694ddc 100644 --- a/JugarAlPadel/gestion_reservas/templates/index.html +++ b/JugarAlPadel/gestion_reservas/templates/index.html @@ -9,7 +9,7 @@