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

cleanup broadcast html

Browse Source
clubs
Laurent 1 year ago
parent 925f5d0208
commit 78c41da1d0
8 changed files with 95 additions and 164 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. 3
      tournaments/models/match.py
  2. 4
      tournaments/models/tournament.py
  3. 49
      tournaments/static/tournaments/css/style.css
  4. 24
      tournaments/templates/tournaments/broadcast_base.html
  5. 9
      tournaments/templates/tournaments/broadcasted_group_stage.html
  6. 30
      tournaments/templates/tournaments/broadcasted_group_stages.html
  7. 12
      tournaments/templates/tournaments/broadcasted_match.html
  8. 104
      tournaments/templates/tournaments/broadcasted_matches.html

3
tournaments/models/match.py
Unescape View File

@ -34,7 +34,10 @@ class Match(models.Model):
return self.group_stage.tournament
def court_name(self, index):
club = None
if self.tournament().event:
club = self.tournament().event.club
if club:
return club.court_name(index)
elif index is not None:

4
tournaments/models/tournament.py
Unescape View File

@ -131,7 +131,10 @@ class Tournament(models.Model):
return None
def name_and_event(self):
event_name = None
if self.event:
event_name = self.event.name
if event_name and self.name:
return event_name + " : " + self.name
elif event_name:
@ -141,7 +144,6 @@ class Tournament(models.Model):
else:
return None
def team_summons(self):
summons = []
for team_registration in self.teamregistration_set.all():

49
tournaments/static/tournaments/css/style.css
Unescape View File

