rebase usando pagamentos

This commit is contained in:
LS
2025-04-22 18:14:32 -03:00
parent 4742a888b7
commit 91d9bef6c6
4 changed files with 113 additions and 136 deletions

View File

@@ -2,6 +2,7 @@
{% block title %}Dashboard Administrativo{% endblock %}
<<<<<<< HEAD
{% block extra_css %}
<style>
.card {
@@ -126,10 +127,21 @@
<h2 class="display-4 mb-0">{{ total_users }}</h2>
<i class="fas fa-users fa-3x opacity-50"></i>
</div>
=======
{% block content %}
<div class="row mb-4">
<div class="col-md-4">
<div class="card">
<div class="card-body">
<h5 class="card-title">Total de Usuários</h5>
<p class="card-text display-4">{{ total_users }}</p>
<i class="fas fa-users fa-2x text-primary"></i>
>>>>>>> a22b0e4 (refactor(#11): Integra listagem de usuários no dashboard)
</div>
</div>
</div>
<div class="col-md-4">
<<<<<<< HEAD
<div class="card bg-success text-white">
<div class="card-body">
<h5 class="card-title text-uppercase">Usuários Ativos</h5>
@@ -137,10 +149,18 @@
<h2 class="display-4 mb-0">{{ active_users }}</h2>
<i class="fas fa-user-check fa-3x opacity-50"></i>
</div>
=======
<div class="card">
<div class="card-body">
<h5 class="card-title">Usuários Ativos</h5>
<p class="card-text display-4">{{ active_users }}</p>
<i class="fas fa-user-check fa-2x text-success"></i>
>>>>>>> a22b0e4 (refactor(#11): Integra listagem de usuários no dashboard)
</div>
</div>
</div>
<div class="col-md-4">
<<<<<<< HEAD
<div class="card bg-danger text-white">
<div class="card-body">
<h5 class="card-title text-uppercase">Usuários Inativos</h5>
@@ -148,11 +168,19 @@
<h2 class="display-4 mb-0">{{ inactive_users }}</h2>
<i class="fas fa-user-times fa-3x opacity-50"></i>
</div>
=======
<div class="card">
<div class="card-body">
<h5 class="card-title">Usuários Inativos</h5>
<p class="card-text display-4">{{ inactive_users }}</p>
<i class="fas fa-user-times fa-2x text-danger"></i>
>>>>>>> a22b0e4 (refactor(#11): Integra listagem de usuários no dashboard)
</div>
</div>
</div>
</div>
<<<<<<< HEAD
<div class="card lista-usuarios">
<div class="card-header d-flex justify-content-between align-items-center">
<h5 class="mb-0">
@@ -188,10 +216,45 @@
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
<button type="submit" class="btn btn-warning btn-sm" title="Reset OTP" onclick="return confirm('Confirma o reset do OTP deste usuário?')">
<i class="fas fa-key"></i>
=======
<div class="card">
<div class="card-header">
<h5 class="mb-0">Gerenciamento de Usuários</h5>
</div>
<div class="card-body">
<div class="table-responsive">
<table id="users-table" class="table table-striped">
<thead>
<tr>
<th>Email</th>
<th>Nome</th>
<th>Status</th>
<th>Último Login</th>
<th>Ações</th>
</tr>
</thead>
<tbody>
{% for user in users %}
<tr>
<td>{{ user.email }}</td>
<td>{{ user.name }}</td>
<td>
<span class="badge {% if user.is_active %}bg-success{% else %}bg-danger{% endif %}">
{{ "Ativo" if user.is_active else "Inativo" }}
</span>
</td>
<td>{{ user.last_login.strftime('%d/%m/%Y %H:%M') if user.last_login else 'Nunca' }}</td>
<td>
<form action="{{ url_for('admin.reset_user_otp', user_id=user.id) }}" method="post" class="d-inline">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
<button type="submit" class="btn btn-warning btn-sm" onclick="return confirm('Confirma o reset do OTP deste usuário?')">
<i class="fas fa-key"></i> Reset OTP
>>>>>>> a22b0e4 (refactor(#11): Integra listagem de usuários no dashboard)
</button>
</form>
<form action="{{ url_for('admin.reset_user_password', user_id=user.id) }}" method="post" class="d-inline">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
<<<<<<< HEAD
<button type="submit" class="btn btn-info btn-sm" title="Reset Senha" onclick="return confirm('Confirma o reset da senha deste usuário?')">
<i class="fas fa-lock"></i>
</button>
@@ -208,19 +271,58 @@
{% endfor %}
</tbody>
</table>
=======
<button type="submit" class="btn btn-info btn-sm" onclick="return confirm('Confirma o reset da senha deste usuário?')">
<i class="fas fa-lock"></i> Reset Senha
</button>
</form>
<button onclick="toggleUserStatus({{ user.id }})" class="btn btn-{% if user.is_active %}danger{% else %}success{% endif %} btn-sm">
<i class="fas fa-{% if user.is_active %}user-times{% else %}user-check{% endif %}"></i>
{{ "Desativar" if user.is_active else "Ativar" }}
</button>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
>>>>>>> a22b0e4 (refactor(#11): Integra listagem de usuários no dashboard)
</div>
</div>
{% endblock %}
{% block extra_js %}
<script>
<<<<<<< HEAD
=======
function toggleUserStatus(userId) {
if (confirm('Deseja alterar o status deste usuário?')) {
fetch(`/admin/users/${userId}/toggle-status`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': '{{ csrf_token() }}'
}
}).then(response => {
if (response.ok) {
window.location.reload();
}
});
}
}
>>>>>>> a22b0e4 (refactor(#11): Integra listagem de usuários no dashboard)
$(document).ready(function() {
$('#users-table').DataTable({
language: {
url: '//cdn.datatables.net/plug-ins/1.13.7/i18n/pt-BR.json'
},
<<<<<<< HEAD
order: [[0, 'asc']],
pageLength: 25
=======
order: [[1, 'asc']]
>>>>>>> a22b0e4 (refactor(#11): Integra listagem de usuários no dashboard)
});
});
</script>