Commit 7219548d authored by Jonathan Talbot's avatar Jonathan Talbot

Merge branch 'main' into 'AnnouncementBoard'

# Conflicts:
#   widget_group3/widget_group3/urls.py
#   widget_group3/widget_group3/views.py
parents 1827bf18 973a354c
...@@ -15,10 +15,11 @@ Including another URLconf ...@@ -15,10 +15,11 @@ Including another URLconf
""" """
from django.contrib import admin from django.contrib import admin
from django.urls import path from django.urls import path
from .views import homepage from .views import homepage, forum
urlpatterns = [ urlpatterns = [
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path('', homepage, name='homepage'), path('', homepage, name='homepage'),
path('announcements/', announcements, name='Announcement Board') path('announcements/', announcements, name='Announcement Board')
path('forum/', forum, name='forum'),
] ]
...@@ -5,3 +5,6 @@ def homepage(request): ...@@ -5,3 +5,6 @@ def homepage(request):
def announcements(request): def announcements(request):
return HttpResponse('This is the Announcement Board!') return HttpResponse('This is the Announcement Board!')
def forum(request):
return HttpResponse('Welcome to Widget’s Forum!')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment