From 94213c6e11dbd23130ef2eafc93c678166ace949 Mon Sep 17 00:00:00 2001 From: Marc Pervaz Boocha Date: Tue, 27 Dec 2022 15:45:56 +0530 Subject: Long List of items. On branch main Your branch is up to date with 'origin/main'. You are currently rebasing. Changes to be committed: deleted: .browserslistrc deleted: .eleventy.js deleted: .eslintrc.js modified: .gitignore deleted: .stylelintrc.json deleted: .vscode/tasks.json deleted: _headers modified: assets/index.js modified: assets/sw.js renamed: gen-icons.sh -> deploy new file: eleventy.config.js new file: license modified: package-lock.json modified: package.json renamed: src/data/env.js -> src/_data/env.js renamed: src/data/metadata.js -> src/_data/metadata.js new file: src/_includes/base.njk new file: src/_includes/page.njk new file: src/_includes/post.njk deleted: src/about.md new file: src/about.njk deleted: src/blog.11ty.js new file: src/blog.njk deleted: src/gen/atom.11ty.js new file: src/gen/atom.njk deleted: src/gen/error.11ty.js new file: src/gen/error.njk new file: src/gen/feedjson.11ty.js modified: src/gen/gen.11tydata.js deleted: src/gen/json.11ty.js modified: src/gen/metadata.11ty.js deleted: src/gen/robot.11ty.js new file: src/gen/robot.njk deleted: src/gen/sitemap.11ty.js new file: src/gen/sitemap.njk renamed: src/index.md -> src/index.njk deleted: src/layouts/base.11ty.js deleted: src/layouts/page.11ty.js deleted: src/layouts/post.11ty.js --- src/gen/atom.11ty.js | 30 ------------------------------ src/gen/atom.njk | 27 +++++++++++++++++++++++++++ src/gen/error.11ty.js | 21 --------------------- src/gen/error.njk | 13 +++++++++++++ src/gen/feedjson.11ty.js | 35 +++++++++++++++++++++++++++++++++++ src/gen/gen.11tydata.js | 5 +++-- src/gen/json.11ty.js | 28 ---------------------------- src/gen/metadata.11ty.js | 12 +++++------- src/gen/robot.11ty.js | 13 ------------- src/gen/robot.njk | 6 ++++++ src/gen/sitemap.11ty.js | 17 ----------------- src/gen/sitemap.njk | 12 ++++++++++++ 12 files changed, 101 insertions(+), 118 deletions(-) delete mode 100644 src/gen/atom.11ty.js create mode 100644 src/gen/atom.njk delete mode 100644 src/gen/error.11ty.js create mode 100644 src/gen/error.njk create mode 100644 src/gen/feedjson.11ty.js delete mode 100644 src/gen/json.11ty.js delete mode 100644 src/gen/robot.11ty.js create mode 100644 src/gen/robot.njk delete mode 100644 src/gen/sitemap.11ty.js create mode 100644 src/gen/sitemap.njk (limited to 'src/gen') diff --git a/src/gen/atom.11ty.js b/src/gen/atom.11ty.js deleted file mode 100644 index 0184018..0000000 --- a/src/gen/atom.11ty.js +++ /dev/null @@ -1,30 +0,0 @@ -module.exports = class { - async data() { - return { - permalink: "/feed.xml" - }; - } - - async render(data) { - return ` - - ${data.metadata.title} - ${data.metadata.description} - - - ${this.getNewestCollectionItemDate((data.collections.posts) || []).toISOString()} - ${data.metadata.url} - - ${data.metadata.author.name} - ${data.metadata.author.email} - - ${(await Promise.all((data.collections.posts || []).map(async post => ` - ${post.data.title} - - ${post.date.toISOString()} - ${new URL(post.url, data.metadata.url)} - - `))).join()} - `; - } -}; diff --git a/src/gen/atom.njk b/src/gen/atom.njk new file mode 100644 index 0000000..a603195 --- /dev/null +++ b/src/gen/atom.njk @@ -0,0 +1,27 @@ +--- +permalink: "/feed.xml" +--- + + + {{ metadata.title }} + ${data.metadata.description} + {% set absoluteUrl %}{{ metadata.feed.path | url | absoluteUrl(metadata.url) }}{% endset %} + + + {{ collections.posts | getNewestCollectionItemDate | dateToRfc3339 }} + {{ metadata.feed.id }} + + {{ metadata.author.name }} + {{ metadata.author.email }} + + {% for post in collections.posts | reverse %} + {% set absolutePostUrl %}{{ post.url | absoluteUrl(metadata.url) }}{% endset %} + + {{ post.data.title }} + + {{ post.date | dateToRfc3339 }} + {{ absolutePostUrl }} + {{ post.templateContent | htmlToAbsoluteUrls(absolutePostUrl) }} + + {% endfor %} + diff --git a/src/gen/error.11ty.js b/src/gen/error.11ty.js deleted file mode 100644 index 6c7105e..0000000 --- a/src/gen/error.11ty.js +++ /dev/null @@ -1,21 +0,0 @@ -module.exports = class { - data() { - return { - layout: "base", - pagination: { - data: "err", - size: 1, - }, - err: { - offline: "The Page is offline", - 404: "Not Found" - }, - permalink: data => `/${data.pagination.items}.html` - }; - } - - render(data) { - return `

ERROR: ${data.pagination.items}

-

${data.err[data.pagination.items]}

`; - } -}; diff --git a/src/gen/error.njk b/src/gen/error.njk new file mode 100644 index 0000000..dc5599c --- /dev/null +++ b/src/gen/error.njk @@ -0,0 +1,13 @@ +--- +layout: base +pagination: + data: err + size: 1 +err: + offline: The Page is offline + 404: Not Found +permalink: "/{{pagination.items}}.html" +--- + +

