From cd2995d01ac20a14bcec72e083fb186cc368eb88 Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Sat, 18 Sep 2021 12:09:12 -0500 Subject: [PATCH 01/16] Converting site to lume --- .eleventy.js | 211 - .github/workflows/build.yml | 33 + .gitignore | 6 +- .nvmrc | 1 - .vscode/launch.json | 20 +- .vscode/lume_import_map.json | 5 + .vscode/settings.json | 40 +- .vscode/tasks.json | 47 +- README.md | 2 - _config.ts | 31 + content/404.md | 5 +- content/_data/eleventyComputed.js | 44 - content/_data/site.json | 9 - content/_data/site.yml | 8 + content/_includes/docs-toc.html | 4 - content/_includes/layouts/archive.njk | 30 + .../layouts}/content-well.njk | 2 +- .../layouts}/content.njk | 2 +- .../layouts}/default.njk | 7 +- .../{_layouts => _includes/layouts}/docs.njk | 4 +- .../{_layouts => _includes/layouts}/post.njk | 2 +- content/_includes/layouts/tag.njk | 12 + content/_includes/layouts/template/base.njk | 43 + content/_includes/layouts/template/home.njk | 16 + content/_includes/layouts/template/post.njk | 43 + .../{carousel.html => templates/carousel.njk} | 0 content/_includes/templates/docs-toc.njk | 4 + content/_includes/{ => templates}/head.njk | 5 +- .../_includes/{ => templates}/intercom.njk | 0 content/_includes/templates/postslist.njk | 25 + content/about.md | 6 +- content/admin/config.tmpl.js | 88 + content/admin/index.njk | 21 + content/archive.tmpl.js | 28 + content/assets/js/searcher/searcher.js | 231 + content/content.json | 5 - content/docs/_data.yml | 2 + content/docs/docs.json | 4 - content/feed.njk | 30 - content/feed.tmpl.js | 28 + content/feed.xml.njk | 24 + content/{index.html => index.njk} | 9 +- content/{news.html => news.njk} | 1 + ...coming-exceptionless-2-0-simplified-api.md | 3 +- ...g-move-elastic-search-exceptionless-2-0.md | 3 +- content/news/_data.yml | 2 + content/news/news.json | 5 - content/{pricing.html => pricing.njk} | 1 + content/privacy.md | 2 +- content/{_redirects.njk => redirects.njk} | 3 +- content/robots.njk | 7 - content/robots.txt.njk | 3 + content/{search.html => search.njk} | 2 +- content/search.tmpl.js | 22 + content/sitemap.njk | 6 - content/sitemap.xml.njk | 9 + content/tag.tmpl.js | 12 + content/tags.njk | 8 + content/terms.md | 2 +- content/{tour.html => tour.njk} | 1 + content/{why.html => why.njk} | 2 +- m2json.js | 89 - netlify.toml | 9 + new_post.js | 51 - package-lock.json | 9420 ----------------- package.json | 40 - 66 files changed, 820 insertions(+), 10020 deletions(-) delete mode 100644 .eleventy.js create mode 100644 .github/workflows/build.yml delete mode 100644 .nvmrc create mode 100644 .vscode/lume_import_map.json create mode 100644 _config.ts delete mode 100644 content/_data/eleventyComputed.js delete mode 100644 content/_data/site.json create mode 100644 content/_data/site.yml delete mode 100644 content/_includes/docs-toc.html create mode 100644 content/_includes/layouts/archive.njk rename content/{_layouts => _includes/layouts}/content-well.njk (91%) rename content/{_layouts => _includes/layouts}/content.njk (88%) rename content/{_layouts => _includes/layouts}/default.njk (98%) rename content/{_layouts => _includes/layouts}/docs.njk (94%) rename content/{_layouts => _includes/layouts}/post.njk (97%) create mode 100644 content/_includes/layouts/tag.njk create mode 100644 content/_includes/layouts/template/base.njk create mode 100644 content/_includes/layouts/template/home.njk create mode 100644 content/_includes/layouts/template/post.njk rename content/_includes/{carousel.html => templates/carousel.njk} (100%) create mode 100644 content/_includes/templates/docs-toc.njk rename content/_includes/{ => templates}/head.njk (89%) rename content/_includes/{ => templates}/intercom.njk (100%) create mode 100644 content/_includes/templates/postslist.njk create mode 100644 content/admin/config.tmpl.js create mode 100644 content/admin/index.njk create mode 100644 content/archive.tmpl.js create mode 100644 content/assets/js/searcher/searcher.js delete mode 100644 content/content.json create mode 100644 content/docs/_data.yml delete mode 100644 content/docs/docs.json delete mode 100644 content/feed.njk create mode 100644 content/feed.tmpl.js create mode 100644 content/feed.xml.njk rename content/{index.html => index.njk} (98%) rename content/{news.html => news.njk} (97%) create mode 100644 content/news/_data.yml delete mode 100644 content/news/news.json rename content/{pricing.html => pricing.njk} (99%) rename content/{_redirects.njk => redirects.njk} (99%) delete mode 100644 content/robots.njk create mode 100644 content/robots.txt.njk rename content/{search.html => search.njk} (98%) create mode 100644 content/search.tmpl.js delete mode 100644 content/sitemap.njk create mode 100644 content/sitemap.xml.njk create mode 100644 content/tag.tmpl.js create mode 100644 content/tags.njk rename content/{tour.html => tour.njk} (99%) rename content/{why.html => why.njk} (99%) delete mode 100644 m2json.js create mode 100644 netlify.toml delete mode 100644 new_post.js delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/.eleventy.js b/.eleventy.js deleted file mode 100644 index 6aa31755..00000000 --- a/.eleventy.js +++ /dev/null @@ -1,211 +0,0 @@ -const pluginRss = require("@11ty/eleventy-plugin-rss"); -const slugify = require("slugify"); -const embedEverything = require("eleventy-plugin-embed-everything"); -const syntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight"); -const eleventyNavigationPlugin = require("@11ty/eleventy-navigation"); -const path = require('path'); -const sitemap = require("@quasibit/eleventy-plugin-sitemap"); - -module.exports = function (eleventyConfig) { - if(!process.env.ELEVENTY_PRODUCTION) { - eleventyConfig.setQuietMode(true); - } - - eleventyConfig.setBrowserSyncConfig({ - ui: false, - ghostMode: false - }); - - eleventyConfig.addPlugin(pluginRss); - eleventyConfig.addPlugin(embedEverything); - eleventyConfig.addPlugin(syntaxHighlight); - eleventyConfig.addPlugin(eleventyNavigationPlugin); - eleventyConfig.addPlugin(sitemap, { - sitemap: { - hostname: "https://exceptionless.com", - }, - }); - - eleventyConfig.addPassthroughCopy("content/assets"); - eleventyConfig.addPassthroughCopy("content/favicon.ico"); - eleventyConfig.addPassthroughCopy("content/**/*.jpg"); - eleventyConfig.addPassthroughCopy("content/**/*.png"); - eleventyConfig.addPassthroughCopy("content/**/*.gif"); - eleventyConfig.addPassthroughCopy("content/_redirects"); - - eleventyConfig.setDataDeepMerge(true); - - // ------------------------------------------------------------------------ - // Markdown plugins - // ------------------------------------------------------------------------ - - const markdownIt = require('markdown-it'); - - const markdownItOptions = { - html: true, - breaks: true, - linkify: false, - replaceLink: function (link, env) { - const doNothing = ['http://', 'https://', '/', '#', 'mailto:']; - if (doNothing.some((protocol) => link.startsWith(protocol))) - return link; - - let dir = path.dirname(env.page?.filePathStem ?? ''); - let fullPath = dir + '/' + link; - - fullPath = fullPath.replace(/index.md$/, '').replace(/.md$/, '/'); - - return fullPath; - } - }; - - const markdownItFootnote = require('markdown-it-footnote'); - - const markdownItAnchor = require('markdown-it-anchor'); - - const markdownItAnchorOptions = { - permalink: true, - permalinkClass: 'deeplink', - permalinkSymbol: '#', - level: [2, 3, 4], - slugify: function (s) { - return slugify(s, { - replacement: "-", - remove: /[*+~()'"!:@]/g, - lower: true, - strict: true, - }); - }, - }; - - const markdownItAttributes = require('markdown-it-attrs'); - - const markdownItSpan = require('markdown-it-bracketed-spans'); - - const markdownItAlerts = require('markdown-it-alerts'); - - const markdownItAbbr = require('markdown-it-abbr'); - - const markdownItReplaceLink = require('markdown-it-replace-link'); - - function getHeadingLevel(tagName) { - if (tagName[0].toLowerCase() === 'h') { - tagName = tagName.slice(1); - } - - return parseInt(tagName, 10); - } - - function markdownItHeadingLevel(md, options) { - var firstLevel = options.firstLevel; - - if (typeof firstLevel === 'string') { - firstLevel = getHeadingLevel(firstLevel); - } - - if (!firstLevel || isNaN(firstLevel)) { - return; - } - - var levelOffset = firstLevel - 1; - if (levelOffset < 1 || levelOffset > 6) { - return; - } - - md.core.ruler.push('adjust-heading-levels', function (state) { - var tokens = state.tokens; - for (var i = 0; i < tokens.length; i++) { - if (tokens[i].type !== 'heading_close') { - continue; - } - - var headingOpen = tokens[i - 2]; - var headingClose = tokens[i]; - - var currentLevel = getHeadingLevel(headingOpen.tag); - var tagName = 'h' + Math.min(currentLevel + levelOffset, 6); - - headingOpen.tag = tagName; - headingClose.tag = tagName; - } - }); - } - - const md = markdownIt(markdownItOptions) - .disable('code') - .use(markdownItHeadingLevel, { firstLevel: 2 }) - .use(markdownItFootnote) - .use(markdownItAnchor, markdownItAnchorOptions) - .use(markdownItAttributes) - .use(markdownItSpan) - .use(markdownItAbbr) - .use(markdownItReplaceLink) - .use(markdownItAlerts); - - md.renderer.rules.table_open = function(tokens, idx) { - return ''; - }; - - const m2j = require('./m2json'); - const glob = require('glob'); - const options = { - minify: false, - width: 70, - outfile: './content/assets/index.json', - content: true - }; - // Read all markdown files - glob('./content/docs/**/*.md', function(er, files) { - m2j.parse(files, options); - }); - - - eleventyConfig.setLibrary('md', md); - - eleventyConfig.addFilter('markdownify', (markdownString) => - md.render(markdownString) - ); - - eleventyConfig.addFilter("slug", function (value) { - return slugify(value, { - replacement: "-", - remove: /[*+~()'"!:@]/g, - lower: true, - strict: true, - }); - }); - - eleventyConfig.addNunjucksFilter("json", function (value) { - if (!value) return ""; - - const getCircularReplacer = () => { - const seen = new WeakSet(); - return (key, value) => { - if (typeof value === "object" && value !== null) { - if (seen.has(value)) { - return; - } - seen.add(value); - } - return value; - }; - }; - - return JSON.stringify(value, getCircularReplacer(), 4); - }); - - return { - templateFormats: ["html", "md", "njk", "json"], - - markdownTemplateEngine: "njk", - htmlTemplateEngine: "njk", - dataTemplateEngine: "njk", - dir: { - output: "_site", - data: "_data", - input: "content", - includes: "_includes", - layouts: "_layouts", - }, - }; -}; diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..ead1360c --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,33 @@ +name: Publish + +on: + push: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Setup Deno environment + uses: denoland/setup-deno@v1 + with: + deno-version: v1.x + + - name: Install lume + run: | + deno run -A https://deno.land/x/lume/install.ts + lume upgrade --dev + + - name: Run lume + run: | + lume --location=https://exceptionless.github.io/website/ + + - name: Deploy + uses: crazy-max/ghaction-github-pages@v2 + with: + build_dir: _site + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index fddfe8d4..1c563ae2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -node_modules/ -_site/ -.idea -content/assets/index.json +.DS_Store +_site \ No newline at end of file diff --git a/.nvmrc b/.nvmrc deleted file mode 100644 index 19c7bdba..00000000 --- a/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -16 \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index e7301e11..ee481805 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,13 +1,21 @@ { + "version": "0.2.0", "configurations": [ { - "type": "node", "request": "launch", - "name": "Launch 11ty", - "program": "${workspaceFolder}\\node_modules\\@11ty\\eleventy\\cmd.js", - "args": [ - // "--output=C:\\Temp" - ] + "name": "Lume build", + "type": "pwa-node", + "program": "${workspaceFolder}/_config.ts", + "cwd": "${workspaceFolder}", + "runtimeExecutable": "deno", + "runtimeArgs": [ + "run", + "--unstable", + "--import-map=.vscode/lume_import_map.json", + "--inspect", + "--allow-all" + ], + "attachSimplePort": 9229 } ] } \ No newline at end of file diff --git a/.vscode/lume_import_map.json b/.vscode/lume_import_map.json new file mode 100644 index 00000000..3b65f18b --- /dev/null +++ b/.vscode/lume_import_map.json @@ -0,0 +1,5 @@ +{ + "imports": { + "https://deno.land/x/lume/": "https:/cdn.jsdelivr.net/gh/lumeland/lume@520ef01ff133adaec5c99a162b7c30d244217069/" + } +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 8e3bb757..b8b086e2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,36 +1,8 @@ { - "cSpell.words": [ - "Aliyun", - "Burcham", - "Foundatio", - "Geocode", - "Gmail", - "Kibana", - "Kubernetes", - "Lucene", - "Minio", - "OWIN", - "Reindex", - "Reindexing", - "Serilog", - "Trello", - "Varorbc", - "Zurb", - "Zurb's", - "adamsitnik", - "angularjs", - "caesay", - "deduplicated", - "deduplicating", - "edwardmeng", - "eleventy", - "exceptionless", - "frankebersoll", - "kubectl", - "pluggable", - "serializers", - "srijken", - "typeof", - "walkthrough" - ] + "deno.enable": true, + "deno.lint": true, + "deno.unstable": true, + "deno.suggest.imports.hosts": { + "https://cdn.skypack.dev": false + } } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4b3a56c3..fc8aabe4 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,30 +1,31 @@ { "version": "2.0.0", "tasks": [ - { - "type": "npm", - "script": "dev", - "problemMatcher": [], - "label": "npm: dev", - "detail": "npx @11ty/eleventy --serve" - }, - { - "type": "npm", - "script": "build", - "group": { + { + "label": "Lume build", + "type": "shell", + "command": "lume", + "group": { "isDefault": true, "kind": "build" }, - "problemMatcher": [], - "label": "npm: build", - "detail": "npx @11ty/eleventy" - }, - { - "type": "npm", - "script": "install", - "problemMatcher": [], - "label": "npm: install", - "detail": "install dependencies from package" - } - ] + "presentation": { + "reveal": "always", + "panel": "dedicated" + } + }, + { + "label": "Lume serve", + "type": "shell", + "command": "lume", + "args": [ + "--serve" + ], + "group": "build", + "presentation": { + "reveal": "always", + "panel": "dedicated" + } + } + ] } \ No newline at end of file diff --git a/README.md b/README.md index 124bd8dd..293f255c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ ## Exceptionless Marketing Site -*Under Construction* - ## Creating New Posts You can manually create a new markdown file for your posts and ensure the front matter is correct, or you can run the following command from within the project directory: diff --git a/_config.ts b/_config.ts new file mode 100644 index 00000000..39147c0b --- /dev/null +++ b/_config.ts @@ -0,0 +1,31 @@ +import lume from "https://deno.land/x/lume/mod.ts"; +import date from "https://deno.land/x/lume/plugins/date.ts"; +import postcss from "https://deno.land/x/lume/plugins/postcss.ts"; +import terser from "https://deno.land/x/lume/plugins/terser.ts"; +import codeHighlight from "https://deno.land/x/lume/plugins/code_highlight.ts"; +import basePath from "https://deno.land/x/lume/plugins/base_path.ts"; +import slugifyUrls from "https://deno.land/x/lume/plugins/slugify_urls.ts"; +import gpm from "https://deno.land/x/gpm@v0.2.0/mod.ts"; + +const site = lume({ + location: new URL("https://exceptionless.com/"), + src: "content", +}); + +site + .ignore("README.md") + .copy("assets") + .use(postcss()) + .use(terser()) + .use(date()) + .use(codeHighlight()) + .use(basePath()) + .use(slugifyUrls({ alphanumeric: false })) + .addEventListener( + "beforeBuild", + () => gpm(["oom-components/searcher"], "content/assets/js"), + ); + +export default site; + +if (import.meta.main) site.build(); \ No newline at end of file diff --git a/content/404.md b/content/404.md index 090b06bc..9decf8da 100644 --- a/content/404.md +++ b/content/404.md @@ -1,8 +1,7 @@ --- title: Not Found -layout: content-well -permalink: 404.html -eleventyExcludeFromCollections: true +layout: layouts/content-well.njk +url: /404.html --- Sorry, but the page you were trying to view does not exist. diff --git a/content/_data/eleventyComputed.js b/content/_data/eleventyComputed.js deleted file mode 100644 index 31092ef1..00000000 --- a/content/_data/eleventyComputed.js +++ /dev/null @@ -1,44 +0,0 @@ -module.exports = { - eleventyNavigation: { - key: (data) => { - const urlParts = data.page.url.split("/"); - - const pathDirs = urlParts.slice(1, urlParts.length - 1); - const path = pathDirs.join("/"); - return data.key || path; - }, - title: (data) => data.title, - parent: (data) => { - const urlParts = data.page.url.split("/"); - - const parentDirs = urlParts.slice(1, urlParts.length - 2); - const parent = parentDirs.join("/"); - - return data.parent || parent; - }, - order: (data) => data.order, - }, - eleventyComputed: { - /** - * Adds support for drafts. - * If a page has `draft: true` in its YAML frontmatter then this snippet - * will set its permalink to false and exclude it from collections. - * - * For dev builds we will always render the page. - */ - permalink: data => { - if (data.draft) { - return false; - } - - return data.permalink; - }, - eleventyExcludeFromCollections: data => { - if (data.draft) { - return true; - } - - return false; - } - } -}; \ No newline at end of file diff --git a/content/_data/site.json b/content/_data/site.json deleted file mode 100644 index d4fa5b53..00000000 --- a/content/_data/site.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "title": "Exceptionless", - "description": "Real-time exception reporting for ASP.NET, Web API, WebForms, WPF, Console, and MVC applications. Includes event organization, notifications, and more.", - "url": "https://exceptionless.com", - "author": "Exceptionless Team", - "twitter": "Exceptionless", - "analyticsId": "UA-433340-8", - "intercomId": "6c0d76e0bec950052459f5cb4b727a949aeabbe1" -} \ No newline at end of file diff --git a/content/_data/site.yml b/content/_data/site.yml new file mode 100644 index 00000000..5288605f --- /dev/null +++ b/content/_data/site.yml @@ -0,0 +1,8 @@ +title: Exceptionless +description: Real-time exception reporting for ASP.NET, Web API, WebForms, WPF, Console, and MVC applications. Includes event organization, notifications, and more. +author: + name: Exceptionless Team + email: team@exceptionless.com +twitter: Exceptionless +analyticsId: UA-433340-8 +intercomId: 6c0d76e0bec950052459f5cb4b727a949aeabbe1 diff --git a/content/_includes/docs-toc.html b/content/_includes/docs-toc.html deleted file mode 100644 index 4e746a77..00000000 --- a/content/_includes/docs-toc.html +++ /dev/null @@ -1,4 +0,0 @@ -{%- if eleventyNavigation -%} - {%- set navKey = eleventyNavigation.key -%} -{%- endif -%} -{{ collections.docs | eleventyNavigation | eleventyNavigationToHtml({ activeKey: navKey, listClass: 'toc-list', activeListItemClass: 'toc-active' }) | safe }} diff --git a/content/_includes/layouts/archive.njk b/content/_includes/layouts/archive.njk new file mode 100644 index 00000000..e6c44907 --- /dev/null +++ b/content/_includes/layouts/archive.njk @@ -0,0 +1,30 @@ +--- +layout: layouts/content.njk +bodyClass: body-tag +--- +

