From 48a6af53511b87e9746b678c6148f3f6f04e179e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 4 Jan 2021 13:27:28 +0100 Subject: [PATCH] Books implemented --- Client/WebServer/css/docs.css | 7 +- Client/WebServer/index.html | 4 +- .../Superalgos/Icons/docs-chapter-style.png | Bin 0 -> 5719 bytes .../Schemas/Docs-Books/how-to-trade-.json | 4 + .../Docs-Books/the-docs-explained.json | 27 +++++ .../UI/Spaces/Docs-Space/ContextMenu.js | 12 ++ .../UI/Spaces/Docs-Space/DocumentPage.js | 106 ++++++++++++++---- Projects/Superalgos/UI/Utilities/Docs.js | 10 +- 8 files changed, 145 insertions(+), 25 deletions(-) create mode 100644 Projects/Superalgos/Icons/docs-chapter-style.png create mode 100644 Projects/Superalgos/Schemas/Docs-Books/the-docs-explained.json diff --git a/Client/WebServer/css/docs.css b/Client/WebServer/css/docs.css index 8fcbacd3f..866af2abe 100644 --- a/Client/WebServer/css/docs.css +++ b/Client/WebServer/css/docs.css @@ -921,7 +921,12 @@ text-align: center; vertical-align: middle; } -.docs-link { +.docs-external-link { +text-decoration: none; +color: #31708f; +} + +.docs-chapter { text-decoration: none; color: #31708f; } diff --git a/Client/WebServer/index.html b/Client/WebServer/index.html index 2d9aea595..cc835e04e 100644 --- a/Client/WebServer/index.html +++ b/Client/WebServer/index.html @@ -193,8 +193,8 @@
-
- +
+
diff --git a/Projects/Superalgos/Icons/docs-chapter-style.png b/Projects/Superalgos/Icons/docs-chapter-style.png new file mode 100644 index 0000000000000000000000000000000000000000..d9e46d9a4afbe1e71cfeb1114faf9ac69e5d86e9 GIT binary patch literal 5719 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 Mo18c1+i(*87xDWJng9R* literal 0 HcmV?d00001 diff --git a/Projects/Superalgos/Schemas/Docs-Books/how-to-trade-.json b/Projects/Superalgos/Schemas/Docs-Books/how-to-trade-.json index bb6498e3f..c4dff2daf 100644 --- a/Projects/Superalgos/Schemas/Docs-Books/how-to-trade-.json +++ b/Projects/Superalgos/Schemas/Docs-Books/how-to-trade-.json @@ -7,6 +7,10 @@ { "style": "Text", "text": "Left click and Edit to enter edit mode and change this text. ENTER to write new paragraphs. ESC to exit edit mode." + }, + { + "style": "Chapter", + "text": "Superalgos->Docs Styles" } ] } \ No newline at end of file diff --git a/Projects/Superalgos/Schemas/Docs-Books/the-docs-explained.json b/Projects/Superalgos/Schemas/Docs-Books/the-docs-explained.json new file mode 100644 index 000000000..66a3b6505 --- /dev/null +++ b/Projects/Superalgos/Schemas/Docs-Books/the-docs-explained.json @@ -0,0 +1,27 @@ +{ + "type": "The Docs Explained", + "definition": { + "text": "This book will walk you through everything you need to know about the Docs.", + "updated": 1609762580891 + }, + "paragraphs": [ + { + "style": "Chapter", + "text": "Superalgos->I->Docs Basics->Read Chapter I to learn the basics concepts. They are the foundation that will let you understand the commands and styles explained later in this book.", + "updated": 1609763076399 + }, + { + "style": "Chapter", + "text": "Superalgos->II->Docs Commands->The Docs include a powerful command line interface that allows you to quickly fire commands from the search box. Dive into Chapter II to learn the details of each available command.", + "updated": 1609763122458 + }, + { + "style": "Chapter", + "text": "Superalgos->III->Docs Commands Errors" + }, + { + "style": "Chapter", + "text": "Superalgos->VI->Docs Paragraph Styles" + } + ] +} \ No newline at end of file diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/ContextMenu.js b/Projects/Superalgos/UI/Spaces/Docs-Space/ContextMenu.js index ddd31825b..f1e422304 100644 --- a/Projects/Superalgos/UI/Spaces/Docs-Space/ContextMenu.js +++ b/Projects/Superalgos/UI/Spaces/Docs-Space/ContextMenu.js @@ -45,6 +45,7 @@ function newSuperalgosDocsContextMenu() { toAnchor: toAnchor, toBlock: toBlock, toInclude: toInclude, + toChapter: toChapter, toSection: toSection, copyLink: copyLink, toWebPageLink: toWebPageLink, @@ -266,6 +267,13 @@ function newSuperalgosDocsContextMenu() { UI.projects.superalgos.spaces.docsSpace.documentPage.render() } + function toChapter() { + let docSchemaParagraph = UI.projects.superalgos.spaces.docsSpace.paragraphMap.get(UI.projects.superalgos.spaces.docsSpace.contextMenu.selectedParagraph.id) + docSchemaParagraph.style = 'Chapter' + forceOutClick() + UI.projects.superalgos.spaces.docsSpace.documentPage.render() + } + function toWebPageLink() { let docSchemaParagraph = UI.projects.superalgos.spaces.docsSpace.paragraphMap.get(UI.projects.superalgos.spaces.docsSpace.contextMenu.selectedParagraph.id) docSchemaParagraph.style = 'Link' @@ -464,6 +472,10 @@ function newSuperalgosDocsContextMenu() { selectedParagraphData = paragraphNode.innerText.trim() return true } + if (paragraphNode.id.indexOf('-chapter') >= 0) { + selectedParagraphData = paragraphNode.innerText.trim() + return true + } if (paragraphNode.id.indexOf('-link') >= 0) { selectedParagraphData = UI.projects.superalgos.utilities.docs.reverseParseLink(paragraphNode.innerHTML) return true diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js index e6697651e..42556247b 100644 --- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js +++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js @@ -144,7 +144,7 @@ function newSuperalgosDocsDocumentPage() { if (UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.category === 'Topic') { - buildOrderedTopicPageIndex() + buildOrderedTopicPageIndex(thisObject.docsSchemaDocument.topic) generatePreviousAndNextPageNavigation() /* Topic Title */ titleLabel = thisObject.docsSchemaDocument.topic + ' Topic Content' @@ -203,12 +203,13 @@ function newSuperalgosDocsDocumentPage() { } - function buildOrderedTopicPageIndex() { + function buildOrderedTopicPageIndex(topic) { + orderedTopicPageIndexArray = [] let schemaArray = SCHEMAS_BY_PROJECT.get(UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.project).array.docsTopicSchema for (let i = 0; i < schemaArray.length; i++) { let arrayItem = schemaArray[i] - if (arrayItem.topic === thisObject.docsSchemaDocument.topic) { + if (arrayItem.topic === topic) { let itemAdded = false if (orderedTopicPageIndexArray.length === 0) { orderedTopicPageIndexArray.push(arrayItem) @@ -269,13 +270,11 @@ function newSuperalgosDocsDocumentPage() { key = 'auto-generated-index-paragraph-' + autoGeneratedParagraphIndex paragraph = { style: "Title", - text: "" + arrayItem.type + "" + text: "" + arrayItem.type + "" } autoGeneratedParagraphIndex++ - HTML = HTML + '

' + arrayItem.pageNumber + '. ' +'' + paragraph.text + '

' + HTML = HTML + '

' + arrayItem.pageNumber + '. ' + '' + paragraph.text + '

' } - - HTML = HTML = HTML + '
' // END Container for title and index } function addContent() { @@ -285,22 +284,41 @@ function newSuperalgosDocsDocumentPage() { let key = 'editable-paragraph-' + editableParagraphIndex let paragraph = thisObject.docsSchemaDocument.paragraphs[i] - if (paragraph.style === "Include") { - renderParagraph(paragraph, key) - editableParagraphIndex++ - let error = addIncludedParagraphs(paragraph.text) - if (error !== undefined) { - paragraph = { - style: "Error", - text: error - } - key = 'error-paragraph-' + autoGeneratedParagraphIndex + switch (paragraph.style) { + case "Include": { renderParagraph(paragraph, key) - autoGeneratedParagraphIndex++ + editableParagraphIndex++ + let error = addIncludedParagraphs(paragraph.text) + if (error !== undefined) { + paragraph = { + style: "Error", + text: error + } + key = 'error-paragraph-' + autoGeneratedParagraphIndex + renderParagraph(paragraph, key) + autoGeneratedParagraphIndex++ + } + break + } + case "Chapter": { + renderParagraph(paragraph, key) + editableParagraphIndex++ + let error = addChapterIndex(paragraph.text) + if (error !== undefined) { + paragraph = { + style: "Error", + text: error + } + key = 'error-paragraph-' + autoGeneratedParagraphIndex + renderParagraph(paragraph, key) + autoGeneratedParagraphIndex++ + } + break + } + default: { + renderParagraph(paragraph, key) + editableParagraphIndex++ } - } else { - renderParagraph(paragraph, key) - editableParagraphIndex++ } } } @@ -393,6 +411,44 @@ function newSuperalgosDocsDocumentPage() { } } } + + function addChapterIndex(chapterText) { + let splittedChapterText = chapterText.split('->') + let project = splittedChapterText[0] + let chapterNumber = splittedChapterText[1] + let chapterName = splittedChapterText[2] + let introText = splittedChapterText[3] + + if (project === undefined || chapterNumber === undefined || chapterName === undefined) { + return 'Chapter paragraph style Syntax Error. Some of the required parameters are undefined. Check the Docs Chapter Style Syntax. This error message will dissapear as soon as you fix the problem.' + } + + if (SCHEMAS_BY_PROJECT.get(project) === undefined) { + return 'Chapter paragraph style Syntax Error. The Project ' + project + ' could not be found. Check the Docs Chapter Style Syntax. This error message will dissapear as soon as you fix the problem.' + } + + buildOrderedTopicPageIndex(chapterName) + + let key = 'auto-generated-paragraph-' + autoGeneratedParagraphIndex + paragraph = { + style: "Title", + text: 'Chapter ' + chapterNumber + ' - ' + chapterName + } + renderParagraph(paragraph, key) + autoGeneratedParagraphIndex++ + + if (introText !== undefined) { + let key = 'auto-generated-paragraph-' + autoGeneratedParagraphIndex + paragraph = { + style: "Text", + text: introText + } + renderParagraph(paragraph, key) + autoGeneratedParagraphIndex++ + } + + generateMultiPageIndex() + } } function addImages() { @@ -1358,6 +1414,14 @@ function newSuperalgosDocsDocumentPage() { innerHTML = paragraph.text break } + case 'Chapter': { + styleClass = 'class="docs-chapter"' + prefix = '' + role = '' + key = key + '-chapter' + innerHTML = paragraph.text + break + } } HTML = HTML + '

' + prefix + ' ' + innerHTML + sufix + '

' diff --git a/Projects/Superalgos/UI/Utilities/Docs.js b/Projects/Superalgos/UI/Utilities/Docs.js index 9b382dc81..85a61cb26 100644 --- a/Projects/Superalgos/UI/Utilities/Docs.js +++ b/Projects/Superalgos/UI/Utilities/Docs.js @@ -190,7 +190,15 @@ function newSuperalgosUtilitiesDocs() { let HTML = '' let splittedText = text.split('->') if (splittedText.length < 1) { return } - HTML = '' + splittedText[0] + '' + HTML = '' + splittedText[0] + '' + return HTML + } + + function parseChapter(text) { + let HTML = '' + let splittedText = text.split('->') + if (splittedText.length < 1) { return } + HTML = '' + splittedText[1] + '' return HTML }