diff --git a/.eslintrc.json b/.eslintrc.json index 6ec5479..c17b532 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -8,7 +8,8 @@ ], "plugins": ["tailwindcss"], "rules": { - "tailwindcss/no-custom-classname": "off" + "tailwindcss/no-custom-classname": "off", + "tailwindcss/classnames-order": "off" }, "settings": { "tailwindcss": { diff --git a/.gitignore b/.gitignore index 83d560e..dd019e4 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ yarn-error.log* # turbo .turbo -.contentlayer .env .vercel -.vscode \ No newline at end of file +.vscode +.env*.local diff --git a/app/layout.tsx b/app/layout.tsx index 7dc2981..f4e6d31 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,15 +1,17 @@ import { Metadata } from 'next' import { Toaster } from 'react-hot-toast' +import { GeistSans } from 'geist/font/sans' +import { GeistMono } from 'geist/font/mono' import '@/app/globals.css' -import { fontMono, fontSans } from '@/lib/fonts' import { cn } from '@/lib/utils' import { TailwindIndicator } from '@/components/tailwind-indicator' import { Providers } from '@/components/providers' import { Header } from '@/components/header' export const metadata: Metadata = { + metadataBase: new URL('https://chat.vercel.ai/'), title: { default: 'Next.js AI Chatbot', template: `%s - Next.js AI Chatbot` @@ -33,18 +35,16 @@ interface RootLayoutProps { export default function RootLayout({ children }: RootLayoutProps) { return ( -
- {/* @ts-ignore */}
{children}
diff --git a/components/header.tsx b/components/header.tsx index 3ff0dd6..47aa70a 100644 --- a/components/header.tsx +++ b/components/header.tsx @@ -17,7 +17,6 @@ import { SidebarFooter } from '@/components/sidebar-footer' import { ThemeToggle } from '@/components/theme-toggle' import { ClearHistory } from '@/components/clear-history' import { UserMenu } from '@/components/user-menu' -import { LoginButton } from '@/components/login-button' export async function Header() { const session = await auth() diff --git a/components/toaster.tsx b/components/toaster.tsx deleted file mode 100644 index 4d26934..0000000 --- a/components/toaster.tsx +++ /dev/null @@ -1,3 +0,0 @@ -'use client' - -export { Toaster } from 'react-hot-toast' diff --git a/components/user-menu.tsx b/components/user-menu.tsx index 82601f1..f25076f 100644 --- a/components/user-menu.tsx +++ b/components/user-menu.tsx @@ -34,7 +34,8 @@ export function UserMenu({ user }: UserMenuProps) { className="w-6 h-6 transition-opacity duration-300 rounded-full select-none ring-1 ring-zinc-100/10 hover:opacity-80" src={user?.image ? `${user.image}&s=60` : ''} alt={user.name ?? 'Avatar'} - height={48} width={48} + height={48} + width={48} /> ) : (
diff --git a/lib/fonts.ts b/lib/fonts.ts deleted file mode 100644 index cf02806..0000000 --- a/lib/fonts.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { JetBrains_Mono as FontMono, Inter as FontSans } from 'next/font/google' - -export const fontSans = FontSans({ - subsets: ['latin'], - variable: '--font-sans' -}) - -export const fontMono = FontMono({ - subsets: ['latin'], - variable: '--font-mono' -}) diff --git a/package.json b/package.json index 2cad860..8398108 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "class-variance-authority": "^0.4.0", "clsx": "^1.2.1", "focus-trap-react": "^10.1.1", + "geist": "^1.1.0", "nanoid": "^4.0.2", "next": "13.4.7-canary.1", "next-auth": "0.0.0-manual.83c4ebd1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ca8d29..3435164 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,6 +53,9 @@ dependencies: focus-trap-react: specifier: ^10.1.1 version: 10.1.1(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0) + geist: + specifier: ^1.1.0 + version: 1.1.0(next@13.4.7-canary.1) nanoid: specifier: ^4.0.2 version: 4.0.2 @@ -156,8 +159,8 @@ packages: engines: {node: '>=10'} dev: true - /@auth/core@0.0.0-manual.8fcd46b0: - resolution: {integrity: sha512-KuhvZ0hHz6NvMAgAi+su0dJOD0YAiOWGaLswyfGK5RsG/cdhqyyiII9HOTaZbWZAKir0UGYb8SlN+owhV30JXg==} + /@auth/core@0.0.0-manual.e9863699: + resolution: {integrity: sha512-/hVzGuFw7nAZimliD8kpuKnNjvkRu+jpaVhYB/FaIXLNJFNwhbO2MgXBnr5tvLIHgRJnR5C9UN5RNpQXiFHuSA==} peerDependencies: nodemailer: ^6.8.0 peerDependenciesMeta: @@ -2567,6 +2570,14 @@ packages: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} dev: true + /geist@1.1.0(next@13.4.7-canary.1): + resolution: {integrity: sha512-UwZH+ekwAt1T5XYlviFD+jUXFeRRawDDT8RtpJ//IHTPXlVIO6BCcZ8M0Pxg1K/FT3H8HLn3KJqMsPLHbo1HNg==} + peerDependencies: + next: ^13.2 || ^14 + dependencies: + next: 13.4.7-canary.1(react-dom@18.2.0)(react@18.2.0) + dev: false + /get-intrinsic@1.2.0: resolution: {integrity: sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==} dependencies: @@ -3693,7 +3704,7 @@ packages: nodemailer: optional: true dependencies: - '@auth/core': 0.0.0-manual.8fcd46b0 + '@auth/core': 0.0.0-manual.e9863699 next: 13.4.7-canary.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 dev: false diff --git a/tailwind.config.js b/tailwind.config.js index e16dd0f..f734baf 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,5 +1,3 @@ -const { fontFamily } = require('tailwindcss/defaultTheme') - /** @type {import('tailwindcss').Config} */ module.exports = { darkMode: ['class'], @@ -14,7 +12,8 @@ module.exports = { }, extend: { fontFamily: { - sans: ['var(--font-sans)', ...fontFamily.sans] + sans: ['var(--font-geist-sans)'], + mono: ['var(--font-geist-mono)'] }, colors: { border: 'hsl(var(--border))',