Fix merge conflicts and resulting errors

semicolonsnet · Nov 13, 2023 · 6d728a1 · 6d728a1
1 parent b8ebe85
commit 6d728a1
Show file tree

Hide file tree

Showing 25 changed files with 195 additions and 621 deletions.
diff --git a/_config.yml b/_config.yml
@@ -63,38 +63,27 @@ og_image: # The site-wide (default for all links) Open Graph preview image
 github_username: semicolonsnet # your GitHub user name
 gitlab_username: # your GitLab user name
 twitter_username: # your Twitter handle
+mastodon_username: # your mastodon instance+username in the format instance.tld/@username
 linkedin_username: chase-nordengren # your LinkedIn user name
+telegram_username: # your Telegram user name
 scholar_userid: # your Google Scholar ID
 semanticscholar_id: # your Semantic Scholar ID
+whatsapp_number: # your WhatsApp number (full phone number in international format. Omit any zeroes, brackets, or dashes when adding the phone number in international format.)
 orcid_id: 0000-0002-9249-1243 # your ORCID ID
 medium_username: # your Medium username
 quora_username: # your Quora username
 publons_id: # your ID on Publons
-research_gate_profile: Chase_Nordengren # your profile on ResearchGate
-=======
-mastodon_username: # your mastodon instance+username in the format instance.tld/@username
-linkedin_username: # your LinkedIn user name
-telegram_username: # your Telegram user name
-scholar_userid: # your Google Scholar ID
-whatsapp_number: # your WhatsApp number (full phone number in international format. Omit any zeroes, brackets, or dashes when adding the phone number in international format.)
-orcid_id: # your ORCID ID
-medium_username: # your Medium username
 lattes_id: # your ID on Lattes (Brazilian Lattes CV)
 osf_id: # your OSF ID
-research_gate_profile: # your profile on ResearchGate
+research_gate_profile: Chase_Nordengren # your profile on ResearchGate
 scopus_id: # your profile on Scopus
 blogger_url: # your blogger URL
 work_url: http://nwea.org/chase-nordengren # work page URL
 keybase_username: # your keybase user name
 wikidata_id: # your wikidata id
 wikipedia_id: # your wikipedia id (Case sensitive)
 dblp_url: # your DBLP profile url
-cv_url: assets/pdf/cv.pdf # your CV url
-
-#contact_note: >
-#  You can even add a little note about which of these is the best way to reach you.
-stackoverflow_id: #your stackoverflow id
-google_analytics:  # your google-analytics ID (format: UA-XXXXXXXXX)
+stackoverflow_id: # your stackoverflow id
 kaggle_id: # your kaggle id
 lastfm_id: # your lastfm id
 spotify_id: # your spotify id
@@ -125,14 +114,13 @@ bing_site_verification:  # out your bing-site-verification ID (Bing Webmaster)
 blog_name: media # your blog must have a name for it to show up in the nav bar
 blog_nav_title: media # your blog must have a title for it to be displayed in the nav bar
 blog_description:
-permalink: /posts/:year/:title/
+permalink: /media/:year/:title/
 
 
 # Pagination
 pagination:
   enabled: true
 
-=======
 related_blog_posts:
   enabled: true
   max_related: 5
@@ -160,6 +148,7 @@ giscus:
 # you can display them in your blog by adding a link to the RSS feed.
 external_sources:
 
+
 # -----------------------------------------------------------------------------
 # Collections
 # -----------------------------------------------------------------------------
@@ -282,6 +271,7 @@ scholar:
 
   source: /_bibliography/
   bibliography: papers.bib
+  presentations: presentations.bib
   bibliography_template: bib
   # Note: if you have latex math in your bibtex, the latex filter
   # preprocessing may conflict with MathJAX if the latter is enabled.
@@ -360,7 +350,7 @@ jekyll-diagrams:
 # -----------------------------------------------------------------------------
 
 enable_google_analytics:    false  # enables google analytics
-enable_cronitor_analytics: false  # enables cronitor RUM analytics
+enable_cronitor_analytics:  false  # enables cronitor RUM analytics
 enable_google_verification: false  # enables google site verification
 enable_bing_verification:   false  # enables bing site verification
 enable_mansory:             true   # enables automatic project cards arangement
@@ -370,9 +360,9 @@ enable_tooltips:            false  # enables automatic tooltip links generated
 enable_darkmode:            true   # enables switching between light/dark modes
 enable_navbar_social:       true  # enables displaying social links in the
                                    # navbar on the about page
-enable_project_categories:  true   # enables categorization of projects into
+enable_project_categories:  false   # enables categorization of projects into
                                    # multiple categories
