fix page to add search and docs

gregsdennis · gregsdennis · commit 6949ae2c8fd9 · 2023-07-17T10:14:29.000+12:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "assets/lib"]
 	path = assets/lib
-	url = https://github.com/cotes2020/chirpy-static-assets.git
+	url = git@github.com:cotes2020/chirpy-static-assets.git
diff --git a/_docs/schema/basics.md b/_docs/schema/basics.md
@@ -24,9 +24,10 @@ There are currently six drafts of the JSON Schema specification that have known
 - Draft 2019-09
 - Draft 2020-12
 
-*JsonSchema.Net* supports draft 6 and later.
+The JSON Schema team recommends using draft 7 or later.  *JsonSchema.Net* supports draft 6 and later.
 
-The next version, which will be supported by v4.0.0 and later of this library, is currently in development and will start a new era for the project which includes various backward- and forward-compatibility guarantees.  Have a read of the various discussions happening in the [JSON Schema GitHub org](https://github.com/json-schema-org) for more information.
+> The next version of JSON Schema, which is supported by v4.0.0 and later of this library, is currently in development and will start a new era for the project which includes various backward- and forward-compatibility guarantees.  Have a read of the various discussions happening in the [JSON Schema GitHub org](https://github.com/json-schema-org) for more information.
+{: .prompt-tip }
 
 ### Meta-schemas {#schema-metaschemas}
 
diff --git a/_includes/topbar.html b/_includes/topbar.html
@@ -50,7 +50,7 @@
       {% endif %}
     </div>
 
-    {% if false %}
+    {% if true %}
     <i id="search-trigger" class="fas fa-search fa-fw"></i>
     <span id="search-wrapper" class="align-items-center">
       <i class="fas fa-search fa-fw"></i>
diff --git a/_javascript/modules/components/toc.js b/_javascript/modules/components/toc.js
@@ -1,4 +1,5 @@
 export function toc() {
+  console.log("initializing toc");
   if (document.querySelector('#core-wrapper h2,#core-wrapper h3')) {
     // see: https://github.com/tscanlin/tocbot#usage
     tocbot.init({
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -40,7 +40,7 @@ <h1 class="dynamic-title">
   <div id="panel-wrapper" class="col-xl-3 pl-2 text-muted">
     <div class="access">
       {% include update-list.html lang=lang %}
-      <!-- TODO: get toc working -->
+      {% include toc.html lang=lang %}
     </div>
 
     {% for _include in layout.panel_includes %}
diff --git a/assets/img/favicons/android-chrome-512x512.png b/assets/img/favicons/android-chrome-512x512.png
diff --git a/assets/img/favicons/android-chrome-full.png b/assets/img/favicons/android-chrome-full.png
diff --git a/assets/js/data/search.json b/assets/js/data/search.json
@@ -4,7 +4,8 @@ swcache: true
 ---
 
 [
-  {% for post in site.posts %}
+  {% for post in site.docs %}
+  {% if post.title != '__title' and post.title != '__close' %}
   {
     "title": {{ post.title | jsonify }},
     "url": {{ post.url | relative_url | jsonify }},
@@ -16,5 +17,6 @@ swcache: true
     "snippet": {{ _content | truncate: 200 | jsonify }},
     "content": {{ _content | jsonify }}
   }{% unless forloop.last %},{% endunless %}
+  {% endif %}
   {% endfor %}
 ]
diff --git a/assets/lib b/assets/lib
@@ -0,0 +1 @@
+Subproject commit 557de301fe393fb4660a338ae3c1b72ec2b3bf7c
diff --git a/index.md b/index.md
@@ -12,4 +12,4 @@ In the sidebar to the left, you'll find
 - Release notes
 - API reference
 
-If you have question about this site or an idea for improving it, please [open an issue](https://github.com/gregsdennis/json-everything/issues/new?assignees=&labels=documentation&projects=&template=Documentation.md) in the main repository.
+If you have question about this site or an idea for improving it, please [open an issue](https://github.com/gregsdennis/json-everything/issues/new?assignees=&labels=documentation&projects=&template=Documentation.yml) in the main repository.
diff --git a/init.bat b/init.bat
@@ -0,0 +1,3 @@
+npm i && npm run build
+
+bundle
diff --git a/init.sh b/init.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+npm i && npm run build
+
+bundle
diff --git a/rollup.config.js b/rollup.config.js
@@ -38,8 +38,6 @@ function build(filename) {
 
 export default [
   build('commons'),
-  build('categories'),
   build('page'),
-  build('post'),
   build('misc')
 ];
diff --git a/run.bat b/run.bat
@@ -0,0 +1 @@
+bundle exec jekyll serve
diff --git a/run.sh b/run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bundle exec jekyll serve

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export function toc() {`
	`2`	`+ console.log("initializing toc");`
`2`	`3`	`if (document.querySelector('#core-wrapper h2,#core-wrapper h3')) {`
`3`	`4`	`// see: https://github.com/tscanlin/tocbot#usage`
`4`	`5`	`tocbot.init({`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@ swcache: true`
`4`	`4`	`---`
`5`	`5`
`6`	`6`	`[`
`7`		`- {% for post in site.posts %}`
	`7`	`+ {% for post in site.docs %}`
	`8`	`+ {% if post.title != '__title' and post.title != '__close' %}`
`8`	`9`	`{`
`9`	`10`	`"title": {{ post.title \| jsonify }},`
`10`	`11`	`"url": {{ post.url \| relative_url \| jsonify }},`
`@@ -16,5 +17,6 @@ swcache: true`
`16`	`17`	`"snippet": {{ _content \| truncate: 200 \| jsonify }},`
`17`	`18`	`"content": {{ _content \| jsonify }}`
`18`	`19`	`}{% unless forloop.last %},{% endunless %}`
	`20`	`+ {% endif %}`
`19`	`21`	`{% endfor %}`
`20`	`22`	`]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+npm i && npm run build`
	`2`	`+`
	`3`	`+bundle`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
	`3`	`+bundle exec jekyll serve`