Merge remote-tracking branch 'origin/feat/refresh' into feat/completed-share-link

This commit is contained in:
Mythie
2023-09-21 18:55:52 +10:00

View File

@ -10,6 +10,7 @@ import {
User as LucideUser, User as LucideUser,
Monitor, Monitor,
Moon, Moon,
Palette,
Sun, Sun,
UserCog, UserCog,
} from 'lucide-react'; } from 'lucide-react';
@ -26,7 +27,13 @@ import {
DropdownMenuContent, DropdownMenuContent,
DropdownMenuItem, DropdownMenuItem,
DropdownMenuLabel, DropdownMenuLabel,
DropdownMenuPortal,
DropdownMenuRadioGroup,
DropdownMenuRadioItem,
DropdownMenuSeparator, DropdownMenuSeparator,
DropdownMenuSub,
DropdownMenuSubContent,
DropdownMenuSubTrigger,
DropdownMenuTrigger, DropdownMenuTrigger,
} from '@documenso/ui/primitives/dropdown-menu'; } from '@documenso/ui/primitives/dropdown-menu';
@ -37,8 +44,8 @@ export type ProfileDropdownProps = {
}; };
export const ProfileDropdown = ({ user }: ProfileDropdownProps) => { export const ProfileDropdown = ({ user }: ProfileDropdownProps) => {
const { theme, setTheme } = useTheme();
const { getFlag } = useFeatureFlags(); const { getFlag } = useFeatureFlags();
const { theme, setTheme } = useTheme();
const isUserAdmin = isAdmin(user); const isUserAdmin = isAdmin(user);
const isBillingEnabled = getFlag('app_billing'); const isBillingEnabled = getFlag('app_billing');
@ -98,28 +105,30 @@ export const ProfileDropdown = ({ user }: ProfileDropdownProps) => {
<DropdownMenuSeparator /> <DropdownMenuSeparator />
{theme === 'light' ? null : ( <DropdownMenuSub>
<DropdownMenuItem onClick={() => setTheme('light')}> <DropdownMenuSubTrigger>
<Sun className="mr-2 h-4 w-4" /> <Palette className="mr-2 h-4 w-4" />
Light Mode Themes
</DropdownMenuItem> </DropdownMenuSubTrigger>
)} <DropdownMenuPortal>
{theme === 'dark' ? null : ( <DropdownMenuSubContent>
<DropdownMenuItem onClick={() => setTheme('dark')}> <DropdownMenuRadioGroup value={theme} onValueChange={setTheme}>
<Moon className="mr-2 h-4 w-4" /> <DropdownMenuRadioItem value="light">
Dark Mode <Sun className="mr-2 h-4 w-4" /> Light
</DropdownMenuItem> </DropdownMenuRadioItem>
)} <DropdownMenuRadioItem value="dark">
<Moon className="mr-2 h-4 w-4" />
{theme === 'system' ? null : ( Dark
<DropdownMenuItem onClick={() => setTheme('system')}> </DropdownMenuRadioItem>
<Monitor className="mr-2 h-4 w-4" /> <DropdownMenuRadioItem value="system">
System Theme <Monitor className="mr-2 h-4 w-4" />
</DropdownMenuItem> System
)} </DropdownMenuRadioItem>
</DropdownMenuRadioGroup>
</DropdownMenuSubContent>
</DropdownMenuPortal>
</DropdownMenuSub>
<DropdownMenuSeparator /> <DropdownMenuSeparator />
<DropdownMenuItem asChild> <DropdownMenuItem asChild>
<Link href="https://github.com/documenso/documenso" className="cursor-pointer"> <Link href="https://github.com/documenso/documenso" className="cursor-pointer">
<Github className="mr-2 h-4 w-4" /> <Github className="mr-2 h-4 w-4" />