@ -31,6 +31,7 @@ body {
label {
color: #707070;
font-size: 1.1em;
}
h1 {
@ -80,11 +81,6 @@ nav a {
font-weight: 600;
} */
.container {
/* width: 100%; */
/* text-align:center; */
}
.wrapper {
margin: 0px 10px;
}
@ -116,10 +112,6 @@ table {
font-size: 1.1em;
}
label {
font-size: 1.1em;
}
td {
padding: 3px 0px;
}
@ -286,6 +278,14 @@ svg {
border-radius: 16px;
}
.padding {
padding: 100px;
}
h-margin {
margin: 100px;
}
.bubble {
padding: 20px;
background-color: white;
@ -312,6 +312,10 @@ svg {
/* width: 25%; */
}
.fit {
width: fit-content;
}
.inline {
display: inline-block;
/* box-sizing: border-box; */
@ -543,6 +547,14 @@ svg {
padding: 5px 0px;
}
.table-row-2-column-header {
display: grid;
grid-template-columns: auto 1fr;
align-items: center;
/* Vertically center the content within each column */
padding: 5px 0px;
}
.table-row-2-colums {
display: grid;
grid-template-columns: 2fr 60px;
@ -690,3 +702,22 @@ screen and (min-width: 80em) {
vertical-align: middle;
padding: 5px 0px;
}
#header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20px 40px;
}
.left-content {
display: flex;
align-items: center;
}
.right-content {
margin-left: auto;
}

24
tournaments/templates/tournaments/broadcast_base.html
Unescape View File

@ -13,30 +13,22 @@
</head>
<body>
<div class="wrapper">
<header>
<div class="grid-x">
<div class="cell medium-6 large-6 topblock my-block">
<div class="bubble">
<img
src="{% static 'tournaments/images/PadelClub_logo_512.png' %}"
class="logo inline"
/>
<div class="inline">
<div id="header">
<div class="left-content bubble">
<img src="{% static 'tournaments/images/PadelClub_logo_512.png' %}" alt="logo" class="logo left-image">
<div>
<h1 class="club">{% block first_title %}Page Title{% endblock %}</h1>
<h1 class="event">{% block second_title %}Page Title{% endblock %}</h1>
<!-- <span>Propulsé par Padel Club</span> -->
</div>
</div>
</div>
<div class="cell medium-6 large-6 topblock my-block">
<div class="alignright">
{% qr_from_text qr_code_url options=qr_code_options %}
</div>
</div>
<div class="right-content">{% qr_from_text qr_code_url options=qr_code_options %}</div>
</div>
</header>
<div class="wrapper">
<main>
<!-- Content -->
{% block content %}

9
tournaments/templates/tournaments/broadcasted_group_stage.html
Unescape View File

@ -12,7 +12,10 @@
<div class="flex-left">
<template x-for="name in group_stage.teams[i-1].names">
<div class="semibold" x-data="{
<div class="bold" :class="group_stage.teams[i-1].is_winner ? 'winner' : ''" x-text="name"></div>
<!-- <div class="semibold" x-data="{
showName(name, team) {
let html = `<span class='`
if (team.is_winner) html += `winner`
@ -22,7 +25,7 @@
return html
},
}" x-html="showName(name, group_stage.teams[i-1])">
</div>
</div> -->
</template>
</div>
@ -50,7 +53,7 @@
</template>
<div class="top-margin flex-row">
<label class="left-label minor-info"><span class="beige" x-text="group_stage.duration"></span></label>
<label class="left-label minor-info semibold"><span class="beige" x-text="group_stage.duration"></span></label>
<!-- <label class="right-label minor-info"><span x-text="group_stage.court"></span></label> -->
</div>

30
tournaments/templates/tournaments/broadcasted_group_stages.html
Unescape View File

@ -44,30 +44,22 @@
}" x-init="loop()">
<div class="wrapper">
<main class="page-body">
<div class="container">
<div class="grid-x">
<div class="cell medium-6 large-6 topblock my-block">
<div class="bubble">
<img
src="{% static 'tournaments/images/PadelClub_logo_512.png' %}"
class="logo inline"
/>
<div class="inline">
<header>
<div id="header">
<div class="left-content bubble">
<img src="{% static 'tournaments/images/PadelClub_logo_512.png' %}" alt="logo" class="logo left-image">
<div>
<h1 class="club">{{ tournament.display_name }}</h1>
<h1 class="event">Poules</h1>
<!-- <span>Propulsé par Padel Club</span> -->
</div>
</div>
</div>
<div class="cell medium-6 large-6 topblock my-block">
<div class="alignright">
{% qr_from_text qr_code_url options=qr_code_options %}
</div>
</div>
<div class="right-content">{% qr_from_text qr_code_url options=qr_code_options %}</div>
</div>
</header>
<div class="wrapper">
<main class="page-body">
<div class="container">
<div class="grid-x padding-bottom">

12
tournaments/templates/tournaments/broadcasted_match.html
Unescape View File

@ -20,17 +20,7 @@
<div class="scores">
<template x-for="score in match.teams[i-1].scores">
<span x-data="{
showScore(score, team) {
let html = `<span class='score bold w30px`
if (team.is_winner) html += ` winner`
html += `'>`
html += score
html += `</span>`
return html
},
}" x-html="showScore(score, match.teams[i-1])">
</span>
<span class="score bold w30px" :class="match.teams[i-1].is_winner ? 'winner' : ''" x-text="score"></span>
</template>

104
tournaments/templates/tournaments/broadcasted_matches.html
Unescape View File

@ -42,29 +42,23 @@
}
}" x-init="loop()">
<div class="wrapper">
<main>
<div class="grid-x">
<div class="cell medium-6 large-6 topblock my-block">
<div class="bubble">
<img
src="{% static 'tournaments/images/PadelClub_logo_512.png' %}"
class="logo inline"
/>
<div class="inline">
<header>
<div id="header">
<div class="left-content bubble">
<img src="{% static 'tournaments/images/PadelClub_logo_512.png' %}" alt="logo" class="logo left-image">
<div>
<h1 class="club">{{ tournament.display_name }}</h1>
<h1 class="event">Matchs</h1>
<!-- <span>Propulsé par Padel Club</span> -->
</div>
</div>
</div>
<div class="cell medium-6 large-6 topblock my-block">
<div class="alignright">
{% qr_from_text qr_code_url options=qr_code_options %}
</div>
</div>
<div class="right-content">{% qr_from_text qr_code_url options=qr_code_options %}</div>
</div>
</header>
<div class="wrapper">
<main>
<div class="grid-x padding-bottom">
@ -75,82 +69,6 @@
{% include 'tournaments/broadcasted_match.html' %}
<!-- <div class="bubble">
<div class="flex-row">
<label class="left-label matchtitle"><span x-text="match.title"></span></label>
</div>
<template x-for="i in match.teams.length">
<div>
<div class="match-result">
<div class="player">
<template x-for="name in match.teams[i-1].names">
<div class="ws" x-data="{
showName(name, team) {
let html = `<span class='`
if (team.is_winner) html += `winner`
html += `'>`
html += name
html += `</span>`
return html
},
}" x-html="showName(name, match.teams[i-1])">
</div>
</template>
</div>
<div class="scores">
<template x-for="score in match.teams[i-1].scores">
<span x-data="{
showScore(score, team) {
let html = `<span class='score ws w30px`
if (team.is_winner) html += ` winner`
html += `'>`
html += score
html += `</span>`
return html
},
}" x-html="showScore(score, match.teams[i-1])">
</span>
</template>
<span x-data="{
showWalkOut(match, team) {
let html = ``
if (match.has_walk_out) {
html += `<span class='score ws w60px'>`
if (team.walk_out) html += `WO`
html += `</span>`
}
return html
},
}" x-html="showWalkOut(match, match.teams[i-1])">
</span>
</div>
</div>
<div x-show="i === 1">
<div class="bottom-border"></div>
</div>
</div>
</template>
<div class="top-margin flex-row">
<label class="left-label minor-info bold"><span x-text="match.duration"></span></label>
<label class="right-label minor-info semibold"><span x-text="match.court"></span></label>
</div>
</div> -->
</div>
</template>

Write Preview
Loading…
Cancel
Save