Skip to content

WIP: Move forms to accounts app#641

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

Closed
karbassi wants to merge 1 commit into from
Closed

WIP: Move forms to accounts app #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 32 additions & 7 deletions .vscode/extensions.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
{
"recommendations": [
"ms-python.python",
"PeterJausovec.vscode-docker",
"thebarkman.vscode-djaneiro",
"Zignd.html-css-class-completion"
]
}
"recommendations": [
// Python: Linting, Debugging (multi-threaded, remote), Intellisense,
// code formatting, refactoring, unit tests, snippets, and more.
"ms-python.python",

// Django: Beautiful syntax and scoped snippets
"batisteo.vscode-django",

// Docker: Adds syntax highlighting, commands, hover tips, and linting
// for Dockerfile and docker-compose files
"PeterJausovec.vscode-docker",

// IntelliSense for CSS class names in HTML
"Zignd.html-css-class-completion"

// Auto Rename Tag: Auto rename paired HTML/XML tag
"formulahendry.auto-rename-tag",

// Beautify: Beautify code in place for VS Code
"hookyqr.beautify",

// CSS Peek: Allow peeking to css ID and class strings as definitions
// from html files to respective CSS.Allows peek and goto definition.
"pranaygp.vscode-css-peek",

// HTMLHint: A Static Code Analysis Tool for HTML
"mkaufman.htmlhint",

// HTML CSS Support: CSS support for HTML documents
"ecmel.vscode-html-css"
]
}
84 changes: 46 additions & 38 deletions .vscode/settings.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
{
"editor.trimAutoWhitespace": true,
"files.exclude": {
"**/.git": true,
"**/.DS_Store": true,
"**/*.pyc": true,
"**/__pycache__": true,
"staticfiles": true,
"editor.trimAutoWhitespace": true,
"files.exclude": {
"**/.git": true,
"**/.DS_Store": true,
"**/*.pyc": true,
"**/__pycache__": true,
"staticfiles": true,
},
"files.associations": {
"**/templates/*.html": "django-html",
"**/templates/*": "django-txt",
"**/requirements{/**,*}.{txt,in}": "pip-requirements"
},
"emmet.includeLanguages": {
"django-html": "html"
},
"python.linting.enabled": true,
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
"**/migrations/**",
],
"python.linting.pylintEnabled": false,
"python.linting.pep8Enabled": true,
"python.linting.pep8Path": "pycodestyle",
"python.linting.pep8Args": [
"--max-line-length=120",
],
"[python]": {
"editor.rulers": [120],
"editor.codeActionsOnSave": {
"source.organizeImports": true
},
"files.associations": {
"*.html": "django-html",
},
"[git-commit]": {
"editor.rulers": [72],
},
"[json]": {
"editor.quickSuggestions": {
"strings": true,
},
"python.linting.enabled": true,
"python.linting.ignorePatterns": [
".vscode/*.py",
"**/site-packages/**/*.py",
"**/migrations/**",
],
"python.linting.pylintEnabled": false,
"python.linting.pep8Enabled": true,
"python.linting.pep8Path": "pycodestyle",
"python.linting.pep8Args": [
"--max-line-length=120",
],
"[python]": {
"editor.rulers": [120],
},
"[git-commit]": {
"editor.rulers": [72],
},
"[json]": {
"editor.quickSuggestions": {
"strings": true,
},
},
"[markdown]": {
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false,
},
}
},
"[markdown]": {
"editor.wordWrap": "on",
"editor.quickSuggestions": false,
"editor.trimAutoWhitespace": false,
},
}
224 changes: 224 additions & 0 deletions accounts/forms.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
from django import forms

import html5.forms.widgets as html5_widgets

from coderdojochi.models import CDCUser, Guardian, Mentor, RaceEthnicity


class CDCModelForm(forms.ModelForm):
# strip leading or trailing whitespace
def _clean_fields(self):
for name, field in list(self.fields.items()):
# value_from_datadict() gets the data from the data dictionaries.
# Each widget type knows how to retrieve its own data, because some
# widgets split data over several HTML fields.
value = field.widget.value_from_datadict(
self.data,
self.files,
self.add_prefix(name)
)

try:
if isinstance(field, forms.FileField):
initial = self.initial.get(name, field.initial)
value = field.clean(value, initial)
else:
if isinstance(value, str):
# regex normalizes carriage return
# and cuts them to two at most
value = re.sub(r'\r\n', '\n', value)
value = re.sub(r'\n{3,}', '\n\n', value)
value = field.clean(value.strip())
else:
value = field.clean(value)

self.cleaned_data[name] = value

if hasattr(self, f"clean_{name}"):
value = getattr(self, f"clean_{name}")()
self.cleaned_data[name] = value

except forms.ValidationError as e:
self.add_error(name, e)

class Meta:
model = CDCUser
fields = ('first_name', 'last_name')


class GuardianForm(CDCModelForm):
phone = forms.CharField(
widget=forms.TextInput(
attrs={
'placeholder': 'Phone Number',
'class': 'form-control'
}
),
label='Phone Number'
)

zip = forms.CharField(
widget=forms.TextInput(
attrs={
'placeholder': 'Zip Code',
'class': 'form-control'
}
),
label='Zip Code'
)

gender = forms.CharField(
widget=forms.TextInput(
attrs={
'placeholder': '',
'class': 'form-control'
}
),
label='Gender',
required=True
)

race_ethnicity = forms.ModelMultipleChoiceField(
widget=forms.SelectMultiple,
queryset=RaceEthnicity.objects.filter(is_visible=True),
required=True
)

birthday = forms.CharField(
widget=forms.DateInput(
attrs={
'class': 'form-control'
}
),
required=True
)

class Meta:
model = Guardian
fields = ('phone', 'zip', 'gender', 'race_ethnicity', 'birthday')


class MentorForm(CDCModelForm):
bio = forms.CharField(
widget=forms.Textarea(
attrs={
'placeholder': 'Short Bio',
'class': 'form-control',
'rows': 4
}
),
label='Short Bio',
required=False
)

