yagich/pyrom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use template element for badge template

Browse Source
This commit is contained in:
Lera Elvoé
2025-12-15 19:34:16 +03:00
parent b2d16e305d
commit c655caab9e
7 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/routes/hyperapi.py
View File

@@ -60,11 +60,3 @@ def get_badges():
uploads = BadgeUploads.get_for_user(get_active_user().id) uploads = BadgeUploads.get_for_user(get_active_user().id)
badges = sorted(Badges.findall({'user_id': int(get_active_user().id)}), key=lambda x: x['sort_order']) badges = sorted(Badges.findall({'user_id': int(get_active_user().id)}), key=lambda x: x['sort_order'])
return render_template('components/badge_editor_badges.html', uploads=uploads, badges=badges) return render_template('components/badge_editor_badges.html', uploads=uploads, badges=badges)
@bp.get('/badge-editor/template')
@login_required
@account_required
def get_badge_template():
uploads = BadgeUploads.get_for_user(get_active_user().id)
return render_template('components/badge_editor_template.html', uploads=uploads)

3
app/routes/users.py
View File

@@ -394,7 +394,8 @@ def page(username):
@login_required @login_required
@redirect_to_own @redirect_to_own
def settings(username): def settings(username):
return render_template('users/settings.html') uploads = BadgeUploads.get_for_user(get_active_user().id)
return render_template('users/settings.html', uploads=uploads)
@bp.post('/<username>/settings') @bp.post('/<username>/settings')

4
app/templates/common/macros.html
View File

@@ -331,8 +331,8 @@
{% else %} {% else %}
{% set selected_href = defaults[0].file_path %} {% set selected_href = defaults[0].file_path %}
{% endif %} {% endif %}
<bitty-7-0 data-connect="{{ '/static/js/bitties/pyrom-bitty.js' | cachebust }} BadgeEditorBadge" data-listeners="click input submit change"> <bitty-7-0 data-connect="{{ '/static/js/bitties/pyrom-bitty.js' | cachebust }} BadgeEditorBadge" data-listeners="click input submit change" data-receive="deleteBadge">
<div class="settings-badge-container" data-receive="deleteBadge"> <div class="settings-badge-container">
<div class="settings-badge-select"> <div class="settings-badge-select">
<select data-send="badgeUpdatePreview badgeToggleFilePicker" name="badge_choice[]" required> <select data-send="badgeUpdatePreview badgeToggleFilePicker" name="badge_choice[]" required>
<optgroup label="Default"> <optgroup label="Default">

2
app/templates/components/badge_editor_badges.html
View File

@@ -1,4 +1,4 @@
{% from 'common/macros.html' import badge_editor_single with context %} {% from 'common/macros.html' import badge_editor_single %}
{% for badge in badges %} {% for badge in badges %}
{{ badge_editor_single(options=uploads, selected=badge.upload, badge=badge) }} {{ badge_editor_single(options=uploads, selected=badge.upload, badge=badge) }}
{% endfor %} {% endfor %}

2
app/templates/components/badge_editor_template.html
View File

@@ -1,2 +1,2 @@
{% from 'common/macros.html' import badge_editor_single with context %} {% from 'common/macros.html' import badge_editor_single %}
{{ badge_editor_single(options=uploads) }} {{ badge_editor_single(options=uploads) }}

6
app/templates/users/settings.html
View File

@@ -1,4 +1,4 @@
{% from 'common/macros.html' import babycode_editor_component %} {% from 'common/macros.html' import babycode_editor_component, badge_editor_single %}
{% extends 'base.html' %} {% extends 'base.html' %}
{% block title %}settings{% endblock %} {% block title %}settings{% endblock %}
{% block content %} {% block content %}
@@ -68,4 +68,8 @@
<a class="linkbutton critical" href="{{ url_for('users.delete_page', username=active_user.username) }}">Delete account</a> <a class="linkbutton critical" href="{{ url_for('users.delete_page', username=active_user.username) }}">Delete account</a>
</div> </div>
</div> </div>
<template id='badge-editor-template'>
{{ badge_editor_single(options=uploads) }}
</template>
{% endblock %} {% endblock %}

7
data/static/js/bitties/pyrom-bitty.js
View File

@@ -287,11 +287,8 @@ export class BadgeEditorForm {
return; return;
} }
if (this.#badgeTemplate === undefined){ if (this.#badgeTemplate === undefined){
const badge = await this.api.getHTML(`${badgeEditorEndpoint}/template`) this.#badgeTemplate = document.getElementById('badge-editor-template').content;
if (!badge.value){ console.log(this.#badgeTemplate);
return;
}
this.#badgeTemplate= badge.value;
} }
el.replaceChildren(); el.replaceChildren();
const addButton = `<button data-disable-if-max="1" data-receive="updateBadgeCount" DISABLE_IF_MAX type="button" data-send="addBadge">Add badge</button>`; const addButton = `<button data-disable-if-max="1" data-receive="updateBadgeCount" DISABLE_IF_MAX type="button" data-send="addBadge">Add badge</button>`;