Merge branch 'latest' of github.com:dsaub/proyecto-final into latest

refactor: update static and media URL handling for S3 integration
Merge pull request #103 from dsaub/dependabot/pip/stripe-15.2.0
2026-05-31 18:52:49 +02:00 · 2026-05-31 18:51:39 +02:00 · 2026-05-29 10:29:53 +02:00 · 2026-05-28 10:35:33 +00:00
2 changed files with 11 additions and 5 deletions
@@ -164,10 +164,10 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/6.0/howto/static-files/

-STATIC_URL = 'static/'
+
 STATIC_ROOT = BASE_DIR / 'staticfiles'
 COMPRESS_ROOT = STATIC_ROOT
-COMPRESS_URL = STATIC_URL
+
 STATICFILES_DIRS = [
    BASE_DIR / 'tienda' / 'static',
 ]
@@ -206,6 +206,14 @@ if S3_ENABLE:
        },
    }

+if S3_ENABLE and AWS_S3_CUSTOM_DOMAIN:
+    STATIC_URL = f"https://{AWS_S3_CUSTOM_DOMAIN}/static/"
+    MEDIA_URL = f"https://{AWS_S3_CUSTOM_DOMAIN}/media/"
+else:
+    STATIC_URL = env("STATIC_URL", default="static/")
+    MEDIA_URL = env("MEDIA_URL", default="media/")
+
+COMPRESS_URL = STATIC_URL
 STATICFILES_FINDERS = [
    'django.contrib.staticfiles.finders.FileSystemFinder',
    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
@@ -214,8 +222,6 @@ STATICFILES_FINDERS = [

 COMPRESS_PRECOMPILERS = ()

-# Media files (User uploads)
-MEDIA_URL = 'media/'
 MEDIA_ROOT = Path(env('MEDIA_ROOT', default='/app/media'))

 # Redis Configuration
@@ -18,7 +18,7 @@ dependencies = [
    "pillow==12.2.0",
    "psycopg2-binary==2.9.12",
    "requests==2.34.2",
-    "stripe==15.1.0",
+    "stripe==15.2.0",
    "whitenoise==6.12.0",
 ]
Author	SHA1	Message	Date
elordenador	1d319d8efa	Merge branch 'latest' of github.com:dsaub/proyecto-final into latest	2026-05-31 18:52:49 +02:00
elordenador	874f4e29db	refactor: update static and media URL handling for S3 integration	2026-05-31 18:51:39 +02:00
Daniel (elordenador)	b154da09a5	Merge pull request #103 from dsaub/dependabot/pip/stripe-15.2.0 build(deps): bump stripe from 15.1.0 to 15.2.0	2026-05-29 10:29:53 +02:00
dependabot[bot]	f47fd21deb	build(deps): bump stripe from 15.1.0 to 15.2.0 Bumps [stripe](https://github.com/stripe/stripe-python) from 15.1.0 to 15.2.0. - [Release notes](https://github.com/stripe/stripe-python/releases) - [Changelog](https://github.com/stripe/stripe-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/stripe/stripe-python/compare/v15.1.0...v15.2.0) --- updated-dependencies: - dependency-name: stripe dependency-version: 15.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-28 10:35:33 +00:00