gender = forms.CharField(
widget=forms.TextInput(
attrs={
'placeholder': '',
'class': 'form-control'
}
),
label='Gender',
required=True
)

race_ethnicity = forms.ModelMultipleChoiceField(
widget=forms.SelectMultiple,
queryset=RaceEthnicity.objects.filter(is_visible=True),
required=True
)

birthday = forms.CharField(
widget=html5_widgets.DateInput(
attrs={
'class': 'form-control'
}
),
required=True
)

work_place = forms.CharField(
widget=forms.TextInput(
attrs={
'placeholder': '',
'class': 'form-control'
}
),
label='Work Place',
required=False
)

phone = forms.CharField(
widget=forms.TextInput(
attrs={
'placeholder': '',
'class': 'form-control'
}
),
label='Phone',
required=False
)

home_address = forms.CharField(
widget=forms.TextInput(
attrs={
'placeholder': '',
'class': 'form-control'
}
),
label='Home Address',
required=False
)

class Meta:
model = Mentor
fields = ('bio', 'avatar', 'gender', 'race_ethnicity', 'birthday', 'phone', 'home_address', 'work_place')

def clean_avatar(self):
avatar = self.cleaned_data['avatar']

if avatar is None:
return avatar

try:
w, h = get_image_dimensions(avatar)

# validate dimensions
max_width = max_height = 1000
if w > max_width or h > max_height:
raise forms.ValidationError(
f'Please use an image that is {max_width} x {max_height}px or smaller.'
)

min_width = min_height = 500
if w < min_width or h < min_height:
raise forms.ValidationError(
f'Please use an image that is {min_width} x {min_height}px or larger.'
)

# validate content type
main, sub = avatar.content_type.split('/')
if (
not (
main == 'image' and
sub in ['jpeg', 'pjpeg', 'gif', 'png']
)
):
raise forms.ValidationError(
'Please use a JPEG, GIF or PNG image.'
)

# validate file size
if len(avatar) > (2000 * 1024):
raise forms.ValidationError(
'Avatar file size may not exceed 2MB.'
)

except AttributeError:
"""
Handles case when we are updating the user profile
and do not supply a new avatar
"""
pass

return avatar
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
WIP: Move forms to accounts app by karbassi · Pull Request #641 · WeAllCode/website · GitHub
Skip to content
WIP: Move forms to accounts app#641

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

 Closed

karbassi
wants to merge
1
commit into

from

 Closed


WIP: Move forms to accounts app
#641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


39 changes: 32 additions & 7 deletions
.vscode/extensions.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
{
 "recommendations": [
 "ms-python.python",
 "PeterJausovec.vscode-docker",
 "thebarkman.vscode-djaneiro",
 "Zignd.html-css-class-completion"
 ]
}
 "recommendations": [
 // Python: Linting, Debugging (multi-threaded, remote), Intellisense,
 // code formatting, refactoring, unit tests, snippets, and more.
 "ms-python.python",

 // Django: Beautiful syntax and scoped snippets
 "batisteo.vscode-django",

 // Docker: Adds syntax highlighting, commands, hover tips, and linting
 // for Dockerfile and docker-compose files
 "PeterJausovec.vscode-docker",

 // IntelliSense for CSS class names in HTML
 "Zignd.html-css-class-completion"

 // Auto Rename Tag: Auto rename paired HTML/XML tag
 "formulahendry.auto-rename-tag",

 // Beautify: Beautify code in place for VS Code
 "hookyqr.beautify",

 // CSS Peek: Allow peeking to css ID and class strings as definitions
 // from html files to respective CSS.Allows peek and goto definition.
 "pranaygp.vscode-css-peek",

 // HTMLHint: A Static Code Analysis Tool for HTML
 "mkaufman.htmlhint",

 // HTML CSS Support: CSS support for HTML documents
 "ecmel.vscode-html-css"
 ]
}

84 changes: 46 additions & 38 deletions
.vscode/settings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
{
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 },
 "files.associations": {
 "**/templates/*.html": "django-html",
 "**/templates/*": "django-txt",
 "**/requirements{/**,*}.{txt,in}": "pip-requirements"
 },
 "emmet.includeLanguages": {
 "django-html": "html"
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 "editor.codeActionsOnSave": {
 "source.organizeImports": true
 },
 "files.associations": {
 "*.html": "django-html",
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}

224 changes: 224 additions & 0 deletions
accounts/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
from django import forms

import html5.forms.widgets as html5_widgets

from coderdojochi.models import CDCUser, Guardian, Mentor, RaceEthnicity


class CDCModelForm(forms.ModelForm):
 # strip leading or trailing whitespace
 def _clean_fields(self):
 for name, field in list(self.fields.items()):
 # value_from_datadict() gets the data from the data dictionaries.
 # Each widget type knows how to retrieve its own data, because some
 # widgets split data over several HTML fields.
 value = field.widget.value_from_datadict(
 self.data,
 self.files,
 self.add_prefix(name)
 )

 try:
 if isinstance(field, forms.FileField):
 initial = self.initial.get(name, field.initial)
 value = field.clean(value, initial)
 else:
 if isinstance(value, str):
 # regex normalizes carriage return
 # and cuts them to two at most
 value = re.sub(r'\r\n', '\n', value)
 value = re.sub(r'\n{3,}', '\n\n', value)
 value = field.clean(value.strip())
 else:
 value = field.clean(value)

 self.cleaned_data[name] = value

 if hasattr(self, f"clean_{name}"):
 value = getattr(self, f"clean_{name}")()
 self.cleaned_data[name] = value

 except forms.ValidationError as e:
 self.add_error(name, e)

 class Meta:
 model = CDCUser
 fields = ('first_name', 'last_name')


class GuardianForm(CDCModelForm):
 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Phone Number',
 'class': 'form-control'
 }
 ),
 label='Phone Number'
 )

 zip = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Zip Code',
 'class': 'form-control'
 }
 ),
 label='Zip Code'
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=forms.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 class Meta:
 model = Guardian
 fields = ('phone', 'zip', 'gender', 'race_ethnicity', 'birthday')


