From a15134cd8990e7bbbd8eb539d21c3da5479e4f3f Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sat, 7 Dec 2019 17:37:29 +0100
Subject: [PATCH] - Settings angepasst

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 4113 -> 4275 bytes
 .../__pycache__/urls.cpython-38.pyc           | Bin 1864 -> 1909 bytes
 digitaleagentur/settings.py                   |  33 ++++++++----------
 digitaleagentur/urls.py                       |  16 ++++++---
 .../templates/standards/standards_single.html |   2 +-
 .../templates/users/password_reset_done.html  |   2 --
 6 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 7697a67fc2de09a1d1180b6f97382fb4903a8b37..0ad905abb3160c42d5e210aeac9d9a77a1249e80 100644
GIT binary patch
delta 750
zcmYjP%TgLa6s3m-MjkV$D5xm-enT{B-VdW_FeWB|d0b-%dd3!FzyK+#+_29kWoFAl
z_gSQhMfUlIWaBSnpKa2PF4DK|sdMf<Rkv?fA4i-0+NRIvw#oDL=kM+L(6JU){L1mv
zY#k0bg+eWGK}8GP@W2ZnH0bc76>Vro03AXnH#!kS2wmt#55mGl9`uqIeZmHg2%_l6
z00srmGYmDjVC2IvX&50LqvXdJwaRP*r*@1}027$R6zbE6AugmHSI!w`FpI00!!+iF
ziiL)PYq*XZQs2ZaiMMe_;$7UseJo1$083aFt(G%^6|4%y;t!F;8XjR?a7#bN6Kq`e
zp5hr&7rc%%GT6j(yueGm5>CrZa`YBnH{>qVA#b{kH!`w#i(JDYYn|A^uH176u+Xq@
zFV6(0AOwZ5PhE1;ZkatY!^l%F7?cA>3<c^lSV1|lOROs=5yNrHP8r?>Z4|W{{YDgp
zQ-ucpS9^>GaX>?tH7DLn$1sXCBA;~>B^tvajpGAN$bpk6(-bN+4JB<Gujb~M&E{S%
z<cgvctr*p6z9=fuy;3>a3@clV1<Z)I!x5_0YO!<Htl8sg;K=u}Vw5ZKN;Ox_@5Ybp
z@mS3K?)l7O%~kI=mT;#ti<#t7b~Ckprk0J|!C|htPc7+WCXr2TY-G-Op_DJ4c`j{M
z$$ueMlIw|db~%|!n?5aQPH1183-WK47t9~pw*QZ$+^h1ii`%)PI?Wlq$6V7tG2Q&7
a4@X=o<2=MP#ru~#xLsq?W#`Nag|mMsLdxX;

delta 598
zcmXYvNmEln6ovC%I*$;N_Y$Tsgqbj76mcE^Q85}p862)4ARo3tB#O9k!`_WWy=@ly
z1FW(t8~6SKUAl6i3(G2hgUu`Y);)D@pL47Gc6FuepwnGSBw``6HvaxuDWnhFjQ!m@
z7#Z8wA*m*ULlse~iBUtG1TG#)Qq)qXJ&93I1C69<qL~(5B{j54oQw{kXrrADI_c7?
zXwh9(+L8o4;?gS~SxM3-DU-D*siR-&8DNkhh8bahR2w_T3>_uMaZWI1gp)eTc-iI@
zr#WNlvz#+{o(l#qa*4}K7&gfiS9B_HPIHxO+79@2X1GC~n_30+EehN|(q@_C&Jn-M
z{5}gTvcx^^YbP*2Fh@T`%4Qa6FgJa~vWXQQvs#Xry++npH*>D>B*2XTDOy@dnoViq
zsWh8OTTHf^%%G)>XVOklI@prVO>4{k(6#CC{G%=X-E2#bd7NHeNR}Pxqa^*NZGe|D
z$SWDbUI-2DRwnH?R^@j%7fnfIyQGUdZ=<=_d+U3}jhsIae{T&}zQjLUjn##@nf&bP
z(tP1ZY+-R~F+Y9C{ZDQ>qP9xK9sjHAJLBdb?2h}(-b(VHp(-9#nJN`lwsQP$UW5PB
cbNpZ4JFD3*C9~<Ua*P&stwU5+5Vo@Z17V?|#sB~S

diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc
index 49c08fe321a09569581cada833bf8932435ba56c..ad5c2e5cc0cc1320035d672c2e9dc0536c5ab8b5 100644
GIT binary patch
delta 157
zcmX@X_mz(~l$V!_0SNX^c^z9lkyn;+%SP=)MuSxDRL(3JAeK!r=w%XTh>`=c<tH!}
z^`y#y<rIK?MUb31NKS6@8b(D%xy|Po-I*DcHjA-lF-mX+hd73KI>(0w`P|}$vV;8n
rLnha=>9HvRtt?WSyqPVM(PlC)yS@MuAKxbyehx+vCMHG!MxK8F@)Rd}

delta 112
zcmey$cY=>Ml$V!_0SHc~zlyb-$ScdZWTSQ>qe7HSDrc7L1jeG8RGCz6AX^TI<x>oL
znaml0ax#<mFe)<2Y`(|n&djK=S&cP|aq>zwT{Z=vNks~i@32KOT1+-$*XLp3=U^0J
LVqz3v<oO2xj~g3C

diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index 94b8306..80ac13a 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -26,7 +26,7 @@ SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com']
 
 
 # Application definition
@@ -38,7 +38,7 @@ INSTALLED_APPS = [
     'tasks.apps.TasksConfig',
     'standards.apps.StandardsConfig',
     'crispy_forms',
-    'colorful',        
+    'colorful',
     'ckeditor',
     'ckeditor_uploader',
     'django.contrib.admin',
@@ -124,17 +124,7 @@ DATABASES = {
         'PORT' : 3306
     }
 }
-'''
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME' : 'digitaleagentur',
-        'USER' : 'root',
-        'PASSWORD' : '',
-        'PORT' : 3306
-    }
-}
-'''
+
 # Password validation
 # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
 
@@ -171,13 +161,20 @@ USE_TZ = True
 LOGIN_REDIRECT_URL = 'users-dashboard'
 
 # LOGIN PAGE FOR LOGIN-REDIRECT
-LOGIN_URL = 'login'
-
+#LOGIN_URL = 'login'
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.2/howto/static-files/
-
-STATIC_URL = '/static/'
+import os
+STATIC_URL = 'users/static/'
+#SITE_ROOT = os.path.dirname(os.path.realpath(__file__))
+#SITE_ROOT = '/var/www/digitale-agentur.com/digitaleagentur/digitaleagentur/../'
+#STATIC_ROOT = (os.path.join(SITE_ROOT, '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/'),
+)
 
 # CRISPY
 CRISPY_TEMPLATE_PACK = 'bootstrap4'
@@ -196,4 +193,4 @@ EMAIL_PORT = 587
 EMAIL_USE_TLS = True
 
 EMAIL_HOST_USER = "support@digitale-agentur.com"
-EMAIL_HOST_PASSWORD = "aPx9m3!7x3m@8o!t"
\ No newline at end of file
+EMAIL_HOST_PASSWORD = "aPx9m3!7x3m@8o!t"
diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py
index 305027f..aa0a82a 100644
--- a/digitaleagentur/urls.py
+++ b/digitaleagentur/urls.py
@@ -9,12 +9,18 @@ from ckeditor_uploader.views import upload
 from django.contrib.auth.decorators import login_required
 
 '''
-ADMINPAGE - Verwaltung der Super-User
- - LOGIN-Page
-dashboard/ --> Nach Login werden hier die URLS aus der Users-App eingebunden und dort alle URLS eingeladen 
+
+    Main URLS
+
+    Apps:
+        areas
+        tasks
+        standards
+        orga
+
+        -> Rest ist von Django
 
 '''
-
 urlpatterns = [
 	path('', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'),    
 	path('admin/', admin.site.urls),    
@@ -29,7 +35,7 @@ urlpatterns = [
     path('password-reset-complete/', auth_views.PasswordResetCompleteView.as_view(template_name='users/password_reset_complete.html'), name='password_reset_complete'),
     path('register/', AgencyCreateView.as_view(template_name='users/register.html'), name='register'),
     path('register/done', views.registerdone, name='register-done')    
-]
+] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 if settings.DEBUG:
 	urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
diff --git a/standards/templates/standards/standards_single.html b/standards/templates/standards/standards_single.html
index 3747ee8..e569e39 100644
--- a/standards/templates/standards/standards_single.html
+++ b/standards/templates/standards/standards_single.html
@@ -19,4 +19,4 @@
   {{standard.media}}
   {{standard.content|safe}}
 </div>
-{% endblock content %}
+{% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/password_reset_done.html b/users/templates/users/password_reset_done.html
index 0c4d5a5..9438392 100644
--- a/users/templates/users/password_reset_done.html
+++ b/users/templates/users/password_reset_done.html
@@ -1,7 +1,5 @@
 <!-- Base-Template einbinden -->
 {% extends "users/publicbase.html" %}
-
-{% load crispy_forms_tags %}
 <!-- BLOCK NAME START -->
 {% block content %}	
 		<div class="alert alert-info">Es wurde eine E-Mail mit einem Link verschickt.</div>