diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 6c473d8..dac4f16 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 c61c031..217e1d3 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 dc98465..c27c090 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -15,35 +15,31 @@ import os BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -############################################## LOCAL ##################################### -BASE_URL = "http://localhost:8000/" +############################################## DEV ##################################### +BASE_URL = "https://dev01.digitale-agentur.com/" CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" - # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -# Database -# https://docs.djangoproject.com/en/2.2/ref/settings/#databases +# MAIL DEV +EMAIL_HOST = 'smtp.strato.de' +EMAIL_PORT = 587 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = "support@dev01.digitale-agentur.com" +EMAIL_HOST_PASSWORD = "support@dev01.digitale-agentur.com" +DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com" + # DEV DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME' : 'digitaleagentur', - 'USER' : 'root', - 'PASSWORD' : '', + 'NAME' : 'digitaleagentur_dev01', + 'USER' : 'digitaleagentur_dev01', + 'PASSWORD' : 't3TvtGAOkFHYXdJlUMIu9u3U', 'PORT' : 3306 } } - -# MAIL DEV -EMAIL_HOST = 'gymhum.de' -EMAIL_PORT = 587 -EMAIL_USE_TLS = True -EMAIL_HOST_USER = "holger.trampe" -EMAIL_HOST_PASSWORD = "Motte2016_!" -DEFAULT_FROM_EMAIL = "holger.trampe@gymhum.de" - -################################################### LOCAL ############################### +############################################## DEV ##################################### # Nach zehn Stunden läuft der Cookie ab! @@ -175,9 +171,11 @@ LOGIN_URL = 'login' #DEV-UMBGEUNG STATIC_URL = '/static/' + ############################# 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 diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py index 926a486..764d28c 100644 --- a/digitaleagentur/urls.py +++ b/digitaleagentur/urls.py @@ -46,4 +46,4 @@ urlpatterns = [ path('tm/', include('timemanagement.urls'), name="timemanagement") ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) if settings.DEBUG: - urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/media/agencymain/ag_default.jpg b/media/agencymain/ag_default.jpg deleted file mode 100644 index c8d0904..0000000 Binary files a/media/agencymain/ag_default.jpg and /dev/null differ diff --git a/media/agencymain/default.jpg b/media/agencymain/default.jpg deleted file mode 100644 index 1fb7d8c..0000000 Binary files a/media/agencymain/default.jpg and /dev/null differ diff --git a/users/models.py b/users/models.py index 879d614..fe62f12 100644 --- a/users/models.py +++ b/users/models.py @@ -17,11 +17,11 @@ User._meta.get_field('last_name').blank = False # PATH FOR AGENCYPIC def picturepath_agency(instance, filename): # file will be uploaded to MEDIA_ROOT/agency_// - return 'agencydata/agency_{0}/agencystats/{1}'.format(instance.pk, filename) + return settings.MEDIA_URL + 'agencydata/agency_{0}/agencystats/{1}'.format(instance.pk, filename) # PATH FOR PROFILEPICS def picturepath_user(instance, filename): - return 'agencydata/agency_{0}/agencystats/profilepics/{1}'.format(instance.agency.pk, filename) + return settings.MEDIA_URL + 'agencydata/agency_{0}/agencystats/profilepics/{1}'.format(instance.agency.pk, filename) @@ -81,7 +81,7 @@ class Agency(models.Model): plz = models.CharField(default="", max_length=5, blank=True) agency_email = models.EmailField(default="", blank=True) phone = models.CharField(default="", max_length=50, blank=True) - agencypic = models.ImageField(default='ag_default.jpg', upload_to=picturepath_agency, blank=True) + agencypic = models.ImageField(default=settings.MEDIA_URL + 'ag_default.jpg', upload_to=picturepath_agency, blank=True) @@ -125,7 +125,7 @@ class Agency(models.Model): if self.agencypic and hasattr(self.agencypic, 'url'): return self.agencypic.url else: - return "/media/ag_default.jpg" + return settings.MEDIA_URL + "ag_default.jpg" ''' @@ -170,7 +170,7 @@ class Profile(models.Model): func = models.ForeignKey("AgencyJob", blank=True, null=True, default=None, on_delete=models.SET_NULL) # Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht agency = models.ForeignKey(Agency, on_delete=models.PROTECT) - image = models.ImageField(default='agencymain/default.jpg', upload_to=picturepath_user, blank=True) + image = models.ImageField(default=settings.MEDIA_URL + 'default.jpg', upload_to=picturepath_user, blank=True) compfunc = models.CharField(max_length=60, blank=True) visible = models.BooleanField(default=True) persnumber = models.CharField(default="", max_length=50, blank=True) @@ -239,7 +239,7 @@ class Profile(models.Model): if self.image and hasattr(self.image, 'url'): return self.image.url else: - return "/media/default.jpg" + return settings.MEDIA_URL + "default.jpg" class UserTime(models.Model): diff --git a/users/signals.py b/users/signals.py index b2f102a..f05e914 100644 --- a/users/signals.py +++ b/users/signals.py @@ -84,6 +84,8 @@ def checkDefaultAbsenceReasons(sender, user, request, **kwargs): @receiver(signal=user_logged_in, sender=User) def checkAllFreeDaysLoaded(sender, user, request, **kwargs): + pass + ''' allFreeDays = FreeDays.objects.filter(agency=user.profile.agency, year=date.today().year) # NO DAYS FOR THIS YEAR if(len(allFreeDays) == 0): @@ -91,7 +93,7 @@ def checkAllFreeDaysLoaded(sender, user, request, **kwargs): for k in tempdays.keys(): tempdate = tempdays[k]["datum"].split("-") FreeDays(agency=user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=date.today().year).save() - + ''' diff --git a/users/static/users/img/favicon.ico b/users/static/users/img/favicon.ico new file mode 100644 index 0000000..40bdf60 Binary files /dev/null and b/users/static/users/img/favicon.ico differ diff --git a/users/static/users/img/favicon.png b/users/static/users/img/favicon_OLD.png similarity index 100% rename from users/static/users/img/favicon.png rename to users/static/users/img/favicon_OLD.png diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 7cd582a..d4225ce 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -8,7 +8,7 @@ - + Digitale Agentur