Update packages#831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karbassi merged 6 commits into from
Dec 29, 2020
Merged

Update packages #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d93be3
Update packages
karbassi Nov 11, 2020
55db2c8
Remove settings.SITE_NAME and replace with text
karbassi Nov 11, 2020
d01dd68
Update settings.py with hardcoded SITE_NAME to solve any issues.
karbassi Nov 11, 2020
30d0e32
Merge remote-tracking branch 'upstream/master' into hotfix/update-pac…
karbassi Dec 28, 2020
f5d4856
Remove SITE_NAME and replace with hardcoded text
karbassi Dec 28, 2020
9077104
Upgrade packages to latest
karbassi Dec 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.sample
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
DEBUG=True
ENABLE_DEV_FIXTURES=True

SITE_NAME=We All Code
SITE_URL=http://localhost:8000
SECRET_KEY=CHANGEME
DJANGO_SECURE_SSL_REDIRECT=False
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ json-logging-py = "*"
django-anymail = "*"
django-meta = "*"
django-environ = "*"
sentry-sdk = "==0.14.3"
sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
Expand Down
276 changes: 181 additions & 95 deletions Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions accounts/templates/account/guardian/home.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-dojo{% endblock %}

{% block contained_content %}
Expand Down
11 changes: 0 additions & 11 deletions accounts/templates/account/mentor/home.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-account{% endblock %}

{% block contained_content %}
Expand Down
208 changes: 87 additions & 121 deletions accounts/views.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,19 @@
from meta.views import MetadataMixin

from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
from coderdojochi.models import (
Guardian,
MeetingOrder,
Mentor,
MentorOrder,
Order,
Student,
)


class SignupView(MetadataMixin, AllAuthSignupView):
template_name = 'account/signup.html'
title = f"Sign up | {settings.SITE_NAME}"
template_name = "account/signup.html"
title = "Sign up | We All Code"
description = (
"We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
"youth ages 7 to 17 free of charge."
Expand All@@ -28,8 +35,8 @@ class SignupView(MetadataMixin, AllAuthSignupView):


class LoginView(MetadataMixin, AllAuthLoginView):
template_name = 'account/login.html'
title = f"Login | {settings.SITE_NAME}"
template_name = "account/login.html"
title = "Login | We All Code"
description = (
"We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
"youth ages 7 to 17 free of charge."
Expand All@@ -40,36 +47,36 @@ class LoginView(MetadataMixin, AllAuthLoginView):
twitter_creator = "@weallcode"


@method_decorator(login_required, name='dispatch')
class AccountHomeView(TemplateView):
@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
title = "My Account | We All Code"

def dispatch(self, *args, **kwargs):
if not self.request.user.role:
if 'next' in self.request.GET:
return redirect(
f"{reverse('welcome')}?next={self.request.GET['next']}"
)
if "next" in self.request.GET:
return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
else:
messages.warning(
self.request,
'Tell us a little about yourself before going on account.'
"Tell us a little about yourself before going on account.",
)
return redirect('welcome')
return redirect("welcome")

return super().dispatch(*args, **kwargs)

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)

context['highlight'] = (
self.request.GET['highlight'] if 'highlight' in self.request.GET else False
context["highlight"] = (
self.request.GET["highlight"] if "highlight" in self.request.GET else False
)

context['user'] = self.request.user
context["user"] = self.request.user

if self.request.user.role == 'mentor':
if self.request.user.role == "mentor":
return {**context, **self.get_context_data_for_mentor()}

if self.request.user.role == 'guardian':
if self.request.user.role == "guardian":
return {**context, **self.get_context_data_for_guardian()}

return context
Expand All@@ -78,187 +85,146 @@ def get_context_data_for_mentor(self):
mentor = get_object_or_404(Mentor, user=self.request.user)

orders = MentorOrder.objects.select_related().filter(
is_active=True,
mentor=mentor,
is_active=True, mentor=mentor,
)

upcoming_sessions = orders.filter(
is_active=True,
session__start_date__gte=timezone.now()
).order_by('session__start_date')
is_active=True, session__start_date__gte=timezone.now()
).order_by("session__start_date")

past_sessions = orders.filter(
is_active=True,
session__start_date__lte=timezone.now()
).order_by('session__start_date')
is_active=True, session__start_date__lte=timezone.now()
).order_by("session__start_date")

meeting_orders = MeetingOrder.objects.select_related().filter(
mentor=mentor
)
meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

upcoming_meetings = meeting_orders.filter(
is_active=True,
meeting__is_public=True,
meeting__end_date__gte=timezone.now()
).order_by('meeting__start_date')
meeting__end_date__gte=timezone.now(),
).order_by("meeting__start_date")

account_complete = False

if (
mentor.user.first_name and
mentor.user.last_name and
mentor.avatar and
mentor.background_check and
past_sessions.count() > 0
mentor.user.first_name
and mentor.user.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
):
account_complete = True

return {
'mentor': mentor,
'orders': orders,
'upcoming_sessions': upcoming_sessions,
'past_sessions': upcoming_sessions,
'meeting_orders': meeting_orders,
'upcoming_meetings': upcoming_meetings,
'account_complete': account_complete
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": upcoming_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
}

def get_context_data_for_guardian(self):
guardian = get_object_or_404(
Guardian,
user=self.request.user
)
guardian = get_object_or_404(Guardian, user=self.request.user)

students = Student.objects.filter(
is_active=True,
guardian=guardian,
)
students = Student.objects.filter(is_active=True, guardian=guardian,)

student_orders = Order.objects.filter(
student__in=students,
)
student_orders = Order.objects.filter(student__in=students,)

upcoming_orders = student_orders.filter(
is_active=True,
session__start_date__gte=timezone.now(),
).order_by('session__start_date')
is_active=True, session__start_date__gte=timezone.now(),
).order_by("session__start_date")

past_orders = student_orders.filter(
is_active=True,
session__start_date__lte=timezone.now(),
).order_by('session__start_date')
is_active=True, session__start_date__lte=timezone.now(),
).order_by("session__start_date")

return {
'guardian': guardian,
'students': students,
'student_orders': student_orders,
'upcoming_orders': upcoming_orders,
'past_orders': past_orders,
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
}

