sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-15 10:30:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'query-builder' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into query-builder

Browse Source
This commit is contained in:
Inga Kirschnick
2023-10-26 15:18:32 +02:00
parent 985e9b406f 0abfe65afa
commit fbb32ef580
11 changed files with 118 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/_scripts.html.j2
View File

@ -80,9 +80,9 @@
'js/resource-lists/job-list.js',
'js/resource-lists/job-result-list.js',
'js/resource-lists/public-corpus-list.js',
'js/resource-lists/public-user-list.js',
'js/resource-lists/spacy-nlp-pipeline-model-list.js',
'js/resource-lists/tesseract-ocr-pipeline-model-list.js',
'js/resource-lists/user-list.js'
'js/resource-lists/tesseract-ocr-pipeline-model-list.js'
%}
<script src="{{ ASSET_URL }}"></script>
{%- endassets %}

2
app/templates/admin/user_settings.html.j2
View File

@ -57,7 +57,7 @@
let userConfirmedSwitchElement = document.querySelector('#user-confirmed-switch');
userConfirmedSwitchElement.addEventListener('change', (event) => {
let newConfirmed = userConfirmedSwitchElement.checked;
requests.admin.users.entity.confirmed.update({{ user.hashid|tojson }}, newConfirmed)
Requests.admin.users.entity.confirmed.update({{ user.hashid|tojson }}, newConfirmed)
.catch((response) => {
userConfirmedSwitchElement.checked = !userConfirmedSwitchElement;
});

11
app/templates/corpora/corpus.html.j2
View File

@ -240,7 +240,7 @@
{% if current_user.is_following_corpus(corpus) %}
let unfollowRequestElement = document.querySelector('.action-button[data-action="unfollow-request"]');
unfollowRequestElement.addEventListener('click', () => {
requests.corpora.entity.followers.entity.delete({{ corpus.hashid|tojson }}, {{ current_user.hashid|tojson }})
Requests.corpora.entity.followers.entity.delete({{ corpus.hashid|tojson }}, {{ current_user.hashid|tojson }})
.then((response) => {
window.location.reload();
});
@ -252,7 +252,7 @@
let publishingModalIsPublicSwitchElement = document.querySelector('#publishing-modal-is-public-switch');
publishingModalIsPublicSwitchElement.addEventListener('change', (event) => {
let newIsPublic = publishingModalIsPublicSwitchElement.checked;
requests.corpora.entity.isPublic.update({{ corpus.hashid|tojson }}, newIsPublic)
Requests.corpora.entity.isPublic.update({{ corpus.hashid|tojson }}, newIsPublic)
.catch((response) => {
publishingModalIsPublicSwitchElement.checked = !newIsPublic;
});
@ -262,7 +262,7 @@ publishingModalIsPublicSwitchElement.addEventListener('change', (event) => {
// #region Delete
let deleteModalDeleteButtonElement = document.querySelector('#delete-modal-delete-button');
deleteModalDeleteButtonElement.addEventListener('click', (event) => {
requests.corpora.entity.delete({{ corpus.hashid|tojson }})
Requests.corpora.entity.delete({{ corpus.hashid|tojson }})
.then((response) => {
window.location.href = {{ url_for('main.dashboard')|tojson }};
});
@ -281,6 +281,7 @@ let users = {
{% if not loop.last %},{% endif %}
{% endfor %}
};
console.log(users);
let inviteUserModalSearch = M.Chips.init(
inviteUserModalSearchElement,
@ -312,7 +313,7 @@ M.Modal.init(
inviteUserModalInviteButtonElement.addEventListener('click', (event) => {
let usernames = inviteUserModalSearch.chipsData.map((chipData) => chipData.tag);
requests.corpora.entity.followers.add({{ corpus.hashid|tojson }}, usernames);
Requests.corpora.entity.followers.add({{ corpus.hashid|tojson }}, usernames);
});
// #endregion Invite user
@ -357,7 +358,7 @@ M.Modal.init(
shareLinkModalCreateButtonElement.addEventListener('click', (event) => {
let role = shareLinkModalCorpusFollowerRoleSelectElement.value;
let expiration = shareLinkModalExpirationDateDatepickerElement.value
requests.corpora.entity.generateShareLink({{ corpus.hashid|tojson }}, role, expiration)
Requests.corpora.entity.generateShareLink({{ corpus.hashid|tojson }}, role, expiration)
.then((response) => {
response.json()
.then((json) => {

13
app/templates/main/social_area.html.j2
View File

@ -40,7 +40,7 @@
<p>Find other users and see what corpora they have made public.</p>
<div class="card">
<div class="card-content">
<div class="user-list no-autoinit"></div>
<div id="public-user-list"></div>
</div>
</div>
</div>
@ -51,7 +51,7 @@
<div class="card">
<div class="card-content">
<span class="card-title">Public Corpora</span>
<div class="public-corpus-list no-autoinit"></div>
<div id="public-corpus-list"></div>
</div>
</div>
</div>
@ -62,15 +62,18 @@
{% block scripts %}
{{ super() }}
<script>
let userList = new ResourceLists.UserList(document.querySelector('.user-list'));
userList.add(
let publicUserListElement = document.querySelector('#public-user-list');
let publicUserList = new ResourceLists.PublicUserList(publicUserListElement);
publicUserList.add(
[
{% for user in users %}
{{ user.to_json_serializeable(relationships=True, filter_by_privacy_settings=True)|tojson }},
{% endfor %}
]
);
let publicCorpusList = new ResourceLists.PublicCorpusList(document.querySelector('.public-corpus-list'));
let publicCorpusListElement = document.querySelector('#public-corpus-list');
let publicCorpusList = new ResourceLists.PublicCorpusList(publicCorpusListElement);
publicCorpusList.add(
[
{% for corpus in corpora %}