Commit 6ac81709 authored by Jonathan Talbot's avatar Jonathan Talbot

Merge branch 'main' into 'assignments'

# Conflicts:
#   widget_group3/widget_group3/urls.py
#   widget_group3/widget_group3/views.py
parents 815deaa7 2f54bd56
......@@ -15,10 +15,12 @@ Including another URLconf
"""
from django.contrib import admin
from django.urls import path
from .views import homepage, assignments
from .views import homepage, forum, announcements, assignments
urlpatterns = [
path('admin/', admin.site.urls),
path('', homepage, name='homepage'),
path('assignments/', assignments, name='assignments')
path('assignments/', assignments, name='assignments'),
path('announcements/', announcements, name='Announcement Board'),
path('forum/', forum, name='forum')
]
......@@ -4,4 +4,10 @@ def homepage(request):
return HttpResponse('Welcome to Widget!')
def assignments(request):
return HttpResponse('This is the Assignments page!')
\ No newline at end of file
return HttpResponse('This is the Assignments page!')
def announcements(request):
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