Skip to content
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

[masterbots.ai] fix: restore desktop navigation link - browse section #303

Merged
merged 6 commits into from
Nov 12, 2024
Merged

[masterbots.ai] fix: restore desktop navigation link - browse section #303

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9274cb
fix:restore desktop navigation link - browse
Bran18 Nov 9, 2024
4618a83
fix:formating
Bran18 Nov 9, 2024
5a91ec5
feat:yellow combobox btn (JUN-REQUEST)
Bran18 Nov 11, 2024
42c539e
glowing effect variant
Bran18 Nov 11, 2024
3036edb
upt:removed /b navigation as original v
Bran18 Nov 12, 2024
650acc5
feat:powerup mode + provider
Bran18 Nov 12, 2024
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 apps/masterbots.ai/components/layout/header/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ export function Header() {
<SidebarToggle />
</React.Suspense>
<HeaderLink href="/" text="MB" />

{/* Navigation links - Hidden on mobile */}
<div className="hidden lg:flex lg:items-center">
<IconSeparator className="size-6 text-muted-foreground/50" />
<HeaderLink href="/c" text="Chat" />

<HeaderLink href="/b" text="Browse" />
{appConfig.devMode && (
<>
<HeaderLink href="/c/p" text="Pro" />
Expand Down
2 changes: 1 addition & 1 deletion apps/masterbots.ai/components/routes/chat/chat-combobox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function ChatCombobox() {
role="combobox"
aria-expanded={open}
className={cn(
buttonVariants({ size: 'sm', variant: 'outline' }),
buttonVariants({ size: 'sm', variant: 'chatCombobox' }),
'absolute left-0 top-4 size-8 rounded-full p-0 sm:left-4'
)}
>
Expand Down
3 changes: 3 additions & 0 deletions apps/masterbots.ai/components/ui/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Slot } from '@radix-ui/react-slot'
import { cva, type VariantProps } from 'class-variance-authority'

import { cn } from '@/lib/utils'
import {ChatCombobox} from '@/components/routes/chat/chat-combobox';
AndlerRL marked this conversation as resolved.
Show resolved Hide resolved

const buttonVariants = cva(
'inline-flex items-center justify-center rounded-md text-sm font-medium shadow ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
Expand All @@ -21,6 +22,8 @@ const buttonVariants = cva(
link: 'text-primary underline-offset-4 shadow-none hover:underline',
icon: 'flex size-8 shrink-0 select-none items-center justify-center rounded-full border shadow cursor-pointer',
sideBarProfile: 'bg-transparent border-0 shadow-none justify-start',
chatCombobox:
AndlerRL marked this conversation as resolved.
Show resolved Hide resolved
'border border-input bg-yellow-400 hover:bg-yellow-500 hover:text-accent-foreground',
},
size: {
default: 'h-8 px-4 py-2',
Expand Down