def get(self, *args, **kwargs):
if self.request.user.role == 'mentor':
if self.request.user.role == "mentor":
return self.get_for_mentor(**kwargs)

if self.request.user.role == 'guardian':
if self.request.user.role == "guardian":
return self.get_for_guardian(**kwargs)

def get_for_mentor(self, **kwargs):
context = self.get_context_data(**kwargs)

context['form'] = MentorForm(instance=context['mentor'])
context['user_form'] = CDCModelForm(instance=context['mentor'].user)
context["form"] = MentorForm(instance=context["mentor"])
context["user_form"] = CDCModelForm(instance=context["mentor"].user)

return render(self.request, 'account/mentor/home.html', context)
return render(self.request, "account/mentor/home.html", context)

def get_for_guardian(self, **kwargs):
context = self.get_context_data(**kwargs)

context['form'] = GuardianForm(instance=context['guardian'])
context['user_form'] = CDCModelForm(instance=context['guardian'].user)
context["form"] = GuardianForm(instance=context["guardian"])
context["user_form"] = CDCModelForm(instance=context["guardian"].user)

return render(self.request, 'account/guardian/home.html', context)
return render(self.request, "account/guardian/home.html", context)

def post(self, *args, **kwargs):
if self.request.user.role == 'mentor':
if self.request.user.role == "mentor":
return self.post_for_mentor(**kwargs)

if self.request.user.role == 'guardian':
if self.request.user.role == "guardian":
return self.post_for_guardian(**kwargs)

def post_for_mentor(self, **kwargs):
context = self.get_context_data(**kwargs)

mentor = context['mentor']
mentor = context["mentor"]

form = MentorForm(
self.request.POST,
self.request.FILES,
instance=mentor
)
form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)

user_form = CDCModelForm(
self.request.POST,
self.request.FILES,
instance=mentor.user
self.request.POST, self.request.FILES, instance=mentor.user
)

if (
form.is_valid() and
user_form.is_valid()
):
if form.is_valid() and user_form.is_valid():
form.save()
user_form.save()
messages.success(
self.request,
'Profile information saved.'
)
messages.success(self.request, "Profile information saved.")

return redirect('account_home')
return redirect("account_home")

else:
messages.error(
self.request,
'There was an error. Please try again.'
)
messages.error(self.request, "There was an error. Please try again.")

context['form'] = form
context['user_form'] = user_form
context["form"] = form
context["user_form"] = user_form

return render(self.request, 'account/mentor/home.html', context)
return render(self.request, "account/mentor/home.html", context)

def post_for_guardian(self, **kwargs):
context = self.get_context_data(**kwargs)

guardian = context['guardian']
guardian = context["guardian"]

form = GuardianForm(
self.request.POST,
instance=guardian
)
form = GuardianForm(self.request.POST, instance=guardian)

user_form = CDCModelForm(
self.request.POST,
instance=guardian.user
)
user_form = CDCModelForm(self.request.POST, instance=guardian.user)

if form.is_valid() and user_form.is_valid():
form.save()
user_form.save()
messages.success(
self.request,
'Profile information saved.'
)
messages.success(self.request, "Profile information saved.")

return redirect('account_home')
return redirect("account_home")

else:
messages.error(
self.request,
'There was an error. Please try again.'
)
messages.error(self.request, "There was an error. Please try again.")

context["form"] = form
context["user_form"] = user_form

context['form'] = form
context['user_form'] = user_form
return render(self.request, "account/guardian/home.html", context)

return render(self.request, 'account/guardian/home.html', context)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Update packages#831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 6 commits into

from

Dec 29, 2020
 Merged


Update packages
#831
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1d93be3

Update packages


karbassi Nov 11, 2020
55db2c8

Remove settings.SITE_NAME and replace with text


karbassi Nov 11, 2020
d01dd68

Update settings.py with hardcoded SITE_NAME to solve any issues.


karbassi Nov 11, 2020
30d0e32

Merge remote-tracking branch 'upstream/master' into hotfix/update-pac…


karbassi Dec 28, 2020
f5d4856

Remove SITE_NAME and replace with hardcoded text


karbassi Dec 28, 2020
9077104

Upgrade packages to latest


karbassi Dec 28, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
DEBUG=True
ENABLE_DEV_FIXTURES=True

SITE_NAME=We All Code
SITE_URL=http://localhost:8000
SECRET_KEY=CHANGEME
DJANGO_SECURE_SSL_REDIRECT=False
Expand Down

2 changes: 1 addition & 1 deletion
Pipfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ json-logging-py = "*"
django-anymail = "*"
django-meta = "*"
django-environ = "*"
sentry-sdk = "==0.14.3"
sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
Expand Down

276 changes: 181 additions & 95 deletions
Pipfile.lock

View file


Open in desktop


Large diffs are not rendered by default.


11 changes: 0 additions & 11 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-dojo{% endblock %}

{% block contained_content %}
Expand Down

11 changes: 0 additions & 11 deletions
accounts/templates/account/mentor/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-account{% endblock %}

{% block contained_content %}
Expand Down

208 changes: 87 additions & 121 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,19 @@
from meta.views import MetadataMixin

from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
from coderdojochi.models import (
 Guardian,
 MeetingOrder,
 Mentor,
 MentorOrder,
 Order,
 Student,
)


class SignupView(MetadataMixin, AllAuthSignupView):
 template_name = 'account/signup.html'
 title = f"Sign up | {settings.SITE_NAME}"
 template_name = "account/signup.html"
 title = "Sign up | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -28,8 +35,8 @@ class SignupView(MetadataMixin, AllAuthSignupView):


class LoginView(MetadataMixin, AllAuthLoginView):
 template_name = 'account/login.html'
 title = f"Login | {settings.SITE_NAME}"
 template_name = "account/login.html"
 title = "Login | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -40,36 +47,36 @@ class LoginView(MetadataMixin, AllAuthLoginView):
 twitter_creator = "@weallcode"


