Tune pinboard styling and Muuri-driven dynamic item widths

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/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

@@ -1,4 +1,6 @@
-<link rel="stylesheet" href="{{ asset('bundles/contaopinboard/css/pinboard.css') }}">
+{% 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>
@@ -10,20 +12,22 @@
         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 %}
+        <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>
+          <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 %}
+          {% 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>
@@ -31,4 +35,5 @@
   </div>
 </section>
 
-<script src="{{ asset('bundles/contaopinboard/js/pinboard.js') }}" defer></script>
+<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,38 +2,53 @@
   width: 100%;
   max-width: 1400px;
   margin: 0 auto;
-  padding: 1.5rem;
+  padding: 2em;
+  box-sizing: border-box;
+}
+
+.pinboard {
+  --pin-gap: 1.25rem;
 }
 
 .pinboard__surface {
   position: relative;
   min-height: 42rem;
+  padding: 1.2rem;
+  border: 30px solid #cba888;
   border-radius: 1.2rem;
   overflow: hidden;
   background:
-    radial-gradient(circle at 20% 10%, rgba(255, 255, 255, 0.25), transparent 42%),
-    radial-gradient(circle at 80% 90%, rgba(50, 30, 10, 0.2), transparent 36%),
-    repeating-linear-gradient(35deg, rgba(75, 40, 15, 0.18), rgba(75, 40, 15, 0.18) 3px, rgba(93, 52, 23, 0.12) 3px, rgba(93, 52, 23, 0.12) 9px),
-    linear-gradient(145deg, #b77944 0%, #a66a38 45%, #8d552a 100%);
+    radial-gradient(circle at 20% 10%, rgba(255, 255, 255, 0.18), transparent 42%),
+    radial-gradient(circle at 80% 90%, rgba(40, 22, 10, 0.16), transparent 36%),
+    url('/bundles/contaopinboard/assets/wood_0011_color_1k.jpg') center/cover no-repeat;
   box-shadow: inset 0 0 0 1px rgba(65, 33, 12, 0.25), inset 0 0 18px rgba(45, 22, 8, 0.35);
 }
 
 .pin-note {
   position: absolute;
-  width: clamp(220px, 28vw, 340px);
+  width: 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 +61,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,14 +111,10 @@
 
 @media (max-width: 768px) {
   .pinboard {
-    padding: 0.8rem;
+    padding: 2em;
   }
 
   .pinboard__surface {
     min-height: 36rem;
   }
-
-  .pin-note {
-    width: min(84vw, 290px);
-  }
 }

public/assets/pinboard.js

@@ -0,0 +1,87 @@
+(() => {
+  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 toPx = (value) => {
+    const parsed = Number.parseFloat(value);
+    return Number.isNaN(parsed) ? 0 : parsed;
+  };
+
+  const updateItemWidths = () => {
+    const boardStyles = window.getComputedStyle(board);
+    const boardWidth = board.clientWidth;
+    const gap = toPx(boardStyles.getPropertyValue('--pin-gap')) || 20;
+    const minItemWidth = 260;
+
+    const columns = Math.max(1, Math.floor((boardWidth + gap) / (minItemWidth + gap)));
+    const itemWidth = Math.max(220, Math.floor((boardWidth - (columns - 1) * gap) / columns));
+
+    ordered.forEach((note) => {
+      note.style.width = `${itemWidth}px`;
+    });
+  };
+
+  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 = () => {
+    updateItemWidths();
+    grid.refreshItems().layout();
+  };
+
+  relayout();
+  window.addEventListener('resize', relayout);
+})();

src/Controller/FrontendModule/PinboardController.php

@@ -6,6 +6,7 @@ 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;
@@ -18,6 +19,7 @@ final class PinboardController extends AbstractFrontendModuleController
 {
     public function __construct(
         private readonly Studio $studio,
+        private readonly InsertTagParser $insertTagParser,
     ) {
     }
 
@@ -60,7 +62,7 @@ final class PinboardController extends AbstractFrontendModuleController
                     '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,
                     'imageFigure' => $imageFigure,
@@ -74,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,125 +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) => {
-      if (event.target instanceof Element && event.target.closest('a, button, input, select, textarea, label')) {
-        return;
-      }
-
-      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();
-  });
-})();