Skip to content

Commit 7fa4476

Browse files
committed
Update deps
1 parent eae6d04 commit 7fa4476

5 files changed

Lines changed: 444 additions & 551 deletions

File tree

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{% extends "page.html" %}
2-
{% load static %}
2+
{% load static i18n %}
33

44
{% block header %}
55
<h2 class="text-center">Landolfio</h2>
66
<p class="lead text-center">
7-
Inventory management
7+
{% translate "Inventory management" %}
88
</p>
99
{% endblock %}
1010

1111
{% block content %}
1212
<div class="text-center">
1313
<a href="{% url 'inventory_frontend:search' %}" class="btn btn-primary btn-lg">
14-
<i class="fas fa-sign-in-alt me-2"></i>Login
14+
<i class="fas fa-sign-in-alt me-2"></i>{% translate "Login" %}
1515
</a>
1616
</div>
1717
{% endblock %}

landolfio/website/settings/common.py

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"admin_reorder",
2929
"autocompletefilter",
3030
"django_drf_filepond",
31+
"storages",
3132
"ninox_import",
3233
"accounting",
3334
"inventory",
@@ -261,9 +262,26 @@
261262
AWS_S3_SIGNATURE_VERSION = "s3v4"
262263
AWS_S3_FILE_OVERWRITE = False
263264
if AWS_STORAGE_BUCKET_NAME is not None:
264-
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
265+
# Configure S3 storage for Django 5.0+
266+
STORAGES = {
267+
"default": {
268+
"BACKEND": "storages.backends.s3boto3.S3Boto3Storage",
269+
},
270+
"staticfiles": {
271+
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
272+
},
273+
}
265274
DJANGO_DRF_FILEPOND_STORAGES_BACKEND = "storages.backends.s3boto3.S3Boto3Storage"
266275
else:
276+
# Use local file storage
277+
STORAGES = {
278+
"default": {
279+
"BACKEND": "django.core.files.storage.FileSystemStorage",
280+
},
281+
"staticfiles": {
282+
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
283+
},
284+
}
267285
DJANGO_DRF_FILEPOND_STORAGES_BACKEND = "django.core.files.storage.FileSystemStorage"
268286
DJANGO_DRF_FILEPOND_FILE_STORE_PATH = os.path.join(MEDIA_ROOT, "stored_uploads")
269287

landolfio/website/settings/production.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,3 @@
106106
EMAIL_DEFAULT_SENDER = os.environ.get("SMTP_FROM", None)
107107
DEFAULT_FROM_EMAIL = os.environ.get("SMTP_FROM_EMAIL", None)
108108
SERVER_EMAIL = os.environ.get("SMTP_FROM", None)
109-
110-
111-
# Force S3 storage in production (no fallback!)
112-
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
113-
DJANGO_DRF_FILEPOND_STORAGES_BACKEND = "storages.backends.s3boto3.S3Boto3Storage"
114-
AWS_S3_SIGNATURE_VERSION = "s3v4"
115-
AWS_S3_FILE_OVERWRITE = False
116-
AWS_DEFAULT_ACL = None
117-
AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID")
118-
AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY")
119-
AWS_STORAGE_BUCKET_NAME = os.environ.get("AWS_STORAGE_BUCKET_NAME")
120-
AWS_S3_REGION_NAME = os.environ.get("AWS_S3_REGION_NAME")

0 commit comments

Comments
 (0)