From a64f48e3ebf9b1c02dad5da4dd28e6fcab8a5775 Mon Sep 17 00:00:00 2001
From: Max <mskravec@buffalo.edu>
Date: Wed, 5 Jan 2022 15:00:37 -0500
Subject: [PATCH 1/3] Added Calendar path.

---
 mos/urls.py                      | 1 +
 templates/calendar/calendar.html | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 templates/calendar/calendar.html

diff --git a/mos/urls.py b/mos/urls.py
index a6b8e0e..344e59d 100644
--- a/mos/urls.py
+++ b/mos/urls.py
@@ -33,6 +33,7 @@
 	path('projects/', include('projects.urls')),
 	path('join/', include('join.urls')),
 	path('about/', TemplateView.as_view(template_name='about/index.html')),
+    path('calendar/', TemplateView.as_view(template_name='calendar/calendar.html')),
     path('announcements/', include('announcements.urls')),
     path('admin/', admin.site.urls),
     path('discord/', RedirectView.as_view(url='https://discord.gg/xbBPqdqr6n')),
diff --git a/templates/calendar/calendar.html b/templates/calendar/calendar.html
new file mode 100644
index 0000000..93ea687
--- /dev/null
+++ b/templates/calendar/calendar.html
@@ -0,0 +1,5 @@
+{% extends "base/base_template.html" %}
+
+{% block content %}
+    <iframe src="https://calendar.google.com/calendar/embed?src=c_lkachc26hdpg3rt9kptbk1go6s%40group.calendar.google.com&ctz=America%2FNew_York" style="border: 0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
+{% endblock %}
\ No newline at end of file

From 6af6666ee808e00e764f5701def642f44a12a78a Mon Sep 17 00:00:00 2001
From: Nick Brown <50608130+bicknrown@users.noreply.github.com>
Date: Wed, 5 Jan 2022 15:05:01 -0500
Subject: [PATCH 2/3] changed calendar path

changed calendar path  from calendar.html to index.html
---
 mos/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mos/urls.py b/mos/urls.py
index 344e59d..03c585d 100644
--- a/mos/urls.py
+++ b/mos/urls.py
@@ -33,7 +33,7 @@
 	path('projects/', include('projects.urls')),
 	path('join/', include('join.urls')),
 	path('about/', TemplateView.as_view(template_name='about/index.html')),
-    path('calendar/', TemplateView.as_view(template_name='calendar/calendar.html')),
+    path('calendar/', TemplateView.as_view(template_name='calendar/index.html')),
     path('announcements/', include('announcements.urls')),
     path('admin/', admin.site.urls),
     path('discord/', RedirectView.as_view(url='https://discord.gg/xbBPqdqr6n')),

From 698839290dd0eba04491d974de6f3175bea1ef22 Mon Sep 17 00:00:00 2001
From: Nick Brown <50608130+bicknrown@users.noreply.github.com>
Date: Wed, 5 Jan 2022 15:05:49 -0500
Subject: [PATCH 3/3] changed path:

changed calendar.html to index.html
---
 templates/calendar/{calendar.html => index.html} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename templates/calendar/{calendar.html => index.html} (95%)

diff --git a/templates/calendar/calendar.html b/templates/calendar/index.html
similarity index 95%
rename from templates/calendar/calendar.html
rename to templates/calendar/index.html
index 93ea687..4ccd136 100644
--- a/templates/calendar/calendar.html
+++ b/templates/calendar/index.html
@@ -2,4 +2,4 @@
 
 {% block content %}
     <iframe src="https://calendar.google.com/calendar/embed?src=c_lkachc26hdpg3rt9kptbk1go6s%40group.calendar.google.com&ctz=America%2FNew_York" style="border: 0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
-{% endblock %}
\ No newline at end of file
+{% endblock %}