class MentorForm(CDCModelForm):
 bio = forms.CharField(
 widget=forms.Textarea(
 attrs={
 'placeholder': 'Short Bio',
 'class': 'form-control',
 'rows': 4
 }
 ),
 label='Short Bio',
 required=False
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=html5_widgets.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 work_place = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Work Place',
 required=False
 )

 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Phone',
 required=False
 )

 home_address = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Home Address',
 required=False
 )

 class Meta:
 model = Mentor
 fields = ('bio', 'avatar', 'gender', 'race_ethnicity', 'birthday', 'phone', 'home_address', 'work_place')

 def clean_avatar(self):
 avatar = self.cleaned_data['avatar']

 if avatar is None:
 return avatar

 try:
 w, h = get_image_dimensions(avatar)

 # validate dimensions
 max_width = max_height = 1000
 if w > max_width or h > max_height:
 raise forms.ValidationError(
 f'Please use an image that is {max_width} x {max_height}px or smaller.'
 )

 min_width = min_height = 500
 if w < min_width or h < min_height:
 raise forms.ValidationError(
 f'Please use an image that is {min_width} x {min_height}px or larger.'
 )

 # validate content type
 main, sub = avatar.content_type.split('/')
 if (
 not (
 main == 'image' and
 sub in ['jpeg', 'pjpeg', 'gif', 'png']
 )
 ):
 raise forms.ValidationError(
 'Please use a JPEG, GIF or PNG image.'
 )

 # validate file size
 if len(avatar) > (2000 * 1024):
 raise forms.ValidationError(
 'Avatar file size may not exceed 2MB.'
 )

 except AttributeError:
 """
 Handles case when we are updating the user profile
 and do not supply a new avatar
 """
 pass

 return avatar
Loading

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

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

 Closed

karbassi
wants to merge
1
commit into

from

 Closed


WIP: Move forms to accounts app
#641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


39 changes: 32 additions & 7 deletions
.vscode/extensions.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
{
 "recommendations": [
 "ms-python.python",
 "PeterJausovec.vscode-docker",
 "thebarkman.vscode-djaneiro",
 "Zignd.html-css-class-completion"
 ]
}
 "recommendations": [
 // Python: Linting, Debugging (multi-threaded, remote), Intellisense,
 // code formatting, refactoring, unit tests, snippets, and more.
 "ms-python.python",

 // Django: Beautiful syntax and scoped snippets
 "batisteo.vscode-django",

 // Docker: Adds syntax highlighting, commands, hover tips, and linting
 // for Dockerfile and docker-compose files
 "PeterJausovec.vscode-docker",

 // IntelliSense for CSS class names in HTML
 "Zignd.html-css-class-completion"

 // Auto Rename Tag: Auto rename paired HTML/XML tag
 "formulahendry.auto-rename-tag",

 // Beautify: Beautify code in place for VS Code
 "hookyqr.beautify",

 // CSS Peek: Allow peeking to css ID and class strings as definitions
 // from html files to respective CSS.Allows peek and goto definition.
 "pranaygp.vscode-css-peek",

 // HTMLHint: A Static Code Analysis Tool for HTML
 "mkaufman.htmlhint",

 // HTML CSS Support: CSS support for HTML documents
 "ecmel.vscode-html-css"
 ]
}

84 changes: 46 additions & 38 deletions
.vscode/settings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
{
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 },
 "files.associations": {
 "**/templates/*.html": "django-html",
 "**/templates/*": "django-txt",
 "**/requirements{/**,*}.{txt,in}": "pip-requirements"
 },
 "emmet.includeLanguages": {
 "django-html": "html"
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 "editor.codeActionsOnSave": {
 "source.organizeImports": true
 },
 "files.associations": {
 "*.html": "django-html",
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}

224 changes: 224 additions & 0 deletions
accounts/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
from django import forms

import html5.forms.widgets as html5_widgets

from coderdojochi.models import CDCUser, Guardian, Mentor, RaceEthnicity


class CDCModelForm(forms.ModelForm):
 # strip leading or trailing whitespace
 def _clean_fields(self):
 for name, field in list(self.fields.items()):
 # value_from_datadict() gets the data from the data dictionaries.
 # Each widget type knows how to retrieve its own data, because some
 # widgets split data over several HTML fields.
 value = field.widget.value_from_datadict(
 self.data,
 self.files,
 self.add_prefix(name)
 )

 try:
 if isinstance(field, forms.FileField):
 initial = self.initial.get(name, field.initial)
 value = field.clean(value, initial)
 else:
 if isinstance(value, str):
 # regex normalizes carriage return
 # and cuts them to two at most
 value = re.sub(r'\r\n', '\n', value)
 value = re.sub(r'\n{3,}', '\n\n', value)
 value = field.clean(value.strip())
 else:
 value = field.clean(value)

 self.cleaned_data[name] = value

 if hasattr(self, f"clean_{name}"):
 value = getattr(self, f"clean_{name}")()
 self.cleaned_data[name] = value

 except forms.ValidationError as e:
 self.add_error(name, e)

 class Meta:
 model = CDCUser
 fields = ('first_name', 'last_name')


class GuardianForm(CDCModelForm):
 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Phone Number',
 'class': 'form-control'
 }
 ),
 label='Phone Number'
 )

 zip = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Zip Code',
 'class': 'form-control'
 }
 ),
 label='Zip Code'
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=forms.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 class Meta:
 model = Guardian
 fields = ('phone', 'zip', 'gender', 'race_ethnicity', 'birthday')


