From c5719bb1ce51109b0436e502fb1e9a4217ad2d92 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 10 Aug 2022 13:02:19 +0200 Subject: [PATCH 01/31] feat: created trim component --- src/lib/components/index.ts | 1 + src/lib/components/trim.svelte | 14 ++++++++++++++ src/lib/elements/table/cellText.svelte | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/lib/components/trim.svelte diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index b7de66eed..560971d69 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -26,3 +26,4 @@ export { default as Box } from './box.svelte'; export { default as Search } from './search.svelte'; export { default as Bucket } from './bucket.svelte'; export { default as EmptyBucket } from './emptyBucket.svelte'; +export { default as Trim } from './trim.svelte'; diff --git a/src/lib/components/trim.svelte b/src/lib/components/trim.svelte new file mode 100644 index 000000000..610901554 --- /dev/null +++ b/src/lib/components/trim.svelte @@ -0,0 +1,14 @@ + + + + + diff --git a/src/lib/elements/table/cellText.svelte b/src/lib/elements/table/cellText.svelte index a8a00db42..59b8fe2e3 100644 --- a/src/lib/elements/table/cellText.svelte +++ b/src/lib/elements/table/cellText.svelte @@ -1,8 +1,9 @@
- +
From 223b50db9ee064bc63e777cb4e452781a8422a35 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 10 Aug 2022 17:29:08 +0200 Subject: [PATCH 02/31] feat: tooltip only shown when there are elipsis --- src/lib/actions/tooltip.ts | 6 +++++ src/lib/components/trim.svelte | 40 +++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/lib/actions/tooltip.ts b/src/lib/actions/tooltip.ts index 1636a14ec..d20196ddf 100644 --- a/src/lib/actions/tooltip.ts +++ b/src/lib/actions/tooltip.ts @@ -13,6 +13,12 @@ export const tooltip: Action> = (node, config) => { }); } }, + enable() { + instance.enable(); + }, + disable() { + instance.disable(); + }, destroy() { instance.destroy(); } diff --git a/src/lib/components/trim.svelte b/src/lib/components/trim.svelte index 610901554..0cd0b3be6 100644 --- a/src/lib/components/trim.svelte +++ b/src/lib/components/trim.svelte @@ -1,14 +1,44 @@ - + + + From b0ad7f03994dd1af4ec45c6b5d84ffc6ba51f7ee Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 6 Sep 2022 12:14:02 +0200 Subject: [PATCH 03/31] fix: trim component --- src/lib/actions/tooltip.ts | 6 ------ src/lib/components/trim.svelte | 23 +++++++++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/lib/actions/tooltip.ts b/src/lib/actions/tooltip.ts index d20196ddf..1636a14ec 100644 --- a/src/lib/actions/tooltip.ts +++ b/src/lib/actions/tooltip.ts @@ -13,12 +13,6 @@ export const tooltip: Action> = (node, config) => { }); } }, - enable() { - instance.enable(); - }, - disable() { - instance.disable(); - }, destroy() { instance.destroy(); } diff --git a/src/lib/components/trim.svelte b/src/lib/components/trim.svelte index 0cd0b3be6..817ce3eea 100644 --- a/src/lib/components/trim.svelte +++ b/src/lib/components/trim.svelte @@ -1,8 +1,8 @@ - + From 033a180ee841582662b5671d2206853a4911f58c Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 6 Sep 2022 12:19:10 +0200 Subject: [PATCH 04/31] removed todo --- src/lib/components/trim.svelte | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/components/trim.svelte b/src/lib/components/trim.svelte index 817ce3eea..042a4cf3c 100644 --- a/src/lib/components/trim.svelte +++ b/src/lib/components/trim.svelte @@ -40,8 +40,6 @@ } }; }; - - //TODO: disable tooltip when text is without elipsis From 9c38e75f84b300c04e5d137b79bfd30b4c0f88e4 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 6 Sep 2022 12:29:57 +0200 Subject: [PATCH 05/31] feat: only set data when needed --- src/lib/components/trim.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/trim.svelte b/src/lib/components/trim.svelte index 042a4cf3c..76d1aa6c4 100644 --- a/src/lib/components/trim.svelte +++ b/src/lib/components/trim.svelte @@ -15,8 +15,8 @@ if (data.offsetWidth < data.scrollWidth) { if (tool) { - tool.setContent(content); - tool.enable(); + if (!tool?.props?.content) tool.setContent(content); + if (!tool.state.isEnabled) tool.enable(); } else { tippy(data, { content }); } From c6205aaced87e56b63af19e71bc4a4fafa6d8f1b Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 4 Oct 2022 12:23:10 +0200 Subject: [PATCH 06/31] feat: init code example --- package-lock.json | 14 ++++++++++++++ package.json | 1 + src/lib/components/code.svelte | 15 +++++++++++++++ .../overview/platforms/+page.svelte | 9 +++++++++ 4 files changed, 39 insertions(+) create mode 100644 src/lib/components/code.svelte diff --git a/package-lock.json b/package-lock.json index b05e71318..3298c77e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@aw-labs/icons": "0.0.0-55", "@aw-labs/ui": "0.0.0-55", "echarts": "^5.3.3", + "highlight.js": "^11.6.0", "tippy.js": "^6.3.7", "web-vitals": "^2.1.4" }, @@ -4304,6 +4305,14 @@ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", "dev": true }, + "node_modules/highlight.js": { + "version": "11.6.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz", + "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==", + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/html-encoding-sniffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", @@ -11379,6 +11388,11 @@ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", "dev": true }, + "highlight.js": { + "version": "11.6.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz", + "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==" + }, "html-encoding-sniffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", diff --git a/package.json b/package.json index 2409815ef..93a6b36e5 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@aw-labs/icons": "0.0.0-55", "@aw-labs/ui": "0.0.0-55", "echarts": "^5.3.3", + "highlight.js": "^11.6.0", "tippy.js": "^6.3.7", "web-vitals": "^2.1.4" }, diff --git a/src/lib/components/code.svelte b/src/lib/components/code.svelte new file mode 100644 index 000000000..76860d59c --- /dev/null +++ b/src/lib/components/code.svelte @@ -0,0 +1,15 @@ + + + + +
diff --git a/src/routes/console/project-[project]/overview/platforms/+page.svelte b/src/routes/console/project-[project]/overview/platforms/+page.svelte index b679ee92e..740c0a0a4 100644 --- a/src/routes/console/project-[project]/overview/platforms/+page.svelte +++ b/src/routes/console/project-[project]/overview/platforms/+page.svelte @@ -1,6 +1,7 @@ +{` +document.addEventListener('DOMContentLoaded', (event) => { + document.querySelectorAll('pre code').forEach((el) => { + hljs.highlightElement(el); + }); +}); +`}

