This commit is contained in:
Patrick Jentsch
2023-03-23 17:42:51 +01:00
parent 57813b4bc2
commit 5b6eae7645
7 changed files with 177 additions and 158 deletions

View File

@ -18,6 +18,13 @@
<script>
let corpusListElement = document.querySelector('#corpus-list');
let corpusList = new CorpusList(corpusListElement);
corpusList.add({{ corpora|tojson }});
corpusList.add(
[
{% for corpus in corpora %}
{{ corpus.to_json_serializeable(backrefs=True)|tojson }}
{% if not loop.last %},{% endif %}
{% endfor %}
]
);
</script>
{% endblock scripts %}

View File

@ -9,12 +9,18 @@
</div>
<div class="col s12 l10">
<h1 id="title">{{ title }}</h1>
<span class="chip hoverable tooltipped no-autoinit" id="user-role-chip">{{ user.role.name }}</span>
<span class="chip white-text" id="user-confirmed-chip" style="background-color: {{ '#4caf50' if user.confirmed else '#f44336' }};">{{ 'confirmed' if user.confirmed else 'unconfirmed' }}</span>
<p id="description">{{ user.about_me }}</p>
<p>
<span class="chip hoverable tooltipped no-autoinit" id="user-role-chip">{{ user.role.name }}</span>
{% if user.confirmed %}
<span class="chip white-text" id="user-confirmed-chip" style="background-color: #4caf50;">confirmed</span>
{% else %}
<span class="chip white-text" id="user-confirmed-chip" style="background-color: #f44336;">unconfirmed</span>
{% endif %}
</p>
<p>{{ user.about_me }}</p>
</div>
<div class="col s12">&nbsp;</div>
<div class="col s12 hide-on-med-and-down">&nbsp;</div>
<div class="col s12">
<ul class="tabs tabs-fixed-width z-depth-1">
@ -34,8 +40,8 @@
<li>Email: {{ user.email }}</li>
<li>Id: {{ user.id }}</li>
<li>Hashid: {{ user.hashid }}</li>
<li>Member since: {{ user.member_since }}</li>
<li>Last seen: {{ user.last_seen }}</li>
<li>Member since: {{ user.member_since.strftime('%Y-%m-%d') }}</li>
<li>Last seen: {{ user.last_seen.strftime('%Y-%m-%d') }}</li>
</ul>
</div>
<div class="card-action right-align">
@ -89,7 +95,7 @@
<p>Do you really want to delete the user {{ user.username }}? All associated data will be permanently deleted!</p>
</div>
<div class="modal-footer">
<a href="#!" class="btn modal-close waves-effect waves-light">Cancel</a>
<a class="btn modal-close waves-effect waves-light">Cancel</a>
<a href="{{ url_for('.delete_user', user_id=user.id) }}" class="btn red modal-close waves-effect waves-light"><i class="material-icons left">delete</i>Delete</a>
</div>
</div>

View File

@ -23,6 +23,13 @@
<script>
let adminUserListElement = document.querySelector('#admin-user-list');
let adminUserList = new AdminUserList(adminUserListElement);
adminUserList.add({{ users|tojson }});
adminUserList.add(
[
{% for user in users %}
{{ user.to_json_serializeable(backrefs=True)|tojson }}
{% if not loop.last %},{% endif %}
{% endfor %}
]
);
</script>
{% endblock scripts %}

View File

