diff --git a/TODO.txt b/TODO.txt index 9e4cca8..f57fc6b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,14 +1,44 @@ +v1.0 [x] login page [x] logout -[ ] change password [x] member profile update and avatar [x] forum -[ ] view other's profiles, add links in forums +[x] anonymous prayerbox +[x] view other's profiles, add links in forums [x] member type +[x] change password page +[x] users must be authed +[x] signup must redirect NOT auto grant users access, and MUST give them some info on what to expect + +v1.1 +[ ] polls +[ ] watch forum, get email notifications when someone replies +[ ] @ replies? +[ ] display if user is currently logged on when seeing their posts and their profile +[ ] show how many posts a user has made, flair for high amounts of posts? +[ ] chat room? IRC? + +TO DISCUSS: [ ] nav bar -[ ] users must be authed -[ ] signup must redirect NOT auto grant users access, and MUST give them some info on what to expect +[ ] page that displays all users and links to their websites (this already exists on neko, but better to automate it) +[ ] Pick better anonymous avatar [ ] determine where which pages should live where [ ] easier way to handle sites var, API endpoint? -[ ] send out emails to existing users letting them know they have a password and to change it -[ ] + +ACTION ITEMS: +DOMINIC --- +[x] join option without member area access +[x] NAV BAR +[x] list user api endpoint +[x] CSS +[x] Assets +[ ] soft-release +[ ] email notifications when user signs up: disroot email +[ ] maybe start sending emails to users automatically too + +KYRIE ---- +[ ] Welcome message +[ ] Signup screen +[ ] new css design +[ ] send out emails to existing users to sign up AFTER website is released + diff --git a/cwr/settings.py b/cwr/settings.py index a193610..9bdf66e 100644 --- a/cwr/settings.py +++ b/cwr/settings.py @@ -110,6 +110,10 @@ USE_TZ = True STATIC_URL = 'static/' STATIC_ROOT = 'static/' +site_root = '/home/dominic/repos/cwr' +STATICFILES_DIRS = ( + os.path.join(site_root, 'assets/'), +) LOGIN_REDIRECT_URL = 'forum_threads' LOGOUT_REDIRECT_URL = "login" # Default primary key field type diff --git a/cwr/urls.py b/cwr/urls.py index bd58c44..2548015 100644 --- a/cwr/urls.py +++ b/cwr/urls.py @@ -1,15 +1,20 @@ from django.contrib import admin from django.urls import path, include -from web.views import signup, forum_threads, thread, custom_logout, profile +from web.views import signup, forum_threads, thread, custom_logout, profile, user_profile, denied, users urlpatterns = [ path('markdownx/', include('markdownx.urls')), path('admin/', admin.site.urls), + path('api/users/', users, name='users'), path("accounts/", include("django.contrib.auth.urls")), path("accounts/signup/", signup, name="signup"), path("accounts/profile/", profile, name="profile"), + path("accounts/user/", user_profile, name="user"), + path("accounts/denied/", denied, name="denied"), 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'), ] diff --git a/static/img/bg.png b/static/img/bg.png new file mode 100644 index 0000000..413e053 Binary files /dev/null and b/static/img/bg.png differ diff --git a/static/img/bible.png b/static/img/bible.png new file mode 100644 index 0000000..e460cf9 Binary files /dev/null and b/static/img/bible.png differ diff --git a/static/img/widget-example.png b/static/img/widget-example.png new file mode 100644 index 0000000..f4c4bfe Binary files /dev/null and b/static/img/widget-example.png differ diff --git a/web/forms.py b/web/forms.py index 1ba2fe7..8facf6b 100644 --- a/web/forms.py +++ b/web/forms.py @@ -8,14 +8,22 @@ class SignupForm(UserCreationForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - for field_name in self.fields: + self.fields['email'].required = True + self.fields['email'].help_text = 'Email will be used to alert you of major announcements or information regarding your account.' + ignored_help_text_fields = ['password1', 'password2', 'username'] + for field_name in ignored_help_text_fields: self.fields[field_name].help_text = '' - url = forms.URLField(max_length=200, help_text='Required') - description = forms.CharField(widget=forms.Textarea) - rule_conf = forms.BooleanField(label='Have you read the rules?') + url = forms.URLField(max_length=200, required=True, help_text='The URL of the website that you intend to add the widget to. please follow the format of: https://your-website.com') + description = forms.CharField(widget=forms.Textarea, help_text='Please provide a description about your website. Feel free to add a description about yourself as well.') + + rule_conf = forms.BooleanField(label='Have you read the rules?', help_text='Please be sure to read the rules before signing up for this webring. The rules can be found here') rule_conf.widget.attrs.update({'class': 'checkmark'}) - comments = forms.CharField(widget=forms.Textarea) + + email_only = forms.BooleanField(label='Skip Member Area', help_text='If you just want to add the webring widget to your website and do not care about the community aspect of this webring, click this checkmark. Any important announcements will be sent to you via email. If you decide you would like to join the member area later on, contact an admin.', required=False) + email_only.widget.attrs.update({'class': 'checkmark'}) + + comments = forms.CharField(widget=forms.Textarea, required=False) class Meta: model = CustomUser @@ -27,6 +35,7 @@ class SignupForm(UserCreationForm): 'url', 'description', 'rule_conf', + 'email_only', 'comments' ) diff --git a/web/migrations/0006_forumsubcategory_can_by_anon.py b/web/migrations/0006_forumsubcategory_can_by_anon.py new file mode 100644 index 0000000..90039e5 --- /dev/null +++ b/web/migrations/0006_forumsubcategory_can_by_anon.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.7 on 2025-10-23 18:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('web', '0005_remove_forumpost_title_alter_forumpost_content'), + ] + + operations = [ + migrations.AddField( + model_name='forumsubcategory', + name='can_by_anon', + field=models.BooleanField(default=False), + ), + ] diff --git a/web/migrations/0007_customuser_email_only_alter_customuser_comments_and_more.py b/web/migrations/0007_customuser_email_only_alter_customuser_comments_and_more.py new file mode 100644 index 0000000..2e557d5 --- /dev/null +++ b/web/migrations/0007_customuser_email_only_alter_customuser_comments_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 5.2.7 on 2025-11-01 01:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('web', '0006_forumsubcategory_can_by_anon'), + ] + + operations = [ + migrations.AddField( + model_name='customuser', + name='email_only', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='customuser', + name='comments', + field=models.TextField(blank=True, default=''), + ), + migrations.AlterField( + model_name='customuser', + name='flair', + field=models.CharField(blank=True, default=''), + ), + ] diff --git a/web/models/custom_user.py b/web/models/custom_user.py index b76045a..3282c09 100644 --- a/web/models/custom_user.py +++ b/web/models/custom_user.py @@ -7,6 +7,7 @@ class CustomUser(AbstractUser): description = models.TextField(default='') avatar = models.TextField(default='', blank=True) rule_conf = models.BooleanField(default=True) - comments = models.TextField(default='') - flair = models.CharField(default='') + comments = models.TextField(default='', blank=True) + flair = models.CharField(default='', blank=True) + email_only = models.BooleanField(default=False) diff --git a/web/models/forum_subcategory.py b/web/models/forum_subcategory.py index cd995a5..eebad76 100644 --- a/web/models/forum_subcategory.py +++ b/web/models/forum_subcategory.py @@ -9,6 +9,7 @@ class ForumSubcategory(BaseModel): description = models.TextField() forum_category = models.ForeignKey(ForumCategory, on_delete=models.CASCADE) sticky = models.BooleanField() + can_by_anon = models.BooleanField(default=False) class Meta: db_table = 'forum_subcategory' diff --git a/web/templates/base.html b/web/templates/base.html index 704d85a..84dc99c 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -1,7 +1,7 @@ +{% load static %} - Christians of the Internet @@ -9,124 +9,182 @@