{{ title }}

+ +{% set postslist = results %} +{% include "templates/postslist.njk" %} + +
+ + \ No newline at end of file diff --git a/content/_layouts/content-well.njk b/content/_includes/layouts/content-well.njk similarity index 91% rename from content/_layouts/content-well.njk rename to content/_includes/layouts/content-well.njk index a16dd9b2..c8cbd291 100644 --- a/content/_layouts/content-well.njk +++ b/content/_includes/layouts/content-well.njk @@ -1,5 +1,5 @@ --- -layout: default +layout: layouts/default.njk ---
diff --git a/content/_layouts/content.njk b/content/_includes/layouts/content.njk similarity index 88% rename from content/_layouts/content.njk rename to content/_includes/layouts/content.njk index eb979f2a..bf331f52 100644 --- a/content/_layouts/content.njk +++ b/content/_includes/layouts/content.njk @@ -1,5 +1,5 @@ --- -layout: default +layout: layouts/default.njk ---
diff --git a/content/_layouts/default.njk b/content/_includes/layouts/default.njk similarity index 98% rename from content/_layouts/default.njk rename to content/_includes/layouts/default.njk index d29d33ae..f8d20b5a 100644 --- a/content/_layouts/default.njk +++ b/content/_includes/layouts/default.njk @@ -1,7 +1,8 @@ - + + - {% include "head.njk" %} + {% include "templates/head.njk" %} @@ -93,6 +94,6 @@ - {% include "intercom.njk" %} + {% include "templates/intercom.njk" %} diff --git a/content/_layouts/docs.njk b/content/_includes/layouts/docs.njk similarity index 94% rename from content/_layouts/docs.njk rename to content/_includes/layouts/docs.njk index cd963523..d8a5abb0 100644 --- a/content/_layouts/docs.njk +++ b/content/_includes/layouts/docs.njk @@ -1,5 +1,5 @@ --- -layout: default +layout: layouts/default.njk ---
@@ -14,7 +14,7 @@ layout: default
- {% include "docs-toc.html" %} + {% include "templates/docs-toc.njk" %}

