Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# ignore hidden files
.*

node_modules/
_site/
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,7 @@ Dockerfile text eol=lf
*.mp3 binary
*.ogg binary
*.flv binary

# ensure dockerfiles are checked out with LF line endings
Dockerfile text eol=lf
*.dockerfile text eol=lf
4 changes: 0 additions & 4 deletions .github/FUNDING.yml

This file was deleted.

55 changes: 55 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
---
# This file is centrally managed in https://github.com/<organization>/.github/
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
# the above-mentioned repo.

version: 2
updates:
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
time: "08:00"
open-pull-requests-limit: 10

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
time: "08:30"
open-pull-requests-limit: 10

- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
time: "09:00"
open-pull-requests-limit: 10

- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "daily"
time: "09:30"
open-pull-requests-limit: 10

- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "daily"
time: "10:00"
open-pull-requests-limit: 10

- package-ecosystem: "gitsubmodule"
directory: "/"
schedule:
interval: "daily"
time: "10:30"
open-pull-requests-limit: 10

- package-ecosystem: "bundler"
directory: "/"
schedule:
interval: "daily"
time: "11:00"
open-pull-requests-limit: 10
3 changes: 0 additions & 3 deletions .github/issue_template.md

This file was deleted.

5 changes: 0 additions & 5 deletions .github/pull_request_template.md

This file was deleted.

64 changes: 58 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,67 @@
---
name: Beautiful Jekyll CI
on: [push, pull_request]

on:
push:
branches:
- master
pull_request:
branches:
- master

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}

jobs:
build:
name: Build Jekyll
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 'latest'

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3'
- name: Install dependencies
run: bundle install && bundle exec appraisal install
# runs `bundle install` and caches gems automatically,
# unfortunately the `Build site` step fails when using cache
# bundler-cache: true

- name: Install ruby dependencies
run: |
bundle install
bundle exec appraisal install

- name: Build site
run: bundle exec appraisal jekyll build --future
run: |
bundle exec appraisal jekyll build --future

- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: _site
path: _site/
if-no-files-found: error

publish:
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
needs: build
runs-on: ubuntu-latest
steps:
- name: Download Artifacts
uses: actions/download-artifact@v4
with:
name: _site
path: gh-pages

- name: Deploy
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./gh-pages
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# ignore JetBrains IDE files
.idea/

# project
_site
.sass-cache
Expand All @@ -11,3 +14,7 @@ ehthumbs.db
Gemfile.lock

beautiful-jekyll-theme-*.gem

# npm
node_modules/
package-lock.json
20 changes: 20 additions & 0 deletions .run/Dockerfile.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="containerName" value="" />
<option name="portBindings">
<list>
<DockerPortBindingImpl>
<option name="containerPort" value="4000" />
<option name="hostPort" value="4000" />
</DockerPortBindingImpl>
</list>
</option>
<option name="commandLineOptions" value="--net=host" />
<option name="sourceFilePath" value="Dockerfile" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>
32 changes: 32 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
FROM ruby:3.3-bookworm

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN <<_DEPS
#!/bin/bash
set -e

apt-get update -qq
apt-get install -y \
build-essential \
nodejs \
npm
_DEPS

WORKDIR /app

COPY . .

# Install the gems specified in the Gemfile
RUN <<_SETUP
#!/bin/bash
set -e

bundle install
_SETUP

# Expose the port that Jekyll will run on
EXPOSE 4000

# Command to build and serve the Jekyll site
CMD ["bundle", "exec", "jekyll", "serve", "--trace", "--config", "_config.yml,_config_local.yml"]
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
source "https://rubygems.org"

gemspec

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Beautiful Jekyll

TODO: Update Readme for fork

