From 9926f9fd1995bb32c2915b55c647f0e849364e1c Mon Sep 17 00:00:00 2001 From: Garrett Date: Tue, 10 Oct 2023 17:36:37 -0700 Subject: [PATCH 01/14] Push all updates --- docs/developer_guide.rst | 2 +- pyflask/manageNeuroconv/manage_neuroconv.py | 5 +- schemas/json/dandi/global.json | 2 +- src/renderer/assets/css/global.css | 2 +- src/renderer/assets/css/guided.css | 13 +- src/renderer/assets/css/main.css | 37 +-- src/renderer/assets/css/section.css | 10 - src/renderer/assets/css/variables.css | 5 +- src/renderer/src/stories/Main.js | 8 +- src/renderer/src/stories/NavigationSidebar.js | 4 +- src/renderer/src/stories/Search.js | 4 +- src/renderer/src/stories/Table.js | 1 - .../src/stories/pages/contact-us/Contact.js | 42 ++- .../pages/documentation/Documentation.js | 2 - .../pages/getting-started/GettingStarted.js | 7 +- .../stories/pages/guided-mode/GuidedHome.js | 95 ++++--- .../stories/pages/guided-mode/GuidedStart.js | 49 +++- .../stories/pages/guided-mode/ProgressCard.js | 25 +- .../pages/guided-mode/data/GuidedMetadata.js | 9 +- .../guided-mode/data/GuidedPathExpansion.js | 21 +- .../pages/guided-mode/setup/GuidedSubjects.js | 2 +- .../src/stories/pages/inspect/InspectPage.js | 4 +- .../src/stories/pages/preview/PreviewPage.js | 2 +- .../stories/pages/settings/SettingsPage.js | 32 ++- .../src/stories/pages/tutorial/Tutorial.js | 257 +++++++++--------- .../src/stories/pages/uploads/UploadsPage.js | 2 +- .../preview/inspector/InspectorList.js | 7 +- 27 files changed, 313 insertions(+), 336 deletions(-) diff --git a/docs/developer_guide.rst b/docs/developer_guide.rst index e191ff894..0eae33f35 100644 --- a/docs/developer_guide.rst +++ b/docs/developer_guide.rst @@ -75,7 +75,7 @@ This will automatically add the new page to the sidebar. The page itself can be constructor(...args) { super(...args); - console.log(this.info.globalState) // This will print the global state that is currently being passed between subpages (i.e. within guided mode) + console.log(this.info.globalState) // This will print the global state that is currently being passed between subpages } render() { diff --git a/pyflask/manageNeuroconv/manage_neuroconv.py b/pyflask/manageNeuroconv/manage_neuroconv.py index 2045f2d42..9662905f1 100644 --- a/pyflask/manageNeuroconv/manage_neuroconv.py +++ b/pyflask/manageNeuroconv/manage_neuroconv.py @@ -342,8 +342,7 @@ def convert_to_nwb(info: dict) -> str: # Remove symlink placed at the default_output_directory if this will hold real data if ( - not run_stub_test - and resolved_output_directory == default_output_directory + resolved_output_directory == default_output_directory and default_output_directory.is_symlink() ): default_output_directory.unlink() @@ -401,7 +400,7 @@ def update_conversion_progress(**kwargs): ) # Create a symlink between the fake data and custom data - if not run_stub_test and not resolved_output_directory == default_output_directory: + if not resolved_output_directory == default_output_directory: if default_output_directory.exists(): # If default default_output_directory is not a symlink, delete all contents and create a symlink there if not default_output_directory.is_symlink(): diff --git a/schemas/json/dandi/global.json b/schemas/json/dandi/global.json index 1680fd34d..e44e06df6 100644 --- a/schemas/json/dandi/global.json +++ b/schemas/json/dandi/global.json @@ -14,7 +14,7 @@ "description": "From the staging (testing) server" } }, - "required": ["main_api_key", "staging_api_key"] + "required": ["main_api_key"] } } } diff --git a/src/renderer/assets/css/global.css b/src/renderer/assets/css/global.css index a238aa68f..bb44ffba5 100755 --- a/src/renderer/assets/css/global.css +++ b/src/renderer/assets/css/global.css @@ -10,7 +10,7 @@ /* Notfy */ .notyf__toast { - max-width: clamp(300px, 40vw, min-content) !important; + max-width: 40vw !important; } .notyf__message { diff --git a/src/renderer/assets/css/guided.css b/src/renderer/assets/css/guided.css index fef0872e0..33ab62748 100644 --- a/src/renderer/assets/css/guided.css +++ b/src/renderer/assets/css/guided.css @@ -27,7 +27,6 @@ width: 100%; height: 100%; border-radius: 5px; - margin-top: 15px; } .guided--nav-bar-dropdown { @@ -434,14 +433,6 @@ margin: 6px; } -.guided--main-tab, -.guided--parent-tab { - height: 100%; - width: 100%; - display: flex; - flex-direction: column; -} - .guided--page, .guided--panel { width: 100%; @@ -900,9 +891,9 @@ h1.guided--text-sub-step { background-color: var(--color-border); border: none; display: inline-block; - cursor: pointer; border-radius: 16px; } + .guided--capsule.active { background-color: var(--color-light-green); } @@ -922,7 +913,6 @@ h1.guided--text-sub-step { background-color: #d5eaff; border: none; display: inline-block; - cursor: pointer; transform: skewx(-25deg); } .guided--capsule-sub-page.active { @@ -1196,7 +1186,6 @@ h1.guided--text-sub-step { margin-bottom: 15px; border-bottom: 5px solid #b80d49; width: 100%; - margin-top: -0.5rem !important; } .guided--button-tab-container { diff --git a/src/renderer/assets/css/main.css b/src/renderer/assets/css/main.css index e7da66550..b1eb0db0a 100644 --- a/src/renderer/assets/css/main.css +++ b/src/renderer/assets/css/main.css @@ -1471,43 +1471,12 @@ details[open] > summary::before { box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } -.getting-started-overview { - padding-left: 0 !important; - padding-right: 0 !important; - height: 100%; - text-align: center; - display: flex; - flex-direction: column; - /* display: grid; - grid-template-rows: 68% 14% 15%; */ -} - -.getting-started-header { - width: auto; - height: 18rem; +.standalone-section { + width: 100%; display: flex; flex-direction: column; - justify-content: center; - margin: 0 auto; - margin-top: 3rem; align-items: center; - margin-bottom: 0rem; -} - -.front-page_logo { - margin-top: 0.5rem; - display: flex; - align-items: center; - flex-direction: row; - width: 63rem; - flex-direction: column; - justify-content: center; -} - -.header-text { - font-size: 18px; - margin-top: 1rem; - font-weight: bold; + margin-bottom: 20px; } .overview-card-layout { diff --git a/src/renderer/assets/css/section.css b/src/renderer/assets/css/section.css index af8b679f0..ce05dcc80 100755 --- a/src/renderer/assets/css/section.css +++ b/src/renderer/assets/css/section.css @@ -1,22 +1,12 @@ /* Section ------------------ */ .section { - /* position: absolute; */ - top: 0; - left: 210px; - right: 0; - bottom: 0; height: 100%; width: 100%; margin-right: 0; padding: 0px 50px 50px 50px; display: flex; flex-direction: column; - /* display: grid; - grid-template-rows: min-content auto; - grid-template-columns: 1fr; */ - /* padding-top: 7px; - padding-left: 30px; */ box-sizing: border-box; overflow-x: hidden; overflow-y: auto; diff --git a/src/renderer/assets/css/variables.css b/src/renderer/assets/css/variables.css index d38aac2c4..0554f24fc 100755 --- a/src/renderer/assets/css/variables.css +++ b/src/renderer/assets/css/variables.css @@ -32,9 +32,8 @@ .u-category-windows { --color-accent: hsl(190, 60%, 36%); } -.u-category-menu { - --color-accent: hsl(190, 60%, 36%); -} + + .u-category-native-ui { --color-accent: hsl(222, 53%, 50%); } diff --git a/src/renderer/src/stories/Main.js b/src/renderer/src/stories/Main.js index cb416ce10..0efbb1418 100644 --- a/src/renderer/src/stories/Main.js +++ b/src/renderer/src/stories/Main.js @@ -139,11 +139,11 @@ export class Main extends LitElement { ${headerEl} ${capsules ? html`
${capsuleEl}
` - : html`
`} + : html`
`}
-
+
${title - ? html`
+ ? html`
@@ -157,7 +157,7 @@ export class Main extends LitElement {
` : ""} -
${page}
+
${page}
${footerEl} diff --git a/src/renderer/src/stories/NavigationSidebar.js b/src/renderer/src/stories/NavigationSidebar.js index adccf07bd..091861c72 100644 --- a/src/renderer/src/stories/NavigationSidebar.js +++ b/src/renderer/src/stories/NavigationSidebar.js @@ -94,8 +94,8 @@ export class NavigationSidebar extends LitElement { render() { return html`