{{ title }}

diff --git a/content/_layouts/post.njk b/content/_includes/layouts/post.njk similarity index 97% rename from content/_layouts/post.njk rename to content/_includes/layouts/post.njk index 5d2deda9..7d50115d 100644 --- a/content/_layouts/post.njk +++ b/content/_includes/layouts/post.njk @@ -1,5 +1,5 @@ --- -layout: default +layout: layouts/default.njk ---
diff --git a/content/_includes/layouts/tag.njk b/content/_includes/layouts/tag.njk new file mode 100644 index 00000000..87a56dd4 --- /dev/null +++ b/content/_includes/layouts/tag.njk @@ -0,0 +1,12 @@ +--- +layout: layouts/default.njk +bodyClass: body-tag +--- +

Tagged “{{ tag }}”

+ +{% set postslist = search.pages("'" + tag + "'") %} +{% include "templates/postslist.njk" %} + +
+ +

See all tags.

diff --git a/content/_includes/layouts/template/base.njk b/content/_includes/layouts/template/base.njk new file mode 100644 index 00000000..b3a74f1c --- /dev/null +++ b/content/_includes/layouts/template/base.njk @@ -0,0 +1,43 @@ + + + + + + + {{ title or site.title }} + + + + + + + + + +
+ {{ content | safe }} +
+ +
+ + + + diff --git a/content/_includes/layouts/template/home.njk b/content/_includes/layouts/template/home.njk new file mode 100644 index 00000000..cbadf74d --- /dev/null +++ b/content/_includes/layouts/template/home.njk @@ -0,0 +1,16 @@ +--- +layout: layouts/base.njk +bodyClass: body-home +--- + +
+
    +
  1. Edit the _data/metadata.json with your blog’s information.
    2. +
  2. (Optional) Edit _config.js with your configuration preferences.
    3. +
  3. Delete this message from _includes/layouts/base.njk.
    4. +
