diff --git a/.gitignore b/.gitignore index f9e9cc0..ec80125 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ media/agencydata/* digitaleagentur/__pycache__/* digitaleagentur/sec.py +collectedstatic/* media/userprofilepics/* !media/userprofilepics/default.jpg diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index efb2348..a39cb7a 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 88ed8cb..05c5b66 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -170,11 +170,12 @@ LOGIN_URL = 'login' STATIC_URL = '/static/' 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/'), -#) +STATICFILES_DIRS = ( + os.path.join(SITE_ROOT, 'users/static/'), +) + +STATIC_ROOT = (os.path.join(SITE_ROOT, 'collectedstatic/')) # CRISPY CRISPY_TEMPLATE_PACK = 'bootstrap4' diff --git a/users/signals.py b/users/signals.py index 5321ba1..f427edc 100644 --- a/users/signals.py +++ b/users/signals.py @@ -382,18 +382,6 @@ def receiver_function(sender, **kwargs): # DELETES ALL PRESENCE-OBJETS LOWER THAN 15 MINUTES now_minus = datetime.datetime.now() - datetime.timedelta(minutes=2) Presence.objects.filter(last_seen__lt=now_minus).delete() - - print(settings.MEDIA_URL) - print(settings.MEDIA_ROOT) - print(os.path.join(settings.BASE_DIR, 'media')) - print(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - - print(settings.STATIC_URL) - print(settings.SITE_ROOT) - print(settings.STATIC_ROOT) - - print(os.path.dirname(os.path.realpath(__file__)) + '/..') - print(os.path.join(settings.SITE_ROOT, 'users/static/')) # PREENCE CHANGED @receiver(signal=presence_changed)