valentin
/
colles.mp2i-vms.fr
46
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: valentin:872f2378446ae405164ff8b58430a51b64d6e6f2
Branches Tags
valentin:main
valentin:dev
..
compare: valentin:21ef5140f0342d67530487818cbfedec3d7a0d16
Branches Tags
valentin:dev
valentin:main

No commits in common. "872f2378446ae405164ff8b58430a51b64d6e6f2" and "21ef5140f0342d67530487818cbfedec3d7a0d16" have entirely different histories.
872f237844 ... 21ef5140f0

8 changed files with 38 additions and 142 deletions
Show Stats Expand all files Collapse all files

2
colloscope/templates/marketplace.html
View File

@ -6,6 +6,8 @@
{% block title %}Marketplace{% endblock title %}
{% block main %}
<a href="{% url "colloscope.dashboard" %}">Retour au tableau de bord</a>
<h1>Marketplace</h1>
Bienvenue sur le marketplace.

6
colloscope/templates/select_profile.html
View File

@ -2,9 +2,11 @@
{% block title %}Sélection du profil{% endblock title %}
{% block main %}
{% block header %}
<h1>Sélection du profil</h1>
{% endblock header %}
{% block main %}
Vous êtes connecté. Votre compte correspond à deux profils :
<ul>

6
colloscope/templates/table.html
View File

@ -9,8 +9,12 @@
<link href="{% static 'table.css' %}" rel="stylesheet" type="text/css">
{% endblock head %}
{% block main %}
{% block header %}
<h1>Colloscope</h1>
{% endblock header %}
{% block main %}
<p>
Lycée : {{ term.cls.school.description }}. Classe : {{ term.cls.description }}. <a href="dashboard.html">Retour au tableau de bord</a>

6
colloscope/templates/unbound_profile.html
View File

@ -2,9 +2,11 @@
{% block title %}Sélection du profil{% endblock title %}
{% block main %}
{% block header %}
<h1>Sélection du profil</h1>
{% endblock header %}
{% block main %}
Vous êtes connecté, mais votre compte n'est associé à aucun profil. Veuillez contacter le webmestre à l'adresse <a href="mailto:valentin@mp2i-vms.fr">valentin@mp2i-vms.fr</a>.

2
colloscope/viewsets.py
View File

@ -78,7 +78,7 @@ class SlotViewset(ReadOnlyModelViewSet):
return Slot.objects.all()
class ColleViewset(ModelViewSet):
class ColleViewset(ReadOnlyModelViewSet):
serializer_class = ColleSerializer
permission_classes = [IsAuthenticated]

72
static/main.css
View File

