The minimalistic document archiving platform.
refactor(layouts): removed icons bar (#567)
Corentin Thomassetd7df2f095b8c
diff --git a/.changeset/bumpy-pens-study.md b/.changeset/bumpy-pens-study.mdnew file mode 100644index 00000000..53b910d5--- /dev/null+++ b/.changeset/bumpy-pens-study.md@@ -0,0 +1,5 @@+---+"@papra/docker": patch+---++Removed unnecessary left icon navbardiff --git a/.changeset/upset-nails-double.md b/.changeset/upset-nails-double.mdnew file mode 100644index 00000000..5a5ebecb--- /dev/null+++ b/.changeset/upset-nails-double.md@@ -0,0 +1,5 @@+---+"@papra/docker": patch+---++Redesigned the organization picker in the sidenavdiff --git a/apps/papra-client/src/modules/ui/components/select.tsx b/apps/papra-client/src/modules/ui/components/select.tsxindex e51d2adf..b22d2c7e 100644--- a/apps/papra-client/src/modules/ui/components/select.tsx+++ b/apps/papra-client/src/modules/ui/components/select.tsx@@ -4,7 +4,7 @@ import type {SelectItemProps,SelectTriggerProps,} from '@kobalte/core/select';-import type { ParentProps, ValidComponent } from 'solid-js';+import type { JSX, ParentProps, ValidComponent } from 'solid-js';import { Select as SelectPrimitive } from '@kobalte/core/select';import { splitProps } from 'solid-js';import { cn } from '@/modules/shared/style/cn';@@ -17,12 +17,13 @@ export const SelectItemDescription = SelectPrimitive.ItemDescription;export const SelectHiddenSelect = SelectPrimitive.HiddenSelect;export const SelectSection = SelectPrimitive.Section;-type selectTriggerProps<T extends ValidComponent = 'button'> = ParentProps<SelectTriggerProps<T> & { class?: string }>;+type selectTriggerProps<T extends ValidComponent = 'button'> = ParentProps<SelectTriggerProps<T> & { class?: string; caretIcon?: JSX.Element }>;export function SelectTrigger<T extends ValidComponent = 'button'>(props: PolymorphicProps<T, selectTriggerProps<T>>) {const [local, rest] = splitProps(props as selectTriggerProps, ['class','children',+ 'caretIcon',]);return (@@ -34,23 +35,27 @@ export function SelectTrigger<T extends ValidComponent = 'button'>(props: Polymo{...rest}>{local.children}- <SelectPrimitive.Icon- as="svg"- xmlns="http://www.w3.org/2000/svg"- width="1em"- height="1em"- viewBox="0 0 24 24"- class="size-4 opacity-50 flex items-center justify-center"- >- <path- fill="none"- stroke="currentColor"- stroke-linecap="round"- stroke-linejoin="round"- stroke-width="2"- d="m8 9l4-4l4 4m0 6l-4 4l-4-4"- />- </SelectPrimitive.Icon>+ {local.caretIcon !== undefined+ ? local.caretIcon+ : (+ <SelectPrimitive.Icon+ as="svg"+ xmlns="http://www.w3.org/2000/svg"+ width="1em"+ height="1em"+ viewBox="0 0 24 24"+ class="size-4 opacity-50 flex items-center justify-center"+ >+ <path+ fill="none"+ stroke="currentColor"+ stroke-linecap="round"+ stroke-linejoin="round"+ stroke-width="2"+ d="m8 9l4-4l4 4m0 6l-4 4l-4-4"+ />+ </SelectPrimitive.Icon>+ )}</SelectPrimitive.Trigger>);}diff --git a/apps/papra-client/src/modules/ui/layouts/organization-settings.layout.tsx b/apps/papra-client/src/modules/ui/layouts/organization-settings.layout.tsxindex a91bd2fc..d3988c4a 100644--- a/apps/papra-client/src/modules/ui/layouts/organization-settings.layout.tsx+++ b/apps/papra-client/src/modules/ui/layouts/organization-settings.layout.tsx@@ -33,7 +33,7 @@ export const OrganizationSettingsLayout: ParentComponent = (props) => {return (<div class="flex flex-row h-screen min-h-0">- <div class="w-350px border-r border-r-border flex-shrink-0 hidden md:block bg-card">+ <div class="w-280px border-r border-r-border flex-shrink-0 hidden md:block bg-card"><SideNavmainMenu={getNavigationItems()}diff --git a/apps/papra-client/src/modules/ui/layouts/organization.layout.tsx b/apps/papra-client/src/modules/ui/layouts/organization.layout.tsxindex de9ba733..579b661c 100644--- a/apps/papra-client/src/modules/ui/layouts/organization.layout.tsx+++ b/apps/papra-client/src/modules/ui/layouts/organization.layout.tsx@@ -145,8 +145,9 @@ const OrganizationLayoutSideNav: Component = () => {footer={() => <UpgradeCTAFooter organizationId={params.organizationId} />}header={() =>(- <div class="px-6 pt-4 max-w-285px min-w-0">+ <div class="p-4 pb-0 min-w-0 max-w-full"><Select+ class="w-full"options={[...organizationsQuery.data?.organizations ?? [], { id: 'create' }]}optionValue="id"optionTextValue="name"@@ -174,11 +175,23 @@ const OrganizationLayoutSideNav: Component = () => {<SelectItem class="cursor-pointer" item={props.item}>{props.item.rawValue.name}</SelectItem>)}>- <SelectTrigger>- <SelectValue<Organization | undefined> class="truncate">- {state => state.selectedOption()?.name}+ <SelectTrigger class="hover:bg-accent/50 transition rounded-lg h-auto pl-2" caretIcon={<div class="i-tabler-chevron-down size-4 opacity-50 ml-2 flex-shrink-0" />}>+ <SelectValue<Organization | undefined> class="flex items-center gap-2 min-w-0">+ {state => (+ <>+ <span class="p-1.5 rounded text-lg font-bold flex items-center bg-muted light:border dark:bg-primary/10 text-primary transition flex-shrink-0">+ <div class="i-tabler-file-text size-5.5"></div>+ </span>++ <span class="truncate text-base font-medium">+ {state.selectedOption()?.name}+ </span>+ </>+ )}+</SelectValue></SelectTrigger>+<SelectContent /></Select>diff --git a/apps/papra-client/src/modules/ui/layouts/settings.layout.tsx b/apps/papra-client/src/modules/ui/layouts/settings.layout.tsxindex 0216eca2..a0604843 100644--- a/apps/papra-client/src/modules/ui/layouts/settings.layout.tsx+++ b/apps/papra-client/src/modules/ui/layouts/settings.layout.tsx@@ -27,7 +27,7 @@ export const SettingsLayout: ParentComponent = (props) => {return (<div class="flex flex-row h-screen min-h-0">- <div class="w-350px border-r border-r-border flex-shrink-0 hidden md:block bg-card">+ <div class="w-280px border-r border-r-border flex-shrink-0 hidden md:block bg-card"><SideNavmainMenu={getMainMenuItems()}diff --git a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsxindex 7e695f73..bbfbf23f 100644--- a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx+++ b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx@@ -1,4 +1,3 @@-import type { TooltipTriggerProps } from '@kobalte/core/tooltip';import type { Component, ComponentProps, JSX, ParentComponent } from 'solid-js';import { A, useNavigate, useParams } from '@solidjs/router';import { Show, Suspense } from 'solid-js';@@ -16,7 +15,6 @@ import { useThemeStore } from '@/modules/theme/theme.store';import { Button } from '@/modules/ui/components/button';import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger } from '../components/dropdown-menu';import { Sheet, SheetContent, SheetTrigger } from '../components/sheet';-import { Tooltip, TooltipContent, TooltipTrigger } from '../components/tooltip';type MenuItem = {label: string;@@ -43,57 +41,10 @@ export const SideNav: Component<{footer?: Component;preFooter?: Component;}> = (props) => {- const getShortSideNavItems = () => [- {- label: 'All organizations',- to: '/organizations',- icon: 'i-tabler-building-community',- },- {- label: 'GitHub repository',- href: 'https://github.com/papra-hq/papra',- icon: 'i-tabler-brand-github',- },- {- label: 'Bluesky',- href: 'https://bsky.app/profile/papra.app',- icon: 'i-tabler-brand-bluesky',- },- ];-return (<div class="flex h-full">- <div class="w-65px border-r bg-card pt-4 pb-6 flex flex-col">- <Button variant="link" size="icon" as={A} href="/" class="text-lg font-bold hover:no-underline flex items-center text-primary mb-4 mx-auto">- <div class="i-tabler-file-text size-10 transform rotate-12deg hover:rotate-25deg transition"></div>- </Button>-- <div class="flex flex-col gap-0.5 flex-1">- {getShortSideNavItems().map(menuItem => (- <Tooltip>- <TooltipTrigger- as={(tooltipProps: TooltipTriggerProps) => (- <Button- variant="link"- class="text-lg font-bold hover:no-underline flex items-center text-foreground dark:text-muted-foreground hover:text-primary"- {...tooltipProps}- aria-label={menuItem.label}- {...(menuItem.href- ? { as: 'a', href: menuItem.href, target: '_blank', rel: 'noopener noreferrer' }- : { as: A, href: menuItem.to })}- >- <div class={cn(menuItem.icon, 'size-5')} />- </Button>- )}- />-- <TooltipContent>{menuItem.label}</TooltipContent>- </Tooltip>- ))}- </div>- </div>{(props.header || props.mainMenu || props.footerMenu || props.footer || props.preFooter) && (- <div class="h-full flex flex-col pb-6 flex-1">+ <div class="h-full flex flex-col pb-6 flex-1 min-w-0">{props.header && <props.header />}{props.mainMenu && (@@ -183,7 +134,7 @@ export const SidenavLayout: ParentComponent<{return (<div class="flex flex-row h-screen min-h-0">- <div class="w-350px border-r border-r-border flex-shrink-0 hidden md:block bg-card">+ <div class="w-280px border-r border-r-border flex-shrink-0 hidden md:block bg-card"><props.sideNav /></div>