ERROR: {{pagination.items}}

+

{{err[pagination.items]}}

diff --git a/src/gen/feedjson.11ty.js b/src/gen/feedjson.11ty.js new file mode 100644 index 0000000..7ddbf51 --- /dev/null +++ b/src/gen/feedjson.11ty.js @@ -0,0 +1,35 @@ +module.exports = class { + data() { + return { + permalink: "/feed.json" + }; + } + + async render(data) { + const out = { + version: "https://jsonfeed.org/version/1.1", + title: data.metadata.title, + language: data.metadata.language, + home_page_url: data.metadata.url, + feed_url: data.page.url, + description: data.metadata.description, + author: { + name: data.metadata.author.name, + url: data.metadata.author.url + }, + items: (data.collections.posts || []).map( + async function (e) { + const absolutePostUrl = this.absoluteUrl(this.url(e.url), data.metadata.url) + return { + id: absolutePostUrl, + url: absolutePostUrl, + title: e.data.title, + date_published: this.dateToRfc3339(e.date), + content_html: htmlToAbsoluteUrls(e.templateContent, absolutePostUrl), + } + } + ) + } + return JSON.stringify(out) + } +} diff --git a/src/gen/gen.11tydata.js b/src/gen/gen.11tydata.js index 52b6ced..5694649 100644 --- a/src/gen/gen.11tydata.js +++ b/src/gen/gen.11tydata.js @@ -2,7 +2,8 @@ const path = require("path"); module.exports = { eleventyExcludeFromCollections: true, + permalink: false, eleventyComputed: { - permalink: data => data.permalink || `/${path.relative("/gen", data.page.filePathStem)}.${data.page.outputFileExtension}` + //permalink: data => data.permalink || `/${path.relative("/gen", data.page.filePathStem)}.${data.page.outputFileExtension}` } -}; \ No newline at end of file +} diff --git a/src/gen/json.11ty.js b/src/gen/json.11ty.js deleted file mode 100644 index 017b69c..0000000 --- a/src/gen/json.11ty.js +++ /dev/null @@ -1,28 +0,0 @@ -module.exports = class { - async data() { - return { - permalink: "/feed.json" - }; - } - - async render(data) { - return JSON.stringify({ - version: "https://jsonfeed.org/version/1.1", - title: data.metadata.title, - language: data.metadata.language, - home_page_url: data.metadata.url, - feed_url: new URL(data.page.url, data.metadata.url), - description: data.metadata.description, - author: { - name: data.metadata.author.name - }, - items: await Promise.all((data.collections.posts || []).map(async post => ({ - id: new URL(post.url, data.metadata.url), - url: new URL(post.url, data.metadata.url), - title: new URL(post.url, data.metadata.url), - content_html: await this.convertHtmlToAbsoluteUrls(post.templateContent, new URL(post.url, data.metadata.url)), - date_published: post.date.toISOString() - })).reverse()) - }); - } -}; \ No newline at end of file diff --git a/src/gen/metadata.11ty.js b/src/gen/metadata.11ty.js index 87d7997..56bf6af 100644 --- a/src/gen/metadata.11ty.js +++ b/src/gen/metadata.11ty.js @@ -1,15 +1,13 @@ module.exports = class { data() { return { - permalink: "/assets/metadata.js" + //permalink: "/assets/metadata.js" + permalink: false }; } render() { - const obj = JSON.stringify({ - version: new Date().toISOString() - }); - return `const obj = '${obj}' - export default () => JSON.parse(obj);`; + const date = new Date() + return `export default = ${date.toISOString()}` } -}; \ No newline at end of file +}; diff --git a/src/gen/robot.11ty.js b/src/gen/robot.11ty.js deleted file mode 100644 index 289d3b6..0000000 --- a/src/gen/robot.11ty.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = class { - data() { - return { - permalink: "/robot.txt" - }; - } - - render(data) { - return `User-agent: * - Disallow: - Sitemap: ${new URL("/sitemap.xml",data.metadata.url)}`; - } -}; \ No newline at end of file diff --git a/src/gen/robot.njk b/src/gen/robot.njk new file mode 100644 index 0000000..faf9e2f --- /dev/null +++ b/src/gen/robot.njk @@ -0,0 +1,6 @@ +--- +permalink: /robot.txt +--- +User-agent: * +Disallow: +Sitemap: {{ "/sitemap.xml" | absoluteUrl(data.metadata.url)}} diff --git a/src/gen/sitemap.11ty.js b/src/gen/sitemap.11ty.js deleted file mode 100644 index 02b285f..0000000 --- a/src/gen/sitemap.11ty.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = class { - data() { - return { - permalink: "/sitemap.xml" - }; - } - - render(data) { - return ` - - ${(data.collections.all || []).map(page => ` - ${new URL(page.url, data.metadata.url)} - ${page.date.toISOString()} - `).join()} - `; - } -}; diff --git a/src/gen/sitemap.njk b/src/gen/sitemap.njk new file mode 100644 index 0000000..c2030de --- /dev/null +++ b/src/gen/sitemap.njk @@ -0,0 +1,12 @@ +--- +permalink: "/sitemap.xml" +--- + + +{% for page in collections.all %} + + {{ page.url | absoluteUrl(metadata.url) }} + {{ page.date | htmlDateString }} + +{% endfor %} + -- cgit v1.2.3-70-g09d2