build website improvements

This commit is contained in:
zadam 2023-01-14 22:50:04 +01:00
parent c97ada3434
commit 32bd74fe27
4 changed files with 93 additions and 32 deletions

View file

@ -1,44 +1,23 @@
const fs = require("fs-extra"); const fs = require("fs-extra");
const utils = require("./services/utils.js"); const utils = require("../../src/services/utils.js");
const html = require("html"); const html = require("html");
const SRC_DIR = './src-build/docs-website';
const USER_GUIDE_DIR = './docs/user_guide'; const USER_GUIDE_DIR = './docs/user_guide';
const META_PATH = USER_GUIDE_DIR + '/!!!meta.json'; const META_PATH = USER_GUIDE_DIR + '/!!!meta.json';
const WEB_TMP_DIR = './tmp/user_guide_web'; const WEB_TMP_DIR = './tmp/user_guide_web';
fs.copySync(USER_GUIDE_DIR, WEB_TMP_DIR); fs.copySync(USER_GUIDE_DIR, WEB_TMP_DIR);
const meta = JSON.parse(fs.readFileSync(META_PATH).toString()); const meta = JSON.parse(readFile(META_PATH));
const rootNoteMeta = meta.files[0]; const rootNoteMeta = meta.files[0];
const noteIdToMeta = {}; const noteIdToMeta = {};
createNoteIdToMetaMapping(rootNoteMeta); createNoteIdToMetaMapping(rootNoteMeta);
addNavigationAndStyle(rootNoteMeta, WEB_TMP_DIR); addNavigationAndStyle(rootNoteMeta, WEB_TMP_DIR);
fs.writeFileSync(WEB_TMP_DIR + '/style.css', getCss()); fs.writeFileSync(WEB_TMP_DIR + '/main.js', readFile(SRC_DIR + "/main.js"));
fs.writeFileSync(WEB_TMP_DIR + '/main.css', readFile(SRC_DIR + "/main.css"));
function getCss() { fs.cpSync('libraries/ckeditor/ckeditor-content.css' ,WEB_TMP_DIR + '/ckeditor-content.css');
return `
body {
display: flex;
flex-direction: row-reverse;
width: 1000px;
margin: auto;
}
.note-tree-nav {
width: 200px;
margin-right: 20px;
overflow-x: auto;
}
.note-tree-nav ul {
padding-left: 20px;
}
.content {
width: 780px;
}`;
}
function addNavigationAndStyle(noteMeta, parentDirPath) { function addNavigationAndStyle(noteMeta, parentDirPath) {
const nav = createNavigation(rootNoteMeta, noteMeta); const nav = createNavigation(rootNoteMeta, noteMeta);
@ -48,10 +27,13 @@ function addNavigationAndStyle(noteMeta, parentDirPath) {
console.log(`Adding nav to ${filePath}`); console.log(`Adding nav to ${filePath}`);
const content = fs.readFileSync(filePath).toString(); const content = readFile(filePath);
const depth = noteMeta.notePath.length - 1; const depth = noteMeta.notePath.length - 1;
const updatedContent = content const updatedContent = content
.replaceAll("</head>", `<link rel="stylesheet" href="${"../".repeat(depth)}styles.css">`) .replaceAll("</head>", `
<link rel="stylesheet" href="${"../".repeat(depth)}main.css">
<link rel="stylesheet" href="${"../".repeat(depth)}ckeditor-content.css">
<script src="${"../".repeat(depth)}main.js"></script>`)
.replaceAll("</body>", nav + "</body>"); .replaceAll("</body>", nav + "</body>");
const prettified = html.prettyPrint(updatedContent, {indent_size: 2}); const prettified = html.prettyPrint(updatedContent, {indent_size: 2});
fs.writeFileSync(filePath, prettified); fs.writeFileSync(filePath, prettified);
@ -63,8 +45,8 @@ function addNavigationAndStyle(noteMeta, parentDirPath) {
} }
function createNavigation(rootMeta, sourceMeta) { function createNavigation(rootMeta, sourceMeta) {
function saveNavigationInner(meta) { function saveNavigationInner(meta, parentNoteId = 'root') {
let html = '<li>'; let html = `<li data-branch-id="${parentNoteId}_${meta.noteId}">`;
const escapedTitle = utils.escapeHtml(`${meta.prefix ? `${meta.prefix} - ` : ''}${meta.title}`); const escapedTitle = utils.escapeHtml(`${meta.prefix ? `${meta.prefix} - ` : ''}${meta.title}`);
@ -81,7 +63,7 @@ function createNavigation(rootMeta, sourceMeta) {
html += '<ul>'; html += '<ul>';
for (const child of meta.children) { for (const child of meta.children) {
html += saveNavigationInner(child); html += saveNavigationInner(child, meta.noteId);
} }
html += '</ul>' html += '</ul>'
@ -141,3 +123,7 @@ function getTargetUrl(targetNoteId, sourceMeta) {
return url; return url;
} }
function readFile(filePath) {
return fs.readFileSync(filePath).toString();
}

View file

@ -0,0 +1,45 @@
body {
display: flex;
flex-direction: row-reverse;
width: 1100px;
margin: auto;
font-family: 'Lucida Grande', 'Lucida Sans Unicode', arial, sans-serif;
}
.note-tree-nav {
padding-top: 10px;
width: 300px;
margin-right: 20px;
overflow-x: auto;
}
.note-tree-nav ul {
padding-left: 20px;
list-style-type: none;
}
.note-tree-nav ul li {
line-height: 150%;
font-size: 105%;
}
.note-tree-nav > ul > li > a {
font-size: x-large;
}
.note-tree-nav a {
text-decoration: none;
}
.note-tree-nav li span.expander, .note-tree-nav li span.spacer {
width: 1em;
display: inline-block;
}
.note-tree-nav li span.expander {
cursor: pointer;
}
.content {
width: 780px;
}

View file

@ -0,0 +1,30 @@
document.addEventListener('DOMContentLoaded', function () {
for (const li of document.querySelectorAll('.note-tree-nav li')) {
const branchId = li.getAttribute("data-branch-id");
if (branchId.startsWith("root_")) {
// first level is expanded and cannot be collapsed
continue;
}
const newDiv = document.createElement("span");
const subList = li.querySelector('ul');
if (subList) {
const toggleVisibility = (show) => {
newDiv.innerHTML = show ? "&blacktriangledown; " : "&blacktriangleright; ";
subList.style.display = show ? 'block' : 'none';
localStorage.setItem(branchId, show ? "true" : "false");
};
newDiv.classList.add("expander");
newDiv.addEventListener('click', () => toggleVisibility(subList.style.display === 'none'));
toggleVisibility(localStorage.getItem(branchId) === "true");
} else {
newDiv.classList.add("spacer");
}
li.prepend(newDiv);
}
}, false);