@method_decorator(login_required, name='dispatch')
class AccountHomeView(TemplateView):
@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if 'next' in self.request.GET:
 return redirect(
 f"{reverse('welcome')}?next={self.request.GET['next']}"
 )
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
'Tell us a little about yourself before going on account.'
"Tell us a little about yourself before going on account.",
 )
 return redirect('welcome')
 return redirect("welcome")

 return super().dispatch(*args, **kwargs)

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 context['highlight'] = (
 self.request.GET['highlight'] if 'highlight' in self.request.GET else False
 context["highlight"] = (
 self.request.GET["highlight"] if "highlight" in self.request.GET else False
 )

 context['user'] = self.request.user
 context["user"] = self.request.user

 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context
Expand All@@ -78,187 +85,146 @@ def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 is_active=True, mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now()
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now()
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor
 )
 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now()
 ).order_by('meeting__start_date')
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.user.first_name and
 mentor.user.last_name and
 mentor.avatar and
 mentor.background_check and
 past_sessions.count() > 0
 mentor.user.first_name
and mentor.user.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
 ):
 account_complete = True

 return {
'mentor': mentor,
'orders': orders,
'upcoming_sessions': upcoming_sessions,
'past_sessions': upcoming_sessions,
'meeting_orders': meeting_orders,
'upcoming_meetings': upcoming_meetings,
'account_complete': account_complete
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": upcoming_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user
 )
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 )
 students = Student.objects.filter(is_active=True, guardian=guardian,)

 student_orders = Order.objects.filter(
 student__in=students,
 )
 student_orders = Order.objects.filter(student__in=students,)

 upcoming_orders = student_orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_orders = student_orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
'guardian': guardian,
'students': students,
'student_orders': student_orders,
'upcoming_orders': upcoming_orders,
'past_orders': past_orders,
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = MentorForm(instance=context['mentor'])
 context['user_form'] = CDCModelForm(instance=context['mentor'].user)
 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def get_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = GuardianForm(instance=context['guardian'])
 context['user_form'] = CDCModelForm(instance=context['guardian'].user)
 context["form"] = GuardianForm(instance=context["guardian"])
 context["user_form"] = CDCModelForm(instance=context["guardian"].user)

 return render(self.request, 'account/guardian/home.html', context)
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 mentor = context['mentor']
 mentor = context["mentor"]

 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor
 )
 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)

 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user
 self.request.POST, self.request.FILES, instance=mentor.user
 )

 if (
 form.is_valid() and
 user_form.is_valid()
 ):
 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

 context['form'] = form
 context['user_form'] = user_form
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 guardian = context['guardian']
 guardian = context["guardian"]

 form = GuardianForm(
 self.request.POST,
 instance=guardian
 )
 form = GuardianForm(self.request.POST, instance=guardian)

 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user
 )
 user_form = CDCModelForm(self.request.POST, instance=guardian.user)

 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

context["form"] = form
context["user_form"] = user_form

 context['form'] = form
 context['user_form'] = user_form
 return render(self.request, "account/guardian/home.html", context)

 return render(self.request, 'account/guardian/home.html', context)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update packages#831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 6 commits into

from

Dec 29, 2020
 Merged


Update packages
#831
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1d93be3

Update packages


karbassi Nov 11, 2020
55db2c8

Remove settings.SITE_NAME and replace with text


karbassi Nov 11, 2020
d01dd68

Update settings.py with hardcoded SITE_NAME to solve any issues.


karbassi Nov 11, 2020
30d0e32

Merge remote-tracking branch 'upstream/master' into hotfix/update-pac…


karbassi Dec 28, 2020
f5d4856

Remove SITE_NAME and replace with hardcoded text


karbassi Dec 28, 2020
9077104

Upgrade packages to latest


karbassi Dec 28, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
DEBUG=True
ENABLE_DEV_FIXTURES=True

SITE_NAME=We All Code
SITE_URL=http://localhost:8000
SECRET_KEY=CHANGEME
DJANGO_SECURE_SSL_REDIRECT=False
Expand Down

2 changes: 1 addition & 1 deletion
Pipfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ json-logging-py = "*"
django-anymail = "*"
django-meta = "*"
django-environ = "*"
sentry-sdk = "==0.14.3"
sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
Expand Down

276 changes: 181 additions & 95 deletions
Pipfile.lock

View file


Open in desktop


Large diffs are not rendered by default.


11 changes: 0 additions & 11 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-dojo{% endblock %}

{% block contained_content %}
Expand Down

11 changes: 0 additions & 11 deletions
accounts/templates/account/mentor/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-account{% endblock %}

{% block contained_content %}
Expand Down

208 changes: 87 additions & 121 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,19 @@
from meta.views import MetadataMixin

from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
from coderdojochi.models import (
 Guardian,
 MeetingOrder,
 Mentor,
 MentorOrder,
 Order,
 Student,
)


class SignupView(MetadataMixin, AllAuthSignupView):
 template_name = 'account/signup.html'
 title = f"Sign up | {settings.SITE_NAME}"
 template_name = "account/signup.html"
 title = "Sign up | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -28,8 +35,8 @@ class SignupView(MetadataMixin, AllAuthSignupView):


class LoginView(MetadataMixin, AllAuthLoginView):
 template_name = 'account/login.html'
 title = f"Login | {settings.SITE_NAME}"
 template_name = "account/login.html"
 title = "Login | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -40,36 +47,36 @@ class LoginView(MetadataMixin, AllAuthLoginView):
 twitter_creator = "@weallcode"


@method_decorator(login_required, name='dispatch')
class AccountHomeView(TemplateView):
@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if 'next' in self.request.GET:
 return redirect(
 f"{reverse('welcome')}?next={self.request.GET['next']}"
 )
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
'Tell us a little about yourself before going on account.'
"Tell us a little about yourself before going on account.",
 )
 return redirect('welcome')
 return redirect("welcome")

 return super().dispatch(*args, **kwargs)

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 context['highlight'] = (
 self.request.GET['highlight'] if 'highlight' in self.request.GET else False
 context["highlight"] = (
 self.request.GET["highlight"] if "highlight" in self.request.GET else False
 )

 context['user'] = self.request.user
 context["user"] = self.request.user

 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context
Expand All@@ -78,187 +85,146 @@ def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 is_active=True, mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now()
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now()
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor
 )
 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now()
 ).order_by('meeting__start_date')
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.user.first_name and
 mentor.user.last_name and
 mentor.avatar and
 mentor.background_check and
 past_sessions.count() > 0
 mentor.user.first_name
