walcutt/searchable-jekyll-template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46 from Am3ra/patch-1

Browse Source 
Update generator to include baseurl.
This commit is contained in:
Maxime Vaillancourt 2021-02-08 17:28:52 -05:00 committed by GitHub
commit ac70b2f668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_config.yml
View File

@ -4,7 +4,7 @@ exclude: ['_includes/notes_graph.json']
# You may need to change the base URL depending on your deploy configuration. # You may need to change the base URL depending on your deploy configuration.
# Specifically, when using GitHub Pages, the baseurl should point to where GitHub # Specifically, when using GitHub Pages, the baseurl should point to where GitHub
# Pages deploys your repository (which is usually the repository name). # Pages deploys your repository (which is usually the repository name).
baseurl: / baseurl: ''
# If you are using a host that cannot resolve URLs that do # If you are using a host that cannot resolve URLs that do
# not end with .html (such as Neocities), set this to 'true'. # not end with .html (such as Neocities), set this to 'true'.

2
_includes/head.html
View File

@ -11,7 +11,7 @@
<link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo="> <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=">
<link rel="stylesheet" href="{{ site.baseurl }}styles.css"> <link rel="stylesheet" href="{{ site.baseurl }}/styles.css">
{% if page.excerpt %} {% if page.excerpt %}
<meta property="og:description" content="{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}"/> <meta property="og:description" content="{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}"/>

2
_includes/nav.html
View File

@ -1,3 +1,3 @@
<div> <div>
<a class="internal-link" href="/"><b>{{ site.title }}</b></a> <a class="internal-link" href="{{ site.baseurl }}/"><b>{{ site.title }}</b></a>
</div> </div>

2
_layouts/note.html
View File

@ -22,7 +22,7 @@ layout: default
<div style="display: grid; grid-gap: 1em; grid-template-columns: repeat(1fr);"> <div style="display: grid; grid-gap: 1em; grid-template-columns: repeat(1fr);">
{% for backlink in page.backlinks %} {% for backlink in page.backlinks %}
<div class="backlink-box"> <div class="backlink-box">
<a class="internal-link" href="{{ backlink.url }}{%- if site.use_html_extension -%}.html{%- endif -%}">{{ backlink.title }}</a><br> <a class="internal-link" href="{{ site.baseurl }}{{ backlink.url }}{%- if site.use_html_extension -%}.html{%- endif -%}">{{ backlink.title }}</a><br>
<div style="font-size: 0.9em">{{ backlink.excerpt | strip_html | truncatewords: 20 }}</div> <div style="font-size: 0.9em">{{ backlink.excerpt | strip_html | truncatewords: 20 }}</div>
</div> </div>
{% endfor %} {% endfor %}

10
_plugins/bidirectional_links_generator.rb
View File

@ -24,28 +24,28 @@ class BidirectionalLinksGenerator < Jekyll::Generator
# [[A note about cats|this is a link to the note about cats]] # [[A note about cats|this is a link to the note about cats]]
current_note.content = current_note.content.gsub( current_note.content = current_note.content.gsub(
/\[\[#{title_from_filename}\|(.+?)(?=\])\]\]/i, /\[\[#{title_from_filename}\|(.+?)(?=\])\]\]/i,
"<a class='internal-link' href='#{note_potentially_linked_to.url}#{link_extension}'>\\1</a>" "<a class='internal-link' href='#{site.baseurl}#{note_potentially_linked_to.url}#{link_extension}'>\\1</a>"
) )
# Replace double-bracketed links with label using note filename # Replace double-bracketed links with label using note filename
# [[cats|this is a link to the note about cats]] # [[cats|this is a link to the note about cats]]
current_note.content = current_note.content.gsub( current_note.content = current_note.content.gsub(
/\[\[#{note_potentially_linked_to.data['title']}\|(.+?)(?=\])\]\]/i, /\[\[#{note_potentially_linked_to.data['title']}\|(.+?)(?=\])\]\]/i,
"<a class='internal-link' href='#{note_potentially_linked_to.url}#{link_extension}'>\\1</a>" "<a class='internal-link' href='#{site.baseurl}#{note_potentially_linked_to.url}#{link_extension}'>\\1</a>"
) )
# Replace double-bracketed links using note title # Replace double-bracketed links using note title
# [[a note about cats]] # [[a note about cats]]
current_note.content = current_note.content.gsub( current_note.content = current_note.content.gsub(
/\[\[(#{note_potentially_linked_to.data['title']})\]\]/i, /\[\[(#{note_potentially_linked_to.data['title']})\]\]/i,
"<a class='internal-link' href='#{note_potentially_linked_to.url}#{link_extension}'>\\1</a>" "<a class='internal-link' href='#{site.baseurl}#{note_potentially_linked_to.url}#{link_extension}'>\\1</a>"
) )
# Replace double-bracketed links using note filename # Replace double-bracketed links using note filename
# [[cats]] # [[cats]]
current_note.content = current_note.content.gsub( current_note.content = current_note.content.gsub(
/\[\[(#{title_from_filename})\]\]/i, /\[\[(#{title_from_filename})\]\]/i,
"<a class='internal-link' href='#{note_potentially_linked_to.url}#{link_extension}'>\\1</a>" "<a class='internal-link' href='#{site.baseurl}#{note_potentially_linked_to.url}#{link_extension}'>\\1</a>"
) )
end end
@ -73,7 +73,7 @@ class BidirectionalLinksGenerator < Jekyll::Generator
# Nodes: Graph # Nodes: Graph
graph_nodes << { graph_nodes << {
id: note_id_from_note(current_note), id: note_id_from_note(current_note),
path: "#{current_note.url}#{link_extension}", path: "#{site.baseurl}#{current_note.url}#{link_extension}",
label: current_note.data['title'], label: current_note.data['title'],
} unless current_note.path.include?('_notes/index.html') } unless current_note.path.include?('_notes/index.html')