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.

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

Add name management functionality for Characters and Pets #5

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 28 additions & 0 deletions app.py
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,34 @@ def dashboard():

return render_template('private/dashboard.html', current_user=current_user, resources=resources)

# Name approval dashboard
@app.route('/approve_names', methods=['GET', 'POST'])
@login_required
def approve_names():
message = ''
connection = db.engine
if current_user.gm_level != 9:
abort(403)
return

if request.method == 'POST':

char_id = request.form['char_id']
pending_name = request.form['pending_name']
approved = int(request.form['approved'])

if approved > 0:
query = "UPDATE charinfo SET name = %s, pending_name = '' WHERE id = %s"
connection.execute(query, (pending_name, char_id))
message = 'Name approved'
else:
query = "UPDATE charinfo SET needs_rename = true WHERE id = %s"
connection.execute(query, (char_id))
message = 'Name marked for rename'

query = "SELECT id, account_id, name, pending_name FROM charinfo WHERE pending_name <> '' AND needs_rename = false"
result = connection.execute(query).all()
return render_template('private/approve_names.html', message=message, names=result, current_user=current_user, resources=resources)

"""
App configuration
Expand Down
121 changes: 121 additions & 0 deletions templates/private/approve_names.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
{% extends "bootstrap/base.html" %}
{% block title %}Name Approval{% endblock %}

{% block navbar %}
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href="{{ url_for('dashboard') }}">Dashboard</a>
</div>
<ul class="nav navbar-nav">
</ul>
<ul class="nav navbar-nav" style="float: right">
<li class="active"><a href="#">Welcome {{ current_user.username }}!</a></li>
<li><a href="{{ url_for('logout') }}">Logout</a></li>
</ul>
</div>
</nav>
{% endblock navbar %}}

{% block content %}
{# LOGO #}
<div class="container" style="margin-top: 50px">

{# Display logo #}
<div style="margin-bottom: 50px">
<img
src="{{ url_for('static', filename=resources.LOGO) }}"
class="center-block img-responsive mx-auto d-block"
alt="Logo"
width="100"
height="100"
>
</div>

</div>

{# Key creation #}
<div class="container">
<div class="text-center">
<h3>Name Approval</h3>
</div>

<div class="col-lg-3">
</div>
<div class="col-lg-6">

{# If the error value is set, display the error in red text #}
{% if error %}
<div class="alert alert-danger">
{{ error }}
</div>
{% endif %}

{# If the message value is set, display the message in green text #}
{% if message %}
<div class="alert alert-success">
{{ message }}
</div>
{% endif %}

{# If the keys value is set, create a list for each key in keys #}
{% if names %}
<table class="table table-striped">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about including some default text like "No pending approvals" when there are neither pending character name nor pet name approvals?
This would make it a little bit more obvious why the page is empty.

Though I am not a member of this project, so feel free to just ignore that suggestion.

<tr>
<th>Character ID</th>
<th>Account ID</th>
<th>Current Name</th>
<th>Custom Name</th>
<th>Approve?</th>
<th>Reject?</th>
</tr>
{% for name in names %}
<tr>
<td>{{ name.id }}</td>
<td>{{ name.account_id }}</td>
<td>{{ name.name }}</td>
<td>{{ name.pending_name }}</td>
<td><button class="btn btn-primary approvalButton" data-id="{{ name.id }}" data-pending_name="{{ name.pending_name }}">Approve</button></td>
<td><button class="btn btn-warning rejectButton" data-id="{{ name.id }}" data-pending_name="{{ name.pending_name }}">Reject</button></td>
</tr>
{% endfor %}
</table>
{% endif %}
</div>
<div class="col-lg-3">
</div>
</div>
</div>
{% endblock %}

{% block scripts %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script>

const approvalButtons = document.querySelectorAll('.approvalButton');

for (const button of approvalButtons) {
button.addEventListener('click', (event) => {
$("body").load("{{ url_for('approve_names') }}", {
char_id: parseInt(event.target.dataset.id),
pending_name: event.target.dataset.pending_name,
approved: 1,
});
});
}

const rejectButtons = document.querySelectorAll('.rejectButton');

for (const button of rejectButtons) {
button.addEventListener('click', (event) => {
$("body").load("{{ url_for('approve_names') }}", {
char_id: parseInt(event.target.dataset.id),
pending_name: event.target.dataset.pending_name,
approved: 0,
});
});
}

</script>

{% endblock %}