all repos — archive/homestead @ 529946dc5bdccc2153c97e2040953047319480f4

My future indieweb platform

Add tags listing
Alan Pearce alan@alanpearce.eu
Tue, 03 Oct 2017 17:28:29 +0200
commit

529946dc5bdccc2153c97e2040953047319480f4

parent

ad56116d0df26b4a6fe7f9cd04a21965d3184af5

7 files changed, 172 insertions(+), 4 deletions(-)

jump to
M src/actions.js → src/actions.js
@@ -50,6 +50,14 @@ responder(ctx, config, { post });   };
 }
 
+function tags(config, responder, tags) {
+  return async function(ctx, next) {
+    responder(ctx, config, {
+      tags: tags.keys()
+    });
+  };
+}
+
 function tag(config, responder, items) {
   return async function(ctx, next) {
     const tag = ctx.params.name;
@@ -77,6 +85,7 @@ home,   posts,
   highlightTheme,
   post,
+  tags,
   tag,
   serveFiles
 };
M src/app.js → src/app.js
@@ -53,6 +53,8 @@ "/post/:filename",     actions.post(config, responders.post, Posts.posts)
   );
 
+  router.get("tags", "/tag", actions.tags(config, responders.tags, Posts.tags));
+
   router.get(
     "tag",
     "/tag/:name",
M src/responders.js → src/responders.js
@@ -27,7 +27,9 @@ const postIndentLevel =   baseIndentLevel + getTemplateIndent(findPostContent, "post.html");
 
 function indentForTemplate(text, indentLevel = 0) {
-  return indent(text, indentLevel).slice(indentLevel).replace(/\n+$/, "");
+  return indent(text, indentLevel)
+    .slice(indentLevel)
+    .replace(/\n+$/, "");
 }
 
 function templateReader(template, indentLevel) {
@@ -39,6 +41,7 @@ layout: templateReader("layout.html"),   home: templateReader("home.html", baseIndentLevel),
   post: templateReader("post.html", baseIndentLevel),
   list: templateReader("list.html", baseIndentLevel),
+  tags: templateReader("tags.html", baseIndentLevel),
   feed: templateReader("feed.xml")
 };
 
@@ -131,6 +134,23 @@ config,       Case.title(listName),
       hyperfast(templates.list, {
         ".h-entry": posts.map(renderPost(ctx))
+      })
+    );
+  },
+
+  tags(ctx, config, { tags }) {
+    ctx.type = "html";
+
+    ctx.body = layout(
+      config,
+      "Tags",
+      hyperfast(templates.tags, {
+        ".tag": Array.from(tags).map(tag => ({
+          ".u-url": {
+            href: ctx.getURL("tag", tag),
+            _text: Case.title(tag)
+          }
+        }))
       })
     );
   },
A src/templates/tags.html
@@ -0,0 +1,5 @@+<ul class="tags">
+  <li class="tag h-feed">
+    <a class="u-url p-name" href="/">Tag</a>
+  </li>
+</ul>
M test/app.test.js → test/app.test.js
@@ -45,8 +45,20 @@ const $ = parseResponse(res); 
   t.is($("head > title").text(), "John Doe", "head title is site author");
   t.is($("main").length, 1, "only one <main> tag");
-  t.is($("nav a").first().text(), "Home", "nav link has text");
-  t.is($("nav a").first().attr("href"), "/", "nav links to homepage");
+  t.is(
+    $("nav a")
+      .first()
+      .text(),
+    "Home",
+    "nav link has text"
+  );
+  t.is(
+    $("nav a")
+      .first()
+      .attr("href"),
+    "/",
+    "nav links to homepage"
+  );
   t.is(
     $("a[rel=me]").length,
     2,
@@ -131,6 +143,41 @@ t.snapshot(data, "should contain relevant microformats data"); });
 
 test("tags", async function(t) {
+  const res = await request(app.listen()).get("/tag");
+
+  t.is(res.statusCode, 200);
+  t.is(res.type, "text/html");
+  t.is(res.charset, "utf-8");
+  t.regex(res.text, /^<!DOCTYPE html>/);
+
+  const $ = parseResponse(res);
+
+  t.is(
+    $("head > title").text(),
+    "Tags · John Doe",
+    "head title contains 'Tags' and site name"
+  );
+
+  t.is($(".tags > .tag").length, 2, "lists two tags");
+
+  t.is(
+    $(".tag .p-name")
+      .first()
+      .text(),
+    "A",
+    "sets tag text"
+  );
+
+  t.is(
+    $(".tag .u-url")
+      .first()
+      .attr("href"),
+    "/tag/a",
+    "sets tag link"
+  );
+});
+
+test("tag", async function(t) {
   const res = await request(app.listen()).get("/tag/a");
 
   t.is(res.statusCode, 200);
M test/snapshots/app.test.js.md → test/snapshots/app.test.js.md
@@ -332,4 +332,89 @@ stylesheet: [           '/css/code.css',
         ],
       },
-    }
+    
+
+## tag
+
+> should contain relevant microformats data
+
+    {
+      items: [
+        {
+          properties: {
+            name: [
+              'John Doe',
+            ],
+            note: [
+              'Nobody in particular',
+            ],
+            photo: [
+              '/static/johndoe.jpg',
+            ],
+            url: [
+              '/',
+            ],
+          },
+          type: [
+            'h-card',
+          ],
+        },
+        {
+          children: [
+            {
+              properties: {
+                name: [
+                  'This is a test',
+                ],
+                published: [
+                  '2017-01-01T00:00:00.000Z',
+                ],
+                url: [
+                  '/post/testfile',
+                ],
+              },
+              type: [
+                'h-entry',
+              ],
+              value: 'This is a test Sunday, January 1, 2017',
+            },
+          ],
+          properties: {
+            name: [
+              'A · John Doe',
+            ],
+          },
+          type: [
+            'h-feed',
+          ],
+        },
+      ],
+      'rel-urls': {
+        '/css/code.css': {
+          rels: [
+            'stylesheet',
+          ],
+        },
+        'https://twitter.com/johndoe': {
+          rels: [
+            'me',
+          ],
+          text: 'Twitter',
+        },
+        'mailto:johndoe@johndoe.org': {
+          rels: [
+            'me',
+          ],
+          text: 'johndoe@johndoe.org',
+        },
+      },
+      rels: {
+        me: [
+          'mailto:johndoe@johndoe.org',
+          'https://twitter.com/johndoe',
+        ],
+        stylesheet: [
+          '/css/code.css',
+        ],
+      },
+    }