class MentorForm(CDCModelForm):
 bio = forms.CharField(
 widget=forms.Textarea(
 attrs={
 'placeholder': 'Short Bio',
 'class': 'form-control',
 'rows': 4
 }
 ),
 label='Short Bio',
 required=False
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=html5_widgets.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 work_place = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Work Place',
 required=False
 )

 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Phone',
 required=False
 )

 home_address = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Home Address',
 required=False
 )

 class Meta:
 model = Mentor
 fields = ('bio', 'avatar', 'gender', 'race_ethnicity', 'birthday', 'phone', 'home_address', 'work_place')

 def clean_avatar(self):
 avatar = self.cleaned_data['avatar']

 if avatar is None:
 return avatar

 try:
 w, h = get_image_dimensions(avatar)

 # validate dimensions
 max_width = max_height = 1000
 if w > max_width or h > max_height:
 raise forms.ValidationError(
 f'Please use an image that is {max_width} x {max_height}px or smaller.'
 )

 min_width = min_height = 500
 if w < min_width or h < min_height:
 raise forms.ValidationError(
 f'Please use an image that is {min_width} x {min_height}px or larger.'
 )

 # validate content type
 main, sub = avatar.content_type.split('/')
 if (
 not (
 main == 'image' and
 sub in ['jpeg', 'pjpeg', 'gif', 'png']
 )
 ):
 raise forms.ValidationError(
 'Please use a JPEG, GIF or PNG image.'
 )

 # validate file size
 if len(avatar) > (2000 * 1024):
 raise forms.ValidationError(
 'Avatar file size may not exceed 2MB.'
 )

 except AttributeError:
 """
 Handles case when we are updating the user profile
 and do not supply a new avatar
 """
 pass

 return avatar
Loading

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

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

 Closed

karbassi
wants to merge
1
commit into

from

 Closed


WIP: Move forms to accounts app
#641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


39 changes: 32 additions & 7 deletions
.vscode/extensions.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
{
 "recommendations": [
 "ms-python.python",
 "PeterJausovec.vscode-docker",
 "thebarkman.vscode-djaneiro",
 "Zignd.html-css-class-completion"
 ]
}
 "recommendations": [
 // Python: Linting, Debugging (multi-threaded, remote), Intellisense,
 // code formatting, refactoring, unit tests, snippets, and more.
 "ms-python.python",

 // Django: Beautiful syntax and scoped snippets
 "batisteo.vscode-django",

 // Docker: Adds syntax highlighting, commands, hover tips, and linting
 // for Dockerfile and docker-compose files
 "PeterJausovec.vscode-docker",

 // IntelliSense for CSS class names in HTML
 "Zignd.html-css-class-completion"

 // Auto Rename Tag: Auto rename paired HTML/XML tag
 "formulahendry.auto-rename-tag",

 // Beautify: Beautify code in place for VS Code
 "hookyqr.beautify",

 // CSS Peek: Allow peeking to css ID and class strings as definitions
 // from html files to respective CSS.Allows peek and goto definition.
 "pranaygp.vscode-css-peek",

 // HTMLHint: A Static Code Analysis Tool for HTML
 "mkaufman.htmlhint",

 // HTML CSS Support: CSS support for HTML documents
 "ecmel.vscode-html-css"
 ]
}

84 changes: 46 additions & 38 deletions
.vscode/settings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
{
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 },
 "files.associations": {
 "**/templates/*.html": "django-html",
 "**/templates/*": "django-txt",
 "**/requirements{/**,*}.{txt,in}": "pip-requirements"
 },
 "emmet.includeLanguages": {
 "django-html": "html"
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 "editor.codeActionsOnSave": {
 "source.organizeImports": true
 },
 "files.associations": {
 "*.html": "django-html",
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}

224 changes: 224 additions & 0 deletions
accounts/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
from django import forms

import html5.forms.widgets as html5_widgets

from coderdojochi.models import CDCUser, Guardian, Mentor, RaceEthnicity


class CDCModelForm(forms.ModelForm):
 # strip leading or trailing whitespace
 def _clean_fields(self):
 for name, field in list(self.fields.items()):
 # value_from_datadict() gets the data from the data dictionaries.
 # Each widget type knows how to retrieve its own data, because some
 # widgets split data over several HTML fields.
 value = field.widget.value_from_datadict(
 self.data,
 self.files,
 self.add_prefix(name)
 )

 try:
 if isinstance(field, forms.FileField):
 initial = self.initial.get(name, field.initial)
 value = field.clean(value, initial)
 else:
 if isinstance(value, str):
 # regex normalizes carriage return
 # and cuts them to two at most
 value = re.sub(r'\r\n', '\n', value)
 value = re.sub(r'\n{3,}', '\n\n', value)
 value = field.clean(value.strip())
 else:
 value = field.clean(value)

 self.cleaned_data[name] = value

 if hasattr(self, f"clean_{name}"):
 value = getattr(self, f"clean_{name}")()
 self.cleaned_data[name] = value

 except forms.ValidationError as e:
 self.add_error(name, e)

 class Meta:
 model = CDCUser
 fields = ('first_name', 'last_name')


class GuardianForm(CDCModelForm):
 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Phone Number',
 'class': 'form-control'
 }
 ),
 label='Phone Number'
 )

 zip = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Zip Code',
 'class': 'form-control'
 }
 ),
 label='Zip Code'
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=forms.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 class Meta:
 model = Guardian
 fields = ('phone', 'zip', 'gender', 'race_ethnicity', 'birthday')


class MentorForm(CDCModelForm):
 bio = forms.CharField(
 widget=forms.Textarea(
 attrs={
 'placeholder': 'Short Bio',
 'class': 'form-control',
 'rows': 4
 }
 ),
 label='Short Bio',
 required=False
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=html5_widgets.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 work_place = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Work Place',
 required=False
 )

 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Phone',
 required=False
 )

 home_address = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Home Address',
 required=False
 )

 class Meta:
 model = Mentor
 fields = ('bio', 'avatar', 'gender', 'race_ethnicity', 'birthday', 'phone', 'home_address', 'work_place')

 def clean_avatar(self):
 avatar = self.cleaned_data['avatar']

 if avatar is None:
 return avatar

 try:
 w, h = get_image_dimensions(avatar)

 # validate dimensions
 max_width = max_height = 1000
 if w > max_width or h > max_height:
 raise forms.ValidationError(
 f'Please use an image that is {max_width} x {max_height}px or smaller.'
 )

 min_width = min_height = 500
 if w < min_width or h < min_height:
 raise forms.ValidationError(
 f'Please use an image that is {min_width} x {min_height}px or larger.'
 )

 # validate content type
 main, sub = avatar.content_type.split('/')
 if (
 not (
 main == 'image' and
 sub in ['jpeg', 'pjpeg', 'gif', 'png']
 )
 ):
 raise forms.ValidationError(
 'Please use a JPEG, GIF or PNG image.'
 )

 # validate file size
 if len(avatar) > (2000 * 1024):
 raise forms.ValidationError(
 'Avatar file size may not exceed 2MB.'
 )

 except AttributeError:
 """
 Handles case when we are updating the user profile
 and do not supply a new avatar
 """
 pass

 return avatar
