From bc058dc99a053b6fd779f8fe16553f4b3af780ae Mon Sep 17 00:00:00 2001
From: Jonathan Partain <jonathan.partain@protonmail.com>
Date: Fri, 17 Nov 2023 17:15:26 +0100
Subject: [PATCH 1/2] moved communityposts to just posts

---
 .../2023-11-23-oopsex-movie-boardgames-night.md                | 1 -
 communityposts.md => posts.md                                  | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename _communityposts/oopsex-movie-boardgames-night.md => _posts/2023-11-23-oopsex-movie-boardgames-night.md (98%)
 rename communityposts.md => posts.md (64%)

diff --git a/_communityposts/oopsex-movie-boardgames-night.md b/_posts/2023-11-23-oopsex-movie-boardgames-night.md
similarity index 98%
rename from _communityposts/oopsex-movie-boardgames-night.md
rename to _posts/2023-11-23-oopsex-movie-boardgames-night.md
index aa5343c..9555e1a 100644
--- a/_communityposts/oopsex-movie-boardgames-night.md
+++ b/_posts/2023-11-23-oopsex-movie-boardgames-night.md
@@ -6,7 +6,6 @@ sub_title: A night full of laughter, excitement, and endless entertainment!
 author:
   name: SKIP
 comments: false
-collection: communityposts
 ---
 
 <!-- Export from Orbi -->
diff --git a/communityposts.md b/posts.md
similarity index 64%
rename from communityposts.md
rename to posts.md
index abd2e82..fe3deb7 100644
--- a/communityposts.md
+++ b/posts.md
@@ -1,7 +1,6 @@
 ---
 title: Posts
-layout: collection
+layout: posts
 permalink: /posts/
-collection: communityposts
 entries_layout: list #list (default), grid
 ---

From 43a84b6a29a67009b47c6c8a3bb827c7b2634392 Mon Sep 17 00:00:00 2001
From: Jonathan Partain <jonathan.partain@protonmail.com>
Date: Fri, 17 Nov 2023 17:16:30 +0100
Subject: [PATCH 2/2] Modified config, data etc to suit the new posts setup.
 Modified github build step to build with future flag, in order to display
 events and posts happening in the future

---
 .github/workflows/deploy.yml |  1 +
 README.md                    |  2 +-
 _config.yml                  | 15 ---------------
 _data/theme.yml              |  5 ++++-
 scripts/dev.sh               |  2 +-
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4bf31f1..2c73eab 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -34,6 +34,7 @@ jobs:
         with:
           source: ./
           destination: ./_site
+          future: true
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v2
 
diff --git a/README.md b/README.md
index d2b6936..83742bf 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ $ bundle install
 ### Run (local level)
 
 ```sh
-$ bundle exec jekyll serve --config "_config.yml,_config_local.yml"
+$ bundle exec jekyll serve --config "_config.yml,_config_local.yml" --future
 ```
 
 Or, more simply
diff --git a/_config.yml b/_config.yml
index 2a69345..bbdfa14 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,18 +15,3 @@ paginate_path: /page:num/
 
 plugins:
   - jekyll-paginate
-
-collections:
-  communityposts:
-    output: true
-    permalink: /posts/:path/
-
-defaults:
-  - scope:
-      path: "_communityposts"
-      type: communityposts
-    values:
-      layout: posts
-      read_time: true
-    
-
diff --git a/_data/theme.yml b/_data/theme.yml
index f34f53e..59d0a29 100644
--- a/_data/theme.yml
+++ b/_data/theme.yml
@@ -3,4 +3,7 @@ skin: night # default, night, plum, sea, soft, steel
 navigation_pages:
   - join_skip.md
   - membership.md
-  - communityposts.md
+  - posts.md
+
+t:
+  posts: Posts and Events
diff --git a/scripts/dev.sh b/scripts/dev.sh
index 748fa0d..7507605 100755
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@@ -3,4 +3,4 @@
 # Run the jekyll server locally in development mode;
 # that is, changes are reflected immediately in the browser.
 
-bundle exec jekyll serve --config "_config.yml,_config_local.yml"
+bundle exec jekyll serve --config "_config.yml,_config_local.yml" --future