diff --git a/.gitignore b/.gitignore index d7c28a1..1d84fc8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ __pycache__/ coverage.xml .coverage la_chariotte.egg-info/ -node_modules \ No newline at end of file +node_modules +/static/* +/media/* \ No newline at end of file diff --git a/la_chariotte/order/templates/order/index.html b/la_chariotte/order/templates/order/index.html index 8b0bef3..1a4b7b4 100644 --- a/la_chariotte/order/templates/order/index.html +++ b/la_chariotte/order/templates/order/index.html @@ -24,7 +24,7 @@ {{ gr_order.delivery_date }} {{ gr_order.deadline }} Nb de commandes - Détail Organisation + Détail Organisation {% endfor %} @@ -49,7 +49,7 @@ {{ gr_order.delivery_date }} {{ gr_order.deadline }} Nb de commandes - Détail Organisation + Détail Organisation {% endfor %} @@ -74,7 +74,7 @@ {{ gr_order.delivery_date }} {{ gr_order.deadline }} Nb de commandes - Détail Organisation + Détail Organisation {% endfor %} diff --git a/la_chariotte/settings.py b/la_chariotte/settings.py index 1a2ba7c..5619108 100644 --- a/la_chariotte/settings.py +++ b/la_chariotte/settings.py @@ -132,6 +132,11 @@ USE_TZ = True STATIC_URL = "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 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field diff --git a/la_chariotte/templates/base.html b/la_chariotte/templates/base.html index af6a8bd..cade1f0 100644 --- a/la_chariotte/templates/base.html +++ b/la_chariotte/templates/base.html @@ -25,14 +25,14 @@