mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-10 03:49:24 +00:00
Apply all biomejs fixes
This commit is contained in:
@ -10,8 +10,8 @@
|
||||
*/
|
||||
class PictureWithIdentifications {
|
||||
identifications = null;
|
||||
image_loading = false;
|
||||
identifications_loading = false;
|
||||
imageLoading = false;
|
||||
identificationsLoading = false;
|
||||
|
||||
/**
|
||||
* @param {Picture} picture
|
||||
@ -23,7 +23,7 @@ class PictureWithIdentifications {
|
||||
/**
|
||||
* @param {Picture} picture
|
||||
*/
|
||||
static from_picture(picture) {
|
||||
static fromPicture(picture) {
|
||||
return new PictureWithIdentifications(picture);
|
||||
}
|
||||
|
||||
@ -33,19 +33,19 @@ class PictureWithIdentifications {
|
||||
* @param {?Object=} options
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async load_identifications(options) {
|
||||
if (this.identifications_loading) {
|
||||
async loadIdentifications(options) {
|
||||
if (this.identificationsLoading) {
|
||||
return; // The users are already being fetched.
|
||||
}
|
||||
if (!!this.identifications && !options?.force_reload) {
|
||||
if (!!this.identifications && !options?.forceReload) {
|
||||
// The users are already fetched
|
||||
// and the user does not want to force the reload
|
||||
return;
|
||||
}
|
||||
this.identifications_loading = true;
|
||||
this.identificationsLoading = true;
|
||||
const url = `/api/sas/picture/${this.id}/identified`;
|
||||
this.identifications = await (await fetch(url)).json();
|
||||
this.identifications_loading = false;
|
||||
this.identificationsLoading = false;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -56,12 +56,12 @@ class PictureWithIdentifications {
|
||||
const img = new Image();
|
||||
img.src = this.compressed_url;
|
||||
if (!img.complete) {
|
||||
this.image_loading = true;
|
||||
this.imageLoading = true;
|
||||
img.addEventListener("load", () => {
|
||||
this.image_loading = false;
|
||||
this.imageLoading = false;
|
||||
});
|
||||
}
|
||||
await this.load_identifications();
|
||||
await this.loadIdentifications();
|
||||
}
|
||||
}
|
||||
|
||||
@ -78,13 +78,18 @@ document.addEventListener("alpine:init", () => {
|
||||
* when loading the page at the beginning
|
||||
* @type PictureWithIdentifications
|
||||
**/
|
||||
current_picture: {
|
||||
currentPicture: {
|
||||
// biome-ignore lint/style/useNamingConvention: json is snake_case
|
||||
is_moderated: true,
|
||||
id: null,
|
||||
name: "",
|
||||
// biome-ignore lint/style/useNamingConvention: json is snake_case
|
||||
display_name: "",
|
||||
// biome-ignore lint/style/useNamingConvention: json is snake_case
|
||||
compressed_url: "",
|
||||
// biome-ignore lint/style/useNamingConvention: json is snake_case
|
||||
profile_url: "",
|
||||
// biome-ignore lint/style/useNamingConvention: json is snake_case
|
||||
full_size_url: "",
|
||||
owner: "",
|
||||
date: new Date(),
|
||||
@ -94,12 +99,12 @@ document.addEventListener("alpine:init", () => {
|
||||
* The picture which will be displayed next if the user press the "next" button
|
||||
* @type ?PictureWithIdentifications
|
||||
**/
|
||||
next_picture: null,
|
||||
nextPicture: null,
|
||||
/**
|
||||
* The picture which will be displayed next if the user press the "previous" button
|
||||
* @type ?PictureWithIdentifications
|
||||
**/
|
||||
previous_picture: null,
|
||||
previousPicture: null,
|
||||
/**
|
||||
* The select2 component used to identify users
|
||||
**/
|
||||
@ -111,7 +116,7 @@ document.addEventListener("alpine:init", () => {
|
||||
* Error message when a moderation operation fails
|
||||
* @type string
|
||||
**/
|
||||
moderation_error: "",
|
||||
moderationError: "",
|
||||
/**
|
||||
* Method of pushing new url to the browser history
|
||||
* Used by popstate event and always reset to it's default value when used
|
||||
@ -120,114 +125,119 @@ document.addEventListener("alpine:init", () => {
|
||||
pushstate: History.PUSH,
|
||||
|
||||
async init() {
|
||||
this.pictures = (await fetch_paginated(picture_endpoint)).map(
|
||||
PictureWithIdentifications.from_picture,
|
||||
// biome-ignore lint/correctness/noUndeclaredVariables: Imported from script.js
|
||||
this.pictures = (await fetchPaginated(pictureEndpoint)).map(
|
||||
PictureWithIdentifications.fromPicture,
|
||||
);
|
||||
// biome-ignore lint/correctness/noUndeclaredVariables: Imported from script.js
|
||||
this.selector = sithSelect2({
|
||||
element: $(this.$refs.search),
|
||||
data_source: remote_data_source("/api/user/search", {
|
||||
// biome-ignore lint/correctness/noUndeclaredVariables: Imported from script.js
|
||||
dataSource: remoteDataSource("/api/user/search", {
|
||||
excluded: () => [
|
||||
...(this.current_picture.identifications || []).map((i) => i.user.id),
|
||||
...(this.currentPicture.identifications || []).map((i) => i.user.id),
|
||||
],
|
||||
result_converter: (obj) => Object({ ...obj, text: obj.display_name }),
|
||||
resultConverter: (obj) => new Object({ ...obj, text: obj.display_name }),
|
||||
}),
|
||||
picture_getter: (user) => user.profile_pict,
|
||||
pictureGetter: (user) => user.profile_pict,
|
||||
});
|
||||
this.current_picture = this.pictures.find((i) => i.id === first_picture_id);
|
||||
this.$watch("current_picture", (current, previous) => {
|
||||
// biome-ignore lint/correctness/noUndeclaredVariables: Imported from picture.jinja
|
||||
this.currentPicture = this.pictures.find((i) => i.id === firstPictureId);
|
||||
this.$watch("currentPicture", (current, previous) => {
|
||||
if (current === previous) {
|
||||
/* Avoid recursive updates */
|
||||
return;
|
||||
}
|
||||
this.update_picture();
|
||||
this.updatePicture();
|
||||
});
|
||||
window.addEventListener("popstate", async (event) => {
|
||||
if (!event.state || event.state.sas_picture_id === undefined) {
|
||||
if (!event.state || event.state.sasPictureId === undefined) {
|
||||
return;
|
||||
}
|
||||
this.pushstate = History.REPLACE;
|
||||
this.current_picture = this.pictures.find(
|
||||
(i) => i.id === Number.parseInt(event.state.sas_picture_id),
|
||||
this.currentPicture = this.pictures.find(
|
||||
(i) => i.id === Number.parseInt(event.state.sasPictureId),
|
||||
);
|
||||
});
|
||||
this.pushstate = History.REPLACE; /* Avoid first url push */
|
||||
await this.update_picture();
|
||||
await this.updatePicture();
|
||||
},
|
||||
|
||||
/**
|
||||
* Update the page.
|
||||
* Called when the `current_picture` property changes.
|
||||
* Called when the `currentPicture` property changes.
|
||||
*
|
||||
* The url is modified without reloading the page,
|
||||
* and the previous picture, the next picture and
|
||||
* the list of identified users are updated.
|
||||
*/
|
||||
async update_picture() {
|
||||
const update_args = [
|
||||
{ sas_picture_id: this.current_picture.id },
|
||||
async updatePicture() {
|
||||
const updateArgs = [
|
||||
{ sasPictureId: this.currentPicture.id },
|
||||
"",
|
||||
`/sas/picture/${this.current_picture.id}/`,
|
||||
`/sas/picture/${this.currentPicture.id}/`,
|
||||
];
|
||||
if (this.pushstate === History.REPLACE) {
|
||||
window.history.replaceState(...update_args);
|
||||
window.history.replaceState(...updateArgs);
|
||||
this.pushstate = History.PUSH;
|
||||
} else {
|
||||
window.history.pushState(...update_args);
|
||||
window.history.pushState(...updateArgs);
|
||||
}
|
||||
|
||||
this.moderation_error = "";
|
||||
const index = this.pictures.indexOf(this.current_picture);
|
||||
this.previous_picture = this.pictures[index - 1] || null;
|
||||
this.next_picture = this.pictures[index + 1] || null;
|
||||
await this.current_picture.load_identifications();
|
||||
this.$refs.main_picture?.addEventListener("load", () => {
|
||||
this.moderationError = "";
|
||||
const index = this.pictures.indexOf(this.currentPicture);
|
||||
this.previousPicture = this.pictures[index - 1] || null;
|
||||
this.nextPicture = this.pictures[index + 1] || null;
|
||||
await this.currentPicture.loadIdentifications();
|
||||
this.$refs.mainPicture?.addEventListener("load", () => {
|
||||
// once the current picture is loaded,
|
||||
// start preloading the next and previous pictures
|
||||
this.next_picture?.preload();
|
||||
this.previous_picture?.preload();
|
||||
this.nextPicture?.preload();
|
||||
this.previousPicture?.preload();
|
||||
});
|
||||
},
|
||||
|
||||
async moderate_picture() {
|
||||
const res = await fetch(`/api/sas/picture/${this.current_picture.id}/moderate`, {
|
||||
async moderatePicture() {
|
||||
const res = await fetch(`/api/sas/picture/${this.currentPicture.id}/moderate`, {
|
||||
method: "PATCH",
|
||||
});
|
||||
if (!res.ok) {
|
||||
this.moderation_error = `${gettext("Couldn't moderate picture")} : ${res.statusText}`;
|
||||
this.moderationError = `${gettext("Couldn't moderate picture")} : ${res.statusText}`;
|
||||
return;
|
||||
}
|
||||
this.current_picture.is_moderated = true;
|
||||
this.current_picture.asked_for_removal = false;
|
||||
this.currentPicture.is_moderated = true;
|
||||
this.currentPicture.askedForRemoval = false;
|
||||
},
|
||||
|
||||
async delete_picture() {
|
||||
const res = await fetch(`/api/sas/picture/${this.current_picture.id}`, {
|
||||
async deletePicture() {
|
||||
const res = await fetch(`/api/sas/picture/${this.currentPicture.id}`, {
|
||||
method: "DELETE",
|
||||
});
|
||||
if (!res.ok) {
|
||||
this.moderation_error = `${gettext("Couldn't delete picture")} : ${res.statusText}`;
|
||||
this.moderationError = `${gettext("Couldn't delete picture")} : ${res.statusText}`;
|
||||
return;
|
||||
}
|
||||
this.pictures.splice(this.pictures.indexOf(this.current_picture), 1);
|
||||
this.pictures.splice(this.pictures.indexOf(this.currentPicture), 1);
|
||||
if (this.pictures.length === 0) {
|
||||
// The deleted picture was the only one in the list.
|
||||
// As the album is now empty, go back to the parent page
|
||||
document.location.href = album_url;
|
||||
// biome-ignore lint/correctness/noUndeclaredVariables: imported from picture.jinja
|
||||
document.location.href = albumUrl;
|
||||
}
|
||||
this.current_picture = this.next_picture || this.previous_picture;
|
||||
this.currentPicture = this.nextPicture || this.previousPicture;
|
||||
},
|
||||
|
||||
/**
|
||||
* Send the identification request and update the list of identified users.
|
||||
*/
|
||||
async submit_identification() {
|
||||
const url = `/api/sas/picture/${this.current_picture.id}/identified`;
|
||||
async submitIdentification() {
|
||||
const url = `/api/sas/picture/${this.currentPicture.id}/identified`;
|
||||
await fetch(url, {
|
||||
method: "PUT",
|
||||
body: JSON.stringify(this.selector.val().map((i) => Number.parseInt(i))),
|
||||
});
|
||||
// refresh the identified users list
|
||||
await this.current_picture.load_identifications({ force_reload: true });
|
||||
await this.currentPicture.loadIdentifications({ forceReload: true });
|
||||
this.selector.empty().trigger("change");
|
||||
},
|
||||
|
||||
@ -236,23 +246,22 @@ document.addEventListener("alpine:init", () => {
|
||||
* @param {PictureIdentification} identification
|
||||
* @return {boolean}
|
||||
*/
|
||||
can_be_removed(identification) {
|
||||
return user_is_sas_admin || identification.user.id === user_id;
|
||||
canBeRemoved(identification) {
|
||||
// biome-ignore lint/correctness/noUndeclaredVariables: imported from picture.jinja
|
||||
return userIsSasAdmin || identification.user.id === userId;
|
||||
},
|
||||
|
||||
/**
|
||||
* Untag a user from the current picture
|
||||
* @param {PictureIdentification} identification
|
||||
*/
|
||||
async remove_identification(identification) {
|
||||
async removeIdentification(identification) {
|
||||
const res = await fetch(`/api/sas/relation/${identification.id}`, {
|
||||
method: "DELETE",
|
||||
});
|
||||
if (res.ok && Array.isArray(this.current_picture.identifications)) {
|
||||
this.current_picture.identifications =
|
||||
this.current_picture.identifications.filter(
|
||||
(i) => i.id !== identification.id,
|
||||
);
|
||||
if (res.ok && Array.isArray(this.currentPicture.identifications)) {
|
||||
this.currentPicture.identifications =
|
||||
this.currentPicture.identifications.filter((i) => i.id !== identification.id);
|
||||
}
|
||||
},
|
||||
}));
|
||||
|
||||
@ -83,7 +83,7 @@
|
||||
</a>
|
||||
</template>
|
||||
</div>
|
||||
{{ paginate_alpine("page", "nb_pages()") }}
|
||||
{{ paginate_alpine("page", "nbPages()") }}
|
||||
</div>
|
||||
|
||||
{% if is_sas_admin %}
|
||||
@ -116,14 +116,14 @@
|
||||
loading: false,
|
||||
|
||||
async init() {
|
||||
await this.fetch_pictures();
|
||||
await this.fetchPictures();
|
||||
this.$watch("page", () => {
|
||||
update_query_string("page",
|
||||
updateQueryString("page",
|
||||
this.page === 1 ? null : this.page,
|
||||
this.pushstate
|
||||
);
|
||||
this.pushstate = History.PUSH;
|
||||
this.fetch_pictures();
|
||||
this.fetchPictures();
|
||||
});
|
||||
|
||||
window.addEventListener("popstate", () => {
|
||||
@ -134,7 +134,7 @@
|
||||
});
|
||||
},
|
||||
|
||||
async fetch_pictures() {
|
||||
async fetchPictures() {
|
||||
this.loading=true;
|
||||
const url = "{{ url("api:pictures") }}"
|
||||
+"?album_id={{ album.id }}"
|
||||
@ -144,7 +144,7 @@
|
||||
this.loading = false;
|
||||
},
|
||||
|
||||
nb_pages() {
|
||||
nbPages() {
|
||||
return Math.ceil(this.pictures.count / {{ settings.SITH_SAS_IMAGES_PER_PAGE }});
|
||||
}
|
||||
}))
|
||||
|
||||
@ -17,21 +17,21 @@
|
||||
{% block content %}
|
||||
<main x-data="picture_viewer">
|
||||
<code>
|
||||
<a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album) }} <span x-text="current_picture.name"></span>
|
||||
<a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album) }} <span x-text="currentPicture.name"></span>
|
||||
</code>
|
||||
|
||||
<br>
|
||||
|
||||
<div class="title">
|
||||
<h3 x-text="current_picture.name"></h3>
|
||||
<h4 x-text="`${pictures.indexOf(current_picture) + 1 } / ${pictures.length}`"></h4>
|
||||
<h3 x-text="currentPicture.name"></h3>
|
||||
<h4 x-text="`${pictures.indexOf(currentPicture) + 1 } / ${pictures.length}`"></h4>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<template x-if="!current_picture.is_moderated">
|
||||
<template x-if="!currentPicture.is_moderated">
|
||||
<div class="alert alert-red">
|
||||
<div class="alert-main">
|
||||
<template x-if="current_picture.asked_for_removal">
|
||||
<template x-if="currentPicture.askedForRemoval">
|
||||
<span class="important">{% trans %}Asked for removal{% endtrans %}</span>
|
||||
</template>
|
||||
<p>
|
||||
@ -43,14 +43,14 @@
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
<button class="btn btn-blue" @click="moderate_picture()">
|
||||
<button class="btn btn-blue" @click="moderatePicture()">
|
||||
{% trans %}Moderate{% endtrans %}
|
||||
</button>
|
||||
<button class="btn btn-red" @click.prevent="delete_picture()">
|
||||
<button class="btn btn-red" @click.prevent="deletePicture()">
|
||||
{% trans %}Delete{% endtrans %}
|
||||
</button>
|
||||
</div>
|
||||
<p x-show="!!moderation_error" x-text="moderation_error"></p>
|
||||
<p x-show="!!moderationError" x-text="moderationError"></p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@ -58,12 +58,12 @@
|
||||
<div class="container" id="pict">
|
||||
<div class="main">
|
||||
|
||||
<div class="photo" :aria-busy="current_picture.image_loading">
|
||||
<div class="photo" :aria-busy="currentPicture.imageLoading">
|
||||
<img
|
||||
:src="current_picture.compressed_url"
|
||||
:alt="current_picture.name"
|
||||
:src="currentPicture.compressed_url"
|
||||
:alt="currentPicture.name"
|
||||
id="main-picture"
|
||||
x-ref="main_picture"
|
||||
x-ref="mainPicture"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@ -76,13 +76,13 @@
|
||||
<span
|
||||
x-text="Intl.DateTimeFormat(
|
||||
'{{ LANGUAGE_CODE }}', {dateStyle: 'long'}
|
||||
).format(new Date(current_picture.date))"
|
||||
).format(new Date(currentPicture.date))"
|
||||
>
|
||||
</span>
|
||||
</div>
|
||||
<div>
|
||||
<span>{% trans %}Owner: {% endtrans %}</span>
|
||||
<a :href="current_picture.owner.profile_url" x-text="current_picture.owner.display_name"></a>
|
||||
<a :href="currentPicture.owner.profile_url" x-text="currentPicture.owner.display_name"></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -91,14 +91,14 @@
|
||||
<h5>{% trans %}Tools{% endtrans %}</h5>
|
||||
<div>
|
||||
<div>
|
||||
<a class="text" :href="current_picture.full_size_url">
|
||||
<a class="text" :href="currentPicture.full_size_url">
|
||||
{% trans %}HD version{% endtrans %}
|
||||
</a>
|
||||
<br>
|
||||
<a class="text danger" href="?ask_removal">{% trans %}Ask for removal{% endtrans %}</a>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<a class="button" :href="`/sas/picture/${current_picture.id}/edit/`"><i class="fa-regular fa-pen-to-square edit-action"></i></a>
|
||||
<a class="button" :href="`/sas/picture/${currentPicture.id}/edit/`"><i class="fa-regular fa-pen-to-square edit-action"></i></a>
|
||||
<a class="button" href="?rotate_left"><i class="fa-solid fa-rotate-left"></i></a>
|
||||
<a class="button" href="?rotate_right"><i class="fa-solid fa-rotate-right"></i></a>
|
||||
</div>
|
||||
@ -110,23 +110,23 @@
|
||||
<div class="subsection">
|
||||
<div class="navigation">
|
||||
<div id="prev" class="clickable">
|
||||
<template x-if="previous_picture">
|
||||
<template x-if="previousPicture">
|
||||
<div
|
||||
@keyup.left.window="current_picture = previous_picture"
|
||||
@click="current_picture = previous_picture"
|
||||
@keyup.left.window="currentPicture = previousPicture"
|
||||
@click="currentPicture = previousPicture"
|
||||
>
|
||||
<img :src="previous_picture.thumb_url" alt="{% trans %}Previous picture{% endtrans %}"/>
|
||||
<img :src="previousPicture.thumb_url" alt="{% trans %}Previous picture{% endtrans %}"/>
|
||||
<div class="overlay">←</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div id="next" class="clickable">
|
||||
<template x-if="next_picture">
|
||||
<template x-if="nextPicture">
|
||||
<div
|
||||
@keyup.right.window="current_picture = next_picture"
|
||||
@click="current_picture = next_picture"
|
||||
@keyup.right.window="currentPicture = nextPicture"
|
||||
@click="currentPicture = nextPicture"
|
||||
>
|
||||
<img :src="next_picture.thumb_url" alt="{% trans %}Previous picture{% endtrans %}"/>
|
||||
<img :src="nextPicture.thumb_url" alt="{% trans %}Previous picture{% endtrans %}"/>
|
||||
<div class="overlay">→</div>
|
||||
</div>
|
||||
</template>
|
||||
@ -136,14 +136,14 @@
|
||||
<div class="tags">
|
||||
<h5>{% trans %}People{% endtrans %}</h5>
|
||||
{% if user.was_subscribed %}
|
||||
<form @submit.prevent="submit_identification" x-show="!!selector">
|
||||
<form @submit.prevent="submitIdentification" x-show="!!selector">
|
||||
<select x-ref="search" multiple="multiple"></select>
|
||||
<input type="submit" value="{% trans %}Go{% endtrans %}"/>
|
||||
</form>
|
||||
{% endif %}
|
||||
<ul>
|
||||
<template
|
||||
x-for="identification in (current_picture.identifications || [])"
|
||||
x-for="identification in (currentPicture.identifications || [])"
|
||||
:key="identification.id"
|
||||
>
|
||||
<li>
|
||||
@ -151,12 +151,12 @@
|
||||
<img class="profile-pic" :src="identification.user.profile_pict" alt="image de profil"/>
|
||||
<span x-text="identification.user.display_name"></span>
|
||||
</a>
|
||||
<template x-if="can_be_removed(identification)">
|
||||
<a class="delete clickable" @click="remove_identification(identification)"><i class="fa fa-times fa-xl delete-action"></i></a>
|
||||
<template x-if="canBeRemoved(identification)">
|
||||
<a class="delete clickable" @click="removeIdentification(identification)"><i class="fa fa-times fa-xl delete-action"></i></a>
|
||||
</template>
|
||||
</li>
|
||||
</template>
|
||||
<template x-if="current_picture.identifications_loading">
|
||||
<template x-if="currentPicture.identificationsLoading">
|
||||
{# shadow element that exists only to put the loading wheel below
|
||||
the list of identified people #}
|
||||
<li class="loader" aria-busy="true"></li>
|
||||
@ -171,10 +171,10 @@
|
||||
{% block script %}
|
||||
{{ super() }}
|
||||
<script>
|
||||
const picture_endpoint = "{{ url("api:pictures") + "?album_id=" + album.id|string }}";
|
||||
const album_url = "{{ album.get_absolute_url() }}";
|
||||
const first_picture_id = {{ picture.id }}; {# id of the first picture to show after page load #}
|
||||
const user_id = {{ user.id }};
|
||||
const user_is_sas_admin = {{ (user.is_root or user.is_in_group(pk = settings.SITH_GROUP_SAS_ADMIN_ID))|tojson }}
|
||||
const pictureEndpoint = "{{ url("api:pictures") + "?album_id=" + album.id|string }}";
|
||||
const albumUrl = "{{ album.get_absolute_url() }}";
|
||||
const firstPictureId = {{ picture.id }}; {# id of the first picture to show after page load #}
|
||||
const userId = {{ user.id }};
|
||||
const userIsSasAdmin = {{ (user.is_root or user.is_in_group(pk = settings.SITH_GROUP_SAS_ADMIN_ID))|tojson }}
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user