Skip to content

Refactor top bar #1829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lilydelalande merged 5 commits into from
Mar 24, 2025
Merged

Refactor top bar #1829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb92ae5
move more menu into sub-component dir
lilydelalande Mar 24, 2025
35c0fc2
add annotations, removed unused imports
lilydelalande Mar 24, 2025
a12f8c4
get rid of placeholder
lilydelalande Mar 24, 2025
9cc025b
fix imports
lilydelalande Mar 24, 2025
cee00e0
match main
lilydelalande Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ui/desktop/src/components/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import GooseMessage from './GooseMessage';
import Input from './Input';
import { type View } from '../App';
import LoadingGoose from './LoadingGoose';
import MoreMenu from './MoreMenu';
import MoreMenuLayout from './more_menu/MoreMenuLayout';
import { Card } from './ui/card';
import { ScrollArea, ScrollAreaHandle } from './ui/scroll-area';
import UserMessage from './UserMessage';
Expand Down Expand Up @@ -370,7 +370,7 @@ export default function ChatView({
return (
<div className="flex flex-col w-full h-screen items-center justify-center">
<div className="relative flex items-center h-[36px] w-full">
<MoreMenu setView={setView} setIsGoosehintsModalOpen={setIsGoosehintsModalOpen} />
<MoreMenuLayout setView={setView} setIsGoosehintsModalOpen={setIsGoosehintsModalOpen} />
</div>
<Card className="flex flex-col flex-1 rounded-none h-[calc(100vh-95px)] w-full bg-bgApp mt-0 border-none relative">
{messages.length === 0 ? (
Expand Down
11 changes: 8 additions & 3 deletions ui/desktop/src/components/MoreMenu.tsx → ...top/src/components/more_menu/MoreMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import { Popover, PopoverContent, PopoverPortal, PopoverTrigger } from '../components/ui/popover';
import {
Popover,
PopoverContent,
PopoverPortal,
PopoverTrigger,
} from '../../components/ui/popover';
import React, { useEffect, useState } from 'react';
import { ChatSmart, Idea, More, Refresh, Time, Send } from './icons';
import { ChatSmart, Idea, More, Refresh, Time, Send } from '../icons';
import { FolderOpen, Moon, Sliders, Sun } from 'lucide-react';
import { View } from '../App';
import { View } from '../../App';

interface VersionInfo {
current_version: string;
Expand Down
22 changes: 22 additions & 0 deletions ui/desktop/src/components/more_menu/MoreMenuLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import MoreMenu from './MoreMenu';
import React from 'react';
import type { View } from '../../App';

export default function MoreMenuLayout({
setView,
setIsGoosehintsModalOpen,
}: {
setView: (view: View, viewOptions?: Record<any, any>) => void;
setIsGoosehintsModalOpen: (isOpen: boolean) => void;
}) {
return (
<div className="relative flex items-center h-[36px] w-full bg-bgSubtle border-b border-borderSubtle">
<div className="flex-1"></div>
<div className="flex items-center h-full">
<div className="flex items-center justify-center h-full px-2 mr-2">
<MoreMenu setView={setView} setIsGoosehintsModalOpen={setIsGoosehintsModalOpen} />
</div>
</div>
</div>
);
}