-enable_medium_zoom:         true   # enables image zoom feature (as on medium.com)
+enable_medium_zoom:         false   # enables image zoom feature (as on medium.com)
 enable_progressbar:         false   # enables a horizontal progress bar linked to the vertical scroll position
 
 # -----------------------------------------------------------------------------

diff --git a/_includes/giscus.html b/_includes/giscus.html
@@ -1,4 +1,4 @@
-<div id="giscus_thread" style="max-width: {{ site.max_width }}; margin: 0 auto;">
+<div id="giscus_thread">
   {%- if site.giscus.repo -%}
   <script>
     let giscusTheme = localStorage.getItem("theme");

diff --git a/_includes/head.html b/_includes/head.html
@@ -1,4 +1,3 @@
-
     <!-- Metadata, OpenGraph and Schema.org -->
     {% include metadata.html %}
 

diff --git a/_includes/header.html b/_includes/header.html
@@ -117,4 +117,3 @@
       </progress>
 {%- endif %}
     </header>
-
diff --git a/_includes/latest_posts.html b/_includes/latest_posts.html
@@ -12,7 +12,7 @@
               {% endif %}
               {% for item in latest_posts limit: latest_posts_limit %}
                 <tr>
-                  <th scope="row" style="width: 20%">{{ item.date | date: "%b %-d, %Y" }}</th>
+                  <th scope="row">{{ item.date | date: "%b %-d, %Y" }}</th>
                   <td>
                     {% if item.redirect == blank %}
                       <a class="news-title" href="{{ item.url | relative_url }}">{{ item.title }}</a>

diff --git a/_includes/metadata.html b/_includes/metadata.html
@@ -6,11 +6,6 @@
     {% if site.enable_bing_verification -%}
     <meta name="msvalidate.01" content="{{ site.bing_site_verification }}" />
     {%- endif -%}
-    <!-- Avoid warning on Google Chrome
-        Error with Permissions-Policy header: Origin trial controlled feature not enabled: 'interest-cohort'.
-        see https://stackoverflow.com/a/75119417
-    -->
-    <meta http-equiv="Permissions-Policy" content="interest-cohort=()" />
 {%- endif %}
 
     <!-- Standard metadata -->
@@ -41,17 +36,11 @@
     <meta name="keywords" content="{%- if page.keywords -%}{{ page.keywords }}{%- else -%}{{ site.keywords }}{%- endif -%}" />
 {%- endif %}
 
-{%- assign is_blog_post = false -%}
-{%- if page.url != '/blog/index.html' and page.url contains '/blog/' -%}
-    {%- unless page.url contains '/tag/' or page.url contains '/category/' -%}
-        {%- assign is_blog_post = true -%}
-    {%- endunless -%}
-{%- endif -%}
-
 {%- if site.serve_og_meta %}
+
     <!-- OpenGraph -->
     <meta property="og:site_name" content="{{ title }}" />
-    <meta property="og:type" content="{%- if is_blog_post -%}article{%- else -%}website{%- endif -%}" />
+    <meta property="og:type" content="website" />
     <meta property="og:title" content="{%- if page.title -%}{{ title }} | {{ page.title }}{%- else -%}{{ title }}{%- endif -%}" />
     <meta property="og:url" content="{{ page.url | prepend: site.baseurl | prepend: site.url | remove_first: 'index.html' }}" />
     <meta property="og:description" content="{%- if page.description -%}{{ page.description }}{%- else -%}{{ site.description }}{%- endif -%}" />
@@ -94,30 +83,14 @@
         {%- capture link -%}https://publons.com/a/{{ site.publons_id }}/{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
     {%- endif -%}
-    {%- if site.lattes_id -%}
-        {%- capture link -%}http://lattes.cnpq.br/{{ site.lattes_id }}{%- endcapture -%}
-        {%- assign sameaslinks = sameaslinks | push: link -%}
-    {%- endif -%}
-    {%- if site.osf_id -%}
-        {%- capture link -%}https://osf.io/{{ site.osf_id }}/{%- endcapture -%}
-        {%- assign sameaslinks = sameaslinks | push: link -%}
-    {%- endif -%}
     {%- if site.research_gate_profile -%}
         {%- capture link -%}https://www.researchgate.net/profile/{{site.research_gate_profile}}{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
     {%- endif -%}
-    {%- if site.scopus_id -%}
-        {%- capture link -%}https://www.scopus.com/authid/detail.uri?authorId={{site.scopus_id}}{%- endcapture -%}
-        {%- assign sameaslinks = sameaslinks | push: link -%}
-    {%- endif -%}
     {%- if site.github_username -%}
         {%- capture link -%}https://github.com/{{ site.github_username }}{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
     {%- endif -%}
