Add UI for action bar

This commit is contained in:
cuom1999 2022-11-16 18:48:32 -06:00
parent f9e9df6056
commit b75a52fe74
22 changed files with 543 additions and 333 deletions

View file

@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _
from django.views.generic import ListView
from judge.comments import CommentedDetailView
from judge.views.pagevote import PageVoteDetailView
from judge.views.pagevote import PageVoteDetailView, PageVoteListView
from judge.models import (
BlogPost,
Comment,
@ -93,7 +93,7 @@ class FeedView(ListView):
return context
class PostList(FeedView):
class PostList(FeedView, PageVoteListView):
model = BlogPost
paginate_by = 10
context_object_name = "posts"
@ -130,6 +130,9 @@ class PostList(FeedView):
return context
def get_comment_page(self, post):
return "b:%s" % post.id
class TicketFeed(FeedView):
model = Ticket

View file

@ -82,6 +82,8 @@ from judge.utils.views import (
generic_message,
)
from judge.widgets import HeavyPreviewPageDownWidget
from judge.views.pagevote import PageVoteDetailView
__all__ = [
"ContestList",
@ -380,7 +382,7 @@ class ContestMixin(object):
)
class ContestDetail(ContestMixin, TitleMixin, CommentedDetailView):
class ContestDetail(ContestMixin, TitleMixin, CommentedDetailView, PageVoteDetailView):
template_name = "contest/contest.html"
def get_comment_page(self):

View file

@ -13,7 +13,7 @@ from django.views.generic.base import TemplateResponseMixin
from django.views.generic.detail import SingleObjectMixin
from judge.dblock import LockModel
from django.views.generic import View
from django.views.generic import View, ListView
__all__ = [
@ -21,6 +21,7 @@ __all__ = [
"downvote_page",
]
@login_required
def vote_page(request, delta):
if abs(delta) != 1:
@ -75,7 +76,9 @@ def vote_page(request, delta):
_("You already voted."), content_type="text/plain"
)
vote.delete()
PageVote.objects.filter(id=pagevote_id).update(score=F("score") - vote.score)
PageVote.objects.filter(id=pagevote_id).update(
score=F("score") - vote.score
)
else:
PageVote.objects.filter(id=pagevote_id).update(score=F("score") + delta)
break
@ -89,6 +92,7 @@ def upvote_page(request):
def downvote_page(request):
return vote_page(request, -1)
class PageVoteDetailView(TemplateResponseMixin, SingleObjectMixin, View):
pagevote_page = None
@ -108,13 +112,21 @@ class PageVoteDetailView(TemplateResponseMixin, SingleObjectMixin, View):
def get_context_data(self, **kwargs):
context = super(PageVoteDetailView, self).get_context_data(**kwargs)
queryset = PageVote.objects.filter(page=self.get_comment_page())
if (queryset.exists() == False):
pagevote = PageVote(
page=self.get_comment_page(), score=0
)
if queryset.exists() == False:
pagevote = PageVote(page=self.get_comment_page(), score=0)
pagevote.save()
context["pagevote"] = queryset.first()
return context
class PageVoteListView(ListView):
pagevote_page = None
def get_context_data(self, **kwargs):
context = super(PageVoteListView, self).get_context_data(**kwargs)
for item in context["object_list"]:
pagevote, _ = PageVote.objects.get_or_create(
page=self.get_comment_page(item)
)
setattr(item, "pagevote", pagevote)
return context

View file

@ -86,6 +86,7 @@ from judge.utils.views import (
generic_message,
)
from judge.ml.collab_filter import CollabFilter
from judge.views.pagevote import PageVoteDetailView, PageVoteListView
def get_contest_problem(problem, profile):
@ -172,7 +173,11 @@ class SolvedProblemMixin(object):
class ProblemSolution(
SolvedProblemMixin, ProblemMixin, TitleMixin, CommentedDetailView
SolvedProblemMixin,
ProblemMixin,
TitleMixin,
CommentedDetailView,
PageVoteDetailView,
):
context_object_name = "problem"
template_name = "problem/editorial.html"
@ -237,7 +242,9 @@ class ProblemRaw(
)
class ProblemDetail(ProblemMixin, SolvedProblemMixin, CommentedDetailView):
class ProblemDetail(
ProblemMixin, SolvedProblemMixin, CommentedDetailView, PageVoteDetailView
):
context_object_name = "problem"
template_name = "problem/problem.html"
@ -806,7 +813,7 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView
return HttpResponseRedirect(request.get_full_path())
class ProblemFeed(ProblemList):
class ProblemFeed(ProblemList, PageVoteListView):
model = Problem
context_object_name = "problems"
template_name = "problem/feed.html"
@ -832,6 +839,9 @@ class ProblemFeed(ProblemList):
**kwargs
)
def get_comment_page(self, problem):
return "p:%s" % problem.code
# arr = [[], [], ..]
def merge_recommendation(self, arr):
seed = datetime.now().strftime("%d%m%Y")