Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 30 additions & 8 deletions backend/backend/admin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin

from .models import Member


# Register your models here.
class MemberAdmin(UserAdmin):
"""
Expand All @@ -11,16 +13,36 @@ class MemberAdmin(UserAdmin):
"""

model = Member
list_display = ('ssn', 'email', 'name', 'is_staff', 'is_active', 'verified_email')
search_fields = ('ssn','email', 'name')
ordering = ('ssn','email',)
list_display = ("ssn", "email", "name", "is_staff", "is_active", "verified_email")
search_fields = ("ssn", "email", "name")
ordering = (
"ssn",
"email",
)
fieldsets = (
(None, {'fields': ('ssn','email', 'password')}),
('Personal info', {'fields': ('name',)}),
('Permissions', {'fields': ('is_active', 'is_staff', 'is_superuser', 'verified_email')}),
(None, {"fields": ("ssn", "email", "password")}),
("Personal info", {"fields": ("name",)}),
(
"Permissions",
{"fields": ("is_active", "is_staff", "is_superuser", "verified_email")},
),
)
add_fieldsets = (
(None, {'fields': ('ssn', 'email', 'password', 'is_active', 'is_staff', 'is_superuser', 'verified_email')}),
(
None,
{
"fields": (
"ssn",
"email",
"password",
"is_active",
"is_staff",
"is_superuser",
"verified_email",
)
},
),
)

admin.site.register(Member, MemberAdmin)

admin.site.register(Member, MemberAdmin)
4 changes: 2 additions & 2 deletions backend/backend/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@


class BackendConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'backend'
default_auto_field = "django.db.models.BigAutoField"
name = "backend"
18 changes: 9 additions & 9 deletions backend/backend/email.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from django.contrib.auth.tokens import default_token_generator
from django.contrib.sites.shortcuts import get_current_site
from django.core.mail import send_mail
from django.utils.html import strip_tags
from django.template.loader import render_to_string
from django.contrib.sites.shortcuts import get_current_site

from django.contrib.auth.tokens import default_token_generator
from django.utils.html import strip_tags


# This needs rate limiting
Expand All @@ -12,12 +11,12 @@ def send_verification_email(user):
TEMPORARY FUNCTION
This function sends an email verification link to the user.
The link contains a token that the user can use to verify their email address.

"""

token = default_token_generator.make_token(user)

subject = 'Verify your email address'
subject = "Verify your email address"
message = f"Sign in with the secure link: http://localhost:3000/auth/verify-email?id={user.id}&token={token}"

send_mail(
Expand All @@ -27,22 +26,23 @@ def send_verification_email(user):
[user.email],
)


# This needs rate limiting
def send_password_reset_email(user):
"""
TEMPORARY FUNCTION
This function sends a password reset email to the user.
The email contains a link to reset the user's password.

"""
token = default_token_generator.make_token(user)

subject = 'Reset your password'
subject = "Reset your password"
message = f"Sign in with the secure link: http://localhost:3000/auth/reset?id={user.id}&token={token}"

send_mail(
subject,
message,
"webmaster@localhost",
[user.email],
)
)
Loading