-    {%- if site.telegram_username -%}
-        {%- capture link -%}https://telegram.me/{{ site.telegram_username }}{%- endcapture -%}
-        {%- assign sameaslinks = sameaslinks | push: link -%}
-    {%- endif -%}
     {%- if site.linkedin_username -%}
         {%- capture link -%}https://www.linkedin.com/in/{{ site.linkedin_username }}{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
@@ -126,10 +99,6 @@
         {%- capture link -%}https://twitter.com/{{ site.twitter_username }}{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
     {%- endif -%}
-    {%- if site.mastodon_username -%}
-        {%- capture link -%}https://{{ site.mastodon_username  }}{%- endcapture -%}
-        {%- assign sameaslinks = sameaslinks | push: link -%}
-    {%- endif -%}
     {%- if site.medium_username -%}
         {%- capture link -%}https://medium.com/@{{ site.medium_username }}{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
@@ -150,10 +119,6 @@
         {%- capture link -%}https://www.wikidata.org/wiki/{{ site.wikidata_id }}{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
     {%- endif -%}
-    {%- if site.wikipedia_id -%}
-        {%- capture link -%}https://wikipedia.org/wiki/User:{{ site.wikipedia_id }}{%- endcapture -%}
-        {%- assign sameaslinks = sameaslinks | push: link -%}
-    {%- endif -%}
     {%- if site.strava_userid -%}
         {%- capture link -%}https://www.strava.com/athletes/{{ site.strava_userid }}{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
@@ -202,38 +167,30 @@
         {%- capture link -%}https://facebook.com/{{ site.facebook_id }}{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
     {%- endif -%}
-    {%- if site.youtube_id -%}
-        {%- capture link -%}https://youtube.com/@{{ site.youtube_id }}{%- endcapture -%}
-        {%- assign sameaslinks = sameaslinks | push: link -%}
-    {%- endif -%}
     {%- if site.discord_id -%}
         {%- capture link -%}https://discord.com/users/{{ site.discord_id }}{%- endcapture -%}
         {%- assign sameaslinks = sameaslinks | push: link -%}
     {%- endif -%}
-    {%- if site.zotero_username -%}
-        {%- capture link -%}https://www.zotero.org/{{ site.zotero_username }}{%- endcapture -%}
-        {%- assign sameaslinks = sameaslinks | push: link -%}
-    {%- endif -%}
     {%- if sameaslinks != blank -%}
         {%- assign sameaslinks = sameaslinks | split: "" -%}
     {%- endif -%}
 
     <script type="application/ld+json">
-    {
+      {
         "author":
         {
-            "@type": "Person",
-            "name": "{{ site.first_name }} {{ site.middle_name }} {{ site.last_name }}"
+          "@type": "Person",
+          "name": "{{ site.first_name }} {{ site.middle_name }} {{ site.last_name }}"
         },
         "url": "{{ page.url | prepend: site.baseurl | prepend: site.url }}",
-        "@type": "{%- if is_blog_post -%}BlogPosting{%- else -%}WebSite{%- endif -%}",
+        "@type": "WebSite",
         "description": "{%- if page.description -%}{{ page.description }}{%- else if site.description -%}{{ site.description }}{%- endif -%}",
         "headline": "{%- if page.title -%}{{ page.title }}{%- else -%}{{ site.title }}{%- endif -%}",
         {% if sameaslinks != blank -%}
         "sameAs": {{ sameaslinks }},
         {%- endif %}
         "name": "{{ site.first_name }} {{ site.middle_name }} {{ site.last_name }}",
         "@context": "https://schema.org"
-    }
+      }
     </script>
 {%- endif %}
diff --git a/_includes/news.html b/_includes/news.html
@@ -1,4 +1,3 @@
-
           <div class="news">
             {% if site.news != blank -%}
             {%- assign news_size = site.news | size -%}
@@ -12,7 +11,7 @@
               {% endif %}
               {% for item in news limit: news_limit %}
                 <tr>
-                  <th scope="row" style="width: 20%">{{ item.date | date: "%b %-d, %Y" }}</th>
+                  <th scope="row">{{ item.date | date: "%b %-d, %Y" }}</th>
                   <td>
                     {% if item.inline -%}
                       {{ item.content | remove: '<p>' | remove: '</p>' | emojify }}
@@ -27,4 +26,4 @@
           {%- else -%}
             <p>No news so far...</p>
           {%- endif %}