and mentor.user.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
 ):
 account_complete = True

 return {
'mentor': mentor,
'orders': orders,
'upcoming_sessions': upcoming_sessions,
'past_sessions': upcoming_sessions,
'meeting_orders': meeting_orders,
'upcoming_meetings': upcoming_meetings,
'account_complete': account_complete
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": upcoming_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user
 )
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 )
 students = Student.objects.filter(is_active=True, guardian=guardian,)

 student_orders = Order.objects.filter(
 student__in=students,
 )
 student_orders = Order.objects.filter(student__in=students,)

 upcoming_orders = student_orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_orders = student_orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
'guardian': guardian,
'students': students,
'student_orders': student_orders,
'upcoming_orders': upcoming_orders,
'past_orders': past_orders,
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = MentorForm(instance=context['mentor'])
 context['user_form'] = CDCModelForm(instance=context['mentor'].user)
 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def get_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = GuardianForm(instance=context['guardian'])
 context['user_form'] = CDCModelForm(instance=context['guardian'].user)
 context["form"] = GuardianForm(instance=context["guardian"])
 context["user_form"] = CDCModelForm(instance=context["guardian"].user)

 return render(self.request, 'account/guardian/home.html', context)
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 mentor = context['mentor']
 mentor = context["mentor"]

 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor
 )
 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)

 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user
 self.request.POST, self.request.FILES, instance=mentor.user
 )

 if (
 form.is_valid() and
 user_form.is_valid()
 ):
 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

 context['form'] = form
 context['user_form'] = user_form
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 guardian = context['guardian']
 guardian = context["guardian"]

 form = GuardianForm(
 self.request.POST,
 instance=guardian
 )
 form = GuardianForm(self.request.POST, instance=guardian)

 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user
 )
 user_form = CDCModelForm(self.request.POST, instance=guardian.user)

 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

context["form"] = form
context["user_form"] = user_form

 context['form'] = form
 context['user_form'] = user_form
 return render(self.request, "account/guardian/home.html", context)

 return render(self.request, 'account/guardian/home.html', context)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update packages#831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 6 commits into

from

Dec 29, 2020
 Merged


Update packages
#831
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1d93be3

Update packages


karbassi Nov 11, 2020
55db2c8

Remove settings.SITE_NAME and replace with text


karbassi Nov 11, 2020
d01dd68

Update settings.py with hardcoded SITE_NAME to solve any issues.


karbassi Nov 11, 2020
30d0e32

Merge remote-tracking branch 'upstream/master' into hotfix/update-pac…


karbassi Dec 28, 2020
f5d4856

Remove SITE_NAME and replace with hardcoded text


karbassi Dec 28, 2020
9077104

Upgrade packages to latest


karbassi Dec 28, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
DEBUG=True
ENABLE_DEV_FIXTURES=True

SITE_NAME=We All Code
SITE_URL=http://localhost:8000
SECRET_KEY=CHANGEME
DJANGO_SECURE_SSL_REDIRECT=False
Expand Down

2 changes: 1 addition & 1 deletion
Pipfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ json-logging-py = "*"
django-anymail = "*"
django-meta = "*"
django-environ = "*"
sentry-sdk = "==0.14.3"
sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
Expand Down

276 changes: 181 additions & 95 deletions
Pipfile.lock

View file


Open in desktop


Large diffs are not rendered by default.


11 changes: 0 additions & 11 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-dojo{% endblock %}

{% block contained_content %}
Expand Down

11 changes: 0 additions & 11 deletions
accounts/templates/account/mentor/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-account{% endblock %}

{% block contained_content %}
Expand Down

208 changes: 87 additions & 121 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,19 @@
from meta.views import MetadataMixin

from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
from coderdojochi.models import (
 Guardian,
 MeetingOrder,
 Mentor,
 MentorOrder,
 Order,
 Student,
)


class SignupView(MetadataMixin, AllAuthSignupView):
 template_name = 'account/signup.html'
 title = f"Sign up | {settings.SITE_NAME}"
 template_name = "account/signup.html"
 title = "Sign up | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -28,8 +35,8 @@ class SignupView(MetadataMixin, AllAuthSignupView):


class LoginView(MetadataMixin, AllAuthLoginView):
 template_name = 'account/login.html'
 title = f"Login | {settings.SITE_NAME}"
 template_name = "account/login.html"
 title = "Login | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -40,36 +47,36 @@ class LoginView(MetadataMixin, AllAuthLoginView):
 twitter_creator = "@weallcode"


@method_decorator(login_required, name='dispatch')
class AccountHomeView(TemplateView):
@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if 'next' in self.request.GET:
 return redirect(
 f"{reverse('welcome')}?next={self.request.GET['next']}"
 )
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
'Tell us a little about yourself before going on account.'
"Tell us a little about yourself before going on account.",
 )
 return redirect('welcome')
 return redirect("welcome")

 return super().dispatch(*args, **kwargs)

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 context['highlight'] = (
 self.request.GET['highlight'] if 'highlight' in self.request.GET else False
 context["highlight"] = (
 self.request.GET["highlight"] if "highlight" in self.request.GET else False
 )

 context['user'] = self.request.user
 context["user"] = self.request.user

 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context
Expand All@@ -78,187 +85,146 @@ def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 is_active=True, mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now()
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now()
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor
 )
 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now()
 ).order_by('meeting__start_date')
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.user.first_name and
 mentor.user.last_name and
 mentor.avatar and
 mentor.background_check and
 past_sessions.count() > 0
 mentor.user.first_name
and mentor.user.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
 ):
 account_complete = True

 return {
'mentor': mentor,
'orders': orders,
'upcoming_sessions': upcoming_sessions,
'past_sessions': upcoming_sessions,
'meeting_orders': meeting_orders,
'upcoming_meetings': upcoming_meetings,
'account_complete': account_complete
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": upcoming_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user
 )
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 )
 students = Student.objects.filter(is_active=True, guardian=guardian,)

 student_orders = Order.objects.filter(
 student__in=students,
 )
 student_orders = Order.objects.filter(student__in=students,)

 upcoming_orders = student_orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_orders = student_orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
