From 93e75949e9a2861f651e2a3602e08e9b25cf47c4 Mon Sep 17 00:00:00 2001 From: Marc Pervaz Boocha Date: Thu, 16 Feb 2023 22:57:52 +0530 Subject: Move to Server Side Render with expressjs Backend Rewritten in typescript Signed-off-by: Marc Pervaz Boocha On branch main Your branch is up to date with 'origin/main'. Changes to be committed: new file: .editorconfig modified: .gitignore new file: Containerfile renamed: favicon/icon.svg -> assets/favicon.svg modified: assets/index.css deleted: assets/index.js deleted: assets/mandle.png deleted: assets/sw.js new file: assets/syntax.css modified: deploy deleted: eleventy.config.js deleted: favicon/192.png deleted: favicon/512.png deleted: favicon/icon.ico deleted: license modified: package-lock.json modified: package.json deleted: src/_data/env.js deleted: src/_data/metadata.js deleted: src/_includes/base.njk deleted: src/_includes/page.njk deleted: src/_includes/post.njk deleted: src/about.njk deleted: src/blog.njk new file: src/client/index.ts deleted: src/gen/atom.njk deleted: src/gen/error.njk deleted: src/gen/feedjson.11ty.js deleted: src/gen/gen.11tydata.js deleted: src/gen/manifest.11ty.js deleted: src/gen/metadata.11ty.js deleted: src/gen/robot.njk deleted: src/gen/sitemap.njk deleted: src/index.njk deleted: src/post/post.11tydata.js new file: src/server/app.ts new file: src/server/build.ts new file: src/server/content/about.ts new file: src/server/content/blog.ts new file: src/server/content/feed.ts new file: src/server/content/index.ts new file: src/server/content/robots.ts new file: src/server/content/sitemap.ts new file: src/server/content/webmanifest.ts new file: src/server/errHanadler.ts new file: src/server/img.ts new file: src/server/metadata.ts new file: src/server/router.ts new file: src/server/server.ts new file: src/server/template/Base.ts new file: src/server/template/Page.ts new file: src/server/template/Post.ts new file: src/server/template/atom.ts new file: src/server/template/header.ts new file: src/server/template/html.ts new file: src/server/template/sitemap.ts new file: src/server/template/syntax.ts new file: src/server/template/table.ts new file: src/server/template/vdom.ts new file: src/server/template/xml.ts new file: src/server/utils/createUrl.ts new file: src/server/utils/curl.ts new file: src/server/utils/isDefined.ts new file: src/server/utils/isDevel.ts new file: src/server/utils/relDir.ts new file: src/server/utils/relUrl.ts new file: src/server/utils/schema.ts new file: src/server/utils/setStingRoute.ts new file: src/server/utils/strHandler.ts new file: src/worker/sw.ts new file: src/worker/tsconfig.json new file: tsconfig.json --- src/gen/atom.njk | 27 --------------------------- src/gen/error.njk | 13 ------------- src/gen/feedjson.11ty.js | 35 ----------------------------------- src/gen/gen.11tydata.js | 9 --------- src/gen/manifest.11ty.js | 28 ---------------------------- src/gen/metadata.11ty.js | 13 ------------- src/gen/robot.njk | 6 ------ src/gen/sitemap.njk | 12 ------------ 8 files changed, 143 deletions(-) delete mode 100644 src/gen/atom.njk delete mode 100644 src/gen/error.njk delete mode 100644 src/gen/feedjson.11ty.js delete mode 100644 src/gen/gen.11tydata.js delete mode 100644 src/gen/manifest.11ty.js delete mode 100644 src/gen/metadata.11ty.js delete mode 100644 src/gen/robot.njk delete mode 100644 src/gen/sitemap.njk (limited to 'src/gen') diff --git a/src/gen/atom.njk b/src/gen/atom.njk deleted file mode 100644 index a603195..0000000 --- a/src/gen/atom.njk +++ /dev/null @@ -1,27 +0,0 @@ ---- -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.njk b/src/gen/error.njk deleted file mode 100644 index dc5599c..0000000 --- a/src/gen/error.njk +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 deleted file mode 100644 index 7ddbf51..0000000 --- a/src/gen/feedjson.11ty.js +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 5694649..0000000 --- a/src/gen/gen.11tydata.js +++ /dev/null @@ -1,9 +0,0 @@ -const path = require("path"); - -module.exports = { - eleventyExcludeFromCollections: true, - permalink: false, - eleventyComputed: { - //permalink: data => data.permalink || `/${path.relative("/gen", data.page.filePathStem)}.${data.page.outputFileExtension}` - } -} diff --git a/src/gen/manifest.11ty.js b/src/gen/manifest.11ty.js deleted file mode 100644 index e41df83..0000000 --- a/src/gen/manifest.11ty.js +++ /dev/null @@ -1,28 +0,0 @@ -module.exports = class { - data() { - return { - permalink: "/app.webmanifest" - }; - } - - render(data) { - return JSON.stringify({ - $schema: "https://json.schemastore.org/web-manifest-combined.json", - name: data.metadata.title, - lang: data.metadata.language, - start_url: "/", - id: "/", - scope: "/", - display: "minimal-ui", - background_color: data.metadata.theme, - theme_color: data.metadata.theme, - description: data.metadata.description, - icons: [192, 512, 1024].map(size => ({ - src: `/favicon/${size}.png`, - type: "image/png", - sizes: `${size}x${size}`, - purpose: "maskable" - })) - }); - } -}; \ No newline at end of file diff --git a/src/gen/metadata.11ty.js b/src/gen/metadata.11ty.js deleted file mode 100644 index 56bf6af..0000000 --- a/src/gen/metadata.11ty.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = class { - data() { - return { - //permalink: "/assets/metadata.js" - permalink: false - }; - } - - render() { - const date = new Date() - return `export default = ${date.toISOString()}` - } -}; diff --git a/src/gen/robot.njk b/src/gen/robot.njk deleted file mode 100644 index faf9e2f..0000000 --- a/src/gen/robot.njk +++ /dev/null @@ -1,6 +0,0 @@ ---- -permalink: /robot.txt ---- -User-agent: * -Disallow: -Sitemap: {{ "/sitemap.xml" | absoluteUrl(data.metadata.url)}} diff --git a/src/gen/sitemap.njk b/src/gen/sitemap.njk deleted file mode 100644 index c2030de..0000000 --- a/src/gen/sitemap.njk +++ /dev/null @@ -1,12 +0,0 @@ ---- -permalink: "/sitemap.xml" ---- - - -{% for page in collections.all %} - - {{ page.url | absoluteUrl(metadata.url) }} - {{ page.date | htmlDateString }} - -{% endfor %} - -- cgit v1.2.3-70-g09d2