diff --git a/.gitignore b/.gitignore index e15106e..8263906 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,4 @@ __marimo__/ # Streamlit .streamlit/secrets.toml +config* diff --git a/TODO.txt b/TODO.txt index e1e4a5f..b7b8bf6 100644 --- a/TODO.txt +++ b/TODO.txt @@ -13,10 +13,10 @@ DOMINIC --- [x] list user api endpoint [x] CSS [x] Assets -[ ] Pick better anonymous avatar -[ ] figure out backing up DB -[ ] soft-release -[ ] Domain +[x] Pick better anonymous avatar +[x] figure out backing up DB +[x] soft-release +[x] GET Domain [ ] email notifications when user signs up: disroot email [ ] maybe start sending emails to users automatically too [ ] full-release diff --git a/cwr/settings.py b/cwr/settings.py index 9bdf66e..bd37622 100644 --- a/cwr/settings.py +++ b/cwr/settings.py @@ -1,6 +1,8 @@ import os from pathlib import Path +from config import ADMIN_EMAIL_PASSWORD + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -121,3 +123,9 @@ LOGOUT_REDIRECT_URL = "login" DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_HOST = 'smtp.purelymail.com' +EMAIL_PORT = 587 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = 'admin@christian-webring.org' +EMAIL_HOST_PASSWORD = ADMIN_EMAIL_PASSWORD diff --git a/cwr/urls.py b/cwr/urls.py index 2548015..e812174 100644 --- a/cwr/urls.py +++ b/cwr/urls.py @@ -1,7 +1,7 @@ from django.contrib import admin from django.urls import path, include -from web.views import signup, forum_threads, thread, custom_logout, profile, user_profile, denied, users +from web.views import signup, forum_threads, thread, custom_logout, profile, user_profile, denied, users, code_of_ethics, test_email urlpatterns = [ path('markdownx/', include('markdownx.urls')), @@ -12,9 +12,10 @@ urlpatterns = [ path("accounts/profile/", profile, name="profile"), path("accounts/user/", user_profile, name="user"), path("accounts/denied/", denied, name="denied"), + path("code_of_ethics", code_of_ethics, name="code_of_ethics"), path('logout/', custom_logout, name='custom_logout'), path("", forum_threads, name='index'), path("forum/threads/", forum_threads, name='forum_threads'), path("forum/thread/", thread, name='thread'), - # path("test/", test_endpoint, name='test'), + path("test/", test_email, name='test'), ] diff --git a/web/templates/base.html b/web/templates/base.html index 08311c8..03cb375 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -191,6 +191,7 @@
Forum Profile + Code of Ethics Logout
diff --git a/web/templates/code_of_ethics.html b/web/templates/code_of_ethics.html new file mode 100644 index 0000000..e294c90 --- /dev/null +++ b/web/templates/code_of_ethics.html @@ -0,0 +1,82 @@ + +{% extends "base.html" %} +{% block content %} +

Code Of Ethics

+

Code of Ethics has been borrowed from SQLite's Code of Ethics

