diff --git a/.cred b/.cred index 26f9598..1e9b8f8 100644 --- a/.cred +++ b/.cred @@ -1 +1,2 @@ https://holger.trampe:Zerogoogle123_@git.vhevents.de/ +https://holger.trampe:Zerogoogle123_@git.vhevents.de/ diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 67562f9..35bd580 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index de9d1da..fd0c252 100644 Binary files a/digitaleagentur/__pycache__/urls.cpython-38.pyc and b/digitaleagentur/__pycache__/urls.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 7c0c051..37970f2 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -169,11 +169,28 @@ LOGIN_REDIRECT_URL = 'users-dashboard' LOGIN_URL = 'login' STATIC_URL = '/static/' + + + +''' SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..' STATICFILES_DIRS = (os.path.join(SITE_ROOT, 'users/static/'),) -STATIC_ROOT = (os.path.join(SITE_ROOT, 'collectedstatic')) +#STATIC_ROOT = (os.path.join(SITE_ROOT, 'collectedstatic')) +''' +############################# FÜR COMMIT +SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..' +STATIC_ROOT = (os.path.join(SITE_ROOT, 'users/static/')) + +#STATICFILES_DIRS = (os.path.join(SITE_ROOT, 'users/static/'),) + +# CRISPY +CRISPY_TEMPLATE_PACK = 'bootstrap4' + +# Bildspeicherpfad +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') +MEDIA_URL = '/media/' # CRISPY CRISPY_TEMPLATE_PACK = 'bootstrap4' diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py index 3371b37..4dc132f 100644 --- a/digitaleagentur/urls.py +++ b/digitaleagentur/urls.py @@ -35,8 +35,8 @@ urlpatterns = [ path('chat/', include('chat.urls'), name='chat'), path('api-token-auth/', obtain_auth_token, name='api-token-auth'), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) -#if settings.DEBUG: -# urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) +if settings.DEBUG: + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) # ERROR HANDLERS handler404 = 'users.views.handler404'