Loading

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

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

 Closed

karbassi
wants to merge
1
commit into

from

 Closed


WIP: Move forms to accounts app
#641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


39 changes: 32 additions & 7 deletions
.vscode/extensions.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
{
 "recommendations": [
 "ms-python.python",
 "PeterJausovec.vscode-docker",
 "thebarkman.vscode-djaneiro",
 "Zignd.html-css-class-completion"
 ]
}
 "recommendations": [
 // Python: Linting, Debugging (multi-threaded, remote), Intellisense,
 // code formatting, refactoring, unit tests, snippets, and more.
 "ms-python.python",

 // Django: Beautiful syntax and scoped snippets
 "batisteo.vscode-django",

 // Docker: Adds syntax highlighting, commands, hover tips, and linting
 // for Dockerfile and docker-compose files
 "PeterJausovec.vscode-docker",

 // IntelliSense for CSS class names in HTML
 "Zignd.html-css-class-completion"

 // Auto Rename Tag: Auto rename paired HTML/XML tag
 "formulahendry.auto-rename-tag",

 // Beautify: Beautify code in place for VS Code
 "hookyqr.beautify",

 // CSS Peek: Allow peeking to css ID and class strings as definitions
 // from html files to respective CSS.Allows peek and goto definition.
 "pranaygp.vscode-css-peek",

 // HTMLHint: A Static Code Analysis Tool for HTML
 "mkaufman.htmlhint",

 // HTML CSS Support: CSS support for HTML documents
 "ecmel.vscode-html-css"
 ]
}

84 changes: 46 additions & 38 deletions
.vscode/settings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
{
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 },
 "files.associations": {
 "**/templates/*.html": "django-html",
 "**/templates/*": "django-txt",
 "**/requirements{/**,*}.{txt,in}": "pip-requirements"
 },
 "emmet.includeLanguages": {
 "django-html": "html"
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 "editor.codeActionsOnSave": {
 "source.organizeImports": true
 },
 "files.associations": {
 "*.html": "django-html",
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}

224 changes: 224 additions & 0 deletions
accounts/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
from django import forms

import html5.forms.widgets as html5_widgets

from coderdojochi.models import CDCUser, Guardian, Mentor, RaceEthnicity


class CDCModelForm(forms.ModelForm):
 # strip leading or trailing whitespace
 def _clean_fields(self):
 for name, field in list(self.fields.items()):
 # value_from_datadict() gets the data from the data dictionaries.
 # Each widget type knows how to retrieve its own data, because some
 # widgets split data over several HTML fields.
 value = field.widget.value_from_datadict(
 self.data,
 self.files,
 self.add_prefix(name)
 )

 try:
 if isinstance(field, forms.FileField):
 initial = self.initial.get(name, field.initial)
 value = field.clean(value, initial)
 else:
 if isinstance(value, str):
 # regex normalizes carriage return
 # and cuts them to two at most
 value = re.sub(r'\r\n', '\n', value)
 value = re.sub(r'\n{3,}', '\n\n', value)
 value = field.clean(value.strip())
 else:
 value = field.clean(value)

 self.cleaned_data[name] = value

 if hasattr(self, f"clean_{name}"):
 value = getattr(self, f"clean_{name}")()
 self.cleaned_data[name] = value

 except forms.ValidationError as e:
 self.add_error(name, e)

 class Meta:
 model = CDCUser
 fields = ('first_name', 'last_name')


class GuardianForm(CDCModelForm):
 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Phone Number',
 'class': 'form-control'
 }
 ),
 label='Phone Number'
 )

 zip = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Zip Code',
 'class': 'form-control'
 }
 ),
 label='Zip Code'
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=forms.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 class Meta:
 model = Guardian
 fields = ('phone', 'zip', 'gender', 'race_ethnicity', 'birthday')


class MentorForm(CDCModelForm):
 bio = forms.CharField(
 widget=forms.Textarea(
 attrs={
 'placeholder': 'Short Bio',
 'class': 'form-control',
 'rows': 4
 }
 ),
 label='Short Bio',
 required=False
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=html5_widgets.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 work_place = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Work Place',
 required=False
 )

 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Phone',
 required=False
 )

 home_address = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Home Address',
 required=False
 )

 class Meta:
 model = Mentor
 fields = ('bio', 'avatar', 'gender', 'race_ethnicity', 'birthday', 'phone', 'home_address', 'work_place')

 def clean_avatar(self):
 avatar = self.cleaned_data['avatar']

 if avatar is None:
 return avatar

 try:
 w, h = get_image_dimensions(avatar)

 # validate dimensions
 max_width = max_height = 1000
 if w > max_width or h > max_height:
 raise forms.ValidationError(
 f'Please use an image that is {max_width} x {max_height}px or smaller.'
 )

 min_width = min_height = 500
 if w < min_width or h < min_height:
 raise forms.ValidationError(
 f'Please use an image that is {min_width} x {min_height}px or larger.'
 )

 # validate content type
 main, sub = avatar.content_type.split('/')
 if (
 not (
 main == 'image' and
 sub in ['jpeg', 'pjpeg', 'gif', 'png']
 )
 ):
 raise forms.ValidationError(
 'Please use a JPEG, GIF or PNG image.'
 )

 # validate file size
 if len(avatar) > (2000 * 1024):
 raise forms.ValidationError(
 'Avatar file size may not exceed 2MB.'
 )

 except AttributeError:
 """
 Handles case when we are updating the user profile
 and do not supply a new avatar
 """
 pass

 return avatar
