Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add orgnaization tabs and settings tab skeleton #5458

Merged
merged 10 commits into from
Aug 20, 2024

Conversation

AdityaHegde
Copy link
Collaborator

  1. Adds tabs for organization that is hidden if the available tabs <= 1
  2. Adds skeleton for settings page that can be reused in project settings page.

Copy link
Contributor

@lovincyrus lovincyrus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The project settings page looks great. I can definitely re-use it for the public URLs table.

Unsure about the addition of sub-navigation bar (1 in the screenshot). Ideally, we only have 1 nav bar to avoid confusion. Also asked for clarification on the design https://www.figma.com/design/Qt6EyotCBS3V6O31jVhMQ7?node-id=144-815#915050693

CleanShot 2024-08-16 at 10 10 56@2x

Should be Settings instead of Status

CleanShot 2024-08-16 at 10 14 55@2x

@jkhwu
Copy link
Contributor

jkhwu commented Aug 16, 2024

Yes @lovincyrus is correct, the intent was for only one tab bar to show at a time. The org tab bar when you're on an org page, the project tab bar when you're on a project page.
Screenshot 2024-08-16 at 4 10 44 PM

Copy link
Contributor

@lovincyrus lovincyrus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spacing nit - could we align the nav tabs with the wordmark above?

CleanShot 2024-08-19 at 11 24 00@2x

CleanShot 2024-08-19 at 11 22 59@2x

@AdityaHegde
Copy link
Collaborator Author

@lovincyrus The outline is not really visible to users. The start of rill logo aligns with the tab background when hovered. You can see that in the 1st image you posted.

Side note the rill logo doesnt have a hover state in mocks but it does in UI. We should figure it out separately.

Copy link
Contributor

@ericpgreen2 ericpgreen2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UXQA –

  1. When any of the left nav tabs are highlighted, the "Settings" tab should retain its active state.
    image
  2. When arriving on the settings page, the "General" tab should be active.
    image

@@ -54,6 +55,7 @@
$: onReportPage = !!report;
$: onMetricsExplorerPage = isMetricsExplorerPage($page);
$: onPublicURLPage = isPublicURLPage($page);
$: witinOrgPage = withinOrganization($page);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: witin -> within

Comment on lines 24 to 31
<LeftNav
title="Settings"
{basePage}
baseRoute="/[organization]/-/settings"
{navItems}
>
<slot />
</LeftNav>
Copy link
Contributor

@ericpgreen2 ericpgreen2 Aug 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than the main page content being a child of LeftNav, I think it'd be more conventional/semantic for the main page content and LeftNav component to be siblings, like:

<div class="layout-container">
  <LeftNav {title} {basePage} {baseRoute} {navItems} />
  <slot />
</div>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this approach, it'd also make sense to pull the "Settings" header out of the LeftNav component.

Copy link
Contributor

@ericpgreen2 ericpgreen2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sweet. Agree w/ Cyrus that we should reconsider the alignment between the Rill icon & the tabs, but can leave that to a follow-up PR that also encompasses the Project page. Approving to unblock.

@AdityaHegde AdityaHegde dismissed lovincyrus’s stale review August 20, 2024 09:38

Will be taking the comment in a future PR and fix for project tabs as well.

@AdityaHegde AdityaHegde merged commit 58a7b68 into main Aug 20, 2024
4 checks passed
@AdityaHegde AdityaHegde deleted the adityahegde/org-settings-page branch August 20, 2024 09:38
@lovincyrus lovincyrus mentioned this pull request Oct 7, 2024
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants