Feature/fix conflict

.github/workflows/build-deploy.yml

@@ -0,0 +1,76 @@
+name: "Build and Deploy"
+on:
+  push:
+    branches:
+      - main
+      - master
+    paths-ignore:
+      - .gitignore
+      - README.md
+      - LICENSE
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+          # If using the 'assets' git submodule from Chirpy Starter, uncomment above
+          # (See: https://github.com/cotes2020/chirpy-starter/tree/main/assets)
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v4
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+          bundler-cache: true
+
+      - name: npm build
+        run: npm install && npm run build
+
+      - name: Build site
+        run: bundle exec jekyll b -d "_site${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: "production"
+
+      - name: Test site
+        run: |
+          bundle exec htmlproofer _site \
+            \-\-disable-external \
+            \-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/"
+
+      - name: Upload site artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: "_site${{ steps.pages.outputs.base_path }}"
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/scripts/pr-filter.js

@@ -12,7 +12,12 @@ function hasDescription(markdown) {
 export default async ({ github, context, core }) => {
   const pr = context.payload.pull_request;
   const body = pr.body === null ? '' : pr.body;
-  const markdown = body.replace(/<!--[\s\S]*?-->/g, '');
+  let markdown = body;
+  let previous;
+  do {
+    previous = markdown;
+    markdown = markdown.replace(/<!--[\s\S]*?-->/g, '');
+  } while (markdown !== previous);
   const action = context.payload.action;
 
   const isValid =

7d0afff79dd24b81b8533e1e09c56a04.md

@@ -0,0 +1,5 @@
+---
+layout: redirect
+redirect: posts/Cpp-코드를-웹으로-포팅하는-Emscripten-알아보기
+---
+

CNAME

@@ -0,0 +1 @@
+blog.ounols.kr

_config.yml

@@ -6,40 +6,40 @@ theme: jekyll-theme-chirpy
 # The language of the webpage › http://www.lingoes.net/en/translator/langcode.htm
 # If it has the same name as one of the files in folder `_data/locales`, the layout language will also be changed,
 # otherwise, the layout language will use the default value of 'en'.
-lang: en
+lang: ko
 
 # Change to your timezone › https://zones.arilyn.cc
-timezone: Asia/Shanghai
+timezone: Asia/Seoul
 
 # jekyll-seo-tag settings › https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md
 # ↓ --------------------------
 
-title: Chirpy # the main title
+title: "@Ounols" # the main title
 
-tagline: A text-focused Jekyll theme # it will display as the subtitle
+tagline: I'm a game developer and interested in realtime rendering. # it will display as the subtitle
 
 description: >- # used by seo meta and the atom feed
   A minimal, responsive and feature-rich Jekyll theme for technical writing.
 
 # Fill in the protocol & hostname for your site.
 # E.g. 'https://username.github.io', note that it does not end with a '/'.
-url: ""
+url: "https://ounols.kr"
 
 github:
-  username: github_username # change to your GitHub username
+  username: ounols # change to your GitHub username
 
 twitter:
-  username: twitter_username # change to your Twitter username
+  username: eftdjmr # change to your Twitter username
 
 social:
   # Change to your full name.
   # It will be displayed as the default author of the posts and the copyright owner in the Footer
-  name: your_full_name
-  email: example@domain.com # change to your email address
+  name: ounols
+  email: ounols@naver.com # change to your email address
   links:
     # The first element serves as the copyright owner's link
-    - https://twitter.com/username # change to your Twitter homepage
-    - https://github.com/username # change to your GitHub homepage
+    - https://github.com/ounols # change to your GitHub homepage
+    - https://www.linkedin.com/in/lerp
     # Uncomment below to add more social links
     # - https://www.facebook.com/username
     # - https://www.linkedin.com/in/username
@@ -95,10 +95,11 @@ theme_mode: # [light | dark]
 # will be added to all media resources (site avatar, posts' images, audio and video files) paths starting with '/'
 #
 # e.g. 'https://cdn.com'
-cdn: "https://chirpy-img.netlify.app"
+# cdn: "https://chirpy-img.netlify.app"
+cdn: "https://ounols.kr"
 
 # the avatar on sidebar, support local or CORS resources
-avatar: "/commons/avatar.jpg"
+avatar: "/assets/img/favicons/12756091.png"
 
 # The URL of the site-wide social preview image used in SEO `og:image` meta tag.
 # It can be overridden by a customized `page.image` in front matter.
@@ -109,7 +110,7 @@ toc: true
 
 comments:
   # Global switch for the post-comment system. Keeping it empty means disabled.
-  provider: # [disqus | utterances | giscus]
+  provider: giscus # [disqus | utterances | giscus]
   # The provider options are as follows:
   disqus:
     shortname: # fill with the Disqus shortname. › https://help.disqus.com/en/articles/1717111-what-s-a-shortname
@@ -119,15 +120,15 @@ comments:
     issue_term: # < url | pathname | title | ...>
   # Giscus options › https://giscus.app
   giscus:
-    repo: # <gh-username>/<repo>
-    repo_id:
-    category:
-    category_id:
+    repo: ounols/jekyll-blog
+    repo_id: R_kgDOOO4wEA
+    category: General
+    category_id: DIC_kwDOOO4wEM4CoiHa
     mapping: # optional, default to 'pathname'
     strict: # optional, default to '0'
     input_position: # optional, default to 'bottom'
-    lang: # optional, default to the value of `site.lang`
-    reactions_enabled: # optional, default to the value of `1`
+    lang: en
+    reactions_enabled: 1 # optional, default to the value of `1`
 
 # Self-hosted static assets, optional › https://github.com/cotes2020/chirpy-static-assets
 assets:
@@ -215,6 +216,7 @@ exclude:
   - purgecss.js
   - "*.config.js"
   - "package*.json"
+  - "*.sh"
 
 jekyll-archives:
   enabled: [categories, tags]

_data/authors.yml

@@ -6,12 +6,6 @@
 #   url: {homepage_of_author}
 # -------------------------------------
 
-cotes:
-  name: Cotes Chung
-  twitter: cotes2020
-  url: https://github.com/cotes2020/
-
-sille_bille:
-  name: Dinesh Prasanth Moluguwan Krishnamoorthy
-  twitter: dinesh_MKD
-  url: https://github.com/SilleBille/
+ounols:
+  name: ounols
+  url: https://github.com/ounols/

_data/contact.yml

@@ -10,18 +10,18 @@
   icon: "fas fa-envelope"
   noblank: true # open link in current tab
 
-- type: rss
-  icon: "fas fa-rss"
-  noblank: true
+# - type: rss
+#   icon: "fas fa-rss"
+#   noblank: true
 # Uncomment and complete the url below to enable more contact options
 #
 # - type: mastodon
 #   icon: 'fab fa-mastodon'   # icons powered by <https://fontawesome.com/>
 #   url:  ''                  # Fill with your Mastodon account page, rel="me" will be applied for verification
 #
-# - type: linkedin
-#   icon: 'fab fa-linkedin'   # icons powered by <https://fontawesome.com/>
-#   url:  ''                  # Fill with your Linkedin homepage
+- type: linkedin
+  icon: "fab fa-linkedin" # icons powered by <https://fontawesome.com/>
+  url: "https://www.linkedin.com/in/lerp" # Fill with your Linkedin homepage
 #
 # - type: stack-overflow
 #   icon: 'fab fa-stack-overflow'

_includes/ad.html

@@ -0,0 +1,12 @@
+{% if page.layout != 'home' %}
+  <script
+    async
+    src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-7885608228730680"
+    crossorigin="anonymous"
+  ></script>
+  <script
+    src="https://app.rybbit.io/api/script.js"
+    data-site-id="185"
+    defer
+  ></script>
+{% endif %}

_includes/favicons.html

@@ -6,8 +6,7 @@
 {% capture favicon_path %}{{ '/assets/img/favicons' | relative_url }}{% endcapture %}
 
 <link rel="apple-touch-icon" sizes="180x180" href="{{ favicon_path }}/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href="{{ favicon_path }}/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="16x16" href="{{ favicon_path }}/favicon-16x16.png">
+<link rel="icon" type="image/png" sizes="96x96" href="{{ favicon_path }}/favicon-96x96.png">
 {% if site.pwa.enabled %}
   <link rel="manifest" href="{{ favicon_path }}/site.webmanifest">
 {% endif %}

_includes/head.html

@@ -122,5 +122,7 @@
     {% endfor %}
   {% endif %}
 
+  {% include ad.html %}
+
   {% include metadata-hook.html %}
 </head>

_includes/header.html

@@ -0,0 +1,110 @@
+{% assign date_format = site.date_format | default: '%B %-d, %Y' %}
+
+{% if page.image %}
+  <div
+    id="header-big-imgs"
+    data-num-img=""
+    {% if page.image.first %}
+      {{- page.image.cover.size -}}
+    {% else %}
+      1
+    {% endif %}
+    {% for bigimg in page.image.cover %}
+      {% assign imgnum = forloop.index %}
+      {% for imginfo in bigimg %}
+        {% if imginfo[0] %}
+          data-img-src-{{ imgnum }}="{{ new_url }}"
+          data-img-desc-{{ imgnum }}="{{ imginfo[1] }}"
+        {% else %}
+          data-img-src-{{ imgnum }}="{{ new_url }}"
+        {% endif %}
+      {% endfor %}
+    {% endfor %}
+  ></div>
+{% endif %}
+
+<header
+  id="post-header"
+  class="d-flex flex-column w-100"
+  style="
+    background-size: cover;
+    width: 100%;
+    {% if page.image %}
+      height: 300px;
+    {% endif %}
+  "
+>
+  <div
+    class="intro-header {% if page.image %} big-img {% endif %}"
+    style="
+      background-image: url('{{ new_url }}');
+      width: 100%;
+      height: 100%;
+      background-size: cover;
+      background-position: center;
+      background-repeat: no-repeat;
+      align-content: end;
+    "
+  >
+    {% if page.image or page.title %}
+      <div class="container d-flex flex-column px-xxl-5">
+        <div class="row">
+          <div class="col-12 col-lg-11 col-xl-9 px-md-4 px-1">
+            <div class="heading">
+              <h1
+                class="header-title"
+                style="
+                  {% if page.image %}
+                  color: white;
+                  text-shadow: -2px 0px 2px black, 0px 2px 2px black, 2px 0px 2px black, 0px -2px 2px black;
+                  {% endif %}
+                "
+              >
+                {% if page.title %}{{ page.title | strip_html }}{% else %}<br>{% endif %}
+              </h1>
+              {% if page.description %}
+                {% if include.type == 'page' %}
+                  <hr class="small">
+                  <span
+                    class="post-desc fw-light mb-4"
+                    style="
+                      {% if page.image %}
+                      color: #dddddd;
+                      text-shadow: -1px 0px 1px black, 0px 1px 1px black, 1px 0px 1px black, 0px -1px 1px black;
+                      {% endif %}
+                    "
+                  >
+                    {{- page.description | strip_html -}}
+                  </span>
+                {% else %}
+                  <h2
+                    class="post-desc fw-light mb-4"
+                    style="
+                      {% if page.image %}
+                      color: #dddddd;
+                      text-shadow: -1px 0px 1px black, 0px 1px 1px black, 1px 0px 1px black, 0px -1px 1px black;
+                      {% endif %}
+                    "
+                  >
+                    {{ page.description | strip_html }}
+                  </h2>
+                {% endif %}
+              {% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
+    {% endif %}
+    {% if page.image %}
+      <span class="img-desc"></span>
+    {% else %}
+      <hr>
+    {% endif %}
+  </div>
+
+  {% if page['header-extra'] %}
+    {% for file in page['header-extra'] %}
+      {% include {{ file }} %}
+    {% endfor %}
+  {% endif %}
+</header>