Use Salesforce for models#892

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 5 commits into from
Closed

Use Salesforce for models #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f178ef
Work in Progress
karbassi Jul 5, 2021
47d6723
Testing commit and push
gregoriofs Jul 6, 2021
93ed7bf
"Salesforce Migrations in progress"
gregoriofs Jul 6, 2021
c2f0637
WIP
gregoriofs Jul 7, 2021
018cb61
Cypress tests (#893)
karbassi Jul 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
7 changes: 7 additions & 0 deletions .env.sample
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=mysecretpassword

# Salesforce
SALESFORCE_KEY=
SALESFORCE_SECRET=
SALESFORCE_USER=
SALESFORCE_PASSWORD=
SALESFORCE_HOST=https://test.salesforce.com

# Email
DEFAULT_FROM_EMAIL=hello+local@weallcode.org
CONTACT_EMAIL=hello+local@weallcode.org
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ docker-compose run --rm app python manage.py migrate
```console
docker kill $(docker ps -q); docker-compose rm -f; docker volume rm $(docker volume ls -qf dangling=true);
```

n
- Rebuild docker containers after major changes:

```console
Expand Down
60 changes: 30 additions & 30 deletions coderdojochi/admin.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,30 +110,30 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
"last_name",
"user_link",
"mentor_count_link",
"created_at",
"updated_at",
# "created_at",
# "updated_at",
"is_active",
"is_public",
"background_check",
"avatar_approved",
# "avatar_approved",
]

list_filter = [
"is_active",
"is_public",
"background_check",
"avatar_approved",
# "avatar_approved",
]

list_select_related = [
"user",
]

ordering = [
"-created_at",
# "-created_at",
]

date_hierarchy = "created_at"
# date_hierarchy = "created_at"

search_fields = [
"user__first_name",
Expand All@@ -151,7 +151,7 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
]

filter_horizontal = [
"race_ethnicity",
# "race_ethnicity",
]

def view_on_site(self, obj):
Expand DownExpand Up@@ -253,12 +253,12 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
"last_name",
"student_count_link",
"user_link",
"created_at",
"updated_at",
# "created_at",
# "updated_at",
]

list_filter = [
"zip",
# "zip",
]

list_select_related = [
Expand All@@ -282,10 +282,10 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
]

filter_horizontal = [
"race_ethnicity",
# "race_ethnicity",
]

date_hierarchy = "created_at"
# date_hierarchy = "created_at"

view_on_site = False

Expand DownExpand Up@@ -410,7 +410,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
]

filter_horizontal = [
"race_ethnicity",
# "race_ethnicity",
]

ordering = [
Expand All@@ -428,7 +428,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
"guardian",
]

date_hierarchy = "created_at"
# date_hierarchy = "created_at"

view_on_site = False

Expand DownExpand Up@@ -499,17 +499,17 @@ class CourseAdmin(ImportExportMixin, ImportExportActionModelAdmin):

ordering = [
"code",
"created_at",
# "created_at",
]

search_fields = [
"title",
"description",
]

prepopulated_fields = {
"slug": ("title",),
}
# prepopulated_fields = {
# "slug": ("title",),
# }

view_on_site = False

Expand DownExpand Up@@ -551,7 +551,7 @@ class SessionAdmin(ImportExportMixin, ImportExportActionModelAdmin):
filter_horizontal = [
# "waitlist_mentors",
# "waitlist_students",
"assistant",
# "assistant",
]

# autocomplete_fields = [
Expand DownExpand Up@@ -687,7 +687,7 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
"get_student_age",
"get_guardian_link",
"get_session_link",
"_created_at",
# "_created_at",
"is_checked_in",
"is_active",
]
Expand All@@ -710,16 +710,16 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
]

ordering = [
"created_at",
# "created_at",
]

autocomplete_fields = [
"guardian",
# "guardian",
"session",
"student",
]

date_hierarchy = "created_at"
# date_hierarchy = "created_at"

view_on_site = False

Expand DownExpand Up@@ -755,10 +755,10 @@ def get_session_link(self, obj):

get_session_link.short_description = "Session"

def _created_at(self, obj):
return obj.created_at.strftime("%m/%d/%y %H:%M")
# def _created_at(self, obj):
# return obj.created_at.strftime("%m/%d/%y %H:%M")

_created_at.short_description = "Created At"
# _created_at.short_description = "Created At"


def mentor_check_in(modeladmin, request, queryset):
Expand DownExpand Up@@ -787,8 +787,8 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
"is_active",
"week_reminder_sent",
"day_reminder_sent",
"created_at",
"updated_at",
# "created_at",
# "updated_at",
]

list_display_links = [
Expand All@@ -807,7 +807,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
]

ordering = [
"created_at",
# "created_at",
]

search_fields = [
Expand All@@ -829,7 +829,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
mentor_check_out,
]

date_hierarchy = "created_at"
# date_hierarchy = "created_at"
view_on_site = False


Expand Down
55 changes: 28 additions & 27 deletions coderdojochi/forms.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,42 +126,43 @@ class MentorForm(CDCModelForm):

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

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

if avatar is None:
return avatar
# if avatar is None:
# return avatar

try:
w, h = get_image_dimensions(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.")
# # 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.")
# 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 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.")
# # 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
"""
# except AttributeError:
# """
# Handles case when we are updating the user profile
# and do not supply a new avatar
# """

return avatar
# return avatar


class GuardianForm(CDCModelForm):
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
Use Salesforce for models#892

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
5
commits into

from

 Closed


Use Salesforce for models
#892
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7f178ef

Work in Progress


karbassi Jul 5, 2021
47d6723

Testing commit and push


gregoriofs Jul 6, 2021
93ed7bf

"Salesforce Migrations in progress"


gregoriofs Jul 6, 2021
c2f0637

WIP


gregoriofs Jul 7, 2021
018cb61

Cypress tests (#893)


karbassi Jul 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


7 changes: 7 additions & 0 deletions
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=mysecretpassword

# Salesforce
SALESFORCE_KEY=
SALESFORCE_SECRET=
SALESFORCE_USER=
SALESFORCE_PASSWORD=
SALESFORCE_HOST=https://test.salesforce.com

# Email
DEFAULT_FROM_EMAIL=hello+local@weallcode.org
CONTACT_EMAIL=hello+local@weallcode.org
Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ docker-compose run --rm app python manage.py migrate
```console
docker kill $(docker ps -q); docker-compose rm -f; docker volume rm $(docker volume ls -qf dangling=true);
```

n
- Rebuild docker containers after major changes:

```console
Expand Down

60 changes: 30 additions & 30 deletions
coderdojochi/admin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,30 +110,30 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "user_link",
 "mentor_count_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_filter = [
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_select_related = [
 "user",
 ]

 ordering = [
 "-created_at",
# "-created_at",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 search_fields = [
 "user__first_name",
Expand All@@ -151,7 +151,7 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 def view_on_site(self, obj):
Expand DownExpand Up@@ -253,12 +253,12 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "student_count_link",
 "user_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_filter = [
 "zip",
# "zip",
 ]

 list_select_related = [
Expand All@@ -282,10 +282,10 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -410,7 +410,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 ordering = [
Expand All@@ -428,7 +428,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "guardian",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -499,17 +499,17 @@ class CourseAdmin(ImportExportMixin, ImportExportActionModelAdmin):

 ordering = [
 "code",
 "created_at",
# "created_at",
 ]

 search_fields = [
 "title",
 "description",
 ]

 prepopulated_fields = {
 "slug": ("title",),
 }
# prepopulated_fields = {
#  "slug": ("title",),
# }

 view_on_site = False

Expand DownExpand Up@@ -551,7 +551,7 @@ class SessionAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 filter_horizontal = [
 # "waitlist_mentors",
 # "waitlist_students",
 "assistant",
# "assistant",
 ]

 # autocomplete_fields = [
Expand DownExpand Up@@ -687,7 +687,7 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "get_student_age",
 "get_guardian_link",
 "get_session_link",
 "_created_at",
# "_created_at",
 "is_checked_in",
 "is_active",
 ]
Expand All@@ -710,16 +710,16 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 autocomplete_fields = [
 "guardian",
# "guardian",
 "session",
 "student",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -755,10 +755,10 @@ def get_session_link(self, obj):

 get_session_link.short_description = "Session"

 def _created_at(self, obj):
 return obj.created_at.strftime("%m/%d/%y %H:%M")
# def _created_at(self, obj):
#  return obj.created_at.strftime("%m/%d/%y %H:%M")

 _created_at.short_description = "Created At"
# _created_at.short_description = "Created At"


def mentor_check_in(modeladmin, request, queryset):
Expand DownExpand Up@@ -787,8 +787,8 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "is_active",
 "week_reminder_sent",
 "day_reminder_sent",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_display_links = [
Expand All@@ -807,7 +807,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 search_fields = [
Expand All@@ -829,7 +829,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 mentor_check_out,
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"
 view_on_site = False


Expand Down

55 changes: 28 additions & 27 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,42 +126,43 @@ class MentorForm(CDCModelForm):

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

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

 if avatar is None:
 return avatar
#  if avatar is None:
#  return avatar

 try:
 w, h = get_image_dimensions(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.")
#  # 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.")
#  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 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.")
#  # 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
 """
#  except AttributeError:
#  """
#  Handles case when we are updating the user profile
#  and do not supply a new avatar
#  """

 return avatar
#  return avatar


class GuardianForm(CDCModelForm):
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
Use Salesforce for models#892

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
5
commits into

from

 Closed


Use Salesforce for models
#892
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7f178ef

Work in Progress


karbassi Jul 5, 2021
47d6723

Testing commit and push


gregoriofs Jul 6, 2021
93ed7bf

"Salesforce Migrations in progress"


gregoriofs Jul 6, 2021
c2f0637

WIP


gregoriofs Jul 7, 2021
018cb61

Cypress tests (#893)


karbassi Jul 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


7 changes: 7 additions & 0 deletions
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=mysecretpassword

# Salesforce
SALESFORCE_KEY=
SALESFORCE_SECRET=
SALESFORCE_USER=
SALESFORCE_PASSWORD=
SALESFORCE_HOST=https://test.salesforce.com

# Email
DEFAULT_FROM_EMAIL=hello+local@weallcode.org
CONTACT_EMAIL=hello+local@weallcode.org
Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ docker-compose run --rm app python manage.py migrate
```console
docker kill $(docker ps -q); docker-compose rm -f; docker volume rm $(docker volume ls -qf dangling=true);
```

n
- Rebuild docker containers after major changes:

```console
Expand Down

60 changes: 30 additions & 30 deletions
coderdojochi/admin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,30 +110,30 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "user_link",
 "mentor_count_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_filter = [
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_select_related = [
 "user",
 ]

 ordering = [
 "-created_at",
# "-created_at",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 search_fields = [
 "user__first_name",
Expand All@@ -151,7 +151,7 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 def view_on_site(self, obj):
Expand DownExpand Up@@ -253,12 +253,12 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "student_count_link",
 "user_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_filter = [
 "zip",
# "zip",
 ]

 list_select_related = [
Expand All@@ -282,10 +282,10 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -410,7 +410,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 ordering = [
Expand All@@ -428,7 +428,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "guardian",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -499,17 +499,17 @@ class CourseAdmin(ImportExportMixin, ImportExportActionModelAdmin):

 ordering = [
 "code",
 "created_at",
# "created_at",
 ]

 search_fields = [
 "title",
 "description",
 ]

 prepopulated_fields = {
 "slug": ("title",),
 }
# prepopulated_fields = {
#  "slug": ("title",),
# }

 view_on_site = False

Expand DownExpand Up@@ -551,7 +551,7 @@ class SessionAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 filter_horizontal = [
 # "waitlist_mentors",
 # "waitlist_students",
 "assistant",
# "assistant",
 ]

 # autocomplete_fields = [
Expand DownExpand Up@@ -687,7 +687,7 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "get_student_age",
 "get_guardian_link",
 "get_session_link",
 "_created_at",
# "_created_at",
 "is_checked_in",
 "is_active",
 ]
Expand All@@ -710,16 +710,16 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 autocomplete_fields = [
 "guardian",
# "guardian",
 "session",
 "student",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -755,10 +755,10 @@ def get_session_link(self, obj):

 get_session_link.short_description = "Session"

 def _created_at(self, obj):
 return obj.created_at.strftime("%m/%d/%y %H:%M")
# def _created_at(self, obj):
#  return obj.created_at.strftime("%m/%d/%y %H:%M")

 _created_at.short_description = "Created At"
# _created_at.short_description = "Created At"


def mentor_check_in(modeladmin, request, queryset):
Expand DownExpand Up@@ -787,8 +787,8 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "is_active",
 "week_reminder_sent",
 "day_reminder_sent",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_display_links = [
Expand All@@ -807,7 +807,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 search_fields = [
Expand All@@ -829,7 +829,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 mentor_check_out,
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"
 view_on_site = False


Expand Down

55 changes: 28 additions & 27 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,42 +126,43 @@ class MentorForm(CDCModelForm):

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

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

 if avatar is None:
 return avatar
#  if avatar is None:
#  return avatar

 try:
 w, h = get_image_dimensions(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.")
#  # 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.")
#  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 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.")
#  # 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
 """
#  except AttributeError:
#  """
#  Handles case when we are updating the user profile
#  and do not supply a new avatar
#  """

 return avatar
#  return avatar


class GuardianForm(CDCModelForm):
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
Use Salesforce for models#892

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
5
commits into

from

 Closed


Use Salesforce for models
#892
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7f178ef

Work in Progress


karbassi Jul 5, 2021
47d6723

Testing commit and push


gregoriofs Jul 6, 2021
93ed7bf

"Salesforce Migrations in progress"


gregoriofs Jul 6, 2021
c2f0637

WIP


gregoriofs Jul 7, 2021
018cb61

Cypress tests (#893)


karbassi Jul 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


7 changes: 7 additions & 0 deletions
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=mysecretpassword

# Salesforce
SALESFORCE_KEY=
SALESFORCE_SECRET=
SALESFORCE_USER=
SALESFORCE_PASSWORD=
SALESFORCE_HOST=https://test.salesforce.com

# Email
DEFAULT_FROM_EMAIL=hello+local@weallcode.org
CONTACT_EMAIL=hello+local@weallcode.org
Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ docker-compose run --rm app python manage.py migrate
```console
docker kill $(docker ps -q); docker-compose rm -f; docker volume rm $(docker volume ls -qf dangling=true);
```

n
- Rebuild docker containers after major changes:

```console
Expand Down

60 changes: 30 additions & 30 deletions
coderdojochi/admin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,30 +110,30 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "user_link",
 "mentor_count_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_filter = [
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_select_related = [
 "user",
 ]

 ordering = [
 "-created_at",
# "-created_at",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 search_fields = [
 "user__first_name",
Expand All@@ -151,7 +151,7 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 def view_on_site(self, obj):
Expand DownExpand Up@@ -253,12 +253,12 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "student_count_link",
 "user_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_filter = [
 "zip",
# "zip",
 ]

 list_select_related = [
Expand All@@ -282,10 +282,10 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -410,7 +410,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 ordering = [
Expand All@@ -428,7 +428,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "guardian",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -499,17 +499,17 @@ class CourseAdmin(ImportExportMixin, ImportExportActionModelAdmin):

 ordering = [
 "code",
 "created_at",
# "created_at",
 ]

 search_fields = [
 "title",
 "description",
 ]

 prepopulated_fields = {
 "slug": ("title",),
 }
# prepopulated_fields = {
#  "slug": ("title",),
# }

 view_on_site = False

Expand DownExpand Up@@ -551,7 +551,7 @@ class SessionAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 filter_horizontal = [
 # "waitlist_mentors",
 # "waitlist_students",
 "assistant",
# "assistant",
 ]

 # autocomplete_fields = [
Expand DownExpand Up@@ -687,7 +687,7 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "get_student_age",
 "get_guardian_link",
 "get_session_link",
 "_created_at",
# "_created_at",
 "is_checked_in",
 "is_active",
 ]
Expand All@@ -710,16 +710,16 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 autocomplete_fields = [
 "guardian",
# "guardian",
 "session",
 "student",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -755,10 +755,10 @@ def get_session_link(self, obj):

 get_session_link.short_description = "Session"

 def _created_at(self, obj):
 return obj.created_at.strftime("%m/%d/%y %H:%M")
# def _created_at(self, obj):
#  return obj.created_at.strftime("%m/%d/%y %H:%M")

 _created_at.short_description = "Created At"
# _created_at.short_description = "Created At"


def mentor_check_in(modeladmin, request, queryset):
Expand DownExpand Up@@ -787,8 +787,8 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "is_active",
 "week_reminder_sent",
 "day_reminder_sent",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_display_links = [
Expand All@@ -807,7 +807,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 search_fields = [
Expand All@@ -829,7 +829,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 mentor_check_out,
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"
 view_on_site = False


Expand Down

55 changes: 28 additions & 27 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,42 +126,43 @@ class MentorForm(CDCModelForm):

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

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

 if avatar is None:
 return avatar
#  if avatar is None:
#  return avatar

 try:
 w, h = get_image_dimensions(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.")
#  # 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.")
#  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 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.")
#  # 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
 """
#  except AttributeError:
#  """
#  Handles case when we are updating the user profile
#  and do not supply a new avatar
#  """

 return avatar
#  return avatar


class GuardianForm(CDCModelForm):
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
Use Salesforce for models#892

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
5
commits into

from

 Closed


Use Salesforce for models
#892
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7f178ef

Work in Progress


karbassi Jul 5, 2021
47d6723

Testing commit and push


gregoriofs Jul 6, 2021
93ed7bf

"Salesforce Migrations in progress"


gregoriofs Jul 6, 2021
c2f0637

WIP


gregoriofs Jul 7, 2021
018cb61

Cypress tests (#893)


karbassi Jul 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


7 changes: 7 additions & 0 deletions
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=mysecretpassword

# Salesforce
SALESFORCE_KEY=
SALESFORCE_SECRET=
SALESFORCE_USER=
SALESFORCE_PASSWORD=
SALESFORCE_HOST=https://test.salesforce.com

# Email
DEFAULT_FROM_EMAIL=hello+local@weallcode.org
CONTACT_EMAIL=hello+local@weallcode.org
Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ docker-compose run --rm app python manage.py migrate
```console
docker kill $(docker ps -q); docker-compose rm -f; docker volume rm $(docker volume ls -qf dangling=true);
```

n
- Rebuild docker containers after major changes:

```console
Expand Down

60 changes: 30 additions & 30 deletions
coderdojochi/admin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,30 +110,30 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "user_link",
 "mentor_count_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_filter = [
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_select_related = [
 "user",
 ]

 ordering = [
 "-created_at",
# "-created_at",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 search_fields = [
 "user__first_name",
Expand All@@ -151,7 +151,7 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 def view_on_site(self, obj):
Expand DownExpand Up@@ -253,12 +253,12 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "student_count_link",
 "user_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_filter = [
 "zip",
# "zip",
 ]

 list_select_related = [
Expand All@@ -282,10 +282,10 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -410,7 +410,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 ordering = [
Expand All@@ -428,7 +428,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "guardian",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -499,17 +499,17 @@ class CourseAdmin(ImportExportMixin, ImportExportActionModelAdmin):

 ordering = [
 "code",
 "created_at",
# "created_at",
 ]

 search_fields = [
 "title",
 "description",
 ]

 prepopulated_fields = {
 "slug": ("title",),
 }
# prepopulated_fields = {
#  "slug": ("title",),
# }

 view_on_site = False

Expand DownExpand Up@@ -551,7 +551,7 @@ class SessionAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 filter_horizontal = [
 # "waitlist_mentors",
 # "waitlist_students",
 "assistant",
# "assistant",
 ]

 # autocomplete_fields = [
Expand DownExpand Up@@ -687,7 +687,7 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "get_student_age",
 "get_guardian_link",
 "get_session_link",
 "_created_at",
# "_created_at",
 "is_checked_in",
 "is_active",
 ]
Expand All@@ -710,16 +710,16 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 autocomplete_fields = [
 "guardian",
# "guardian",
 "session",
 "student",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -755,10 +755,10 @@ def get_session_link(self, obj):

 get_session_link.short_description = "Session"

 def _created_at(self, obj):
 return obj.created_at.strftime("%m/%d/%y %H:%M")
# def _created_at(self, obj):
#  return obj.created_at.strftime("%m/%d/%y %H:%M")

 _created_at.short_description = "Created At"
# _created_at.short_description = "Created At"


def mentor_check_in(modeladmin, request, queryset):
Expand DownExpand Up@@ -787,8 +787,8 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "is_active",
 "week_reminder_sent",
 "day_reminder_sent",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_display_links = [
Expand All@@ -807,7 +807,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 search_fields = [
Expand All@@ -829,7 +829,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 mentor_check_out,
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"
 view_on_site = False


Expand Down

55 changes: 28 additions & 27 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,42 +126,43 @@ class MentorForm(CDCModelForm):

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

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

 if avatar is None:
 return avatar
#  if avatar is None:
#  return avatar

 try:
 w, h = get_image_dimensions(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.")
#  # 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.")
#  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 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.")
#  # 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
 """
#  except AttributeError:
#  """
#  Handles case when we are updating the user profile
#  and do not supply a new avatar
#  """

 return avatar
#  return avatar


class GuardianForm(CDCModelForm):
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
Use Salesforce for models#892

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
5
commits into

from

 Closed


Use Salesforce for models
#892
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7f178ef

Work in Progress


karbassi Jul 5, 2021
47d6723

Testing commit and push


gregoriofs Jul 6, 2021
93ed7bf

"Salesforce Migrations in progress"


gregoriofs Jul 6, 2021
c2f0637

WIP


gregoriofs Jul 7, 2021
018cb61

Cypress tests (#893)


karbassi Jul 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


7 changes: 7 additions & 0 deletions
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=mysecretpassword

# Salesforce
SALESFORCE_KEY=
SALESFORCE_SECRET=
SALESFORCE_USER=
SALESFORCE_PASSWORD=
SALESFORCE_HOST=https://test.salesforce.com

# Email
DEFAULT_FROM_EMAIL=hello+local@weallcode.org
CONTACT_EMAIL=hello+local@weallcode.org
Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ docker-compose run --rm app python manage.py migrate
```console
docker kill $(docker ps -q); docker-compose rm -f; docker volume rm $(docker volume ls -qf dangling=true);
```

n
- Rebuild docker containers after major changes:

```console
Expand Down

60 changes: 30 additions & 30 deletions
coderdojochi/admin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,30 +110,30 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "user_link",
 "mentor_count_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_filter = [
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_select_related = [
 "user",
 ]

 ordering = [
 "-created_at",
# "-created_at",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 search_fields = [
 "user__first_name",
Expand All@@ -151,7 +151,7 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 def view_on_site(self, obj):
Expand DownExpand Up@@ -253,12 +253,12 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "student_count_link",
 "user_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_filter = [
 "zip",
# "zip",
 ]

 list_select_related = [
Expand All@@ -282,10 +282,10 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -410,7 +410,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 ordering = [
Expand All@@ -428,7 +428,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "guardian",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -499,17 +499,17 @@ class CourseAdmin(ImportExportMixin, ImportExportActionModelAdmin):

 ordering = [
 "code",
 "created_at",
# "created_at",
 ]

 search_fields = [
 "title",
 "description",
 ]

 prepopulated_fields = {
 "slug": ("title",),
 }
# prepopulated_fields = {
#  "slug": ("title",),
# }

 view_on_site = False

Expand DownExpand Up@@ -551,7 +551,7 @@ class SessionAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 filter_horizontal = [
 # "waitlist_mentors",
 # "waitlist_students",
 "assistant",
# "assistant",
 ]

 # autocomplete_fields = [
Expand DownExpand Up@@ -687,7 +687,7 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "get_student_age",
 "get_guardian_link",
 "get_session_link",
 "_created_at",
# "_created_at",
 "is_checked_in",
 "is_active",
 ]
Expand All@@ -710,16 +710,16 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 autocomplete_fields = [
 "guardian",
# "guardian",
 "session",
 "student",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -755,10 +755,10 @@ def get_session_link(self, obj):

 get_session_link.short_description = "Session"

 def _created_at(self, obj):
 return obj.created_at.strftime("%m/%d/%y %H:%M")
# def _created_at(self, obj):
#  return obj.created_at.strftime("%m/%d/%y %H:%M")

 _created_at.short_description = "Created At"
# _created_at.short_description = "Created At"


def mentor_check_in(modeladmin, request, queryset):
Expand DownExpand Up@@ -787,8 +787,8 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "is_active",
 "week_reminder_sent",
 "day_reminder_sent",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_display_links = [
Expand All@@ -807,7 +807,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 search_fields = [
Expand All@@ -829,7 +829,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 mentor_check_out,
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"
 view_on_site = False


Expand Down

55 changes: 28 additions & 27 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,42 +126,43 @@ class MentorForm(CDCModelForm):

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

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

 if avatar is None:
 return avatar
#  if avatar is None:
#  return avatar

 try:
 w, h = get_image_dimensions(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.")
#  # 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.")
#  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 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.")
#  # 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
 """
#  except AttributeError:
#  """
#  Handles case when we are updating the user profile
#  and do not supply a new avatar
#  """

 return avatar
#  return avatar


class GuardianForm(CDCModelForm):
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
Use Salesforce for models#892

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
5
commits into

from

 Closed


Use Salesforce for models
#892
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7f178ef

Work in Progress


karbassi Jul 5, 2021
47d6723

Testing commit and push


gregoriofs Jul 6, 2021
93ed7bf

"Salesforce Migrations in progress"


gregoriofs Jul 6, 2021
c2f0637

WIP


gregoriofs Jul 7, 2021
018cb61

Cypress tests (#893)


karbassi Jul 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


7 changes: 7 additions & 0 deletions
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=mysecretpassword

# Salesforce
SALESFORCE_KEY=
SALESFORCE_SECRET=
SALESFORCE_USER=
SALESFORCE_PASSWORD=
SALESFORCE_HOST=https://test.salesforce.com

# Email
DEFAULT_FROM_EMAIL=hello+local@weallcode.org
CONTACT_EMAIL=hello+local@weallcode.org
Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ docker-compose run --rm app python manage.py migrate
```console
docker kill $(docker ps -q); docker-compose rm -f; docker volume rm $(docker volume ls -qf dangling=true);
```

n
- Rebuild docker containers after major changes:

```console
Expand Down

60 changes: 30 additions & 30 deletions
coderdojochi/admin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,30 +110,30 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "user_link",
 "mentor_count_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_filter = [
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_select_related = [
 "user",
 ]

 ordering = [
 "-created_at",
# "-created_at",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 search_fields = [
 "user__first_name",
Expand All@@ -151,7 +151,7 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 def view_on_site(self, obj):
Expand DownExpand Up@@ -253,12 +253,12 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "student_count_link",
 "user_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_filter = [
 "zip",
# "zip",
 ]

 list_select_related = [
Expand All@@ -282,10 +282,10 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -410,7 +410,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 ordering = [
Expand All@@ -428,7 +428,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "guardian",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -499,17 +499,17 @@ class CourseAdmin(ImportExportMixin, ImportExportActionModelAdmin):

 ordering = [
 "code",
 "created_at",
# "created_at",
 ]

 search_fields = [
 "title",
 "description",
 ]

 prepopulated_fields = {
 "slug": ("title",),
 }
# prepopulated_fields = {
#  "slug": ("title",),
# }

 view_on_site = False

Expand DownExpand Up@@ -551,7 +551,7 @@ class SessionAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 filter_horizontal = [
 # "waitlist_mentors",
 # "waitlist_students",
 "assistant",
# "assistant",
 ]

 # autocomplete_fields = [
Expand DownExpand Up@@ -687,7 +687,7 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "get_student_age",
 "get_guardian_link",
 "get_session_link",
 "_created_at",
# "_created_at",
 "is_checked_in",
 "is_active",
 ]
Expand All@@ -710,16 +710,16 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 autocomplete_fields = [
 "guardian",
# "guardian",
 "session",
 "student",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -755,10 +755,10 @@ def get_session_link(self, obj):

 get_session_link.short_description = "Session"

 def _created_at(self, obj):
 return obj.created_at.strftime("%m/%d/%y %H:%M")
# def _created_at(self, obj):
#  return obj.created_at.strftime("%m/%d/%y %H:%M")

 _created_at.short_description = "Created At"
# _created_at.short_description = "Created At"


def mentor_check_in(modeladmin, request, queryset):
Expand DownExpand Up@@ -787,8 +787,8 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "is_active",
 "week_reminder_sent",
 "day_reminder_sent",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_display_links = [
Expand All@@ -807,7 +807,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 search_fields = [
Expand All@@ -829,7 +829,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 mentor_check_out,
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"
 view_on_site = False


Expand Down

55 changes: 28 additions & 27 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,42 +126,43 @@ class MentorForm(CDCModelForm):

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

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

 if avatar is None:
 return avatar
#  if avatar is None:
#  return avatar

 try:
 w, h = get_image_dimensions(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.")
#  # 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.")
#  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 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.")
#  # 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
 """
#  except AttributeError:
#  """
#  Handles case when we are updating the user profile
#  and do not supply a new avatar
#  """

 return avatar
#  return avatar


class GuardianForm(CDCModelForm):
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
Use Salesforce for models#892

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
5
commits into

from

 Closed


Use Salesforce for models
#892
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7f178ef

Work in Progress


karbassi Jul 5, 2021
47d6723

Testing commit and push


gregoriofs Jul 6, 2021
93ed7bf

"Salesforce Migrations in progress"


gregoriofs Jul 6, 2021
c2f0637

WIP


gregoriofs Jul 7, 2021
018cb61

Cypress tests (#893)


karbassi Jul 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


7 changes: 7 additions & 0 deletions
.env.sample

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=mysecretpassword

# Salesforce
SALESFORCE_KEY=
SALESFORCE_SECRET=
SALESFORCE_USER=
SALESFORCE_PASSWORD=
SALESFORCE_HOST=https://test.salesforce.com

# Email
DEFAULT_FROM_EMAIL=hello+local@weallcode.org
CONTACT_EMAIL=hello+local@weallcode.org
Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ docker-compose run --rm app python manage.py migrate
```console
docker kill $(docker ps -q); docker-compose rm -f; docker volume rm $(docker volume ls -qf dangling=true);
```

n
- Rebuild docker containers after major changes:

```console
Expand Down

60 changes: 30 additions & 30 deletions
coderdojochi/admin.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,30 +110,30 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "user_link",
 "mentor_count_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_filter = [
 "is_active",
 "is_public",
 "background_check",
 "avatar_approved",
# "avatar_approved",
 ]

 list_select_related = [
 "user",
 ]

 ordering = [
 "-created_at",
# "-created_at",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 search_fields = [
 "user__first_name",
Expand All@@ -151,7 +151,7 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 def view_on_site(self, obj):
Expand DownExpand Up@@ -253,12 +253,12 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "last_name",
 "student_count_link",
 "user_link",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_filter = [
 "zip",
# "zip",
 ]

 list_select_related = [
Expand All@@ -282,10 +282,10 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -410,7 +410,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 filter_horizontal = [
 "race_ethnicity",
# "race_ethnicity",
 ]

 ordering = [
Expand All@@ -428,7 +428,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "guardian",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -499,17 +499,17 @@ class CourseAdmin(ImportExportMixin, ImportExportActionModelAdmin):

 ordering = [
 "code",
 "created_at",
# "created_at",
 ]

 search_fields = [
 "title",
 "description",
 ]

 prepopulated_fields = {
 "slug": ("title",),
 }
# prepopulated_fields = {
#  "slug": ("title",),
# }

 view_on_site = False

Expand DownExpand Up@@ -551,7 +551,7 @@ class SessionAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 filter_horizontal = [
 # "waitlist_mentors",
 # "waitlist_students",
 "assistant",
# "assistant",
 ]

 # autocomplete_fields = [
Expand DownExpand Up@@ -687,7 +687,7 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "get_student_age",
 "get_guardian_link",
 "get_session_link",
 "_created_at",
# "_created_at",
 "is_checked_in",
 "is_active",
 ]
Expand All@@ -710,16 +710,16 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 autocomplete_fields = [
 "guardian",
# "guardian",
 "session",
 "student",
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"

 view_on_site = False

Expand DownExpand Up@@ -755,10 +755,10 @@ def get_session_link(self, obj):

 get_session_link.short_description = "Session"

 def _created_at(self, obj):
 return obj.created_at.strftime("%m/%d/%y %H:%M")
# def _created_at(self, obj):
#  return obj.created_at.strftime("%m/%d/%y %H:%M")

 _created_at.short_description = "Created At"
# _created_at.short_description = "Created At"


def mentor_check_in(modeladmin, request, queryset):
Expand DownExpand Up@@ -787,8 +787,8 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 "is_active",
 "week_reminder_sent",
 "day_reminder_sent",
 "created_at",
 "updated_at",
# "created_at",
# "updated_at",
 ]

 list_display_links = [
Expand All@@ -807,7 +807,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

 ordering = [
 "created_at",
# "created_at",
 ]

 search_fields = [
Expand All@@ -829,7 +829,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 mentor_check_out,
 ]

 date_hierarchy = "created_at"
# date_hierarchy = "created_at"
 view_on_site = False


Expand Down

55 changes: 28 additions & 27 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,42 +126,43 @@ class MentorForm(CDCModelForm):

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

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

 if avatar is None:
 return avatar
#  if avatar is None:
#  return avatar

 try:
 w, h = get_image_dimensions(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.")
#  # 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.")
#  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 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.")
#  # 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
 """
#  except AttributeError:
#  """
#  Handles case when we are updating the user profile
#  and do not supply a new avatar
#  """

 return avatar
#  return avatar


class GuardianForm(CDCModelForm):
Expand Down
Loading