simple-gh-pages-theme 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76f74777454e6c817541ffd856c597ceb29108fcfc2ca2e1ff8710929e5b12a8
-  data.tar.gz: f4bef2936b68df0052a2622e161eacfb0ae5e510eb2c37d1054bd9c4d097ec00
+  metadata.gz: b44373a992017401fc4506c609fee23b0231a9de89aff5aed5d222d5e7fc0cba
+  data.tar.gz: 68ef089d1446713675933bc68e9ab52ca0604f442d9daba5c885f3960b79d5bd
 SHA512:
-  metadata.gz: cf6ba10ddddb570f4422e031bc33b48ce886e053c059d7375042a9c5c97a557ed32b6f81205b57cb015208b309c9ca2d0c7b07873479f357d0ca868bc0a9cc43
-  data.tar.gz: f3d8f92f9537a48deaff67323120ef1975e07b3c14bba368fd277d9f1142194f1da9767add52ba3ac1d812314818d22aeff59f0b3d3794c3b6fc37d774e398a6
+  metadata.gz: da5b2fa9992495f1fef392f35b6b5f1e600367b0c10f9c942b1228d13f33f0deb49009a9fb952d1154c27640192f1e473d4bceeb653c33a116ea1e19840fb8f7
+  data.tar.gz: 4013a523a0b55cfbd3307844abd4806eba63fef17927903494fee981c478a9363658f4e3c7bd840b0ec203b14766eaf056294f217dd5b1cc562fd6f6177f2560

data/README.md

@@ -2,7 +2,7 @@
 
 <table>
 <tr><td>
-<img width="500" alt="empty default" src="https://user-images.githubusercontent.com/5443727/229302809-750132e5-d461-4ec8-a38a-ccdc62b3b72e.png"> 
+<img width="500" alt="after installing the theme" src="https://user-images.githubusercontent.com/5443727/229901057-23be4caa-0c70-46c1-aa83-d60cbb1220ba.png">
 </td><td>
 <img width="500" alt="jordiwippert.nl" src="https://user-images.githubusercontent.com/5443727/229302812-d481eb40-b0ca-49cd-95d5-c7fef5228b7a.png">
 </td>
@@ -17,66 +17,62 @@ in-use: https://jordiwippert.nl
 </table>
 
 ## Quick installation
-
-1. Add this line to your Jekyll site's `Gemfile`:
-
+```shell
+# 0. To create a new Jekyll site:
+jekyll new <SITENAME>
+cd <SITENAME>
+```
 ```ruby
+# 1. Add this line to your Jekyll site's `Gemfile`:
 gem "simple-gh-pages-theme"
 ```
-
-2. Add this line to your Jekyll site's `_config.yml`. Remove/disable possibly already enabled themes:
-
 ```yaml
+# 2. Add this line to your Jekyll site's `_config.yml`. Remove/disable possibly already enabled themes:
 theme: simple-gh-pages-theme
 ```
-
-3. And then execute:
-
 ```shell
+# 3. Execute on your command line:
 bundle
-```
 
-4. Run install script to create 'posts.md'
-
-```shell
+# 4. Run install script to create 'posts.md'
 bundle exec install-theme
-```
 
-5. When you now run your website locally on `http://localhost:4000`, it should show the theme:
-
-```shell
+# 5. When you now run your website locally on `http://localhost:4000`, it should show the theme:
 bundle exec jekyll serve
 ```
 
 ## Configuration:
 
-See/use example config [here](https://github.com/LiveNL/simple-gh-pages-theme/blob/main/example-config.yml). Copy to `_config.yml`
+All configuration options that can be overwritten can be found [here](https://github.com/LiveNL/simple-gh-pages-theme/blob/main/_config.yml).
 
-## Usage
+## Github Pages setup
 
-### Posts
-
-Create your posts like:
+Go to `settings` > `page` in your github-pages-repository.
+1. Select source: `Deploy from a branch`
+2. Select branch: `gh-pages` (create if non-existent)
+3. Select `/docs` as folder
+4. You can now run `script/deploy`
 
+## Posts
+Create your posts (files) like:
 ```
