Merge branch 'development' into set-up-deployment

Author: korlaxxalrok

src/signal_documentation/settings.py

@@ -169,21 +169,19 @@
 
 LOCALE_PATHS: list[str] = [os.path.join(BASE_DIR, 'locale')]
 
+MAIN_PAGE = os.environ.get('MAIN_PAGE', '')
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.2/howto/static-files/
 
-STATIC_URL: str = '/static/'
+STATIC_URL: str = f'{MAIN_PAGE}/static/'
 STATICFILES_DIRS: tuple[str] = (os.path.join(BASE_DIR, 'assets'),)
 STATIC_ROOT: str = os.path.join(BASE_DIR, 'staticfiles')
 
-MEDIA_URL: str = '/media/'
+MEDIA_URL: str = f'{MAIN_PAGE}/media/'
 MEDIA_ROOT: str = os.path.join(BASE_DIR, 'media')
 
 
-MAIN_PAGE = os.environ.get('MAIN_PAGE', '')
-
-
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 

src/signal_documentation/urls.py

@@ -38,7 +38,7 @@
 urlpatterns: list[URLResolver] = [
     path('admin/', admin.site.urls),
     path('__debug__/', include('debug_toolbar.urls')),
-    path(settings.MAIN_PAGE, include('signals.urls')),
+    path(f'{settings.MAIN_PAGE}/', include('signals.urls')),
 ]
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)  # type: ignore