Refine muuri pinboard layout, spacing and remove randomization

contao/config/config.php

@@ -9,3 +9,5 @@ $GLOBALS['BE_MOD']['content']['pinnwand'] = [
 ];
 
 $GLOBALS['TL_MODELS']['tl_pinnwand'] = PinboardModel::class;
+
+$GLOBALS['TL_DCA']['tl_module']['palettes']['pinnwand'] = '{title_legend},name,headline,type;{image_legend},imgSize;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';

contao/config/services.yaml

@@ -15,7 +15,7 @@ services:
         name: contao.frontend_module
         category: application
         type: pinnwand
-        template: frontend_module/pinnwand
+        template: frontend/pinnwand
 
   Eiswurm\ContaoPinboardBundle\EventListener\DataContainer\PinboardTimestampListener:
     tags:

contao/dca/tl_module.php

@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+$GLOBALS['TL_DCA']['tl_module']['palettes']['pinnwand'] = '{title_legend},name,headline,type;{image_legend},imgSize;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';

contao/dca/tl_pinnwand.php

@@ -102,14 +102,16 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'sorting' => true,
             'flag' => 6,
             'inputType' => 'text',
-            'eval' => ['rgxp' => 'datim', 'datepicker' => true, 'mandatory' => true, 'default' => time(), 'tl_class' => 'w50 wizard'],
+            'default' => time(),
+            'eval' => ['rgxp' => 'datim', 'datepicker' => true, 'mandatory' => true, 'tl_class' => 'w50 wizard'],
             'sql' => 'int(10) unsigned NOT NULL default 0',
         ],
         'dateModified' => [
             'sorting' => true,
             'flag' => 6,
             'inputType' => 'text',
-            'eval' => ['rgxp' => 'datim', 'readonly' => true, 'default' => time(), 'tl_class' => 'w50'],
+            'default' => time(),
+            'eval' => ['rgxp' => 'datim', 'readonly' => true, 'tl_class' => 'w50'],
             'sql' => 'int(10) unsigned NOT NULL default 0',
         ],
         'published' => [
@@ -145,14 +147,14 @@ $GLOBALS['TL_DCA']['tl_pinnwand']['fields']['ueberschrift']['save_callback'][] =
     $start = 2;
     $base = $baseHeadline;
 
-    if (preg_match('/^(.*)\s-\s(\d+)$/', $baseHeadline, $matches)) {
+    if (preg_match('/^(.*)\s\((\d+)\)$/', $baseHeadline, $matches)) {
         $base = trim($matches[1]);
         $start = (int) $matches[2] + 1;
     }
 
     $id = (int) ($dataContainer->id ?? 0);
     $number = max(2, $start);
-    $candidate = sprintf('%s - %d', $base, $number);
+    $candidate = sprintf('%s (%d)', $base, $number);
 
     do {
         $exists = Database::getInstance()
@@ -164,6 +166,18 @@ $GLOBALS['TL_DCA']['tl_pinnwand']['fields']['ueberschrift']['save_callback'][] =
         }
 
         ++$number;
-        $candidate = sprintf('%s - %d', $base, $number);
+        $candidate = sprintf('%s (%d)', $base, $number);
     } while (true);
 };
+
+$GLOBALS['TL_DCA']['tl_pinnwand']['fields']['dateAdded']['load_callback'][] = static function (mixed $value): int {
+    $timestamp = (int) $value;
+
+    return $timestamp > 0 ? $timestamp : time();
+};
+
+$GLOBALS['TL_DCA']['tl_pinnwand']['fields']['dateModified']['load_callback'][] = static function (mixed $value): int {
+    $timestamp = (int) $value;
+
+    return $timestamp > 0 ? $timestamp : time();
+};

contao/templates/frontend/pinnwand.html.twig

@@ -0,0 +1,39 @@
+{% use '@Contao/component/_figure.html.twig' %}
+
+<link rel="stylesheet" href="{{ asset('bundles/contaopinboard/assets/pinboard.css') }}">
+
+<section class="pinboard" data-pinboard>
+  <div class="pinboard__surface" data-pinboard-surface>
+    {% for entry in entries %}
+      <article
+        class="pin-note{% if entry.highlighted %} is-highlighted{% endif %}"
+        data-pin-note
+        data-highlighted="{{ entry.highlighted ? '1' : '0' }}"
+        data-seed="{{ entry.id }}"
+        aria-label="{{ entry.headline }}"
+      >
+        <div class="pin-note__inner" data-pin-note-inner>
+          {% if entry.imageFigure %}
+            <figure class="pin-note__image-wrap">
+              {% with {figure: entry.imageFigure} %}{{ block('figure_component') }}{% endwith %}
+            </figure>
+          {% endif %}
+
+          <h3 class="pin-note__headline">{{ entry.headline }}</h3>
+          <div class="pin-note__text">{{ entry.text|e|nl2br }}</div>
+
+          {% if entry.link %}
+            <p class="pin-note__link-wrap">
+              <a href="{{ entry.link }}" class="pin-note__link" target="_blank" rel="noopener">Mehr erfahren</a>
+            </p>
+          {% endif %}
+        </div>
+      </article>
+    {% else %}
+      <p class="pinboard__empty">Keine veröffentlichten Pinnwandeinträge vorhanden.</p>
+    {% endfor %}
+  </div>
+</section>
+
+<script src="https://cdn.jsdelivr.net/npm/muuri@0.9.5/dist/muuri.min.js" defer></script>
+<script src="{{ asset('bundles/contaopinboard/assets/pinboard.js') }}" defer></script>

public/assets/pinboard.css

@@ -2,12 +2,14 @@
   width: 100%;
   max-width: 1400px;
   margin: 0 auto;