-          </div>
+          </div>
diff --git a/_includes/projects.html b/_includes/projects.html
@@ -0,0 +1,36 @@
+<!-- _includes/projects.html -->
+<div class="grid-sizer"></div>
+<div class="grid-item">
+  {% if project.redirect -%}
+  <a href="{{ project.redirect }}">
+    {%- else -%}
+    <a href="{{ project.url | relative_url }}">
+      {%- endif %}
+      <div class="card hoverable">
+        {%- if project.img %}
+        {%- include figure.html
+          path=project.img
+          alt="project thumbnail" -%}
+        {%- endif %}
+        <div class="card-body">
+          <h2 class="card-title text-lowercase">{{ project.title }}</h2>
+          <p class="card-text">{{ project.description }}</p>
+          <div class="row ml-1 mr-1 p-0">
+            {%- if project.github -%}
+            <div class="github-icon">
+              <div class="icon" data-toggle="tooltip" title="Code Repository">
+                <a href="{{ project.github }}"><i class="fab fa-github gh-icon"></i></a>
+              </div>
+              {%- if project.github_stars -%}
+              <span class="stars" data-toggle="tooltip" title="GitHub Stars">
+                <i class="fas fa-star"></i>
+                <span id="{{ project.github_stars }}-stars"></span>
+              </span>
+              {%- endif %}
+            </div>
+            {%- endif %}
+          </div>
+        </div>
+      </div>
+    </a>
+</div>
diff --git a/_includes/projects_horizontal.html b/_includes/projects_horizontal.html
@@ -0,0 +1,40 @@
+<div class="card-item col">
+  {%- if project.redirect -%}
+  <a href="{{ project.redirect }}">
+  {%- else -%}
+  <a href="{{ project.url | relative_url }}">
+  {%- endif -%}
+    <div class="card hoverable">
+      <div class="row g-0">
+        {%- if project.img -%}
+        <div class="card-img col-md-6">
+          {% include figure.html path=project.img alt="project thumbnail" %}
+        </div>
+        <div class="col-md-6">
+        {%- else -%}
+        <div class="col-md-12">
+        {%- endif -%}
+          <div class="card-body">
+            <h3 class="card-title text-lowercase">{{ project.title }}</h3>
+            <p class="card-text">{{ project.description }}</p>
+            <div class="row ml-1 mr-1 p-0">
+              {%- if project.github -%}
+              <div class="github-icon">
+                <div class="icon" data-toggle="tooltip" title="Code Repository">
+                  <a href="{{ project.github }}"><i class="fab fa-github gh-icon"></i></a>
+                </div>
+                {%- if project.github_stars -%}
+                <span class="stars" data-toggle="tooltip" title="GitHub Stars">
+                  <i class="fas fa-star"></i>
+                  <span id="{{ project.github_stars }}-stars"></span>
+                </span>
+                {%- endif -%}
+              </div>
+              {%- endif -%}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a>
+</div>
diff --git a/_includes/scripts/badges.html b/_includes/scripts/badges.html
@@ -1,6 +1,6 @@
-{%- if site.enable_publication_badges.altmetric %}
+{%- if site.badges.altmetric_badge %}
   <script async src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>
 {%- endif %}
-{%- if site.enable_publication_badges.dimensions %}
+{%- if site.badges.dimensions_badge %}
   <script async src="https://badge.dimensions.ai/badge.js"></script>
 {%- endif %}
diff --git a/_includes/selected_papers.html b/_includes/selected_papers.html
@@ -1,5 +1,4 @@
 
           <div class="publications">
-            <h2>selected publications</h2>
-            {% bibliography -f papers -q @*[selected=true]* %}          </div>
+            {% bibliography -f {{ site.scholar.bibliography }} -q @*[selected=true]* %}
           </div>
diff --git a/_includes/social.html b/_includes/social.html
@@ -1,4 +1,4 @@
- {%- if site.email -%}
+            {%- if site.email -%}
             <a href="mailto:{{ site.email | encode_email }}" title="email"><i class="fas fa-envelope"></i></a>
             {% endif %}
             {%- if site.telegram_username -%}
@@ -109,13 +109,10 @@
             {%- if site.rss_icon -%}
             <a href="{{ site.baseurl }}/feed.xml" title="RSS Feed"><i class="fas fa-rss-square"></i></a>
             {% endif %}
-            {% if site.cv_url %}
-            <a href="{{ site.cv_url }}" target="_blank" title="Vita""><i class="ai ai-cv"></i></a>
             {%- if site.wechat_qr -%}
             <a id="WeChatBtn" title="WeChat"><i class="fab fa-weixin"></i></a>
             <div id="WeChatMod" class="wechat-modal">
                 <img src="{{ site.wechat_qr | prepend: 'assets/img/' | relative_url }}" alt="WeChat QR" id="WeChatQR">
             </div>
             {% include scripts/wechatModal.html %}
-
             {% endif %}
diff --git a/_layouts/about.html b/_layouts/about.html
@@ -74,4 +74,4 @@ <h2><a href="{{ '/publications/' | relative_url }}" style="color: inherit;">sele
           {%- endif %}
         </article>
 
-</div>
+</div>