[![Gem Version](https://badge.fury.io/rb/beautiful-jekyll-theme.svg)](https://badge.fury.io/rb/beautiful-jekyll-theme)

> By [Dean Attali](https://deanattali.com) &middot; [Demo](https://beautifuljekyll.com/)
Expand Down
50 changes: 36 additions & 14 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ social-network-links:
youtube: "@daattali"
whatsapp: 15551212
# medium: yourname
# reddit: yourname
# reddit: yourname or r/yoursubreddit
# linkedin: daattali
# xing: yourname
# stackoverflow: "3943160/daattali"
Expand All @@ -76,7 +76,7 @@ social-network-links:
# bluesky: yourname
# ORCID: your ORCID ID
# google-scholar: your google scholar
# discord: "invite_code" or "users/userid" or "invite/invite_code"
# discord: "invite_code" or "users/userid" or "invite/invite_code"
# kaggle: yourname
# hackerrank: yourname
# gitlab: yourname
Expand Down Expand Up @@ -214,23 +214,23 @@ footer-hover-col: "#0085A1"
# label: blog-comments # Label that will be assigned to GitHub Issues created by Utterances

# To use Staticman comments, uncomment the following section. You may leave the reCaptcha
# section commented if you aren't using reCaptcha for spam protection.
# Using Staticman requires advanced knowledge, please consult
# https://github.com/eduardoboucas/staticman/ and https://staticman.net/ for further
# instructions. For any support with staticman please direct questions to staticman and
# section commented if you aren't using reCaptcha for spam protection.
# Using Staticman requires advanced knowledge, please consult
# https://github.com/eduardoboucas/staticman/ and https://staticman.net/ for further
# instructions. For any support with staticman please direct questions to staticman and
# not to BeautifulJekyll.
#staticman:
# repository : # GitHub username/repository eg. "daattali/beautiful-jekyll"
# branch : master # If you're not using `master` branch, then you also need to update the `branch` parameter in `staticman.yml`
# endpoint : # URL of your deployment, with a trailing slash eg. "https://<your-api>/v3/entry/github/"
# reCaptcha: # (optional, set these parameters in `staticman.yml` as well)
# reCaptcha: # (optional, set these parameters in `staticman.yml` as well)
# siteKey : # You need to apply for a site key on Google
# secret : # Encrypt your password by going to https://<your-own-api>/v3/encrypt/<your-site-secret>

# To use giscus comments:
# (0) Uncomment the following giscus section, (1) Enable Discussions in your GitHub repository,
# (0) Uncomment the following giscus section, (1) Enable Discussions in your GitHub repository,
# (2) Install the giscus app in your repository (details at https://giscus.app),
# (3) Fill in *all* the parameters below
# (3) Fill in *all* the parameters below
# See more details about giscus and each of the following parameters at https://giscus.app
#giscus:
# hostname: giscus.app # Replace with your giscus instance's hostname if self-hosting
Expand Down Expand Up @@ -267,18 +267,41 @@ paginate: 5
kramdown:
input: GFM

npm_hook:
modules_dir: node_modules
# npm_dependencies:
# - "@lizardbyte/shared-web@latest"
copy_files:
- src: "bootstrap/dist/css/bootstrap.min.css"
dst: "assets/vendor/css/bootstrap.min.css"
- src: "bootstrap/dist/css/bootstrap.min.css.map"
dst: "assets/vendor/css/bootstrap.min.css.map"
- src: "bootstrap/dist/js/bootstrap.min.js"
dst: "assets/vendor/js/bootstrap.min.js"
- src: "jquery/dist/jquery.min.js"
dst: "assets/vendor/js/jquery.min.js"
- src: "popper.js/dist/umd/popper.min.js"
dst: "assets/vendor/js/popper.min.js"
- src: "@fortawesome/fontawesome-free/css/all.min.css"
dst: "assets/vendor/css/fontawesome.min.css"
copy_dirs:
- src: "@fortawesome/fontawesome-free/webfonts"
dst: "assets/vendor/webfonts"
- src: "@fontsource/lora/"
dst: "assets/vendor/fonts/lora"
- src: "@fontsource/open-sans"
dst: "assets/vendor/fonts/open-sans"

# Default YAML values (more information on Jekyll's site)
defaults:
-
scope:
- scope:
path: ""
type: "posts"
values:
layout: "post"
comments: true # add comments to all blog posts
social-share: true # add social media sharing buttons to all blog posts
-
scope:
- scope:
path: "" # any file that's not a post will be a "page" layout by default
values:
layout: "page"
Expand All @@ -300,4 +323,3 @@ plugins:

# Beautiful Jekyll / Dean Attali
# 2fc73a3a967e97599c9763d05e564189

5 changes: 5 additions & 0 deletions _config_local.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
host: "localhost"
port: 4000
baseurl: ""
repository: "octocat/dummy"
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
{% include ext-css.html css=css %}
{% endfor %}
{% endif %}

{% if page.css %}
{% for css in page.css %}
<link rel="stylesheet" href="{{ css | relative_url }}">
Expand Down
12 changes: 8 additions & 4 deletions _includes/social-networks-links.html
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,12 @@
{%- endif -%}

{%- if network[0] == "reddit" -%}
{% assign reddit_start = network[1] | split: "/" | first -%}
{% unless reddit_start == 'r' or reddit_start == 'u' -%}
{% assign reddit_url_prefix = 'u/' -%}
{% endunless -%}
<li class="list-inline-item">
<a href="https://reddit.com/u/{{ network[1] }}" title="Reddit">
<a href="https://reddit.com/{{ reddit_url_prefix }}{{ network[1] }}" title="Reddit">
<span class="fa-stack fa-lg" aria-hidden="true">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-reddit fa-stack-1x fa-inverse"></i>
Expand Down Expand Up @@ -314,7 +318,7 @@
</a>
</li>
{%- endif -%}

{%- if network[0] == "medium" -%}
<li class="list-inline-item">
<a href="https://medium.com/@{{ network[1] }}" title="Medium">
Expand All @@ -338,7 +342,7 @@
</a>
</li>
{%- endif -%}

{%- if network[0] == "discord" -%}
{% assign discord_start = network[1] | split: "/" | first -%}
{% unless discord_start == 'users' or discord_start == 'invite' -%}
Expand All @@ -354,7 +358,7 @@
</a>
</li>
{%- endif -%}

{%- if network[0] == "kaggle" -%}
<li class="list-inline-item">
<a href="https://www.kaggle.com/{{ network[1] }}" title="Kaggle">
Expand Down
Loading