Skip to content

Commit

Permalink
chore: wip - styling
Browse files Browse the repository at this point in the history
  • Loading branch information
PatrickDinh committed Mar 14, 2024
1 parent a3ea119 commit 5003046
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 23 deletions.
9 changes: 4 additions & 5 deletions src/App.routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Outlet } from 'react-router-dom'
import { LayoutPage } from './features/layout/pages/layout-page'
import { Urls } from './routes/urls'
import { evalTemplates } from './routes/templated-route'
import { TransactionPage } from './features/transactions/components/transaction'

export const routes = evalTemplates([
{
Expand All @@ -18,12 +17,12 @@ export const routes = evalTemplates([
element: <div>Home</div>,
},
{
template: Urls.Feature1,
element: <div>Feature 1</div>,
template: Urls.Explore,
element: <div>Explore</div>,
},
{
template: Urls.Transaction.ById,
element: <TransactionPage />,
template: Urls.AppStudio,
element: <div>App Studio</div>,
},
],
},
Expand Down
20 changes: 13 additions & 7 deletions src/features/layout/components/left-side-bar-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,27 @@ import { cn } from '@/features/primitive/utils'

export function LeftSideBarMenu() {
return (
<NavigationMenu className={cn('bg-secondary')}>
<NavigationMenu className={cn('bg-secondary w-52')}>

Check warning on line 8 in src/features/layout/components/left-side-bar-menu.tsx

View workflow job for this annotation

GitHub Actions / CI / node-ci

Replace `bg-secondary·w-52` with `w-52·bg-secondary`
<NavigationMenuList className={cn('flex-col items-start space-x-0')}>
<NavigationMenuItem>
<NavigationMenuItem className={cn('flex h-12 items-center p-4')}>
<NavigationMenuLink asChild>
<TemplatedNavLink urlTemplate={Urls.Feature1}>Home</TemplatedNavLink>
<TemplatedNavLink urlTemplate={Urls.Index} className={cn('[&.active]:text-primary')}>
Home
</TemplatedNavLink>
</NavigationMenuLink>
</NavigationMenuItem>
<NavigationMenuItem>
<NavigationMenuItem className={cn('flex h-12 items-center p-4')}>
<NavigationMenuLink asChild>
<TemplatedNavLink urlTemplate={Urls.Feature1}>Explore</TemplatedNavLink>
<TemplatedNavLink urlTemplate={Urls.Explore} className={cn('[&.active]:text-primary')}>
Explore
</TemplatedNavLink>
</NavigationMenuLink>
</NavigationMenuItem>
<NavigationMenuItem>
<NavigationMenuItem className={cn('flex h-12 items-center p-4')}>
<NavigationMenuLink asChild>
<TemplatedNavLink urlTemplate={Urls.Feature1}>App Studio</TemplatedNavLink>
<TemplatedNavLink urlTemplate={Urls.AppStudio} className={cn('[&.active]:text-primary')}>
App Studio
</TemplatedNavLink>
</NavigationMenuLink>
</NavigationMenuItem>
</NavigationMenuList>
Expand Down
7 changes: 5 additions & 2 deletions src/features/layout/pages/layout-page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ReactNode } from 'react'
import { Header } from '../components/header'
import { LeftSideBarMenu } from '../components/left-side-bar-menu'
import { cn } from '@/features/primitive/utils'

export interface LayoutPageProps {
children?: ReactNode
Expand All @@ -10,8 +11,10 @@ export function LayoutPage({ children }: LayoutPageProps) {
return (
<>
<Header />
<LeftSideBarMenu />
{children}
<div className={cn('flex h-full flex-row')}>
<LeftSideBarMenu />
{children}
</div>
</>
)
}
6 changes: 1 addition & 5 deletions src/features/primitive/components/navigation-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ const NavigationMenu = React.forwardRef<
React.ElementRef<typeof NavigationMenuPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof NavigationMenuPrimitive.Root>
>(({ className, children, ...props }, ref) => (
<NavigationMenuPrimitive.Root
ref={ref}
className={cn('relative z-10 flex max-w-max flex-1 items-center justify-center', className)}
{...props}
>
<NavigationMenuPrimitive.Root ref={ref} className={cn('relative z-10 flex flex-1', className)} {...props}>
{children}
<NavigationMenuViewport />
</NavigationMenuPrimitive.Root>
Expand Down
3 changes: 3 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,7 @@
body {
@apply bg-background text-foreground;
}
#root {
height: 100vh;
}
}
6 changes: 2 additions & 4 deletions src/routes/urls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ export const UrlParams = {

export const Urls = {
Index: UrlTemplate`/`,
Feature1: UrlTemplate`/feature-1`,
Transaction: UrlTemplate`/transaction`.extend({
ById: UrlTemplate`/${UrlParams.TransactionId}`,
}),
Explore: UrlTemplate`/explore`,
AppStudio: UrlTemplate`/app-studio`,
}

0 comments on commit 5003046

Please sign in to comment.