diff --git a/package.json b/package.json index b8510e0..7fe5fe4 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "groq-sdk": "^0.3.3", "highlight.js": "^11.9.0", "marked-react": "^2.0.0", - "next": "14.1.1", + "next": "14.2.4", "nodemailer": "^6.9.13", "openai": "^4.42.0", "react": "^18", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fca4eba..8fc8db9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ dependencies: version: 0.21.1 '@auth0/nextjs-auth0': specifier: ^3.5.0 - version: 3.5.0(next@14.1.1) + version: 3.5.0(next@14.2.4) '@aws-sdk/client-s3': specifier: ^3.569.0 version: 3.569.0(aws-crt@1.21.2) @@ -28,7 +28,7 @@ dependencies: version: 0.8.0 '@next/third-parties': specifier: ^14.2.3 - version: 14.2.3(next@14.1.1)(react@18.2.0) + version: 14.2.3(next@14.2.4)(react@18.2.0) '@prisma/client': specifier: 5.8.1 version: 5.8.1(prisma@5.8.1) @@ -64,7 +64,7 @@ dependencies: version: 2.2.1 flowbite-react: specifier: ^0.7.2 - version: 0.7.2(@types/react@18.2.47)(esbuild@0.19.11)(next@14.1.1)(react-dom@18.2.0)(react@18.2.0)(tailwindcss@3.4.1) + version: 0.7.2(@types/react@18.2.47)(esbuild@0.19.11)(next@14.2.4)(react-dom@18.2.0)(react@18.2.0)(tailwindcss@3.4.1) google: specifier: link:@next/third-parties/google version: link:@next/third-parties/google @@ -78,8 +78,8 @@ dependencies: specifier: ^2.0.0 version: 2.0.0(react@18.2.0) next: - specifier: 14.1.1 - version: 14.1.1(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0) + specifier: 14.2.4 + version: 14.2.4(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0) nodemailer: specifier: ^6.9.13 version: 6.9.13 @@ -210,7 +210,7 @@ packages: - encoding dev: false - /@auth0/nextjs-auth0@3.5.0(next@14.1.1): + /@auth0/nextjs-auth0@3.5.0(next@14.2.4): resolution: { integrity: sha512-uFZEE2QQf1zU+jRK2fwqxRQt+WSqDPYF2tnr7d6BEa7b6L6tpPJ3evzoImbWSY1a7gFdvD7RD/Rvrsx7B5CKVg==, @@ -224,7 +224,7 @@ packages: debug: 4.3.4 joi: 17.13.1 jose: 4.15.5 - next: 14.1.1(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0) + next: 14.2.4(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0) oauth4webapi: 2.10.4 openid-client: 5.6.4 tslib: 2.6.2 @@ -1954,10 +1954,10 @@ packages: - supports-color dev: false - /@next/env@14.1.1: + /@next/env@14.2.4: resolution: { - integrity: sha512-7CnQyD5G8shHxQIIg3c7/pSeYFeMhsNbpU/bmvH7ZnDql7mNRgg8O2JZrhrc/soFnfBnKP4/xXNiiSIPn2w8gA==, + integrity: sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg==, } dev: false @@ -1970,10 +1970,10 @@ packages: glob: 7.1.7 dev: true - /@next/swc-darwin-arm64@14.1.1: + /@next/swc-darwin-arm64@14.2.4: resolution: { - integrity: sha512-yDjSFKQKTIjyT7cFv+DqQfW5jsD+tVxXTckSe1KIouKk75t1qZmj/mV3wzdmFb0XHVGtyRjDMulfVG8uCKemOQ==, + integrity: sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==, } engines: { node: '>= 10' } cpu: [arm64] @@ -1982,10 +1982,10 @@ packages: dev: false optional: true - /@next/swc-darwin-x64@14.1.1: + /@next/swc-darwin-x64@14.2.4: resolution: { - integrity: sha512-KCQmBL0CmFmN8D64FHIZVD9I4ugQsDBBEJKiblXGgwn7wBCSe8N4Dx47sdzl4JAg39IkSN5NNrr8AniXLMb3aw==, + integrity: sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==, } engines: { node: '>= 10' } cpu: [x64] @@ -1994,10 +1994,10 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-gnu@14.1.1: + /@next/swc-linux-arm64-gnu@14.2.4: resolution: { - integrity: sha512-YDQfbWyW0JMKhJf/T4eyFr4b3tceTorQ5w2n7I0mNVTFOvu6CGEzfwT3RSAQGTi/FFMTFcuspPec/7dFHuP7Eg==, + integrity: sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==, } engines: { node: '>= 10' } cpu: [arm64] @@ -2006,10 +2006,10 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-musl@14.1.1: + /@next/swc-linux-arm64-musl@14.2.4: resolution: { - integrity: sha512-fiuN/OG6sNGRN/bRFxRvV5LyzLB8gaL8cbDH5o3mEiVwfcMzyE5T//ilMmaTrnA8HLMS6hoz4cHOu6Qcp9vxgQ==, + integrity: sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==, } engines: { node: '>= 10' } cpu: [arm64] @@ -2018,10 +2018,10 @@ packages: dev: false optional: true - /@next/swc-linux-x64-gnu@14.1.1: + /@next/swc-linux-x64-gnu@14.2.4: resolution: { - integrity: sha512-rv6AAdEXoezjbdfp3ouMuVqeLjE1Bin0AuE6qxE6V9g3Giz5/R3xpocHoAi7CufRR+lnkuUjRBn05SYJ83oKNQ==, + integrity: sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==, } engines: { node: '>= 10' } cpu: [x64] @@ -2030,10 +2030,10 @@ packages: dev: false optional: true - /@next/swc-linux-x64-musl@14.1.1: + /@next/swc-linux-x64-musl@14.2.4: resolution: { - integrity: sha512-YAZLGsaNeChSrpz/G7MxO3TIBLaMN8QWMr3X8bt6rCvKovwU7GqQlDu99WdvF33kI8ZahvcdbFsy4jAFzFX7og==, + integrity: sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==, } engines: { node: '>= 10' } cpu: [x64] @@ -2042,10 +2042,10 @@ packages: dev: false optional: true - /@next/swc-win32-arm64-msvc@14.1.1: + /@next/swc-win32-arm64-msvc@14.2.4: resolution: { - integrity: sha512-1L4mUYPBMvVDMZg1inUYyPvFSduot0g73hgfD9CODgbr4xiTYe0VOMTZzaRqYJYBA9mana0x4eaAaypmWo1r5A==, + integrity: sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==, } engines: { node: '>= 10' } cpu: [arm64] @@ -2054,10 +2054,10 @@ packages: dev: false optional: true - /@next/swc-win32-ia32-msvc@14.1.1: + /@next/swc-win32-ia32-msvc@14.2.4: resolution: { - integrity: sha512-jvIE9tsuj9vpbbXlR5YxrghRfMuG0Qm/nZ/1KDHc+y6FpnZ/apsgh+G6t15vefU0zp3WSpTMIdXRUsNl/7RSuw==, + integrity: sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==, } engines: { node: '>= 10' } cpu: [ia32] @@ -2066,10 +2066,10 @@ packages: dev: false optional: true - /@next/swc-win32-x64-msvc@14.1.1: + /@next/swc-win32-x64-msvc@14.2.4: resolution: { - integrity: sha512-S6K6EHDU5+1KrBDLko7/c1MNy/Ya73pIAmvKeFwsF4RmBFJSO7/7YeD4FnZ4iBdzE69PpQ4sOMU9ORKeNuxe8A==, + integrity: sha512-tkLrjBzqFTP8DVrAAQmZelEahfR9OxWpFR++vAI9FBhCiIxtwHwBHC23SBHCTURBtwB4kc/x44imVOnkKGNVGg==, } engines: { node: '>= 10' } cpu: [x64] @@ -2078,7 +2078,7 @@ packages: dev: false optional: true - /@next/third-parties@14.2.3(next@14.1.1)(react@18.2.0): + /@next/third-parties@14.2.3(next@14.2.4)(react@18.2.0): resolution: { integrity: sha512-j4E2xBSsEZq4VX2pVm3LpGltSwCxETic6glJWfHyYQvpoMdplCAYrQKpF+E9Gg3jfsrfmRAIdTE11m+biBCx1Q==, @@ -2087,7 +2087,7 @@ packages: next: ^13.0.0 || ^14.0.0 react: ^18.2.0 dependencies: - next: 14.1.1(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0) + next: 14.2.4(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 third-party-capital: 1.0.20 dev: false @@ -3178,12 +3178,20 @@ packages: tslib: 2.6.2 dev: false - /@swc/helpers@0.5.2: + /@swc/counter@0.1.3: resolution: { - integrity: sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==, + integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==, + } + dev: false + + /@swc/helpers@0.5.5: + resolution: + { + integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==, } dependencies: + '@swc/counter': 0.1.3 tslib: 2.6.2 dev: false @@ -5590,7 +5598,7 @@ packages: } dev: true - /flowbite-react@0.7.2(@types/react@18.2.47)(esbuild@0.19.11)(next@14.1.1)(react-dom@18.2.0)(react@18.2.0)(tailwindcss@3.4.1): + /flowbite-react@0.7.2(@types/react@18.2.47)(esbuild@0.19.11)(next@14.2.4)(react-dom@18.2.0)(react@18.2.0)(tailwindcss@3.4.1): resolution: { integrity: sha512-Qq+yKW3955ZWjABzNq02NAS91rE86AHjCVRTXHXZ3dkcoGghqViIpsDCxOBo0NO7xnKkshYU3DocmczcP4pYTA==, @@ -5604,7 +5612,7 @@ packages: contentlayer: 0.3.4(esbuild@0.19.11) flowbite: 2.2.1 markdown-toc: 1.2.0 - next-contentlayer: 0.3.4(contentlayer@0.3.4)(esbuild@0.19.11)(next@14.1.1)(react-dom@18.2.0)(react@18.2.0) + next-contentlayer: 0.3.4(contentlayer@0.3.4)(esbuild@0.19.11)(next@14.2.4)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-icons: 4.12.0(react@18.2.0) @@ -8370,7 +8378,7 @@ packages: } dev: true - /next-contentlayer@0.3.4(contentlayer@0.3.4)(esbuild@0.19.11)(next@14.1.1)(react-dom@18.2.0)(react@18.2.0): + /next-contentlayer@0.3.4(contentlayer@0.3.4)(esbuild@0.19.11)(next@14.2.4)(react-dom@18.2.0)(react@18.2.0): resolution: { integrity: sha512-UtUCwgAl159KwfhNaOwyiI7Lg6sdioyKMeh+E7jxx0CJ29JuXGxBEYmCI6+72NxFGIFZKx8lvttbbQhbnYWYSw==, @@ -8384,7 +8392,7 @@ packages: '@contentlayer/core': 0.3.4(esbuild@0.19.11) '@contentlayer/utils': 0.3.4 contentlayer: 0.3.4(esbuild@0.19.11) - next: 14.1.1(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0) + next: 14.2.4(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) transitivePeerDependencies: @@ -8394,27 +8402,30 @@ packages: - supports-color dev: false - /next@14.1.1(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0): + /next@14.2.4(@opentelemetry/api@1.7.0)(react-dom@18.2.0)(react@18.2.0): resolution: { - integrity: sha512-McrGJqlGSHeaz2yTRPkEucxQKe5Zq7uPwyeHNmJaZNY4wx9E9QdxmTp310agFRoMuIYgQrCrT3petg13fSVOww==, + integrity: sha512-R8/V7vugY+822rsQGQCjoLhMuC9oFj9SOi4Cl4b2wjDrseD0LRZ10W7R6Czo4w9ZznVSshKjuIomsRjvm9EKJQ==, } engines: { node: '>=18.17.0' } hasBin: true peerDependencies: '@opentelemetry/api': ^1.1.0 + '@playwright/test': ^1.41.2 react: ^18.2.0 react-dom: ^18.2.0 sass: ^1.3.0 peerDependenciesMeta: '@opentelemetry/api': optional: true + '@playwright/test': + optional: true sass: optional: true dependencies: - '@next/env': 14.1.1 + '@next/env': 14.2.4 '@opentelemetry/api': 1.7.0 - '@swc/helpers': 0.5.2 + '@swc/helpers': 0.5.5 busboy: 1.6.0 caniuse-lite: 1.0.30001617 graceful-fs: 4.2.11 @@ -8423,15 +8434,15 @@ packages: react-dom: 18.2.0(react@18.2.0) styled-jsx: 5.1.1(react@18.2.0) optionalDependencies: - '@next/swc-darwin-arm64': 14.1.1 - '@next/swc-darwin-x64': 14.1.1 - '@next/swc-linux-arm64-gnu': 14.1.1 - '@next/swc-linux-arm64-musl': 14.1.1 - '@next/swc-linux-x64-gnu': 14.1.1 - '@next/swc-linux-x64-musl': 14.1.1 - '@next/swc-win32-arm64-msvc': 14.1.1 - '@next/swc-win32-ia32-msvc': 14.1.1 - '@next/swc-win32-x64-msvc': 14.1.1 + '@next/swc-darwin-arm64': 14.2.4 + '@next/swc-darwin-x64': 14.2.4 + '@next/swc-linux-arm64-gnu': 14.2.4 + '@next/swc-linux-arm64-musl': 14.2.4 + '@next/swc-linux-x64-gnu': 14.2.4 + '@next/swc-linux-x64-musl': 14.2.4 + '@next/swc-win32-arm64-msvc': 14.2.4 + '@next/swc-win32-ia32-msvc': 14.2.4 + '@next/swc-win32-x64-msvc': 14.2.4 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros diff --git a/src/app/assistants/[id]/chat/ChatPage.tsx b/src/app/assistants/[id]/chat/ChatPage.tsx index c6f5ed6..eace2cf 100644 --- a/src/app/assistants/[id]/chat/ChatPage.tsx +++ b/src/app/assistants/[id]/chat/ChatPage.tsx @@ -46,14 +46,7 @@ export default function ChatPage() { key='1' className='flex h-[calc(100vh-5rem)] max-h-full max-w-full flex-col' > -
- -
+
diff --git a/src/app/assistants/[id]/chat/ChatPageContextWrapper.tsx b/src/app/assistants/[id]/chat/ChatPageContextWrapper.tsx index 65daa51..63b3b97 100644 --- a/src/app/assistants/[id]/chat/ChatPageContextWrapper.tsx +++ b/src/app/assistants/[id]/chat/ChatPageContextWrapper.tsx @@ -1,5 +1,5 @@ import { useGetAssistant } from '@/app/assistants/[id]/client'; -import React, { useEffect, useState } from 'react'; +import React, { useContext, useEffect, useState } from 'react'; import { Assistant } from '@/app/types/assistant'; import ChatPage from '@/app/assistants/[id]/chat/ChatPage'; import { Spinner } from 'flowbite-react'; diff --git a/src/app/assistants/[id]/chat/ChatPageHeader.tsx b/src/app/assistants/[id]/chat/ChatPageHeader.tsx index 3e548a3..cfd38d2 100644 --- a/src/app/assistants/[id]/chat/ChatPageHeader.tsx +++ b/src/app/assistants/[id]/chat/ChatPageHeader.tsx @@ -1,39 +1,45 @@ 'use client'; -import { Card, Dropdown } from 'flowbite-react'; +import { Card, Dropdown, Navbar, NavbarBrand } from 'flowbite-react'; import Image from 'next/image'; import { useContext } from 'react'; import AssistantContext from '@/app/assistants/[id]/AssistantContext'; import { getImageHash } from '@/app/utils/hash'; +import { UserProfile } from '@/components/user-profile'; +import { useUser } from '@auth0/nextjs-auth0/client'; +import UserDropdown from '@/components/user-dropdown'; +import { getPrimaryBackgroundColor } from '@/app/utils/assistant'; export function ChatPageHeader() { const { assistant } = useContext(AssistantContext); + const { user, error, isLoading } = useUser(); + return ( -
-
-
- Assistant -
-
-

- {assistant.name} -

-

- {assistant.description} -

-
-
-
+ + + Assistant + + {assistant.name} + + + {user ? : <>} + ); } diff --git a/src/components/user-dropdown.tsx b/src/components/user-dropdown.tsx new file mode 100644 index 0000000..f5b1a51 --- /dev/null +++ b/src/components/user-dropdown.tsx @@ -0,0 +1,36 @@ +import { Avatar, Dropdown, DropdownHeader, DropdownItem } from 'flowbite-react'; +import { HiCog } from 'react-icons/hi'; +import { SignOut } from '@/components/signout'; + +export interface UserDropdownProps { + user?: any; +} + +export default function UserDropdown(props: UserDropdownProps) { + return ( +
+ + } + > + + {props.user?.name} + + {props.user?.email} + + + + Settings + + + +
+ ); +} diff --git a/src/components/user-profile.tsx b/src/components/user-profile.tsx index 6e52d1e..c5e67a8 100644 --- a/src/components/user-profile.tsx +++ b/src/components/user-profile.tsx @@ -15,6 +15,7 @@ import { DropdownItem, } from 'flowbite-react'; import { HiCog, HiLogout, HiUser } from 'react-icons/hi'; +import UserDropdown from '@/components/user-dropdown'; export const UserProfile = () => { // @ts-ignore @@ -31,30 +32,7 @@ export const UserProfile = () => { <> -
- - } - > - - {user?.name} - - {user?.email} - - - - Settings - - - -
+
Home