staxriver
/
padel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added header/footer and improved UI

Browse Source
v2
Laurent 3 years ago
parent 90c18edf05
commit fe15928374
6 changed files with 201 additions and 114 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      scores/migrations/0006_club_footer_club_header.py
  2. 2
      scores/models.py
  3. 40
      scores/static/scores/style.css
  4. 18
      scores/templates/scores/index.html
  5. 18
      scores/templates/scores/match.html
  6. 4
      scores/views.py

23
scores/migrations/0006_club_footer_club_header.py
Unescape View File

@ -0,0 +1,23 @@
# Generated by Django 4.1.1 on 2023-02-24 08:37
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('scores', '0005_match_team5'),
]
operations = [
migrations.AddField(
model_name='club',
name='footer',
field=models.CharField(blank=True, max_length=200),
),
migrations.AddField(
model_name='club',
name='header',
field=models.CharField(blank=True, max_length=200),
),
]

2
scores/models.py
Unescape View File

@ -3,6 +3,8 @@ from django.utils import timezone
class Club(models.Model): class Club(models.Model):
name = models.CharField(max_length=200) name = models.CharField(max_length=200)
header = models.CharField(max_length=200, blank=True)
footer = models.CharField(max_length=200, blank=True)
def __str__(self): def __str__(self):
return self.name return self.name

40
scores/static/scores/style.css
Unescape View File

@ -1,11 +1,36 @@
html { html, body {
/* font-size: 30px; /* px signifie 'pixels': la taille de base pour la police est désormais 10 pixels de haut */ /* font-size: 30px; /* px signifie 'pixels': la taille de base pour la police est désormais 10 pixels de haut */
/* font-family: 'Open Sans', sans-serif; /* cela devrait être le reste du résultat obtenu à partir de Google fonts */ /* font-family: 'Open Sans', sans-serif; /* cela devrait être le reste du résultat obtenu à partir de Google fonts */
font-family: Helvetica, sans-serif; font-family: Helvetica, sans-serif;
background-color: #3878D8; background-color: #3878D8;
color: white; color: white;
box-sizing: border-box;
height: 100%;
padding: 0;
margin: 0;
}
header, footer {
padding: 15px;
}
header {
font-size: 30px;
}
.page-body {
flex-grow: 1;
}
.wrapper {
box-sizing: border-box;
min-height: 100%;
display: flex;
flex-direction: column;
} }
a { a {
@ -13,7 +38,7 @@ a {
} }
table { table {
font-size: 30px; /* px signifie 'pixels': la taille de base pour la police est désormais 10 pixels de haut */ font-size: 30px;
font-weight: 600; font-weight: 600;
} }
@ -31,6 +56,10 @@ td {
padding: 10px; padding: 10px;
} }
.big {
font-size: 30px;
}
.score { .score {
width: 60px; width: 60px;
text-align: center; text-align: center;
@ -50,7 +79,7 @@ td {
} }
.smatch { .smatch {
padding-top: 100px; padding-top: 50px;
width: 800px; width: 800px;
margin: 0 auto; margin: 0 auto;
@ -67,7 +96,10 @@ td {
align-items: center; align-items: center;
} }
.page-footer {
flex-grow: 0;
flex-shrink: 0;
}
.container { .container {
/* width: 100%; */ /* width: 100%; */
/* text-align:center; */ /* text-align:center; */

18
scores/templates/scores/index.html
Unescape View File

@ -36,9 +36,16 @@ var x = setInterval(function() {
<head> <head>
<link rel="stylesheet" href="{% static 'scores/style.css' %}"> <link rel="stylesheet" href="{% static 'scores/style.css' %}">
<title>Padel</title> <title>Padel</title>
<!-- <meta http-equiv="refresh" content="5" > --> <meta http-equiv="refresh" content="15"/>
</head> </head>
<div class="wrapper">
{% if club.header %}
<header class="center">{{ club.header }}</header>
{% endif %}
<main class="page-body">
<div class="container"> <div class="container">
{% if matches %} {% if matches %}
@ -94,7 +101,7 @@ var x = setInterval(function() {
<!-- <p id="demo"></p> --> <!-- <p id="demo"></p> -->
<p>{{ match.duration }}</p> <p class="big">{{ match.duration }}</p>
</div> </div>
{% endfor %} {% endfor %}
@ -104,5 +111,12 @@ var x = setInterval(function() {
{% endif %} {% endif %}
</div> </div>
</main>
{% if club.footer %}
<footer class="page-footer, center">{{ club.footer }}</footer>
{% endif %}
</div>
</html> </html>

18
scores/templates/scores/match.html
Unescape View File

@ -36,11 +36,19 @@ var x = setInterval(function() {
<head> <head>
<link rel="stylesheet" href="{% static 'scores/style.css' %}"> <link rel="stylesheet" href="{% static 'scores/style.css' %}">
<title>Padel - {{ match.title }} - COURS {{ match.court }}</title> <title>Padel - {{ match.title }} - COURS {{ match.court }}</title>
<!-- <meta http-equiv="refresh" content="5" > --> <meta http-equiv="refresh" content="15"/>
</head> </head>
<!-- <p id="demo"></p> --> <!-- <p id="demo"></p> -->
<div class="wrapper">
{% if match.club.header %}
<header class="center">{{ match.club.header }}</header>
{% endif %}
<main class="page-body">
<div class="scontainer"> <div class="scontainer">
{% if match %} {% if match %}
<div class="smatch"> <div class="smatch">
@ -92,7 +100,7 @@ var x = setInterval(function() {
{% endif %} {% endif %}
<p>{{ match.duration }}</p> <p class="big">{{ match.duration }}</p>
</div> </div>
{% else %} {% else %}
@ -100,5 +108,11 @@ var x = setInterval(function() {
{% endif %} {% endif %}
</div> </div>
</main>
{% if match.club.footer %}
<footer class="page-footer, center">{{ match.club.footer }}</footer>
{% endif %}
</html> </html>

4
scores/views.py
Unescape View File

@ -2,15 +2,17 @@ from django.shortcuts import render, get_object_or_404
from django.http import HttpResponse from django.http import HttpResponse
from django.template import loader from django.template import loader
from django.contrib.auth.models import User from django.contrib.auth.models import User
from .models import Match from .models import Match, Club
from .serializers import UserSerializer, MatchSerializer from .serializers import UserSerializer, MatchSerializer
from rest_framework import viewsets from rest_framework import viewsets
from rest_framework import permissions from rest_framework import permissions
def index(request): def index(request):
club = Club.objects.first()
matches = Match.objects.order_by('court') matches = Match.objects.order_by('court')
template = loader.get_template('scores/index.html') template = loader.get_template('scores/index.html')
context = { context = {
'club': club,
'matches': matches, 'matches': matches,
} }
return HttpResponse(template.render(context, request)) return HttpResponse(template.render(context, request))

Write Preview
Loading…
Cancel
Save