+
    +
  1. First of all, love the Lord God with your whole heart, your whole soul, and your whole strength.
    2. +
  2. Then, love your neighbor as yourself.
    3. +
  3. Do not murder.
    4. +
  4. Do not commit adultery.
    5. +
  5. Do not steal.
    6. +
  6. Do not covet.
    7. +
  7. Do not bear false witness.
    8. +
  8. Honor all people.
    9. +
  9. Do not do to another what you would not have done to yourself.
    10. +
  10. Deny oneself in order to follow Christ.
    11. +
  11. Chastise the body.
    12. +
  12. Do not become attached to pleasures.
    13. +
  13. Love fasting.
    14. +
  14. Relieve the poor.
    15. +
  15. Clothe the naked.
    16. +
  16. Visit the sick.
    17. +
  17. Bury the dead.
    18. +
  18. Be a help in times of trouble.
    19. +
  19. Console the sorrowing.
    20. +
  20. Be a stranger to the world's ways.
    21. +
  21. Prefer nothing more than the love of Christ.
    22. +
  22. Do not give way to anger.
    23. +
  23. Do not nurse a grudge.
    24. +
  24. Do not entertain deceit in your heart.
    25. +
  25. Do not give a false peace.
    26. +
  26. Do not forsake charity.
    27. +
  27. Do not swear, for fear of perjuring yourself.
    28. +
  28. Utter only truth from heart and mouth.
    29. +
  29. Do not return evil for evil.
    30. +
  30. Do no wrong to anyone, and bear patiently wrongs done to yourself.
    31. +
  31. Love your enemies.
    32. +
  32. Do not curse those who curse you, but rather bless them.
    33. +
  33. Bear persecution for justice's sake.
    34. +
  34. Be not proud.
    35. +
  35. Be not addicted to wine.
    36. +
  36. Be not a great eater.
    37. +
  37. Be not drowsy.
    38. +
  38. Be not lazy.
    39. +
  39. Be not a grumbler.
    40. +
  40. Be not a detractor.
    41. +
  41. Put your hope in God.
    42. +
  42. Attribute to God, and not to self, whatever good you see in yourself.
    43. +
  43. Recognize always that evil is your own doing, and to impute it to yourself.
    44. +
  44. Fear the Day of Judgment.
    45. +
  45. Be in dread of hell.
    46. +
  46. Desire eternal life with all the passion of the spirit.
    47. +
  47. Keep death daily before your eyes.
    48. +
  48. Keep constant guard over the actions of your life.
    49. +
  49. Know for certain that God sees you everywhere.
    50. +
  50. When wrongful thoughts come into your heart, dash them against Christ immediately.
    51. +
  51. Disclose wrongful thoughts to your spiritual mentor.
    52. +
  52. Guard your tongue against evil and depraved speech.
    53. +
  53. Do not love much talking.
    54. +
  54. Speak no useless words or words that move to laughter.
    55. +
  55. Do not love much or boisterous laughter.
    56. +
  56. Listen willingly to holy reading.
    57. +
  57. Devote yourself frequently to prayer.
    58. +
  58. Daily in your prayers, with tears and sighs, confess your past sins to God, and amend them for the future.
    59. +
  59. Fulfill not the desires of the flesh; hate your own will.
    60. +
  60. + Obey in all things the commands of those whom God has placed in authority over you even though they (which God forbid) should act otherwise, mindful of the Lord's precept, "Do what they say, but not what they do." +
    61. +
  61. Do not wish to be called holy before one is holy; but first to be holy, that you may be truly so called.
    62. +
  62. Fulfill God's commandments daily in your deeds.
    63. +
  63. Love chastity.
    64. +
  64. Hate no one.
    65. +
  65. Be not jealous, nor harbor envy.
    66. +
  66. Do not love quarreling.
    67. +
  67. Shun arrogance.
    68. +
  68. Respect your seniors.
    69. +
  69. Love your juniors.
    70. +
  70. Pray for your enemies in the love of Christ.
    71. +
  71. Make peace with your adversary before the sun sets.
    72. +
  72. Never despair of God's mercy.
    73. + +{% endblock %} diff --git a/web/views.py b/web/views.py index 10e124b..0a1e163 100644 --- a/web/views.py +++ b/web/views.py @@ -1,11 +1,11 @@ import base64 -import json from io import BytesIO from PIL import Image from django.contrib.auth import login, logout from django.contrib.auth.decorators import login_required, user_passes_test from django.contrib import messages +from django.core.mail import send_mail from django.http import JsonResponse from django.shortcuts import render, redirect, get_object_or_404 from django.urls import reverse @@ -16,11 +16,25 @@ from web.models.forum_subcategory import ForumSubcategory from web.models.forum_post import ForumPost from web.models.custom_user import CustomUser +def test_email(request): + send_mail( + subject='test email', + message='test email', + from_email='noreply@christian-webring.org', + recipient_list=['me@domdit.com'], + fail_silently=False, + ) + return redirect('index') -# def send_email(subject, body, recipients=None): -# if not recipients: -# recipients = [x[0] for x in CustomUser.objects.filter(is_superuser=True).all().values_list('email') if x[0] != ''] -# send_mail(subject, body, 'domdit@gmail.com', recipients, fail_silently=False) + +def send_email(subject, message, recipients=None): + send_mail( + subject=subject, + message=message, + from_email='noreply@christian-webring.org', + recipient_list=recipients or ['domdit@gmail.com', 'me@domdit.com'], + fail_silently=False, + ) def is_member(user): @@ -29,11 +43,6 @@ def is_member(user): return False -# def test_endpoint(request): -# send_email('this is a subject', 'this is a body') -# return render(request, 'index.html') - - # ACCOUNT MANAGEMENT ###################################### def signup(request): if request.method == 'POST': @@ -43,6 +52,17 @@ def signup(request): login(request, user) messages.success(request, "You have successfully applied for membership, we will review your submission and send you an email once we have added you as a member! In the meantime, please start setting up the webring widget on your website!") + send_email( + subject='New User Sign Up Alert', + message=f'A new user has signed up for the webring, please review the user in the admin portal! \n\n ID: {user.id}, EMAIL: {user.email}, USERNAME: {user.username}' + ) + + send_email( + subject='Christian Web Ring - Thanks for Joining', + message=f'Hello {user.username}! \n Thank you for signing up for the Christian Web Ring. We will reach out to you soon once we have approved your account. In the meantime, please add the widget to your page. Instructions can be found here: https://christian-webring.nekoweb.org/widget.html \n Remember, we cannot add you to the webring until you have completed this step! \n\n Thanks, \n Christian Webring Admins', + recipients=[user.email] + ) + return redirect(reverse('login')) else: form = SignupForm() @@ -104,6 +124,10 @@ def user_profile(request, user_id): return render(request, 'user.html', context) +def code_of_ethics(request): + return render(request, 'code_of_ethics.html') + + # FORUM ################################################### @login_required @user_passes_test(is_member, login_url='/accounts/denied/')