Skip to content

Commit

Permalink
Merge pull request #244 from priyanshuverma-dev/feat-command-panel
Browse files Browse the repository at this point in the history
feat: Adds Command Panel with shortcuts
  • Loading branch information
kom-senapati authored Nov 2, 2024
2 parents ecc3ce0 + f8da005 commit bb45fb6
Show file tree
Hide file tree
Showing 10 changed files with 417 additions and 4 deletions.
Binary file modified client/bun.lockb
Binary file not shown.
3 changes: 3 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
"@hookform/resolvers": "^3.9.0",
"@radix-ui/react-alert-dialog": "^1.1.2",
"@radix-ui/react-avatar": "^1.1.1",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-icons": "^1.3.1",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-scroll-area": "^1.2.0",
"@radix-ui/react-select": "^2.1.2",
Expand All @@ -26,6 +28,7 @@
"axios": "^1.7.7",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "1.0.0",
"emoji-picker-react": "^4.12.0",
"lucide-react": "^0.453.0",
"moment": "^2.30.1",
Expand Down
2 changes: 1 addition & 1 deletion client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ function App() {
<Route path="/login" element={<LoginPage />} />
<Route path="/signup" element={<SignupPage />} />
<Route path="/anonymous" element={<AnonymousPage />} />
<Route path="/leaderboard" element={<LeaderboardPage />} />

<Route element={<ProtectedRoute />}>
<Route path="/chatbot/:id" element={<ChatbotPage />} />
Expand All @@ -55,6 +54,7 @@ function App() {
<Route path="/hub/:chatbotId" element={<ChatbotViewPage />} />
<Route path="/profile" element={<ProfilePage />} />
<Route path="/profile/:username" element={<ProfilePage />} />
<Route path="/leaderboard" element={<LeaderboardPage />} />
</Route>
</Routes>
</AuthProvider>
Expand Down
2 changes: 2 additions & 0 deletions client/src/components/ProtectedRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useAuth } from "@/contexts/auth-context";
import { Navigate, Outlet } from "react-router-dom";

import { CopilotPopup } from "@copilotkit/react-ui";
import { CommandModal } from "./modals/command-modal";
const ProtectedRoute: React.FC = () => {
const { user, loading } = useAuth();

Expand All @@ -22,6 +23,7 @@ const ProtectedRoute: React.FC = () => {
}}
/>
<Outlet />
<CommandModal />
</>
);
};
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/modals/Tts-magic-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const markdownToPlainText = (markdown: string) => {

export default function TtsMagicModal() {
const modal = useTtsMagicModal();
const { text: initialText } = modal.extras;
const initialText = modal.extras.text || "";

const [text, setText] = useState("");
const [loading, setLoading] = useState(false);
Expand Down
133 changes: 133 additions & 0 deletions client/src/components/modals/command-modal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
"use client";

import * as React from "react";
import { GearIcon } from "@radix-ui/react-icons";

import {
CommandDialog,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
CommandSeparator,
} from "@/components/ui/command";
import {
AudioWaveform,
Bot,
ChartColumn,
Image,
Languages,
PanelTopInactive,
Plus,
} from "lucide-react";
import {
useCreateChatbotModal,
useSettingsModal,
useTranslateMagicModal,
useTtsMagicModal,
} from "@/stores/modal-store";
import { useNavigate } from "react-router-dom";

export function CommandModal() {
const [open, setOpen] = React.useState(false);

const createBotModal = useCreateChatbotModal();
const settingsModal = useSettingsModal();
const ttsModal = useTtsMagicModal();
const translateModal = useTranslateMagicModal();
const navigate = useNavigate();

React.useEffect(() => {
const down = (e: KeyboardEvent) => {
if (e.key === "k" && (e.metaKey || e.ctrlKey)) {
e.preventDefault();
setOpen((open) => !open);
}
};

document.addEventListener("keydown", down);
return () => document.removeEventListener("keydown", down);
}, []);

return (
<>
<div className="flex justify-between p-1">
<p className="text-sm text-muted-foreground font-mono ">
Open Command Panel
</p>
<p className="text-sm text-muted-foreground">
Press{" "}
<kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border bg-muted px-1.5 font-mono text-[10px] font-medium text-muted-foreground opacity-100">
<span className="text-xs"></span>K
</kbd>
</p>
</div>
<CommandDialog open={open} onOpenChange={setOpen}>
<CommandInput placeholder="Type a command or search..." />
<CommandList>
<CommandEmpty>No results found.</CommandEmpty>
<CommandGroup heading="Suggestions">
<CommandItem onSelect={() => createBotModal.onOpen()}>
<Plus />
<span>Create Chatbot</span>
</CommandItem>
<CommandItem onSelect={() => ttsModal.onOpen({ text: "" })}>
<AudioWaveform />
<span>Text-to-Speech Magic</span>
</CommandItem>
<CommandItem onSelect={() => translateModal.onOpen({ text: "" })}>
<Languages />
<span>Translate Magic</span>
</CommandItem>
<CommandItem
onSelect={() => {
setOpen(false);
navigate("/imagine");
}}
>
<Image />
<span>Generate Images</span>
</CommandItem>
<CommandItem
onSelect={() => {
setOpen(false);
navigate("/anonymous");
}}
>
<Bot />
<span>Anonymous Chat</span>
</CommandItem>
</CommandGroup>
<CommandSeparator />
<CommandGroup heading="Socialize">
<CommandItem
onSelect={() => {
setOpen(false);
navigate("/hub");
}}
>
<PanelTopInactive />
<span>Marketplace Hub</span>
</CommandItem>
<CommandItem
onSelect={() => {
setOpen(false);
navigate("/leaderboard");
}}
>
<ChartColumn />
<span>Leaderboard</span>
</CommandItem>
</CommandGroup>
<CommandGroup heading="Settings">
<CommandItem onSelect={() => settingsModal.onOpen()}>
<GearIcon />
<span>Settings</span>
</CommandItem>
</CommandGroup>
</CommandList>
</CommandDialog>
</>
);
}
2 changes: 1 addition & 1 deletion client/src/components/modals/translate-magic-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const languageOptions = [

export default function TranslateMagicModal() {
const modal = useTranslateMagicModal();
const { text: initialText } = modal.extras;
const initialText = modal.extras.text || "";

const [text, setText] = useState("");
const [language, setLanguage] = useState("");
Expand Down
153 changes: 153 additions & 0 deletions client/src/components/ui/command.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
import * as React from "react"
import { type DialogProps } from "@radix-ui/react-dialog"
import { Command as CommandPrimitive } from "cmdk"
import { Search } from "lucide-react"

import { cn } from "@/lib/utils"
import { Dialog, DialogContent } from "@/components/ui/dialog"

const Command = React.forwardRef<
React.ElementRef<typeof CommandPrimitive>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive>
>(({ className, ...props }, ref) => (
<CommandPrimitive
ref={ref}
className={cn(
"flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground",
className
)}
{...props}
/>
))
Command.displayName = CommandPrimitive.displayName

interface CommandDialogProps extends DialogProps {}

const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
return (
<Dialog {...props}>
<DialogContent className="overflow-hidden p-0 shadow-lg">
<Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
{children}
</Command>
</DialogContent>
</Dialog>
)
}

const CommandInput = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Input>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Input>
>(({ className, ...props }, ref) => (
<div className="flex items-center border-b px-3" cmdk-input-wrapper="">
<Search className="mr-2 h-4 w-4 shrink-0 opacity-50" />
<CommandPrimitive.Input
ref={ref}
className={cn(
"flex h-11 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
className
)}
{...props}
/>
</div>
))

CommandInput.displayName = CommandPrimitive.Input.displayName

const CommandList = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.List>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.List>
>(({ className, ...props }, ref) => (
<CommandPrimitive.List
ref={ref}
className={cn("max-h-[300px] overflow-y-auto overflow-x-hidden", className)}
{...props}
/>
))

CommandList.displayName = CommandPrimitive.List.displayName

const CommandEmpty = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Empty>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Empty>
>((props, ref) => (
<CommandPrimitive.Empty
ref={ref}
className="py-6 text-center text-sm"
{...props}
/>
))

CommandEmpty.displayName = CommandPrimitive.Empty.displayName

const CommandGroup = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Group>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Group>
>(({ className, ...props }, ref) => (
<CommandPrimitive.Group
ref={ref}
className={cn(
"overflow-hidden p-1 text-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground",
className
)}
{...props}
/>
))

CommandGroup.displayName = CommandPrimitive.Group.displayName

const CommandSeparator = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Separator>
>(({ className, ...props }, ref) => (
<CommandPrimitive.Separator
ref={ref}
className={cn("-mx-1 h-px bg-border", className)}
{...props}
/>
))
CommandSeparator.displayName = CommandPrimitive.Separator.displayName

const CommandItem = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Item>
>(({ className, ...props }, ref) => (
<CommandPrimitive.Item
ref={ref}
className={cn(
"relative flex cursor-default gap-2 select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled=true]:pointer-events-none data-[selected='true']:bg-accent data-[selected=true]:text-accent-foreground data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
className
)}
{...props}
/>
))

CommandItem.displayName = CommandPrimitive.Item.displayName

const CommandShortcut = ({
className,
...props
}: React.HTMLAttributes<HTMLSpanElement>) => {
return (
<span
className={cn(
"ml-auto text-xs tracking-widest text-muted-foreground",
className
)}
{...props}
/>
)
}
CommandShortcut.displayName = "CommandShortcut"

export {
Command,
CommandDialog,
CommandInput,
CommandList,
CommandEmpty,
CommandGroup,
CommandItem,
CommandShortcut,
CommandSeparator,
}
Loading

0 comments on commit bb45fb6

Please sign in to comment.