restify album view

core/static/core/js/script.js

@@ -65,3 +65,21 @@ function display_notif() {
 function getCSRFToken() {
     return $("[name=csrfmiddlewaretoken]").val();
 }
+
+
+const initialUrlParams = new URLSearchParams(window.location.search);
+
+function update_query_string(key, value) {
+    const url = new URL(window.location.href);
+    if (!value) {
+        // If the value is null, undefined or empty => delete it
+        url.searchParams.delete(key)
+    } else if (Array.isArray(value)) {
+
+        url.searchParams.delete(key)
+        value.forEach((v) => url.searchParams.append(key, v))
+    } else {
+        url.searchParams.set(key, value);
+    }
+    history.pushState(null, document.title, url.toString());
+}

core/static/core/pagination.scss

@@ -3,6 +3,7 @@
 .pagination {
   text-align: center;
   gap: 10px;
+  margin: 30px;
 
   button {
     background-color: $secondary-neutral-light-color;

core/static/sas/album.scss

@@ -161,17 +161,13 @@ main {
     > .album {
       box-sizing: border-box;
       background-color: #333333;
-      background-size: cover;
+      background-size: contain;
       background-repeat: no-repeat;
       background-position: center center;
 
       width: calc(16 / 9 * 128px);
       height: 128px;
 
-      &.vertical {
-        background-size: contain;
-      }
-
       margin: 0;
       padding: 0;
       box-shadow: none;

pedagogy/templates/pedagogy/guide.jinja

@@ -126,22 +126,6 @@
     </nav>
   </div>
   <script>
-    const initialUrlParams = new URLSearchParams(window.location.search);
-
-    function update_query_string(key, value) {
-      const url = new URL(window.location.href);
-      if (!value) {
-            {# If the value is null, undefined or empty => delete it #}
-        url.searchParams.delete(key)
-      } else if (Array.isArray(value)) {
-        url.searchParams.delete(key)
-        value.forEach((v) => url.searchParams.append(key, v))
-      } else {
-        url.searchParams.set(key, value);
-      }
-      history.pushState(null, document.title, url.toString());
-    }
-
     {#
     How does this work :
 

sas/api.py

@@ -50,7 +50,7 @@ class PicturesController(ControllerBase):
                 Picture.objects.filter(is_moderated=True, asked_for_removal=False)
             )
             .distinct()
-            .order_by("-date")
+            .order_by("-parent__date", "date")
             .annotate(album=F("parent__name"))
         )
 

sas/templates/sas/album.jinja

@@ -3,6 +3,7 @@
 
 {%- block additional_css -%}
   <link rel="stylesheet" href="{{ scss('sas/album.scss') }}">
+  <link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">
 {%- endblock -%}
 
 {% block title %}
@@ -81,39 +82,38 @@
     <br>
   {% endif %}
 
+  <div x-data="pictures">
     <h4>{% trans %}Pictures{% endtrans %}</h4>
-  {% if pictures | length != 0 %}
     <div class="photos">
-      {% for p in pictures %}
+      <template x-for="picture in pictures.results">
-        {% if p.can_be_viewed_by(user) %}
+        <a :href="`/sas/picture/${picture.id}#pict`">
-          <a href="{{ url('sas:picture', picture_id=p.id) }}#pict">
+          <div class="photo" :style="`background-image: url(${picture.thumb_url})`">
-            <div
+            <template x-if="!picture.is_moderated">
-              class="photo {% if p.is_vertical %}vertical{% endif %}"
-              style="background-image: url('{{ p.get_download_thumb_url() }}')"
-            >
-              {% if not p.is_moderated %}
               <div class="overlay">&nbsp;</div>
               <div class="text">{% trans %}To be moderated{% endtrans %}</div>
-              {% else %}
+            </template>
+            <template x-if="picture.is_moderated">
               <div class="text">&nbsp;</div>
-              {% endif %}
+            </template>
           </div>
           {% if edit_mode %}
-              <input type="checkbox" name="file_list" value="{{ p.id }}">
+            <input type="checkbox" name="file_list" :value="picture.id">
           {% endif %}
         </a>
-        {% endif %}
+      </template>
-      {% endfor %}
     </div>
-  {% else %}
+    <nav class="pagination" x-show="nb_pages() > 1">
-    {% trans %}This album does not contain any photos.{% endtrans %}
+      <button @click="page--" :disabled="page <= 1">
-  {% endif %}
+        <i class="fa fa-caret-left"></i>
-
+      </button>
-  {% if pictures.has_previous() or pictures.has_next() %}
+      <template x-for="i in nb_pages()">
-    <div class="paginator">
+        <button x-text="i" @click="page = i":class="{active: page === i}"></button>
-      {{ paginate(pictures, paginator) }}
+      </template>
+      <button @click="page++" :disabled="page >= nb_pages()">
+        <i class="fa fa-caret-right"></i>
+      </button>
+    </nav>
   </div>
-  {% endif %}
 
   {% if edit_mode %}
     </form>
@@ -140,6 +140,29 @@
 {% block script %}
   {{ super() }}
   <script>
+    document.addEventListener("alpine:init", () => {
+      Alpine.data("pictures", () => ({
+        pictures: {},
+        page: parseInt(initialUrlParams.get("page")) || 1,
+        async init() {
+          await this.fetch_pictures();
+          this.$watch("page", () => this.fetch_pictures());
+        },
+
+        async fetch_pictures() {
+          update_query_string("page", this.page === 1 ? null : this.page);
+          const url = "{{ url("api:pictures") }}"
+          +"?album_id={{ album.id }}"
+          +`&page=${this.page}`
+          +"&page_size={{ settings.SITH_SAS_IMAGES_PER_PAGE }}";
+          this.pictures = await (await fetch(url)).json();
+        },
+
+        nb_pages() {
+          return Math.ceil(this.pictures.count / {{ settings.SITH_SAS_IMAGES_PER_PAGE }});
+        }
+      }))
+    })
     $("form#upload_form").submit(function (event) {
       let formData = new FormData($(this)[0]);
 

sas/views.py

@@ -236,7 +236,6 @@ class AlbumView(CanViewMixin, DetailView, FormMixin):
     form_class = SASForm
     pk_url_kwarg = "album_id"
     template_name = "sas/album.jinja"
-    paginate_by = settings.SITH_SAS_IMAGES_PER_PAGE
 
     def dispatch(self, request, *args, **kwargs):
         try:
@@ -283,13 +282,6 @@ class AlbumView(CanViewMixin, DetailView, FormMixin):
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
-        kwargs["paginator"] = Paginator(
-            self.object.children_pictures.order_by("id"), self.paginate_by
-        )
-        try:
-            kwargs["pictures"] = kwargs["paginator"].page(self.asked_page)
-        except InvalidPage as e:
-            raise Http404 from e
         kwargs["form"] = self.form
         kwargs["clipboard"] = SithFile.objects.filter(
             id__in=self.request.session["clipboard"]