Skip to content

Commit

Permalink
Merge pull request #898 from scidsg/minor-refactors
Browse files Browse the repository at this point in the history 
Minor refactors
  • Loading branch information
@brassy-endomorph
brassy-endomorph authored Feb 3, 2025
2 parents fe56e78 + c705a26 commit 64c34dc
Show file tree
Hide file tree
Showing 15 changed files with 541 additions and 845 deletions.
5 changes: 1 addition & 4 deletions hushline/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
{% endif %}

<header>
<!-- Navigation bar, logo, etc. -->
<div class="brand-wrapper">
{% if brand_logo_url %}
<img class="brand-logo" src="{{ brand_logo_url }}" alt="Logo"/>
Expand Down Expand Up @@ -166,9 +165,7 @@ <h1>{{ brand_name }}</h1>

<main class="{% block main_class %}{% endblock %}">
<div class="container">
{% block content %}
<!-- This block will be filled with page-specific content -->
{% endblock %}
{% block content %}{% endblock %}
</div>
</main>

Expand Down
2 changes: 0 additions & 2 deletions hushline/templates/premium.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,13 @@ <h2 class="centered-heading">Choose a Hush&nbsp;Line&nbsp;Plan</h2>
⚠️ Your subscription will expire on {{
user.stripe_subscription_current_period_end.strftime('%B %d, %Y') }}.
</p>
<!-- Corrected action URL -->
<form
id="enable-autorenew-form"
action="{{ url_for('premium.enable_autorenew') }}"
method="post"
>
<button id="enable-autorenew">Automatically Renew</button>
</form>
<!-- Corrected action URL -->
<form
id="cancel-form"
action="{{ url_for('premium.cancel') }}"
Expand Down
3 changes: 0 additions & 3 deletions hushline/templates/profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,7 @@ <h2 class="submit">
{% endif %}
{% endfor %}

<!-- Hidden field for public PGP key -->
<input type="hidden" id="publicKey" value="{{ user.pgp_key }}" />
<!-- Hidden field to indicate if the message was encrypted client-side -->
<input
type="hidden"
name="client_side_encrypted"
Expand All @@ -136,7 +134,6 @@ <h2 class="submit">
/>

{% if user.pgp_key %}
<!-- Math CAPTCHA -->
<div class="captcha">
<p>🤖 Solve the math problem to submit your message.</p>
<div class="captcha_container">
Expand Down
111 changes: 52 additions & 59 deletions hushline/templates/settings/admin.html
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,59 @@
{% extends "base.html" %}
{% extends "settings/base.html" %}

{% block title %}Settings{% endblock %}
{% block settings_content %}
<h3>Admin</h3>
<div class="admin-highlights">
<div class="metric">
<p>Users</p>
<p>{{ user_count }}</p>
</div>
<div class="metric">
<p>2FA Enabled</p>
<p>{{ two_fa_count }}</p>
<p>{{ two_fa_percentage | round(2) }}%</p>
</div>
<div class="metric">
<p>PGP Enabled</p>
<p>{{ pgp_key_count }}</p>
<p>{{ pgp_key_percentage | round(2) }}%</p>
</div>
</div>

{% block content %}
<h2>Settings</h2>
<div class="settings-content">
{% include "settings/nav.html" %}
<div class="tab-content">
<h3>Admin</h3>
<div class="admin-highlights">
<div class="metric">
<p>Users</p>
<p>{{ user_count }}</p>
</div>
<div class="metric">
<p>2FA Enabled</p>
<p>{{ two_fa_count }}</p>
<p>{{ two_fa_percentage | round(2) }}%</p>
</div>
<div class="metric">
<p>PGP Enabled</p>
<p>{{ pgp_key_count }}</p>
<p>{{ pgp_key_percentage | round(2) }}%</p>
<h4>All Users</h4>
{% if all_users %}
{% for user in all_users %}
<div class="user">
<h5>{{ user.primary_username.username }}</h5>
<p class="meta">
Display Name: {{ user.primary_username.display_name or 'No display name' }}
</p>
<p class="meta">
Verified: {{ "✅ Yes" if user.primary_username.is_verified else "👎 No" }}
</p>
<p class="meta">
Admin: {{ "✅ Yes" if user.is_admin else "👎 No" }}
</p>
<div class="tableActions">
<form
action="{{ url_for('admin.toggle_verified', user_id=user.id) }}"
method="POST"
class="formBody"
>
<button type="submit">Toggle Verified</button>
</form>
<form
action="{{ url_for('admin.toggle_admin', user_id=user.id) }}"
method="POST"
class="formBody"
>
<button type="submit">Toggle Admin</button>
</form>
</div>
</div>

