From 3a0d62102821c2f1fb23904cc07b912381d7ffd9 Mon Sep 17 00:00:00 2001 From: Nick Brown Date: Tue, 31 Aug 2021 23:58:44 -0400 Subject: [PATCH 01/10] created dev branch with dev settings --- mos/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mos/settings.py b/mos/settings.py index b8d7e52..0058a13 100644 --- a/mos/settings.py +++ b/mos/settings.py @@ -27,9 +27,9 @@ SECRET_KEY = os.getenv('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True -ALLOWED_HOSTS = ['makeopensource.org','www.makeopensource.org'] +ALLOWED_HOSTS = ['dev.makeopensource.org'] # Email Definition From 2e6cc9470de0a9ab93b54e3f43cec5103dfa8f8f Mon Sep 17 00:00:00 2001 From: Nick Brown Date: Thu, 2 Sep 2021 10:38:31 -0400 Subject: [PATCH 02/10] updated discord join information and added discord link in navbar --- templates/base/base_template.html | 1 + templates/home/index.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/base/base_template.html b/templates/base/base_template.html index 04f2630..ad74c21 100644 --- a/templates/base/base_template.html +++ b/templates/base/base_template.html @@ -35,6 +35,7 @@ {% comment %} IdeaLab {% endcomment %} About Join + About diff --git a/templates/home/index.html b/templates/home/index.html index 76cebad..c45d8fc 100644 --- a/templates/home/index.html +++ b/templates/home/index.html @@ -44,7 +44,7 @@

Join Us

Interested in becoming a member of MakeOpenSource? Visit the Join page and fill out - our form! Also, join our official Discord Server, + our form! Also, join our official Discord Server, where we will share information about events.

From 2b4d85d782e87d9dfbd099ae8e58cef21fb6c1a6 Mon Sep 17 00:00:00 2001 From: Nick Brown Date: Thu, 2 Sep 2021 10:44:02 -0400 Subject: [PATCH 03/10] fixed navbar and moved stuff around --- templates/base/base_template.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base/base_template.html b/templates/base/base_template.html index ad74c21..842858b 100644 --- a/templates/base/base_template.html +++ b/templates/base/base_template.html @@ -30,12 +30,12 @@ From 1973534fecbae76f61fe0f1023e5620c0214f49f Mon Sep 17 00:00:00 2001 From: Nick Brown Date: Fri, 3 Sep 2021 10:26:25 -0400 Subject: [PATCH 04/10] fixed discord join, again --- templates/base/base_template.html | 2 +- templates/home/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base/base_template.html b/templates/base/base_template.html index 842858b..a4dbce8 100644 --- a/templates/base/base_template.html +++ b/templates/base/base_template.html @@ -31,7 +31,7 @@ From d7bb309851eb41197724856574e79488bff8f0cf Mon Sep 17 00:00:00 2001 From: Nick Brown Date: Fri, 3 Sep 2021 11:05:39 -0400 Subject: [PATCH 05/10] checking new discord route --- mos/urls.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mos/urls.py b/mos/urls.py index 38834ba..fe4eb43 100644 --- a/mos/urls.py +++ b/mos/urls.py @@ -19,6 +19,7 @@ from django.conf import settings from django.conf.urls.static import static +from django.views.generic.base import RedirectView handler404 = 'api.views.page_not_found' @@ -34,4 +35,5 @@ path('about/', TemplateView.as_view(template_name='about/index.html')), path('announcements/', include('announcements.urls')), path('admin/', admin.site.urls), + path('discord/', RedirectView.as_view(url='https://discord.gg/xbBPqdqr6n')) ] From bbc026e0f6dd32861dc8fe4080976e32703020bf Mon Sep 17 00:00:00 2001 From: Nick Brown Date: Fri, 3 Sep 2021 11:09:27 -0400 Subject: [PATCH 06/10] checking new discord link in page layouts --- templates/base/base_template.html | 2 +- templates/home/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base/base_template.html b/templates/base/base_template.html index a4dbce8..f7b12e5 100644 --- a/templates/base/base_template.html +++ b/templates/base/base_template.html @@ -31,7 +31,7 @@ From 68fd227da761bccdc9c024290aa9a9d50537b9f2 Mon Sep 17 00:00:00 2001 From: Nick Brown Date: Fri, 3 Sep 2021 11:12:08 -0400 Subject: [PATCH 07/10] changed discord redirects --- templates/base/base_template.html | 2 +- templates/home/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base/base_template.html b/templates/base/base_template.html index f7b12e5..9cb4da1 100644 --- a/templates/base/base_template.html +++ b/templates/base/base_template.html @@ -31,7 +31,7 @@ From 4b1e64b8cb7e5108ee0d374513ef5507743d9bff Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 10 Sep 2021 16:24:17 -0400 Subject: [PATCH 08/10] resolved email formatting --- join/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/join/views.py b/join/views.py index 2dec0f8..58fb46d 100644 --- a/join/views.py +++ b/join/views.py @@ -53,7 +53,7 @@ def index(request): send_mail( subject='Verify your identity: Thank you for joining MakeOpenSource!', html_message = html_content, - plain_message = strip_tags(html_content), + message = strip_tags(html_content), from_email='no-reply@makeopensource.org', recipient_list=[email], fail_silently=False, From 9f84ee20216200a1f42e4a55ff06a011efd004d7 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 13 Sep 2021 16:14:46 -0400 Subject: [PATCH 09/10] corrected a typo, 404 error should be resolved --- join/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/join/views.py b/join/views.py index 58fb46d..2ff5403 100644 --- a/join/views.py +++ b/join/views.py @@ -19,7 +19,7 @@ def index(request): if 'join_status' in request.session and request.session['join_status'] == 'joined': - render(request, 'join/send_verification.html') + return render(request, 'join/send_verification.html') elif request.method == "POST": form = JoinForm(request.POST) From 03e9bf5f1562048de4888fda94484201af30c2c3 Mon Sep 17 00:00:00 2001 From: Emil Kovacev Date: Mon, 13 Sep 2021 18:06:59 -0400 Subject: [PATCH 10/10] Update settings.py to reflect deployment branch --- mos/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mos/settings.py b/mos/settings.py index 0058a13..b8d7e52 100644 --- a/mos/settings.py +++ b/mos/settings.py @@ -27,9 +27,9 @@ SECRET_KEY = os.getenv('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False -ALLOWED_HOSTS = ['dev.makeopensource.org'] +ALLOWED_HOSTS = ['makeopensource.org','www.makeopensource.org'] # Email Definition