Skip to content

Arquivando funcionalidades no Vote Pelo Clima #313

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
igr-santos wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Arquivando funcionalidades no Vote Pelo Clima #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7e94c8
feat(vote): change navigation to archived pages and apps
igr-santos Nov 4, 2024
9973713
feat(vote): change copy to header in candidate search page
igr-santos Nov 4, 2024
bc7e03d
feat(vote): add elected filter like default in candidature search
igr-santos Nov 4, 2024
554c68b
fix(vote): color to link in footer
igr-santos Nov 4, 2024
47a1d15
feat(vote): layout adjusts on candidature search template
sergiomario Nov 11, 2024
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
6 changes: 3 additions & 3 deletions app/org_eleicoes/votepeloclima/candidature/forms/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ class FilterFormSidebar(RemoveRequiredMixin, forms.ModelForm):
election_status = forms.ChoiceField(
label="Filtrar por",
choices=[
("second_round", "Candidaturas no 2º turno"),
("elected", "Candidaturas eleitas"),
("all", "Todas as candidaturas"),
("elected", "Candidaturas eleitas")
("second_round", "Candidaturas no 2º turno")
],
widget=ButtonRadioSelect,
initial="second_round" # Define o filtro de 2º turno como padrão
initial="elected" # Define o filtro de eleito como padrão
)
proposes = forms.MultipleChoiceField(
label="Propostas", widget=ButtonCheckboxSelectMultiple
Expand Down
14 changes: 7 additions & 7 deletions app/org_eleicoes/votepeloclima/candidature/templates/candidature/candidature_search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
{% block content %}
<form method="get">
<main class="container mx-auto pb-4">
<section class="pt-5 pb-3" style="max-width:570px;">
<h2 class="text-uppercase fw-bold search-title-font-size">Conheça candidaturas da sua cidade</h2>
<p>Use os filtros para descobrir candidaturas comprometidas com políticas climáticas!</span>
<section class="pt-5 pb-3" style="max-width:757px;">
<h2 class="text-uppercase fw-bold search-title-font-size">Conheça candidaturas comprometidas com o clima</h2>
<p>Veja todas as candidaturas cadastradas em 2024 e descubra quais foram eleitas com compromisso com políticas climáticas. Use os filtros para explorar as propostas e os representantes de sua cidade.</p>
</section>
<div class="grid">
<!-- Navbar -->
Expand Down Expand Up @@ -45,11 +45,11 @@ <h6 class="text-uppercase fw-bold"><i class="ds-sidebar-bars"></i> Filtrar resul
<div class="card">
<a class="position-relative" href="{% url 'candidate_profile' candidature.slug %}">
<img src="{{ candidature.photo|thumbnail_url:'profile-photo' }}" class="card-img-top" alt="Foto de {{ candidature.legal_name }}">
{% if candidature.get_election_result == "segundo_turno" %}
<span class="card-flag badge bg-primary position-absolute top-0 end-0 mt-3 p-2">2º Turno</span>
{% endif %}
{% if candidature.get_election_result == "eleita" %}
<span class="card-flag badge bg-secondary position-absolute top-0 end-0 mt-3 p-2">Eleito/a</span>
<span class="card-flag badge bg-secondary position-absolute top-0 end-0 mt-3 p-2">Eleito/a</span>
{% endif %}
{% if candidature.get_election_result == "segundo_turno" %}
<span class="card-flag badge bg-primary position-absolute top-0 end-0 mt-3 p-2">2º Turno</span>
{% endif %}
</a>
<div class="card-body px-2 py-1">
Expand Down
4 changes: 2 additions & 2 deletions app/org_eleicoes/votepeloclima/candidature/views/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ def get_queryset(self):
)
)

election_status = cleaned_data.get("election_status", "second_round")
election_status = cleaned_data.get("election_status", "elected")
else:
election_status = "second_round"
election_status = "elected"

# Filtra com base no status da eleição
if election_status == "second_round":
Expand Down
28 changes: 1 addition & 27 deletions app/org_eleicoes/votepeloclima/templates/votepeloclima/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,7 @@
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav me-auto my-2 my-lg-0">
{% show_menu 0 100 100 100 "votepeloclima/menu_item.html" %}
<!-- <li class="nav-item">
<a class="nav-link active" aria-current="page" href="#">Menu 1</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Menu 2</a>
</li> -->
<!-- <li class="nav-item">
<a class="nav-link" href="#">Pricing</a>
</li> -->
</ul>
<div class="d-flex flex-column flex-md-row" style="--bs-gap:1rem;">
{% block navbar_actions %}
{% if request.user.is_authenticated %}
<a class="btn btn-outline-light text-uppercase" href="{% url 'dashboard' %}">Área da Candidatura</a>
<a class="btn btn-light text-uppercase" href="{% url 'oauth:logout' %}">Sair</a>
{% else %}
<a class="btn btn-outline-light text-uppercase" href="{% url 'register' %}" role="button">Cadastre-se</a>
<a class="btn btn-light text-uppercase" href="{% url 'dashboard' %}" role="button">Login</a>
{% endif %}
{% endblock %}
</div>
</div>
</div>
</nav>
Expand All @@ -62,13 +42,7 @@
<div class="g-col-12 g-col-md-8">
<img src="{% static "imgs/logo-footer.svg" %}" alt="Vote Pelo Clima">
<p class="mt-3">Vote pelo Clima é uma iniciativa para fortalecer a democracia por meio da participação popular nas eleições municipais, com ênfase na crise climática. Nosso objetivo é dar visibilidade a candidaturas comprometidas em enfrentar amplamente as mudanças climáticas nas cidades</p>
<ul class="d-flex flex-wrap list-unstyled gap-2 mb-2">
{% comment %} <li><a class="text-white text-uppercase fw-bold" href="{% url 'candidature-list' %}" rel="noopener noreferrer">Conheça as candidaturas</a></li> {% endcomment %}
<li><a class="text-white text-uppercase fw-bold" href="{% url 'register' %}" rel="noopener noreferrer">Cadastre-se</a></li>
<li><a class="text-white text-uppercase fw-bold" href="{% url 'dashboard' %}" rel="noopener noreferrer">Login</a></li>
<li><a class="text-white text-uppercase fw-bold" href="/contato" rel="noopener noreferrer">Contato</a></li>
<li><a class="text-white text-uppercase fw-bold" href="https://docs.google.com/forms/d/e/1FAIpQLScNjIpS-4FBFKbsJNECFC8aupOc01TkiZ7AQWd6fQ8Q8uze5A/viewform" target="_blank" rel="noopener noreferrer">Seja Nosso Parceiro</a></li>
</ul>
<p>Se você deseja excluir suas informações, entre em contato com <a class="text-bold text-white" href="mailto:votepeloclima@nossas.org">votepeloclima@nossas.org</a></p>
</div>
<div class="g-col-12 g-col-md-4">
<h5 class="fw-bold text-uppercase text-white">Realização</h5>
Expand Down