Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"check": "prettier --write . && eslint --fix"
},
"dependencies": {
"@pomerium/js-sdk": "^1.1.0",
"@radix-ui/react-alert-dialog": "^1.1.14",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
Expand Down
6 changes: 4 additions & 2 deletions src/components/Chat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type { Message } from 'ai'
import { type Servers } from '../lib/schemas'
import { ToolCallMessage } from './ToolCallMessage'
import { useModel } from '../contexts/ModelContext'
import { useUser } from '../contexts/UserContext'

// Streamed event type
type StreamEvent =
Expand All @@ -31,14 +32,15 @@ export function Chat() {
const [streamBuffer, setStreamBuffer] = useState<StreamEvent[]>([])
const [streaming, setStreaming] = useState(false)
const { selectedModel } = useModel()
const { user } = useUser()

const initialMessage = useMemo<Message>(
() => ({
id: generateMessageId(),
content: "👋 Hello! I'm your AI assistant. How can I help you today?",
content: `Hello ${user?.name?.split(' ')[0] ?? 'there'}! I'm your AI assistant. How can I help you today?`,
role: 'assistant',
}),
[],
[user?.name],
)

// Create a memoized body object that updates when selectedServers or model change
Expand Down
23 changes: 17 additions & 6 deletions src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ import { ThemeToggle } from './ThemeToggle'
import { Button } from './ui/button'
import { ModelSelect } from './ModelSelect'
import { useModel } from '../contexts/ModelContext'
import { useUser } from '../contexts/UserContext'

const Header: React.FC = () => {
const { selectedModel, setSelectedModel } = useModel()
const { user, isLoading } = useUser()
const [isDark, setIsDark] = useState(false)

useEffect(() => {
Expand Down Expand Up @@ -46,7 +48,7 @@ const Header: React.FC = () => {
<div className="px-2 py-1.5">
<p className="text-sm font-medium">User Account</p>
<p className="text-xs text-gray-500 dark:text-gray-400">
user@example.com
{isLoading ? 'Loading...' : user?.email}
</p>
</div>
<DropdownMenuSeparator />
Expand Down Expand Up @@ -80,17 +82,26 @@ const Header: React.FC = () => {
<DropdownMenuTrigger asChild>
<Button
variant="secondary"
size="sm"
className="size-10 flex items-center justify-center rounded-full"
className="size-10 flex justify-center items-center rounded-full"
>
<User className="h-5 w-5 text-secondary-foreground" />
<span className="sr-only">User menu</span>
{user?.picture ? (
<img
src={user.picture}
alt={user.name}
Comment thread
nickytonline marked this conversation as resolved.
aria-hidden={true}
className="size-8 rounded-full"
/>
) : (
<User className="size-4" />
)}
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-56">
<div className="px-2 py-1.5">
<p className="text-sm font-medium">User Account</p>
<p className="text-sm font-medium">{user?.name}</p>
<p className="text-xs text-gray-500 dark:text-gray-400">
user@example.com
{user?.email}
</p>
</div>
<DropdownMenuSeparator />
Expand Down
48 changes: 48 additions & 0 deletions src/contexts/UserContext.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { createContext, useContext } from 'react'
import type { ReactNode } from 'react'
import { getBrowserUser } from '@pomerium/js-sdk'
import { useQuery } from '@tanstack/react-query'
import type { UserInfo } from 'node_modules/@pomerium/js-sdk/lib/esm/types/utils'

type UserContextType = {
user: UserInfo | undefined
isLoading: boolean
error: unknown
}

const UserContext = createContext<UserContextType | undefined>(undefined)

async function fetchUserInfo(): Promise<UserInfo> {
const userInfo = await getBrowserUser()

return {
email: userInfo.email ?? '',
name: userInfo.name ?? '',
picture: userInfo.picture as string,
Comment thread
nickytonline marked this conversation as resolved.
}
}

export function UserProvider({ children }: { children: ReactNode }) {
const {
data: user,
isLoading,
error,
} = useQuery({
queryKey: ['user'],
queryFn: fetchUserInfo,
})

return (
<UserContext.Provider value={{ user, isLoading, error }}>
{children}
</UserContext.Provider>
)
}

export function useUser() {
const context = useContext(UserContext)
if (context === undefined) {
throw new Error('useUser must be used within a UserProvider')
}
return context
}
13 changes: 8 additions & 5 deletions src/routes/__root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
} from '@tanstack/react-router'
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { ModelProvider } from '../contexts/ModelContext'
import { UserProvider } from '../contexts/UserContext'

import appCss from '../styles.css?url'
import Header from '../components/Header'
Expand Down Expand Up @@ -59,11 +60,13 @@ export const Route = createRootRoute({

component: () => (
<QueryClientProvider client={queryClient}>
<ModelProvider>
<RootDocument>
<Outlet />
</RootDocument>
</ModelProvider>
<UserProvider>
<ModelProvider>
<RootDocument>
<Outlet />
</RootDocument>
</ModelProvider>
</UserProvider>
</QueryClientProvider>
),
})
Expand Down