Christians of the Internet

- Home - Widget - Rules - Index - Manager - Join + Home + Widget + Rules + Index + Manager + Join
- Forum + Forum Profile Logout
@@ -141,7 +199,14 @@ } } -
+
+ {% if messages %} +
    + {% for message in messages %} +
  • {{ message }}
    • + {% endfor %} +
+ {% endif %} {% block content %}{% endblock %}
diff --git a/web/templates/forum_threads.html b/web/templates/forum_threads.html index 510b95b..0031343 100644 --- a/web/templates/forum_threads.html +++ b/web/templates/forum_threads.html @@ -1,6 +1,16 @@ {% extends "base.html" %} {% block content %} +

Welcome to the Forum Area

+

+ Here is where you can receive and view announcements, let us know feedback as it comes to mind, provide prayer requests for the prayer box, and enjoy conversation with other members if you'd like. +

+

+ This exists as a way to garner a bit more community, should you desire such, as well as being relatively private to the members to prevent outsider abuse; or a place for those who are little less vocal about their faith in online spaces. +

+

+ The conversation thread will be up as trial for 6 months. Please enjoy and aim to act in good faith; there are no rules besides the ones you read in order to join the ring. +

Forum

{% for category, thread in threads.items %}
{{ category }}
diff --git a/web/templates/profile.html b/web/templates/profile.html index 9fcdd60..1dc25c3 100644 --- a/web/templates/profile.html +++ b/web/templates/profile.html @@ -1,8 +1,9 @@ {% extends "base.html" %} {% block content %} -

