Updates

2025-12-14 08:46:49 +00:00 · 2022-12-10 14:39:05 +01:00
parent 1a39b4c241
commit 4d203fed07
6 changed files with 130 additions and 133 deletions
--- a/src/adventskalender.pug
+++ b/src/adventskalender.pug
@@ -3,10 +3,10 @@ include includes/mixins
 block vars
  - const pageTitle = "Adventskalender"
  - const pageDescription = "🎄 Wir wünschen euch mit unserem Adventskalender bullishe All Time Highnachten! 🎅"
-  - const pageCard = "/img/adventskalender.png"
+  - const pageCard = "/img/card/adventskalender.png"

 <!DOCTYPE html>
-html(lang="en")
+html(lang="de")
  head
    include includes/_head
    link(href=assetPath("/css/adventskalender.css") rel="stylesheet")
--- a/src/css/sections/meetups.css
+++ b/src/css/sections/meetups.css
@@ -4,9 +4,7 @@
  3% { transform: scale(.75);  }
 }

-#meetups,
-#kurse {
-  & #map {
+#map {
  @media (--up_to_L) {
    margin-top: var(--space-xl);

@@ -87,14 +85,13 @@
      border-radius: var(--space-m);
    }
  }
-  }
+}

-  & #unmapped {
+#unmapped {
  @media (--up_to_L) {
    display: none;
  }
  @media (--L_and_up) {
    margin-top: var(--space-xxl);
  }
-  }
 }
--- a/src/includes/mixins.pug
+++ b/src/includes/mixins.pug
@@ -32,6 +32,50 @@ mixin member(m)
    if m.text
      !=markdown(m.text)

+mixin map(m)
+  - const filterOfficial = (list, official) => list.filter(meetup => (meetup.name.startsWith('Einundzwanzig') || meetup.name.startsWith('Einezwänzg')) === official)
+  - const filterUnmapped = (list) => list.filter(meetup => !meetup.top || !meetup.left)
+  - const style = m => m.top && m.left ? `top:${m.top}%;left:${m.left}%;` : null
+  - const clss = m => m.top && m.left ? null : 'unmapped'
+  - let j = 0
+  #map
+    h2 Einundzwanzig Meetups
+    ul.meetups
+      each m in filterOfficial(meetups, true)
+        li.official(class=clss(m) style=style(m))
+          a(href=m.url target="_blank" rel="nofollow noopener")
+            .dot(style=`animation-delay:${((j*2000) + random(3000))}ms;animation-duration:${meetups.length*2}s;`)
+            = m.name.replace('Einundzwanzig ', '').replace('Einezwänzg ', '')
+          if m.members
+            = ' '
+            small.members= `(${m.members})`
+          - j++
+
+    h2 Weitere Meetups
+    ul.meetups
+      each m in filterOfficial(meetups, false)
+        li(class=clss(m) style=style(m))
+          a(href=m.url target="_blank" rel="nofollow noopener")
+            .dot(style=`animation-delay:${((j*2000) + random(3000))}ms;animation-duration:${meetups.length*2}s;`)
+            = m.name.replace('Bitcoin ', '')
+          if m.members
+            = ' '
+            small.members= `(${m.members})`
+          - j++
+
+    img#dach(src=assetPath('/img/dach.svg') alt="DE, AT, CH")
+    #tooltip.tooltip(hidden)
+  #unmapped
+    h2 Weitere Meetups
+    ul.meetups
+      each m in filterUnmapped(meetups)
+        li(class=clss(m) style=style(m))
+          a(href=m.url target="_blank" rel="nofollow noopener")
+            = m.name
+          if m.members
+            = ' '
+            small.members= `(${m.members})`
+
 mixin spende(d, trunc = false)
  .spende(id=d.id)&attributes(attributes)
    .inner
--- a/src/includes/template.pug
+++ b/src/includes/template.pug
@@ -10,7 +10,7 @@ block vars
 - const themeColor = site.meta.themeColor

 <!DOCTYPE html>
-html(lang="en")
+html(lang="de")
  head
    include _head
  body
@@ -46,8 +46,6 @@ html(lang="en")
                a(href="/team/" class=(navCurrent === 'team' && 'current')) Team
                a(href="/verein/" class=(navCurrent === 'verein' && 'current')) Verein
                a(href="/kontakt/" class=(navCurrent === 'kontakt' && 'current')) Kontakt
-            //- .navItem
-            //-   a(href=site.meta.shopUrl target="_blank") Shop
          button(type="button").theme
            +sprite("theme")

--- a/src/meetups.pug
+++ b/src/meetups.pug
@@ -4,11 +4,6 @@ block vars
  - const title = 'Bitcoin-Meetups'
  - const description = 'Eine Liste von Bitcoin-Meetups und Einundzwanzig-Treffen im D/A/CH/S/LI/LU-Raum.'
  - const cardImage = '/img/card/meetups.png'
-  - const filterOfficial = (list, official) => list.filter(meetup => (meetup.name.startsWith('Einundzwanzig') || meetup.name.startsWith('Einezwänzg')) === official)
-  - const filterUnmapped = (list) => list.filter(meetup => !meetup.top || !meetup.left)
-  - const style = m => m.top && m.left ? `top:${m.top}%;left:${m.left}%;` : null
-  - const clss = m => m.top && m.left ? null : 'unmapped'
-  - let j = 0

 block main
  #meetups.wrap
@@ -27,41 +22,4 @@ block main

        Die Vorlage für das Telegram-Gruppenbild findest du im [Media Kit](/media).

-      #map
-        h2 Einundzwanzig Meetups
-        ul.meetups
-          each m in filterOfficial(meetups, true)
-            li.official(class=clss(m) style=style(m))
-              a(href=m.url target="_blank" rel="nofollow noopener")
-                .dot(style=`animation-delay:${((j*2000) + random(3000))}ms;animation-duration:${meetups.length*2}s;`)
-                = m.name.replace('Einundzwanzig ', '').replace('Einezwänzg ', '')
-              if m.members
-                = ' '
-                small.members= `(${m.members})`
-              - j++
-
-        h2 Weitere Meetups
-        ul.meetups
-          each m in filterOfficial(meetups, false)
-            li(class=clss(m) style=style(m))
-              a(href=m.url target="_blank" rel="nofollow noopener")
-                .dot(style=`animation-delay:${((j*2000) + random(3000))}ms;animation-duration:${meetups.length*2}s;`)
-                = m.name.replace('Bitcoin ', '')
-              if m.members
-                = ' '
-                small.members= `(${m.members})`
-              - j++
-
-        img#dach(src=assetPath('/img/dach.svg') alt="DE, AT, CH")
-        #tooltip.tooltip(hidden)
-
-      #unmapped
-        h2 Weitere Meetups
-        ul.meetups
-          each m in filterUnmapped(meetups)
-            li(class=clss(m) style=style(m))
-              a(href=m.url target="_blank" rel="nofollow noopener")
-                = m.name
-              if m.members
-                = ' '
-                small.members= `(${m.members})`
+      +map(meetups)
--- a/static/img/card/adventskalender.png
+++ b/static/img/card/adventskalender.png