@geekity/cms 0.41.0 → 0.42.1

package/admin/components/blocks.njk

@@ -166,7 +166,7 @@
           <text class="fill-base-content/70" x="24" y="{{ day.y }}" text-anchor="end" font-size="9">{{ day.label }}</text>
         {% endfor %}
         {% for cell in view.cells %}
-          <rect class="{% if cell.level == 0 %}fill-base-content/10{% elif cell.level == 1 %}fill-primary/25{% elif cell.level == 2 %}fill-primary/50{% elif cell.level == 3 %}fill-primary/75{% else %}fill-primary{% endif %}" x="{{ cell.x }}" y="{{ cell.y }}" width="{{ view.cell }}" height="{{ view.cell }}" rx="2"><title>{{ cell.title }}</title></rect>
+          <rect class="{% if cell.level == 0 %}fill-base-content/10{% elif cell.level == 1 %}fill-primary/25{% elif cell.level == 2 %}fill-primary/50{% elif cell.level == 3 %}fill-primary/75{% else %}fill-primary{% endif %}{% if cell.marked %} stroke-base-content{% endif %}"{% if cell.marked %} stroke-width="1.5"{% endif %} x="{{ cell.x }}" y="{{ cell.y }}" width="{{ view.cell }}" height="{{ view.cell }}" rx="2"><title>{{ cell.title }}</title></rect>
         {% endfor %}
       </svg>
     </div>
@@ -180,6 +180,12 @@
         <rect class="fill-primary" x="56" y="0" width="12" height="12" rx="2" />
       </svg>
       <span>More</span>
+      {% if view.mark %}
+        <svg class="ml-3 size-3" viewBox="0 0 12 12">
+          <rect class="fill-base-content/10 stroke-base-content" stroke-width="1.5" x="0.75" y="0.75" width="10.5" height="10.5" rx="2" />
+        </svg>
+        <span>{{ view.mark }}</span>
+      {% endif %}
     </div>
     {{ numbers(view) }}
   </div>
@@ -243,6 +249,14 @@
     {{ bars(view) }}
   {% elif view.kind == 'calendar' %}
     {{ calendar(view) }}
+  {% elif view.kind == 'progress' %}
+    <div class="grid gap-1">
+      <div class="flex flex-wrap justify-between gap-x-3 text-sm">
+        <span>{{ view.label }}</span>
+        <span class="tabular-nums">{{ view.value }} of {{ view.max }} · <span class="font-semibold">{{ view.percent }}</span></span>
+      </div>
+      <progress class="progress progress-primary w-full" value="{{ view.filled }}" max="{{ view.limit }}" aria-label="{{ view.label }}">{{ view.percent }}</progress>
+    </div>
   {% else %}
     {% if view.caption %}<p class="text-sm font-semibold">{{ view.caption }}</p>{% endif %}
     <p class="text-sm text-base-content/70">No data to show.</p>

package/admin/pages/documents/editor.njk

@@ -502,6 +502,7 @@
         {% endif %}
 
         {{ field.textarea('editor-body', 'body', (editorKind.body if editorKind else 'Body'), value=form.body, rows=(8 if editorKind and editorKind.sections | length else 20)) }}