Loading

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

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

 Closed

karbassi
wants to merge
1
commit into

from

 Closed


WIP: Move forms to accounts app
#641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


39 changes: 32 additions & 7 deletions
.vscode/extensions.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
{
 "recommendations": [
 "ms-python.python",
 "PeterJausovec.vscode-docker",
 "thebarkman.vscode-djaneiro",
 "Zignd.html-css-class-completion"
 ]
}
 "recommendations": [
 // Python: Linting, Debugging (multi-threaded, remote), Intellisense,
 // code formatting, refactoring, unit tests, snippets, and more.
 "ms-python.python",

 // Django: Beautiful syntax and scoped snippets
 "batisteo.vscode-django",

 // Docker: Adds syntax highlighting, commands, hover tips, and linting
 // for Dockerfile and docker-compose files
 "PeterJausovec.vscode-docker",

 // IntelliSense for CSS class names in HTML
 "Zignd.html-css-class-completion"

 // Auto Rename Tag: Auto rename paired HTML/XML tag
 "formulahendry.auto-rename-tag",

 // Beautify: Beautify code in place for VS Code
 "hookyqr.beautify",

 // CSS Peek: Allow peeking to css ID and class strings as definitions
 // from html files to respective CSS.Allows peek and goto definition.
 "pranaygp.vscode-css-peek",

 // HTMLHint: A Static Code Analysis Tool for HTML
 "mkaufman.htmlhint",

 // HTML CSS Support: CSS support for HTML documents
 "ecmel.vscode-html-css"
 ]
}

84 changes: 46 additions & 38 deletions
.vscode/settings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
{
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 },
 "files.associations": {
 "**/templates/*.html": "django-html",
 "**/templates/*": "django-txt",
 "**/requirements{/**,*}.{txt,in}": "pip-requirements"
 },
 "emmet.includeLanguages": {
 "django-html": "html"
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 "editor.codeActionsOnSave": {
 "source.organizeImports": true
 },
 "files.associations": {
 "*.html": "django-html",
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}

224 changes: 224 additions & 0 deletions
accounts/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
from django import forms

import html5.forms.widgets as html5_widgets

from coderdojochi.models import CDCUser, Guardian, Mentor, RaceEthnicity


class CDCModelForm(forms.ModelForm):
 # strip leading or trailing whitespace
 def _clean_fields(self):
 for name, field in list(self.fields.items()):
 # value_from_datadict() gets the data from the data dictionaries.
 # Each widget type knows how to retrieve its own data, because some
 # widgets split data over several HTML fields.
 value = field.widget.value_from_datadict(
 self.data,
 self.files,
 self.add_prefix(name)
 )

 try:
 if isinstance(field, forms.FileField):
 initial = self.initial.get(name, field.initial)
 value = field.clean(value, initial)
 else:
 if isinstance(value, str):
 # regex normalizes carriage return
 # and cuts them to two at most
 value = re.sub(r'\r\n', '\n', value)
 value = re.sub(r'\n{3,}', '\n\n', value)
 value = field.clean(value.strip())
 else:
 value = field.clean(value)

 self.cleaned_data[name] = value

 if hasattr(self, f"clean_{name}"):
 value = getattr(self, f"clean_{name}")()
 self.cleaned_data[name] = value

 except forms.ValidationError as e:
 self.add_error(name, e)

 class Meta:
 model = CDCUser
 fields = ('first_name', 'last_name')


class GuardianForm(CDCModelForm):
 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Phone Number',
 'class': 'form-control'
 }
 ),
 label='Phone Number'
 )

 zip = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Zip Code',
 'class': 'form-control'
 }
 ),
 label='Zip Code'
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=forms.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 class Meta:
 model = Guardian
 fields = ('phone', 'zip', 'gender', 'race_ethnicity', 'birthday')


class MentorForm(CDCModelForm):
 bio = forms.CharField(
 widget=forms.Textarea(
 attrs={
 'placeholder': 'Short Bio',
 'class': 'form-control',
 'rows': 4
 }
 ),
 label='Short Bio',
 required=False
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=html5_widgets.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 work_place = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Work Place',
 required=False
 )

 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Phone',
 required=False
 )

 home_address = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Home Address',
 required=False
 )

 class Meta:
 model = Mentor
 fields = ('bio', 'avatar', 'gender', 'race_ethnicity', 'birthday', 'phone', 'home_address', 'work_place')

 def clean_avatar(self):
 avatar = self.cleaned_data['avatar']

 if avatar is None:
 return avatar

 try:
 w, h = get_image_dimensions(avatar)

 # validate dimensions
 max_width = max_height = 1000
 if w > max_width or h > max_height:
 raise forms.ValidationError(
 f'Please use an image that is {max_width} x {max_height}px or smaller.'
 )

 min_width = min_height = 500
 if w < min_width or h < min_height:
 raise forms.ValidationError(
 f'Please use an image that is {min_width} x {min_height}px or larger.'
 )

 # validate content type
 main, sub = avatar.content_type.split('/')
 if (
 not (
 main == 'image' and
 sub in ['jpeg', 'pjpeg', 'gif', 'png']
 )
 ):
 raise forms.ValidationError(
 'Please use a JPEG, GIF or PNG image.'
 )

 # validate file size
 if len(avatar) > (2000 * 1024):
 raise forms.ValidationError(
 'Avatar file size may not exceed 2MB.'
 )

 except AttributeError:
 """
 Handles case when we are updating the user profile
 and do not supply a new avatar
 """
 pass

 return avatar
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
WIP: Move forms to accounts app by karbassi · Pull Request #641 · WeAllCode/website · GitHub
Skip to content
WIP: Move forms to accounts app#641

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

 Closed

karbassi
wants to merge
1
commit into

from

 Closed


WIP: Move forms to accounts app
#641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