+

This is an Lume project "inspired" by the eleventy-base-blog repo.

+
+ + +{{ content | safe }} diff --git a/content/_includes/layouts/template/post.njk b/content/_includes/layouts/template/post.njk new file mode 100644 index 00000000..4a0a7ea0 --- /dev/null +++ b/content/_includes/layouts/template/post.njk @@ -0,0 +1,43 @@ +--- +layout: layouts/base.njk +bodyClass: body-post +--- +
+
+

{{ title }}

+ + + + +
+ +
+ {{ content | safe }} +
+
+ +
+ + \ No newline at end of file diff --git a/content/_includes/carousel.html b/content/_includes/templates/carousel.njk similarity index 100% rename from content/_includes/carousel.html rename to content/_includes/templates/carousel.njk diff --git a/content/_includes/templates/docs-toc.njk b/content/_includes/templates/docs-toc.njk new file mode 100644 index 00000000..fbdf2a16 --- /dev/null +++ b/content/_includes/templates/docs-toc.njk @@ -0,0 +1,4 @@ +{%- if eleventyNavigation -%} + {%- set navKey = eleventyNavigation.key -%} +{%- endif -%} +{#{ collections.docs | eleventyNavigation | eleventyNavigationToHtml({ activeKey: navKey, listClass: 'toc-list', activeListItemClass: 'toc-active' }) | safe }#} diff --git a/content/_includes/head.njk b/content/_includes/templates/head.njk similarity index 89% rename from content/_includes/head.njk rename to content/_includes/templates/head.njk index e7e36b61..bc826be8 100644 --- a/content/_includes/head.njk +++ b/content/_includes/templates/head.njk @@ -1,7 +1,7 @@ {%- set pageTitle = title or site.title or '' %} {%- set pageTitle = pageTitle if (pageTitle == site.title) else pageTitle + ' - ' + site.title %} {%- set pageUrl = site.url + page.url %} - {%- set pageDescription = description or site.title or '' %} + {%- set pageDescription = description or site.description or '' %} {%- set pageImage = site.url + '/' + eleventyNavigation.parent + '/' + image or pageUrl + site.image %} {%- set pageRobots = "noindex,follow" if (pagination.pageNumber > 0 and pagination.size > 0) else "index,follow" %} {%- set pageAuthor = author or site.author -%} @@ -47,5 +47,6 @@ - + + \ No newline at end of file diff --git a/content/_includes/intercom.njk b/content/_includes/templates/intercom.njk similarity index 100% rename from content/_includes/intercom.njk rename to content/_includes/templates/intercom.njk diff --git a/content/_includes/templates/postslist.njk b/content/_includes/templates/postslist.njk new file mode 100644 index 00000000..f3c1a171 --- /dev/null +++ b/content/_includes/templates/postslist.njk @@ -0,0 +1,25 @@ + diff --git a/content/about.md b/content/about.md index 6178f984..142a8352 100644 --- a/content/about.md +++ b/content/about.md @@ -1,6 +1,10 @@ --- +layout: layouts/content-well.njk title: About Us -layout: content-well +templateClass: tmpl-post +menu: + visible: true + order: 2 --- ![Exceptionless Logo](/assets/img/exceptionless-logoBLK-300x75.png) diff --git a/content/admin/config.tmpl.js b/content/admin/config.tmpl.js new file mode 100644 index 00000000..637d3acd --- /dev/null +++ b/content/admin/config.tmpl.js @@ -0,0 +1,88 @@ +import { stringify } from "https://deno.land/x/lume/deps/yaml.ts"; + +export const url = "./config.yml"; + +export default (data, { url }) => { + const config = { + backend: { + name: "github", + repo: "exceptionless/Website", + branch: "master", + open_authoring: true, + }, + media_folder: "assets/img", + display_url: url("/"), + collections: [], + }; + + // Posts + config.collections.push({ + label: "Posts", + name: "posts", + description: "Here you can create or edit your posts", + folder: "news", + preview: false, + create: true, + nested: { + depth: 100, + }, + view_filters: [ + { + label: "Drafts", + field: "draft", + pattern: true, + }, + ], + fields: [ + field("title"), + field("description"), + field("image", "image"), + field("date", "datetime"), + field("tags", "list"), + field("draft", "boolean"), + field("body", "markdown"), + ], + }); + + const pageFields = [ + field("title"), + field("url", "string"), + field("body", "markdown"), + field("menu", "object", { + fields: [ + field("visible", "boolean"), + field("order", "number"), + ], + }), + field("templateClass", "hidden"), + field("layout", "hidden"), + ]; + + // Individual pages + config.collections.push({ + label: "pages", + name: "pages", + description: "Here you can edit your individual pages", + preview: false, + files: [ + { + label: "about", + name: "about", + file: "/about.md", + fields: pageFields, + }, + { + label: "404", + name: "404", + file: "/404.md", + fields: pageFields, + }, + ], + }); + + return stringify(config); +}; + +function field(label, widget = "string", extra = {}) { + return { label, name: label.toLowerCase(), widget, ...extra }; +} diff --git a/content/admin/index.njk b/content/admin/index.njk new file mode 100644 index 00000000..cbef56a8 --- /dev/null +++ b/content/admin/index.njk @@ -0,0 +1,21 @@ +--- +config_file: /admin/config.yml +--- + + + + + + + Admin + + + + + + + + + + + \ No newline at end of file diff --git a/content/archive.tmpl.js b/content/archive.tmpl.js new file mode 100644 index 00000000..a01e4e6f --- /dev/null +++ b/content/archive.tmpl.js @@ -0,0 +1,28 @@ +export const layout = "layouts/archive.njk"; +export const title = "Archive"; + +export default function* ({ search, paginate }) { + const posts = search.pages("type=posts", "date=desc"); + + for ( + const data of paginate(posts, { url, size: 10 }) + ) { + // Show the first page in the menu + if (data.pagination.page === 1) { + data.menu = { + visible: true, + order: 1, + }; + } + + yield data; + } +} + +function url(n) { + if (n === 1) { + return "/news/"; + } + + return `/news/${n}/`; +} diff --git a/content/assets/js/searcher/searcher.js b/content/assets/js/searcher/searcher.js new file mode 100644 index 00000000..582ba1b9 --- /dev/null +++ b/content/assets/js/searcher/searcher.js @@ -0,0 +1,231 @@ +export default class Searcher extends HTMLElement { + static get observedAttributes() { + return ["src", "label", "placeholder"]; + } + + constructor() { + super(); + const shadow = this.attachShadow({ mode: "open" }); + shadow.innerHTML = ` + + + + + `; + this.input = shadow.querySelector("input"); + this.itemsContainer = shadow.querySelector("div"); + this.label = shadow.querySelector("label > span"); + + this.itemsContainer.addEventListener("selected", (event) => { + this.input.value = event.target.innerText; + this.itemsContainer.hidden = true; + + this.dispatchEvent( + new CustomEvent("selected", { + detail: { + label: event.target.innerHTML, + value: event.target.value, + }, + }), + ); + }); + } + + set data(data) { + this.innerHTML = ""; + + for (const row of data) { + const btn = this.ownerDocument.createElement("button"); + btn.innerHTML = row.label || row.value; + btn.value = row.value; + btn.setAttribute("part", "item"); + btn.addEventListener("focus", () => this.activeItem = btn); + btn.addEventListener("mouseenter", () => this.activeItem = btn); + const search = `${row.search || ""} ${row.label}`; + btn.dataset.search = slugify(search); + btn.addEventListener( + "click", + () => btn.dispatchEvent(new CustomEvent("selected", { bubbles: true })), + ); + this.itemsContainer.appendChild(btn); + } + } + + connectedCallback() { + const { input } = this; + input.addEventListener("input", () => this.search(input.value)); + input.addEventListener("keydown", (event) => { + switch (event.code) { + case "ArrowDown": { + event.preventDefault(); + const item = this.activeItem; + const result = Array.from(this.resultItems); + + if (item) { + const key = result.indexOf(item); + + if (result[key + 1]) { + const activeItem = result[key + 1]; + this.activeItem = activeItem; + scroll(this.itemsContainer, activeItem); + } + } else if (result.length) { + const activeItem = result[0]; + this.activeItem = activeItem; + scroll(this.itemsContainer, activeItem); + } + break; + } + + case "ArrowUp": { + event.preventDefault(); + const item = this.activeItem; + + if (item) { + const result = Array.from(this.resultItems); + const key = result.indexOf(item); + + if (key > 0) { + const activeItem = result[key - 1]; + this.activeItem = activeItem; + scroll(this.itemsContainer, activeItem); + } + } + break; + } + + case "Enter": + const item = this.activeItem; + + if (item) { + item.click(); + } + break; + + case "Escape": + input.value = ""; + this.search(""); + break; + } + }); + } + + attributeChangedCallback(name, oldValue, newValue) { + switch (name) { + case "src": + if (!newValue) { + this.data = []; + break; + } + fetch(newValue) + .then((res) => res.json()) + .then((json) => { + this.data = json; + }); + break; + case "label": + this.label.innerHTML = newValue; + break; + case "placeholder": + this.input.setAttribute("placeholder", newValue); + break; + } + } + + get items() { + return this.itemsContainer.querySelectorAll(":scope > button"); + } + + get resultItems() { + return this.itemsContainer.querySelectorAll( + ":scope > button:not([hidden])", + ); + } + + get activeItem() { + return this.itemsContainer.querySelector(':scope > [part~="active"]'); + } + + set activeItem(item) { + const old = this.activeItem; + if (old) { + old.setAttribute("part", "item"); + } + item.setAttribute("part", "item active"); + } + + search(query) { + query = slugify(query); + + this.items.forEach((item) => { + item.hidden = !query || item.dataset.search.indexOf(query) === -1; + }); + + if (!this.focusedItem) { + const activeItem = this.resultItems[0]; + + if (activeItem) { + this.activeItem = activeItem; + } + } + + this.itemsContainer.hidden = !this.itemsContainer.querySelector( + ":scope > button:not([hidden])", + ); + } +} + +function scroll(parent, item) { + let scroll; + + const viewbox = parent.getBoundingClientRect(); + const rect = item.getBoundingClientRect(); + + if (viewbox.top - rect.top > 0) { + scroll = item.previousElementSibling ? "start" : "center"; + } else if (viewbox.bottom < rect.bottom) { + scroll = item.previousElementSibling ? "end" : "center"; + } + + if (scroll) { + try { + item.scrollIntoView({ + block: scroll, + }); + } catch (err) { + item.scrollIntoView(); + } + } +} + +function slugify(text) { + return text.toLowerCase() + .replaceAll(/[^\w]+/g, ""); +} diff --git a/content/content.json b/content/content.json deleted file mode 100644 index b1610c8a..00000000 --- a/content/content.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "layout": "content", - "title": "Exception and Event Reporting in real-time", - "description": "Real-time exception reporting for ASP.NET, Web API, WebForms, WPF, Console, and MVC applications. Includes event organization, notifications, and more." -} \ No newline at end of file diff --git a/content/docs/_data.yml b/content/docs/_data.yml new file mode 100644 index 00000000..970f9613 --- /dev/null +++ b/content/docs/_data.yml @@ -0,0 +1,2 @@ +type: doc +layout: layouts/docs.njk \ No newline at end of file diff --git a/content/docs/docs.json b/content/docs/docs.json deleted file mode 100644 index 4b299e5b..00000000 --- a/content/docs/docs.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "layout": "docs", - "tags": ["docs"] -} \ No newline at end of file diff --git a/content/feed.njk b/content/feed.njk deleted file mode 100644 index f13aa5d8..00000000 --- a/content/feed.njk +++ /dev/null @@ -1,30 +0,0 @@ ---- -permalink: feed.xml -eleventyExcludeFromCollections: true -layout: ---- - - - {{ site.title }} - {{ site.description }} - - - {{ collections.posts | rssLastUpdatedDate }} - {{ metadata.url }} - - {{ site.author }} - team@exceptionless.com - - {%- for post in collections.posts | reverse %} - {% if post.data.draft != true %} - {% set absolutePostUrl %}{{ post.url | url | absoluteUrl(metadata.url) }}{% endset %} - - {{ post.data.title }} - - {{ post.date | rssDate }} - {{ post.data.id if post.data.id else absolutePostUrl }} - {{ post.templateContent | htmlToAbsoluteUrls(absolutePostUrl) }} - - {% endif %} - {%- endfor %} - \ No newline at end of file diff --git a/content/feed.tmpl.js b/content/feed.tmpl.js new file mode 100644 index 00000000..b3cd2b7a --- /dev/null +++ b/content/feed.tmpl.js @@ -0,0 +1,28 @@ +export const url = "/feed.json"; + +export default function ({ site, search }, { md, url, date, htmlUrl }) { + const feed = { + version: "https://jsonfeed.org/version/1", + title: site.title, + home_page_url: url("", true), + feed_url: url("feed.json", true), + description: site.description, + author: { + name: site.author.name, + url: site.author.url, + }, + items: [], + }; + + for (const post of search.pages("type=posts", "date=desc", 10)) { + feed.items.push({ + id: url(post.data.url, true), + url: url(post.data.url, true), + title: post.data.title, + content_html: htmlUrl(md(post.data.content), true), + date_published: date(post.data.date, "ATOM"), + }); + } + + return JSON.stringify(feed, null, 2); +} diff --git a/content/feed.xml.njk b/content/feed.xml.njk new file mode 100644 index 00000000..8f1fb3dd --- /dev/null +++ b/content/feed.xml.njk @@ -0,0 +1,24 @@ + + + + {{ site.title }} + {{ site.description }} + + + {% set lastPage = search.pages() | last %} + {{ lastPage.data.date | date("ATOM") }} + {{ "/" | url(true) }} + + {{ site.author.name }} + {{ site.author.email }} + + {%- for post in search.pages("type=posts", "date=desc", 10) %} + + {{ post.data.title }} + + {{ post.data.date | date("ATOM") }} + {{ post.data.url | url(true) }} + {{ post.data.content | md | htmlUrl(true) }} + + {%- endfor %} + diff --git a/content/index.html b/content/index.njk similarity index 98% rename from content/index.html rename to content/index.njk index 0f04ca83..3ee102be 100644 --- a/content/index.html +++ b/content/index.njk @@ -1,9 +1,12 @@ --- -layout: default -title: Home +layout: layouts/default.njk +menu: + visible: true + title: Home + order: 0 --- -{% include "carousel.html" %} +{% include "templates/carousel.njk" %}
diff --git a/content/news.html b/content/news.njk similarity index 97% rename from content/news.html rename to content/news.njk index a17a6a1a..a31d4ed6 100644 --- a/content/news.html +++ b/content/news.njk @@ -1,5 +1,6 @@ --- title: News +layout: layouts/default.njk sitemap: changefreq: daily priority: 1.0 diff --git a/content/news/2014/2014-06-12-upcoming-exceptionless-2-0-simplified-api.md b/content/news/2014/2014-06-12-upcoming-exceptionless-2-0-simplified-api.md index f1c40631..fc2bdf43 100644 --- a/content/news/2014/2014-06-12-upcoming-exceptionless-2-0-simplified-api.md +++ b/content/news/2014/2014-06-12-upcoming-exceptionless-2-0-simplified-api.md @@ -2,7 +2,8 @@ id: 9027 title: "More from the Upcoming Exceptionless 2.0: Simplified API" date: 2014-06-12 -tags: [ "api"] +tags: + - api --- ![Exceptionless 2.0 API Simplified](/assets/img/news/v2-api.png)Since [going open source](/fork-us-exceptionless-goes-open-source/ "Fork Us! Exceptionless Goes Open Source"), we've wanted to simplify the API and make it easier to work with. diff --git a/content/news/2014/2014-09-03-making-move-elastic-search-exceptionless-2-0.md b/content/news/2014/2014-09-03-making-move-elastic-search-exceptionless-2-0.md index 367055e3..4bc57a98 100644 --- a/content/news/2014/2014-09-03-making-move-elastic-search-exceptionless-2-0.md +++ b/content/news/2014/2014-09-03-making-move-elastic-search-exceptionless-2-0.md @@ -2,7 +2,8 @@ id: 10108 title: Making the Move to Elasticsearch for Exceptionless 2.0 date: 2014-09-03 -tags: [ "new features"] +tags: + - new features --- ![Screenshot 2014-09-03 15.03.16](/assets/img/news/Screenshot-2014-09-03-15.03.16.png)We know you've thought about it when using Exceptionless, and many developers have submitted formal requests. **Search**. diff --git a/content/news/_data.yml b/content/news/_data.yml new file mode 100644 index 00000000..bd026d2f --- /dev/null +++ b/content/news/_data.yml @@ -0,0 +1,2 @@ +type: posts +layout: layouts/post.njk \ No newline at end of file diff --git a/content/news/news.json b/content/news/news.json deleted file mode 100644 index 6fbdb5a6..00000000 --- a/content/news/news.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "layout": "post", - "author": "Exceptionless", - "tags": ["posts"] -} \ No newline at end of file diff --git a/content/pricing.html b/content/pricing.njk similarity index 99% rename from content/pricing.html rename to content/pricing.njk index 3d09a8d7..41bb7e55 100644 --- a/content/pricing.html +++ b/content/pricing.njk @@ -1,5 +1,6 @@ --- title: Pricing +layout: layouts/content.njk ---
diff --git a/content/privacy.md b/content/privacy.md index e405d42f..04e5fb14 100644 --- a/content/privacy.md +++ b/content/privacy.md @@ -1,6 +1,6 @@ --- title: Privacy Policy -layout: content-well +layout: layouts/content-well.njk --- We collect the e-mail addresses of those who communicate with us via e-mail or through our feedback forms, aggregate information on what pages consumers access or visit, and information volunteered by the consumer (such as survey information and/or site registrations). The information we collect is used to improve the content of our Web pages and the quality of our service, and is not shared with or sold to other organizations for commercial purposes, except to provide products or services you’ve requested, when we have your permission, or under the following circumstances: diff --git a/content/_redirects.njk b/content/redirects.njk similarity index 99% rename from content/_redirects.njk rename to content/redirects.njk index 4bf79595..f2c1f125 100644 --- a/content/_redirects.njk +++ b/content/redirects.njk @@ -1,7 +1,6 @@ --- -permalink: _redirects +url: ./_redirects eleventyExcludeFromCollections: true -layout: --- /feed/ /feed.xml /better-approach-running-azure-webjobs/ /news/2015/2015-12-08-better-approach-running-azure-webjobs/ diff --git a/content/robots.njk b/content/robots.njk deleted file mode 100644 index 2c5a0d24..00000000 --- a/content/robots.njk +++ /dev/null @@ -1,7 +0,0 @@ ---- -permalink: /robots.txt -eleventyExcludeFromCollections: true -layout: null ---- -User-agent: * -Sitemap: https://exceptionless.com/sitemap.xml \ No newline at end of file diff --git a/content/robots.txt.njk b/content/robots.txt.njk new file mode 100644 index 00000000..40531ed8 --- /dev/null +++ b/content/robots.txt.njk @@ -0,0 +1,3 @@ +User-agent: * + +Sitemap: {{ 'sitemap.xml' | url(true) }} diff --git a/content/search.html b/content/search.njk similarity index 98% rename from content/search.html rename to content/search.njk index 6189aeaa..5bffa5b2 100644 --- a/content/search.html +++ b/content/search.njk @@ -1,6 +1,6 @@ --- title: Search Results -layout: docs +layout: layouts/docs.njk ---
diff --git a/content/search.tmpl.js b/content/search.tmpl.js new file mode 100644 index 00000000..d09187da --- /dev/null +++ b/content/search.tmpl.js @@ -0,0 +1,22 @@ +export const url = "/docs/index.json"; +export const renderOrder = 1000; +import lunr from 'https://cdn.skypack.dev/lunr?dts'; + +export default function ({ search }, { url }) { + const idx = lunr(function () { + this.field('title'); + this.field('body'); + + for (const post of search.pages("type=doc")) { + this.add({ + "id": url(post.data.url), + "title": post.data.title, + //"description": post.data.description, + //"tags": post.data.tags.join(" "), + "body": post.content + }); + } + }); + + return JSON.stringify(idx); +} diff --git a/content/sitemap.njk b/content/sitemap.njk deleted file mode 100644 index 86efa57b..00000000 --- a/content/sitemap.njk +++ /dev/null @@ -1,6 +0,0 @@ ---- -permalink: /sitemap.xml -eleventyExcludeFromCollections: true -layout: null ---- -{% sitemap collections.all %} diff --git a/content/sitemap.xml.njk b/content/sitemap.xml.njk new file mode 100644 index 00000000..62b14938 --- /dev/null +++ b/content/sitemap.xml.njk @@ -0,0 +1,9 @@ + + +{%- for page in search.pages() %} + + {{ page.data.url | url(true) }} + {{ page.data.date | date("DATE") }} + +{%- endfor %} + diff --git a/content/tag.tmpl.js b/content/tag.tmpl.js new file mode 100644 index 00000000..ec3bb58e --- /dev/null +++ b/content/tag.tmpl.js @@ -0,0 +1,12 @@ +export const layout = "layouts/tag.njk"; + +export default function* ({ search }) { + for (const tag of search.tags()) { + yield { + url: `/tags/${tag}/`, + title: `Tagged “${tag}”`, + type: "tag", + tag, + }; + } +} diff --git a/content/tags.njk b/content/tags.njk new file mode 100644 index 00000000..cc4c4e06 --- /dev/null +++ b/content/tags.njk @@ -0,0 +1,8 @@ +--- +layout: layouts/default.njk +--- +

Tags

+ +{% for page in search.pages("type=tag", "tag") %} + {{ page.data.tag }} +{% endfor %} diff --git a/content/terms.md b/content/terms.md index e0d60d9b..2ecdaa03 100644 --- a/content/terms.md +++ b/content/terms.md @@ -1,6 +1,6 @@ --- title: Terms of Use -layout: content-well +layout: layouts/content-well.njk --- The Exceptionless Terms of Service are between Exceptionless ("we" or "Exceptionless") and the customer who orders the Exceptionless services ("you" or "Customer"). By using the Exceptionless web site or any service of Exceptionless (collectively, "Service"), you are agreeing to be bound by the following terms and conditions ("Terms of Service"). diff --git a/content/tour.html b/content/tour.njk similarity index 99% rename from content/tour.html rename to content/tour.njk index 60a141c6..92def07e 100644 --- a/content/tour.html +++ b/content/tour.njk @@ -1,5 +1,6 @@ --- title: Feature Tour +layout: layouts/content.njk ---
diff --git a/content/why.html b/content/why.njk similarity index 99% rename from content/why.html rename to content/why.njk index ae182f9f..78eee12e 100644 --- a/content/why.html +++ b/content/why.njk @@ -1,6 +1,6 @@ --- title: Why Exceptionless? -layout: default +layout: layouts/default.njk ---