+        <p id="editor-words" class="text-sm text-base-content/70 tabular-nums"{% if words.today is defined %} data-words-today="{{ words.today }}"{% endif %}>{{ words.label }}</p>
 
         {# Everything the editor's own script needs, on the element it hangs
            off. With JavaScript off this is one button that posts the form to

package/admin/pages/settings/reading.njk

@@ -161,4 +161,18 @@
   {% endset %}
   {{ field.checkbox('settings-index-now', fields.index_now, 'Submit changes to IndexNow',
        checked=form.index_now, hintHtml=indexNowHint) }}
+
+  {% set geminiHint %}
+    Serves the site as a Gemini capsule at <code>gemini://</code> with a self-signed
+    certificate the site generates once and keeps. Gemini clients remember the
+    certificate on their first visit, so a new one makes every visitor's client warn.
+    {% if geminiCertificate and geminiCertificate.ok %}
+      <span class="block mt-1">SHA-256 fingerprint:
+        <code class="break-all">{{ geminiCertificate.certificate.fingerprint256 }}</code></span>
+    {% elif geminiCertificate %}
+      <span class="block mt-1 text-error">{{ geminiCertificate.problem }}</span>
+    {% endif %}
+  {% endset %}
+  {{ field.checkbox('settings-gemini', fields.gemini, 'Serve over Gemini',
+       checked=form.gemini, hintHtml=geminiHint) }}
 {% endblock %}

package/admin/pages/users/writing-goals.njk

@@ -0,0 +1,64 @@
+{% extends "layouts/shell.njk" %}
+{% import "components/fields.njk" as field %}
+{% from "components/button.njk" import button %}
+{% from "components/card.njk" import card %}
+
+{% block title %}Writing goals{% endblock %}
+
+{% block content %}
+  <h1 class="mb-6 text-2xl font-bold">Writing goals</h1>
+
+  <div class="flex max-w-2xl flex-col gap-6">
+  {% if hasProblems %}
+    {% call field.summary('Nothing was saved. Fix the fields marked below and save again.') %}
+      {{ field.problem('goal-words', problems.words) }}
+      {{ field.problem('goal-period', problems.period) }}
+      {{ field.problem('streak-daily-words', problems.dailyWords) }}
+      {{ field.problem('streak-misses-allowed', problems.missesAllowed) }}
+    {% endcall %}
+  {% endif %}
+
+  {% call card() %}
+  <form method="post" action="{{ formUrl }}">
+    <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+
+    <p class="text-sm">
+      The site counts the words you write in the editor whether or not you
+      track a goal. Tracking shows your progress and your streak on the
+      dashboard. Turning it off keeps your goal for when you turn it on again.
+    </p>
+
+    {{ field.checkbox('writing-tracking', fields.tracking, 'Track writing goals', checked=form.tracking,
+         hint=('Save to set your goal.' if not form.tracking else '')) }}
+
+    {% if form.tracking or hasProblems %}
+      <h2 class="mt-4 font-semibold">Goal</h2>
+      {{ field.text('goal-words', fields.words, 'Words', form.words, type='number', min='1', step='1',
+           inputmode='numeric', error=problems.words) }}
+      {% call field.select('goal-period', fields.period, 'Every', error=problems.period) %}
+        {% for period in periods %}
+          <option value="{{ period.value }}"{% if period.chosen %} selected{% endif %}>{{ period.label }}</option>
+        {% endfor %}
+      {% endcall %}
+
+      <h2 class="mt-4 font-semibold">Streak</h2>
+      {% set dailyHint %}
+        A day keeps your streak when you write at least this many words. Leave
+        it empty to use your goal's daily pace{% if paceWords %} ({{ paceWords }} words){% endif %}.
+      {% endset %}
+      {{ field.text('streak-daily-words', fields.dailyWords, 'Words a day', form.dailyWords, type='number',
+           min='1', step='1', inputmode='numeric', error=problems.dailyWords, hintHtml=dailyHint) }}
+      {% set missesHint %}
+        How many missed days in a row your streak survives, from 0 to {{ maxMissesAllowed }}.
+        With 1, missing a day is fine and missing two in a row ends it.
+      {% endset %}
+      {{ field.text('streak-misses-allowed', fields.missesAllowed, 'Missed days allowed', form.missesAllowed,
+           type='number', min='0', step='1', inputmode='numeric', error=problems.missesAllowed,
+           hintHtml=missesHint) }}
+    {% endif %}
+
+    <div class="mt-4">{{ button('Save writing goals', type='submit', color='primary') }}</div>
+  </form>
+  {% endcall %}
+  </div>
+{% endblock %}

package/admin/static/admin.css

@@ -7275,6 +7275,10 @@
     margin-bottom: calc(var(--spacing) * 10);
   }
 
+  .ml-3 {
+    margin-left: calc(var(--spacing) * 3);
+  }
+
   .box-content {
     box-sizing: content-box;
   }
@@ -7884,7 +7888,7 @@
     stroke: var(--color-base-100);
   }
 
-  .stroke-base-content\/10 {
+  .stroke-base-content, .stroke-base-content\/10 {
     stroke: var(--color-base-content);
   }