Skip to content

armgit / papra

Public Imported from GitHub
0

The minimalistic document archiving platform.

feat(client): add user settings dropdown in org creation page (#811)

Corentin Thomasset1eeb3df4a282
diff --git a/.changeset/orange-icons-hug.md b/.changeset/orange-icons-hug.md
new file mode 100644
index 00000000..3829e9c6
--- /dev/null
+++ b/.changeset/orange-icons-hug.md
@@ -0,0 +1,5 @@
+---
+"@papra/app": patch
+---
+
+Added small header in organization creation page to quickly access the invitations when first organization is being created
diff --git a/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx b/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx
index 92ae6125..7cfcb5b1 100644
--- a/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx
+++ b/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx
@@ -1,8 +1,10 @@
import type { Component } from 'solid-js';
-import { useNavigate } from '@solidjs/router';
+import { A, useNavigate } from '@solidjs/router';
import { useQuery } from '@tanstack/solid-query';
import { createEffect, on } from 'solid-js';
import { useI18n } from '@/modules/i18n/i18n.provider';
+import { AppLogo } from '@/modules/ui/components/app-logo';
+import { UserSettingsDropdown } from '@/modules/users/components/user-settings.component';
import { useCurrentUser } from '@/modules/users/composables/useCurrentUser';
import { CreateOrganizationForm } from '../components/create-organization-form.component';
import { useCreateOrganization } from '../organizations.composables';
@@ -40,6 +42,12 @@ export const CreateFirstOrganizationPage: Component = () => {
return (
<div>
+ <div class="max-w-2xl mx-auto px-6 py-4 flex justify-between items-center border-b">
+ <AppLogo as={A} href="/" />
+
+ <UserSettingsDropdown />
+ </div>
+
<div class="max-w-md mx-auto pt-12 sm:pt-24 px-6">
<h1 class="text-xl font-bold">
{t('organizations.create-first.title')}
diff --git a/apps/papra-client/src/modules/organizations/pages/create-organization.page.tsx b/apps/papra-client/src/modules/organizations/pages/create-organization.page.tsx
index 47731d26..0d875939 100644
--- a/apps/papra-client/src/modules/organizations/pages/create-organization.page.tsx
+++ b/apps/papra-client/src/modules/organizations/pages/create-organization.page.tsx
@@ -1,7 +1,9 @@
import type { Component } from 'solid-js';
import { A } from '@solidjs/router';
import { useI18n } from '@/modules/i18n/i18n.provider';
+import { AppLogo } from '@/modules/ui/components/app-logo';
import { Button } from '@/modules/ui/components/button';
+import { UserSettingsDropdown } from '@/modules/users/components/user-settings.component';
import { CreateOrganizationForm } from '../components/create-organization-form.component';
import { useCreateOrganization } from '../organizations.composables';
@@ -11,11 +13,13 @@ export const CreateOrganizationPage: Component = () => {
return (
<div>
+ <div class="max-w-2xl mx-auto px-6 py-4 flex justify-between items-center border-b">
+ <AppLogo as={A} href="/" />
+
+ <UserSettingsDropdown />
+ </div>
+
<div class="max-w-md mx-auto pt-12 sm:pt-24 px-6">
- <Button as={A} href="/" class="mb-4" variant="outline">
- <div class="i-tabler-arrow-left mr-2" />
- {t('organizations.create.back')}
- </Button>
<h1 class="text-xl font-bold">
{t('organizations.create.title')}
@@ -26,6 +30,10 @@ export const CreateOrganizationPage: Component = () => {
</p>
<CreateOrganizationForm onSubmit={createOrganization} />
+ <Button as={A} href="/" class="mb-4 w-full" variant="outline">
+ <div class="i-tabler-arrow-left mr-2" />
+ {t('organizations.create.back')}
+ </Button>
</div>
</div>
);
diff --git a/apps/papra-client/src/modules/ui/components/app-logo.tsx b/apps/papra-client/src/modules/ui/components/app-logo.tsx
new file mode 100644
index 00000000..55a58fc1
--- /dev/null
+++ b/apps/papra-client/src/modules/ui/components/app-logo.tsx
@@ -0,0 +1,20 @@
+import type { PolymorphicProps } from '@kobalte/core/polymorphic';
+import type { ValidComponent } from 'solid-js';
+import { Polymorphic } from '@kobalte/core/polymorphic';
+import { splitProps } from 'solid-js';
+import { cn } from '@/modules/shared/style/cn';
+
+export function AppLogo<T extends ValidComponent = 'div'>(props: PolymorphicProps<T, { class?: string }>) {
+ const [local, rest] = splitProps(props, ['class']);
+
+ return (
+ <Polymorphic
+ as="div"
+ class={cn(`text-lg flex items-center gap-2 font-semibold group`, local.class)}
+ {...rest}
+ >
+ <div class="i-tabler-file-text text-primary rotate-12 size-6 group-hover:rotate-25 transition" />
+ Papra
+ </Polymorphic>
+ );
+}
diff --git a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
index 64fd18d9..b6ced8f6 100644
--- a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
+++ b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx
@@ -1,20 +1,19 @@
import type { Component, ParentComponent } from 'solid-js';
-import { A, useNavigate, useParams } from '@solidjs/router';
+import { A, useParams } from '@solidjs/router';
import { For, Show, Suspense } from 'solid-js';
-import { signOut } from '@/modules/auth/auth.services';
import { useCommandPalette } from '@/modules/command-palette/command-palette.provider';
import { useDocumentUpload } from '@/modules/documents/components/document-import-status.component';
import { GlobalDropArea } from '@/modules/documents/components/global-drop-area.component';
import { useI18n } from '@/modules/i18n/i18n.provider';
-import { usePendingInvitationsCount } from '@/modules/invitations/composables/usePendingInvitationsCount';
import { AboutDialog, useAboutDialog } from '@/modules/shared/components/about-dialog';
import { UsageWarningCard } from '@/modules/subscriptions/components/usage-warning-card';
import { useThemeStore } from '@/modules/theme/theme.store';
import { Button } from '@/modules/ui/components/button';
+import { UserSettingsDropdown } from '@/modules/users/components/user-settings.component';
import { useCurrentUser } from '@/modules/users/composables/useCurrentUser';
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger } from '../components/dropdown-menu';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuTrigger } from '../components/dropdown-menu';
import { Sheet, SheetContent, SheetTrigger } from '../components/sheet';
export const ThemeSwitcher: Component = () => {
@@ -75,8 +74,6 @@ export const SidenavLayout: ParentComponent<{
const themeStore = useThemeStore();
const params = useParams();
const { openCommandPalette } = useCommandPalette();
- const navigate = useNavigate();
- const { getPendingInvitationsCount } = usePendingInvitationsCount();
const { t } = useI18n();
const { hasPermission } = useCurrentUser();
const aboutDialog = useAboutDialog();
@@ -142,68 +139,7 @@ export const SidenavLayout: ParentComponent<{
</Button>
</Show>
- <DropdownMenu>
- <DropdownMenuTrigger as={Button} class="relative text-base hidden sm:flex" variant="outline" aria-label="User menu" size="icon">
- <div class="i-tabler-user size-4" />
- <Show when={getPendingInvitationsCount() > 0}>
- <div class="absolute -top-2 -right-2 bg-primary text-primary-foreground rounded-xl text-xs px-1.5 py-0.8 font-bold leading-none">
- {getPendingInvitationsCount() }
- </div>
- </Show>
- </DropdownMenuTrigger>
- <DropdownMenuContent class="min-w-48">
- <DropdownMenuItem class="flex items-center gap-2 cursor-pointer" as={A} href="/settings">
- <div class="i-tabler-settings size-4 text-muted-foreground" />
- {t('user-menu.account-settings')}
- </DropdownMenuItem>
-
- <DropdownMenuItem class="flex items-center gap-2 cursor-pointer" as={A} href="/api-keys">
- <div class="i-tabler-key size-4 text-muted-foreground" />
- {t('user-menu.api-keys')}
- </DropdownMenuItem>
-
- <DropdownMenuItem class="flex items-center gap-2 cursor-pointer" as={A} href="/invitations">
- <div class="i-tabler-mail-plus size-4 text-muted-foreground" />
- {t('user-menu.invitations')}
- <Show when={getPendingInvitationsCount() > 0}>
- <div class="ml-auto bg-primary text-primary-foreground rounded-xl text-xs px-1.5 py-0.8 font-bold leading-none">
- {getPendingInvitationsCount() }
- </div>
- </Show>
- </DropdownMenuItem>
-
- <DropdownMenuSub>
-
- <DropdownMenuSubTrigger class="flex items-center gap-2 cursor-pointer">
- <div class="i-tabler-language size-4 text-muted-foreground" />
- {t('user-menu.language')}
- </DropdownMenuSubTrigger>
-
- <DropdownMenuSubContent class="min-w-48">
- <LanguageSwitcher />
- </DropdownMenuSubContent>
- </DropdownMenuSub>
-
- <DropdownMenuItem
- onClick={() => aboutDialog.open()}
- class="flex items-center gap-2 cursor-pointer"
- >
- <div class="i-tabler-info-circle size-4 text-muted-foreground" />
- {t('user-menu.about')}
- </DropdownMenuItem>
-
- <DropdownMenuItem
- onClick={async () => {
- await signOut();
- navigate('/login');
- }}
- class="flex items-center gap-2 cursor-pointer"
- >
- <div class="i-tabler-logout size-4 text-muted-foreground" />
- {t('user-menu.logout')}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <UserSettingsDropdown class="hidden sm:flex" />
</div>
</div>
diff --git a/apps/papra-client/src/modules/users/components/user-settings.component.tsx b/apps/papra-client/src/modules/users/components/user-settings.component.tsx
new file mode 100644
index 00000000..39245179
--- /dev/null
+++ b/apps/papra-client/src/modules/users/components/user-settings.component.tsx
@@ -0,0 +1,83 @@
+import type { Component } from 'solid-js';
+import { A, useNavigate } from '@solidjs/router';
+import { Show } from 'solid-js';
+import { signOut } from '@/modules/auth/auth.services';
+import { useI18n } from '@/modules/i18n/i18n.provider';
+import { usePendingInvitationsCount } from '@/modules/invitations/composables/usePendingInvitationsCount';
+import { useAboutDialog } from '@/modules/shared/components/about-dialog';
+import { cn } from '@/modules/shared/style/cn';
+import { Button } from '@/modules/ui/components/button';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger } from '@/modules/ui/components/dropdown-menu';
+import { LanguageSwitcher } from '@/modules/ui/layouts/sidenav.layout';
+
+export const UserSettingsDropdown: Component<{ class?: string }> = (props) => {
+ const { getPendingInvitationsCount } = usePendingInvitationsCount();
+ const aboutDialog = useAboutDialog();
+ const { t } = useI18n();
+ const navigate = useNavigate();
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger as={Button} class={cn('relative', props.class)} variant="outline" aria-label="User menu" size="icon">
+ <div class="i-tabler-user size-4" />
+ <Show when={getPendingInvitationsCount() > 0}>
+ <div class="absolute -top-2 -right-2 bg-primary text-primary-foreground rounded-xl text-xs px-1.5 py-0.8 font-bold leading-none">
+ {getPendingInvitationsCount()}
+ </div>
+ </Show>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent class="min-w-48">
+ <DropdownMenuItem class="flex items-center gap-2 cursor-pointer" as={A} href="/settings">
+ <div class="i-tabler-settings size-4 text-muted-foreground" />
+ {t('user-menu.account-settings')}
+ </DropdownMenuItem>
+
+ <DropdownMenuItem class="flex items-center gap-2 cursor-pointer" as={A} href="/api-keys">
+ <div class="i-tabler-key size-4 text-muted-foreground" />
+ {t('user-menu.api-keys')}
+ </DropdownMenuItem>
+
+ <DropdownMenuItem class="flex items-center gap-2 cursor-pointer" as={A} href="/invitations">
+ <div class="i-tabler-mail-plus size-4 text-muted-foreground" />
+ {t('user-menu.invitations')}
+ <Show when={getPendingInvitationsCount() > 0}>
+ <div class="ml-auto bg-primary text-primary-foreground rounded-xl text-xs px-1.5 py-0.8 font-bold leading-none">
+ {getPendingInvitationsCount()}
+ </div>
+ </Show>
+ </DropdownMenuItem>
+
+ <DropdownMenuSub>
+
+ <DropdownMenuSubTrigger class="flex items-center gap-2 cursor-pointer">
+ <div class="i-tabler-language size-4 text-muted-foreground" />
+ {t('user-menu.language')}
+ </DropdownMenuSubTrigger>
+
+ <DropdownMenuSubContent class="min-w-48">
+ <LanguageSwitcher />
+ </DropdownMenuSubContent>
+ </DropdownMenuSub>
+
+ <DropdownMenuItem
+ onClick={() => aboutDialog.open()}
+ class="flex items-center gap-2 cursor-pointer"
+ >
+ <div class="i-tabler-info-circle size-4 text-muted-foreground" />
+ {t('user-menu.about')}
+ </DropdownMenuItem>
+
+ <DropdownMenuItem
+ onClick={async () => {
+ await signOut();
+ navigate('/login');
+ }}
+ class="flex items-center gap-2 cursor-pointer"
+ >
+ <div class="i-tabler-logout size-4 text-muted-foreground" />
+ {t('user-menu.logout')}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+};