<h4>All Users</h4>
{% if all_users %}
{% for user in all_users %}
<div class="user">
<h5>{{ user.primary_username.username }}</h5>
<p class="meta">
Display Name: {{ user.primary_username.display_name or 'No display name' }}
</p>
<p class="meta">
Verified: {{ "✅ Yes" if user.primary_username.is_verified else "👎 No" }}
</p>
<p class="meta">
Admin: {{ "✅ Yes" if user.is_admin else "👎 No" }}
</p>
<div class="tableActions">
<form
action="{{ url_for('admin.toggle_verified', user_id=user.id) }}"
method="POST"
class="formBody"
>
<button type="submit">Toggle Verified</button>
</form>
<form
action="{{ url_for('admin.toggle_admin', user_id=user.id) }}"
method="POST"
class="formBody"
>
<button type="submit">Toggle Admin</button>
</form>
</div>
</div>
{% endfor %}
{% else %}
<p>No users found.</p>
{% endif %}
</div>
{% endfor %}
{% else %}
<p>No users found.</p>
{% endif %}
{% endblock %}

{% block scripts %}
Expand Down
52 changes: 23 additions & 29 deletions hushline/templates/settings/advanced.html
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,30 @@
{% extends "base.html" %}
{% extends "settings/base.html" %}

{% block title %}Settings{% endblock %}
{% block settings_content %}
<h3>Advanced</h3>

{% block content %}
<h2>Settings</h2>
<div class="settings-content">
{% include "settings/nav.html" %}
<div class="tab-content">
<h3>Advanced</h3>
{% if is_premium_enabled %}
<div class="adv-form">
<h4>Paid Features</h4>
<div>
<a href="{{ url_for('premium.index') }}">Manage my plan</a>
</div>
{% if is_premium_enabled %}
<div class="adv-form">
<h4>Paid Features</h4>
<div>
<a href="{{ url_for('premium.index') }}">Manage my plan</a>
</div>
{% endif %}

<h4>Delete Account</h4>
<p class="meta">
⚠️ Deleting your account is a permanent action that cannot be undone!
</p>
<form
method="POST"
action="{{ url_for('settings.delete_account') }}"
class="formBody"
>
<button type="submit" class="btn-danger" id="deleteAccountButton">
Delete Account
</button>
</form>
</div>
{% endif %}

<h4>Delete Account</h4>
<p class="meta">
⚠️ Deleting your account is a permanent action that cannot be undone!
</p>
<form
method="POST"
action="{{ url_for('settings.delete_account') }}"
class="formBody"
>
<button type="submit" class="btn-danger" id="deleteAccountButton">
Delete Account
</button>
</form>
{% endblock %}

{% block scripts %}
Expand Down
74 changes: 33 additions & 41 deletions hushline/templates/settings/aliases.html
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,40 @@
{% extends "base.html" %}
{% extends "settings/base.html" %}

{% block title %}Settings{% endblock %}
{% block settings_content %}
<h3>Aliases</h3>
<h4>Add an Alias</h4>
{% set alias_count = aliases.__len__() %}
{% if alias_count < user.max_aliases %}
<form
method="POST"
class="formBody"
>
{{ new_alias_form.hidden_tag() }}
{{ new_alias_form.username.label }}
{{ new_alias_form.username }}
{{ new_alias_form.submit }}
</form>
{% else %}
<p>Alias limit reached.</p>
{% endif %}

{% block content %}
<h2>Settings</h2>
<div class="settings-content">
{% include "settings/nav.html" %}
<div class="tab-content">
<h3>Aliases</h3>
<h4>Add an Alias</h4>
{% set alias_count = aliases.__len__() %}
{% if alias_count < user.max_aliases %}
<form
method="POST"
class="formBody"
>
{{ new_alias_form.hidden_tag() }}
{{ new_alias_form.username.label }}
{{ new_alias_form.username }}
{{ new_alias_form.submit }}
</form>
{% else %}
<p>Alias limit reached.</p>
{% endif %}

<h4>Current Aliases</h4>
{% if aliases %}
<div class="alias-list">
{% for username in aliases %}
<div class="alias-entry">
<div>
<a href="{{ url_for('.alias', username_id=username.id) }}" class="stretched-link">
{{ username.display_name or username.username }}
</a>
</div>
<div class="icon chevron"></div>
</div>
{% endfor %}
<h4>Current Aliases</h4>
{% if aliases %}
<div class="alias-list">
{% for username in aliases %}
<div class="alias-entry">
<div>
<a href="{{ url_for('.alias', username_id=username.id) }}" class="stretched-link">
{{ username.display_name or username.username }}
</a>
</div>
<div class="icon chevron"></div>
</div>
{% else %}
<p>🙊 No aliases configured.</p>
{% endif %}
{% endfor %}
</div>
</div>
{% else %}
<p>🙊 No aliases configured.</p>
{% endif %}
{% endblock %}

{% block scripts %}
Expand Down
Loading

0 comments on commit 64c34dc

Please sign in to comment.