@ -18,7 +18,7 @@
</div>
<div class="col s8">
<br>
<ul class="collapsible">
<ul class="collapsible no-autoinit settings-collapsible">
<li>
<div class="collapsible-header" style="justify-content: space-between;">
<span>User Settings</span>
@ -28,48 +28,26 @@
<form method="POST" enctype="multipart/form-data">
<div class="row">
<div class="col s6">
{{ edit_profile_settings_form.hidden_tag() }}
{{ wtf.render_field(edit_profile_settings_form.username, material_icon='person') }}
{{ wtf.render_field(edit_profile_settings_form.email, material_icon='email') }}
{{ edit_account_form.hidden_tag() }}
{{ wtf.render_field(edit_account_form.username, material_icon='person') }}
{{ wtf.render_field(edit_account_form.email, material_icon='email') }}
</div>
</div>
<div class="right-align">
{{ wtf.render_field(edit_profile_settings_form.submit, material_icon='send') }}
{{ wtf.render_field(edit_account_form.submit, material_icon='send') }}
</div>
</form>
</div>
</li>
{# <li>
<div class="collapsible-header" style="justify-content: space-between;"><span>Privacy Settings</span><i class="material-icons caret right">keyboard_arrow_right</i></div>
<div class="collapsible-body">
<form method="POST">
{{ edit_privacy_settings_form.hidden_tag() }}
<br>
{{ wtf.render_field(edit_privacy_settings_form.is_public, id='public-profile') }}
<br>
<hr>
<br>
{{ wtf.render_field(edit_privacy_settings_form.show_email, data_action='disable', disabled=true) }}
<br>
{{ wtf.render_field(edit_privacy_settings_form.show_last_seen, data_action='disable', disabled=true) }}
<br>
{{ wtf.render_field(edit_privacy_settings_form.show_member_since, data_action='disable', disabled=true) }}
<br>
<div class="right-align">
{{ wtf.render_field(edit_privacy_settings_form.submit, material_icon='send') }}
</div>
</form>
</div>
</li> #}
<li>
<div class="collapsible-header" style="justify-content: space-between;"><span>Public Profile</span><i class="material-icons caret right">keyboard_arrow_right</i></div>
<div class="collapsible-body">
<form method="POST" enctype="multipart/form-data">
{{ edit_public_profile_information_form.hidden_tag() }}
{{ edit_profile_form.hidden_tag() }}
<div class="switch">
<label>
private
<input {% if current_user.is_public %}checked{% endif %} id="profile-is-public-switch" type="checkbox">
<input {% if user.is_public %}checked{% endif %} id="profile-is-public-switch" type="checkbox">
<span class="lever"></span>
public
</label>
@ -82,42 +60,42 @@
<div class="col s3">
<p>
<label>
{{ edit_public_profile_information_form.show_email() }}
<span>{{ edit_public_profile_information_form.show_email.label.text }}</span>
{{ edit_profile_form.show_email() }}
<span>{{ edit_profile_form.show_email.label.text }}</span>
</label>
</p>
</div>
<div class="col s3">
<p>
<label>
{{ edit_public_profile_information_form.show_last_seen() }}
<span>{{ edit_public_profile_information_form.show_last_seen.label.text }}</span>
{{ edit_profile_form.show_last_seen() }}
<span>{{ edit_profile_form.show_last_seen.label.text }}</span>
</label>
</p>
</div>
<div class="col s4">
<p>
<label>
{{ edit_public_profile_information_form.show_member_since() }}
<span>{{ edit_public_profile_information_form.show_member_since.label.text }}</span>
{{ edit_profile_form.show_member_since() }}
<span>{{ edit_profile_form.show_member_since.label.text }}</span>
</label>
</p>
</div>
</div>
<p></p>
<br>
{{ wtf.render_field(edit_public_profile_information_form.full_name, material_icon='badge') }}
{{ wtf.render_field(edit_public_profile_information_form.about_me, material_icon='description', id='about-me-textfield') }}
{{ wtf.render_field(edit_public_profile_information_form.website, material_icon='laptop') }}
{{ wtf.render_field(edit_public_profile_information_form.organization, material_icon='business') }}
{{ wtf.render_field(edit_public_profile_information_form.location, material_icon='location_on') }}
{{ wtf.render_field(edit_profile_form.full_name, material_icon='badge') }}
{{ wtf.render_field(edit_profile_form.about_me, material_icon='description', id='about-me-textfield') }}
{{ wtf.render_field(edit_profile_form.website, material_icon='laptop') }}
{{ wtf.render_field(edit_profile_form.organization, material_icon='business') }}
{{ wtf.render_field(edit_profile_form.location, material_icon='location_on') }}
<p></p>
<div class="row">
<div class="col s12 m2">
<img src="{{ url_for('users.user_avatar', user_id=current_user.id) }}" alt="user-image" class="circle responsive-img" id="avatar">
<img src="{{ url_for('users.user_avatar', user_id=user.id) }}" alt="user-image" class="circle responsive-img" id="avatar">
</div>
<div class="col s12 m6">
{{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }}
{{ wtf.render_field(edit_profile_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }}
</div>
<div class="col s12 m1">
<a class="btn-floating red waves-effect waves-light modal-trigger" style="margin-top:15px;" href="#delete-avatar-modal"><i class="material-icons">delete</i></a>
@ -126,7 +104,7 @@
<br>
<p></p>
<div class="right-align">
{{ wtf.render_field(edit_public_profile_information_form.submit, material_icon='send') }}
{{ wtf.render_field(edit_profile_form.submit, material_icon='send') }}
</div>
</form>
</div>
@ -144,7 +122,7 @@
</div>
<div class="col s8">
<br>
<ul class="collapsible">
<ul class="collapsible no-autoinit settings-collapsible">
<li>
<div class="collapsible-header" style="justify-content: space-between;">
<span>Notification Settings</span>
@ -152,10 +130,10 @@
</div>
<div class="collapsible-body">
<form method="POST">
{{ edit_notification_settings_form.hidden_tag() }}
{{ wtf.render_field(edit_notification_settings_form.job_status_mail_notification_level, material_icon='notifications') }}
{{ edit_notifications_form.hidden_tag() }}
{{ wtf.render_field(edit_notifications_form.job_status_mail_notification_level, material_icon='notifications') }}
<div class="right-align">
{{ wtf.render_field(edit_notification_settings_form.submit, material_icon='send') }}
{{ wtf.render_field(edit_notifications_form.submit, material_icon='send') }}
</div>
</form>
</div>
@ -204,7 +182,7 @@
<div class="modal" id="delete-avatar-modal">
<div class="modal-content">
<h4>Confirm Avatar deletion</h4>
<p>Do you really want to delete your Avatar?</p>
<p>Do you really want to delete <b>{{ user.username }}</b>s avatar?</p>
</div>
<div class="modal-footer">
<a class="btn modal-close waves-effect waves-light">Cancel</a>
@ -214,7 +192,7 @@
<div class="modal" id="delete-user">
<div class="modal-content">
<h4>Confirm User deletion</h4>
<p>Do you really want to delete the User <b>{{ current_user.username }}</b>? All files will be permanently deleted!</p>
<p>Do you really want to delete the User <b>{{ user.username }}</b>? All files will be permanently deleted!</p>
</div>
<div class="modal-footer">
<a class="btn modal-close waves-effect waves-light">Cancel</a>
@ -226,20 +204,20 @@
{% block scripts %}
{{ super() }}
<script>
let deleteButton = document.querySelector('#delete-avatar');
let avatar = document.querySelector('#avatar');
let avatarUpload = document.querySelector('#avatar-upload');
let deleteButtonElement = document.querySelector('#delete-avatar');
let avatarElement = document.querySelector('#avatar');
let avatarUploadElement = document.querySelector('#avatar-upload');
avatarUpload.addEventListener('change', function() {
let file = this.files[0];
avatar.src = URL.createObjectURL(file);
avatarUploadElement.addEventListener('change', () => {
let file = avatarUploadElement.files[0];
avatarElement.src = URL.createObjectURL(file);
});
deleteButton.addEventListener('click', () => {
deleteButtonElement.addEventListener('click', () => {
Requests.settings.entity.deleteAvatar(currentUserId)
.then(
(response) => {
avatar.src = "{{ url_for('static', filename='images/user_avatar.png') }}";
avatarElement.src = {{ url_for('static', filename='images/user_avatar.png')|tojson }};
}
);
});
@ -249,20 +227,21 @@ document.querySelector('#delete-user-button').addEventListener('click', (event)
.then((response) => {window.location.href = '/';});
});
document.querySelectorAll('.collapsible').forEach((collapsible) => {
for (let collapsibleElement of document.querySelectorAll('.collapsible.no-autoinit.settings-collapsible')) {
M.Collapsible.init(
collapsible,
collapsibleElement,
{
onOpenStart: (event) => {
let caret = event.querySelector('.caret');
onOpenStart: (collapsibleItemElement) => {
let caret = collapsibleItemElement.querySelector('.caret');
caret.innerHTML = 'keyboard_arrow_down';
},
onCloseStart: (event) => {
let caret = event.querySelector('.caret');
onCloseStart: (collapsibleItemElement) => {
let caret = collapsibleItemElement.querySelector('.caret');
caret.innerHTML = 'keyboard_arrow_right';
}
});
});
}
);
}
// #region Public Switch
let profileIsPublicSwitchElement = document.querySelector('#profile-is-public-switch');
@ -274,6 +253,5 @@ profileIsPublicSwitchElement.addEventListener('change', (event) => {
});
});
// #endregion Public Switch
</script>
{% endblock scripts %}