Skip to content
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

change content in the user_civis tab #1484

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

change content in the user_civis tab #1484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22edb99
make the page more presentable
oppcatchera Dec 10, 2022
9ab6a97
add link back to thread page
oppcatchera Dec 12, 2022
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
67 changes: 51 additions & 16 deletions project/accounts/templates/accounts/user_civis.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,62 @@
{% load i18n %}

{% block content %}
{% for civi in civis %}
<div class="civi-card white" data-id="">
<div class="civi-header-account white">
<div class="civi-title-outer">
<div class="civi-type gray-text">{{ civi.c_type }}</div>
<div class="civi-title">{{ civi.title }}</div>
<div hidden> hahaha </div>
<div class="container" style="width: 60%;">
{% for thread, item in civiByThread.items %}
<div class="row">
<div class="thread_container" style="padding: 20px 20px 20px 20px;box-shadow: 10px 10px 30px rgb(0 0 0 / 10%); cursor: pointer;">
<div class="title">
<a href="/thread/{{thread.id}}/"><h5>{{thread.title}}</h5></a>
<h6 style="color: #808484">{{thread.author.first_name}} ({{thread.author.email}})</h6>
</div>
<div class="content">
{{item.0.thread.summary}}
</div>
<div class="civi-body">
<div class="civi-body-inner">{{ civi.body }}</div>
</div>
</div>
{% empty %}
<div class="section no-state">
<div class="container">
<div class="section">
<div class="center title-lato text">No activity</div>
<div class="timestamp" style="text-align: right;">
---- {{thread.created}}
</div>
<br>
<div class="civis" style="text-align: center;">
{% for civi in item.1 %}
<div class="civi-container" style="width: 80%; display: inline-block; border-radius: 10px; padding: 10px 10px 10px 10px; box-shadow: 10px 10px 30px rgb(0 0 0 / 10%);; text-align: left;">
<span> <b>{{civi.title}}</b> </span>
{% if civi.c_type == "problem" %}
<span style="float: right; text-align:right; font-family:cursive; padding: 0px 4px 0px 4px; color: rgb(243, 243, 243); background-color:rgb(249, 170, 170);"> {{civi.c_type}} </span>
{% endif %}
{% if civi.c_type == "cause" %}
<span style="float: right; text-align:right; font-family:cursive; padding: 0px 4px 0px 4px; color: rgb(243, 243, 243); background-color:rgb(243, 236, 24);"> {{civi.c_type}} </span>
{% endif %}
{% if civi.c_type == "solution" %}
<span style="float: right; text-align:right; font-family:cursive; padding: 0px 4px 0px 4px; color: rgb(243, 243, 243); background-color:rgb(146, 243, 156);"> {{civi.c_type}} </span>
{% endif %}
{% if civi.c_type == "response" %}
<span style="float: right; text-align:right; font-family:cursive; padding: 0px 4px 0px 4px; color: rgb(243, 243, 243); background-color:rgb(121, 240, 247);"> {{civi.c_type}} </span>
{% endif %}
{% if civi.c_type == "rebuttal" %}
<span style="float: right; text-align:right; font-family:cursive; padding: 0px 4px 0px 4px; color: rgb(243, 243, 243); background-color:rgb(255, 165, 21);"> {{civi.c_type}} </span>
{% endif %}
<div> {{civi.body}} </div>
<div style="text-align: right;">
<span class="rating-score r-0">{{ civi.votes_vneg }}</span>
<i class="material-icons double-icon-1" style="font-size: 12px;">thumb_down</i>
<span class="rating-score r-0">{{ civi.votes_neg }}</span>
<i class="material-icons" style="font-size: 13px;">thumb_down_off_alt</i>
<span class="rating-score r-0">{{ civi.votes_neutral }}</span>
<i class="material-icons" style="font-size: 13px;">remove</i>
<span class="rating-score r-0">{{ civi.votes_pos }}</span>
<i class="material-icons" style="font-size: 13px;">thumb_up_off_alt</i>
<span class="rating-score r-0">{{ civi.votes_vpos }}</span>
<i class="material-icons double-icon-1" style="font-size: 12px;">thumb_up</i>
&nbsp;&nbsp;&nbsp;
</div>
</div>
{% endfor %}
</div>
</div>
{% endfor %}
</div>

{% endfor %}
</div>

{% endblock content %}
9 changes: 8 additions & 1 deletion project/accounts/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from django.utils.http import urlsafe_base64_decode
from django.views import View
from django.views.generic.edit import FormView, UpdateView
from threads.models import Thread


class ProfileFollow(LoginRequiredMixin, View):
Expand Down Expand Up @@ -217,10 +218,16 @@ def get(self, request, username=None):
user = profile.user
civis = user.civis.all()

threads = {
civi.thread: [Thread.objects.summarize(civi.thread), []] for civi in civis
}
for civi in civis:
threads[civi.thread][1].append(civi)

return TemplateResponse(
request,
"user_civis.html",
{"profile": profile, "civis": civis},
{"profile": profile, "civiByThread": threads},
)


Expand Down
2 changes: 1 addition & 1 deletion project/core/templates/global_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{% if user.is_authenticated %}
<div class="nav-menu-item chip-menu-profile" id="js-toggle-menu">
<span class="label-username">{{ request.session.login_user_firstname }}</span>
<img class="chip-image-profile" src="{{ user.profile.profile_image_url }}" alt="{{ request.user.username }}">
<img class="chip-image-profile" src="{{ user.profile.profile_image_url }}" hidden = true alt="{{ request.user.username }}">
<i class="material-icons js-dropdown-icon">keyboard_arrow_down</i>
<i class="material-icons js-dropdown-icon hide">keyboard_arrow_up</i>
</div>
Expand Down