@ -4,6 +4,7 @@
body {
font-family: sans-serif;
background-color: #fafafa;
margin: 0;
}
@ -35,49 +36,6 @@ header .bandeau button:active {
background-color: darkgoldenrod;
}
.navbar {
background-color: #eee;
display: flex;
flex-direction: column;
}
.navbar .block {
display: flex;
flex-direction: column;
text-align: center;
}
@media screen and (min-width: 400px)
{
.navbar {
padding: 0 10px;
flex-direction: row;
justify-content: space-between;
}
.navbar .block {
flex-direction: row;
gap: 0 10px;
}
}
.navbar a:link, .navbar a:visited {
color: black;
text-decoration: none;
}
.navbar .link {
background: none;
border: none;
font: inherit;
padding: 10px;
cursor: pointer;
}
.navbar .link:hover {
background-color: #ddd;
}
main {
margin: 20px auto;
width: clamp(350px, 60%, 1200px);
@ -89,34 +47,6 @@ h1 {
text-align: center;
}
form.login table {
margin: auto;
}
form.login input[type=text], form.login input[type=password] {
padding: 5px;
border: none;
background-color: #eee;
}
form.login button {
border: none;
padding: 10px;
background-color: dodgerblue;
border-radius: 5px;
color: white;
display: block;
margin: 15px auto;
}
form.login button:hover {
background-color: #0483ff;
}
form.login button:active {
background-color: #0077ea;
}
nav.semaine {
width: 100%;
display: flex;

75
templates/base.html
View File

@ -5,73 +5,28 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% block title %}{% endblock title %}</title>
<link href="{% static 'unified-navigator/navigator.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'main.css' %}" rel="stylesheet" type="text/css">
<script src="https://kit.fontawesome.com/0fd87250ec.js" crossorigin="anonymous"></script>
{% block head %}{% endblock head %}
</head>
<body>
<header>
<script>
function navigator_toggleMenu() {
if (document.body.clientWidth > 600)
return document.location = "https://mp2i-vms.fr"
if (document.getElementById("menu-sec").classList.contains("hidden")) {
document.getElementById("menu-sec").classList.remove("hidden");
document.getElementById("navigator-dropdown-indicator").className = "fa-solid fa-caret-up";
} else {
document.getElementById("menu-sec").classList.add("hidden");
document.getElementById("navigator-dropdown-indicator").className = "fa-solid fa-caret-down";
}
}
</script>
<div class="unified_navigator">
<div class="nav-container">
<div class="logo-wrapper" onclick="navigator_toggleMenu();">
<a class="logo">
<img src="{% static 'unified-navigator/icon.png' %}" alt="logo"><strong>mp2i-vms.fr</strong>
</a>
<i id="navigator-dropdown-indicator" class="fa-solid fa-caret-down"></i>
</div>
<div class="menu-wrapper hidden" id="menu-sec">
<div class="link"><a href="https://mp2i-vms.fr/pages.html"><i class="fa-solid fa-house"></i> Pages personnelles</a></div>
<div class="link"><a href="https://git.mp2i-vms.fr"><i class="fa-brands fa-git-alt"></i> Git</a></div>
<div class="link"><a href="https://play.mp2i-vms.fr"><i class="fa-solid fa-cubes"></i> Minecraft</a></div>
<div class="link"><a href="{% url "home" %}"><i class="fa-solid fa-book"></i> Colles</a></div>
</div>
</div>
</div>
<div class="navbar">
<div class="block">
{% if request.user.is_authenticated %}
<a href="{% url "colloscope.dashboard" %}">
<div class="link"><i class="fa-solid fa-rocket"></i> Tableau de bord</div>
</a>
<a href="{% url "colloscope.table" %}">
<div class="link"><i class="fa-solid fa-calendar"></i> Colloscope</div>
</a>
<a href="{% url "colloscope.marketplace" %}">
<div class="link"><i class="fa-solid fa-shop"></i> Marketplace</div>
</a>
{% endif %}
</div>
<div class="block">
{% if request.user.is_authenticated %}
<form action="{% url 'logout' %}" method="post">
{% csrf_token %}
<button class="link" type="submit" href="{% url "login" %}">
<i class="fa-solid fa-right-from-bracket"></i> Se déconnecter
</button>
</form>
{% else %}
<a href="{% url "login" %}">
<div class="link right"><i class="fa-solid fa-right-from-bracket"></i> Se connecter</div>
</a>
{% endif %}
</div>
{% if request.user.is_authenticated %}
<div class="bandeau">
Vous êtes connecté avec le compte <b>{{ user.username }}</b>.
{% if request.session.profile == "student" %}
Profil actuel : étudiant.
{% elif request.session.profile == "colleur" %}
Profil actuel : colleur.
{% else %}
Pas de profil.
{% endif %}
<form action="{% url 'logout' %}" method="post">
{% csrf_token %}
<button type="submit">Se déconnecter</button>
</form>
</div>
{% endif %}
{% block header %}{% endblock header %}
</header>

5
templates/registration/login.html
View File

@ -19,7 +19,7 @@
{% endif %}
{% endif %}
<form class="login" method="post" action="{% url 'login' %}">
<form method="post" action="{% url 'login' %}">
{% csrf_token %}
<table>
<tr>
@ -31,7 +31,8 @@
<td>{{ form.password }}</td>
</tr>
</table>
<button type="submit">Se connecter</button>
<input type="submit" value="Se connecter">
<input type="hidden" name="next" value="{{ next }}">
</form>