'guardian': guardian,
'students': students,
'student_orders': student_orders,
'upcoming_orders': upcoming_orders,
'past_orders': past_orders,
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = MentorForm(instance=context['mentor'])
 context['user_form'] = CDCModelForm(instance=context['mentor'].user)
 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def get_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = GuardianForm(instance=context['guardian'])
 context['user_form'] = CDCModelForm(instance=context['guardian'].user)
 context["form"] = GuardianForm(instance=context["guardian"])
 context["user_form"] = CDCModelForm(instance=context["guardian"].user)

 return render(self.request, 'account/guardian/home.html', context)
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 mentor = context['mentor']
 mentor = context["mentor"]

 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor
 )
 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)

 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user
 self.request.POST, self.request.FILES, instance=mentor.user
 )

 if (
 form.is_valid() and
 user_form.is_valid()
 ):
 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

 context['form'] = form
 context['user_form'] = user_form
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 guardian = context['guardian']
 guardian = context["guardian"]

 form = GuardianForm(
 self.request.POST,
 instance=guardian
 )
 form = GuardianForm(self.request.POST, instance=guardian)

 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user
 )
 user_form = CDCModelForm(self.request.POST, instance=guardian.user)

 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

context["form"] = form
context["user_form"] = user_form

 context['form'] = form
 context['user_form'] = user_form
 return render(self.request, "account/guardian/home.html", context)

 return render(self.request, 'account/guardian/home.html', context)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Update packages#831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 6 commits into

from

Dec 29, 2020
 Merged


Update packages
#831
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1d93be3

Update packages


karbassi Nov 11, 2020
55db2c8

Remove settings.SITE_NAME and replace with text


karbassi Nov 11, 2020
d01dd68

Update settings.py with hardcoded SITE_NAME to solve any issues.


karbassi Nov 11, 2020
30d0e32

Merge remote-tracking branch 'upstream/master' into hotfix/update-pac…


karbassi Dec 28, 2020
f5d4856

Remove SITE_NAME and replace with hardcoded text


karbassi Dec 28, 2020
9077104

Upgrade packages to latest


karbassi Dec 28, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
DEBUG=True
ENABLE_DEV_FIXTURES=True

SITE_NAME=We All Code
SITE_URL=http://localhost:8000
SECRET_KEY=CHANGEME
DJANGO_SECURE_SSL_REDIRECT=False
Expand Down

2 changes: 1 addition & 1 deletion
Pipfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ json-logging-py = "*"
django-anymail = "*"
django-meta = "*"
django-environ = "*"
sentry-sdk = "==0.14.3"
sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
Expand Down

276 changes: 181 additions & 95 deletions
Pipfile.lock

View file


Open in desktop


Large diffs are not rendered by default.


11 changes: 0 additions & 11 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-dojo{% endblock %}

{% block contained_content %}
Expand Down

11 changes: 0 additions & 11 deletions
accounts/templates/account/mentor/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-account{% endblock %}

{% block contained_content %}
Expand Down

208 changes: 87 additions & 121 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,19 @@
from meta.views import MetadataMixin

from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
from coderdojochi.models import (
 Guardian,
 MeetingOrder,
 Mentor,
 MentorOrder,
 Order,
 Student,
)


class SignupView(MetadataMixin, AllAuthSignupView):
 template_name = 'account/signup.html'
 title = f"Sign up | {settings.SITE_NAME}"
 template_name = "account/signup.html"
 title = "Sign up | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -28,8 +35,8 @@ class SignupView(MetadataMixin, AllAuthSignupView):


class LoginView(MetadataMixin, AllAuthLoginView):
 template_name = 'account/login.html'
 title = f"Login | {settings.SITE_NAME}"
 template_name = "account/login.html"
 title = "Login | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -40,36 +47,36 @@ class LoginView(MetadataMixin, AllAuthLoginView):
 twitter_creator = "@weallcode"


@method_decorator(login_required, name='dispatch')
class AccountHomeView(TemplateView):
@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if 'next' in self.request.GET:
 return redirect(
 f"{reverse('welcome')}?next={self.request.GET['next']}"
 )
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
'Tell us a little about yourself before going on account.'
"Tell us a little about yourself before going on account.",
 )
 return redirect('welcome')
 return redirect("welcome")

 return super().dispatch(*args, **kwargs)

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 context['highlight'] = (
 self.request.GET['highlight'] if 'highlight' in self.request.GET else False
 context["highlight"] = (
 self.request.GET["highlight"] if "highlight" in self.request.GET else False
 )

 context['user'] = self.request.user
 context["user"] = self.request.user

 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context
Expand All@@ -78,187 +85,146 @@ def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 is_active=True, mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now()
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now()
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor
 )
 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now()
 ).order_by('meeting__start_date')
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.user.first_name and
 mentor.user.last_name and
 mentor.avatar and
 mentor.background_check and
 past_sessions.count() > 0
 mentor.user.first_name
and mentor.user.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
 ):
 account_complete = True

 return {
'mentor': mentor,
'orders': orders,
'upcoming_sessions': upcoming_sessions,
'past_sessions': upcoming_sessions,
'meeting_orders': meeting_orders,
'upcoming_meetings': upcoming_meetings,
'account_complete': account_complete
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": upcoming_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user
 )
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 )
 students = Student.objects.filter(is_active=True, guardian=guardian,)

 student_orders = Order.objects.filter(
 student__in=students,
 )
 student_orders = Order.objects.filter(student__in=students,)

 upcoming_orders = student_orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_orders = student_orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
