From 043cf114e7b0f43135783132decd184e7267fe15 Mon Sep 17 00:00:00 2001 From: vincent Date: Wed, 16 Aug 2023 14:04:43 -0400 Subject: [PATCH 1/9] Update feed configuration for dripline posts and cosmos collection - Set dripline feed title to "Hypha Worker Co-operative | Dripline". - Specify path for dripline feed. - Add configuration for cosmos collection feed with its title and path. - Test that replaces the forked jekyll-feed gem source with the official version from RubyGems. --- Gemfile | 2 +- _config.yml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 92018d51..b5c34d4c 100644 --- a/Gemfile +++ b/Gemfile @@ -14,5 +14,5 @@ gem "html-proofer" gem "webrick", "~> 1.8" group :jekyll_plugins do - gem "jekyll-feed", git: "https://github.com/hyphacoop/jekyll-feed" + gem "jekyll-feed" end diff --git a/_config.yml b/_config.yml index 36b7718e..8b88151d 100644 --- a/_config.yml +++ b/_config.yml @@ -63,4 +63,9 @@ plugins: [] #- jekyll-feed feed: - title: Dripline + title: "Hypha Worker Co-operative | Dripline" + path: "feed.xml" + collections: + cosmos: + path: "cosmos.xml" + title: "Hypha Does Cosmos" From 0f473f51514ec8a3be0749008a43447964660ca4 Mon Sep 17 00:00:00 2001 From: tripledoublev Date: Tue, 26 Sep 2023 21:29:47 -0400 Subject: [PATCH 2/9] use specific jekyll-feed ref --- Gemfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index b5c34d4c..216b9425 100644 --- a/Gemfile +++ b/Gemfile @@ -14,5 +14,7 @@ gem "html-proofer" gem "webrick", "~> 1.8" group :jekyll_plugins do - gem "jekyll-feed" -end + gem "jekyll-feed", + git: "https://github.com/hyphacoop/jekyll-feed", + ref: "a7c018943a31186abaa6d9852677d6817cab956c" +end \ No newline at end of file From 6e5f10b4763f7f3515994c4d392efa4419e44bf7 Mon Sep 17 00:00:00 2001 From: tripledoublev Date: Tue, 26 Sep 2023 21:30:27 -0400 Subject: [PATCH 3/9] Reformat feed configurations --- _config.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index 8b88151d..9f24d422 100644 --- a/_config.yml +++ b/_config.yml @@ -63,9 +63,13 @@ plugins: [] #- jekyll-feed feed: - title: "Hypha Worker Co-operative | Dripline" - path: "feed.xml" + title: "Hypha Worker Co-operative" collections: + posts: + path: "feed.xml" + name: "Dripline" + description: "This is the place for our collective writing ranging from short posts, to interviews, design retrospectives, and essays. We publish on a (mostly) monthly schedule." cosmos: path: "cosmos.xml" - title: "Hypha Does Cosmos" + name: "Hypha Does Cosmos" + description: "Hypha writes about our work in the Cosmos ecosystem" \ No newline at end of file From 59dec274def39800c92c50269715f198b4863e00 Mon Sep 17 00:00:00 2001 From: tripledoublev Date: Tue, 26 Sep 2023 21:31:49 -0400 Subject: [PATCH 4/9] Output:true on posts --- _config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_config.yml b/_config.yml index 9f24d422..566e38e7 100644 --- a/_config.yml +++ b/_config.yml @@ -31,6 +31,8 @@ collections: people: posts: permalink: /dripline/:title/ + output: true + work: date_format: '%B %-d, %Y' From a6b76e903d81872ab2f4cb968ee4e812400c1019 Mon Sep 17 00:00:00 2001 From: tripledoublev Date: Tue, 26 Sep 2023 21:39:27 -0400 Subject: [PATCH 5/9] Fix feed.xml link --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index ac009730..752bda40 100644 --- a/_config.yml +++ b/_config.yml @@ -7,7 +7,7 @@ github: https://github.com/hyphacoop linkedin: https://www.linkedin.com/company/hyphacoop/ twitter: https://twitter.com/hyphacoop/ handbook: https://link.hypha.coop/handbook -rss: /feed.xml +rss: feed.xml # facebook: https://www.facebook.com/hyphacoop/ # instagram: https://instagram.com/hyphacoop/ url: "https://hypha.coop" From 208e909c6e87ac3f5a0ffe82073599794ef14965 Mon Sep 17 00:00:00 2001 From: tripledoublev Date: Tue, 26 Sep 2023 21:58:52 -0400 Subject: [PATCH 6/9] Update RSS feed link --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 752bda40..cc230f3c 100644 --- a/_config.yml +++ b/_config.yml @@ -7,7 +7,7 @@ github: https://github.com/hyphacoop linkedin: https://www.linkedin.com/company/hyphacoop/ twitter: https://twitter.com/hyphacoop/ handbook: https://link.hypha.coop/handbook -rss: feed.xml +rss: "https://hypha.coop/feed.xml" # facebook: https://www.facebook.com/hyphacoop/ # instagram: https://instagram.com/hyphacoop/ url: "https://hypha.coop" From 09229b6bf0a0a0aa96ea91aa57c82de302fbf26e Mon Sep 17 00:00:00 2001 From: tripledoublev Date: Wed, 27 Sep 2023 22:36:06 -0400 Subject: [PATCH 7/9] Load custom feed --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 216b9425..4de6dc81 100644 --- a/Gemfile +++ b/Gemfile @@ -16,5 +16,5 @@ gem "webrick", "~> 1.8" group :jekyll_plugins do gem "jekyll-feed", git: "https://github.com/hyphacoop/jekyll-feed", - ref: "a7c018943a31186abaa6d9852677d6817cab956c" + ref: "8837225f79a4464cc3b936a1365130aa6db65180" end \ No newline at end of file From ad47c86de4a3997799ee413338496189ee81c45e Mon Sep 17 00:00:00 2001 From: tripledoublev Date: Wed, 27 Sep 2023 22:47:24 -0400 Subject: [PATCH 8/9] Update RSS link to be relative and adjust footer to reflect changes --- _config.yml | 2 +- _includes/sections/footer.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index cc230f3c..6ea103fb 100644 --- a/_config.yml +++ b/_config.yml @@ -7,7 +7,7 @@ github: https://github.com/hyphacoop linkedin: https://www.linkedin.com/company/hyphacoop/ twitter: https://twitter.com/hyphacoop/ handbook: https://link.hypha.coop/handbook -rss: "https://hypha.coop/feed.xml" +rss: "/feed.xml" # facebook: https://www.facebook.com/hyphacoop/ # instagram: https://instagram.com/hyphacoop/ url: "https://hypha.coop" diff --git a/_includes/sections/footer.html b/_includes/sections/footer.html index 5a346e26..eb901a50 100644 --- a/_includes/sections/footer.html +++ b/_includes/sections/footer.html @@ -6,7 +6,7 @@
  • LinkedIn
  • Twitter
  • Handbook
    • -
  • +
  • RSS rss icon From 16bce6a7fcdcadbb88a4d80c235b54f786576ef1 Mon Sep 17 00:00:00 2001 From: tripledoublev Date: Thu, 28 Sep 2023 11:18:34 -0400 Subject: [PATCH 9/9] Remove redundant output: true for Jekyll posts As pointed out in the code review, Jekyll posts have `output: true` by default, making this explicit setting unnecessary. --- _config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/_config.yml b/_config.yml index 6ea103fb..1d6d73f8 100644 --- a/_config.yml +++ b/_config.yml @@ -32,8 +32,6 @@ collections: people: posts: permalink: /dripline/:title/ - output: true - work: date_format: '%B %-d, %Y'