@rmdes/indiekit-endpoint-microsub 1.0.0-beta.4 → 1.0.0-beta.6

package/locales/en.json

@@ -9,6 +9,7 @@
     },
     "channels": {
       "title": "Channels",
+      "name": "Channel name",
       "new": "New channel",
       "create": "Create channel",
       "delete": "Delete channel",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-microsub",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "description": "Microsub endpoint for Indiekit. Enables subscribing to feeds and reading content using the Microsub protocol.",
   "keywords": [
     "indiekit",

package/views/channel-new.njk

@@ -3,21 +3,17 @@
 {% block content %}
   <div class="channel-new">
     <a href="{{ baseUrl }}/channels" class="back-link">
-      {{ icon("arrow-left") }} {{ __("microsub.channels.title") }}
+      {{ icon("previous") }} {{ __("microsub.channels.title") }}
     </a>
 
     <form method="post" action="{{ baseUrl }}/channels/new">
-      {{ field({
-        label: {
-          text: __("microsub.channels.new")
-        },
-        input: {
-          id: "name",
-          name: "name",
-          required: true,
-          autocomplete: "off",
-          autofocus: true
-        }
+      {{ input({
+        id: "name",
+        name: "name",
+        label: __("microsub.channels.name"),
+        required: true,
+        autocomplete: "off",
+        attributes: { autofocus: true }
       }) }}
 
       <div class="button-group">

package/views/channel.njk

@@ -4,11 +4,11 @@
   <div class="channel">
     <header class="channel__header">
       <a href="{{ baseUrl }}/channels" class="back-link">
-        {{ icon("arrow-left") }} {{ __("microsub.channels.title") }}
+        {{ icon("previous") }} {{ __("microsub.channels.title") }}
       </a>
       <div class="channel__actions">
         <a href="{{ baseUrl }}/channels/{{ channel.uid }}/settings" class="button button--secondary button--small">
-          {{ icon("settings") }} {{ __("microsub.channels.settings") }}
+          {{ icon("updatePost") }} {{ __("microsub.channels.settings") }}
         </a>
       </div>
     </header>
@@ -24,12 +24,12 @@
     <nav class="timeline__paging" aria-label="Pagination">
       {% if paging.before %}
       <a href="?before={{ paging.before }}" class="button button--secondary">
-        {{ icon("arrow-left") }} {{ __("microsub.reader.newer") }}
+        {{ icon("previous") }} {{ __("microsub.reader.newer") }}
       </a>
       {% endif %}
       {% if paging.after %}
       <a href="?after={{ paging.after }}" class="button button--secondary">
-        {{ __("microsub.reader.older") }} {{ icon("arrow-right") }}
+        {{ __("microsub.reader.older") }} {{ icon("next") }}
       </a>
       {% endif %}
     </nav>

package/views/compose.njk

@@ -3,7 +3,7 @@
 {% block content %}
   <div class="compose">
     <a href="{{ baseUrl }}/channels" class="back-link">
-      {{ icon("arrow-left") }} {{ __("Back") }}
+      {{ icon("previous") }} {{ __("Back") }}
     </a>
 
     {% if replyTo %}
@@ -14,7 +14,7 @@
 
     {% if likeOf %}
     <div class="compose__context">
-      {{ icon("heart") }} {{ __("microsub.compose.likeOf") }}: <a href="{{ likeOf }}">{{ likeOf }}</a>
+      {{ icon("like") }} {{ __("microsub.compose.likeOf") }}: <a href="{{ likeOf }}">{{ likeOf }}</a>
     </div>
     {% endif %}
 
@@ -37,14 +37,11 @@
 
       {% if not likeOf and not repostOf %}
       {{ textarea({
-        label: {
-          text: __("microsub.compose.content"),
-          classes: "label--visuallyhidden"
-        },
+        label: __("microsub.compose.content"),
         id: "content",
         name: "content",
         rows: 5,
-        autofocus: true
+        attributes: { autofocus: true }
       }) }}
       {% endif %}
 

package/views/item.njk

@@ -3,7 +3,7 @@
 {% block content %}
   <article class="item">
     <a href="{{ baseUrl }}/channels" class="back-link">
-      {{ icon("arrow-left") }} {{ __("Back") }}
+      {{ icon("previous") }} {{ __("Back") }}
     </a>
 
     {% if item.author %}
@@ -56,7 +56,7 @@
       <p>{{ icon("reply") }} {{ __("Reply to") }}: <a href="{{ item.inReplyTo[0] }}">{{ item.inReplyTo[0] }}</a></p>
       {% endif %}
       {% if item.likeOf %}
-      <p>{{ icon("heart") }} {{ __("Liked") }}: <a href="{{ item.likeOf[0] }}">{{ item.likeOf[0] }}</a></p>
+      <p>{{ icon("like") }} {{ __("Liked") }}: <a href="{{ item.likeOf[0] }}">{{ item.likeOf[0] }}</a></p>
       {% endif %}
       {% if item.repostOf %}
       <p>{{ icon("repost") }} {{ __("Reposted") }}: <a href="{{ item.repostOf[0] }}">{{ item.repostOf[0] }}</a></p>
@@ -72,13 +72,13 @@
         {{ icon("reply") }} {{ __("microsub.item.reply") }}
       </a>
       <a href="{{ baseUrl }}/compose?likeOf={{ item.url | urlencode }}" class="button button--secondary button--small">
-        {{ icon("heart") }} {{ __("microsub.item.like") }}
+        {{ icon("like") }} {{ __("microsub.item.like") }}
       </a>
       <a href="{{ baseUrl }}/compose?repostOf={{ item.url | urlencode }}" class="button button--secondary button--small">
         {{ icon("repost") }} {{ __("microsub.item.repost") }}
       </a>
       <a href="{{ item.url }}" class="button button--secondary button--small" target="_blank" rel="noopener">
-        {{ icon("external") }} {{ __("microsub.item.viewOriginal") }}
+        {{ icon("public") }} {{ __("microsub.item.viewOriginal") }}
       </a>
     </footer>
   </article>

package/views/partials/actions.njk

@@ -4,12 +4,12 @@
     {{ icon("reply") }}
   </a>
   <a href="{{ baseUrl }}/compose?likeOf={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.like') }}">
-    {{ icon("heart") }}
+    {{ icon("like") }}
   </a>
   <a href="{{ baseUrl }}/compose?repostOf={{ itemUrl | urlencode }}" class="item-actions__button" title="{{ __('microsub.item.repost') }}">
     {{ icon("repost") }}
   </a>
   <a href="{{ itemUrl }}" class="item-actions__button" target="_blank" rel="noopener" title="{{ __('microsub.item.viewOriginal') }}">
-    {{ icon("external") }}
+    {{ icon("public") }}
   </a>
 </div>

package/views/partials/item-card.njk

@@ -18,7 +18,7 @@
     {% if item._type and item._type !== "entry" %}
     <div class="item-card__type">
       {% if item._type === "like" %}
-      {{ icon("heart") }} Liked
+      {{ icon("like") }} Liked
       {% elif item._type === "repost" %}
       {{ icon("repost") }} Reposted
       {% elif item._type === "reply" %}
@@ -58,7 +58,7 @@
       </time>
       {% endif %}
       {% if not item._is_read %}
-      <span class="item-card__unread">{{ icon("dot") }}</span>
+      <span class="item-card__unread" aria-label="Unread">●</span>
       {% endif %}
     </footer>
   </a>

package/views/reader.njk

@@ -9,7 +9,7 @@
         <a href="{{ baseUrl }}/channels/{{ channel.uid }}" class="reader__channel-link">
           <span class="reader__channel-name">
             {% if channel.uid === "notifications" %}
-            {{ icon("bell") }}
+            {{ icon("mention") }}
             {% endif %}
             {{ channel.name }}
           </span>
@@ -22,7 +22,7 @@
     </ul>
     <p class="reader__actions">
       <a href="{{ baseUrl }}/channels/new" class="button button--secondary">
-        {{ icon("plus") }} {{ __("microsub.channels.new") }}
+        {{ icon("createPost") }} {{ __("microsub.channels.new") }}
       </a>
     </p>
     {% else %}

package/views/settings.njk

@@ -3,69 +3,47 @@
 {% block content %}
   <div class="settings">
     <a href="{{ baseUrl }}/channels/{{ channel.uid }}" class="back-link">
-      {{ icon("arrow-left") }} {{ channel.name }}
+      {{ icon("previous") }} {{ channel.name }}
     </a>
 
     <form method="post" action="{{ baseUrl }}/channels/{{ channel.uid }}/settings">
-      {{ fieldset({
-        legend: {
-          text: __("microsub.settings.excludeTypes"),
-          classes: "fieldset__legend--medium"
-        },
-        hint: {
-          text: __("microsub.settings.excludeTypesHelp")
+      {{ checkboxes({
+        name: "excludeTypes",
+        values: channel.settings.excludeTypes,
+        fieldset: {
+          legend: __("microsub.settings.excludeTypes")
         },
+        hint: __("microsub.settings.excludeTypesHelp"),
         items: [
           {
-            id: "excludeTypes-like",
-            name: "excludeTypes",
-            value: "like",
-            text: __("microsub.settings.types.like"),
-            checked: channel.settings.excludeTypes | includes("like")
+            label: __("microsub.settings.types.like"),
+            value: "like"
           },
           {
-            id: "excludeTypes-repost",
-            name: "excludeTypes",
-            value: "repost",
-            text: __("microsub.settings.types.repost"),
-            checked: channel.settings.excludeTypes | includes("repost")
+            label: __("microsub.settings.types.repost"),
+            value: "repost"
           },
           {
-            id: "excludeTypes-bookmark",
-            name: "excludeTypes",
-            value: "bookmark",
-            text: __("microsub.settings.types.bookmark"),
-            checked: channel.settings.excludeTypes | includes("bookmark")
+            label: __("microsub.settings.types.bookmark"),
+            value: "bookmark"
           },
           {
-            id: "excludeTypes-reply",
-            name: "excludeTypes",
-            value: "reply",
-            text: __("microsub.settings.types.reply"),
-            checked: channel.settings.excludeTypes | includes("reply")
+            label: __("microsub.settings.types.reply"),
+            value: "reply"
           },
           {
-            id: "excludeTypes-checkin",
-            name: "excludeTypes",
-            value: "checkin",
-            text: __("microsub.settings.types.checkin"),
-            checked: channel.settings.excludeTypes | includes("checkin")
+            label: __("microsub.settings.types.checkin"),
+            value: "checkin"
           }
         ]
-      }) | checkboxes }}
+      }) }}
 
-      {{ field({
-        label: {
-          text: __("microsub.settings.excludeRegex")
-        },
-        hint: {
-          text: __("microsub.settings.excludeRegexHelp")
-        },
-        input: {
-          id: "excludeRegex",
-          name: "excludeRegex",
-          value: channel.settings.excludeRegex
-        }
+      {{ input({
+        id: "excludeRegex",
+        name: "excludeRegex",
+        label: __("microsub.settings.excludeRegex"),
+        hint: __("microsub.settings.excludeRegexHelp"),
+        value: channel.settings.excludeRegex
       }) }}
 
       <div class="button-group">