Merge pull request #1 from pcampos119104/dev

s3

Author: pcampos119104

.env.template

@@ -8,3 +8,8 @@ DB_HOST=postgres
 DB_PORT=5432
 CSRF_TRUSTED_ORIGINS=http://localhost
 SENTRY_DSN=
+PORT=
+AWS_STORAGE_BUCKET_NAME=
+AWS_S3_ENDPOINT_URL=
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=

cdc/settings.py

@@ -57,6 +57,7 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
+    'django.contrib.postgres',
     'django.contrib.staticfiles',
     'django_extensions',
     'django_browser_reload',
@@ -174,17 +175,38 @@
 # https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-STORAGES = {
-    'default': {
-        'BACKEND': 'django.core.files.storage.FileSystemStorage',
-        'OPTIONS': {
-            'location': MEDIA_ROOT,
+if DEBUG:
+    STORAGES = {
+        'default': {
+            'BACKEND': 'django.core.files.storage.FileSystemStorage',
         },
-    },
-    'staticfiles': {
-        'BACKEND': 'whitenoise.storage.CompressedStaticFilesStorage',
-    },
-}
+        'staticfiles': {
+            'BACKEND': 'whitenoise.storage.CompressedStaticFilesStorage',
+        },
+    }
+else:
+    STORAGES = {
+        'default': {
+            'BACKEND': 'storages.backends.s3.S3Storage',
+            'OPTIONS': {
+                'bucket_name': env.str('AWS_STORAGE_BUCKET_NAME'),
+                'endpoint_url': env.str('AWS_S3_ENDPOINT_URL'),  # Interno Docker
+                'querystring_auth': True,
+                'querystring_expire': 900,
+                'default_acl': None,
+                'region_name': 'us-east-1',
+                'signature_version': 's3v4',
+                'addressing_style': 'path',
+                'url_protocol': 'https',
+            },
+        },
+        'staticfiles': {
+            'BACKEND': 'whitenoise.storage.CompressedStaticFilesStorage',
+        },
+    }
+    AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID')
+    AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY')
+
 
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 10_000
 

cdc/static/css/output.css

@@ -1028,6 +1028,9 @@
   .p-2\.5 {
     padding: calc(var(--spacing) * 2.5);
   }
+  .p-3 {
+    padding: calc(var(--spacing) * 3);
+  }
   .p-4 {
     padding: calc(var(--spacing) * 4);
   }

pyproject.toml

@@ -18,6 +18,7 @@ dependencies = [
     "sentry-sdk[django]>=2.32.0",
     "xonsh>=0.19.9",
     "wagtail>=7.2",
+    "django-storages[s3]>=1.14.6",
 ]
 
 [dependency-groups]