{{ user.username }}'s Profile

- +

{{ user.username }}'s Profile

+Change Password

+

diff --git a/web/templates/registration/login.html b/web/templates/registration/login.html index 2a21807..c51f41a 100644 --- a/web/templates/registration/login.html +++ b/web/templates/registration/login.html @@ -1,11 +1,12 @@ {% extends "base.html" %} {% block content %} -

Login

- - - {% csrf_token %} - {{ form.as_p }} - -
+

Login

+
+ {% csrf_token %} + {{ form.as_p }} + +
+
+Sign Up! | Forgot Password? {% endblock %} diff --git a/web/templates/signup.html b/web/templates/signup.html index f978cb2..0f6052d 100644 --- a/web/templates/signup.html +++ b/web/templates/signup.html @@ -1,8 +1,6 @@ {% extends "base.html" %} - {% block content %} - - - -
- {% csrf_token %} - {% for field in form %} -

- {{ field.label_tag }}
- {% if field.help_text %} - {{ field.help_text }}
- {% endif %} - {{ field }}
- {% for error in field.errors %} -

{{ error }}

- {% endfor %} -

- {% endfor %} - -
+ +
+ {% csrf_token %} + {% for field in form %} +

+ {{ field.label_tag }} {% if field.field.required == True %} * {% endif %} +
+ {% if field.help_text %} + {{ field.help_text|safe }} +
+ {% endif %} + {{ field }} +
+ {% for error in field.errors %}

{{ error }}

{% endfor %} +

+ {% endfor %} + +
{% endblock %} diff --git a/web/templates/thread.html b/web/templates/thread.html index 6fce93f..19e5cf1 100644 --- a/web/templates/thread.html +++ b/web/templates/thread.html @@ -13,9 +13,9 @@ {% for post in posts %} - + - {{ post.created_by }} ({{ post.created_by.flair }}) + {{ post.created_by }} {% if post.created_by.flair %}({{ post.created_by.flair }}) {% endif %}
joined {{ post.created_by.date_joined|naturaltime }} @@ -81,18 +81,23 @@
- - -
-
- -
- - << Go Back -{% endblock %} + {% if can_be_anon %} + + Submit Anonymously? +
+ {% endif %} + + +
+
+ +
+ + << Go Back + {% endblock %} diff --git a/web/templates/user.html b/web/templates/user.html new file mode 100644 index 0000000..c590569 --- /dev/null +++ b/web/templates/user.html @@ -0,0 +1,15 @@ + +{% extends "base.html" %} +{% load humanize %} +{% block content %} +

{{ user.username }}'s Profile

+ +
+Joined: {{ user.date_joined|naturaltime }} {% if user.flair %}({{ user.flair }}) {% endif %} +
+ {{ user.url }} +