'guardian': guardian,
'students': students,
'student_orders': student_orders,
'upcoming_orders': upcoming_orders,
'past_orders': past_orders,
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = MentorForm(instance=context['mentor'])
 context['user_form'] = CDCModelForm(instance=context['mentor'].user)
 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def get_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = GuardianForm(instance=context['guardian'])
 context['user_form'] = CDCModelForm(instance=context['guardian'].user)
 context["form"] = GuardianForm(instance=context["guardian"])
 context["user_form"] = CDCModelForm(instance=context["guardian"].user)

 return render(self.request, 'account/guardian/home.html', context)
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 mentor = context['mentor']
 mentor = context["mentor"]

 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor
 )
 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)

 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user
 self.request.POST, self.request.FILES, instance=mentor.user
 )

 if (
 form.is_valid() and
 user_form.is_valid()
 ):
 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

 context['form'] = form
 context['user_form'] = user_form
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 guardian = context['guardian']
 guardian = context["guardian"]

 form = GuardianForm(
 self.request.POST,
 instance=guardian
 )
 form = GuardianForm(self.request.POST, instance=guardian)

 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user
 )
 user_form = CDCModelForm(self.request.POST, instance=guardian.user)

 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

context["form"] = form
context["user_form"] = user_form

 context['form'] = form
 context['user_form'] = user_form
 return render(self.request, "account/guardian/home.html", context)

 return render(self.request, 'account/guardian/home.html', context)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update packages#831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 6 commits into

from

Dec 29, 2020
 Merged


Update packages
#831
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1d93be3

Update packages


karbassi Nov 11, 2020
55db2c8

Remove settings.SITE_NAME and replace with text


karbassi Nov 11, 2020
d01dd68

Update settings.py with hardcoded SITE_NAME to solve any issues.


karbassi Nov 11, 2020
30d0e32

Merge remote-tracking branch 'upstream/master' into hotfix/update-pac…


karbassi Dec 28, 2020
f5d4856

Remove SITE_NAME and replace with hardcoded text


karbassi Dec 28, 2020
9077104

Upgrade packages to latest


karbassi Dec 28, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
DEBUG=True
ENABLE_DEV_FIXTURES=True

SITE_NAME=We All Code
SITE_URL=http://localhost:8000
SECRET_KEY=CHANGEME
DJANGO_SECURE_SSL_REDIRECT=False
Expand Down

2 changes: 1 addition & 1 deletion
Pipfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ json-logging-py = "*"
django-anymail = "*"
django-meta = "*"
django-environ = "*"
sentry-sdk = "==0.14.3"
sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
Expand Down

276 changes: 181 additions & 95 deletions
Pipfile.lock

View file


Open in desktop


Large diffs are not rendered by default.


11 changes: 0 additions & 11 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-dojo{% endblock %}

{% block contained_content %}
Expand Down

11 changes: 0 additions & 11 deletions
accounts/templates/account/mentor/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-account{% endblock %}

{% block contained_content %}
Expand Down

208 changes: 87 additions & 121 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,19 @@
from meta.views import MetadataMixin

from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
from coderdojochi.models import (
 Guardian,
 MeetingOrder,
 Mentor,
 MentorOrder,
 Order,
 Student,
)


class SignupView(MetadataMixin, AllAuthSignupView):
 template_name = 'account/signup.html'
 title = f"Sign up | {settings.SITE_NAME}"
 template_name = "account/signup.html"
 title = "Sign up | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -28,8 +35,8 @@ class SignupView(MetadataMixin, AllAuthSignupView):


class LoginView(MetadataMixin, AllAuthLoginView):
 template_name = 'account/login.html'
 title = f"Login | {settings.SITE_NAME}"
 template_name = "account/login.html"
 title = "Login | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -40,36 +47,36 @@ class LoginView(MetadataMixin, AllAuthLoginView):
 twitter_creator = "@weallcode"


@method_decorator(login_required, name='dispatch')
class AccountHomeView(TemplateView):
@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if 'next' in self.request.GET:
 return redirect(
 f"{reverse('welcome')}?next={self.request.GET['next']}"
 )
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
'Tell us a little about yourself before going on account.'
"Tell us a little about yourself before going on account.",
 )
 return redirect('welcome')
 return redirect("welcome")

 return super().dispatch(*args, **kwargs)

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 context['highlight'] = (
 self.request.GET['highlight'] if 'highlight' in self.request.GET else False
 context["highlight"] = (
 self.request.GET["highlight"] if "highlight" in self.request.GET else False
 )

 context['user'] = self.request.user
 context["user"] = self.request.user

 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context
Expand All@@ -78,187 +85,146 @@ def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 is_active=True, mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now()
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now()
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor
 )
 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now()
 ).order_by('meeting__start_date')
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.user.first_name and
 mentor.user.last_name and
 mentor.avatar and
 mentor.background_check and
 past_sessions.count() > 0
 mentor.user.first_name
and mentor.user.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
 ):
 account_complete = True

 return {
'mentor': mentor,
'orders': orders,
'upcoming_sessions': upcoming_sessions,
'past_sessions': upcoming_sessions,
'meeting_orders': meeting_orders,
'upcoming_meetings': upcoming_meetings,
'account_complete': account_complete
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": upcoming_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user
 )
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 )
 students = Student.objects.filter(is_active=True, guardian=guardian,)

 student_orders = Order.objects.filter(
 student__in=students,
 )
 student_orders = Order.objects.filter(student__in=students,)

 upcoming_orders = student_orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_orders = student_orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
'guardian': guardian,
'students': students,
'student_orders': student_orders,
'upcoming_orders': upcoming_orders,
'past_orders': past_orders,
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = MentorForm(instance=context['mentor'])
 context['user_form'] = CDCModelForm(instance=context['mentor'].user)
 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def get_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = GuardianForm(instance=context['guardian'])
 context['user_form'] = CDCModelForm(instance=context['guardian'].user)
 context["form"] = GuardianForm(instance=context["guardian"])
 context["user_form"] = CDCModelForm(instance=context["guardian"].user)

 return render(self.request, 'account/guardian/home.html', context)
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 mentor = context['mentor']
 mentor = context["mentor"]

 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor
 )
 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)

 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user
 self.request.POST, self.request.FILES, instance=mentor.user
 )

 if (
 form.is_valid() and
 user_form.is_valid()
 ):
 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

 context['form'] = form
 context['user_form'] = user_form
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 guardian = context['guardian']
 guardian = context["guardian"]

 form = GuardianForm(
 self.request.POST,
 instance=guardian
 )
 form = GuardianForm(self.request.POST, instance=guardian)

 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user
 )
 user_form = CDCModelForm(self.request.POST, instance=guardian.user)

 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

