- Settings angepasst

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/
-
+import os
-STATIC_URL = '/static/'
+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"
+EMAIL_HOST_PASSWORD = "aPx9m3!7x3m@8o!t"

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
+    Main URLS
-dashboard/ --> Nach Login werden hier die URLS aus der Users-App eingebunden und dort alle URLS eingeladen 
+
+    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)
 

standards/templates/standards/standards_single.html

@@ -19,4 +19,4 @@
   {{standard.media}}
   {{standard.content|safe}}
 </div>
-{% endblock content %}
+{% endblock content %}

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>