From b7012b77dfdd631cf16f2bc715eeb59dc2fdb4de Mon Sep 17 00:00:00 2001 From: Tony Date: Sun, 7 Nov 2021 15:11:09 -0600 Subject: [PATCH] refactor for less duplication refactored to use a common 'list.html' refactored to allow some modularization (using blocks) --- benchcoach/urls.py | 2 +- events/templates/events/schedule.html | 20 +++++--- events/views.py | 2 +- teams/templates/teams/list.html | 13 ----- teams/views.py | 2 +- templates/home.html | 20 +++----- templates/navbar.html | 73 --------------------------- venues/views.py | 2 +- 8 files changed, 23 insertions(+), 111 deletions(-) delete mode 100644 teams/templates/teams/list.html delete mode 100644 templates/navbar.html diff --git a/benchcoach/urls.py b/benchcoach/urls.py index 2a98129..7ef45f9 100644 --- a/benchcoach/urls.py +++ b/benchcoach/urls.py @@ -21,7 +21,7 @@ from django.conf import settings from .views import welcome urlpatterns = [ - path('', welcome), + path('', welcome, name="home"), path('admin/', admin.site.urls), path('events/', include('events.urls')), path('teams/', include('teams.urls')), diff --git a/events/templates/events/schedule.html b/events/templates/events/schedule.html index b4cbd40..8c64b04 100644 --- a/events/templates/events/schedule.html +++ b/events/templates/events/schedule.html @@ -1,15 +1,19 @@ -{% load bootstrap5 %} -{% bootstrap_css %} -{% bootstrap_javascript %} -Schedule -

Schedule

-
    +{% extends 'base.html' %} + +{% block title %} {{ title }} {% endblock %} + +{% block content %} + +

    {{ title }}

    +
      {% for event in events %} -
    1. +
    2. {{ event.away_team.name }} vs. {{ event.home_team.name }}
      {{ event.start|date:"l, F j, Y g:i A" }}
      {{ event.venue.name }}
      3. {% endfor %} -
    \ No newline at end of file +
+ +{% endblock %} \ No newline at end of file diff --git a/events/views.py b/events/views.py index 82ee6d1..dfc2e6e 100644 --- a/events/views.py +++ b/events/views.py @@ -6,4 +6,4 @@ def root(request): def schedule(request): events = Event.objects.all() - return render(request, 'events/schedule.html', {'events': events}) \ No newline at end of file + return render(request, 'events/schedule.html', {'title':'Schedule', 'events': events}) \ No newline at end of file diff --git a/teams/templates/teams/list.html b/teams/templates/teams/list.html deleted file mode 100644 index 554d9df..0000000 --- a/teams/templates/teams/list.html +++ /dev/null @@ -1,13 +0,0 @@ -{% load bootstrap5 %} -{% bootstrap_css %} -{% bootstrap_javascript %} - -Teams -

Teams

-
    -{% for team in teams %} -
  1. - {{ team.name }} -
    2. -{% endfor %} -
\ No newline at end of file diff --git a/teams/views.py b/teams/views.py index 9714407..63321a5 100644 --- a/teams/views.py +++ b/teams/views.py @@ -6,4 +6,4 @@ def root(request): def list(request): teams = Team.objects.all() - return render(request, 'teams/list.html', {'teams': teams}) \ No newline at end of file + return render(request, 'list.html', {'title': "Teams", 'items': [f"{team.name}" for team in teams]}) \ No newline at end of file diff --git a/templates/home.html b/templates/home.html index e58fc35..8d4d55e 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,17 +1,11 @@ - - - - {% load bootstrap5 %} -{% bootstrap_css %} -{% bootstrap_javascript %} - - Bench Coach - -

Bench Coach

+{% extends "base.html" %} + +{% block title %}Bench Coach Home{% endblock %} + +{% block content %} + {% for page in pages %}
  • {{ page }}
    • {% endfor %} - - - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/templates/navbar.html b/templates/navbar.html deleted file mode 100644 index c7f6cbe..0000000 --- a/templates/navbar.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/venues/views.py b/venues/views.py index 34d5f97..47eeecf 100644 --- a/venues/views.py +++ b/venues/views.py @@ -6,4 +6,4 @@ def root(request): def list(request): venues = Venue.objects.all() - return render(request, 'venues/list.html', {'venues': venues}) \ No newline at end of file + return render(request, 'list.html', {'title': "Venues", 'items': [f"{venue.name}" for venue in venues]}) \ No newline at end of file