context["form"] = form
context["user_form"] = user_form

 context['form'] = form
 context['user_form'] = user_form
 return render(self.request, "account/guardian/home.html", context)

 return render(self.request, 'account/guardian/home.html', context)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update packages#831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 6 commits into

from

Dec 29, 2020
 Merged


Update packages
#831
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1d93be3

Update packages


karbassi Nov 11, 2020
55db2c8

Remove settings.SITE_NAME and replace with text


karbassi Nov 11, 2020
d01dd68

Update settings.py with hardcoded SITE_NAME to solve any issues.


karbassi Nov 11, 2020
30d0e32

Merge remote-tracking branch 'upstream/master' into hotfix/update-pac…


karbassi Dec 28, 2020
f5d4856

Remove SITE_NAME and replace with hardcoded text


karbassi Dec 28, 2020
9077104

Upgrade packages to latest


karbassi Dec 28, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
DEBUG=True
ENABLE_DEV_FIXTURES=True

SITE_NAME=We All Code
SITE_URL=http://localhost:8000
SECRET_KEY=CHANGEME
DJANGO_SECURE_SSL_REDIRECT=False
Expand Down

2 changes: 1 addition & 1 deletion
Pipfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ json-logging-py = "*"
django-anymail = "*"
django-meta = "*"
django-environ = "*"
sentry-sdk = "==0.14.3"
sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
Expand Down

276 changes: 181 additions & 95 deletions
Pipfile.lock

View file


Open in desktop


Large diffs are not rendered by default.


11 changes: 0 additions & 11 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-dojo{% endblock %}

{% block contained_content %}
Expand Down

11 changes: 0 additions & 11 deletions
accounts/templates/account/mentor/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-account{% endblock %}

{% block contained_content %}
Expand Down

208 changes: 87 additions & 121 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,19 @@
from meta.views import MetadataMixin

from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
from coderdojochi.models import (
 Guardian,
 MeetingOrder,
 Mentor,
 MentorOrder,
 Order,
 Student,
)


class SignupView(MetadataMixin, AllAuthSignupView):
 template_name = 'account/signup.html'
 title = f"Sign up | {settings.SITE_NAME}"
 template_name = "account/signup.html"
 title = "Sign up | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -28,8 +35,8 @@ class SignupView(MetadataMixin, AllAuthSignupView):


class LoginView(MetadataMixin, AllAuthLoginView):
 template_name = 'account/login.html'
 title = f"Login | {settings.SITE_NAME}"
 template_name = "account/login.html"
 title = "Login | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -40,36 +47,36 @@ class LoginView(MetadataMixin, AllAuthLoginView):
 twitter_creator = "@weallcode"


@method_decorator(login_required, name='dispatch')
class AccountHomeView(TemplateView):
@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if 'next' in self.request.GET:
 return redirect(
 f"{reverse('welcome')}?next={self.request.GET['next']}"
 )
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
'Tell us a little about yourself before going on account.'
"Tell us a little about yourself before going on account.",
 )
 return redirect('welcome')
 return redirect("welcome")

 return super().dispatch(*args, **kwargs)

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 context['highlight'] = (
 self.request.GET['highlight'] if 'highlight' in self.request.GET else False
 context["highlight"] = (
 self.request.GET["highlight"] if "highlight" in self.request.GET else False
 )

 context['user'] = self.request.user
 context["user"] = self.request.user

 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context
Expand All@@ -78,187 +85,146 @@ def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 is_active=True, mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now()
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now()
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor
 )
 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now()
 ).order_by('meeting__start_date')
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.user.first_name and
 mentor.user.last_name and
 mentor.avatar and
 mentor.background_check and
 past_sessions.count() > 0
 mentor.user.first_name
and mentor.user.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
 ):
 account_complete = True

 return {
'mentor': mentor,
'orders': orders,
'upcoming_sessions': upcoming_sessions,
'past_sessions': upcoming_sessions,
'meeting_orders': meeting_orders,
'upcoming_meetings': upcoming_meetings,
'account_complete': account_complete
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": upcoming_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user
 )
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 )
 students = Student.objects.filter(is_active=True, guardian=guardian,)

 student_orders = Order.objects.filter(
 student__in=students,
 )
 student_orders = Order.objects.filter(student__in=students,)

 upcoming_orders = student_orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_orders = student_orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
'guardian': guardian,
'students': students,
'student_orders': student_orders,
'upcoming_orders': upcoming_orders,
'past_orders': past_orders,
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = MentorForm(instance=context['mentor'])
 context['user_form'] = CDCModelForm(instance=context['mentor'].user)
 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def get_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = GuardianForm(instance=context['guardian'])
 context['user_form'] = CDCModelForm(instance=context['guardian'].user)
 context["form"] = GuardianForm(instance=context["guardian"])
 context["user_form"] = CDCModelForm(instance=context["guardian"].user)

 return render(self.request, 'account/guardian/home.html', context)
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 mentor = context['mentor']
 mentor = context["mentor"]

 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor
 )
 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)

 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user
 self.request.POST, self.request.FILES, instance=mentor.user
 )

 if (
 form.is_valid() and
 user_form.is_valid()
 ):
 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

 context['form'] = form
 context['user_form'] = user_form
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 guardian = context['guardian']
 guardian = context["guardian"]

 form = GuardianForm(
 self.request.POST,
 instance=guardian
 )
 form = GuardianForm(self.request.POST, instance=guardian)

 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user
 )
 user_form = CDCModelForm(self.request.POST, instance=guardian.user)

 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

context["form"] = form
context["user_form"] = user_form

 context['form'] = form
 context['user_form'] = user_form
 return render(self.request, "account/guardian/home.html", context)

 return render(self.request, 'account/guardian/home.html', context)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Update packages#831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

karbassi
merged 6 commits into

from

Dec 29, 2020
 Merged


Update packages
#831
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1d93be3

Update packages


karbassi Nov 11, 2020
55db2c8

Remove settings.SITE_NAME and replace with text


karbassi Nov 11, 2020
d01dd68

Update settings.py with hardcoded SITE_NAME to solve any issues.


karbassi Nov 11, 2020
30d0e32

Merge remote-tracking branch 'upstream/master' into hotfix/update-pac…


