From 96a0a7a497b89b0fd9d05d7a8669b13287ebdff5 Mon Sep 17 00:00:00 2001
From: Heimbs <heimbsle69869@efn033062.ads1.fh-nuernberg.de>
Date: Tue, 19 Nov 2019 14:28:17 +0100
Subject: [PATCH] Fix minor errors in code; Add root page

---
 news/news/urls.py                     |  3 ++-
 news/news/views.py                    | 15 +++++++++++++++
 news/posts/migrations/0001_initial.py | 24 ++++++++++++++++++++++++
 news/posts/urls.py                    |  2 +-
 news/posts/views.py                   | 14 ++++++++++++--
 news/templates/navbar.html            |  2 +-
 news/templates/news/index.html        | 13 +++++++++++++
 7 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 news/news/views.py
 create mode 100644 news/posts/migrations/0001_initial.py
 create mode 100644 news/templates/news/index.html

diff --git a/news/news/urls.py b/news/news/urls.py
index fc29896..78d58d5 100644
--- a/news/news/urls.py
+++ b/news/news/urls.py
@@ -15,9 +15,10 @@ Including another URLconf
 """
 from django.contrib import admin
 from django.urls import path, include
+from. import views
 
 urlpatterns = [
-    path('', include('posts.urls')),
+    path('', views.index, name="index"),
     path('posts/', include('posts.urls')),
     path('admin/', admin.site.urls),
 ]
diff --git a/news/news/views.py b/news/news/views.py
new file mode 100644
index 0000000..a34a572
--- /dev/null
+++ b/news/news/views.py
@@ -0,0 +1,15 @@
+from django.shortcuts import render
+from django.http import HttpResponse
+
+logger = None
+
+def init_loger():
+    global logger
+    if not logger:
+        logger = logging.getLogger(__name__)
+        logger.setLevel(logging.DEBUG)
+        logger.addHandler(logging.StreamHandler)
+
+# Create your views here.
+def index(request):
+    return render(request, 'news/index.html')
diff --git a/news/posts/migrations/0001_initial.py b/news/posts/migrations/0001_initial.py
new file mode 100644
index 0000000..04ba039
--- /dev/null
+++ b/news/posts/migrations/0001_initial.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.2.6 on 2019-11-19 12:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Notice',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('notice_title', models.CharField(max_length=80)),
+                ('notice_text', models.CharField(max_length=400)),
+                ('pub_start', models.DateTimeField()),
+                ('pub_end', models.DateTimeField()),
+            ],
+        ),
+    ]
diff --git a/news/posts/urls.py b/news/posts/urls.py
index 306c8bc..1587894 100644
--- a/news/posts/urls.py
+++ b/news/posts/urls.py
@@ -2,5 +2,5 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path('', views.index, name='index')
+    path('', views.index, name='posts')
 ]
\ No newline at end of file
diff --git a/news/posts/views.py b/news/posts/views.py
index caca9d3..6ff152c 100644
--- a/news/posts/views.py
+++ b/news/posts/views.py
@@ -2,12 +2,22 @@ from django.shortcuts import render
 from django.http import HttpResponse
 from  .models import Notice
 from django.utils import timezone
+import logging
+
+logger = None
+
+def init_loger():
+    global logger
+    if logger == None:
+        logger = logging.getLogger('django.db.backends')
+        logger.setLevel(logging.DEBUG)
+        logger.addHandler(logging.StreamHandler())
 
 # Create your views here.
 def index(request):
+    init_loger()
     notices = Notice.objects.all()
-    notices = Notice.objects.filter(pub_start__lte=timezone.now())
-    notices = Notice.objects.filter(pub_end__gte=timezone.now())
+    notices = Notice.objects.filter(pub_start__lte=timezone.now(), pub_end__gte=timezone.now())
     context = {
         "notices": notices,
     }
diff --git a/news/templates/navbar.html b/news/templates/navbar.html
index 8477ca8..3111c26 100644
--- a/news/templates/navbar.html
+++ b/news/templates/navbar.html
@@ -6,7 +6,7 @@
                 <a class="nav-link" href="{% url 'index' %}">Home</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="{% url 'index' %}">Posts</a>
+                <a class="nav-link" href="{% url 'posts' %}">Posts</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" href="https://www.th-nuernberg.de/fakultaeten/efi/">EFI</a>
diff --git a/news/templates/news/index.html b/news/templates/news/index.html
new file mode 100644
index 0000000..64f587c
--- /dev/null
+++ b/news/templates/news/index.html
@@ -0,0 +1,13 @@
+{% extends 'base.html' %}
+
+{% block title %}
+Index
+{% endblock %}
+
+{% block content %}
+<div class="jumbotron">
+    <h1 class="display-4">Index of News App</h1>
+
+    <p class="lead">Some placeholder Text</p>
+</div>
+{% endblock %}