Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🪟 fix+feat: General UI Enhancements (#2619)
Anirudh8f20fb28e549
diff --git a/.gitignore b/.gitignoreindex ca823b2022..035aa5f465 100644--- a/.gitignore+++ b/.gitignore@@ -69,6 +69,8 @@ src/style - official.css/playwright/.cache/.DS_Store*.code-workspace+.idx+monospace.json.idea*.iml*.pemdiff --git a/client/public/assets/logo.svg b/client/public/assets/logo.svgnew file mode 100644index 0000000000..36a536d654--- /dev/null+++ b/client/public/assets/logo.svg@@ -0,0 +1,32 @@+<svg width="512" height="512" version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">+ <defs>+ <linearGradient id="linearGradient22708">+ <stop stop-color="#21facf" offset="0"/>+ <stop stop-color="#0970ef" offset="1"/>+ </linearGradient>+ <linearGradient id="linearGradient6949" x1="68.454" x2="198.59" y1="246.73" y2="96.35" gradientTransform="translate(-5.754,-56.594)" gradientUnits="userSpaceOnUse">+ <stop stop-color="#72004e" offset="0"/>+ <stop stop-color="#0015b1" offset="1"/>+ </linearGradient>+ <linearGradient id="linearGradient22718" x1="56.735" x2="155.2" y1="246.96" y2="58.575" gradientUnits="userSpaceOnUse">+ <stop stop-color="#4f00da" offset="0"/>+ <stop stop-color="#e5311b" offset="1"/>+ </linearGradient>+ <linearGradient id="linearGradient23463" x1="68.454" x2="198.59" y1="246.73" y2="96.35" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient22708"/>+ <linearGradient id="linearGradient903" x1="54.478" x2="192.1" y1="247.56" y2="9.8095" gradientTransform="matrix(.87923 0 0 .87923 -9.551 48.787)" gradientUnits="userSpaceOnUse">+ <stop stop-color="#dc180d" offset="0"/>+ <stop stop-color="#f96e20" offset=".5"/>+ <stop stop-color="#f4ce41" offset="1"/>+ </linearGradient>+ <linearGradient id="linearGradient918" x1="39.468" x2="154.99" y1="204.22" y2="124.47" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient22708"/>+ </defs>+ <g transform="matrix(2.473 0 0 2.473 -4.8978 -4.8812)">+ <path transform="translate(-5.5496,-57.412)" d="m148.16 59.393c-7.7098 9.3985-19.951 42.888-20.696 49.204-0.16994 4.6737 1.3731 14.231 0.67182 15.805-0.71909 1.6134-5.117-9.4461-7.2151-6.3266-12.219 18.168-10.7 17.731-15.582 31.378-1.8357 5.1315-0.42447 21.99-1.5666 23.773-1.273 1.9866-3.962-12.31-6.8063-9.236-11.603 12.54-16.279 20.379-22.336 30.607-3.3589 5.6725-2.1817 23.33-3.506 24.674-1.3023 1.3215-3.8566-18.326-7.6437-14.309-8.5193 9.038-14.054 13.441-18.946 19.252-5.1981 6.1739-0.78251 17.584-5.0672 35.383l0.1448 0.22073c77.447-50.308 101.52-127.16 107.61-181.19-0.68051 63.93-29.41 142.78-105.33 184.65l0.1127 0.17141c20.241-2.181 22.307 10.458 44.562-4.2837 55.792-48.277 81.856-124.29 61.593-199.78z" display="none" fill="url(#linearGradient903)"/>+ <path transform="translate(-5.5498,-57.412)" d="m148.16 59.393c-7.7098 9.3985-19.951 42.888-20.696 49.204-0.16994 4.6737 1.3731 14.231 0.67182 15.805-0.71909 1.6134-5.117-9.4461-7.2151-6.3266-12.219 18.168-10.7 17.731-15.582 31.378-1.8357 5.1315-0.42447 21.99-1.5666 23.773-1.273 1.9866-3.962-12.31-6.8063-9.236-11.603 12.54-16.279 20.379-22.336 30.607-3.3589 5.6725-2.1817 23.33-3.506 24.674-1.3023 1.3215-3.8566-18.326-7.6437-14.309-8.5193 9.038-14.054 13.441-18.946 19.252-5.1981 6.1739-0.78251 17.584-5.0672 35.383l0.1448 0.22073c77.447-50.308 101.52-127.16 107.61-181.19-0.68051 63.93-29.41 142.78-105.33 184.65l0.1127 0.17141c20.241-2.181 22.307 10.458 44.562-4.2837 55.792-48.277 81.856-124.29 61.593-199.78z" fill="url(#linearGradient918)"/>+ <g transform="translate(0 2.0218e-5)">+ <path transform="translate(-5.7543,-56.594)" d="m111.25 81.024c-48.394-1.5e-5 -87.625 39.231-87.625 87.625 0.0174 20.443 7.1818 40.236 20.253 55.954 0.2523-0.42224 0.53629-0.82423 0.85783-1.2061 4.892-5.8104 10.427-10.214 18.946-19.252 3.7871-4.0176 6.3412 15.63 7.6435 14.309 1.3243-1.3439 0.1473-19.001 3.5062-24.674 6.0563-10.228 10.733-18.067 22.336-30.607 2.8443-3.0741 5.5333 11.223 6.8063 9.2361 1.1421-1.7823-0.26941-18.641 1.5663-23.773 4.8819-13.647 3.3631-13.21 15.582-31.378 2.098-3.1195 6.496 7.9402 7.2151 6.3268 0.70126-1.5734-0.84173-11.131-0.67179-15.805 0.37161-3.1498 3.6036-13.059 7.7055-23.367-7.8432-2.2472-15.962-3.3881-24.12-3.3895zm43.142 11.356c5.5662 61.595-18.426 120.7-62.796 161.65 6.446 1.4857 13.04 2.2367 19.655 2.2386 48.394 1e-5 87.625-39.231 87.625-87.625-3.1e-4 -31.581-16.995-60.719-44.484-76.268z" display="none" fill="url(#linearGradient22718)"/>+ <path transform="translate(-5.754,-56.594)" d="m111.25 81.024c-48.394-1.5e-5 -87.625 39.231-87.625 87.625 0.0174 20.443 7.1818 40.236 20.253 55.954 0.2523-0.42224 0.53629-0.82423 0.85783-1.2061 4.892-5.8104 10.427-10.214 18.946-19.252 3.7871-4.0176 6.3412 15.63 7.6435 14.309 1.3243-1.3439 0.1473-19.001 3.5062-24.674 6.0563-10.228 10.733-18.067 22.336-30.607 2.8443-3.0741 5.5333 11.223 6.8063 9.2361 1.1421-1.7823-0.26941-18.641 1.5663-23.773 4.8819-13.647 3.3631-13.21 15.582-31.378 2.098-3.1195 6.496 7.9402 7.2151 6.3268 0.70126-1.5734-0.84173-11.131-0.67179-15.805 0.37161-3.1498 3.6036-13.059 7.7055-23.367-7.8432-2.2472-15.962-3.3881-24.12-3.3895zm43.142 11.356c5.5662 61.595-18.426 120.7-62.796 161.65 6.446 1.4857 13.04 2.2367 19.655 2.2386 48.394 1e-5 87.625-39.231 87.625-87.625-3.1e-4 -31.581-16.995-60.719-44.484-76.268z" display="none" fill="url(#linearGradient23463)"/>+ <path d="m105.5 24.43c-48.394-1.5e-5 -87.625 39.231-87.625 87.625 0.0174 20.443 7.1818 40.236 20.253 55.954 0.2523-0.42224 0.53629-0.82423 0.85783-1.2061 4.892-5.8104 10.427-10.214 18.946-19.252 3.7871-4.0176 6.3412 15.63 7.6435 14.309 1.3243-1.3439 0.1473-19.001 3.5062-24.674 6.0563-10.228 10.733-18.067 22.336-30.607 2.8443-3.0741 5.5333 11.223 6.8063 9.2361 1.1421-1.7823-0.26941-18.641 1.5663-23.773 4.8819-13.647 3.3631-13.21 15.582-31.378 2.098-3.1195 6.496 7.9402 7.2151 6.3268 0.70126-1.5734-0.84173-11.131-0.67179-15.805 0.37161-3.1498 3.6036-13.059 7.7055-23.367-7.8432-2.2472-15.962-3.3881-24.12-3.3895zm43.142 11.356c5.5662 61.595-18.426 120.7-62.796 161.65 6.446 1.4857 13.04 2.2367 19.655 2.2386 48.394 1e-5 87.625-39.231 87.625-87.625-3.1e-4 -31.581-16.995-60.719-44.484-76.268z" fill="url(#linearGradient6949)"/>+ </g>+ </g>+</svg>diff --git a/client/src/components/Auth/Login.tsx b/client/src/components/Auth/Login.tsxindex c811ac0a14..8bff10c258 100644--- a/client/src/components/Auth/Login.tsx+++ b/client/src/components/Auth/Login.tsx@@ -96,7 +96,7 @@ function Login() {const privacyPolicyRender = privacyPolicy?.externalUrl && (<a- className="text-xs font-medium text-green-500"+ className="text-sm text-green-500"href={privacyPolicy.externalUrl}target={privacyPolicy.openNewTab ? '_blank' : undefined}rel="noreferrer"@@ -107,7 +107,7 @@ function Login() {const termsOfServiceRender = termsOfService?.externalUrl && (<a- className="text-xs font-medium text-green-500"+ className="text-sm text-green-500"href={termsOfService.externalUrl}target={termsOfService.openNewTab ? '_blank' : undefined}rel="noreferrer"@@ -117,57 +117,62 @@ function Login() {);return (- <div className="flex min-h-screen flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0">- <div className="absolute bottom-0 left-0 m-4">+ <div className="relative flex min-h-screen flex-col bg-white dark:bg-gray-900">+ <div className="mt-12 h-24 w-full bg-cover">+ <img src="/assets/logo.svg" className="h-full w-full object-contain" alt="Logo" />+ </div>+ <div className="absolute bottom-0 left-0 md:m-4"><ThemeSelector /></div>- <div className="mt-6 w-authPageWidth overflow-hidden bg-white px-6 py-4 dark:bg-gray-900 sm:max-w-md sm:rounded-lg">- <h1- className="mb-4 text-center text-3xl font-semibold text-black dark:text-white"- style={{ userSelect: 'none' }}- >- {localize('com_auth_welcome_back')}- </h1>- {error && (- <div- className="rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"- role="alert"+ <div className="flex flex-grow items-center justify-center">+ <div className="w-authPageWidth overflow-hidden bg-white px-6 py-4 dark:bg-gray-900 sm:max-w-md sm:rounded-lg">+ <h1+ className="mb-4 text-center text-3xl font-semibold text-black dark:text-white"+ style={{ userSelect: 'none' }}>- {localize(getLoginError(error))}- </div>- )}- {startupConfig.emailLoginEnabled && <LoginForm onSubmit={login} />}- {startupConfig.registrationEnabled && (- <p className="my-4 text-center text-sm font-light text-gray-700 dark:text-white">- {' '}- {localize('com_auth_no_account')}{' '}- <a href="/register" className="p-1 font-medium text-green-500">- {localize('com_auth_sign_up')}- </a>- </p>- )}- {startupConfig.socialLoginEnabled && (- <>- {startupConfig.emailLoginEnabled && (- <>- <div className="relative mt-6 flex w-full items-center justify-center border border-t uppercase">- <div className="absolute bg-white px-3 text-xs text-black dark:bg-gray-900 dark:text-white">- Or- </div>- </div>- <div className="mt-8" />- </>- )}- <div className="mt-2">- {socialLogins.map((provider) => providerComponents[provider] || null)}+ {localize('com_auth_welcome_back')}+ </h1>+ {error && (+ <div+ className="rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"+ role="alert"+ >+ {localize(getLoginError(error))}</div>- </>- )}+ )}+ {startupConfig.emailLoginEnabled && <LoginForm onSubmit={login} />}+ {startupConfig.registrationEnabled && (+ <p className="my-4 text-center text-sm font-light text-gray-700 dark:text-white">+ {' '}+ {localize('com_auth_no_account')}{' '}+ <a href="/register" className="p-1 text-green-500">+ {localize('com_auth_sign_up')}+ </a>+ </p>+ )}+ {startupConfig.socialLoginEnabled && (+ <>+ {startupConfig.emailLoginEnabled && (+ <>+ <div className="relative mt-6 flex w-full items-center justify-center border border-t border-gray-300 uppercase dark:border-gray-600">+ <div className="absolute bg-white px-3 text-xs text-black dark:bg-gray-900 dark:text-white">+ Or+ </div>+ </div>+ <div className="mt-8" />+ </>+ )}+ <div className="mt-2">+ {socialLogins.map((provider) => providerComponents[provider] || null)}+ </div>+ </>+ )}+ </div></div>- <div className="flex justify-center gap-4 align-middle">+ <div className="align-end m-4 flex justify-center gap-2">{privacyPolicyRender}{privacyPolicyRender && termsOfServiceRender && (- <div className="border-r-[1px] border-gray-300" />+ <div className="border-r-[1px] border-gray-300 dark:border-gray-600" />)}{termsOfServiceRender}</div>diff --git a/client/src/components/Auth/LoginForm.tsx b/client/src/components/Auth/LoginForm.tsxindex 102c482657..9cff6c7360 100644--- a/client/src/components/Auth/LoginForm.tsx+++ b/client/src/components/Auth/LoginForm.tsx@@ -18,7 +18,7 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit }) => {const renderError = (fieldName: string) => {const errorMessage = errors[fieldName]?.message;return errorMessage ? (- <span role="alert" className="mt-1 text-sm text-black dark:text-white">+ <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">{String(errorMessage)}</span>) : null;@@ -44,12 +44,12 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit }) => {pattern: { value: /\S+@\S+\.\S+/, message: localize('com_auth_email_pattern') },})}aria-invalid={!!errors.email}- className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-black/10 bg-white px-2.5 pb-2.5 pt-5 text-sm text-gray-800 focus:border-green-500 focus:outline-none dark:border-white/20 dark:bg-gray-900 dark:text-white dark:focus:border-green-500"+ className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-green-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-green-500"placeholder=" "/><labelhtmlFor="email"- className="pointer-events-none absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-100 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500 dark:text-gray-200"+ className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-green-600 dark:bg-gray-900 dark:text-gray-400 peer-focus:dark:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4">{localize('com_auth_email_address')}</label>@@ -69,19 +69,19 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit }) => {maxLength: { value: 128, message: localize('com_auth_password_max_length') },})}aria-invalid={!!errors.password}- className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-black/10 bg-white px-2.5 pb-2.5 pt-5 text-sm text-gray-800 focus:border-green-500 focus:outline-none dark:border-white/20 dark:bg-gray-900 dark:text-white dark:focus:border-green-500"+ className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-green-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-green-500"placeholder=" "/><labelhtmlFor="password"- className="pointer-events-none absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-100 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500 dark:text-gray-200"+ className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-green-600 dark:bg-gray-900 dark:text-gray-400 peer-focus:dark:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4">{localize('com_auth_password')}</label></div>{renderError('password')}</div>- <a href="/forgot-password" className="text-sm font-medium text-green-500">+ <a href="/forgot-password" className="text-sm text-green-500">{localize('com_auth_password_forgot')}</a><div className="mt-6">diff --git a/client/src/components/Auth/Registration.tsx b/client/src/components/Auth/Registration.tsxindex 02e462a0f2..15d2f64894 100644--- a/client/src/components/Auth/Registration.tsx+++ b/client/src/components/Auth/Registration.tsx@@ -64,19 +64,19 @@ const Registration: React.FC = () => {validation,)}aria-invalid={!!errors[id]}- className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-black/10 bg-white px-2.5 pb-2.5 pt-5 text-sm text-gray-800 focus:border-green-500 focus:outline-none dark:border-white/20 dark:bg-gray-900 dark:text-white dark:focus:border-green-500"+ className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-green-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-green-500"placeholder=" "data-testid={id}></input><labelhtmlFor={id}- className="pointer-events-none absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-100 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500 dark:text-gray-200"+ className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-green-600 dark:bg-gray-900 dark:text-gray-400 peer-focus:dark:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4">{localize(label)}</label></div>{errors[id] && (- <span role="alert" className="mt-1 text-sm text-black dark:text-white">+ <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">{String(errors[id]?.message) ?? ''}</span>)}@@ -147,117 +147,154 @@ const Registration: React.FC = () => {),};+ const privacyPolicy = startupConfig.interface?.privacyPolicy;+ const termsOfService = startupConfig.interface?.termsOfService;++ const privacyPolicyRender = privacyPolicy?.externalUrl && (+ <a+ className="text-sm text-green-500"+ href={privacyPolicy.externalUrl}+ target={privacyPolicy.openNewTab ? '_blank' : undefined}+ rel="noreferrer"+ >+ {localize('com_ui_privacy_policy')}+ </a>+ );++ const termsOfServiceRender = termsOfService?.externalUrl && (+ <a+ className="text-sm text-green-500"+ href={termsOfService.externalUrl}+ target={termsOfService.openNewTab ? '_blank' : undefined}+ rel="noreferrer"+ >+ {localize('com_ui_terms_of_service')}+ </a>+ );+return (- <div className="flex min-h-screen flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0">- <div className="absolute bottom-0 left-0 m-4">+ <div className="relative flex min-h-screen flex-col bg-white dark:bg-gray-900">+ <div className="mt-12 h-24 w-full bg-cover">+ <img src="/assets/logo.svg" className="h-full w-full object-contain" alt="Logo" />+ </div>+ <div className="absolute bottom-0 left-0 md:m-4"><ThemeSelector /></div>- <div className="mt-6 w-authPageWidth overflow-hidden bg-white px-6 py-4 dark:bg-gray-900 sm:max-w-md sm:rounded-lg">- <h1- className="mb-4 text-center text-3xl font-semibold text-black dark:text-white"- style={{ userSelect: 'none' }}- >- {localize('com_auth_create_account')}- </h1>- {error && (- <div- className="rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"- role="alert"- data-testid="registration-error"+ <div className="flex flex-grow items-center justify-center">+ <div className="w-authPageWidth overflow-hidden bg-white px-6 py-4 dark:bg-gray-900 sm:max-w-md sm:rounded-lg">+ <h1+ className="mb-4 text-center text-3xl font-semibold text-black dark:text-white"+ style={{ userSelect: 'none' }}>- {localize('com_auth_error_create')} {errorMessage}- </div>- )}- <form- className="mt-6"- aria-label="Registration form"- method="POST"- onSubmit={handleSubmit(onRegisterUserFormSubmit)}- >- {renderInput('name', 'com_auth_full_name', 'text', {- required: localize('com_auth_name_required'),- minLength: {- value: 3,- message: localize('com_auth_name_min_length'),- },- maxLength: {- value: 80,- message: localize('com_auth_name_max_length'),- },- })}- {renderInput('username', 'com_auth_username', 'text', {- minLength: {- value: 2,- message: localize('com_auth_username_min_length'),- },- maxLength: {- value: 80,- message: localize('com_auth_username_max_length'),- },- })}- {renderInput('email', 'com_auth_email', 'email', {- required: localize('com_auth_email_required'),- minLength: {- value: 1,- message: localize('com_auth_email_min_length'),- },- maxLength: {- value: 120,- message: localize('com_auth_email_max_length'),- },- pattern: {- value: /\S+@\S+\.\S+/,- message: localize('com_auth_email_pattern'),- },- })}- {renderInput('password', 'com_auth_password', 'password', {- required: localize('com_auth_password_required'),- minLength: {- value: 8,- message: localize('com_auth_password_min_length'),- },- maxLength: {- value: 128,- message: localize('com_auth_password_max_length'),- },- })}- {renderInput('confirm_password', 'com_auth_password_confirm', 'password', {- validate: (value) => value === password || localize('com_auth_password_not_match'),- })}- <div className="mt-6">- <button- disabled={Object.keys(errors).length > 0}- type="submit"- aria-label="Submit registration"- className="w-full transform rounded-md bg-green-500 px-4 py-3 tracking-wide text-white transition-colors duration-200 hover:bg-green-550 focus:bg-green-550 focus:outline-none disabled:cursor-not-allowed disabled:hover:bg-green-500"+ {localize('com_auth_create_account')}+ </h1>+ {error && (+ <div+ className="rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"+ role="alert"+ data-testid="registration-error">- {localize('com_auth_continue')}- </button>- </div>- </form>- <p className="my-4 text-center text-sm font-light text-gray-700 dark:text-white">- {localize('com_auth_already_have_account')}{' '}- <a href="/login" aria-label="Login" className="p-1 font-medium text-green-500">- {localize('com_auth_login')}- </a>- </p>- {startupConfig.socialLoginEnabled && (- <>- {startupConfig.emailLoginEnabled && (- <>- <div className="relative mt-6 flex w-full items-center justify-center border border-t uppercase">- <div className="absolute bg-white px-3 text-xs text-black dark:bg-gray-900 dark:text-white">- Or- </div>- </div>- <div className="mt-8" />- </>- )}- <div className="mt-2">- {socialLogins.map((provider) => providerComponents[provider] || null)}+ {localize('com_auth_error_create')} {errorMessage}+ </div>+ )}+ <form+ className="mt-6"+ aria-label="Registration form"+ method="POST"+ onSubmit={handleSubmit(onRegisterUserFormSubmit)}+ >+ {renderInput('name', 'com_auth_full_name', 'text', {+ required: localize('com_auth_name_required'),+ minLength: {+ value: 3,+ message: localize('com_auth_name_min_length'),+ },+ maxLength: {+ value: 80,+ message: localize('com_auth_name_max_length'),+ },+ })}+ {renderInput('username', 'com_auth_username', 'text', {+ minLength: {+ value: 2,+ message: localize('com_auth_username_min_length'),+ },+ maxLength: {+ value: 80,+ message: localize('com_auth_username_max_length'),+ },+ })}+ {renderInput('email', 'com_auth_email', 'email', {+ required: localize('com_auth_email_required'),+ minLength: {+ value: 1,+ message: localize('com_auth_email_min_length'),+ },+ maxLength: {+ value: 120,+ message: localize('com_auth_email_max_length'),+ },+ pattern: {+ value: /\S+@\S+\.\S+/,+ message: localize('com_auth_email_pattern'),+ },+ })}+ {renderInput('password', 'com_auth_password', 'password', {+ required: localize('com_auth_password_required'),+ minLength: {+ value: 8,+ message: localize('com_auth_password_min_length'),+ },+ maxLength: {+ value: 128,+ message: localize('com_auth_password_max_length'),+ },+ })}+ {renderInput('confirm_password', 'com_auth_password_confirm', 'password', {+ validate: (value) => value === password || localize('com_auth_password_not_match'),+ })}+ <div className="mt-6">+ <button+ disabled={Object.keys(errors).length > 0}+ type="submit"+ aria-label="Submit registration"+ className="w-full transform rounded-md bg-green-500 px-4 py-3 tracking-wide text-white transition-colors duration-200 hover:bg-green-550 focus:bg-green-550 focus:outline-none disabled:cursor-not-allowed disabled:hover:bg-green-500"+ >+ {localize('com_auth_continue')}+ </button></div>- </>+ </form>+ <p className="my-4 text-center text-sm font-light text-gray-700 dark:text-white">+ {localize('com_auth_already_have_account')}{' '}+ <a href="/login" aria-label="Login" className="p-1 text-green-500">+ {localize('com_auth_login')}+ </a>+ </p>+ {startupConfig.socialLoginEnabled && (+ <>+ {startupConfig.emailLoginEnabled && (+ <>+ <div className="relative mt-6 flex w-full items-center justify-center border border-t border-gray-300 uppercase dark:border-gray-600">+ <div className="absolute bg-white px-3 text-xs text-black dark:bg-gray-900 dark:text-white">+ Or+ </div>+ </div>+ <div className="mt-8" />+ </>+ )}+ <div className="mt-2">+ {socialLogins.map((provider) => providerComponents[provider] || null)}+ </div>+ </>+ )}+ </div>+ </div>+ <div className="align-end m-4 flex justify-center gap-2">+ {privacyPolicyRender}+ {privacyPolicyRender && termsOfServiceRender && (+ <div className="border-r-[1px] border-gray-300 dark:border-gray-600" />)}+ {termsOfServiceRender}</div></div>);diff --git a/client/src/components/Auth/RequestPasswordReset.tsx b/client/src/components/Auth/RequestPasswordReset.tsxindex ded90c7db6..185b6789c9 100644--- a/client/src/components/Auth/RequestPasswordReset.tsx+++ b/client/src/components/Auth/RequestPasswordReset.tsx@@ -49,7 +49,7 @@ function RequestPasswordReset() {setBodyText(<span>{localize('com_auth_click')}{' '}- <a className="font-medium text-green-500 hover:underline" href={resetLink}>+ <a className="text-green-500 hover:underline" href={resetLink}>{localize('com_auth_here')}</a>{' '}{localize('com_auth_to_reset_your_password')}@@ -66,7 +66,7 @@ function RequestPasswordReset() {if (bodyText) {return (<div- className="relative mt-4 rounded border border-green-400 bg-green-100 px-4 py-3 text-green-700 dark:bg-gray-900 dark:text-white"+ className="relative mt-4 rounded border border-green-400 bg-green-100 px-4 py-3 text-green-700 dark:bg-green-900 dark:text-white"role="alert">{bodyText}@@ -103,18 +103,18 @@ function RequestPasswordReset() {},})}aria-invalid={!!errors.email}- className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-black/10 bg-gray-50 px-2.5 pb-2.5 pt-5 text-sm text-gray-800 focus:border-green-500 focus:outline-none dark:border-white/20 dark:bg-gray-900 dark:text-white dark:focus:border-green-500"+ className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-green-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-green-500"placeholder=" "></input><labelhtmlFor="email"- className="pointer-events-none absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-100 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500 dark:text-gray-200"+ className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-green-600 dark:bg-gray-900 dark:text-gray-400 peer-focus:dark:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4">{localize('com_auth_email_address')}</label></div>{errors.email && (- <span role="alert" className="mt-1 text-sm text-black dark:text-white">+ <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">{/* @ts-ignore not sure why */}{errors.email.message}</span>@@ -129,7 +129,7 @@ function RequestPasswordReset() {{localize('com_auth_continue')}</button><div className="mt-4 flex justify-center">- <a href="/login" className="text-sm font-medium text-green-500">+ <a href="/login" className="text-sm text-green-500">{localize('com_auth_back_to_login')}</a></div>@@ -139,24 +139,61 @@ function RequestPasswordReset() {}};+ const privacyPolicy = config.data?.interface?.privacyPolicy;+ const termsOfService = config.data?.interface?.termsOfService;++ const privacyPolicyRender = privacyPolicy?.externalUrl && (+ <a+ className="text-sm text-green-500"+ href={privacyPolicy.externalUrl}+ target={privacyPolicy.openNewTab ? '_blank' : undefined}+ rel="noreferrer"+ >+ {localize('com_ui_privacy_policy')}+ </a>+ );++ const termsOfServiceRender = termsOfService?.externalUrl && (+ <a+ className="text-sm text-green-500"+ href={termsOfService.externalUrl}+ target={termsOfService.openNewTab ? '_blank' : undefined}+ rel="noreferrer"+ >+ {localize('com_ui_terms_of_service')}+ </a>+ );+return (- <div className="flex min-h-screen flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0">- <div className="absolute bottom-0 left-0 m-4">+ <div className="relative flex min-h-screen flex-col bg-white dark:bg-gray-900">+ <div className="mt-12 h-24 w-full bg-cover">+ <img src="/assets/logo.svg" className="h-full w-full object-contain" alt="Logo" />+ </div>+ <div className="absolute bottom-0 left-0 md:m-4"><ThemeSelector /></div>- <div className="mt-5 w-authPageWidth overflow-hidden bg-white px-6 py-4 dark:bg-gray-900 sm:max-w-md sm:rounded-lg">- <h1 className="mb-4 text-center text-3xl font-semibold text-black dark:text-white">- {headerText}- </h1>- {requestError && (- <div- className="rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"- role="alert"- >- {localize('com_auth_error_reset_password')}- </div>+ <div className="flex flex-grow items-center justify-center">+ <div className="w-authPageWidth overflow-hidden bg-white px-6 py-4 dark:bg-gray-900 sm:max-w-md sm:rounded-lg">+ <h1 className="mb-4 text-center text-3xl font-semibold text-black dark:text-white">+ {headerText}+ </h1>+ {requestError && (+ <div+ className="rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"+ role="alert"+ >+ {localize('com_auth_error_reset_password')}+ </div>+ )}+ {renderFormContent()}+ </div>+ </div>+ <div className="align-end m-4 flex justify-center gap-2">+ {privacyPolicyRender}+ {privacyPolicyRender && termsOfServiceRender && (+ <div className="border-r-[1px] border-gray-300 dark:border-gray-600" />)}- {renderFormContent()}+ {termsOfServiceRender}</div></div>);diff --git a/client/src/components/Auth/ResetPassword.tsx b/client/src/components/Auth/ResetPassword.tsxindex 52560828f2..75390286cb 100644--- a/client/src/components/Auth/ResetPassword.tsx+++ b/client/src/components/Auth/ResetPassword.tsx@@ -1,7 +1,7 @@import { useState } from 'react';import { useForm } from 'react-hook-form';import { useNavigate, useSearchParams } from 'react-router-dom';-import { useResetPasswordMutation } from 'librechat-data-provider/react-query';+import { useGetStartupConfig, useResetPasswordMutation } from 'librechat-data-provider/react-query';import type { TResetPassword } from 'librechat-data-provider';import { ThemeSelector } from '~/components/ui';import { useLocalize } from '~/hooks';@@ -15,6 +15,7 @@ function ResetPassword() {formState: { errors },} = useForm<TResetPassword>();const resetPassword = useResetPasswordMutation();+ const config = useGetStartupConfig();const [resetError, setResetError] = useState<boolean>(false);const [params] = useSearchParams();const navigate = useNavigate();@@ -28,6 +29,31 @@ function ResetPassword() {});};+ const privacyPolicy = config.data?.interface?.privacyPolicy;+ const termsOfService = config.data?.interface?.termsOfService;++ const privacyPolicyRender = privacyPolicy?.externalUrl && (+ <a+ className="text-sm text-green-500"+ href={privacyPolicy.externalUrl}+ target={privacyPolicy.openNewTab ? '_blank' : undefined}+ rel="noreferrer"+ >+ {localize('com_ui_privacy_policy')}+ </a>+ );++ const termsOfServiceRender = termsOfService?.externalUrl && (+ <a+ className="text-sm text-green-500"+ href={termsOfService.externalUrl}+ target={termsOfService.openNewTab ? '_blank' : undefined}+ rel="noreferrer"+ >+ {localize('com_ui_terms_of_service')}+ </a>+ );+if (resetPassword.isSuccess) {return (<div className="flex min-h-screen flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0">@@ -56,134 +82,146 @@ function ResetPassword() {);} else {return (- <div className="flex min-h-screen flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0">- <div className="absolute bottom-0 left-0 m-4">+ <div className="relative flex min-h-screen flex-col bg-white dark:bg-gray-900">+ <div className="mt-12 h-24 w-full bg-cover">+ <img src="/assets/logo.svg" className="h-full w-full object-contain" alt="Logo" />+ </div>+ <div className="absolute bottom-0 left-0 md:m-4"><ThemeSelector /></div>- <div className="mt-6 w-authPageWidth overflow-hidden bg-white px-6 py-4 dark:bg-gray-900 sm:max-w-md sm:rounded-lg">- <h1 className="mb-4 text-center text-3xl font-semibold text-black dark:text-white">- {localize('com_auth_reset_password')}- </h1>- {resetError && (- <div- className="rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"- role="alert"- >- {localize('com_auth_error_invalid_reset_token')}{' '}- <a className="font-semibold text-green-600 hover:underline" href="/forgot-password">- {localize('com_auth_click_here')}- </a>{' '}- {localize('com_auth_to_try_again')}- </div>- )}- <form- className="mt-6"- aria-label="Password reset form"- method="POST"- onSubmit={handleSubmit(onSubmit)}- >- <div className="mb-2">- <div className="relative">- <input- type="hidden"- id="token"- // @ts-ignore - Type 'string | null' is not assignable to type 'string | number | readonly string[] | undefined'- value={params.get('token')}- {...register('token', { required: 'Unable to process: No valid reset token' })}- />- <input- type="hidden"- id="userId"- // @ts-ignore - Type 'string | null' is not assignable to type 'string | number | readonly string[] | undefined'- value={params.get('userId')}- {...register('userId', { required: 'Unable to process: No valid user id' })}- />- <input- type="password"- id="password"- autoComplete="current-password"- aria-label={localize('com_auth_password')}- {...register('password', {- required: localize('com_auth_password_required'),- minLength: {- value: 8,- message: localize('com_auth_password_min_length'),- },- maxLength: {- value: 128,- message: localize('com_auth_password_max_length'),- },- })}- aria-invalid={!!errors.password}- className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-black/10 bg-white px-2.5 pb-2.5 pt-5 text-sm text-gray-800 focus:border-green-500 focus:outline-none dark:border-white/20 dark:bg-gray-900 dark:text-white dark:focus:border-green-500"- placeholder=" "- ></input>- <label- htmlFor="password"- className="pointer-events-none absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-100 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500 dark:text-gray-200"- >- {localize('com_auth_password')}- </label>+ <div className="flex flex-grow items-center justify-center">+ <div className="w-authPageWidth overflow-hidden bg-white px-6 py-4 dark:bg-gray-900 sm:max-w-md sm:rounded-lg">+ <h1 className="mb-4 text-center text-3xl font-semibold text-black dark:text-white">+ {localize('com_auth_reset_password')}+ </h1>+ {resetError && (+ <div+ className="rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"+ role="alert"+ >+ {localize('com_auth_error_invalid_reset_token')}{' '}+ <a className="font-semibold text-green-600 hover:underline" href="/forgot-password">+ {localize('com_auth_click_here')}+ </a>{' '}+ {localize('com_auth_to_try_again')}</div>+ )}+ <form+ className="mt-6"+ aria-label="Password reset form"+ method="POST"+ onSubmit={handleSubmit(onSubmit)}+ >+ <div className="mb-2">+ <div className="relative">+ <input+ type="hidden"+ id="token"+ // @ts-ignore - Type 'string | null' is not assignable to type 'string | number | readonly string[] | undefined'+ value={params.get('token')}+ {...register('token', { required: 'Unable to process: No valid reset token' })}+ />+ <input+ type="hidden"+ id="userId"+ // @ts-ignore - Type 'string | null' is not assignable to type 'string | number | readonly string[] | undefined'+ value={params.get('userId')}+ {...register('userId', { required: 'Unable to process: No valid user id' })}+ />+ <input+ type="password"+ id="password"+ autoComplete="current-password"+ aria-label={localize('com_auth_password')}+ {...register('password', {+ required: localize('com_auth_password_required'),+ minLength: {+ value: 8,+ message: localize('com_auth_password_min_length'),+ },+ maxLength: {+ value: 128,+ message: localize('com_auth_password_max_length'),+ },+ })}+ aria-invalid={!!errors.password}+ className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-green-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-green-500"+ placeholder=" "+ ></input>+ <label+ htmlFor="password"+ className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-green-600 dark:bg-gray-900 dark:text-gray-400 peer-focus:dark:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4"+ >+ {localize('com_auth_password')}+ </label>+ </div>- {errors.password && (- <span role="alert" className="mt-1 text-sm text-black dark:text-white">- {/* @ts-ignore not sure why */}- {errors.password.message}- </span>- )}- </div>- <div className="mb-2">- <div className="relative">- <input- type="password"- id="confirm_password"- aria-label={localize('com_auth_password_confirm')}- {...register('confirm_password', {- validate: (value) =>- value === password || localize('com_auth_password_not_match'),- })}- aria-invalid={!!errors.confirm_password}- className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-black/10 bg-white px-2.5 pb-2.5 pt-5 text-sm text-gray-800 focus:border-green-500 focus:outline-none dark:border-white/20 dark:bg-gray-900 dark:text-white dark:focus:border-green-500"- placeholder=" "- ></input>- <label- htmlFor="confirm_password"- className="pointer-events-none absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-100 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500 dark:text-gray-200"+ {errors.password && (+ <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">+ {/* @ts-ignore not sure why */}+ {errors.password.message}+ </span>+ )}+ </div>+ <div className="mb-2">+ <div className="relative">+ <input+ type="password"+ id="confirm_password"+ aria-label={localize('com_auth_password_confirm')}+ {...register('confirm_password', {+ validate: (value) =>+ value === password || localize('com_auth_password_not_match'),+ })}+ aria-invalid={!!errors.confirm_password}+ className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-green-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-green-500"+ placeholder=" "+ ></input>+ <label+ htmlFor="confirm_password"+ className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-green-600 dark:bg-gray-900 dark:text-gray-400 peer-focus:dark:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4"+ >+ {localize('com_auth_password_confirm')}+ </label>+ </div>+ {errors.confirm_password && (+ <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">+ {/* @ts-ignore not sure why */}+ {errors.confirm_password.message}+ </span>+ )}+ {errors.token && (+ <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">+ {/* @ts-ignore not sure why */}+ {errors.token.message}+ </span>+ )}+ {errors.userId && (+ <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">+ {/* @ts-ignore not sure why */}+ {errors.userId.message}+ </span>+ )}+ </div>+ <div className="mt-6">+ <button+ disabled={!!errors.password || !!errors.confirm_password}+ type="submit"+ aria-label={localize('com_auth_submit_registration')}+ className="w-full transform rounded-md bg-green-500 px-4 py-3 tracking-wide text-white transition-all duration-300 hover:bg-green-550 focus:bg-green-550 focus:outline-none">- {localize('com_auth_password_confirm')}- </label>+ {localize('com_auth_continue')}+ </button></div>- {errors.confirm_password && (- <span role="alert" className="mt-1 text-sm text-black dark:text-white">- {/* @ts-ignore not sure why */}- {errors.confirm_password.message}- </span>- )}- {errors.token && (- <span role="alert" className="mt-1 text-sm text-black dark:text-white">- {/* @ts-ignore not sure why */}- {errors.token.message}- </span>- )}- {errors.userId && (- <span role="alert" className="mt-1 text-sm text-black dark:text-white">- {/* @ts-ignore not sure why */}- {errors.userId.message}- </span>- )}- </div>- <div className="mt-6">- <button- disabled={!!errors.password || !!errors.confirm_password}- type="submit"- aria-label={localize('com_auth_submit_registration')}- className="w-full transform rounded-md bg-green-500 px-4 py-3 tracking-wide text-white transition-all duration-300 hover:bg-green-550 focus:bg-green-550 focus:outline-none"- >- {localize('com_auth_continue')}- </button>- </div>- </form>+ </form>+ </div>+ </div>+ <div className="align-end m-4 flex justify-center gap-2">+ {privacyPolicyRender}+ {privacyPolicyRender && termsOfServiceRender && (+ <div className="border-r-[1px] border-gray-300 dark:border-gray-600" />+ )}+ {termsOfServiceRender}</div></div>);diff --git a/client/src/components/Auth/SocialButton.tsx b/client/src/components/Auth/SocialButton.tsxindex 7e76c6f763..8b8318ac3a 100644--- a/client/src/components/Auth/SocialButton.tsx+++ b/client/src/components/Auth/SocialButton.tsx@@ -15,6 +15,7 @@ const SocialButton = ({ id, enabled, serverDomain, oauthPath, Icon, label }) =>const handleMouseLeave = () => {setIsHovered(false);+ if (isPressed) {setIsPressed(false);}};const handleMouseDown = () => {@@ -28,7 +29,7 @@ const SocialButton = ({ id, enabled, serverDomain, oauthPath, Icon, label }) =>const getButtonStyles = () => {// Define Tailwind CSS classes based on state- const baseStyles = 'border border-solid border-gray-300 dark:border-gray-800 transition-colors';+ const baseStyles = 'border border-solid border-gray-300 dark:border-gray-600 transition-colors';const pressedStyles = 'bg-blue-200 border-blue-200 dark:bg-blue-900 dark:border-blue-600';const hoverStyles = 'bg-gray-100 dark:bg-gray-700';diff --git a/client/src/components/Chat/ExportButton.tsx b/client/src/components/Chat/ExportButton.tsxnew file mode 100644index 0000000000..48acd20ec2--- /dev/null+++ b/client/src/components/Chat/ExportButton.tsx@@ -0,0 +1,71 @@+import React from 'react';++import { useState } from 'react';+import { useLocation } from 'react-router-dom';+import type { TConversation } from 'librechat-data-provider';+import { Download } from 'lucide-react';+import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui';+import { useLocalize } from '~/hooks';+import { ExportModal } from '../Nav';+import { useRecoilValue } from 'recoil';+import store from '~/store';++function ExportButton() {+ const localize = useLocalize();+ const location = useLocation();++ const [showExports, setShowExports] = useState(false);++ const activeConvo = useRecoilValue(store.conversationByIndex(0));+ const globalConvo = useRecoilValue(store.conversation) ?? ({} as TConversation);++ let conversation: TConversation | null | undefined;+ if (location.state?.from?.pathname.includes('/chat')) {+ conversation = globalConvo;+ } else {+ conversation = activeConvo;+ }++ const clickHandler = () => {+ if (exportable) {+ setShowExports(true);+ }+ };++ const exportable =+ conversation &&+ conversation.conversationId &&+ conversation.conversationId !== 'new' &&+ conversation.conversationId !== 'search';++ return (+ <>+ {exportable && (+ <div className="flex gap-1 gap-2 pr-1">+ <TooltipProvider delayDuration={50}>+ <Tooltip>+ <TooltipTrigger asChild>+ <button+ className="btn btn-neutral btn-small relative flex h-9 w-9 items-center justify-center whitespace-nowrap rounded-lg"+ onClick={clickHandler}+ >+ <div className="flex w-full items-center justify-center gap-2">+ <Download size={16} />+ </div>+ </button>+ </TooltipTrigger>+ <TooltipContent side="right" sideOffset={5}>+ {localize('com_nav_export_conversation')}+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>+ )}+ {showExports && (+ <ExportModal open={showExports} onOpenChange={setShowExports} conversation={conversation} />+ )}+ </>+ );+}++export default ExportButton;diff --git a/client/src/components/Chat/Header.tsx b/client/src/components/Chat/Header.tsxindex cc76bbbc69..ab40ace0b0 100644--- a/client/src/components/Chat/Header.tsx+++ b/client/src/components/Chat/Header.tsx@@ -5,6 +5,7 @@ import { useGetStartupConfig } from 'librechat-data-provider/react-query';import type { ContextType } from '~/common';import { EndpointsMenu, ModelSpecsMenu, PresetsMenu, HeaderNewChat } from './Menus';import HeaderOptions from './Input/HeaderOptions';+import ExportButton from './ExportButton';const defaultInterface = getConfigDefaults().interface;@@ -19,12 +20,15 @@ export default function Header() {return (<div className="sticky top-0 z-10 flex h-14 w-full items-center justify-between bg-white p-2 font-semibold dark:bg-gray-800 dark:text-white">- <div className="hide-scrollbar flex items-center gap-2 overflow-x-auto">- {!navVisible && <HeaderNewChat />}- {interfaceConfig.endpointsMenu && <EndpointsMenu />}- {modelSpecs?.length > 0 && <ModelSpecsMenu modelSpecs={modelSpecs} />}- {<HeaderOptions interfaceConfig={interfaceConfig} />}- {interfaceConfig.presets && <PresetsMenu />}+ <div className="hide-scrollbar flex w-full items-center justify-between gap-2 overflow-x-auto">+ <div className="flex items-center gap-2">+ {!navVisible && <HeaderNewChat />}+ {interfaceConfig.endpointsMenu && <EndpointsMenu />}+ {modelSpecs?.length > 0 && <ModelSpecsMenu modelSpecs={modelSpecs} />}+ {<HeaderOptions interfaceConfig={interfaceConfig} />}+ {interfaceConfig.presets && <PresetsMenu />}+ </div>+ <ExportButton /></div>{/* Empty div for spacing */}<div />diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsxindex 16343cd0e3..f05fd72793 100644--- a/client/src/components/Chat/Input/ChatForm.tsx+++ b/client/src/components/Chat/Input/ChatForm.tsx@@ -100,7 +100,7 @@ const ChatForm = ({ index = 0 }) => {{showMentionPopover && (<Mention setShowMentionPopover={setShowMentionPopover} textAreaRef={textAreaRef} />)}- <div className="[&:has(textarea:focus)]:border-token-border-xheavy border-token-border-medium bg-token-main-surface-primary relative flex w-full flex-grow flex-col overflow-hidden rounded-2xl border dark:border-gray-600 dark:text-white [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,.05)] dark:[&:has(textarea:focus)]:border-gray-500">+ <div className="bg-token-main-surface-primary relative flex w-full flex-grow flex-col overflow-hidden rounded-2xl border dark:border-gray-600 dark:text-white [&:has(textarea:focus)]:border-gray-300 [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,.05)] dark:[&:has(textarea:focus)]:border-gray-500"><FileRowfiles={files}setFiles={setFiles}diff --git a/client/src/components/Chat/Input/Files/FilesView.tsx b/client/src/components/Chat/Input/Files/FilesView.tsxindex 32acf6aa2f..efd9ec2a82 100644--- a/client/src/components/Chat/Input/Files/FilesView.tsx+++ b/client/src/components/Chat/Input/Files/FilesView.tsx@@ -27,7 +27,9 @@ export default function Files({ open, onOpenChange }) {return (<Dialog open={open} onOpenChange={onOpenChange}>- <DialogContent className={cn('overflow-x-auto shadow-2xl dark:bg-gray-700 dark:text-white')}>+ <DialogContent+ className={cn('w-11/12 overflow-x-auto shadow-2xl dark:bg-gray-700 dark:text-white')}+ ><DialogHeader><DialogTitle className="text-lg font-medium leading-6 text-gray-900 dark:text-gray-200">{localize('com_nav_my_files')}diff --git a/client/src/components/Chat/Input/Files/Table/DataTable.tsx b/client/src/components/Chat/Input/Files/Table/DataTable.tsxindex 23e7b8ea70..75bbb3823a 100644--- a/client/src/components/Chat/Input/Files/Table/DataTable.tsx+++ b/client/src/components/Chat/Input/Files/Table/DataTable.tsx@@ -220,7 +220,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro)}</div><Button- className="dark:border-gray-500"+ className="dark:border-gray-500 dark:hover:bg-gray-600"variant="outline"size="sm"onClick={() => table.previousPage()}@@ -229,7 +229,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro{localize('com_ui_prev')}</Button><Button- className="dark:border-gray-500"+ className="dark:border-gray-500 dark:hover:bg-gray-600"variant="outline"size="sm"onClick={() => table.nextPage()}diff --git a/client/src/components/Chat/Input/MentionItem.tsx b/client/src/components/Chat/Input/MentionItem.tsxindex ce88ba60e8..e44a32a8f8 100644--- a/client/src/components/Chat/Input/MentionItem.tsx+++ b/client/src/components/Chat/Input/MentionItem.tsx@@ -22,7 +22,6 @@ export default function MentionItem({<divclassName={cn('hover:bg-token-main-surface-secondary text-token-text-primary bg-token-main-surface-secondary group flex h-10 items-center gap-2 rounded-lg px-2 text-sm font-medium dark:hover:bg-gray-600',- index === 0 ? 'dark:bg-gray-600' : '',isActive ? 'dark:bg-gray-600' : '',)}>diff --git a/client/src/components/Chat/Input/OptionsPopover.tsx b/client/src/components/Chat/Input/OptionsPopover.tsxindex 3b6d895cb6..8d0a193c41 100644--- a/client/src/components/Chat/Input/OptionsPopover.tsx+++ b/client/src/components/Chat/Input/OptionsPopover.tsx@@ -66,7 +66,7 @@ export default function OptionsPopover({{presetsDisabled ? null : (<Buttontype="button"- className="h-auto w-[150px] justify-start rounded-md border-2 border-gray-300/50 bg-transparent px-2 py-1 text-xs font-medium font-normal text-black hover:bg-gray-100 hover:text-black focus:ring-1 focus:ring-green-500/90 dark:border-gray-500/50 dark:bg-transparent dark:text-white dark:hover:bg-gray-600 dark:focus:ring-green-500"+ className="h-auto w-[150px] justify-start rounded-md border border-gray-300/50 bg-transparent px-2 py-1 text-xs font-medium font-normal text-black hover:bg-gray-100 hover:text-black focus:ring-1 focus:ring-green-500/90 dark:border-gray-500/50 dark:bg-transparent dark:text-white dark:hover:bg-gray-600 dark:focus:ring-green-500"onClick={saveAsPreset}><Save className="mr-1 w-[14px]" />diff --git a/client/src/components/Chat/Landing.tsx b/client/src/components/Chat/Landing.tsxindex 22f2cee022..073ffd6462 100644--- a/client/src/components/Chat/Landing.tsx+++ b/client/src/components/Chat/Landing.tsx@@ -44,12 +44,7 @@ export default function Landing({ Header }: { Header?: ReactNode }) {<div className="relative h-full"><div className="absolute left-0 right-0">{Header && Header}</div><div className="flex h-full flex-col items-center justify-center">- <div- className={cn(- 'relative h-[72px] w-[72px]',- assistantName && avatar ? 'mb-0' : 'mb-3',- )}- >+ <div className={cn('relative h-12 w-12', assistantName && avatar ? 'mb-0' : 'mb-3')}><ConvoIconconversation={conversation}assistantMap={assistantMap}diff --git a/client/src/components/Chat/Menus/Endpoints/MenuItem.tsx b/client/src/components/Chat/Menus/Endpoints/MenuItem.tsxindex 89c230b799..60c210e015 100644--- a/client/src/components/Chat/Menus/Endpoints/MenuItem.tsx+++ b/client/src/components/Chat/Menus/Endpoints/MenuItem.tsx@@ -118,7 +118,7 @@ const MenuItem: FC<MenuItemProps> = ({'invisible flex gap-x-1 group-hover:visible',selected ? 'visible' : '',expiryTime- ? 'w-full rounded-lg p-2 hover:bg-gray-200 dark:hover:bg-gray-600'+ ? 'w-full rounded-lg p-2 hover:text-gray-400 dark:hover:text-gray-400': '',)}onClick={(e) => {diff --git a/client/src/components/Conversations/Convo.tsx b/client/src/components/Conversations/Convo.tsxindex 83dba9830a..b562e820d6 100644--- a/client/src/components/Conversations/Convo.tsx+++ b/client/src/components/Conversations/Convo.tsx@@ -34,6 +34,7 @@ export default function Conversation({ conversation, retainView, toggleNav, isLaconst inputRef = useRef<HTMLInputElement | null>(null);const [titleInput, setTitleInput] = useState(title);const [renaming, setRenaming] = useState(false);+ const [isPopoverActive, setIsPopoverActive] = useState(false);const clickHandler = async (event: React.MouseEvent<HTMLAnchorElement>) => {if (event.button === 0 && event.ctrlKey) {@@ -117,13 +118,17 @@ export default function Conversation({ conversation, retainView, toggleNav, isLa(isLatestConvo && currentConvoId === 'new' && activeConvos[0] && activeConvos[0] !== 'new');return (- <div className="hover:bg-token-sidebar-surface-secondary group relative rounded-lg active:opacity-90">+ <div+ className={cn(+ 'hover:bg-token-sidebar-surface-secondary group relative rounded-lg active:opacity-90',+ )}+ >{renaming ? (- <div className="absolute bottom-0 left-0 right-0 top-0 z-50 flex w-full items-center rounded-lg bg-gray-200 dark:bg-gray-700">+ <div className="absolute inset-0 z-50 flex w-full items-center rounded-lg bg-gray-200 p-1.5 dark:bg-gray-700"><inputref={inputRef}type="text"- className="w-full border border-blue-500 bg-transparent p-0 text-sm leading-tight outline-none"+ className="w-full rounded border border-blue-500 bg-transparent p-0.5 text-sm leading-tight outline-none"value={titleInput}onChange={(e) => setTitleInput(e.target.value)}onBlur={onRename}@@ -131,14 +136,18 @@ export default function Conversation({ conversation, retainView, toggleNav, isLa/></div>) : (- <HoverToggle isActiveConvo={isActiveConvo}>+ <HoverToggle+ isActiveConvo={isActiveConvo}+ isPopoverActive={isPopoverActive}+ setIsPopoverActive={setIsPopoverActive}+ ><EditMenuButton><RenameButtonrenaming={renaming}onRename={onRename}renameHandler={renameHandler}appendLabel={true}- className="group m-1.5 flex w-full cursor-pointer items-center gap-2 rounded p-2.5 text-sm hover:bg-gray-200 focus-visible:bg-gray-200 focus-visible:outline-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-gray-600 dark:focus-visible:bg-gray-600"+ className="mb-[3.5px]"/><DeleteButtonconversationId={conversationId}@@ -146,7 +155,7 @@ export default function Conversation({ conversation, retainView, toggleNav, isLarenaming={renaming}title={title}appendLabel={true}- className="group m-1.5 flex w-full cursor-pointer items-center gap-2 rounded p-2.5 text-sm hover:bg-gray-200 focus-visible:bg-gray-200 focus-visible:outline-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-gray-600 dark:focus-visible:bg-gray-600"+ className="mt-[3.5px]"/></EditMenuButton><ArchiveButton@@ -162,7 +171,7 @@ export default function Conversation({ conversation, retainView, toggleNav, isLadata-testid="convo-item"onClick={clickHandler}className={cn(- isActiveConvo+ isActiveConvo || isPopoverActive? 'group relative mt-2 flex cursor-pointer items-center gap-2 break-all rounded-lg rounded-lg bg-gray-200 px-2 py-2 active:opacity-50 dark:bg-gray-700': 'group relative mt-2 flex grow cursor-pointer items-center gap-2 overflow-hidden whitespace-nowrap break-all rounded-lg rounded-lg px-2 py-2 hover:bg-gray-200 active:opacity-50 dark:hover:bg-gray-700',!isActiveConvo && !renaming ? 'peer-hover:bg-gray-200 dark:peer-hover:bg-gray-800' : '',diff --git a/client/src/components/Conversations/DeleteButton.tsx b/client/src/components/Conversations/DeleteButton.tsxindex c1a0f5c55d..a81c0dd798 100644--- a/client/src/components/Conversations/DeleteButton.tsx+++ b/client/src/components/Conversations/DeleteButton.tsx@@ -16,6 +16,7 @@ import {import DialogTemplate from '~/components/ui/DialogTemplate';import { TrashIcon, CrossIcon } from '~/components/svg';import { useLocalize, useNewConvo } from '~/hooks';+import { cn } from '~/utils';export default function DeleteButton({conversationId,@@ -72,7 +73,14 @@ export default function DeleteButton({return (<Dialog><DialogTrigger asChild>- <button className={className}>{renaming ? <CrossIcon /> : renderDeleteButton()}</button>+ <button+ className={cn(+ 'group m-1.5 flex w-full cursor-pointer items-center gap-2 rounded p-2.5 text-sm hover:bg-gray-200 focus-visible:bg-gray-200 focus-visible:outline-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-gray-600 dark:focus-visible:bg-gray-600',+ className,+ )}+ >+ {renaming ? <CrossIcon /> : renderDeleteButton()}+ </button></DialogTrigger><DialogTemplateshowCloseButton={false}diff --git a/client/src/components/Conversations/EditMenuButton.tsx b/client/src/components/Conversations/EditMenuButton.tsxindex d74dccb199..57c1ad163e 100644--- a/client/src/components/Conversations/EditMenuButton.tsx+++ b/client/src/components/Conversations/EditMenuButton.tsx@@ -46,7 +46,7 @@ const EditMenuButton: FC<EditMenuButtonProps> = ({ children }: EditMenuButtonProalign="start"className={cn('popover radix-side-bottom:animate-slideUpAndFade radix-side-left:animate-slideRightAndFade radix-side-right:animate-slideLeftAndFade radix-side-top:animate-slideDownAndFade overflow-hidden rounded-lg shadow-lg',- 'border border-gray-200 bg-white dark:border-gray-700 dark:bg-gray-700 dark:text-white',+ 'border border-gray-200 bg-white dark:border-gray-600 dark:bg-gray-700 dark:text-white','flex min-w-[200px] max-w-xs flex-wrap',)}>diff --git a/client/src/components/Conversations/HoverToggle.tsx b/client/src/components/Conversations/HoverToggle.tsxindex 404b5caefc..fab8bb2a26 100644--- a/client/src/components/Conversations/HoverToggle.tsx+++ b/client/src/components/Conversations/HoverToggle.tsx@@ -5,11 +5,14 @@ import { cn } from '~/utils';const HoverToggle = ({children,isActiveConvo,+ isPopoverActive,+ setIsPopoverActive,}: {children: React.ReactNode;isActiveConvo: boolean;+ isPopoverActive: boolean;+ setIsPopoverActive: (isActive: boolean) => void;}) => {- const [isPopoverActive, setIsPopoverActive] = useState(false);const setPopoverActive = (value: boolean) => setIsPopoverActive(value);return (<ToggleContext.Provider value={{ setPopoverActive }}>diff --git a/client/src/components/Conversations/RenameButton.tsx b/client/src/components/Conversations/RenameButton.tsxindex 5db040ab02..cd00273b1e 100644--- a/client/src/components/Conversations/RenameButton.tsx+++ b/client/src/components/Conversations/RenameButton.tsx@@ -1,6 +1,7 @@import type { MouseEvent, ReactElement } from 'react';import { EditIcon, CheckMark } from '~/components/svg';import { useLocalize } from '~/hooks';+import { cn } from '~/utils';interface RenameButtonProps {renaming: boolean;@@ -21,7 +22,13 @@ export default function RenameButton({const handler = renaming ? onRename : renameHandler;return (- <button className={className} onClick={handler}>+ <button+ className={cn(+ 'group m-1.5 flex w-full cursor-pointer items-center gap-2 rounded p-2.5 text-sm hover:bg-gray-200 focus-visible:bg-gray-200 focus-visible:outline-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-gray-600 dark:focus-visible:bg-gray-600',+ className,+ )}+ onClick={handler}+ >{renaming ? (<CheckMark />) : appendLabel ? (diff --git a/client/src/components/Endpoints/SaveAsPresetDialog.tsx b/client/src/components/Endpoints/SaveAsPresetDialog.tsxindex f65d6a7d85..7f8802e076 100644--- a/client/src/components/Endpoints/SaveAsPresetDialog.tsx+++ b/client/src/components/Endpoints/SaveAsPresetDialog.tsx@@ -1,7 +1,13 @@import React, { useEffect, useState } from 'react';import { useCreatePresetMutation } from 'librechat-data-provider/react-query';import type { TEditPresetProps } from '~/common';-import { cn, defaultTextPropsLabel, removeFocusOutlines, cleanupPreset } from '~/utils/';+import {+ cn,+ defaultTextPropsLabel,+ removeFocusOutlines,+ cleanupPreset,+ defaultTextProps,+} from '~/utils/';import DialogTemplate from '~/components/ui/DialogTemplate';import { Dialog, Input, Label } from '~/components/ui/';import { NotificationSeverity } from '~/common';@@ -59,12 +65,12 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>{localize('com_endpoint_preset_name')}</Label><Input- id="chatGptLabel"+ id="chatGpt"value={title || ''}onChange={(e) => setTitle(e.target.value || '')}placeholder="Set a custom name for this preset"className={cn(- defaultTextPropsLabel,+ defaultTextProps,'flex h-10 max-h-10 w-full resize-none border-gray-100 px-3 py-2 dark:border-gray-600',removeFocusOutlines,)}diff --git a/client/src/components/Nav/Logout.tsx b/client/src/components/Nav/Logout.tsxindex f107e7c457..7145dbbc3e 100644--- a/client/src/components/Nav/Logout.tsx+++ b/client/src/components/Nav/Logout.tsx@@ -9,7 +9,7 @@ const Logout = forwardRef(() => {return (<button- className="flex w-full cursor-pointer items-center gap-3 px-3 py-3 text-sm text-black transition-colors duration-200 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"+ className="group group flex w-full cursor-pointer items-center gap-2 rounded p-2.5 text-sm transition-colors duration-200 hover:bg-gray-500/10 focus:ring-0 dark:text-white dark:hover:bg-gray-600"onClick={() => logout()}><LogOutIcon />diff --git a/client/src/components/Nav/NavLink.tsx b/client/src/components/Nav/NavLink.tsxindex 519e274226..823c68347b 100644--- a/client/src/components/Nav/NavLink.tsx+++ b/client/src/components/Nav/NavLink.tsx@@ -6,17 +6,21 @@ interface Props {text: string;clickHandler?: () => void;className?: string;+ disabled?: boolean;}const NavLink: FC<Props> = forwardRef<HTMLAnchorElement, Props>((props, ref) => {- const { svg, text, clickHandler, className = '' } = props;+ const { svg, text, clickHandler, disabled, className = '' } = props;const defaultProps: {className: string;onClick?: () => void;} = {className: cn(- 'flex cursor-pointer items-center gap-3 rounded-md py-3 px-3 text-sm text-white transition-colors duration-200 hover:bg-gray-500/10',+ 'flex gap-2 rounded p-2.5 text-sm cursor-pointer focus:ring-0 group items-center transition-colors duration-200 hover:bg-gray-500/10 dark:text-white dark:hover:bg-gray-600',className,+ {+ 'opacity-50 pointer-events-none': disabled,+ },),};diff --git a/client/src/components/Nav/NavLinks.tsx b/client/src/components/Nav/NavLinks.tsxindex 964c919314..6966a9d278 100644--- a/client/src/components/Nav/NavLinks.tsx+++ b/client/src/components/Nav/NavLinks.tsx@@ -1,6 +1,6 @@import { useLocation } from 'react-router-dom';import { Fragment, useState, memo } from 'react';-import { Download, FileText } from 'lucide-react';+import { FileText } from 'lucide-react';import { Menu, Transition } from '@headlessui/react';import { useRecoilValue, useRecoilState } from 'recoil';import { useGetUserBalance, useGetStartupConfig } from 'librechat-data-provider/react-query';@@ -8,7 +8,6 @@ import type { TConversation } from 'librechat-data-provider';import FilesView from '~/components/Chat/Input/Files/FilesView';import { useAuthContext } from '~/hooks/AuthContext';import useAvatar from '~/hooks/Messages/useAvatar';-import { ExportModal } from './ExportConversation';import { LinkIcon, GearIcon } from '~/components';import { UserIcon } from '~/components/svg';import { useLocalize } from '~/hooks';@@ -26,7 +25,6 @@ function NavLinks() {const balanceQuery = useGetUserBalance({enabled: !!isAuthenticated && startupConfig?.checkBalance,});- const [showExports, setShowExports] = useState(false);const [showSettings, setShowSettings] = useState(false);const [showFiles, setShowFiles] = useRecoilState(store.showFiles);@@ -42,34 +40,15 @@ function NavLinks() {conversation = activeConvo;}- const exportable =- conversation &&- conversation.conversationId &&- conversation.conversationId !== 'new' &&- conversation.conversationId !== 'search';-- const clickHandler = () => {- if (exportable) {- setShowExports(true);- }- };-return (<><Menu as="div" className="group relative">{({ open }) => (<>- {startupConfig?.checkBalance &&- balanceQuery.data &&- !isNaN(parseFloat(balanceQuery.data)) && (- <div className="m-1 ml-3 whitespace-nowrap text-left text-sm text-black dark:text-gray-200">- {`Balance: ${parseFloat(balanceQuery.data).toFixed(2)}`}- </div>- )}<Menu.ButtonclassName={cn(- 'group-ui-open:bg-gray-100 dark:group-ui-open:bg-gray-700 duration-350 mt-text-sm mb-1 flex h-11 w-full items-center gap-2 rounded-lg px-3 py-3 text-sm transition-colors hover:bg-gray-100 dark:hover:bg-gray-700',- open ? 'bg-gray-100 dark:bg-gray-700' : '',+ 'group-ui-open:bg-gray-100 dark:group-ui-open:bg-gray-700 duration-350 mt-text-sm flex h-auto w-full items-center gap-2 rounded-lg p-2 text-sm transition-colors hover:bg-gray-100 dark:hover:bg-gray-800',+ open ? 'bg-gray-100 dark:bg-gray-800' : '',)}data-testid="nav-user">@@ -93,7 +72,7 @@ function NavLinks() {</div></div><div- className="mt-2 grow overflow-hidden text-ellipsis whitespace-nowrap text-left text-black dark:text-white"+ className="mt-2 grow overflow-hidden text-ellipsis whitespace-nowrap text-left text-black dark:text-gray-100"style={{ marginTop: '0', marginLeft: '0' }}>{user?.name || user?.username || localize('com_nav_user')}@@ -109,24 +88,23 @@ function NavLinks() {leaveFrom="translate-y-0 opacity-100"leaveTo="translate-y-2 opacity-0">- <Menu.Items className="absolute bottom-full left-0 z-20 mb-1 mt-1 w-full translate-y-0 overflow-hidden rounded-lg bg-white py-1.5 opacity-100 outline-none dark:bg-gray-800">- <Menu.Item as="div">- <NavLink- className={cn(- 'flex w-full cursor-pointer items-center gap-3 rounded-none px-3 py-3 text-sm text-black transition-colors duration-200 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700',- exportable- ? 'cursor-pointer text-black dark:text-white'- : 'cursor-not-allowed text-black/50 dark:text-white/50',- )}- svg={() => <Download size={16} />}- text={localize('com_nav_export_conversation')}- clickHandler={clickHandler}- />- </Menu.Item>- <div className="my-1 h-px bg-black/20 dark:bg-white/20" role="none" />+ <Menu.Items className="absolute bottom-full left-0 z-[100] mb-1 mt-1 w-full translate-y-0 overflow-hidden rounded-lg border border-gray-300 bg-white p-1.5 opacity-100 shadow-lg outline-none dark:border-gray-600 dark:bg-gray-700">+ <div className="text-token-text-secondary ml-3 mr-2 py-2 text-sm" role="none">+ {user?.email || localize('com_nav_user')}+ </div>+ <div className="my-1.5 h-px bg-black/10 dark:bg-white/10" role="none" />+ {startupConfig?.checkBalance &&+ balanceQuery.data &&+ !isNaN(parseFloat(balanceQuery.data)) && (+ <>+ <div className="text-token-text-secondary ml-3 mr-2 py-2 text-sm">+ {`Balance: ${parseFloat(balanceQuery.data).toFixed(2)}`}+ </div>+ <div className="my-1.5 h-px bg-black/10 dark:bg-white/10" role="none" />+ </>+ )}<Menu.Item as="div"><NavLink- className="flex w-full cursor-pointer items-center gap-3 rounded-none px-3 py-3 text-sm text-black transition-colors duration-200 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"svg={() => <FileText className="icon-md" />}text={localize('com_nav_my_files')}clickHandler={() => setShowFiles(true)}@@ -135,7 +113,6 @@ function NavLinks() {{startupConfig?.helpAndFaqURL !== '/' && (<Menu.Item as="div"><NavLink- className="flex w-full cursor-pointer items-center gap-3 rounded-none px-3 py-3 text-sm text-black transition-colors duration-200 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"svg={() => <LinkIcon />}text={localize('com_nav_help_faq')}clickHandler={() => window.open(startupConfig?.helpAndFaqURL, '_blank')}@@ -144,13 +121,12 @@ function NavLinks() {)}<Menu.Item as="div"><NavLink- className="flex w-full cursor-pointer items-center gap-3 rounded-none px-3 py-3 text-sm text-black transition-colors duration-200 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"svg={() => <GearIcon className="icon-md" />}text={localize('com_nav_settings')}clickHandler={() => setShowSettings(true)}/></Menu.Item>- <div className="my-1 h-px bg-black/20 bg-white/20" role="none" />+ <div className="my-1.5 h-px bg-black/10 dark:bg-white/10" role="none" /><Menu.Item as="div"><Logout /></Menu.Item>@@ -159,9 +135,6 @@ function NavLinks() {</>)}</Menu>- {showExports && (- <ExportModal open={showExports} onOpenChange={setShowExports} conversation={conversation} />- )}{showFiles && <FilesView open={showFiles} onOpenChange={setShowFiles} />}{showSettings && <Settings open={showSettings} onOpenChange={setShowSettings} />}</>diff --git a/client/src/components/Nav/Settings.tsx b/client/src/components/Nav/Settings.tsxindex f83810667d..45d4e0e2b5 100644--- a/client/src/components/Nav/Settings.tsx+++ b/client/src/components/Nav/Settings.tsx@@ -16,8 +16,8 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {<Dialog open={open} onOpenChange={onOpenChange}><DialogContentclassName={cn(- 'shadow-2xl md:min-h-[373px] md:w-[680px]',- isSmallScreen ? 'top-20 -translate-y-0' : '',+ 'overflow-hidden shadow-2xl md:min-h-[373px] md:w-[680px]',+ isSmallScreen ? 'top-5 -translate-y-0' : '',)}><DialogHeader>@@ -25,19 +25,19 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {{localize('com_nav_settings')}</DialogTitle></DialogHeader>- <div className="px-6">+ <div className="max-h-[373px] overflow-auto px-6 md:min-h-[373px] md:w-[680px]"><Tabs.RootdefaultValue={SettingsTabValues.GENERAL}className="flex flex-col gap-10 md:flex-row"- orientation="vertical"+ orientation="horizontal"><Tabs.Listaria-label="Settings"role="tablist"- aria-orientation="vertical"+ aria-orientation="horizontal"className={cn(- 'min-w-auto -ml-[8px] flex flex-shrink-0 flex-col',- isSmallScreen ? 'flex-row rounded-lg bg-gray-200 p-1 dark:bg-gray-700' : '',+ 'min-w-auto max-w-auto -ml-[8px] flex flex-shrink-0 flex-col flex-wrap overflow-auto sm:max-w-none',+ isSmallScreen ? 'flex-row rounded-lg bg-gray-200 p-1 dark:bg-gray-800' : '',)}style={{ outline: 'none' }}>@@ -112,11 +112,13 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {{localize('com_nav_setting_account')}</Tabs.Trigger></Tabs.List>- <General />- <Messages />- <Beta />- <Data />- <Account />+ <div className="h-screen max-h-[373px] overflow-auto sm:w-full sm:max-w-none">+ <General />+ <Messages />+ <Beta />+ <Data />+ <Account />+ </div></Tabs.Root></div></DialogContent>diff --git a/client/src/components/Nav/SettingsTabs/Account/Account.tsx b/client/src/components/Nav/SettingsTabs/Account/Account.tsxindex c4d7c86fa4..73bf10f7f3 100644--- a/client/src/components/Nav/SettingsTabs/Account/Account.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/Account.tsx@@ -22,10 +22,10 @@ function Account({ onCheckedChange }: { onCheckedChange?: (value: boolean) => vo<Tabs.Contentvalue={SettingsTabValues.ACCOUNT}role="tabpanel"- className="w-full md:min-h-[300px]"+ className="w-full md:min-h-[271px]"><div className="flex flex-col gap-3 text-sm text-gray-600 dark:text-gray-50">- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><Avatar /></div><div className="flex items-center justify-between">@@ -39,7 +39,7 @@ function Account({ onCheckedChange }: { onCheckedChange?: (value: boolean) => vo/></div></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700"></div>+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"></div></Tabs.Content>);}diff --git a/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx b/client/src/components/Nav/SettingsTabs/Beta/Beta.tsxindex 699def5574..869e8dcec5 100644--- a/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx+++ b/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx@@ -9,13 +9,13 @@ function Beta() {<Tabs.Contentvalue={SettingsTabValues.BETA}role="tabpanel"- className="w-full md:min-h-[300px]"+ className="w-full md:min-h-[271px]"><div className="flex flex-col gap-3 text-sm text-gray-600 dark:text-gray-50">- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><ModularChat /></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><LaTeXParsing /></div></div>diff --git a/client/src/components/Nav/SettingsTabs/Data/Data.tsx b/client/src/components/Nav/SettingsTabs/Data/Data.tsxindex 69e4e4887b..65704d8c12 100644--- a/client/src/components/Nav/SettingsTabs/Data/Data.tsx+++ b/client/src/components/Nav/SettingsTabs/Data/Data.tsx@@ -100,18 +100,18 @@ function Data() {<Tabs.Contentvalue={SettingsTabValues.DATA}role="tabpanel"- className="w-full md:min-h-[300px]"+ className="w-full md:min-h-[271px]"ref={dataTabRef}><div className="flex flex-col gap-3 text-sm text-gray-600 dark:text-gray-50">- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><ImportConversations /></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><RevokeKeysButton all={true} /></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><ClearChatsButtonconfirmClear={confirmClearConvos}onClick={clearConvos}diff --git a/client/src/components/Nav/SettingsTabs/General/General.tsx b/client/src/components/Nav/SettingsTabs/General/General.tsxindex 2c3cb643e8..62fe0a94b5 100644--- a/client/src/components/Nav/SettingsTabs/General/General.tsx+++ b/client/src/components/Nav/SettingsTabs/General/General.tsx@@ -33,7 +33,9 @@ export const ThemeSelector = ({value={theme}onChange={onChange}options={themeOptions}- width={150}+ width={220}+ position={'left'}+ maxHeight="200px"testId="theme-selector"/></div>@@ -103,7 +105,13 @@ export const LangSelector = ({return (<div className="flex items-center justify-between"><div> {localize('com_nav_language')} </div>- <Dropdown value={langcode} onChange={onChange} options={languageOptions} />+ <Dropdown+ value={langcode}+ onChange={onChange}+ position={'left'}+ maxHeight="271px"+ options={languageOptions}+ /></div>);};@@ -142,26 +150,26 @@ function General() {<Tabs.Contentvalue={SettingsTabValues.GENERAL}role="tabpanel"- className="w-full md:min-h-[300px]"+ className="w-full md:min-h-[271px]"ref={contentRef}><div className="flex flex-col gap-3 text-sm text-gray-600 dark:text-gray-50">- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><ThemeSelector theme={theme} onChange={changeTheme} /></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><LangSelector langcode={selectedLang} onChange={changeLang} /></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><AutoScrollSwitch /></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><HideSidePanelSwitch /></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><ArchivedChats /></div>- {/* <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ {/* <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"></div> */}</div></Tabs.Content>diff --git a/client/src/components/Nav/SettingsTabs/Messages/ForkSettings.tsx b/client/src/components/Nav/SettingsTabs/Messages/ForkSettings.tsxindex 7776781f87..eb19532e42 100644--- a/client/src/components/Nav/SettingsTabs/Messages/ForkSettings.tsx+++ b/client/src/components/Nav/SettingsTabs/Messages/ForkSettings.tsx@@ -18,7 +18,7 @@ export const ForkSettings = () => {return (<>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><div className="flex items-center justify-between"><div> {localize('com_ui_fork_change_default')} </div><Dropdown@@ -26,11 +26,13 @@ export const ForkSettings = () => {onChange={setForkSetting}options={forkOptions}width={200}+ position={'left'}+ maxHeight="199px"testId="fork-setting-dropdown"/></div></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><div className="flex items-center justify-between"><div> {localize('com_ui_fork_default')} </div><Switch@@ -42,7 +44,7 @@ export const ForkSettings = () => {/></div></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><div className="flex items-center justify-between"><div> {localize('com_ui_fork_split_target_setting')} </div><Switchdiff --git a/client/src/components/Nav/SettingsTabs/Messages/Messages.tsx b/client/src/components/Nav/SettingsTabs/Messages/Messages.tsxindex df6f3af2c3..85ec7b09f1 100644--- a/client/src/components/Nav/SettingsTabs/Messages/Messages.tsx+++ b/client/src/components/Nav/SettingsTabs/Messages/Messages.tsx@@ -7,16 +7,12 @@ import { ForkSettings } from './ForkSettings';function Messages() {return (- <Tabs.Content- value={SettingsTabValues.MESSAGES}- role="tabpanel"- className="w-full md:min-h-[300px]"- >+ <Tabs.Content value={SettingsTabValues.MESSAGES} role="tabpanel" className="md: w-full"><div className="flex flex-col gap-3 text-sm text-gray-600 dark:text-gray-50">- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><SendMessageKeyEnter /></div>- <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">+ <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600"><ShowCodeSwitch /></div><ForkSettings />diff --git a/client/src/components/SidePanel/Files/PanelFileCell.tsx b/client/src/components/SidePanel/Files/PanelFileCell.tsxindex 7753452b0b..4d5d02979c 100644--- a/client/src/components/SidePanel/Files/PanelFileCell.tsx+++ b/client/src/components/SidePanel/Files/PanelFileCell.tsx@@ -92,7 +92,7 @@ export default function PanelFileCell({ row }: { row: Row<TFile> }) {return (<divonClick={handleFileClick}- className="flex cursor-pointer gap-2 rounded-md dark:hover:bg-gray-900"+ className="flex cursor-pointer gap-2 rounded-md dark:hover:bg-gray-700">{fileType && <FilePreview fileType={fileType} />}<span className="self-center truncate">{file.filename}</span>diff --git a/client/src/components/svg/Clipboard.tsx b/client/src/components/svg/Clipboard.tsxindex e18a9f6651..3ad1f01d29 100644--- a/client/src/components/svg/Clipboard.tsx+++ b/client/src/components/svg/Clipboard.tsx@@ -3,21 +3,18 @@ import React from 'react';export default function Clipboard() {return (<svg+ xmlns="http://www.w3.org/2000/svg"+ width="24"+ height="24"fill="none"- strokeWidth="2"viewBox="0 0 24 24"- strokeLinecap="round"- strokeLinejoin="round"- className="h-4 w-4"- height="1em"- width="1em"- xmlns="http://www.w3.org/2000/svg"+ className="icon-md-heavy"><path+ fill="currentColor"fillRule="evenodd"+ d="M7 5a3 3 0 0 1 3-3h9a3 3 0 0 1 3 3v9a3 3 0 0 1-3 3h-2v2a3 3 0 0 1-3 3H5a3 3 0 0 1-3-3v-9a3 3 0 0 1 3-3h2zm2 2h5a3 3 0 0 1 3 3v5h2a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1h-9a1 1 0 0 0-1 1zM5 9a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1v-9a1 1 0 0 0-1-1z"clipRule="evenodd"- d="M12 4C10.8954 4 10 4.89543 10 6H14C14 4.89543 13.1046 4 12 4ZM8.53513 4C9.22675 2.8044 10.5194 2 12 2C13.4806 2 14.7733 2.8044 15.4649 4H17C18.6569 4 20 5.34315 20 7V19C20 20.6569 18.6569 22 17 22H7C5.34315 22 4 20.6569 4 19V7C4 5.34315 5.34315 4 7 4H8.53513ZM8 6H7C6.44772 6 6 6.44772 6 7V19C6 19.5523 6.44772 20 7 20H17C17.5523 20 18 19.5523 18 19V7C18 6.44772 17.5523 6 17 6H16C16 7.10457 15.1046 8 14 8H10C8.89543 8 8 7.10457 8 6Z"- fill="currentColor"></path></svg>);diff --git a/client/src/components/svg/EditIcon.tsx b/client/src/components/svg/EditIcon.tsxindex 3884875b4e..e73e584bd4 100644--- a/client/src/components/svg/EditIcon.tsx+++ b/client/src/components/svg/EditIcon.tsx@@ -6,7 +6,7 @@ export default function EditIcon() {viewBox="0 0 24 24"strokeLinecap="round"strokeLinejoin="round"- className="h-4 w-4"+ className="icon-md"height="1em"width="1em"xmlns="http://www.w3.org/2000/svg"diff --git a/client/src/components/svg/RegenerateIcon.tsx b/client/src/components/svg/RegenerateIcon.tsxindex f4e5c8ce17..d048a6e29f 100644--- a/client/src/components/svg/RegenerateIcon.tsx+++ b/client/src/components/svg/RegenerateIcon.tsx@@ -3,21 +3,16 @@ import { cn } from '~/utils';export default function RegenerateIcon({ className = '' }: { className?: string }) {return (<svg+ xmlns="http://www.w3.org/2000/svg"+ width="24"+ height="24"fill="none"- strokeWidth="2"viewBox="0 0 24 24"- strokeLinecap="round"- strokeLinejoin="round"- className={cn('h-4 w-4', className)}- height="1em"- width="1em"- xmlns="http://www.w3.org/2000/svg"+ className={cn('icon-md-heavy', className)}><path- fillRule="evenodd"- clipRule="evenodd"- d="M4.5 2.5C5.05228 2.5 5.5 2.94772 5.5 3.5V5.07196C7.19872 3.47759 9.48483 2.5 12 2.5C17.2467 2.5 21.5 6.75329 21.5 12C21.5 17.2467 17.2467 21.5 12 21.5C7.1307 21.5 3.11828 17.8375 2.565 13.1164C2.50071 12.5679 2.89327 12.0711 3.4418 12.0068C3.99033 11.9425 4.48712 12.3351 4.5514 12.8836C4.98798 16.6089 8.15708 19.5 12 19.5C16.1421 19.5 19.5 16.1421 19.5 12C19.5 7.85786 16.1421 4.5 12 4.5C9.7796 4.5 7.7836 5.46469 6.40954 7H9C9.55228 7 10 7.44772 10 8C10 8.55228 9.55228 9 9 9H4.5C3.96064 9 3.52101 8.57299 3.50073 8.03859C3.49983 8.01771 3.49958 7.99677 3.5 7.9758V3.5C3.5 2.94772 3.94771 2.5 4.5 2.5Z"fill="currentColor"+ d="M3.07 10.876C3.623 6.436 7.41 3 12 3a9.15 9.15 0 0 1 6.012 2.254V4a1 1 0 1 1 2 0v4a1 1 0 0 1-1 1H15a1 1 0 1 1 0-2h1.957A7.15 7.15 0 0 0 12 5a7 7 0 0 0-6.946 6.124 1 1 0 1 1-1.984-.248m16.992 1.132a1 1 0 0 1 .868 1.116C20.377 17.564 16.59 21 12 21a9.15 9.15 0 0 1-6-2.244V20a1 1 0 1 1-2 0v-4a1 1 0 0 1 1-1h4a1 1 0 1 1 0 2H7.043A7.15 7.15 0 0 0 12 19a7 7 0 0 0 6.946-6.124 1 1 0 0 1 1.116-.868"></path></svg>);diff --git a/client/src/components/svg/TrashIcon.tsx b/client/src/components/svg/TrashIcon.tsxindex 56c8516987..1eb2fd4a1c 100644--- a/client/src/components/svg/TrashIcon.tsx+++ b/client/src/components/svg/TrashIcon.tsx@@ -6,7 +6,7 @@ export default function TrashIcon() {viewBox="0 0 24 24"strokeLinecap="round"strokeLinejoin="round"- className="h-4 w-4"+ className="icon-md"height="1em"width="1em"xmlns="http://www.w3.org/2000/svg"diff --git a/client/src/components/ui/Dropdown.tsx b/client/src/components/ui/Dropdown.tsxindex b2176fc24e..b23731b145 100644--- a/client/src/components/ui/Dropdown.tsx+++ b/client/src/components/ui/Dropdown.tsx@@ -7,13 +7,17 @@ type OptionType = {display?: string;};+type DropdownPosition = 'left' | 'right';+interface DropdownProps {value: string;label?: string;onChange: (value: string) => void;options: (string | OptionType)[];className?: string;+ position?: DropdownPosition;width?: number;+ maxHeight?: string;testId?: string;}@@ -23,11 +27,18 @@ const Dropdown: FC<DropdownProps> = ({onChange,options,className = '',+ position = 'right',width,+ maxHeight = 'auto',testId = 'dropdown-menu',}) => {const [selectedValue, setSelectedValue] = useState(initialValue);+ const positionClasses = {+ right: 'origin-bottom-left left-0',+ left: 'origin-bottom-right right-0',+ };+return (<div className={cn('relative', className)}><Listbox@@ -41,7 +52,7 @@ const Dropdown: FC<DropdownProps> = ({<Listbox.Buttondata-testid={testId}className={cn(- 'relative inline-flex items-center justify-between rounded-md border-gray-300 bg-white py-2 pl-3 pr-8 text-gray-700 hover:bg-gray-50 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600 ',+ 'relative inline-flex items-center justify-between rounded-md border-gray-300 bg-white py-2 pl-3 pr-8 text-gray-700 hover:bg-gray-50 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600','w-auto',className,)}@@ -67,19 +78,19 @@ const Dropdown: FC<DropdownProps> = ({</Listbox.Button><Listbox.OptionsclassName={cn(- 'absolute z-50 mt-1 max-h-[40vh] overflow-auto rounded-md border-gray-300 bg-white text-gray-700 shadow-lg transition-opacity hover:bg-gray-50 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600',+ `absolute z-50 mt-1 flex max-h-[40vh] flex-col items-start gap-1 overflow-auto rounded-lg border border-gray-300 bg-white p-1.5 text-gray-700 shadow-lg transition-opacity focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white ${positionClasses[position]}`,className,)}- style={{ width: width ? `${width}px` : 'auto' }}+ style={{ width: width ? `${width}px` : 'auto', maxHeight: maxHeight }}>{options.map((item, index) => (<Listbox.Optionkey={index}value={typeof item === 'string' ? item : item.value}className={cn(- 'relative cursor-pointer select-none border-gray-300 bg-white py-1 pl-3 pr-6 text-gray-700 hover:bg-gray-50 dark:border-gray-300 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600',+ 'relative cursor-pointer select-none rounded border-gray-300 bg-white py-2.5 pl-3 pr-6 text-gray-700 hover:bg-gray-100 dark:border-gray-300 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600',)}- style={{ width: width ? `${width}px` : 'auto' }}+ style={{ width: '100%' }}data-theme={typeof item === 'string' ? item : (item as OptionType).value}><span className="block truncate">diff --git a/client/src/components/ui/ThemeSelector.tsx b/client/src/components/ui/ThemeSelector.tsxindex 2aae704787..62cbcf9a3b 100644--- a/client/src/components/ui/ThemeSelector.tsx+++ b/client/src/components/ui/ThemeSelector.tsx@@ -28,7 +28,7 @@ const ThemeSelector = () => {);return (- <div className="flex min-h-screen flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0">+ <div className="flex flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0"><div className="absolute bottom-0 left-0 m-4"><Theme theme={theme} onChange={changeTheme} /></div>diff --git a/client/src/localization/languages/Eng.ts b/client/src/localization/languages/Eng.tsindex b6511a992f..315fad50bd 100644--- a/client/src/localization/languages/Eng.ts+++ b/client/src/localization/languages/Eng.ts@@ -144,7 +144,7 @@ export default {com_ui_fork_success: 'Successfully forked conversation',com_ui_fork_processing: 'Forking conversation...',com_ui_fork_error: 'There was an error forking the conversation',- com_ui_fork_change_default: 'Change default fork option',+ com_ui_fork_change_default: 'Default fork option',com_ui_fork_default: 'Use default fork option',com_ui_fork_remember: 'Remember',com_ui_fork_split_target_setting: 'Start fork from target message by default',@@ -431,8 +431,8 @@ export default {'Make sure to click \'Create and Continue\' to give at least the \'Vertex AI User\' role. Lastly, create a JSON key to import here.',com_nav_welcome_assistant: 'Please Select an Assistant',com_nav_welcome_message: 'How can I help you today?',- com_nav_auto_scroll: 'Auto-scroll to Newest on Open',- com_nav_hide_panel: 'Hide Right-most Side Panel',+ com_nav_auto_scroll: 'Auto-Scroll to latest message on chat open',+ com_nav_hide_panel: 'Hide right-most side panel',com_nav_modular_chat: 'Enable switching Endpoints mid-conversation',com_nav_latex_parsing: 'Parsing LaTeX in messages (may affect performance)',com_nav_profile_picture: 'Profile Picture',diff --git a/client/src/style.css b/client/src/style.cssindex c0f8fd4607..92da6e9e75 100644--- a/client/src/style.css+++ b/client/src/style.css@@ -1725,10 +1725,13 @@ html {height:1rem;width:1rem}-.icon-md {+.icon-md, .icon-md-heavy {stroke-width:1.5;- height:1.25rem;- width:1.25rem+ height:1.125rem;+ width:1.125rem+}+.icon-md-heavy {+ stroke-width: 2.5;}.icon-lg {stroke-width:1.5;diff --git a/client/src/utils/cn.ts b/client/src/utils/cn.tsindex daa125f191..de809354c8 100644--- a/client/src/utils/cn.ts+++ b/client/src/utils/cn.ts@@ -1,11 +1,11 @@import { twMerge } from 'tailwind-merge';-import { clsx } from 'clsx';+import { type ClassValue, clsx } from 'clsx';/*** Merges the tailwind clases (using twMerge). Conditionally removes false values* @param inputs The tailwind classes to merge* @returns className string to apply to an element or HOC*/-export default function cn(...inputs: Array<string | boolean>) {+export default function cn(...inputs: ClassValue[]) {return twMerge(clsx(inputs));}