Skip to content

feature - left nav match #217

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jan 16, 2025
Merged

feature - left nav match #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f12c33
rearrange sidebar
ken-zlai Jan 14, 2025
4b0a9c5
separators
ken-zlai Jan 14, 2025
8231eda
add support button
ken-zlai Jan 15, 2025
d6bcc88
proper margin
ken-zlai Jan 15, 2025
6a690f6
remove -
ken-zlai Jan 15, 2025
c629037
Merge branch 'main' into ken/new-nav-match
ken-zlai Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 33 additions & 13 deletions frontend/src/lib/components/NavigationBar/NavigationBar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import IconExclamationTriangle from '~icons/heroicons/exclamation-triangle-16-solid';
import IconMagnifyingGlass from '~icons/heroicons/magnifying-glass-16-solid';
import IconUser from '~icons/heroicons/user';
import IconSquaresSolid from '~icons/heroicons/squares-2x2-16-solid';
import { Separator } from '$lib/components/ui/separator';

type Props = {
navItems: Entity[];
Expand Down Expand Up @@ -113,19 +115,12 @@
</span>
{/if}
</Button>
<Button
variant="ghost"
class="mb-9 text-regular-medium"
size="nav"
href="https://docs.chronon.ai"
target="_blank"
rel="noopener noreferrer"
icon="leading"
>
<IconDocumentText class="text-muted-icon-neutral" />
<span class="text-muted-foreground">Chronon docs</span>
<Button variant="ghost" class="text-regular-medium" size="nav" href="/" icon="leading">
<IconSquaresSolid class="text-muted-icon-neutral" />
<span class="text-muted-foreground">Home</span>
</Button>
<span class="mb-[10px] px-2 text-xs-medium text-muted-foreground">Observability</span>
<Separator class="my-6" />
<span class="mb-[10px] px-2 text-xs-medium text-muted-foreground">Datasets</span>
<ul class="space-y-1 flex-grow">
{#each navItems as item}
<li>
Expand All @@ -143,7 +138,32 @@
</li>
{/each}
</ul>
<div class="flex items-center mt-auto">
<Separator class="my-6" />
<span class="mb-[10px] px-2 text-xs-medium text-muted-foreground">Resources</span>
<Button
variant="ghost"
class="w-full text-regular-medium my-1"
size="nav"
href="https://docs.chronon.ai"
target="_blank"
rel="noopener noreferrer"
icon="leading"
>
<IconDocumentText class="text-muted-icon-neutral" />
<span class="text-muted-foreground">Chronon docs</span>
</Button>
<Button
variant="ghost"
class="w-full text-regular-medium my-1"
size="nav"
href="mailto:[email protected]"
icon="leading"
>
<IconDocumentText class="text-muted-icon-neutral" />
<span class="text-muted-foreground">Support</span>
</Button>
<Separator class="mt-6 mb-4" />
<div class="flex items-center">
<DropdownMenu>
<DropdownMenuTrigger asChild let:builder>
<Button variant="ghost" class="flex items-center cursor-pointer" builders={[builder]}>
Expand Down
22 changes: 15 additions & 7 deletions frontend/src/lib/types/Entity/Entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import IconCube from '~icons/heroicons/cube-16-solid';
import IconPuzzlePiece from '~icons/heroicons/puzzle-piece-16-solid';
import IconSquare3Stack3d from '~icons/heroicons/square-3-stack-3d-16-solid';
import IconCubeTransparent from '~icons/heroicons/cube-transparent';
import IconRectangleStack from '~icons/heroicons/rectangle-stack-16-solid';

export const entityConfig = [
{
Expand All @@ -9,17 +10,24 @@ export const entityConfig = [
icon: IconCube,
id: 'models'
},
{
label: 'GroupBys',
path: '/groupbys',
icon: IconPuzzlePiece,
id: 'groupbys'
},
{
label: 'Joins',
path: '/joins',
icon: IconSquare3Stack3d,
id: 'joins'
},
{
label: 'GroupBys',
path: '/GroupBys',
icon: IconRectangleStack,
Comment on lines +21 to +22
Copy link

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Fix path casing inconsistency.

Paths should use lowercase for consistency with other routes.

-		path: '/GroupBys',
+		path: '/groupbys',
-		path: '/StagingQueries',
+		path: '/staging-queries',

Also applies to: 28-29

id: 'groupbys'
},

{
label: 'Staging Queries',
path: '/StagingQueries',
icon: IconCubeTransparent,
id: 'stagingqueries'
}
] as const;

Expand Down
3 changes: 1 addition & 2 deletions frontend/src/routes/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
<NavigationSlider />

<!-- Left navigation -->
<NavigationBar navItems={entityConfig.filter((entity) => entity.id === 'joins')} {user} />

<NavigationBar navItems={[...entityConfig]} {user} />
<!-- Main content -->
<main
class="flex-1 flex flex-col overflow-hidden bg-neutral-100 relative rounded-tl-xl"
Expand Down
Loading