From 82b7b30b38b733881c172a570f7dcd9ebbb94870 Mon Sep 17 00:00:00 2001 From: guerler Date: Sun, 7 Apr 2024 07:08:47 +0300 Subject: [PATCH 01/15] Add pages activity --- client/src/components/plugins/icons.js | 2 ++ client/src/stores/activitySetup.ts | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/client/src/components/plugins/icons.js b/client/src/components/plugins/icons.js index a7a4224b70c..f48f0df0159 100644 --- a/client/src/components/plugins/icons.js +++ b/client/src/components/plugins/icons.js @@ -24,6 +24,7 @@ import { faEye, faFile, faFileArchive, + faFileContract, faFileExport, faFilter, faFolder, @@ -76,6 +77,7 @@ library.add( faExternalLinkAlt, faEye, faFileArchive, + faFileContract, faFileExport, faFilter, faFile, diff --git a/client/src/stores/activitySetup.ts b/client/src/stores/activitySetup.ts index 8cc09c12784..4336729659e 100644 --- a/client/src/stores/activitySetup.ts +++ b/client/src/stores/activitySetup.ts @@ -111,7 +111,19 @@ export const Activities = [ title: "Datasets", tooltip: "Show all datasets", to: "/datasets/list", - visible: false, + visible: true, + }, + { + anonymous: false, + description: "Display and create new Pages.", + icon: "fa-file-contract", + id: "pages", + mutable: false, + optional: true, + title: "Pages", + tooltip: "Show all pages", + to: "/pages/list", + visible: true, }, ]; From 88a10cf634b606e4e5ed07b3c2fdefb71f144fd0 Mon Sep 17 00:00:00 2001 From: guerler Date: Sun, 7 Apr 2024 07:22:18 +0300 Subject: [PATCH 02/15] Always display active interactive tools activity --- client/src/stores/activitySetup.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/stores/activitySetup.ts b/client/src/stores/activitySetup.ts index 4336729659e..fd1f2612c2e 100644 --- a/client/src/stores/activitySetup.ts +++ b/client/src/stores/activitySetup.ts @@ -11,7 +11,7 @@ export const Activities = [ icon: "fa-laptop", id: "interactivetools", mutable: false, - optional: true, + optional: false, title: "Interactive Tools", tooltip: "Show active interactive tools", to: "/interactivetool_entry_points/list", From 3642c4c3e2b4428bec6090ccd576aee79606806f Mon Sep 17 00:00:00 2001 From: guerler Date: Mon, 8 Apr 2024 08:14:51 +0300 Subject: [PATCH 03/15] Add title and panel link to visualizations activity --- client/src/components/Panels/VisualizationPanel.vue | 3 ++- client/src/stores/activitySetup.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/components/Panels/VisualizationPanel.vue b/client/src/components/Panels/VisualizationPanel.vue index c38af166b96..a1d7ab4cb7d 100644 --- a/client/src/components/Panels/VisualizationPanel.vue +++ b/client/src/components/Panels/VisualizationPanel.vue @@ -4,7 +4,8 @@ import PluginList from "@/components/Visualizations/PluginList.vue"; diff --git a/client/src/stores/activitySetup.ts b/client/src/stores/activitySetup.ts index fd1f2612c2e..aa15c8ab564 100644 --- a/client/src/stores/activitySetup.ts +++ b/client/src/stores/activitySetup.ts @@ -72,7 +72,7 @@ export const Activities = [ id: "visualizations", mutable: false, optional: true, - title: "Visualize", + title: "Visualization", to: null, tooltip: "Visualize datasets", visible: true, From 15546954194b8a559553034b3a6bcbfb3dd26b0c Mon Sep 17 00:00:00 2001 From: guerler Date: Mon, 8 Apr 2024 11:09:17 +0300 Subject: [PATCH 04/15] Add plugin request to visualizations activity --- .../components/Panels/VisualizationPanel.vue | 17 ++++++++++++++++- client/src/utils/url.ts | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/client/src/components/Panels/VisualizationPanel.vue b/client/src/components/Panels/VisualizationPanel.vue index a1d7ab4cb7d..4e5766aebe1 100644 --- a/client/src/components/Panels/VisualizationPanel.vue +++ b/client/src/components/Panels/VisualizationPanel.vue @@ -1,11 +1,26 @@ diff --git a/client/src/utils/url.ts b/client/src/utils/url.ts index 5b290d7d7b5..bc537c30382 100644 --- a/client/src/utils/url.ts +++ b/client/src/utils/url.ts @@ -5,7 +5,7 @@ import { rethrowSimple } from "@/utils/simple-error"; export interface UrlDataOptions { url: string; - headers: Record; + headers?: Record; params?: Record; errorSimplify?: boolean; } From e5339823084a2216bd1f3d56ade49ab06ba44aba Mon Sep 17 00:00:00 2001 From: guerler Date: Mon, 8 Apr 2024 14:14:38 +0300 Subject: [PATCH 05/15] Adjust panel style, apply to visualizations activity --- .../ActivityBar/ActivitySettings.vue | 2 +- .../src/components/Panels/ActivityPanel.vue | 14 +++- .../components/Panels/VisualizationPanel.vue | 47 +++++++++++-- client/src/style/scss/base.scss | 68 +------------------ client/src/style/scss/panels.scss | 65 ++++++++++++++++++ client/src/style/scss/ui.scss | 4 ++ 6 files changed, 123 insertions(+), 77 deletions(-) create mode 100644 client/src/style/scss/panels.scss diff --git a/client/src/components/ActivityBar/ActivitySettings.vue b/client/src/components/ActivityBar/ActivitySettings.vue index b5b81e4f953..5e7bfca62b9 100644 --- a/client/src/components/ActivityBar/ActivitySettings.vue +++ b/client/src/components/ActivityBar/ActivitySettings.vue @@ -61,7 +61,7 @@ function onQuery(newQuery: string) { - diff --git a/client/src/components/Panels/ActivityPanel.vue b/client/src/components/Panels/ActivityPanel.vue index 05bd06425fc..0e0330b8774 100644 --- a/client/src/components/Panels/ActivityPanel.vue +++ b/client/src/components/Panels/ActivityPanel.vue @@ -77,8 +77,7 @@ const emit = defineEmits(["goToAll"]); border-color: transparent; } button:first-child:hover { - background: $brand-primary; - color: $brand-light; + background: $gray-200; } } From ec70b7a5c6eb1d53bc0d409edb6140673526e755 Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 10 Apr 2024 10:28:15 +0300 Subject: [PATCH 13/15] Use consistent font size in side panel --- client/src/components/ActivityBar/ActivitySettings.vue | 8 ++++---- client/src/components/Panels/VisualizationPanel.vue | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/components/ActivityBar/ActivitySettings.vue b/client/src/components/ActivityBar/ActivitySettings.vue index 944593f6910..7cb15ef9f52 100644 --- a/client/src/components/ActivityBar/ActivitySettings.vue +++ b/client/src/components/ActivityBar/ActivitySettings.vue @@ -77,12 +77,12 @@ function onQuery(newQuery: string) { icon="fas fa-check-square" fa-fw /> - + {{ activity.title || "No title available" }} - + - +
{{ activity.description || "No description available" }} - +
diff --git a/client/src/components/Panels/VisualizationPanel.vue b/client/src/components/Panels/VisualizationPanel.vue index 92c78a95b30..5d11937303f 100644 --- a/client/src/components/Panels/VisualizationPanel.vue +++ b/client/src/components/Panels/VisualizationPanel.vue @@ -79,7 +79,7 @@ onMounted(() => {
diff --git a/client/src/components/Panels/VisualizationPanel.vue b/client/src/components/Panels/VisualizationPanel.vue index 5d11937303f..9297032bfc3 100644 --- a/client/src/components/Panels/VisualizationPanel.vue +++ b/client/src/components/Panels/VisualizationPanel.vue @@ -85,7 +85,7 @@ onMounted(() => {
{{ plugin.html }}
-
{{ plugin.description }}
+
{{ plugin.description }}
From 74c243755bc4cfb6b97ff8b6fd31e1de51dd7e2b Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 11 Apr 2024 08:27:37 +0300 Subject: [PATCH 15/15] Reduce size of visualization logo placeholder icon --- client/src/components/Panels/VisualizationPanel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/Panels/VisualizationPanel.vue b/client/src/components/Panels/VisualizationPanel.vue index 9297032bfc3..e20a115ddad 100644 --- a/client/src/components/Panels/VisualizationPanel.vue +++ b/client/src/components/Panels/VisualizationPanel.vue @@ -108,8 +108,8 @@ onMounted(() => { width: 2rem; } .plugin-icon { - font-size: 1.5rem; - padding: 0.2rem; + font-size: 1.3rem; + padding: 0.3rem; } }