Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d6c8b91
Cleanup. Needs review
karbassi Aug 20, 2020
66ea3ef
Upgrade python 3.8.3 to 3.8.5
karbassi Aug 24, 2020
fab107d
Update packages
karbassi Aug 24, 2020
6d3a629
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 28, 2020
a70a5a5
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 29, 2020
8f573a0
Format
karbassi Dec 29, 2020
d702216
Clean up hard to read if-statements
karbassi Dec 29, 2020
1d62953
Cleanup
karbassi Jan 8, 2021
255b4a4
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 8, 2021
616141a
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
eca4f33
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
f50368a
Fix mentor file location
karbassi Jan 13, 2021
15eccd1
Run black 20.8b1
karbassi Jan 13, 2021
9442b24
Fix mismatched HTML tag.
rgroves Jan 13, 2021
36ee26e
Add format on startup for debug state
karbassi Jan 13, 2021
94eeb64
Fixed form content link
karbassi Jan 13, 2021
c5be5ec
Delete old files
karbassi Jan 13, 2021
b2a3c06
Fixed form content link
rgroves Jan 14, 2021
8984b2b
Fix unformatted string.
rgroves Jan 14, 2021
da85b31
Add missing context values required by template.
rgroves Jan 14, 2021
11de782
Fix attempt to filter object instance.
rgroves Jan 14, 2021
a3aea51
Fix to use past sessions for past sessions list.
rgroves Jan 14, 2021
2c2768b
Add missing context values required by template.
rgroves Jan 14, 2021
c098c9e
Fix bad class at capacity check.
rgroves Jan 14, 2021
412fa6c
avatar and model property helpers
karbassi Jan 14, 2021
2e8252b
meeting-check-in
karbassi Jan 15, 2021
d46600e
session-check-in-mentors
karbassi Jan 15, 2021
0199fed
session-check-in
karbassi Jan 15, 2021
493706d
session-donations
karbassi Jan 15, 2021
b4c54d3
session-stats
karbassi Jan 15, 2021
b28e871
session-sign-up
karbassi Jan 15, 2021
184953c
avatar-changed-mentor
karbassi Jan 15, 2021
0890c22
mentor-reject-avatar
karbassi Jan 15, 2021
3ecd632
class-announcement-guardian
karbassi Jan 15, 2021
f21b2b7
class-announcement-mentor
karbassi Jan 15, 2021
20918da
class-confirm-guardian
karbassi Jan 15, 2021
c42d534
_email-base
karbassi Jan 15, 2021
24dd9f2
class-confirm-mentor
karbassi Jan 15, 2021
eca8c59
class-reminder-guardian-24-hour
karbassi Jan 15, 2021
bca000a
class-reminder-guardian-one-week
karbassi Jan 15, 2021
f34a962
class-reminder-mentor-24-hour
karbassi Jan 15, 2021
4c2eaaf
class-reminder-mentor-one-week
karbassi Jan 15, 2021
159d975
contact-email
karbassi Jan 15, 2021
da53ca1
donation_receipt
karbassi Jan 15, 2021
d856719
meeting-announcement-mentor
karbassi Jan 15, 2021
cdba152
meeting-confirm-mentor
karbassi Jan 15, 2021
cd3277c
waitlist-offer-guardian.html
karbassi Jan 15, 2021
8c0b948
waitlist-offer-mentor
karbassi Jan 15, 2021
45691e4
welcome-{role}
karbassi Jan 15, 2021
ce729a9
_admin-base
karbassi Jan 15, 2021
a96e5c8
meeting-detail
karbassi Jan 15, 2021
d644efd
meeting-sign-up
karbassi Jan 15, 2021
a8b3474
session-sign-up
karbassi Jan 15, 2021
c236edb
session-partner-password
karbassi Jan 15, 2021
b9d214f
student-detail
karbassi Jan 15, 2021
6590867
programs-summer-camps
karbassi Jan 15, 2021
f1dec0e
_allauth-email-base
karbassi Jan 15, 2021
9237ff1
Format
karbassi Jan 15, 2021
65720e5
save db_views into fixtures
karbassi Jan 18, 2021
d8fc3f9
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 18, 2021
2499784
fix migration from merge
karbassi Jan 19, 2021
e7e9a19
Add full_name to Student model
karbassi Jan 20, 2021
1c16b9f
Remove username from email confirmation page
karbassi Jan 20, 2021
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
10 changes: 10 additions & 0 deletions .isort.cfg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
[settings]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
known_django = django
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
skip = venv/
skip_glob = **/migrations/*.py
force_grid_wrap = 0
use_parentheses = true
26 changes: 24 additions & 2 deletions .vscode/settings.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,15 @@
"emmet.includeLanguages": {
"django-html": "html"
},
"beautify.language": {
"js": {
"type": ["javascript", "json", "jsonc"],
"filename": [".jshintrc", ".jsbeautifyrc"]
},
"css": ["css", "less", "scss"],
"html": ["htm", "html", "django-html"]
},
"python.formatting.provider": "black",
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
Expand All@@ -32,10 +41,20 @@
"--enable=W0614", // Used when an imported module or variable is not used from a 'from X import *' style import.
"--load-plugins=pylint_django"
],
"python.autoComplete.extraPaths": ["./"],
"[python]": {
"editor.rulers": [120],
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": true,
"source.fixAll": true
}
},
"[django-html]": {
"editor.defaultFormatter": "HookyQR.beautify",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
}
},
"[git-commit]": {
Expand All@@ -50,5 +69,8 @@
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false
}
},
"python.analysis.extraPaths": [
"./"
]
}
2 changes: 0 additions & 2 deletions Pipfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,6 @@ sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
pylint = "*"
"autopep8" = "*"

[requires]
python_version = "3.9.1"
100 changes: 2 additions & 98 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions accounts/admin.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.contribimportadmin

# Register your models here.
2 changes: 1 addition & 1 deletion accounts/apps.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@


class AccountsConfig(AppConfig):
name = 'accounts'
name = "accounts"
2 changes: 0 additions & 2 deletions accounts/models.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.dbimportmodels

# Create your models here.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "_email-base.html" %}
{% extends "_email_base.html" %}

{% block subject %}{% block child_subject %}{% endblock %}{% endblock %}
{% block preheader %}{% block child_preheader %}{% endblock %}{% endblock %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load account i18n %}
{% user_display user as user_display %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load i18n %}

Expand Down
8 changes: 3 additions & 5 deletions accounts/templates/account/email_confirm.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,11 @@ <h1 class="title">{% trans "Confirm E-mail Address" %}</h1>

{% if confirmation %}

{% user_display confirmation.email_address.user as user_display %}

<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for your account.{% endblocktrans %}</p>

<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
</form>

{% else %}
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d6c8b91
Cleanup. Needs review
karbassi Aug 20, 2020
66ea3ef
Upgrade python 3.8.3 to 3.8.5
karbassi Aug 24, 2020
fab107d
Update packages
karbassi Aug 24, 2020
6d3a629
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 28, 2020
a70a5a5
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 29, 2020
8f573a0
Format
karbassi Dec 29, 2020
d702216
Clean up hard to read if-statements
karbassi Dec 29, 2020
1d62953
Cleanup
karbassi Jan 8, 2021
255b4a4
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 8, 2021
616141a
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
eca4f33
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
f50368a
Fix mentor file location
karbassi Jan 13, 2021
15eccd1
Run black 20.8b1
karbassi Jan 13, 2021
9442b24
Fix mismatched HTML tag.
rgroves Jan 13, 2021
36ee26e
Add format on startup for debug state
karbassi Jan 13, 2021
94eeb64
Fixed form content link
karbassi Jan 13, 2021
c5be5ec
Delete old files
karbassi Jan 13, 2021
b2a3c06
Fixed form content link
rgroves Jan 14, 2021
8984b2b
Fix unformatted string.
rgroves Jan 14, 2021
da85b31
Add missing context values required by template.
rgroves Jan 14, 2021
11de782
Fix attempt to filter object instance.
rgroves Jan 14, 2021
a3aea51
Fix to use past sessions for past sessions list.
rgroves Jan 14, 2021
2c2768b
Add missing context values required by template.
rgroves Jan 14, 2021
c098c9e
Fix bad class at capacity check.
rgroves Jan 14, 2021
412fa6c
avatar and model property helpers
karbassi Jan 14, 2021
2e8252b
meeting-check-in
karbassi Jan 15, 2021
d46600e
session-check-in-mentors
karbassi Jan 15, 2021
0199fed
session-check-in
karbassi Jan 15, 2021
493706d
session-donations
karbassi Jan 15, 2021
b4c54d3
session-stats
karbassi Jan 15, 2021
b28e871
session-sign-up
karbassi Jan 15, 2021
184953c
avatar-changed-mentor
karbassi Jan 15, 2021
0890c22
mentor-reject-avatar
karbassi Jan 15, 2021
3ecd632
class-announcement-guardian
karbassi Jan 15, 2021
f21b2b7
class-announcement-mentor
karbassi Jan 15, 2021
20918da
class-confirm-guardian
karbassi Jan 15, 2021
c42d534
_email-base
karbassi Jan 15, 2021
24dd9f2
class-confirm-mentor
karbassi Jan 15, 2021
eca8c59
class-reminder-guardian-24-hour
karbassi Jan 15, 2021
bca000a
class-reminder-guardian-one-week
karbassi Jan 15, 2021
f34a962
class-reminder-mentor-24-hour
karbassi Jan 15, 2021
4c2eaaf
class-reminder-mentor-one-week
karbassi Jan 15, 2021
159d975
contact-email
karbassi Jan 15, 2021
da53ca1
donation_receipt
karbassi Jan 15, 2021
d856719
meeting-announcement-mentor
karbassi Jan 15, 2021
cdba152
meeting-confirm-mentor
karbassi Jan 15, 2021
cd3277c
waitlist-offer-guardian.html
karbassi Jan 15, 2021
8c0b948
waitlist-offer-mentor
karbassi Jan 15, 2021
45691e4
welcome-{role}
karbassi Jan 15, 2021
ce729a9
_admin-base
karbassi Jan 15, 2021
a96e5c8
meeting-detail
karbassi Jan 15, 2021
d644efd
meeting-sign-up
karbassi Jan 15, 2021
a8b3474
session-sign-up
karbassi Jan 15, 2021
c236edb
session-partner-password
karbassi Jan 15, 2021
b9d214f
student-detail
karbassi Jan 15, 2021
6590867
programs-summer-camps
karbassi Jan 15, 2021
f1dec0e
_allauth-email-base
karbassi Jan 15, 2021
9237ff1
Format
karbassi Jan 15, 2021
65720e5
save db_views into fixtures
karbassi Jan 18, 2021
d8fc3f9
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 18, 2021
2499784
fix migration from merge
karbassi Jan 19, 2021
e7e9a19
Add full_name to Student model
karbassi Jan 20, 2021
1c16b9f
Remove username from email confirmation page
karbassi Jan 20, 2021
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
10 changes: 10 additions & 0 deletions .isort.cfg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
[settings]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
known_django = django
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
skip = venv/
skip_glob = **/migrations/*.py
force_grid_wrap = 0
use_parentheses = true
26 changes: 24 additions & 2 deletions .vscode/settings.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,15 @@
"emmet.includeLanguages": {
"django-html": "html"
},
"beautify.language": {
"js": {
"type": ["javascript", "json", "jsonc"],
"filename": [".jshintrc", ".jsbeautifyrc"]
},
"css": ["css", "less", "scss"],
"html": ["htm", "html", "django-html"]
},
"python.formatting.provider": "black",
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
Expand All@@ -32,10 +41,20 @@
"--enable=W0614", // Used when an imported module or variable is not used from a 'from X import *' style import.
"--load-plugins=pylint_django"
],
"python.autoComplete.extraPaths": ["./"],
"[python]": {
"editor.rulers": [120],
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": true,
"source.fixAll": true
}
},
"[django-html]": {
"editor.defaultFormatter": "HookyQR.beautify",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
}
},
"[git-commit]": {
Expand All@@ -50,5 +69,8 @@
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false
}
},
"python.analysis.extraPaths": [
"./"
]
}
2 changes: 0 additions & 2 deletions Pipfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,6 @@ sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
pylint = "*"
"autopep8" = "*"

[requires]
python_version = "3.9.1"
100 changes: 2 additions & 98 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions accounts/admin.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.contribimportadmin

# Register your models here.
2 changes: 1 addition & 1 deletion accounts/apps.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@


class AccountsConfig(AppConfig):
name = 'accounts'
name = "accounts"
2 changes: 0 additions & 2 deletions accounts/models.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.dbimportmodels

# Create your models here.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "_email-base.html" %}
{% extends "_email_base.html" %}

{% block subject %}{% block child_subject %}{% endblock %}{% endblock %}
{% block preheader %}{% block child_preheader %}{% endblock %}{% endblock %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load account i18n %}
{% user_display user as user_display %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load i18n %}

Expand Down
8 changes: 3 additions & 5 deletions accounts/templates/account/email_confirm.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,11 @@ <h1 class="title">{% trans "Confirm E-mail Address" %}</h1>

{% if confirmation %}

{% user_display confirmation.email_address.user as user_display %}

<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for your account.{% endblocktrans %}</p>

<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
</form>

{% else %}
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d6c8b91
Cleanup. Needs review
karbassi Aug 20, 2020
66ea3ef
Upgrade python 3.8.3 to 3.8.5
karbassi Aug 24, 2020
fab107d
Update packages
karbassi Aug 24, 2020
6d3a629
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 28, 2020
a70a5a5
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 29, 2020
8f573a0
Format
karbassi Dec 29, 2020
d702216
Clean up hard to read if-statements
karbassi Dec 29, 2020
1d62953
Cleanup
karbassi Jan 8, 2021
255b4a4
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 8, 2021
616141a
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
eca4f33
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
f50368a
Fix mentor file location
karbassi Jan 13, 2021
15eccd1
Run black 20.8b1
karbassi Jan 13, 2021
9442b24
Fix mismatched HTML tag.
rgroves Jan 13, 2021
36ee26e
Add format on startup for debug state
karbassi Jan 13, 2021
94eeb64
Fixed form content link
karbassi Jan 13, 2021
c5be5ec
Delete old files
karbassi Jan 13, 2021
b2a3c06
Fixed form content link
rgroves Jan 14, 2021
8984b2b
Fix unformatted string.
rgroves Jan 14, 2021
da85b31
Add missing context values required by template.
rgroves Jan 14, 2021
11de782
Fix attempt to filter object instance.
rgroves Jan 14, 2021
a3aea51
Fix to use past sessions for past sessions list.
rgroves Jan 14, 2021
2c2768b
Add missing context values required by template.
rgroves Jan 14, 2021
c098c9e
Fix bad class at capacity check.
rgroves Jan 14, 2021
412fa6c
avatar and model property helpers
karbassi Jan 14, 2021
2e8252b
meeting-check-in
karbassi Jan 15, 2021
d46600e
session-check-in-mentors
karbassi Jan 15, 2021
0199fed
session-check-in
karbassi Jan 15, 2021
493706d
session-donations
karbassi Jan 15, 2021
b4c54d3
session-stats
karbassi Jan 15, 2021
b28e871
session-sign-up
karbassi Jan 15, 2021
184953c
avatar-changed-mentor
karbassi Jan 15, 2021
0890c22
mentor-reject-avatar
karbassi Jan 15, 2021
3ecd632
class-announcement-guardian
karbassi Jan 15, 2021
f21b2b7
class-announcement-mentor
karbassi Jan 15, 2021
20918da
class-confirm-guardian
karbassi Jan 15, 2021
c42d534
_email-base
karbassi Jan 15, 2021
24dd9f2
class-confirm-mentor
karbassi Jan 15, 2021
eca8c59
class-reminder-guardian-24-hour
karbassi Jan 15, 2021
bca000a
class-reminder-guardian-one-week
karbassi Jan 15, 2021
f34a962
class-reminder-mentor-24-hour
karbassi Jan 15, 2021
4c2eaaf
class-reminder-mentor-one-week
karbassi Jan 15, 2021
159d975
contact-email
karbassi Jan 15, 2021
da53ca1
donation_receipt
karbassi Jan 15, 2021
d856719
meeting-announcement-mentor
karbassi Jan 15, 2021
cdba152
meeting-confirm-mentor
karbassi Jan 15, 2021
cd3277c
waitlist-offer-guardian.html
karbassi Jan 15, 2021
8c0b948
waitlist-offer-mentor
karbassi Jan 15, 2021
45691e4
welcome-{role}
karbassi Jan 15, 2021
ce729a9
_admin-base
karbassi Jan 15, 2021
a96e5c8
meeting-detail
karbassi Jan 15, 2021
d644efd
meeting-sign-up
karbassi Jan 15, 2021
a8b3474
session-sign-up
karbassi Jan 15, 2021
c236edb
session-partner-password
karbassi Jan 15, 2021
b9d214f
student-detail
karbassi Jan 15, 2021
6590867
programs-summer-camps
karbassi Jan 15, 2021
f1dec0e
_allauth-email-base
karbassi Jan 15, 2021
9237ff1
Format
karbassi Jan 15, 2021
65720e5
save db_views into fixtures
karbassi Jan 18, 2021
d8fc3f9
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 18, 2021
2499784
fix migration from merge
karbassi Jan 19, 2021
e7e9a19
Add full_name to Student model
karbassi Jan 20, 2021
1c16b9f
Remove username from email confirmation page
karbassi Jan 20, 2021
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
10 changes: 10 additions & 0 deletions .isort.cfg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
[settings]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
known_django = django
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
skip = venv/
skip_glob = **/migrations/*.py
force_grid_wrap = 0
use_parentheses = true
26 changes: 24 additions & 2 deletions .vscode/settings.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,15 @@
"emmet.includeLanguages": {
"django-html": "html"
},
"beautify.language": {
"js": {
"type": ["javascript", "json", "jsonc"],
"filename": [".jshintrc", ".jsbeautifyrc"]
},
"css": ["css", "less", "scss"],
"html": ["htm", "html", "django-html"]
},
"python.formatting.provider": "black",
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
Expand All@@ -32,10 +41,20 @@
"--enable=W0614", // Used when an imported module or variable is not used from a 'from X import *' style import.
"--load-plugins=pylint_django"
],
"python.autoComplete.extraPaths": ["./"],
"[python]": {
"editor.rulers": [120],
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": true,
"source.fixAll": true
}
},
"[django-html]": {
"editor.defaultFormatter": "HookyQR.beautify",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
}
},
"[git-commit]": {
Expand All@@ -50,5 +69,8 @@
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false
}
},
"python.analysis.extraPaths": [
"./"
]
}
2 changes: 0 additions & 2 deletions Pipfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,6 @@ sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
pylint = "*"
"autopep8" = "*"

[requires]
python_version = "3.9.1"
100 changes: 2 additions & 98 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions accounts/admin.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.contribimportadmin

# Register your models here.
2 changes: 1 addition & 1 deletion accounts/apps.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@


class AccountsConfig(AppConfig):
name = 'accounts'
name = "accounts"
2 changes: 0 additions & 2 deletions accounts/models.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.dbimportmodels

# Create your models here.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "_email-base.html" %}
{% extends "_email_base.html" %}

{% block subject %}{% block child_subject %}{% endblock %}{% endblock %}
{% block preheader %}{% block child_preheader %}{% endblock %}{% endblock %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load account i18n %}
{% user_display user as user_display %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load i18n %}

Expand Down
8 changes: 3 additions & 5 deletions accounts/templates/account/email_confirm.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,11 @@ <h1 class="title">{% trans "Confirm E-mail Address" %}</h1>

{% if confirmation %}

{% user_display confirmation.email_address.user as user_display %}

<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for your account.{% endblocktrans %}</p>

<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
</form>

{% else %}
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d6c8b91
Cleanup. Needs review
karbassi Aug 20, 2020
66ea3ef
Upgrade python 3.8.3 to 3.8.5
karbassi Aug 24, 2020
fab107d
Update packages
karbassi Aug 24, 2020
6d3a629
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 28, 2020
a70a5a5
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 29, 2020
8f573a0
Format
karbassi Dec 29, 2020
d702216
Clean up hard to read if-statements
karbassi Dec 29, 2020
1d62953
Cleanup
karbassi Jan 8, 2021
255b4a4
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 8, 2021
616141a
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
eca4f33
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
f50368a
Fix mentor file location
karbassi Jan 13, 2021
15eccd1
Run black 20.8b1
karbassi Jan 13, 2021
9442b24
Fix mismatched HTML tag.
rgroves Jan 13, 2021
36ee26e
Add format on startup for debug state
karbassi Jan 13, 2021
94eeb64
Fixed form content link
karbassi Jan 13, 2021
c5be5ec
Delete old files
karbassi Jan 13, 2021
b2a3c06
Fixed form content link
rgroves Jan 14, 2021
8984b2b
Fix unformatted string.
rgroves Jan 14, 2021
da85b31
Add missing context values required by template.
rgroves Jan 14, 2021
11de782
Fix attempt to filter object instance.
rgroves Jan 14, 2021
a3aea51
Fix to use past sessions for past sessions list.
rgroves Jan 14, 2021
2c2768b
Add missing context values required by template.
rgroves Jan 14, 2021
c098c9e
Fix bad class at capacity check.
rgroves Jan 14, 2021
412fa6c
avatar and model property helpers
karbassi Jan 14, 2021
2e8252b
meeting-check-in
karbassi Jan 15, 2021
d46600e
session-check-in-mentors
karbassi Jan 15, 2021
0199fed
session-check-in
karbassi Jan 15, 2021
493706d
session-donations
karbassi Jan 15, 2021
b4c54d3
session-stats
karbassi Jan 15, 2021
b28e871
session-sign-up
karbassi Jan 15, 2021
184953c
avatar-changed-mentor
karbassi Jan 15, 2021
0890c22
mentor-reject-avatar
karbassi Jan 15, 2021
3ecd632
class-announcement-guardian
karbassi Jan 15, 2021
f21b2b7
class-announcement-mentor
karbassi Jan 15, 2021
20918da
class-confirm-guardian
karbassi Jan 15, 2021
c42d534
_email-base
karbassi Jan 15, 2021
24dd9f2
class-confirm-mentor
karbassi Jan 15, 2021
eca8c59
class-reminder-guardian-24-hour
karbassi Jan 15, 2021
bca000a
class-reminder-guardian-one-week
karbassi Jan 15, 2021
f34a962
class-reminder-mentor-24-hour
karbassi Jan 15, 2021
4c2eaaf
class-reminder-mentor-one-week
karbassi Jan 15, 2021
159d975
contact-email
karbassi Jan 15, 2021
da53ca1
donation_receipt
karbassi Jan 15, 2021
d856719
meeting-announcement-mentor
karbassi Jan 15, 2021
cdba152
meeting-confirm-mentor
karbassi Jan 15, 2021
cd3277c
waitlist-offer-guardian.html
karbassi Jan 15, 2021
8c0b948
waitlist-offer-mentor
karbassi Jan 15, 2021
45691e4
welcome-{role}
karbassi Jan 15, 2021
ce729a9
_admin-base
karbassi Jan 15, 2021
a96e5c8
meeting-detail
karbassi Jan 15, 2021
d644efd
meeting-sign-up
karbassi Jan 15, 2021
a8b3474
session-sign-up
karbassi Jan 15, 2021
c236edb
session-partner-password
karbassi Jan 15, 2021
b9d214f
student-detail
karbassi Jan 15, 2021
6590867
programs-summer-camps
karbassi Jan 15, 2021
f1dec0e
_allauth-email-base
karbassi Jan 15, 2021
9237ff1
Format
karbassi Jan 15, 2021
65720e5
save db_views into fixtures
karbassi Jan 18, 2021
d8fc3f9
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 18, 2021
2499784
fix migration from merge
karbassi Jan 19, 2021
e7e9a19
Add full_name to Student model
karbassi Jan 20, 2021
1c16b9f
Remove username from email confirmation page
karbassi Jan 20, 2021
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
10 changes: 10 additions & 0 deletions .isort.cfg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
[settings]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
known_django = django
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
skip = venv/
skip_glob = **/migrations/*.py
force_grid_wrap = 0
use_parentheses = true
26 changes: 24 additions & 2 deletions .vscode/settings.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,15 @@
"emmet.includeLanguages": {
"django-html": "html"
},
"beautify.language": {
"js": {
"type": ["javascript", "json", "jsonc"],
"filename": [".jshintrc", ".jsbeautifyrc"]
},
"css": ["css", "less", "scss"],
"html": ["htm", "html", "django-html"]
},
"python.formatting.provider": "black",
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
Expand All@@ -32,10 +41,20 @@
"--enable=W0614", // Used when an imported module or variable is not used from a 'from X import *' style import.
"--load-plugins=pylint_django"
],
"python.autoComplete.extraPaths": ["./"],
"[python]": {
"editor.rulers": [120],
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": true,
"source.fixAll": true
}
},
"[django-html]": {
"editor.defaultFormatter": "HookyQR.beautify",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
}
},
"[git-commit]": {
Expand All@@ -50,5 +69,8 @@
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false
}
},
"python.analysis.extraPaths": [
"./"
]
}
2 changes: 0 additions & 2 deletions Pipfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,6 @@ sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
pylint = "*"
"autopep8" = "*"

[requires]
python_version = "3.9.1"
100 changes: 2 additions & 98 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions accounts/admin.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.contribimportadmin

# Register your models here.
2 changes: 1 addition & 1 deletion accounts/apps.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@


class AccountsConfig(AppConfig):
name = 'accounts'
name = "accounts"
2 changes: 0 additions & 2 deletions accounts/models.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.dbimportmodels

# Create your models here.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "_email-base.html" %}
{% extends "_email_base.html" %}

{% block subject %}{% block child_subject %}{% endblock %}{% endblock %}
{% block preheader %}{% block child_preheader %}{% endblock %}{% endblock %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load account i18n %}
{% user_display user as user_display %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load i18n %}

Expand Down
8 changes: 3 additions & 5 deletions accounts/templates/account/email_confirm.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,11 @@ <h1 class="title">{% trans "Confirm E-mail Address" %}</h1>

{% if confirmation %}

{% user_display confirmation.email_address.user as user_display %}

<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for your account.{% endblocktrans %}</p>

<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
</form>

{% else %}
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d6c8b91
Cleanup. Needs review
karbassi Aug 20, 2020
66ea3ef
Upgrade python 3.8.3 to 3.8.5
karbassi Aug 24, 2020
fab107d
Update packages
karbassi Aug 24, 2020
6d3a629
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 28, 2020
a70a5a5
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 29, 2020
8f573a0
Format
karbassi Dec 29, 2020
d702216
Clean up hard to read if-statements
karbassi Dec 29, 2020
1d62953
Cleanup
karbassi Jan 8, 2021
255b4a4
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 8, 2021
616141a
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
eca4f33
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
f50368a
Fix mentor file location
karbassi Jan 13, 2021
15eccd1
Run black 20.8b1
karbassi Jan 13, 2021
9442b24
Fix mismatched HTML tag.
rgroves Jan 13, 2021
36ee26e
Add format on startup for debug state
karbassi Jan 13, 2021
94eeb64
Fixed form content link
karbassi Jan 13, 2021
c5be5ec
Delete old files
karbassi Jan 13, 2021
b2a3c06
Fixed form content link
rgroves Jan 14, 2021
8984b2b
Fix unformatted string.
rgroves Jan 14, 2021
da85b31
Add missing context values required by template.
rgroves Jan 14, 2021
11de782
Fix attempt to filter object instance.
rgroves Jan 14, 2021
a3aea51
Fix to use past sessions for past sessions list.
rgroves Jan 14, 2021
2c2768b
Add missing context values required by template.
rgroves Jan 14, 2021
c098c9e
Fix bad class at capacity check.
rgroves Jan 14, 2021
412fa6c
avatar and model property helpers
karbassi Jan 14, 2021
2e8252b
meeting-check-in
karbassi Jan 15, 2021
d46600e
session-check-in-mentors
karbassi Jan 15, 2021
0199fed
session-check-in
karbassi Jan 15, 2021
493706d
session-donations
karbassi Jan 15, 2021
b4c54d3
session-stats
karbassi Jan 15, 2021
b28e871
session-sign-up
karbassi Jan 15, 2021
184953c
avatar-changed-mentor
karbassi Jan 15, 2021
0890c22
mentor-reject-avatar
karbassi Jan 15, 2021
3ecd632
class-announcement-guardian
karbassi Jan 15, 2021
f21b2b7
class-announcement-mentor
karbassi Jan 15, 2021
20918da
class-confirm-guardian
karbassi Jan 15, 2021
c42d534
_email-base
karbassi Jan 15, 2021
24dd9f2
class-confirm-mentor
karbassi Jan 15, 2021
eca8c59
class-reminder-guardian-24-hour
karbassi Jan 15, 2021
bca000a
class-reminder-guardian-one-week
karbassi Jan 15, 2021
f34a962
class-reminder-mentor-24-hour
karbassi Jan 15, 2021
4c2eaaf
class-reminder-mentor-one-week
karbassi Jan 15, 2021
159d975
contact-email
karbassi Jan 15, 2021
da53ca1
donation_receipt
karbassi Jan 15, 2021
d856719
meeting-announcement-mentor
karbassi Jan 15, 2021
cdba152
meeting-confirm-mentor
karbassi Jan 15, 2021
cd3277c
waitlist-offer-guardian.html
karbassi Jan 15, 2021
8c0b948
waitlist-offer-mentor
karbassi Jan 15, 2021
45691e4
welcome-{role}
karbassi Jan 15, 2021
ce729a9
_admin-base
karbassi Jan 15, 2021
a96e5c8
meeting-detail
karbassi Jan 15, 2021
d644efd
meeting-sign-up
karbassi Jan 15, 2021
a8b3474
session-sign-up
karbassi Jan 15, 2021
c236edb
session-partner-password
karbassi Jan 15, 2021
b9d214f
student-detail
karbassi Jan 15, 2021
6590867
programs-summer-camps
karbassi Jan 15, 2021
f1dec0e
_allauth-email-base
karbassi Jan 15, 2021
9237ff1
Format
karbassi Jan 15, 2021
65720e5
save db_views into fixtures
karbassi Jan 18, 2021
d8fc3f9
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 18, 2021
2499784
fix migration from merge
karbassi Jan 19, 2021
e7e9a19
Add full_name to Student model
karbassi Jan 20, 2021
1c16b9f
Remove username from email confirmation page
karbassi Jan 20, 2021
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
10 changes: 10 additions & 0 deletions .isort.cfg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
[settings]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
known_django = django
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
skip = venv/
skip_glob = **/migrations/*.py
force_grid_wrap = 0
use_parentheses = true
26 changes: 24 additions & 2 deletions .vscode/settings.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,15 @@
"emmet.includeLanguages": {
"django-html": "html"
},
"beautify.language": {
"js": {
"type": ["javascript", "json", "jsonc"],
"filename": [".jshintrc", ".jsbeautifyrc"]
},
"css": ["css", "less", "scss"],
"html": ["htm", "html", "django-html"]
},
"python.formatting.provider": "black",
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
Expand All@@ -32,10 +41,20 @@
"--enable=W0614", // Used when an imported module or variable is not used from a 'from X import *' style import.
"--load-plugins=pylint_django"
],
"python.autoComplete.extraPaths": ["./"],
"[python]": {
"editor.rulers": [120],
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": true,
"source.fixAll": true
}
},
"[django-html]": {
"editor.defaultFormatter": "HookyQR.beautify",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
}
},
"[git-commit]": {
Expand All@@ -50,5 +69,8 @@
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false
}
},
"python.analysis.extraPaths": [
"./"
]
}
2 changes: 0 additions & 2 deletions Pipfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,6 @@ sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
pylint = "*"
"autopep8" = "*"

[requires]
python_version = "3.9.1"
100 changes: 2 additions & 98 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions accounts/admin.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.contribimportadmin

# Register your models here.
2 changes: 1 addition & 1 deletion accounts/apps.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@


class AccountsConfig(AppConfig):
name = 'accounts'
name = "accounts"
2 changes: 0 additions & 2 deletions accounts/models.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.dbimportmodels

# Create your models here.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "_email-base.html" %}
{% extends "_email_base.html" %}

{% block subject %}{% block child_subject %}{% endblock %}{% endblock %}
{% block preheader %}{% block child_preheader %}{% endblock %}{% endblock %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load account i18n %}
{% user_display user as user_display %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load i18n %}

Expand Down
8 changes: 3 additions & 5 deletions accounts/templates/account/email_confirm.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,11 @@ <h1 class="title">{% trans "Confirm E-mail Address" %}</h1>

{% if confirmation %}

{% user_display confirmation.email_address.user as user_display %}

<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for your account.{% endblocktrans %}</p>

<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
</form>

{% else %}
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d6c8b91
Cleanup. Needs review
karbassi Aug 20, 2020
66ea3ef
Upgrade python 3.8.3 to 3.8.5
karbassi Aug 24, 2020
fab107d
Update packages
karbassi Aug 24, 2020
6d3a629
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 28, 2020
a70a5a5
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 29, 2020
8f573a0
Format
karbassi Dec 29, 2020
d702216
Clean up hard to read if-statements
karbassi Dec 29, 2020
1d62953
Cleanup
karbassi Jan 8, 2021
255b4a4
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 8, 2021
616141a
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
eca4f33
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
f50368a
Fix mentor file location
karbassi Jan 13, 2021
15eccd1
Run black 20.8b1
karbassi Jan 13, 2021
9442b24
Fix mismatched HTML tag.
rgroves Jan 13, 2021
36ee26e
Add format on startup for debug state
karbassi Jan 13, 2021
94eeb64
Fixed form content link
karbassi Jan 13, 2021
c5be5ec
Delete old files
karbassi Jan 13, 2021
b2a3c06
Fixed form content link
rgroves Jan 14, 2021
8984b2b
Fix unformatted string.
rgroves Jan 14, 2021
da85b31
Add missing context values required by template.
rgroves Jan 14, 2021
11de782
Fix attempt to filter object instance.
rgroves Jan 14, 2021
a3aea51
Fix to use past sessions for past sessions list.
rgroves Jan 14, 2021
2c2768b
Add missing context values required by template.
rgroves Jan 14, 2021
c098c9e
Fix bad class at capacity check.
rgroves Jan 14, 2021
412fa6c
avatar and model property helpers
karbassi Jan 14, 2021
2e8252b
meeting-check-in
karbassi Jan 15, 2021
d46600e
session-check-in-mentors
karbassi Jan 15, 2021
0199fed
session-check-in
karbassi Jan 15, 2021
493706d
session-donations
karbassi Jan 15, 2021
b4c54d3
session-stats
karbassi Jan 15, 2021
b28e871
session-sign-up
karbassi Jan 15, 2021
184953c
avatar-changed-mentor
karbassi Jan 15, 2021
0890c22
mentor-reject-avatar
karbassi Jan 15, 2021
3ecd632
class-announcement-guardian
karbassi Jan 15, 2021
f21b2b7
class-announcement-mentor
karbassi Jan 15, 2021
20918da
class-confirm-guardian
karbassi Jan 15, 2021
c42d534
_email-base
karbassi Jan 15, 2021
24dd9f2
class-confirm-mentor
karbassi Jan 15, 2021
eca8c59
class-reminder-guardian-24-hour
karbassi Jan 15, 2021
bca000a
class-reminder-guardian-one-week
karbassi Jan 15, 2021
f34a962
class-reminder-mentor-24-hour
karbassi Jan 15, 2021
4c2eaaf
class-reminder-mentor-one-week
karbassi Jan 15, 2021
159d975
contact-email
karbassi Jan 15, 2021
da53ca1
donation_receipt
karbassi Jan 15, 2021
d856719
meeting-announcement-mentor
karbassi Jan 15, 2021
cdba152
meeting-confirm-mentor
karbassi Jan 15, 2021
cd3277c
waitlist-offer-guardian.html
karbassi Jan 15, 2021
8c0b948
waitlist-offer-mentor
karbassi Jan 15, 2021
45691e4
welcome-{role}
karbassi Jan 15, 2021
ce729a9
_admin-base
karbassi Jan 15, 2021
a96e5c8
meeting-detail
karbassi Jan 15, 2021
d644efd
meeting-sign-up
karbassi Jan 15, 2021
a8b3474
session-sign-up
karbassi Jan 15, 2021
c236edb
session-partner-password
karbassi Jan 15, 2021
b9d214f
student-detail
karbassi Jan 15, 2021
6590867
programs-summer-camps
karbassi Jan 15, 2021
f1dec0e
_allauth-email-base
karbassi Jan 15, 2021
9237ff1
Format
karbassi Jan 15, 2021
65720e5
save db_views into fixtures
karbassi Jan 18, 2021
d8fc3f9
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 18, 2021
2499784
fix migration from merge
karbassi Jan 19, 2021
e7e9a19
Add full_name to Student model
karbassi Jan 20, 2021
1c16b9f
Remove username from email confirmation page
karbassi Jan 20, 2021
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
10 changes: 10 additions & 0 deletions .isort.cfg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
[settings]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
known_django = django
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
skip = venv/
skip_glob = **/migrations/*.py
force_grid_wrap = 0
use_parentheses = true
26 changes: 24 additions & 2 deletions .vscode/settings.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,15 @@
"emmet.includeLanguages": {
"django-html": "html"
},
"beautify.language": {
"js": {
"type": ["javascript", "json", "jsonc"],
"filename": [".jshintrc", ".jsbeautifyrc"]
},
"css": ["css", "less", "scss"],
"html": ["htm", "html", "django-html"]
},
"python.formatting.provider": "black",
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
Expand All@@ -32,10 +41,20 @@
"--enable=W0614", // Used when an imported module or variable is not used from a 'from X import *' style import.
"--load-plugins=pylint_django"
],
"python.autoComplete.extraPaths": ["./"],
"[python]": {
"editor.rulers": [120],
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": true,
"source.fixAll": true
}
},
"[django-html]": {
"editor.defaultFormatter": "HookyQR.beautify",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
}
},
"[git-commit]": {
Expand All@@ -50,5 +69,8 @@
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false
}
},
"python.analysis.extraPaths": [
"./"
]
}
2 changes: 0 additions & 2 deletions Pipfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,6 @@ sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
pylint = "*"
"autopep8" = "*"

[requires]
python_version = "3.9.1"
100 changes: 2 additions & 98 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions accounts/admin.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.contribimportadmin

# Register your models here.
2 changes: 1 addition & 1 deletion accounts/apps.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@


class AccountsConfig(AppConfig):
name = 'accounts'
name = "accounts"
2 changes: 0 additions & 2 deletions accounts/models.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.dbimportmodels

# Create your models here.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "_email-base.html" %}
{% extends "_email_base.html" %}

{% block subject %}{% block child_subject %}{% endblock %}{% endblock %}
{% block preheader %}{% block child_preheader %}{% endblock %}{% endblock %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load account i18n %}
{% user_display user as user_display %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load i18n %}

Expand Down
8 changes: 3 additions & 5 deletions accounts/templates/account/email_confirm.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,11 @@ <h1 class="title">{% trans "Confirm E-mail Address" %}</h1>

{% if confirmation %}

{% user_display confirmation.email_address.user as user_display %}

<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for your account.{% endblocktrans %}</p>

<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
</form>

{% else %}
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d6c8b91
Cleanup. Needs review
karbassi Aug 20, 2020
66ea3ef
Upgrade python 3.8.3 to 3.8.5
karbassi Aug 24, 2020
fab107d
Update packages
karbassi Aug 24, 2020
6d3a629
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 28, 2020
a70a5a5
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 29, 2020
8f573a0
Format
karbassi Dec 29, 2020
d702216
Clean up hard to read if-statements
karbassi Dec 29, 2020
1d62953
Cleanup
karbassi Jan 8, 2021
255b4a4
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 8, 2021
616141a
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
eca4f33
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
f50368a
Fix mentor file location
karbassi Jan 13, 2021
15eccd1
Run black 20.8b1
karbassi Jan 13, 2021
9442b24
Fix mismatched HTML tag.
rgroves Jan 13, 2021
36ee26e
Add format on startup for debug state
karbassi Jan 13, 2021
94eeb64
Fixed form content link
karbassi Jan 13, 2021
c5be5ec
Delete old files
karbassi Jan 13, 2021
b2a3c06
Fixed form content link
rgroves Jan 14, 2021
8984b2b
Fix unformatted string.
rgroves Jan 14, 2021
da85b31
Add missing context values required by template.
rgroves Jan 14, 2021
11de782
Fix attempt to filter object instance.
rgroves Jan 14, 2021
a3aea51
Fix to use past sessions for past sessions list.
rgroves Jan 14, 2021
2c2768b
Add missing context values required by template.
rgroves Jan 14, 2021
c098c9e
Fix bad class at capacity check.
rgroves Jan 14, 2021
412fa6c
avatar and model property helpers
karbassi Jan 14, 2021
2e8252b
meeting-check-in
karbassi Jan 15, 2021
d46600e
session-check-in-mentors
karbassi Jan 15, 2021
0199fed
session-check-in
karbassi Jan 15, 2021
493706d
session-donations
karbassi Jan 15, 2021
b4c54d3
session-stats
karbassi Jan 15, 2021
b28e871
session-sign-up
karbassi Jan 15, 2021
184953c
avatar-changed-mentor
karbassi Jan 15, 2021
0890c22
mentor-reject-avatar
karbassi Jan 15, 2021
3ecd632
class-announcement-guardian
karbassi Jan 15, 2021
f21b2b7
class-announcement-mentor
karbassi Jan 15, 2021
20918da
class-confirm-guardian
karbassi Jan 15, 2021
c42d534
_email-base
karbassi Jan 15, 2021
24dd9f2
class-confirm-mentor
karbassi Jan 15, 2021
eca8c59
class-reminder-guardian-24-hour
karbassi Jan 15, 2021
bca000a
class-reminder-guardian-one-week
karbassi Jan 15, 2021
f34a962
class-reminder-mentor-24-hour
karbassi Jan 15, 2021
4c2eaaf
class-reminder-mentor-one-week
karbassi Jan 15, 2021
159d975
contact-email
karbassi Jan 15, 2021
da53ca1
donation_receipt
karbassi Jan 15, 2021
d856719
meeting-announcement-mentor
karbassi Jan 15, 2021
cdba152
meeting-confirm-mentor
karbassi Jan 15, 2021
cd3277c
waitlist-offer-guardian.html
karbassi Jan 15, 2021
8c0b948
waitlist-offer-mentor
karbassi Jan 15, 2021
45691e4
welcome-{role}
karbassi Jan 15, 2021
ce729a9
_admin-base
karbassi Jan 15, 2021
a96e5c8
meeting-detail
karbassi Jan 15, 2021
d644efd
meeting-sign-up
karbassi Jan 15, 2021
a8b3474
session-sign-up
karbassi Jan 15, 2021
c236edb
session-partner-password
karbassi Jan 15, 2021
b9d214f
student-detail
karbassi Jan 15, 2021
6590867
programs-summer-camps
karbassi Jan 15, 2021
f1dec0e
_allauth-email-base
karbassi Jan 15, 2021
9237ff1
Format
karbassi Jan 15, 2021
65720e5
save db_views into fixtures
karbassi Jan 18, 2021
d8fc3f9
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 18, 2021
2499784
fix migration from merge
karbassi Jan 19, 2021
e7e9a19
Add full_name to Student model
karbassi Jan 20, 2021
1c16b9f
Remove username from email confirmation page
karbassi Jan 20, 2021
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
10 changes: 10 additions & 0 deletions .isort.cfg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
[settings]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
known_django = django
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
skip = venv/
skip_glob = **/migrations/*.py
force_grid_wrap = 0
use_parentheses = true
26 changes: 24 additions & 2 deletions .vscode/settings.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,15 @@
"emmet.includeLanguages": {
"django-html": "html"
},
"beautify.language": {
"js": {
"type": ["javascript", "json", "jsonc"],
"filename": [".jshintrc", ".jsbeautifyrc"]
},
"css": ["css", "less", "scss"],
"html": ["htm", "html", "django-html"]
},
"python.formatting.provider": "black",
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
Expand All@@ -32,10 +41,20 @@
"--enable=W0614", // Used when an imported module or variable is not used from a 'from X import *' style import.
"--load-plugins=pylint_django"
],
"python.autoComplete.extraPaths": ["./"],
"[python]": {
"editor.rulers": [120],
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": true,
"source.fixAll": true
}
},
"[django-html]": {
"editor.defaultFormatter": "HookyQR.beautify",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
}
},
"[git-commit]": {
Expand All@@ -50,5 +69,8 @@
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false
}
},
"python.analysis.extraPaths": [
"./"
]
}
2 changes: 0 additions & 2 deletions Pipfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,6 @@ sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
pylint = "*"
"autopep8" = "*"

[requires]
python_version = "3.9.1"
100 changes: 2 additions & 98 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions accounts/admin.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.contribimportadmin

# Register your models here.
2 changes: 1 addition & 1 deletion accounts/apps.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@


class AccountsConfig(AppConfig):
name = 'accounts'
name = "accounts"
2 changes: 0 additions & 2 deletions accounts/models.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.dbimportmodels

# Create your models here.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "_email-base.html" %}
{% extends "_email_base.html" %}

{% block subject %}{% block child_subject %}{% endblock %}{% endblock %}
{% block preheader %}{% block child_preheader %}{% endblock %}{% endblock %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load account i18n %}
{% user_display user as user_display %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load i18n %}

Expand Down
8 changes: 3 additions & 5 deletions accounts/templates/account/email_confirm.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,11 @@ <h1 class="title">{% trans "Confirm E-mail Address" %}</h1>

{% if confirmation %}

{% user_display confirmation.email_address.user as user_display %}

<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for your account.{% endblocktrans %}</p>

<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
</form>

{% else %}
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d6c8b91
Cleanup. Needs review
karbassi Aug 20, 2020
66ea3ef
Upgrade python 3.8.3 to 3.8.5
karbassi Aug 24, 2020
fab107d
Update packages
karbassi Aug 24, 2020
6d3a629
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 28, 2020
a70a5a5
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Dec 29, 2020
8f573a0
Format
karbassi Dec 29, 2020
d702216
Clean up hard to read if-statements
karbassi Dec 29, 2020
1d62953
Cleanup
karbassi Jan 8, 2021
255b4a4
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 8, 2021
616141a
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
eca4f33
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 12, 2021
f50368a
Fix mentor file location
karbassi Jan 13, 2021
15eccd1
Run black 20.8b1
karbassi Jan 13, 2021
9442b24
Fix mismatched HTML tag.
rgroves Jan 13, 2021
36ee26e
Add format on startup for debug state
karbassi Jan 13, 2021
94eeb64
Fixed form content link
karbassi Jan 13, 2021
c5be5ec
Delete old files
karbassi Jan 13, 2021
b2a3c06
Fixed form content link
rgroves Jan 14, 2021
8984b2b
Fix unformatted string.
rgroves Jan 14, 2021
da85b31
Add missing context values required by template.
rgroves Jan 14, 2021
11de782
Fix attempt to filter object instance.
rgroves Jan 14, 2021
a3aea51
Fix to use past sessions for past sessions list.
rgroves Jan 14, 2021
2c2768b
Add missing context values required by template.
rgroves Jan 14, 2021
c098c9e
Fix bad class at capacity check.
rgroves Jan 14, 2021
412fa6c
avatar and model property helpers
karbassi Jan 14, 2021
2e8252b
meeting-check-in
karbassi Jan 15, 2021
d46600e
session-check-in-mentors
karbassi Jan 15, 2021
0199fed
session-check-in
karbassi Jan 15, 2021
493706d
session-donations
karbassi Jan 15, 2021
b4c54d3
session-stats
karbassi Jan 15, 2021
b28e871
session-sign-up
karbassi Jan 15, 2021
184953c
avatar-changed-mentor
karbassi Jan 15, 2021
0890c22
mentor-reject-avatar
karbassi Jan 15, 2021
3ecd632
class-announcement-guardian
karbassi Jan 15, 2021
f21b2b7
class-announcement-mentor
karbassi Jan 15, 2021
20918da
class-confirm-guardian
karbassi Jan 15, 2021
c42d534
_email-base
karbassi Jan 15, 2021
24dd9f2
class-confirm-mentor
karbassi Jan 15, 2021
eca8c59
class-reminder-guardian-24-hour
karbassi Jan 15, 2021
bca000a
class-reminder-guardian-one-week
karbassi Jan 15, 2021
f34a962
class-reminder-mentor-24-hour
karbassi Jan 15, 2021
4c2eaaf
class-reminder-mentor-one-week
karbassi Jan 15, 2021
159d975
contact-email
karbassi Jan 15, 2021
da53ca1
donation_receipt
karbassi Jan 15, 2021
d856719
meeting-announcement-mentor
karbassi Jan 15, 2021
cdba152
meeting-confirm-mentor
karbassi Jan 15, 2021
cd3277c
waitlist-offer-guardian.html
karbassi Jan 15, 2021
8c0b948
waitlist-offer-mentor
karbassi Jan 15, 2021
45691e4
welcome-{role}
karbassi Jan 15, 2021
ce729a9
_admin-base
karbassi Jan 15, 2021
a96e5c8
meeting-detail
karbassi Jan 15, 2021
d644efd
meeting-sign-up
karbassi Jan 15, 2021
a8b3474
session-sign-up
karbassi Jan 15, 2021
c236edb
session-partner-password
karbassi Jan 15, 2021
b9d214f
student-detail
karbassi Jan 15, 2021
6590867
programs-summer-camps
karbassi Jan 15, 2021
f1dec0e
_allauth-email-base
karbassi Jan 15, 2021
9237ff1
Format
karbassi Jan 15, 2021
65720e5
save db_views into fixtures
karbassi Jan 18, 2021
d8fc3f9
Merge remote-tracking branch 'upstream/master' into feature/cleanup
karbassi Jan 18, 2021
2499784
fix migration from merge
karbassi Jan 19, 2021
e7e9a19
Add full_name to Student model
karbassi Jan 20, 2021
1c16b9f
Remove username from email confirmation page
karbassi Jan 20, 2021
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
10 changes: 10 additions & 0 deletions .isort.cfg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
[settings]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
known_django = django
sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
skip = venv/
skip_glob = **/migrations/*.py
force_grid_wrap = 0
use_parentheses = true
26 changes: 24 additions & 2 deletions .vscode/settings.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,15 @@
"emmet.includeLanguages": {
"django-html": "html"
},
"beautify.language": {
"js": {
"type": ["javascript", "json", "jsonc"],
"filename": [".jshintrc", ".jsbeautifyrc"]
},
"css": ["css", "less", "scss"],
"html": ["htm", "html", "django-html"]
},
"python.formatting.provider": "black",
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
Expand All@@ -32,10 +41,20 @@
"--enable=W0614", // Used when an imported module or variable is not used from a 'from X import *' style import.
"--load-plugins=pylint_django"
],
"python.autoComplete.extraPaths": ["./"],
"[python]": {
"editor.rulers": [120],
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": true,
"source.fixAll": true
}
},
"[django-html]": {
"editor.defaultFormatter": "HookyQR.beautify",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
}
},
"[git-commit]": {
Expand All@@ -50,5 +69,8 @@
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false
}
},
"python.analysis.extraPaths": [
"./"
]
}
2 changes: 0 additions & 2 deletions Pipfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,8 +37,6 @@ sentry-sdk = "*"
django-fullurl = "*"

[dev-packages]
pylint = "*"
"autopep8" = "*"

[requires]
python_version = "3.9.1"
100 changes: 2 additions & 98 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions accounts/admin.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.contribimportadmin

# Register your models here.
2 changes: 1 addition & 1 deletion accounts/apps.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@


class AccountsConfig(AppConfig):
name = 'accounts'
name = "accounts"
2 changes: 0 additions & 2 deletions accounts/models.py
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
fromdjango.dbimportmodels

# Create your models here.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "_email-base.html" %}
{% extends "_email_base.html" %}

{% block subject %}{% block child_subject %}{% endblock %}{% endblock %}
{% block preheader %}{% block child_preheader %}{% endblock %}{% endblock %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load account i18n %}
{% user_display user as user_display %}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
{% extends "account/email/_allauth-email-base.html" %}
{% extends "account/email/_allauth_email_base.html" %}

{% load i18n %}

Expand Down
8 changes: 3 additions & 5 deletions accounts/templates/account/email_confirm.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,11 @@ <h1 class="title">{% trans "Confirm E-mail Address" %}</h1>

{% if confirmation %}

{% user_display confirmation.email_address.user as user_display %}

<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
<p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for your account.{% endblocktrans %}</p>

<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
{% csrf_token %}
<button class="button" type="submit">{% trans 'Confirm' %}</button>
</form>

{% else %}
Expand Down
Loading