Merge branch 'design_improvements' into Add_lineup_page
This commit is contained in:
@@ -1,15 +1,10 @@
|
|||||||
|
{% extends 'base.html' %}{% block title %} {{ title }} {% endblock %}{% block content %}
|
||||||
{% extends 'base.html' %}
|
|
||||||
|
|
||||||
{% block title %} {{ title }} {% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<h1>{{ title }}</h1>
|
<h1>{{ title }}</h1>
|
||||||
<ol class="list-group">
|
<ol class="list-group">
|
||||||
{% for event in events %}
|
{% for event in events %}
|
||||||
<li class="list-group-item">
|
<li class="list-group-item fs-6">
|
||||||
{{ event.away_team.name }} vs. {{ event.home_team.name }} <br>
|
<span class="fs-5 fw-bold" style="text-transform: uppercase">{{ event.away_team.name }} vs. {{ event.home_team.name }}</span> <br>
|
||||||
{{ event.start|date:"l, F j, Y g:i A" }} <br>
|
{{ event.start|date:"l, F j, Y g:i A" }} <br>
|
||||||
{{ event.venue.name }} <br>
|
{{ event.venue.name }} <br>
|
||||||
<a class="btn btn-primary btn-sm" href="{% url 'edit event' event.id%}" role="button">Edit Event Details</a>
|
<a class="btn btn-primary btn-sm" href="{% url 'edit event' event.id%}" role="button">Edit Event Details</a>
|
||||||
|
|||||||
@@ -10,7 +10,12 @@ def root(request):
|
|||||||
def list(request):
|
def list(request):
|
||||||
players = Player.objects.all()
|
players = Player.objects.all()
|
||||||
return render(request, 'list.html', {'title': "Players",
|
return render(request, 'list.html', {'title': "Players",
|
||||||
'items': [(player.id, f"{player.first_name} {player.last_name}") for player in players],
|
'items': [
|
||||||
|
{'id':player.id,
|
||||||
|
'title':f"{player.first_name} {player.last_name}",
|
||||||
|
'subtitle':f"{player.jersey_number}"
|
||||||
|
}
|
||||||
|
for player in players],
|
||||||
'edit_url_name': 'edit player'})
|
'edit_url_name': 'edit player'})
|
||||||
|
|
||||||
def edit(request, id=0):
|
def edit(request, id=0):
|
||||||
|
|||||||
@@ -8,7 +8,13 @@ def root(request):
|
|||||||
|
|
||||||
def list(request):
|
def list(request):
|
||||||
teams = Team.objects.all()
|
teams = Team.objects.all()
|
||||||
return render(request, 'list.html', {'title': "Teams", 'items': [(team.id, f"{team.name}") for team in teams], 'edit_url_name':'edit team'})
|
return render(request, 'list.html', {'title': "Players",
|
||||||
|
'items': [
|
||||||
|
{'id':team.id,
|
||||||
|
'title':f"{team.name}"
|
||||||
|
}
|
||||||
|
for team in teams],
|
||||||
|
'edit_url_name': 'edit team'})
|
||||||
|
|
||||||
def edit(request, id=0):
|
def edit(request, id=0):
|
||||||
# if this is a POST request we need to process the form data
|
# if this is a POST request we need to process the form data
|
||||||
|
|||||||
@@ -14,7 +14,8 @@
|
|||||||
<body class="bg-light">
|
<body class="bg-light">
|
||||||
|
|
||||||
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
|
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
|
||||||
<a class="navbar-brand" href="{% url 'home' %}">⚾️ Bench Coach</a>
|
<div class="container-fluid">
|
||||||
|
<a class="navbar-brand fw-bolder text-uppercase" href="{% url 'home' %}">⚾️ Bench Coach</a>
|
||||||
|
|
||||||
<div class="collapse navbar-collapse">
|
<div class="collapse navbar-collapse">
|
||||||
<ul class="navbar-nav mr-auto">
|
<ul class="navbar-nav mr-auto">
|
||||||
@@ -32,6 +33,7 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<main role="main" class="container">
|
<main role="main" class="container">
|
||||||
|
|||||||
@@ -7,8 +7,9 @@
|
|||||||
<ol class="list-group">
|
<ol class="list-group">
|
||||||
{% for item in items %}
|
{% for item in items %}
|
||||||
<li class="list-group-item">
|
<li class="list-group-item">
|
||||||
<h5>{{ item.1 }}</h5>
|
<span class="fs-5 fw-bold">{{ item.title }}</span> <span class="fs-6">{{ item.subtitle }}</span>
|
||||||
<a class="btn btn-primary btn-sm" href="{% url edit_url_name item.0%}" role="button">Edit</a>
|
<br>
|
||||||
|
<a class="btn btn-primary btn-sm" href="{% url edit_url_name item.id%}" role="button">Edit</a>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ol>
|
</ol>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
from django.shortcuts import render, redirect, get_object_or_404
|
from django.shortcuts import render, redirect, get_object_or_404
|
||||||
from django.http import HttpResponse
|
from django.http import HttpResponse, HttpResponseBadRequest
|
||||||
from .models import Venue
|
from .models import Venue
|
||||||
from .forms import VenueForm
|
from .forms import VenueForm
|
||||||
|
|
||||||
@@ -8,7 +8,13 @@ def root(request):
|
|||||||
|
|
||||||
def list(request):
|
def list(request):
|
||||||
venues = Venue.objects.all()
|
venues = Venue.objects.all()
|
||||||
return render(request, 'list.html', {'title': "Venues", 'items': [(venue.id, f"{venue.name}") for venue in venues], 'edit_url_name': 'edit venue'})
|
return render(request, 'list.html', {'title': "Venues",
|
||||||
|
'items': [
|
||||||
|
{'id':venue.id,
|
||||||
|
'title':f"{venue.name}"
|
||||||
|
}
|
||||||
|
for venue in venues],
|
||||||
|
'edit_url_name': 'edit venue'})
|
||||||
|
|
||||||
|
|
||||||
def edit(request, id=0):
|
def edit(request, id=0):
|
||||||
@@ -26,7 +32,8 @@ def edit(request, id=0):
|
|||||||
# ...
|
# ...
|
||||||
# redirect to a new URL:
|
# redirect to a new URL:
|
||||||
new_venue, did_create = Venue.objects.update_or_create(pk=id, defaults=form.cleaned_data)
|
new_venue, did_create = Venue.objects.update_or_create(pk=id, defaults=form.cleaned_data)
|
||||||
return render(request, 'success.html', {'call_back':'players list'})
|
return render(request, 'success.html', {'call_back':'players list','id':new_venue.id}, status=201 if did_create else 200)
|
||||||
|
return HttpResponseBadRequest()
|
||||||
|
|
||||||
# if a GET (or any other method) we'll create a blank form
|
# if a GET (or any other method) we'll create a blank form
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user