From 998f1ed09fc788787d75dbbbf25b73abf3e904d5 Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Thu, 28 Dec 2023 11:05:08 -0600 Subject: [PATCH 01/15] Add group labels to sidebar --- src/renderer/assets/css/nav.css | 3 +++ src/renderer/src/pages.js | 7 +++++++ src/renderer/src/stories/sidebar.js | 28 ++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/renderer/assets/css/nav.css b/src/renderer/assets/css/nav.css index dcedbecb5..e81e0d06c 100755 --- a/src/renderer/assets/css/nav.css +++ b/src/renderer/assets/css/nav.css @@ -111,6 +111,9 @@ a[data-toggle="collapse"] { display: flex; flex-direction: column; justify-content: space-between; + overflow-y: auto; + margin-top: 15px; + border-top: 1px solid #d5d5d5; flex-grow: 1; } diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index d60abe07b..6d6b37b26 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -104,6 +104,7 @@ const pages = { conversion: new GuidedHomePage({ label: "Conversions", icon: guidedIcon, + group: 'Workflow', pages: { start: new GuidedStartPage({ label: "Start", @@ -176,26 +177,32 @@ const pages = { inspect: new InspectPage({ label: "Inspect", icon: inspectIcon, + group: 'Workflow' }), preview: new PreviewPage({ label: "Neurosift", icon: neurosiftIcon, + group: 'Workflow', }), uploads: new UploadsPage({ label: "Uploads", icon: uploadIcon, + group: 'Workflow' }), tutorial: new TutorialPage({ label: "Tutorial", icon: tutorialIcon, + group: 'Documentation' }), docs: new DocumentationPage({ label: "Documentation", icon: documentationIcon, + group: 'Documentation' }), contact: new ContactPage({ label: "Contact Us", icon: contactIcon, + group: 'Documentation' }), settings: new SettingsPage({ label: "Settings", diff --git a/src/renderer/src/stories/sidebar.js b/src/renderer/src/stories/sidebar.js index 2c6c0735d..a11ac14cb 100644 --- a/src/renderer/src/stories/sidebar.js +++ b/src/renderer/src/stories/sidebar.js @@ -1,5 +1,6 @@ import { LitElement, html } from "lit"; import useGlobalStyles from "./utils/useGlobalStyles.js"; +import { header } from "./forms/utils"; const componentCSS = ``; // These are not active until the component is using shadow DOM @@ -162,14 +163,17 @@ export class Sidebar extends LitElement { ul.classList.add("components"); const groups = {}; + + Object.entries(this.pages).forEach(([id, page]) => { const info = page.info ?? {}; const label = info.label ?? id; const icon = info.icon ?? ""; + const a = document.createElement("a"); a.setAttribute("data-id", id); a.href = "#"; - a.innerHTML = `${icon} ${label} `; + a.innerHTML = `${icon} ${label}`; a.onclick = () => this.#onClick(id); const li = document.createElement("li"); @@ -181,7 +185,27 @@ export class Sidebar extends LitElement { parent.append(a); }); - return [ul, ...Object.values(groups)]; + const bottomGroup = groups["bottom"] + delete groups["bottom"] + + for (let key in groups) { + const group = groups[key] + const title = document.createElement("h4") + Object.assign(title.style, { + color: "gray", + fontSize: "14px", + padding: "15px 0px 7px 10px", + borderBottom: "1px solid #ccc", + margin: 0, + marginBottom: "10px", + }) + title.innerHTML = header(key) + group.prepend(title) + } + + ul.append(...Object.values(groups)) + + return [ul, bottomGroup]; })()}
From f56c373f1ad3036ad348de421640309e314f8e98 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:06:30 +0000 Subject: [PATCH 02/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/renderer/src/pages.js | 14 +++++++------- src/renderer/src/stories/sidebar.js | 17 ++++++++--------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index 6d6b37b26..f29851169 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -104,7 +104,7 @@ const pages = { conversion: new GuidedHomePage({ label: "Conversions", icon: guidedIcon, - group: 'Workflow', + group: "Workflow", pages: { start: new GuidedStartPage({ label: "Start", @@ -177,32 +177,32 @@ const pages = { inspect: new InspectPage({ label: "Inspect", icon: inspectIcon, - group: 'Workflow' + group: "Workflow", }), preview: new PreviewPage({ label: "Neurosift", icon: neurosiftIcon, - group: 'Workflow', + group: "Workflow", }), uploads: new UploadsPage({ label: "Uploads", icon: uploadIcon, - group: 'Workflow' + group: "Workflow", }), tutorial: new TutorialPage({ label: "Tutorial", icon: tutorialIcon, - group: 'Documentation' + group: "Documentation", }), docs: new DocumentationPage({ label: "Documentation", icon: documentationIcon, - group: 'Documentation' + group: "Documentation", }), contact: new ContactPage({ label: "Contact Us", icon: contactIcon, - group: 'Documentation' + group: "Documentation", }), settings: new SettingsPage({ label: "Settings", diff --git a/src/renderer/src/stories/sidebar.js b/src/renderer/src/stories/sidebar.js index a11ac14cb..4e44801f7 100644 --- a/src/renderer/src/stories/sidebar.js +++ b/src/renderer/src/stories/sidebar.js @@ -164,7 +164,6 @@ export class Sidebar extends LitElement { const groups = {}; - Object.entries(this.pages).forEach(([id, page]) => { const info = page.info ?? {}; const label = info.label ?? id; @@ -185,12 +184,12 @@ export class Sidebar extends LitElement { parent.append(a); }); - const bottomGroup = groups["bottom"] - delete groups["bottom"] + const bottomGroup = groups["bottom"]; + delete groups["bottom"]; for (let key in groups) { - const group = groups[key] - const title = document.createElement("h4") + const group = groups[key]; + const title = document.createElement("h4"); Object.assign(title.style, { color: "gray", fontSize: "14px", @@ -198,12 +197,12 @@ export class Sidebar extends LitElement { borderBottom: "1px solid #ccc", margin: 0, marginBottom: "10px", - }) - title.innerHTML = header(key) - group.prepend(title) + }); + title.innerHTML = header(key); + group.prepend(title); } - ul.append(...Object.values(groups)) + ul.append(...Object.values(groups)); return [ul, bottomGroup]; })()} From 4b1b8c8ee8249b62b85ee88970397300f05c9cb2 Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Thu, 28 Dec 2023 15:11:22 -0600 Subject: [PATCH 03/15] Hide home button --- src/renderer/assets/css/nav.css | 13 +++++++++++++ src/renderer/src/pages.js | 1 + src/renderer/src/stories/sidebar.js | 6 +++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/renderer/assets/css/nav.css b/src/renderer/assets/css/nav.css index e81e0d06c..574293d81 100755 --- a/src/renderer/assets/css/nav.css +++ b/src/renderer/assets/css/nav.css @@ -107,6 +107,10 @@ a[data-toggle="collapse"] { padding-bottom: 0px; } +#main-nav .sidebar-header img { + cursor: pointer; +} + #main-nav .sidebar-body { display: flex; flex-direction: column; @@ -117,6 +121,15 @@ a[data-toggle="collapse"] { flex-grow: 1; } +#main-nav .sidebar-body > *:last-child { + /* margin-top: 50px; */ + border-top: 1px solid #ccc; + padding-top: 10px; + position: sticky; + bottom: 0; + background: var(--color-sidebar); +} + #main-nav ul.components { list-style: none; padding-right: 10px; diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index f29851169..e9ad123d9 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -100,6 +100,7 @@ const pages = { "/": new GettingStartedPage({ label: "Home", icon: overviewIcon, + hidden: true }), conversion: new GuidedHomePage({ label: "Conversions", diff --git a/src/renderer/src/stories/sidebar.js b/src/renderer/src/stories/sidebar.js index 4e44801f7..bebac393c 100644 --- a/src/renderer/src/stories/sidebar.js +++ b/src/renderer/src/stories/sidebar.js @@ -139,7 +139,9 @@ export class Sidebar extends LitElement {
${ logoNoName - ? html` ` + ? html` this.select("/") + }/> ` : "" } ${hasName ? html`

${this.name}

` : ""} @@ -169,6 +171,8 @@ export class Sidebar extends LitElement { const label = info.label ?? id; const icon = info.icon ?? ""; + if (info.hidden) return; + const a = document.createElement("a"); a.setAttribute("data-id", id); a.href = "#"; From a495cfee0e893f18d9672900313b32638c5c648c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 21:11:38 +0000 Subject: [PATCH 04/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/renderer/src/pages.js | 2 +- src/renderer/src/stories/sidebar.js | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index e9ad123d9..290a82660 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -100,7 +100,7 @@ const pages = { "/": new GettingStartedPage({ label: "Home", icon: overviewIcon, - hidden: true + hidden: true, }), conversion: new GuidedHomePage({ label: "Conversions", diff --git a/src/renderer/src/stories/sidebar.js b/src/renderer/src/stories/sidebar.js index bebac393c..1548b7e01 100644 --- a/src/renderer/src/stories/sidebar.js +++ b/src/renderer/src/stories/sidebar.js @@ -139,9 +139,14 @@ export class Sidebar extends LitElement {
${ logoNoName - ? html` this.select("/") - }/> ` + ? html` + this.select("/")} + /> + ` : "" } ${hasName ? html`

${this.name}

` : ""} From 5323f30699dce3879109e4a3bfeba85851c45fb4 Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Thu, 28 Dec 2023 15:13:32 -0600 Subject: [PATCH 05/15] Update nav.css --- src/renderer/assets/css/nav.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/renderer/assets/css/nav.css b/src/renderer/assets/css/nav.css index 574293d81..52cff4de7 100755 --- a/src/renderer/assets/css/nav.css +++ b/src/renderer/assets/css/nav.css @@ -117,12 +117,11 @@ a[data-toggle="collapse"] { justify-content: space-between; overflow-y: auto; margin-top: 15px; - border-top: 1px solid #d5d5d5; + border-top: 1px solid #bfbfbf; flex-grow: 1; } #main-nav .sidebar-body > *:last-child { - /* margin-top: 50px; */ border-top: 1px solid #ccc; padding-top: 10px; position: sticky; From 96153f0c8c0c45a09e1180d159601ed4ed25a3c5 Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Thu, 28 Dec 2023 15:15:01 -0600 Subject: [PATCH 06/15] Update nav.css --- src/renderer/assets/css/nav.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/renderer/assets/css/nav.css b/src/renderer/assets/css/nav.css index 52cff4de7..a2e9cb207 100755 --- a/src/renderer/assets/css/nav.css +++ b/src/renderer/assets/css/nav.css @@ -117,7 +117,6 @@ a[data-toggle="collapse"] { justify-content: space-between; overflow-y: auto; margin-top: 15px; - border-top: 1px solid #bfbfbf; flex-grow: 1; } From d63c7ad18929df2356f61a0f47d4df207db927ac Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Fri, 29 Dec 2023 12:43:30 -0600 Subject: [PATCH 07/15] Update style, labels, and initialization --- src/renderer/assets/css/nav.css | 21 ++++++++++++++------- src/renderer/src/pages.js | 10 ++++++---- src/renderer/src/stories/sidebar.js | 15 ++++++++++----- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/renderer/assets/css/nav.css b/src/renderer/assets/css/nav.css index a2e9cb207..f3930403a 100755 --- a/src/renderer/assets/css/nav.css +++ b/src/renderer/assets/css/nav.css @@ -115,25 +115,32 @@ a[data-toggle="collapse"] { display: flex; flex-direction: column; justify-content: space-between; - overflow-y: auto; + overflow-y: hidden; margin-top: 15px; flex-grow: 1; + border-top: 1px solid #dcdcdc; + } #main-nav .sidebar-body > *:last-child { - border-top: 1px solid #ccc; - padding-top: 10px; - position: sticky; - bottom: 0; background: var(--color-sidebar); + border-top: 1px solid #dcdcdc; +} + +#main-nav .sidebar-body > *:last-child h4 { + margin-top: 0px !important; } -#main-nav ul.components { +#main-nav .sidebar-body li { list-style: none; +} + +#main-nav ul { padding-right: 10px; padding-left: 3px; margin-right: 0; - margin-top: 10px; + margin-bottom: 0; + overflow-y: auto; } #main-nav ul p { diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index 290a82660..48c92253d 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -37,6 +37,8 @@ dashboard.logo = logo; dashboard.name = "NWB GUIDE"; dashboard.renderNameInSidebar = false; +const helpGroup = 'Help' + const overviewIcon = ` Date: Fri, 29 Dec 2023 18:43:48 +0000 Subject: [PATCH 08/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/renderer/assets/css/nav.css | 1 - src/renderer/src/pages.js | 4 ++-- src/renderer/src/stories/sidebar.js | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/renderer/assets/css/nav.css b/src/renderer/assets/css/nav.css index f3930403a..d2993c385 100755 --- a/src/renderer/assets/css/nav.css +++ b/src/renderer/assets/css/nav.css @@ -119,7 +119,6 @@ a[data-toggle="collapse"] { margin-top: 15px; flex-grow: 1; border-top: 1px solid #dcdcdc; - } #main-nav .sidebar-body > *:last-child { diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index 48c92253d..a62062d24 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -37,7 +37,7 @@ dashboard.logo = logo; dashboard.name = "NWB GUIDE"; dashboard.renderNameInSidebar = false; -const helpGroup = 'Help' +const helpGroup = "Help"; const overviewIcon = ` Date: Fri, 29 Dec 2023 12:46:31 -0600 Subject: [PATCH 09/15] Update pages.js --- src/renderer/src/pages.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index 48c92253d..8ff75e493 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -37,7 +37,7 @@ dashboard.logo = logo; dashboard.name = "NWB GUIDE"; dashboard.renderNameInSidebar = false; -const helpGroup = 'Help' +const resourcesGroup = 'Resources' const overviewIcon = ` Date: Fri, 29 Dec 2023 18:47:14 +0000 Subject: [PATCH 10/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/renderer/src/pages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index be8c21ab9..63b6e4d27 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -37,7 +37,7 @@ dashboard.logo = logo; dashboard.name = "NWB GUIDE"; dashboard.renderNameInSidebar = false; -const resourcesGroup = 'Resources' +const resourcesGroup = "Resources"; const overviewIcon = ` Date: Fri, 29 Dec 2023 14:50:27 -0600 Subject: [PATCH 11/15] Remove configuration header and darken borders --- src/renderer/assets/css/nav.css | 6 ++++-- src/renderer/src/pages.js | 2 +- src/renderer/src/stories/sidebar.js | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/renderer/assets/css/nav.css b/src/renderer/assets/css/nav.css index d2993c385..494db926e 100755 --- a/src/renderer/assets/css/nav.css +++ b/src/renderer/assets/css/nav.css @@ -118,12 +118,14 @@ a[data-toggle="collapse"] { overflow-y: hidden; margin-top: 15px; flex-grow: 1; - border-top: 1px solid #dcdcdc; + border-top: 1px solid #8f8f8f; } #main-nav .sidebar-body > *:last-child { background: var(--color-sidebar); - border-top: 1px solid #dcdcdc; + padding: 3px; + padding-top: 8px; + border-top: 1px solid #8f8f8f; } #main-nav .sidebar-body > *:last-child h4 { diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index 63b6e4d27..7bc132512 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -210,7 +210,7 @@ const pages = { settings: new SettingsPage({ label: "Settings", icon: settingsIcon, - group: "Configuration", + group: "bottom", }), }; diff --git a/src/renderer/src/stories/sidebar.js b/src/renderer/src/stories/sidebar.js index 2d83afd3e..8d3cd6303 100644 --- a/src/renderer/src/stories/sidebar.js +++ b/src/renderer/src/stories/sidebar.js @@ -197,6 +197,9 @@ export class Sidebar extends LitElement { parent.append(li); }); + const bottomGroup = groups["bottom"]; + delete groups["bottom"]; + for (let key in groups) { const group = groups[key]; const title = document.createElement("h4"); @@ -212,9 +215,6 @@ export class Sidebar extends LitElement { group.prepend(title); } - const bottomGroup = groups["Configuration"]; - delete groups["Configuration"]; - ul.append(...Object.values(groups)); return [ul, bottomGroup]; From 347590670f20259a90039de5281b8e85cd1d0a27 Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Sat, 30 Dec 2023 09:20:20 -0600 Subject: [PATCH 12/15] Update pages.js --- src/renderer/src/pages.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index 7bc132512..d2c8f2f74 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -107,7 +107,7 @@ const pages = { conversion: new GuidedHomePage({ label: "Conversions", icon: guidedIcon, - group: "Workflow", + group: "Workflows", pages: { start: new GuidedStartPage({ label: "Start", @@ -180,17 +180,17 @@ const pages = { inspect: new InspectPage({ label: "Inspect", icon: inspectIcon, - group: "Workflow", + group: "Workflows", }), preview: new PreviewPage({ label: "Neurosift", icon: neurosiftIcon, - group: "Workflow", + group: "Workflows", }), uploads: new UploadsPage({ label: "Uploads", icon: uploadIcon, - group: "Workflow", + group: "Workflows", }), tutorial: new TutorialPage({ label: "Tutorial", From 2c29675fdccac7019062ed5c6b59c6ff53289194 Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Sat, 30 Dec 2023 09:21:53 -0600 Subject: [PATCH 13/15] Update default height --- src/main/main.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/main.ts b/src/main/main.ts index c49609885..e2e397e82 100755 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -234,8 +234,8 @@ function initialize() { const windowOptions = { minWidth: 1121, minHeight: 735, - width: 1121, - height: 735, + width: 1280, + height: 800, center: true, show: false, icon, From 00a177aadfce97199a02609710f6e9cb0df83d3e Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Sat, 30 Dec 2023 20:23:19 -0600 Subject: [PATCH 14/15] Ensure window initializes at min values --- src/main/main.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/main.ts b/src/main/main.ts index e2e397e82..42de322ca 100755 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -231,11 +231,14 @@ function initialize() { if (globals.mainWindow) return // Do not re-initialize if the main window is already declared + const minHeight = 800; + const minWidth = 1280; + const windowOptions = { - minWidth: 1121, - minHeight: 735, - width: 1280, - height: 800, + minWidth, + minHeight, + width: minWidth, + height: minHeight, center: true, show: false, icon, From 580913ed9601115a51c8b50e2e33fa23ce86dd57 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 31 Dec 2023 02:23:34 +0000 Subject: [PATCH 15/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/main/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/main.ts b/src/main/main.ts index 42de322ca..f75cbfc29 100755 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -233,7 +233,7 @@ function initialize() { const minHeight = 800; const minWidth = 1280; - + const windowOptions = { minWidth, minHeight,