almet/la-chariotte
1
0
Fork 0
mirror of https://framagit.org/la-chariotte/la-chariotte.git synced 2025-05-01 19:32:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

static-root in settings

Browse source
This commit is contained in:
Laetitia Getti 2023-04-27 17:10:43 +02:00
parent 6264786229
commit a1c118790c
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -2,4 +2,6 @@ __pycache__/
coverage.xml coverage.xml
.coverage .coverage
la_chariotte.egg-info/ la_chariotte.egg-info/
node_modules node_modules
/static/*
/media/*

6
la_chariotte/order/templates/order/index.html
View file

@ -24,7 +24,7 @@
<td>{{ gr_order.delivery_date }}</td> <td>{{ gr_order.delivery_date }}</td>
<td>{{ gr_order.deadline }}</td> <td>{{ gr_order.deadline }}</td>
<td>Nb de commandes</td> <td>Nb de commandes</td>
<td><a href="{% url 'order:grouped_order_detail' gr_order.id %}">Détail </a><a href="{% url 'order:grouped_order_orga' gr_order.id %}">Organisation</a></td> <td><a href="{% url 'order:grouped_order_detail' gr_order.id %}">Détail </a><a href="{% url 'order:grouped_order_overview' gr_order.id %}">Organisation</a></td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
@ -49,7 +49,7 @@
<td>{{ gr_order.delivery_date }}</td> <td>{{ gr_order.delivery_date }}</td>
<td>{{ gr_order.deadline }}</td> <td>{{ gr_order.deadline }}</td>
<td>Nb de commandes</td> <td>Nb de commandes</td>
<td><a href="{% url 'order:grouped_order_detail' gr_order.id %}">Détail </a><a href="{% url 'order:grouped_order_orga' gr_order.id %}">Organisation</a></td> <td><a href="{% url 'order:grouped_order_detail' gr_order.id %}">Détail </a><a href="{% url 'order:grouped_order_overview' gr_order.id %}">Organisation</a></td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
@ -74,7 +74,7 @@
<td>{{ gr_order.delivery_date }}</td> <td>{{ gr_order.delivery_date }}</td>
<td>{{ gr_order.deadline }}</td> <td>{{ gr_order.deadline }}</td>
<td>Nb de commandes</td> <td>Nb de commandes</td>
<td><a href="{% url 'order:grouped_order_detail' gr_order.id %}">Détail </a><a href="{% url 'order:grouped_order_orga' gr_order.id %}">Organisation</a></td> <td><a href="{% url 'order:grouped_order_detail' gr_order.id %}">Détail </a><a href="{% url 'order:grouped_order_overview' gr_order.id %}">Organisation</a></td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>

5
la_chariotte/settings.py
View file

@ -132,6 +132,11 @@ USE_TZ = True
STATIC_URL = "static/" STATIC_URL = "static/"
STATICFILES_DIRS = ["la_chariotte/static"] STATICFILES_DIRS = ["la_chariotte/static"]
STATIC_ROOT = os.getenv("STATIC_ROOT", BASE_DIR / "static")
MEDIA_URL = "/media/"
MEDIA_ROOT = os.getenv("MEDIA_ROOT", BASE_DIR / "media")
# Default primary key field type # Default primary key field type
# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field

8
la_chariotte/templates/base.html
View file

@ -25,14 +25,14 @@
<div class="navbar-item"> <div class="navbar-item">
<div class="buttons"> <div class="buttons">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<a class="button is-light" href="{% url 'logout' %}"> <a class="button is-light" href="{% url 'accounts:logout' %}">
Se déconnecter Se déconnecter
</a> </a>
{% else %} {% else %}
<a class="button is-light" href="{% url 'accounts:signup' %}"> <a class="button is-light" href="{% url 'accounts:signup' %}">
<strong>Créer un compte</strong> <strong>Créer un compte</strong>
</a> </a>
<a class="button is-primary" href="{% url 'login' %}"> <a class="button is-primary" href="{% url 'accounts:login' %}">
Se connecter Se connecter
</a> </a>
{% endif %} {% endif %}
@ -87,14 +87,14 @@
<div class="navbar-item desktop-hidden"> <div class="navbar-item desktop-hidden">
<div class="buttons"> <div class="buttons">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<a class="button is-light" href="{% url 'logout' %}"> <a class="button is-light" href="{% url 'accounts:logout' %}">
Se déconnecter Se déconnecter
</a> </a>
{% else %} {% else %}
<a class="button is-light" href="{% url 'accounts:signup' %}"> <a class="button is-light" href="{% url 'accounts:signup' %}">
<strong>Créer un compte</strong> <strong>Créer un compte</strong>
</a> </a>
<a class="button is-primary" href="{% url 'login' %}"> <a class="button is-primary" href="{% url 'accounts:login' %}">
Se connecter Se connecter
</a> </a>
{% endif %} {% endif %}