39 changes: 32 additions & 7 deletions
.vscode/extensions.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
{
 "recommendations": [
 "ms-python.python",
 "PeterJausovec.vscode-docker",
 "thebarkman.vscode-djaneiro",
 "Zignd.html-css-class-completion"
 ]
}
 "recommendations": [
 // Python: Linting, Debugging (multi-threaded, remote), Intellisense,
 // code formatting, refactoring, unit tests, snippets, and more.
 "ms-python.python",

 // Django: Beautiful syntax and scoped snippets
 "batisteo.vscode-django",

 // Docker: Adds syntax highlighting, commands, hover tips, and linting
 // for Dockerfile and docker-compose files
 "PeterJausovec.vscode-docker",

 // IntelliSense for CSS class names in HTML
 "Zignd.html-css-class-completion"

 // Auto Rename Tag: Auto rename paired HTML/XML tag
 "formulahendry.auto-rename-tag",

 // Beautify: Beautify code in place for VS Code
 "hookyqr.beautify",

 // CSS Peek: Allow peeking to css ID and class strings as definitions
 // from html files to respective CSS.Allows peek and goto definition.
 "pranaygp.vscode-css-peek",

 // HTMLHint: A Static Code Analysis Tool for HTML
 "mkaufman.htmlhint",

 // HTML CSS Support: CSS support for HTML documents
 "ecmel.vscode-html-css"
 ]
}

84 changes: 46 additions & 38 deletions
.vscode/settings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
{
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 },
 "files.associations": {
 "**/templates/*.html": "django-html",
 "**/templates/*": "django-txt",
 "**/requirements{/**,*}.{txt,in}": "pip-requirements"
 },
 "emmet.includeLanguages": {
 "django-html": "html"
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 "editor.codeActionsOnSave": {
 "source.organizeImports": true
 },
 "files.associations": {
 "*.html": "django-html",
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}

224 changes: 224 additions & 0 deletions
accounts/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
from django import forms

import html5.forms.widgets as html5_widgets

from coderdojochi.models import CDCUser, Guardian, Mentor, RaceEthnicity


class CDCModelForm(forms.ModelForm):
 # strip leading or trailing whitespace
 def _clean_fields(self):
 for name, field in list(self.fields.items()):
 # value_from_datadict() gets the data from the data dictionaries.
 # Each widget type knows how to retrieve its own data, because some
 # widgets split data over several HTML fields.
 value = field.widget.value_from_datadict(
 self.data,
 self.files,
 self.add_prefix(name)
 )

 try:
 if isinstance(field, forms.FileField):
 initial = self.initial.get(name, field.initial)
 value = field.clean(value, initial)
 else:
 if isinstance(value, str):
 # regex normalizes carriage return
 # and cuts them to two at most
 value = re.sub(r'\r\n', '\n', value)
 value = re.sub(r'\n{3,}', '\n\n', value)
 value = field.clean(value.strip())
 else:
 value = field.clean(value)

 self.cleaned_data[name] = value

 if hasattr(self, f"clean_{name}"):
 value = getattr(self, f"clean_{name}")()
 self.cleaned_data[name] = value

 except forms.ValidationError as e:
 self.add_error(name, e)

 class Meta:
 model = CDCUser
 fields = ('first_name', 'last_name')


class GuardianForm(CDCModelForm):
 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Phone Number',
 'class': 'form-control'
 }
 ),
 label='Phone Number'
 )

 zip = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Zip Code',
 'class': 'form-control'
 }
 ),
 label='Zip Code'
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=forms.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 class Meta:
 model = Guardian
 fields = ('phone', 'zip', 'gender', 'race_ethnicity', 'birthday')


class MentorForm(CDCModelForm):
 bio = forms.CharField(
 widget=forms.Textarea(
 attrs={
 'placeholder': 'Short Bio',
 'class': 'form-control',
 'rows': 4
 }
 ),
 label='Short Bio',
 required=False
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=html5_widgets.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 work_place = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Work Place',
 required=False
 )

 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Phone',
 required=False
 )

 home_address = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Home Address',
 required=False
 )

 class Meta:
 model = Mentor
 fields = ('bio', 'avatar', 'gender', 'race_ethnicity', 'birthday', 'phone', 'home_address', 'work_place')

 def clean_avatar(self):
 avatar = self.cleaned_data['avatar']

 if avatar is None:
 return avatar

 try:
 w, h = get_image_dimensions(avatar)

 # validate dimensions
 max_width = max_height = 1000
 if w > max_width or h > max_height:
 raise forms.ValidationError(
 f'Please use an image that is {max_width} x {max_height}px or smaller.'
 )

 min_width = min_height = 500
 if w < min_width or h < min_height:
 raise forms.ValidationError(
 f'Please use an image that is {min_width} x {min_height}px or larger.'
 )

 # validate content type
 main, sub = avatar.content_type.split('/')
 if (
 not (
 main == 'image' and
 sub in ['jpeg', 'pjpeg', 'gif', 'png']
 )
 ):
 raise forms.ValidationError(
 'Please use a JPEG, GIF or PNG image.'
 )

 # validate file size
 if len(avatar) > (2000 * 1024):
 raise forms.ValidationError(
 'Avatar file size may not exceed 2MB.'
 )

 except AttributeError:
 """
 Handles case when we are updating the user profile
 and do not supply a new avatar
 """
 pass

 return avatar
Loading

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

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

 Closed

karbassi
wants to merge
1
commit into

from

 Closed


WIP: Move forms to accounts app
#641
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


39 changes: 32 additions & 7 deletions
.vscode/extensions.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
{
 "recommendations": [
 "ms-python.python",
 "PeterJausovec.vscode-docker",
 "thebarkman.vscode-djaneiro",
 "Zignd.html-css-class-completion"
 ]
}
 "recommendations": [
 // Python: Linting, Debugging (multi-threaded, remote), Intellisense,
 // code formatting, refactoring, unit tests, snippets, and more.
 "ms-python.python",

 // Django: Beautiful syntax and scoped snippets
 "batisteo.vscode-django",

 // Docker: Adds syntax highlighting, commands, hover tips, and linting
 // for Dockerfile and docker-compose files
 "PeterJausovec.vscode-docker",

 // IntelliSense for CSS class names in HTML
 "Zignd.html-css-class-completion"

 // Auto Rename Tag: Auto rename paired HTML/XML tag
 "formulahendry.auto-rename-tag",

 // Beautify: Beautify code in place for VS Code
 "hookyqr.beautify",

 // CSS Peek: Allow peeking to css ID and class strings as definitions
 // from html files to respective CSS.Allows peek and goto definition.
 "pranaygp.vscode-css-peek",

 // HTMLHint: A Static Code Analysis Tool for HTML
 "mkaufman.htmlhint",

 // HTML CSS Support: CSS support for HTML documents
 "ecmel.vscode-html-css"
 ]
}

