Skip to content

New new notifications #36

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

Open
snowsune wants to merge 1 commit into
base: main
Choose a base branch
from
Open

New new notifications #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 3 additions & 16 deletions apps/blog/static/js/blog-comments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,7 @@ function submitFormAjax(form, submitBtn, originalText) {
form.classList.remove('form-submitting');

if (data.success) {
// Show success notification
if (window.notifications) {
if (data.user_authenticated) {
window.notifications.success(data.message, 5000);
} else {
window.notifications.info(data.message, 8000);
}
}
toast(data.message, data.user_authenticated ? "success" : "info");

// Clear form
form.reset();
Expand All @@ -192,10 +185,7 @@ function submitFormAjax(form, submitBtn, originalText) {
}, 1500);

} else {
// Show error notification
if (window.notifications) {
window.notifications.error(data.message || 'An error occurred', 10000);
}
toast(data.message || 'An error occurred?', "error");

// Show field errors if any
if (data.errors) {
Expand All @@ -222,10 +212,7 @@ function submitFormAjax(form, submitBtn, originalText) {
submitBtn.classList.remove('btn-loading');
form.classList.remove('form-submitting');

// Show error notification
if (window.notifications) {
window.notifications.error('Network error. Please try again.', 10000);
}
toast('Network error. Please try again!', "error");

// Fallback to regular form submission
setTimeout(() => {
Expand Down
23 changes: 6 additions & 17 deletions apps/blog/static/js/blog-dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

document.addEventListener('DOMContentLoaded', function () {
const pendingComments = document.querySelectorAll('[data-moderation-type="pending"] .comment-row');
if (pendingComments.length > 0 && window.notifications) {
window.notifications.info(
`${pendingComments.length} comment(s) to check`,
8000
);
if (pendingComments.length > 0) {
toast(`${pendingComments.length} comment(s) to check`, "info");
}

document.addEventListener('click', function (e) {
Expand Down Expand Up @@ -37,9 +34,7 @@ function handleModerationAction(button) {
button.textContent = 'Processing...';
button.classList.add('btn-loading');

if (window.notifications) {
window.notifications.info(`Processing ${action} action...`, 3000);
}
toast(`Processing ${action} action...`, "info");

fetch(`/blog/comment/${commentId}/${action}/`, {
method: 'GET',
Expand All @@ -50,16 +45,12 @@ function handleModerationAction(button) {
.then(response => response.json())
.then(data => {
if (!data.success) {
if (window.notifications) {
window.notifications.error(data.message || 'Action failed', 10000);
}
toast(data.message || 'Action failed', "error");
resetButton(button, originalText);
return;
}

if (window.notifications) {
window.notifications.success(data.message, 5000);
}
toast(data.message, "success");

const commentRow = document.querySelector(`[data-comment-id="${commentId}"]`);
if (commentRow) {
Expand All @@ -77,9 +68,7 @@ function handleModerationAction(button) {
})
.catch(error => {
console.error('Moderation action error:', error);
if (window.notifications) {
window.notifications.error('Network error. Please try again.', 10000);
}
toast('Network error. Please try again.', "error");
resetButton(button, originalText);
});
}
Expand Down
1 change: 0 additions & 1 deletion apps/blog/test_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def __getitem__(self, item):
"django.contrib.staticfiles",
"apps.blog",
"apps.users",
"apps.notifications",
]

# Test user model
Expand Down
172 changes: 58 additions & 114 deletions apps/blog/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@
from .uploads import clean_upload_filename
from .attachments import render_attachments
from .forms import BlogPostForm, BlogPostCreateForm, TagForm, CommentForm
from apps.notifications.utils import (
show_success_notification,
show_error_notification,
show_info_notification,
)


class BlogListView(ListView):
Expand Down Expand Up @@ -123,138 +118,87 @@ def build_comment_tree(self, comments):
return root_comments


def _reply(request, redirect_url, success, message, **extra):
"""JSON for AJAX requests, otherwise a Django message + redirect."""
if request.headers.get("X-Requested-With") == "XMLHttpRequest":
return JsonResponse({"success": success, "message": message, **extra})
(messages.success if success else messages.error)(request, message)
return redirect(redirect_url)


@require_POST
def submit_comment(request, post_id):
post = get_object_or_404(BlogPost, id=post_id)
url = post.get_absolute_url()

# Check if comments are allowed (you could add a field to BlogPost for this)
if post.status != "published":
if request.headers.get("X-Requested-With") == "XMLHttpRequest":
return JsonResponse(
{
"success": False,
"message": "Comments are only allowed on published posts.",
}
)
show_error_notification(
request, "Comments are only allowed on published posts."
return _reply(
request,
url,
False,
"I dont have a way yet for you to comment on unpublished posts!",
)
return redirect(post.get_absolute_url())

form = CommentForm(request.POST, user=request.user, post=post, request=request)

if form.is_valid():
comment = form.save()

# Prepare response data
response_data = {
"success": True,
"user_authenticated": request.user.is_authenticated,
"comment_id": comment.id,
}

if request.user.is_authenticated:
response_data["message"] = "Comment posted."
show_success_notification(request, "Comment posted.")
else:
response_data["message"] = "Got it. I'll check it before it shows up."
show_success_notification(
request, "Got it. I'll check it before it shows up."
)

# Return JSON for AJAX requests, redirect for regular requests
if request.headers.get("X-Requested-With") == "XMLHttpRequest":
return JsonResponse(response_data)
message = "Comment posted."
else:
return redirect(post.get_absolute_url())
else:
# Store form errors in messages with better context
if form.errors:
error_message = "Check the comment and try again."

# Prepare error response data
response_data = {
"success": False,
"message": error_message,
"errors": form.errors,
}

# Add specific field errors
for field, errors in form.errors.items():
field_name = field.replace("_", " ").title()
for error in errors:
if field == "content":
show_error_notification(request, f"Comment: {error}")
elif field == "author_name":
show_error_notification(request, f"Name: {error}")
elif field == "author_email":
show_error_notification(request, f"Email: {error}")
elif field == "author_website":
show_error_notification(request, f"Website: {error}")
else:
show_error_notification(request, f"{field_name}: {error}")
else:
error_message = "Something went wrong. Try again."
response_data = {"success": False, "message": error_message}
show_error_notification(request, "Something went wrong. Try again.")
message = "Got it. I'll check it before it shows up."
return _reply(
request,
url,
True,
message,
user_authenticated=request.user.is_authenticated,
comment_id=comment.id,
)

# Return JSON for AJAX requests, redirect for regular requests
if request.headers.get("X-Requested-With") == "XMLHttpRequest":
return JsonResponse(response_data)
else:
return redirect(post.get_absolute_url())
# If its non ajax, one message per, otherwise...
if request.headers.get("X-Requested-With") != "XMLHttpRequest":
labels = {
"content": "Comment",
"author_name": "Name",
"author_email": "Email",
"author_website": "Website",
}
for field, errors in form.errors.items():
label = labels.get(field, field.replace("_", " ").title())
for error in errors:
messages.error(request, f"{label}: {error}")
return redirect(url)

return _reply(
request, url, False, "Check the comment and try again!", errors=form.errors
)


@login_required
def moderate_comment(request, comment_id, action):
comment = get_object_or_404(Comment, id=comment_id)
url = comment.post.get_absolute_url()

# Check if user has permission to moderate
if not (request.user.is_staff or request.user == comment.post.author):
if request.headers.get("X-Requested-With") == "XMLHttpRequest":
return JsonResponse(
{
"success": False,
"message": "You don't have permission to moderate comments.",
}
)
show_error_notification(
request, "You don't have permission to moderate comments."
return _reply(
request, url, False, "You don't have permission to moderate comments."
)
return redirect(comment.post.get_absolute_url())

# Prepare response data
response_data = {"success": True}

if action == "approve":
comment.status = "approved"
response_data["message"] = "Comment approved."
show_success_notification(request, "Comment approved.")
elif action == "reject":
comment.status = "rejected"
response_data["message"] = "Comment rejected."
show_success_notification(request, "Comment rejected.")
elif action == "spam":
comment.status = "spam"
response_data["message"] = "Comment marked as spam."
show_success_notification(request, "Comment marked as spam.")
else:
response_data = {"success": False, "message": "Invalid moderation action."}
if request.headers.get("X-Requested-With") == "XMLHttpRequest":
return JsonResponse(response_data)
show_error_notification(request, "Invalid moderation action.")
return redirect(comment.post.get_absolute_url())

# Set moderation metadata

results = {
"approve": ("approved", "Comment approved."),
"reject": ("rejected", "Comment rejected."),
"spam": ("spam", "Comment marked as spam."),
}
if action not in results:
return _reply(request, url, False, "Invalid moderation action.")

comment.status, message = results[action]
comment.moderated_at = timezone.now()
comment.moderated_by = request.user
comment.save()

# Return JSON for AJAX requests, redirect for regular requests
if request.headers.get("X-Requested-With") == "XMLHttpRequest":
return JsonResponse(response_data)
else:
return redirect(comment.post.get_absolute_url())
return _reply(request, url, True, message)


class BlogEditorMixin:
Expand All @@ -274,7 +218,7 @@ def form_valid(self, form):
form.instance.author = self.request.user
response = super().form_valid(form)

show_success_notification(self.request, "Blog post created successfully!")
messages.success(self.request, "Blog post created successfully!")
return response

def get_form_kwargs(self):
Expand All @@ -296,7 +240,7 @@ def test_func(self):

def form_valid(self, form):
response = super().form_valid(form)
show_success_notification(self.request, "Blog post updated successfully!")
messages.success(self.request, "Blog post updated successfully!")
return response

def get_form_kwargs(self):
Expand All @@ -315,7 +259,7 @@ def test_func(self):
return self.request.user == post.author or self.request.user.is_staff

def delete(self, request, *args, **kwargs):
show_success_notification(request, "Blog post deleted successfully!")
messages.success(request, "Blog post deleted successfully!")
return super().delete(request, *args, **kwargs)


Expand Down
Loading
Loading