From 82b584b3d1b4dfa7d63e2f63e2aa416d340f0928 Mon Sep 17 00:00:00 2001 From: Muhammad Ali Date: Wed, 23 Nov 2022 09:19:07 +0500 Subject: [PATCH] core: include tags in exported note (#1345) Co-authored-by: Abdullah Atta --- packages/core/models/note.js | 3 ++- packages/core/utils/templates/helper.js | 3 ++- packages/core/utils/templates/html/template.js | 8 ++++---- packages/core/utils/templates/markdown/template.js | 4 +--- packages/core/utils/templates/text/template.js | 3 +-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/core/models/note.js b/packages/core/models/note.js index b04ad8185..e1d63ff98 100644 --- a/packages/core/models/note.js +++ b/packages/core/models/note.js @@ -89,7 +89,8 @@ export default class Note { title: this.title, editedOn: this.dateEdited, headline: this.headline, - createdOn: this.data.dateCreated + createdOn: this.data.dateCreated, + tags: this.tags.join(", ") }; const contentItem = await this._db.content.raw(this._note.contentId); if (!contentItem) return false; diff --git a/packages/core/utils/templates/helper.js b/packages/core/utils/templates/helper.js index 0d8464e5e..459ee4d2b 100644 --- a/packages/core/utils/templates/helper.js +++ b/packages/core/utils/templates/helper.js @@ -37,7 +37,7 @@ function generateMetaTags(metadata, createMetaTag) { export function buildPage( template, createMetaTag, - { metadata, title, headline, content, createdOn, editedOn } + { metadata, title, headline, content, createdOn, editedOn, tags } ) { let page = template; @@ -52,5 +52,6 @@ export function buildPage( page = page.replace(/{{content}}/g, content); page = page.replace(/{{createdOn}}/g, formatDate(createdOn)); page = page.replace(/{{editedOn}}/g, formatDate(editedOn)); + page = page.replace(/{{tags}}/g, tags); return page; } diff --git a/packages/core/utils/templates/html/template.js b/packages/core/utils/templates/html/template.js index 18bc53149..b7a9ca0e9 100644 --- a/packages/core/utils/templates/html/template.js +++ b/packages/core/utils/templates/html/template.js @@ -26,14 +26,14 @@ const template = ` name="description" content="{{headline}}" /> - {{title}} - Notesnook + {{title}} - Notesnook + + +

{{title}}

{{content}} -
- Created on: {{createdOn}}
- Edited on: {{editedOn}} `; diff --git a/packages/core/utils/templates/markdown/template.js b/packages/core/utils/templates/markdown/template.js index 0369ba4cc..d56ff1843 100644 --- a/packages/core/utils/templates/markdown/template.js +++ b/packages/core/utils/templates/markdown/template.js @@ -22,7 +22,5 @@ const template = `# {{title}} {{content}} --- -_Created on: {{createdOn}}_ - -_Edited on: {{editedOn}}_`; +_Tags: {{tags}}_`; export default template; diff --git a/packages/core/utils/templates/text/template.js b/packages/core/utils/templates/text/template.js index 3a7188cd5..0f09a23d5 100644 --- a/packages/core/utils/templates/text/template.js +++ b/packages/core/utils/templates/text/template.js @@ -23,7 +23,6 @@ const template = `{{title}} {{content}} ---------- -Created on: {{createdOn}} -Edited on: {{editedOn}}`; +Tags: {{tags}}`; export default template;