-  padding: 1.5rem;
+  padding: 2em;
+  box-sizing: border-box;
 }
 
 .pinboard__surface {
   position: relative;
   min-height: 42rem;
+  padding: 1.2rem;
   border-radius: 1.2rem;
   overflow: hidden;
   background:
@@ -20,20 +22,29 @@
 
 .pin-note {
   position: absolute;
-  width: clamp(220px, 28vw, 340px);
+  width: clamp(220px, 26vw, 320px);
+  min-height: 230px;
+  padding: 1.5em;
+  box-sizing: border-box;
+  overflow: visible;
+}
+
+.pin-note__inner {
+  position: relative;
   min-height: 190px;
   padding: 1rem 1rem 1.25rem;
   border-radius: 0.3rem;
   background: linear-gradient(160deg, #fff8a8 0%, #f5eb85 100%);
   color: #2a241c;
   box-shadow: 0 10px 22px rgba(20, 10, 5, 0.34);
-  cursor: grab;
+  cursor: pointer;
   user-select: none;
-  touch-action: none;
-  transition: box-shadow 160ms ease, transform 160ms ease;
+  touch-action: auto;
+  transform: translate(0, 0) rotate(0deg);
+  transition: box-shadow 160ms ease;
 }
 
-.pin-note::before {
+.pin-note__inner::before {
   content: '';
   position: absolute;
   top: -9px;
@@ -46,12 +57,11 @@
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.35);
 }
 
-.pin-note.is-highlighted {
+.pin-note.is-highlighted .pin-note__inner {
   background: linear-gradient(160deg, #ffd99b 0%, #f7c46f 100%);
 }
 
-.pin-note.is-dragging {
-  cursor: grabbing;
+.pin-note.is-front .pin-note__inner {
   box-shadow: 0 18px 34px rgba(20, 10, 5, 0.46);
 }
 
@@ -97,7 +107,7 @@
 
 @media (max-width: 768px) {
   .pinboard {
-    padding: 0.8rem;
+    padding: 2em;
   }
 
   .pinboard__surface {

public/assets/pinboard.js

@@ -0,0 +1,67 @@
+(() => {
+  const board = document.querySelector('[data-pinboard-surface]');
+
+  if (!board) {
+    return;
+  }
+
+  if (typeof Muuri === 'undefined') {
+    return;
+  }
+
+  const notes = Array.from(board.querySelectorAll('[data-pin-note]'));
+
+  if (!notes.length) {
+    return;
+  }
+
+  let zCounter = 500;
+
+  const highlighted = notes.filter((note) => note.dataset.highlighted === '1');
+  const normal = notes.filter((note) => note.dataset.highlighted !== '1');
+  const ordered = [...highlighted, ...normal];
+
+  ordered.forEach((note) => {
+    board.appendChild(note);
+  });
+
+  ordered.forEach((note, index) => {
+    const isHighlighted = note.dataset.highlighted === '1';
+    note.style.zIndex = String(isHighlighted ? 300 + index : 100 + index);
+  });
+
+  const grid = new Muuri(board, {
+    items: '.pin-note',
+    dragEnabled: false,
+    layout: {
+      fillGaps: false,
+      horizontal: false,
+      alignRight: false,
+      alignBottom: false,
+      rounding: false,
+    },
+    layoutDuration: 250,
+    layoutEasing: 'ease',
+  });
+
+  const bringToFront = (note) => {
+    zCounter += 1;
+    note.style.zIndex = String(zCounter);
+
+    ordered.forEach((item) => item.classList.remove('is-front'));
+    note.classList.add('is-front');
+  };
+
+  ordered.forEach((note) => {
+    note.addEventListener('pointerdown', () => {
+      bringToFront(note);
+    });
+  });
+
+  const relayout = () => {
+    grid.refreshItems().layout();
+  };
+
+  relayout();
+  window.addEventListener('resize', relayout);
+})();

src/Controller/FrontendModule/PinboardController.php

@@ -5,15 +5,24 @@ declare(strict_types=1);
 namespace Eiswurm\ContaoPinboardBundle\Controller\FrontendModule;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
+use Contao\CoreBundle\Image\Studio\Studio;
+use Contao\CoreBundle\InsertTag\InsertTagParser;
 use Contao\CoreBundle\Twig\FragmentTemplate;
 use Contao\FilesModel;
 use Contao\ModuleModel;
+use Contao\StringUtil;
 use Eiswurm\ContaoPinboardBundle\Model\PinboardModel;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 final class PinboardController extends AbstractFrontendModuleController
 {
+    public function __construct(
+        private readonly Studio $studio,
+        private readonly InsertTagParser $insertTagParser,
+    ) {
+    }
+
     protected function getResponse(FragmentTemplate $template, ModuleModel $model, Request $request): Response
     {
         $collection = PinboardModel::findBy(
@@ -26,21 +35,37 @@ final class PinboardController extends AbstractFrontendModuleController
 
         if (null !== $collection) {
             foreach ($collection as $entry) {
-                $imagePath = null;
+                $imageFigure = null;
 
                 if ($entry->bild) {
                     $fileModel = FilesModel::findByUuid($entry->bild);
-                    $imagePath = $fileModel?->path;
+
+                    if (null !== $fileModel) {
+                        $figureBuilder = $this->studio
+                            ->createFigureBuilder()
+                            ->fromFilesModel($fileModel)
+                            ->enableLightbox()
+                            ->setLightboxGroupIdentifier('pinnwand-'.$model->id)
+                        ;
+
+                        $imageSize = StringUtil::deserialize($model->imgSize, true);
+
+                        if ([] !== $imageSize) {
+                            $figureBuilder->setSize($imageSize);
+                        }
+
+                        $imageFigure = $figureBuilder->buildIfResourceExists();
+                    }
                 }
 
                 $notes[] = [
                     'id' => (int) $entry->id,
                     'headline' => (string) $entry->ueberschrift,
                     'text' => (string) $entry->text,
-                    'link' => (string) $entry->link,
+                    'link' => $this->resolveLink((string) $entry->link),
                     'dateAdded' => (int) $entry->dateAdded,
                     'dateModified' => (int) $entry->dateModified,
-                    'imagePath' => $imagePath,
+                    'imageFigure' => $imageFigure,
                     'highlighted' => '1' === $entry->hervorgehoben,
                 ];
             }
@@ -51,4 +76,15 @@ final class PinboardController extends AbstractFrontendModuleController
 
         return $template->getResponse();
     }
+
+    private function resolveLink(string $link): string
+    {
+        $link = trim($link);
+
+        if ('' === $link) {
+            return '';
+        }
+
+        return html_entity_decode($this->insertTagParser->replaceInline($link), \ENT_QUOTES | \ENT_HTML5);
+    }
 }

src/Resources/public/js/pinboard.js

@@ -1,121 +0,0 @@
-(() => {
-  const board = document.querySelector('[data-pinboard-surface]');
-
-  if (!board) {
-    return;
-  }
-
-  const notes = Array.from(board.querySelectorAll('[data-pin-note]'));
-
-  if (!notes.length) {
-    return;
-  }
-
-  let zCounter = 200;
-
-  const randomBetween = (min, max) => Math.random() * (max - min) + min;
-
-  const placeNotes = () => {
-    const boardRect = board.getBoundingClientRect();
-    const maxXBase = Math.max(24, boardRect.width - 300);
-    const maxYBase = Math.max(24, boardRect.height - 220);
-
-    notes.forEach((note, index) => {
-      const maxX = Math.max(16, maxXBase - note.offsetWidth * 0.2);
-      const maxY = Math.max(16, maxYBase - note.offsetHeight * 0.2);
-
-      const x = randomBetween(12, maxX);
-      const y = randomBetween(12, maxY);
-      const rotation = randomBetween(-7, 7);
-      const highlighted = note.dataset.highlighted === '1';
-      const level = highlighted ? 1000 + index : 100 + index;
-
-      note.dataset.baseRotation = String(rotation);
-      note.dataset.x = String(x);
-      note.dataset.y = String(y);
-      note.style.zIndex = String(level);
-      note.style.transform = `translate(${x}px, ${y}px) rotate(${rotation}deg)`;
-    });
-  };
-
-  const clampToBoard = (note, x, y) => {
-    const boardRect = board.getBoundingClientRect();
-    const noteRect = note.getBoundingClientRect();
-    const maxX = Math.max(0, boardRect.width - noteRect.width);
-    const maxY = Math.max(0, boardRect.height - noteRect.height);
-
-    return {
-      x: Math.min(Math.max(0, x), maxX),
-      y: Math.min(Math.max(0, y), maxY),
-    };
-  };
-
-  const enableDrag = (note) => {
-    let dragging = false;
-    let pointerId = null;
-    let offsetX = 0;
-    let offsetY = 0;
-
-    note.addEventListener('pointerdown', (event) => {
-      dragging = true;
-      pointerId = event.pointerId;
-      note.setPointerCapture(pointerId);
-      note.classList.add('is-dragging');
-      note.style.zIndex = String(++zCounter + 2000);
-
-      const startX = Number.parseFloat(note.dataset.x ?? '0');
-      const startY = Number.parseFloat(note.dataset.y ?? '0');
-      offsetX = event.clientX - startX;
-      offsetY = event.clientY - startY;
-    });
-
-    note.addEventListener('pointermove', (event) => {
-      if (!dragging || event.pointerId !== pointerId) {
-        return;
-      }
-
-      const baseRotation = Number.parseFloat(note.dataset.baseRotation ?? '0');
-      const nextX = event.clientX - offsetX;
-      const nextY = event.clientY - offsetY;
-      const clamped = clampToBoard(note, nextX, nextY);
-
-      note.dataset.x = String(clamped.x);
-      note.dataset.y = String(clamped.y);
-      note.style.transform = `translate(${clamped.x}px, ${clamped.y}px) rotate(${baseRotation}deg)`;
-    });
-
-    const releaseDrag = (event) => {
-      if (!dragging || event.pointerId !== pointerId) {
-        return;
-      }
-
-      dragging = false;
-      note.classList.remove('is-dragging');
-      note.releasePointerCapture(pointerId);
-      pointerId = null;
-    };
-
-    note.addEventListener('pointerup', releaseDrag);
-    note.addEventListener('pointercancel', releaseDrag);
-  };
-
-  const adjustBoardHeight = () => {
-    let requiredHeight = 620;
-
-    notes.forEach((note) => {
-      const y = Number.parseFloat(note.dataset.y ?? '0');
-      requiredHeight = Math.max(requiredHeight, y + note.offsetHeight + 36);
-    });
-
-    board.style.minHeight = `${Math.ceil(requiredHeight)}px`;
-  };
-
-  placeNotes();
-  notes.forEach(enableDrag);
-  adjustBoardHeight();
-
-  window.addEventListener('resize', () => {
-    placeNotes();
-    adjustBoardHeight();
-  });
-})();

templates/frontend_module/pinnwand.html.twig

@@ -1,38 +0,0 @@
-{% extends '@Contao/frontend_module/_base.html.twig' %}
-
-{% block content %}
-  <link rel="stylesheet" href="{{ asset('bundles/contaopinboard/css/pinboard.css') }}">
-
-  <section class="pinboard" data-pinboard>
-    <div class="pinboard__surface" data-pinboard-surface>
-      {% for entry in entries %}
-        <article
-          class="pin-note{% if entry.highlighted %} is-highlighted{% endif %}"
-          data-pin-note
-          data-highlighted="{{ entry.highlighted ? '1' : '0' }}"
-          data-seed="{{ entry.id }}"
-          aria-label="{{ entry.headline }}"
-        >
-          {% if entry.imagePath %}
-            <figure class="pin-note__image-wrap">
-              <img src="{{ asset(entry.imagePath) }}" alt="" class="pin-note__image">
-            </figure>
-          {% endif %}
-
-          <h3 class="pin-note__headline">{{ entry.headline }}</h3>
-          <div class="pin-note__text">{{ entry.text|e|nl2br }}</div>
-
-          {% if entry.link %}
-            <p class="pin-note__link-wrap">
-              <a href="{{ entry.link }}" class="pin-note__link" target="_blank" rel="noopener">Mehr erfahren</a>
-            </p>
-          {% endif %}
-        </article>
-      {% else %}
-        <p class="pinboard__empty">Keine veröffentlichten Pinnwandeinträge vorhanden.</p>
-      {% endfor %}
-    </div>
-  </section>
-
-  <script src="{{ asset('bundles/contaopinboard/js/pinboard.js') }}" defer></script>
-{% endblock %}