From 18a1dd0e03e2511613bbf4f8d2850bb166f518ab Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 13 Oct 2022 08:40:06 +0100 Subject: [PATCH] fix: remove unwanted URLs for daily emails --- .../2022-08-12-git-worktrees-docker-compose.md | 0 .../daily-emails/2022-08-13-i-wrote-a-neovim-plugin.md | 0 .../daily-emails/2022-08-14-why-i-write-tests.md | 0 .../2022-08-15-using-run-file-simplify-project-tasks.md | 0 .../2022-08-16-what-are-git-hooks-why-are-they-useful.md | 0 .../2022-08-17-one-more-run-command-git-worktrees.md | 0 .../2022-08-18-talking-drupal-tailwind-css.md | 0 .../2022-08-19-pair-programming-or-code-reviews.md | 0 website/src/{pages => }/daily-emails/2022-08-20.md | 0 website/src/{pages => }/daily-emails/2022-08-21.md | 0 website/src/{pages => }/daily-emails/2022-08-22.md | 0 website/src/{pages => }/daily-emails/2022-08-23.md | 0 website/src/{pages => }/daily-emails/2022-08-24.md | 0 website/src/{pages => }/daily-emails/2022-08-25.md | 0 website/src/{pages => }/daily-emails/2022-08-26.md | 0 website/src/{pages => }/daily-emails/2022-08-27.md | 0 website/src/{pages => }/daily-emails/2022-08-28.md | 0 website/src/{pages => }/daily-emails/2022-08-29.md | 0 website/src/{pages => }/daily-emails/2022-08-30.md | 0 website/src/{pages => }/daily-emails/2022-09-01.md | 0 website/src/{pages => }/daily-emails/2022-09-02.md | 0 website/src/{pages => }/daily-emails/2022-09-03.md | 0 website/src/{pages => }/daily-emails/2022-09-04.md | 0 website/src/{pages => }/daily-emails/2022-09-05.md | 0 website/src/{pages => }/daily-emails/2022-09-06.md | 0 website/src/{pages => }/daily-emails/2022-09-07.md | 0 website/src/{pages => }/daily-emails/2022-09-08.md | 0 website/src/{pages => }/daily-emails/2022-09-09.md | 0 website/src/{pages => }/daily-emails/2022-09-10.md | 0 website/src/{pages => }/daily-emails/2022-09-11.md | 0 website/src/{pages => }/daily-emails/2022-09-12.md | 0 website/src/{pages => }/daily-emails/2022-09-14.md | 0 website/src/{pages => }/daily-emails/2022-09-16.md | 0 website/src/{pages => }/daily-emails/2022-09-17.md | 0 website/src/{pages => }/daily-emails/2022-09-19.md | 0 website/src/{pages => }/daily-emails/2022-09-20.md | 0 website/src/{pages => }/daily-emails/2022-09-21.md | 0 website/src/{pages => }/daily-emails/2022-09-22.md | 0 website/src/{pages => }/daily-emails/2022-09-23.md | 0 website/src/{pages => }/daily-emails/2022-09-25.md | 0 website/src/{pages => }/daily-emails/2022-09-26.md | 0 website/src/{pages => }/daily-emails/2022-09-27.md | 0 website/src/{pages => }/daily-emails/2022-09-28.md | 0 website/src/{pages => }/daily-emails/2022-09-30.md | 0 website/src/{pages => }/daily-emails/2022-10-01.md | 0 website/src/{pages => }/daily-emails/2022-10-02.md | 0 website/src/{pages => }/daily-emails/2022-10-03.md | 0 website/src/{pages => }/daily-emails/2022-10-08.md | 1 - website/src/{pages => }/daily-emails/2022-10-09.md | 1 - website/src/{pages => }/daily-emails/monorepo-or-not.md | 0 website/src/pages/archive.xml.js | 9 ++++----- website/src/pages/archive/[...slug].astro | 9 ++++++--- website/src/pages/archive/index.astro | 2 +- 53 files changed, 11 insertions(+), 11 deletions(-) rename website/src/{pages => }/daily-emails/2022-08-12-git-worktrees-docker-compose.md (100%) rename website/src/{pages => }/daily-emails/2022-08-13-i-wrote-a-neovim-plugin.md (100%) rename website/src/{pages => }/daily-emails/2022-08-14-why-i-write-tests.md (100%) rename website/src/{pages => }/daily-emails/2022-08-15-using-run-file-simplify-project-tasks.md (100%) rename website/src/{pages => }/daily-emails/2022-08-16-what-are-git-hooks-why-are-they-useful.md (100%) rename website/src/{pages => }/daily-emails/2022-08-17-one-more-run-command-git-worktrees.md (100%) rename website/src/{pages => }/daily-emails/2022-08-18-talking-drupal-tailwind-css.md (100%) rename website/src/{pages => }/daily-emails/2022-08-19-pair-programming-or-code-reviews.md (100%) rename website/src/{pages => }/daily-emails/2022-08-20.md (100%) rename website/src/{pages => }/daily-emails/2022-08-21.md (100%) rename website/src/{pages => }/daily-emails/2022-08-22.md (100%) rename website/src/{pages => }/daily-emails/2022-08-23.md (100%) rename website/src/{pages => }/daily-emails/2022-08-24.md (100%) rename website/src/{pages => }/daily-emails/2022-08-25.md (100%) rename website/src/{pages => }/daily-emails/2022-08-26.md (100%) rename website/src/{pages => }/daily-emails/2022-08-27.md (100%) rename website/src/{pages => }/daily-emails/2022-08-28.md (100%) rename website/src/{pages => }/daily-emails/2022-08-29.md (100%) rename website/src/{pages => }/daily-emails/2022-08-30.md (100%) rename website/src/{pages => }/daily-emails/2022-09-01.md (100%) rename website/src/{pages => }/daily-emails/2022-09-02.md (100%) rename website/src/{pages => }/daily-emails/2022-09-03.md (100%) rename website/src/{pages => }/daily-emails/2022-09-04.md (100%) rename website/src/{pages => }/daily-emails/2022-09-05.md (100%) rename website/src/{pages => }/daily-emails/2022-09-06.md (100%) rename website/src/{pages => }/daily-emails/2022-09-07.md (100%) rename website/src/{pages => }/daily-emails/2022-09-08.md (100%) rename website/src/{pages => }/daily-emails/2022-09-09.md (100%) rename website/src/{pages => }/daily-emails/2022-09-10.md (100%) rename website/src/{pages => }/daily-emails/2022-09-11.md (100%) rename website/src/{pages => }/daily-emails/2022-09-12.md (100%) rename website/src/{pages => }/daily-emails/2022-09-14.md (100%) rename website/src/{pages => }/daily-emails/2022-09-16.md (100%) rename website/src/{pages => }/daily-emails/2022-09-17.md (100%) rename website/src/{pages => }/daily-emails/2022-09-19.md (100%) rename website/src/{pages => }/daily-emails/2022-09-20.md (100%) rename website/src/{pages => }/daily-emails/2022-09-21.md (100%) rename website/src/{pages => }/daily-emails/2022-09-22.md (100%) rename website/src/{pages => }/daily-emails/2022-09-23.md (100%) rename website/src/{pages => }/daily-emails/2022-09-25.md (100%) rename website/src/{pages => }/daily-emails/2022-09-26.md (100%) rename website/src/{pages => }/daily-emails/2022-09-27.md (100%) rename website/src/{pages => }/daily-emails/2022-09-28.md (100%) rename website/src/{pages => }/daily-emails/2022-09-30.md (100%) rename website/src/{pages => }/daily-emails/2022-10-01.md (100%) rename website/src/{pages => }/daily-emails/2022-10-02.md (100%) rename website/src/{pages => }/daily-emails/2022-10-03.md (100%) rename website/src/{pages => }/daily-emails/2022-10-08.md (97%) rename website/src/{pages => }/daily-emails/2022-10-09.md (98%) rename website/src/{pages => }/daily-emails/monorepo-or-not.md (100%) diff --git a/website/src/pages/daily-emails/2022-08-12-git-worktrees-docker-compose.md b/website/src/daily-emails/2022-08-12-git-worktrees-docker-compose.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-12-git-worktrees-docker-compose.md rename to website/src/daily-emails/2022-08-12-git-worktrees-docker-compose.md diff --git a/website/src/pages/daily-emails/2022-08-13-i-wrote-a-neovim-plugin.md b/website/src/daily-emails/2022-08-13-i-wrote-a-neovim-plugin.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-13-i-wrote-a-neovim-plugin.md rename to website/src/daily-emails/2022-08-13-i-wrote-a-neovim-plugin.md diff --git a/website/src/pages/daily-emails/2022-08-14-why-i-write-tests.md b/website/src/daily-emails/2022-08-14-why-i-write-tests.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-14-why-i-write-tests.md rename to website/src/daily-emails/2022-08-14-why-i-write-tests.md diff --git a/website/src/pages/daily-emails/2022-08-15-using-run-file-simplify-project-tasks.md b/website/src/daily-emails/2022-08-15-using-run-file-simplify-project-tasks.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-15-using-run-file-simplify-project-tasks.md rename to website/src/daily-emails/2022-08-15-using-run-file-simplify-project-tasks.md diff --git a/website/src/pages/daily-emails/2022-08-16-what-are-git-hooks-why-are-they-useful.md b/website/src/daily-emails/2022-08-16-what-are-git-hooks-why-are-they-useful.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-16-what-are-git-hooks-why-are-they-useful.md rename to website/src/daily-emails/2022-08-16-what-are-git-hooks-why-are-they-useful.md diff --git a/website/src/pages/daily-emails/2022-08-17-one-more-run-command-git-worktrees.md b/website/src/daily-emails/2022-08-17-one-more-run-command-git-worktrees.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-17-one-more-run-command-git-worktrees.md rename to website/src/daily-emails/2022-08-17-one-more-run-command-git-worktrees.md diff --git a/website/src/pages/daily-emails/2022-08-18-talking-drupal-tailwind-css.md b/website/src/daily-emails/2022-08-18-talking-drupal-tailwind-css.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-18-talking-drupal-tailwind-css.md rename to website/src/daily-emails/2022-08-18-talking-drupal-tailwind-css.md diff --git a/website/src/pages/daily-emails/2022-08-19-pair-programming-or-code-reviews.md b/website/src/daily-emails/2022-08-19-pair-programming-or-code-reviews.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-19-pair-programming-or-code-reviews.md rename to website/src/daily-emails/2022-08-19-pair-programming-or-code-reviews.md diff --git a/website/src/pages/daily-emails/2022-08-20.md b/website/src/daily-emails/2022-08-20.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-20.md rename to website/src/daily-emails/2022-08-20.md diff --git a/website/src/pages/daily-emails/2022-08-21.md b/website/src/daily-emails/2022-08-21.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-21.md rename to website/src/daily-emails/2022-08-21.md diff --git a/website/src/pages/daily-emails/2022-08-22.md b/website/src/daily-emails/2022-08-22.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-22.md rename to website/src/daily-emails/2022-08-22.md diff --git a/website/src/pages/daily-emails/2022-08-23.md b/website/src/daily-emails/2022-08-23.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-23.md rename to website/src/daily-emails/2022-08-23.md diff --git a/website/src/pages/daily-emails/2022-08-24.md b/website/src/daily-emails/2022-08-24.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-24.md rename to website/src/daily-emails/2022-08-24.md diff --git a/website/src/pages/daily-emails/2022-08-25.md b/website/src/daily-emails/2022-08-25.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-25.md rename to website/src/daily-emails/2022-08-25.md diff --git a/website/src/pages/daily-emails/2022-08-26.md b/website/src/daily-emails/2022-08-26.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-26.md rename to website/src/daily-emails/2022-08-26.md diff --git a/website/src/pages/daily-emails/2022-08-27.md b/website/src/daily-emails/2022-08-27.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-27.md rename to website/src/daily-emails/2022-08-27.md diff --git a/website/src/pages/daily-emails/2022-08-28.md b/website/src/daily-emails/2022-08-28.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-28.md rename to website/src/daily-emails/2022-08-28.md diff --git a/website/src/pages/daily-emails/2022-08-29.md b/website/src/daily-emails/2022-08-29.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-29.md rename to website/src/daily-emails/2022-08-29.md diff --git a/website/src/pages/daily-emails/2022-08-30.md b/website/src/daily-emails/2022-08-30.md similarity index 100% rename from website/src/pages/daily-emails/2022-08-30.md rename to website/src/daily-emails/2022-08-30.md diff --git a/website/src/pages/daily-emails/2022-09-01.md b/website/src/daily-emails/2022-09-01.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-01.md rename to website/src/daily-emails/2022-09-01.md diff --git a/website/src/pages/daily-emails/2022-09-02.md b/website/src/daily-emails/2022-09-02.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-02.md rename to website/src/daily-emails/2022-09-02.md diff --git a/website/src/pages/daily-emails/2022-09-03.md b/website/src/daily-emails/2022-09-03.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-03.md rename to website/src/daily-emails/2022-09-03.md diff --git a/website/src/pages/daily-emails/2022-09-04.md b/website/src/daily-emails/2022-09-04.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-04.md rename to website/src/daily-emails/2022-09-04.md diff --git a/website/src/pages/daily-emails/2022-09-05.md b/website/src/daily-emails/2022-09-05.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-05.md rename to website/src/daily-emails/2022-09-05.md diff --git a/website/src/pages/daily-emails/2022-09-06.md b/website/src/daily-emails/2022-09-06.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-06.md rename to website/src/daily-emails/2022-09-06.md diff --git a/website/src/pages/daily-emails/2022-09-07.md b/website/src/daily-emails/2022-09-07.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-07.md rename to website/src/daily-emails/2022-09-07.md diff --git a/website/src/pages/daily-emails/2022-09-08.md b/website/src/daily-emails/2022-09-08.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-08.md rename to website/src/daily-emails/2022-09-08.md diff --git a/website/src/pages/daily-emails/2022-09-09.md b/website/src/daily-emails/2022-09-09.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-09.md rename to website/src/daily-emails/2022-09-09.md diff --git a/website/src/pages/daily-emails/2022-09-10.md b/website/src/daily-emails/2022-09-10.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-10.md rename to website/src/daily-emails/2022-09-10.md diff --git a/website/src/pages/daily-emails/2022-09-11.md b/website/src/daily-emails/2022-09-11.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-11.md rename to website/src/daily-emails/2022-09-11.md diff --git a/website/src/pages/daily-emails/2022-09-12.md b/website/src/daily-emails/2022-09-12.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-12.md rename to website/src/daily-emails/2022-09-12.md diff --git a/website/src/pages/daily-emails/2022-09-14.md b/website/src/daily-emails/2022-09-14.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-14.md rename to website/src/daily-emails/2022-09-14.md diff --git a/website/src/pages/daily-emails/2022-09-16.md b/website/src/daily-emails/2022-09-16.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-16.md rename to website/src/daily-emails/2022-09-16.md diff --git a/website/src/pages/daily-emails/2022-09-17.md b/website/src/daily-emails/2022-09-17.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-17.md rename to website/src/daily-emails/2022-09-17.md diff --git a/website/src/pages/daily-emails/2022-09-19.md b/website/src/daily-emails/2022-09-19.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-19.md rename to website/src/daily-emails/2022-09-19.md diff --git a/website/src/pages/daily-emails/2022-09-20.md b/website/src/daily-emails/2022-09-20.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-20.md rename to website/src/daily-emails/2022-09-20.md diff --git a/website/src/pages/daily-emails/2022-09-21.md b/website/src/daily-emails/2022-09-21.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-21.md rename to website/src/daily-emails/2022-09-21.md diff --git a/website/src/pages/daily-emails/2022-09-22.md b/website/src/daily-emails/2022-09-22.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-22.md rename to website/src/daily-emails/2022-09-22.md diff --git a/website/src/pages/daily-emails/2022-09-23.md b/website/src/daily-emails/2022-09-23.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-23.md rename to website/src/daily-emails/2022-09-23.md diff --git a/website/src/pages/daily-emails/2022-09-25.md b/website/src/daily-emails/2022-09-25.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-25.md rename to website/src/daily-emails/2022-09-25.md diff --git a/website/src/pages/daily-emails/2022-09-26.md b/website/src/daily-emails/2022-09-26.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-26.md rename to website/src/daily-emails/2022-09-26.md diff --git a/website/src/pages/daily-emails/2022-09-27.md b/website/src/daily-emails/2022-09-27.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-27.md rename to website/src/daily-emails/2022-09-27.md diff --git a/website/src/pages/daily-emails/2022-09-28.md b/website/src/daily-emails/2022-09-28.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-28.md rename to website/src/daily-emails/2022-09-28.md diff --git a/website/src/pages/daily-emails/2022-09-30.md b/website/src/daily-emails/2022-09-30.md similarity index 100% rename from website/src/pages/daily-emails/2022-09-30.md rename to website/src/daily-emails/2022-09-30.md diff --git a/website/src/pages/daily-emails/2022-10-01.md b/website/src/daily-emails/2022-10-01.md similarity index 100% rename from website/src/pages/daily-emails/2022-10-01.md rename to website/src/daily-emails/2022-10-01.md diff --git a/website/src/pages/daily-emails/2022-10-02.md b/website/src/daily-emails/2022-10-02.md similarity index 100% rename from website/src/pages/daily-emails/2022-10-02.md rename to website/src/daily-emails/2022-10-02.md diff --git a/website/src/pages/daily-emails/2022-10-03.md b/website/src/daily-emails/2022-10-03.md similarity index 100% rename from website/src/pages/daily-emails/2022-10-03.md rename to website/src/daily-emails/2022-10-03.md diff --git a/website/src/pages/daily-emails/2022-10-08.md b/website/src/daily-emails/2022-10-08.md similarity index 97% rename from website/src/pages/daily-emails/2022-10-08.md rename to website/src/daily-emails/2022-10-08.md index af6e9ebe..4f91e9cf 100644 --- a/website/src/pages/daily-emails/2022-10-08.md +++ b/website/src/daily-emails/2022-10-08.md @@ -1,5 +1,4 @@ --- -layout: ../../layouts/PageLayout.astro title: First impressions of Astro pubDate: "2022-10-08" permalink: archive/2022/10/08/first-impressions-astro diff --git a/website/src/pages/daily-emails/2022-10-09.md b/website/src/daily-emails/2022-10-09.md similarity index 98% rename from website/src/pages/daily-emails/2022-10-09.md rename to website/src/daily-emails/2022-10-09.md index 2309e733..a1daf995 100644 --- a/website/src/pages/daily-emails/2022-10-09.md +++ b/website/src/daily-emails/2022-10-09.md @@ -1,5 +1,4 @@ --- -layout: ../../layouts/DailyEmailLayout.astro title: Coding defensively, and Implicit vs explicit coding pubDate: "2022-10-09" permalink: archive/2022/10/09/coding-defensively-implicit-explicit diff --git a/website/src/pages/daily-emails/monorepo-or-not.md b/website/src/daily-emails/monorepo-or-not.md similarity index 100% rename from website/src/pages/daily-emails/monorepo-or-not.md rename to website/src/daily-emails/monorepo-or-not.md diff --git a/website/src/pages/archive.xml.js b/website/src/pages/archive.xml.js index 1a7a655d..f1dce7cf 100644 --- a/website/src/pages/archive.xml.js +++ b/website/src/pages/archive.xml.js @@ -1,6 +1,6 @@ import rss from '@astrojs/rss'; -const emailImportResult = import.meta.glob('./daily-emails/**/*.md', { eager: true }); +const emailImportResult = import.meta.glob('../daily-emails/*.md', { eager: true }); const emails = Object.values(emailImportResult) .sort((a, b) => new Date(b.frontmatter.pubDate).valueOf() - @@ -8,13 +8,12 @@ const emails = Object.values(emailImportResult) ) export const get = () => rss({ - title: 'Daily list', + title: 'Daily email list', description: 'A daily newsletter on software development, DevOps, community, and open-source.', site: import.meta.env.SITE, items: emails.map((email) => ({ - description: email.compiledContent(), - link: email.url, - pubDate: email.frontmatter.pubDate, + link: `${import.meta.env.SITE}${email.frontmatter.permalink}`, title: email.frontmatter.title, + pubDate: email.frontmatter.pubDate, })) }); diff --git a/website/src/pages/archive/[...slug].astro b/website/src/pages/archive/[...slug].astro index 534626bf..e96242f0 100644 --- a/website/src/pages/archive/[...slug].astro +++ b/website/src/pages/archive/[...slug].astro @@ -1,9 +1,9 @@ --- import DailyEmailForm from '../../components/DailyEmailForm.astro' -import PageLayout from '../../layouts/PageLayout.astro' +import Layout from '../../layouts/DailyEmailLayout.astro' export async function getStaticPaths() { - const emails = await Astro.glob('../daily-emails/*.md') + const emails = await Astro.glob('../../daily-emails/*.md') return emails.map(email => ({ params: { @@ -16,6 +16,9 @@ export async function getStaticPaths() { } const { Content } = Astro.props.email +const { title } = Astro.props.email.frontmatter --- - + + + diff --git a/website/src/pages/archive/index.astro b/website/src/pages/archive/index.astro index b56def2f..e0041d95 100644 --- a/website/src/pages/archive/index.astro +++ b/website/src/pages/archive/index.astro @@ -1,7 +1,7 @@ --- import PageLayout from '../../layouts/PageLayout.astro' -const emails = await Astro.glob('../daily-emails/*.md'); +const emails = await Astro.glob('../../daily-emails/*.md'); const sortedEmails = emails .sort((a, b) =>