After Module 5: URLs and Link Building

codesensei-courses · Apr 19, 2020 · e0a1ba6 · e0a1ba6
1 parent c1210e6
commit e0a1ba6
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 13 deletions.
diff --git a/meeting_planner/meeting_planner/urls.py b/meeting_planner/meeting_planner/urls.py
@@ -14,16 +14,15 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, include
 
 from website.views import welcome, date, about
-from meetings.views import detail
 
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('', welcome),
+    path('', welcome, name="welcome"),
     path('date', date),
     path('about', about),
-    path('meetings/<int:id>', detail),
+    path('meetings/', include('meetings.urls')),
 ]
diff --git a/meeting_planner/meetings/models.py b/meeting_planner/meetings/models.py
@@ -3,9 +3,6 @@
 from django.db import models
 
 
-# Please add a Model class called Room
-# To represent a meeting room
-# A room has a name, a floor number, and a room number
 class Room(models.Model):
     name = models.CharField(max_length=50)
     floor = models.IntegerField()

diff --git a/meeting_planner/meetings/templates/meetings/detail.html b/meeting_planner/meetings/templates/meetings/detail.html
@@ -11,5 +11,7 @@ <h1>{{meeting.title}}</h1>
     {{meeting.start_time}} in <strong>{{meeting.room}}</strong>.
 </p>
 
+<a href="{% url 'welcome' %}">Home</a>
+
 </body>
 </html>
diff --git a/meeting_planner/meetings/templates/meetings/rooms_list.html b/meeting_planner/meetings/templates/meetings/rooms_list.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Rooms</title>
+</head>
+<body>
+    <h2>Rooms</h2>
+    <ul>
+      {% for room in rooms %}
+        <li>
+           {{room}}
+        </li>
+      {% endfor %}
+    </ul>
+</body>
+</html>
diff --git a/meeting_planner/meetings/urls.py b/meeting_planner/meetings/urls.py
@@ -0,0 +1,9 @@
+from django.urls import path
+
+from . import views
+
+
+urlpatterns = [
+    path('<int:id>', views.detail, name="detail"),
+    path('rooms', views.rooms_list, name="rooms")
+]
diff --git a/meeting_planner/meetings/views.py b/meeting_planner/meetings/views.py
@@ -1,8 +1,14 @@
 from django.shortcuts import render, get_object_or_404
 
-from .models import Meeting
+from .models import Meeting, Room
 
 
 def detail(request, id):
     meeting = get_object_or_404(Meeting, pk=id)
     return render(request, "meetings/detail.html", {"meeting": meeting})
+
+
+def rooms_list(request):
+    return render(request, "meetings/rooms_list.html",
+            {"rooms": Room.objects.all()})
+
diff --git a/meeting_planner/website/templates/website/welcome.html b/meeting_planner/website/templates/website/welcome.html
@@ -12,9 +12,18 @@ <h1>Welcome to the Meeting Planner!</h1>
         on <a href="https://www.pluralsight.com">
         Pluralsight</a>.
     </p>
-    <p>
-        There are currently {{ num_meetings }} meetings
-        in the database.
-    </p>
+
+    <h2>Meetings</h2>
+    <ul>
+        {% for meeting in meetings %}
+            <li>
+                <a href="{% url 'detail' meeting.id %}">
+                    {{ meeting.title }}
+                </a>
+            </li>
+        {% endfor %}
+    </ul>
+    <a href="{% url 'rooms' %}">Rooms list</a>
+
 </body>
 </html>
diff --git a/meeting_planner/website/views.py b/meeting_planner/website/views.py
@@ -3,9 +3,12 @@
 from django.shortcuts import render
 from django.http import HttpResponse
 
+from meetings.models import Meeting
+
 
 def welcome(request):
-    return render(request, "website/welcome.html")
+    return render(request, "website/welcome.html",
+                  {"meetings": Meeting.objects.all()})
 
 
 def date(request):
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,5 +11,7 @@ <h1>{{meeting.title}}</h1> @@
         {{meeting.start_time}} in <strong>{{meeting.room}}</strong>.
     </p>
+    <a href="{% url 'welcome' %}">Home</a>
     </body>
     </html>