+ Description: +
+ {{ user.description }} + {% endblock %} diff --git a/web/views.py b/web/views.py index 2b8e7df..10e124b 100644 --- a/web/views.py +++ b/web/views.py @@ -1,72 +1,37 @@ import base64 +import json from io import BytesIO from PIL import Image -from django.shortcuts import render, redirect, get_object_or_404 -from django.contrib.auth import login, logout +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.http import JsonResponse +from django.shortcuts import render, redirect, get_object_or_404 from django.urls import reverse +from markdownx.utils import markdownify + from web.forms import SignupForm, ThreadPostForm, EditProfileForm from web.models.forum_subcategory import ForumSubcategory from web.models.forum_post import ForumPost - -from markdownx.utils import markdownify +from web.models.custom_user import CustomUser -def index(request): - return render(request, 'index.html') +# 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) -# FORUM ################################################### -def forum_threads(request): - parsed_forum_threads = {} - forum_subcategories = ForumSubcategory.objects.filter(active=True).order_by('-created_at').order_by('sticky').all() - - for forum_subcategory in forum_subcategories: - if forum_subcategory.forum_category.title not in parsed_forum_threads: - parsed_forum_threads[forum_subcategory.forum_category.title] = [] - - data = { - 'id': forum_subcategory.id, - 'title': forum_subcategory.title, - 'description': forum_subcategory.description, - 'post_count': len(forum_subcategory.posts.all()), - 'most_recent_poster': forum_subcategory.posts.first().created_by if forum_subcategory.posts.first() else 'admin', - 'most_recent_post_date': forum_subcategory.posts.first().created_at if forum_subcategory.posts.first() else forum_subcategory.created_at, - } - - parsed_forum_threads[forum_subcategory.forum_category.title].append(data) - - context = { - 'threads': parsed_forum_threads - } - return render(request, 'forum_threads.html', context) +def is_member(user): + if user.is_authenticated: + return user.groups.filter(name='Member').exists() + return False -def thread(request, thread_id): - thread = get_object_or_404(ForumSubcategory, pk=thread_id) - - if request.method == 'POST': - form = ThreadPostForm(request.POST) - if form.is_valid(): - post = ForumPost( - content=markdownify(form.data['content']), - forum_subcategory=thread, - created_by=request.user, - edited=False, - sticky=False, - ) - post.save() - - form = ThreadPostForm() - posts = ForumPost.objects.filter(forum_subcategory=thread).all() - - context = { - 'thread_name': thread.title, - 'thread_category': thread.forum_category.title, - 'posts': posts, - 'form': form - } - return render(request, 'thread.html', context) +# def test_endpoint(request): +# send_email('this is a subject', 'this is a body') +# return render(request, 'index.html') # ACCOUNT MANAGEMENT ###################################### @@ -76,7 +41,9 @@ def signup(request): if form.is_valid(): user = form.save() login(request, user) - return redirect('index') + 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!") + + return redirect(reverse('login')) else: form = SignupForm() @@ -86,11 +53,20 @@ def signup(request): return render(request, 'signup.html', context) +def denied(request): + messages.warning(request, "You are not a member yet and cannot access the member site. Please wait for an admin to add you. If you have waited a long time, please send an email to domdit@gmail.com") + return redirect(reverse('login')) + + +@login_required +@user_passes_test(is_member, login_url='/accounts/denied/') def custom_logout(request): logout(request) return redirect(reverse('login')) +@login_required +@user_passes_test(is_member, login_url='/accounts/denied/') def profile(request): if request.method == 'POST': form = EditProfileForm(request.POST) @@ -117,3 +93,88 @@ def profile(request): 'form': form, } return render(request, 'profile.html', context) + + +@login_required +@user_passes_test(is_member, login_url='/accounts/denied/') +def user_profile(request, user_id): + context = { + 'user': get_object_or_404(CustomUser, pk=user_id), + } + return render(request, 'user.html', context) + + +# FORUM ################################################### +@login_required +@user_passes_test(is_member, login_url='/accounts/denied/') +def forum_threads(request): + parsed_forum_threads = {} + forum_subcategories = ForumSubcategory.objects.filter(active=True).order_by('created_at').order_by('-sticky').all() + + for forum_subcategory in forum_subcategories: + if forum_subcategory.forum_category.title not in parsed_forum_threads: + parsed_forum_threads[forum_subcategory.forum_category.title] = [] + + data = { + 'id': forum_subcategory.id, + 'title': forum_subcategory.title, + 'description': forum_subcategory.description, + 'post_count': len(forum_subcategory.posts.all()), + 'most_recent_poster': forum_subcategory.posts.first().created_by if forum_subcategory.posts.first() else 'admin', + 'most_recent_post_date': forum_subcategory.posts.first().created_at if forum_subcategory.posts.first() else forum_subcategory.created_at, + } + + parsed_forum_threads[forum_subcategory.forum_category.title].append(data) + + context = { + 'threads': parsed_forum_threads + } + return render(request, 'forum_threads.html', context) + + +@login_required +@user_passes_test(is_member, login_url='/accounts/denied/') +def thread(request, thread_id): + thread = get_object_or_404(ForumSubcategory, pk=thread_id) + + if request.method == 'POST': + anonymous = False + form = ThreadPostForm(request.POST) + if form.is_valid(): + if 'anonymous' in form.data: + if form.data['anonymous'] == 'on': + anonymous = True + post = ForumPost( + content=markdownify(form.data['content']), + forum_subcategory=thread, + created_by=CustomUser.objects.filter(username='Anonymous').first() if anonymous else request.user, + edited=False, + sticky=False, + ) + post.save() + + form = ThreadPostForm() + posts = ForumPost.objects.filter(forum_subcategory=thread).all() + + context = { + 'can_be_anon': thread.can_by_anon, + 'thread_name': thread.title, + 'thread_category': thread.forum_category.title, + 'posts': posts, + 'form': form + } + return render(request, 'thread.html', context) + + +# API ############################################## +def users(request): + parsed_users = {'users': []} + admin_only = request.GET.get('admin', False) + users = CustomUser.objects.filter(is_active=True).filter(groups__name='Member') + if admin_only == 'true': + users = users.filter(is_superuser=True) + + users = users.all().values('username', 'description', 'url') + for user in users: + parsed_users['users'].append(user) + return JsonResponse(parsed_users)