Merge branch 'demo' into devel

This commit is contained in:
theo@manjaro 2024-03-20 19:58:18 +01:00
commit 057285717b
4 changed files with 121 additions and 2 deletions

7
app.py
View File

@ -412,7 +412,12 @@ def free_rooms(api = False, rq = None) :
return response
else :
url_for("static", filename="style.css")
return render_template("free-rooms.html", **context, **GLOBAL_CONTEXT)
# Vérifie si le mode billboard est demandé :
billboard = str(rq.args.get("billboard"))
if billboard in ("1", "true", "True") :
return render_template("billboard.html", **context, **GLOBAL_CONTEXT)
else:
return render_template("free-rooms.html", **context, **GLOBAL_CONTEXT)
@app.route("/app/date-select", methods=["POST", "GET"])
def date_select() :

62
static/billboardstyle.css Normal file
View File

@ -0,0 +1,62 @@
:root {
--bg: #ffffff;
--bg-dark: #303355;
--fg: #303355;
--special: #c09f80;
}
main {
display: grid;
grid-template-rows: 2fr 1fr 5fr 1fr;
}
body {
background: var(--bg);
color: var(--fg);
font-family: "ubuntu", sans-serif;
font-size: 200%;
margin: 0px;
}
h1, h2 {
text-align: center;
}
h2 {
font-size: 90%;
font-weight: normal;
}
.slider {
overflow: hidden;
}
.slide-track {
display: flex;
flex-wrap: wrap;
gap: 50px;
animation: scroll 40s linear infinite;
width: 750%; /* Pas bô, mais on va faire avec en attendant... */
}
.room {
text-align: center;
background: var(--bg-dark);
border-style: solid;
border-width: 1px;
border-color: var(--bg-dark);
border-radius: 10px;
padding: 10px;
color: var(--bg);
}
@keyframes scroll {
0% { transform: translateX(0); }
100% { transform: translateX(calc(-250px * 7)); }
}
footer {
margin-top: 10px;
font-size: 50%;
text-align: center;
}

52
templates/billboard.html Normal file
View File

@ -0,0 +1,52 @@
<!DOCTYPE html>
<html lang="">
<head>
<meta charset="utf-8">
<title>UniSquat</title>
<link rel="stylesheet" type="text/css" href="../static/billboardstyle.css">
<meta name="viewport" content="width=300, initial-scale=1" />
</head>
<body>
<main>
<h1><b>Salles disponibles</b></h1>
<h2>{{ depts_str }}</h2>
<div class="slider">
<div class="slide-track">
{% if favs: %}
<!-- Afficher les favoris -->
<!-- Deux fois pour que l'animation boucle -->
{% for i in range(2) : %}
{% if favs_free_rooms|length > 0 : %}
{% for room in favs_free_rooms : %}
<div class="room">
<b>{{ room.name }}</b> {% if DEBUG :%}( {{ room.id }} ){% endif %}
{% if not(room.noend) : %}
<p class=details>Jusqu'à {{ frooms_disp[room.name]["end"] }}</p>
{% endif %}
</div>
{% endfor %}
{% endif %}
{% endfor %}
{% else %}
<!-- Si les favoris ne sont pas définis, afficher les salles classiques -->
{% for i in range(2):%}
{% if free_rooms|length>0 %}
{% for room in free_rooms: %}
<div class="room">
<b>{{ room.name }}</b> {% if DEBUG : %}( {{ room.id }} ){% endif %}
{% if not room.noend : %}
<p class=details>Jusqu'à {{ frooms_disp[room.name]["end"] }}</p>
{% endif %}
</div>
{% endfor %}
{% endif %}
{% endfor %}
{% endif %}
</div>
</div>
<footer>
Propulsé par UniSquat : <a href="https://unisquat.alwaysdata.net">https://unisquat.alwaysdata.net</a>
</footer>
</main>
</body>
</html>

View File

@ -34,7 +34,7 @@
</div>
{% if favs: %}
<div class="flex-pc">
{% if favs_free_rooms|length>0: %}
{% if favs_free_rooms|length > 0 : %}
<div class="room-column">
<br>
<h1>Favoris disponibles maintenant</h1>