karbassi Dec 28, 2020
f5d4856

Remove SITE_NAME and replace with hardcoded text


karbassi Dec 28, 2020
9077104

Upgrade packages to latest


karbassi Dec 28, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
DEBUG=True
ENABLE_DEV_FIXTURES=True

SITE_NAME=We All Code
SITE_URL=http://localhost:8000
SECRET_KEY=CHANGEME
DJANGO_SECURE_SSL_REDIRECT=False
Expand Down

2 changes: 1 addition & 1 deletion
Pipfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ json-logging-py = "*"
django-anymail = "*"
django-meta = "*"
django-environ = "*"
sentry-sdk = "==0.14.3"
sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
Expand Down

276 changes: 181 additions & 95 deletions
Pipfile.lock

View file


Open in desktop


Large diffs are not rendered by default.


11 changes: 0 additions & 11 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-dojo{% endblock %}

{% block contained_content %}
Expand Down

11 changes: 0 additions & 11 deletions
accounts/templates/account/mentor/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
{% extends "account/_base.html" %}
{% load bootstrap3 humanize coderdojochi_extras %}

{% block title %}My Account | {{ block.super }}{% endblock %}
{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}

{% comment %} {% block meta_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_facebook_description %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_description %}{% endblock %} {% endcomment %}

{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}

{% block body_class %}page-account{% endblock %}

{% block contained_content %}
Expand Down

208 changes: 87 additions & 121 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,12 +11,19 @@
from meta.views import MetadataMixin

from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
from coderdojochi.models import (
 Guardian,
 MeetingOrder,
 Mentor,
 MentorOrder,
 Order,
 Student,
)


class SignupView(MetadataMixin, AllAuthSignupView):
 template_name = 'account/signup.html'
 title = f"Sign up | {settings.SITE_NAME}"
 template_name = "account/signup.html"
 title = "Sign up | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -28,8 +35,8 @@ class SignupView(MetadataMixin, AllAuthSignupView):


class LoginView(MetadataMixin, AllAuthLoginView):
 template_name = 'account/login.html'
 title = f"Login | {settings.SITE_NAME}"
 template_name = "account/login.html"
 title = "Login | We All Code"
 description = (
 "We All Code is volunteer run nonprofit organization that teaches web, game, and app development to "
 "youth ages 7 to 17 free of charge."
Expand All@@ -40,36 +47,36 @@ class LoginView(MetadataMixin, AllAuthLoginView):
 twitter_creator = "@weallcode"


@method_decorator(login_required, name='dispatch')
class AccountHomeView(TemplateView):
@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if 'next' in self.request.GET:
 return redirect(
 f"{reverse('welcome')}?next={self.request.GET['next']}"
 )
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
'Tell us a little about yourself before going on account.'
"Tell us a little about yourself before going on account.",
 )
 return redirect('welcome')
 return redirect("welcome")

 return super().dispatch(*args, **kwargs)

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 context['highlight'] = (
 self.request.GET['highlight'] if 'highlight' in self.request.GET else False
 context["highlight"] = (
 self.request.GET["highlight"] if "highlight" in self.request.GET else False
 )

 context['user'] = self.request.user
 context["user"] = self.request.user

 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context
Expand All@@ -78,187 +85,146 @@ def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 is_active=True, mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now()
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now()
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now()
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor
 )
 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now()
 ).order_by('meeting__start_date')
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.user.first_name and
 mentor.user.last_name and
 mentor.avatar and
 mentor.background_check and
 past_sessions.count() > 0
 mentor.user.first_name
and mentor.user.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
 ):
 account_complete = True

 return {
'mentor': mentor,
'orders': orders,
'upcoming_sessions': upcoming_sessions,
'past_sessions': upcoming_sessions,
'meeting_orders': meeting_orders,
'upcoming_meetings': upcoming_meetings,
'account_complete': account_complete
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": upcoming_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user
 )
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 )
 students = Student.objects.filter(is_active=True, guardian=guardian,)

 student_orders = Order.objects.filter(
 student__in=students,
 )
 student_orders = Order.objects.filter(student__in=students,)

 upcoming_orders = student_orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_orders = student_orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by('session__start_date')
 is_active=True, session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
'guardian': guardian,
'students': students,
'student_orders': student_orders,
'upcoming_orders': upcoming_orders,
'past_orders': past_orders,
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = MentorForm(instance=context['mentor'])
 context['user_form'] = CDCModelForm(instance=context['mentor'].user)
 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def get_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context['form'] = GuardianForm(instance=context['guardian'])
 context['user_form'] = CDCModelForm(instance=context['guardian'].user)
 context["form"] = GuardianForm(instance=context["guardian"])
 context["user_form"] = CDCModelForm(instance=context["guardian"].user)

 return render(self.request, 'account/guardian/home.html', context)
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == 'mentor':
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == 'guardian':
 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 mentor = context['mentor']
 mentor = context["mentor"]

 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor
 )
 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)

 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user
 self.request.POST, self.request.FILES, instance=mentor.user
 )

 if (
 form.is_valid() and
 user_form.is_valid()
 ):
 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

 context['form'] = form
 context['user_form'] = user_form
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, 'account/mentor/home.html', context)
 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 context = self.get_context_data(**kwargs)

 guardian = context['guardian']
 guardian = context["guardian"]

 form = GuardianForm(
 self.request.POST,
 instance=guardian
 )
 form = GuardianForm(self.request.POST, instance=guardian)

 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user
 )
 user_form = CDCModelForm(self.request.POST, instance=guardian.user)

 if form.is_valid() and user_form.is_valid():
 form.save()
 user_form.save()
 messages.success(
 self.request,
 'Profile information saved.'
 )
 messages.success(self.request, "Profile information saved.")

 return redirect('account_home')
 return redirect("account_home")

 else:
 messages.error(
 self.request,
 'There was an error. Please try again.'
 )
 messages.error(self.request, "There was an error. Please try again.")

context["form"] = form
context["user_form"] = user_form

 context['form'] = form
 context['user_form'] = user_form
 return render(self.request, "account/guardian/home.html", context)

 return render(self.request, 'account/guardian/home.html', context)
Loading