84 changes: 46 additions & 38 deletions
.vscode/settings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
{
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 "editor.trimAutoWhitespace": true,
 "files.exclude": {
 "**/.git": true,
 "**/.DS_Store": true,
 "**/*.pyc": true,
 "**/__pycache__": true,
 "staticfiles": true,
 },
 "files.associations": {
 "**/templates/*.html": "django-html",
 "**/templates/*": "django-txt",
 "**/requirements{/**,*}.{txt,in}": "pip-requirements"
 },
 "emmet.includeLanguages": {
 "django-html": "html"
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 "editor.codeActionsOnSave": {
 "source.organizeImports": true
 },
 "files.associations": {
 "*.html": "django-html",
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 "python.linting.enabled": true,
 "python.linting.ignorePatterns": [
 ".vscode/*.py",
 "**/site-packages/**/*.py",
 "**/migrations/**",
 ],
 "python.linting.pylintEnabled": false,
 "python.linting.pep8Enabled": true,
 "python.linting.pep8Path": "pycodestyle",
 "python.linting.pep8Args": [
 "--max-line-length=120",
 ],
 "[python]": {
 "editor.rulers": [120],
 },
 "[git-commit]": {
 "editor.rulers": [72],
 },
 "[json]": {
 "editor.quickSuggestions": {
 "strings": true,
 },
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}
 },
 "[markdown]": {
 "editor.wordWrap": "on",
 "editor.quickSuggestions": false,
 "editor.trimAutoWhitespace": false,
 },
}

224 changes: 224 additions & 0 deletions
accounts/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
from django import forms

import html5.forms.widgets as html5_widgets

from coderdojochi.models import CDCUser, Guardian, Mentor, RaceEthnicity


class CDCModelForm(forms.ModelForm):
 # strip leading or trailing whitespace
 def _clean_fields(self):
 for name, field in list(self.fields.items()):
 # value_from_datadict() gets the data from the data dictionaries.
 # Each widget type knows how to retrieve its own data, because some
 # widgets split data over several HTML fields.
 value = field.widget.value_from_datadict(
 self.data,
 self.files,
 self.add_prefix(name)
 )

 try:
 if isinstance(field, forms.FileField):
 initial = self.initial.get(name, field.initial)
 value = field.clean(value, initial)
 else:
 if isinstance(value, str):
 # regex normalizes carriage return
 # and cuts them to two at most
 value = re.sub(r'\r\n', '\n', value)
 value = re.sub(r'\n{3,}', '\n\n', value)
 value = field.clean(value.strip())
 else:
 value = field.clean(value)

 self.cleaned_data[name] = value

 if hasattr(self, f"clean_{name}"):
 value = getattr(self, f"clean_{name}")()
 self.cleaned_data[name] = value

 except forms.ValidationError as e:
 self.add_error(name, e)

 class Meta:
 model = CDCUser
 fields = ('first_name', 'last_name')


class GuardianForm(CDCModelForm):
 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Phone Number',
 'class': 'form-control'
 }
 ),
 label='Phone Number'
 )

 zip = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': 'Zip Code',
 'class': 'form-control'
 }
 ),
 label='Zip Code'
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=forms.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 class Meta:
 model = Guardian
 fields = ('phone', 'zip', 'gender', 'race_ethnicity', 'birthday')


class MentorForm(CDCModelForm):
 bio = forms.CharField(
 widget=forms.Textarea(
 attrs={
 'placeholder': 'Short Bio',
 'class': 'form-control',
 'rows': 4
 }
 ),
 label='Short Bio',
 required=False
 )

 gender = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Gender',
 required=True
 )

 race_ethnicity = forms.ModelMultipleChoiceField(
 widget=forms.SelectMultiple,
 queryset=RaceEthnicity.objects.filter(is_visible=True),
 required=True
 )

 birthday = forms.CharField(
 widget=html5_widgets.DateInput(
 attrs={
 'class': 'form-control'
 }
 ),
 required=True
 )

 work_place = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Work Place',
 required=False
 )

 phone = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Phone',
 required=False
 )

 home_address = forms.CharField(
 widget=forms.TextInput(
 attrs={
 'placeholder': '',
 'class': 'form-control'
 }
 ),
 label='Home Address',
 required=False
 )

 class Meta:
 model = Mentor
 fields = ('bio', 'avatar', 'gender', 'race_ethnicity', 'birthday', 'phone', 'home_address', 'work_place')

 def clean_avatar(self):
 avatar = self.cleaned_data['avatar']

 if avatar is None:
 return avatar

 try:
 w, h = get_image_dimensions(avatar)

 # validate dimensions
 max_width = max_height = 1000
 if w > max_width or h > max_height:
 raise forms.ValidationError(
 f'Please use an image that is {max_width} x {max_height}px or smaller.'
 )

 min_width = min_height = 500
 if w < min_width or h < min_height:
 raise forms.ValidationError(
 f'Please use an image that is {min_width} x {min_height}px or larger.'
 )

 # validate content type
 main, sub = avatar.content_type.split('/')
 if (
 not (
 main == 'image' and
 sub in ['jpeg', 'pjpeg', 'gif', 'png']
 )
 ):
 raise forms.ValidationError(
 'Please use a JPEG, GIF or PNG image.'
 )

 # validate file size
 if len(avatar) > (2000 * 1024):
 raise forms.ValidationError(
 'Avatar file size may not exceed 2MB.'
 )

 except AttributeError:
 """
 Handles case when we are updating the user profile
 and do not supply a new avatar
 """
 pass

 return avatar
Loading