-docs/_posts/published/yyyy-mm-dd-postname.md
+docs/_posts/yyyy-mm-dd-postname.md
 ```
 
-Each post can have the following options (with defaults):
-
-```
-layout:     post
-title:      "Title here"
-image:      assets/images/image.png OR https://example.com/image.png
-categories: [category]
-tags:       [tag]
-highlight:  false (if true: it will be used on about page, more here)
-short:      false (if true: it shown in 'short' list on home page)
+Each post can have the following (metadata) options (with example values):
+```yaml
+layout:     post                    # OR page
+title:      "Title here"            # Used for post-titles
+image:      assets/images/image.png # OR images on urls like: https://example.com/image.png
+categories: [category]              # 'category' can be anything
+tags:       [tag]                   # 'tag' can be everything
+highlight:  false                   # if true: it will listed in highlights, which can be shown with: `{% include highlights.html %}`
+short:      false                   # if true: it shown in 'short' list on home page
 ```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/lvenl/simple-gh-pages-theme. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](https://www.contributor-covenant.org/) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/LiveNL/simple-gh-pages-theme. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](https://www.contributor-covenant.org/) code of conduct.
 
 ## License
 

data/_includes/navigation.html

@@ -7,12 +7,12 @@
   {% endfor %}
   <div class="social">
     {% assign socials = site.about.socials %}
-    {% for items in socials %}
-      {% for item in items %}
-        <a target="_blank" href="{{items[item]}}">
-          <i class="fa-brands fa-{{item}} text-muted" aria-hidden="true"></i>
-        </a>
-      {% endfor %}
+    {% for social in socials %}
+      {% assign social_type = social[0] %}
+      {% assign social_url = social[1] %}
+      <a target="_blank" href="{{social_url}}">
+        <i class="fa-brands fa-{{social_type}} text-muted" aria-hidden="true"></i>
+      </a>
     {% endfor %}
     <a href="mailto: {{site.about.email}}">
       <i class="fa fa-envelope text-muted" aria-hidden="true"></i>

data/bin/install-theme

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 # Create 'posts.md'
 File.write('posts.md', <<~HEREDOC
   ---
@@ -6,3 +8,59 @@ File.write('posts.md', <<~HEREDOC
   ---
   HEREDOC
 )
+
+if !Dir.exist?("docs")
+  Dir.mkdir("docs")
+end
+
+Dir.glob("*").each do |file|
+  next if file == ".gitignore" || file == "docs"
+  if File.directory?(file)
+    FileUtils.mkdir_p("docs/#{file}")
+    FileUtils.cp_r("#{file}/.", "docs/#{file}/")
+    FileUtils.rm_rf(file)
+  else
+    FileUtils.mv(file, "docs/#{file}")
+  end
+end
+
+# Create 'script/deploy'
+if !Dir.exist?("script")
+  Dir.mkdir("script")
+end
+
+File.write('script/deploy', <<~HEREDOC
+  #!/bin/bash
+
+  MAIN_BRANCH="main"
+  DEPLOY_BRANCH="gh-pages"
+
+  # Clear files in deploy_branch
+  git checkout $DEPLOY_BRANCH
+  rm -r docs
+
+  # Get docs-files/folders from main_branch
+  git checkout $MAIN_BRANCH -- docs
+  cd docs || exit
+
+  # Build _site contents
+  bundle exec jekyll build
+  cd .. || exit
+
+  # Delete everything except for the docs/_site folder
+  find docs -mindepth 1 -maxdepth 1 ! -name '_site' -exec rm -r {} +
+
+  # Move all files in docs/_site to the docs folder
+  mv docs/_site/* docs
+
+  # Create commit with last message from main_branch and commit to deploy_branch
+  git add .
+  COMMIT_MESSAGE=$(git log $DEPLOY_BRANCH -1 --pretty="%h %s")
+  git commit -m "$COMMIT_MESSAGE"
+  git push origin $DEPLOY_BRANCH
+  git checkout $MAIN_BRANCH
+  HEREDOC
+)
+
+
+File.chmod(0777, "script/deploy")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-gh-pages-theme
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - LiveNL
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-archives
@@ -85,7 +85,8 @@ files:
 homepage: https://github.com/LiveNL/simple-gh-pages-theme
 licenses:
 - MIT
-metadata: {}
+metadata:
+  github_repo: https://github.com/LiveNL/simple-gh-pages-theme
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: This gem provides a simple GitHub pages theme