Platforms

From 1bcd64c2b4e413d3ae6b98cbd1e6ffa077cd4abf Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 4 Oct 2022 18:46:12 +0200 Subject: [PATCH 07/31] feat: code snippet --- package-lock.json | 27 ++++ package.json | 3 +- src/lib/components/code.svelte | 116 ++++++++++++++++-- .../overview/platforms/+page.svelte | 49 +++++++- 4 files changed, 178 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3298c77e4..333cccdd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@aw-labs/ui": "0.0.0-55", "echarts": "^5.3.3", "highlight.js": "^11.6.0", + "prismjs": "^1.29.0", "tippy.js": "^6.3.7", "web-vitals": "^2.1.4" }, @@ -26,6 +27,7 @@ "@testing-library/svelte": "3.1.3", "@testing-library/user-event": "^14.4.3", "@types/gtag.js": "^0.0.11", + "@types/prismjs": "^1.26.0", "@typescript-eslint/eslint-plugin": "^5.37.0", "@typescript-eslint/parser": "^5.37.0", "@vitest/ui": "^0.23.2", @@ -1767,6 +1769,12 @@ "dev": true, "peer": true }, + "node_modules/@types/prismjs": { + "version": "1.26.0", + "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.0.tgz", + "integrity": "sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==", + "dev": true + }, "node_modules/@types/pug": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.6.tgz", @@ -6664,6 +6672,14 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/prismjs": { + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz", + "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==", + "engines": { + "node": ">=6" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -9561,6 +9577,12 @@ "dev": true, "peer": true }, + "@types/prismjs": { + "version": "1.26.0", + "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.0.tgz", + "integrity": "sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==", + "dev": true + }, "@types/pug": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.6.tgz", @@ -13180,6 +13202,11 @@ } } }, + "prismjs": { + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz", + "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==" + }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", diff --git a/package.json b/package.json index 93a6b36e5..c2fc1c43e 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@aw-labs/icons": "0.0.0-55", "@aw-labs/ui": "0.0.0-55", "echarts": "^5.3.3", - "highlight.js": "^11.6.0", + "prismjs": "^1.29.0", "tippy.js": "^6.3.7", "web-vitals": "^2.1.4" }, @@ -36,6 +36,7 @@ "@testing-library/svelte": "3.1.3", "@testing-library/user-event": "^14.4.3", "@types/gtag.js": "^0.0.11", + "@types/prismjs": "^1.26.0", "@typescript-eslint/eslint-plugin": "^5.37.0", "@typescript-eslint/parser": "^5.37.0", "@vitest/ui": "^0.23.2", diff --git a/src/lib/components/code.svelte b/src/lib/components/code.svelte index 76860d59c..a4d411144 100644 --- a/src/lib/components/code.svelte +++ b/src/lib/components/code.svelte @@ -1,15 +1,111 @@ - - -
+
{@html code}
+ + diff --git a/src/routes/console/project-[project]/overview/platforms/+page.svelte b/src/routes/console/project-[project]/overview/platforms/+page.svelte index 740c0a0a4..ff1f4ea8d 100644 --- a/src/routes/console/project-[project]/overview/platforms/+page.svelte +++ b/src/routes/console/project-[project]/overview/platforms/+page.svelte @@ -13,13 +13,50 @@ {` -document.addEventListener('DOMContentLoaded', (event) => { - document.querySelectorAll('pre code').forEach((el) => { - hljs.highlightElement(el); + language="js" + code={`import { Client, Account } from "appwrite"; + +const client = new Client(); + +const account = new Account(client); + +client + .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint + .setProject('5df5acd0d48c2') // Your project ID +; + +const promise = account.createEmailSession('email@example.com', 'password'); + +promise.then(function (response) { + console.log(response); // Success +}, function (error) { + console.log(error); // Failure +});`} /> + +}`} />

Platforms

From f64f401183fb8cdc1daa09a7aa3917fdc9630e38 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 4 Oct 2022 18:49:18 +0200 Subject: [PATCH 08/31] fix: add line numbers to code --- src/lib/components/code.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/components/code.svelte b/src/lib/components/code.svelte index a4d411144..9fa9df774 100644 --- a/src/lib/components/code.svelte +++ b/src/lib/components/code.svelte @@ -8,13 +8,15 @@ export let code = ''; export let language: 'js' | 'html' | 'dart' | 'json'; + export let showLineNumbers = false; afterUpdate(async () => { Prism.highlightAll(); }); -
{@html code}
+
{@html code}