mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-19 18:00:15 +01:00
* feat: init @librechat/client * feat: Add common types and interfaces for accessibility, agents, artifacts, assistants, and tools * feat: Add jotai as a peer dependency * fix build client package * feat: cleanup unused types from common/index.ts - Remove 104 unused type exports from packages/client/src/common/index.ts - Keep only 7 actually used exports (93% reduction) - Add cleanup script with enhanced import pattern detection - Support both named imports and namespace imports (* as t) - Create automatic backups and comprehensive documentation - Maintain type safety with build verification - No breaking changes to existing code Kept exports: - TShowToast, Option, OptionWithIcon, DropdownValueSetter - MentionOption, NotificationSeverity, MenuItemProps Scripts: cleanup-common-types-safe.js, README-CLEANUP.md * fix: cleanup * fix: package; refactor: tsconfig * feat: add back `recoil` * fix: move dependencies to peerDependencies in client package * feat: add @librechat/client as a dependency in package.json and package-lock.json * feat: update client package configuration and dependencies - Added new dependencies for Rollup plugins and updated existing ones in package.json and package-lock.json. - Introduced a new Rollup configuration file for building the client package. - Refactored build scripts to include a dedicated build command for the client. - Updated TypeScript configuration for improved module resolution and type declaration output. - Integrated a Toast component from the client package into the main App component. * feat: enhance Rollup configuration for client package - Updated terser plugin settings to preserve directives like 'use client'. - Added custom warning handler to ignore "use client" directive warnings during the build process. * chore: rename package/client build script command * feat: update client package dependencies and Rollup configuration - Added rollup-plugin-postcss to package.json and updated package-lock.json. - Enhanced Rollup configuration to include postcss plugin for CSS handling. - Updated index.ts to export all components from the components directory for better modularity. * feat: add client package directory to update configuration - Included the 'client' package directory in the update.js configuration to ensure it is recognized during updates. * feat: export Toast component in client package - Added export for the Toast component in index.ts to enhance modularity and accessibility of components. * feat: /client transition to @librechat/client * chore: fixed formatting issues * fix: update peer dependencies in @librechat/client to prevent bundling them * fix: correct useSprings implementation in SplitText component * fix: circular dependencies in DataTable * fix: add remaining peer dependencies and match actual versions previously used in `client/package.json` * fix: correct frontend:ci script to include client package build * chore: enhance unused package detection for @librechat/client and improve dependency extraction * fix: add missing peer dependency for @radix-ui/react-collapsible * chore: include "packages/client" in unused i18next keys detection * test: update AgentFooter tests to use document.querySelector for spinner checks test: mock window.matchMedia in setupTests.js for consistent test environment * feat: add react-hook-form dependency and update FormInput component to use its types * chore: linting * refactor: remove unused defaultSelectedValues prop from MCPSelect and MultiSelect components * chore: linting * feat: update GitHub Actions workflow to publish @librechat/client * chore: update GitHub Actions workflow to install and build data-provider and client dependencies * chore: add missing @testing-library/react dependency to client package * chore: update tsconfig.json to exclude additional test files * chore: fix build issues, resolve latest LC changes * chore: move MCP components outside of `~/components/ui` * feat: implement dynamic theme system with environment variable support and Tailwind CSS integration * chore: remove unnecessary logging of sttExternal and ttsExternal in Speech component * chore: squashed cleanup commits chore: move @tanstack/react-virtual to dependencies and remove recoil from package.json chore: move dependencies to peerDependencies in package.json feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration refactor: reorganize exports in index.ts for improved clarity refactor: remove unused types and interfaces from common files refactor: update peer dependencies and improve component typings - Removed duplicate peer dependencies from package.json and organized them. - Updated rollup.config.js to disable TypeScript checking during the build process. - Modified AnimatedTabs component to use React.ReactNode for label and content types, and added TypeScript workarounds for compatibility. - Enhanced Label and Separator components to accept an optional className prop and improved prop spreading. - Updated Slider component to include an optional className prop and refined prop handling for better type safety. refactor: clean up client workflow and update package dependencies refactor: update package dependencies and improve PostCSS and Rollup configurations chore: bump version to 0.1.2 in package.json chore: bump client version to 0.1.2 in package-lock.json chore: bump client version to 0.1.3 and update dependencies chore: bump client version to 0.1.4 and update @react-spring dependencies chore: update package version to 0.1.5 and adjust peer dependencies - Bump version in package.json from 0.1.4 to 0.1.5. - Update peer dependency for @tanstack/react-query to allow version 5.0.0. - Add @tanstack/react-table and @tanstack/react-virtual as dependencies. - Update various dependencies to their latest compatible versions. - Simplify postcss.config.js by removing unnecessary options. - Clean up rollup.config.js by removing ignored PostCSS warnings. - Update CheckboxButton component to cast icon as React JSX element. - Adjust Combobox component's class names for better styling. - Change DropdownPopup component to use React's namespace import. - Modify InputOTP component to use 'any' type for OTPInputContext. - Ensure displayLabel and value in ModelParameters are converted to strings. - Update MultiSearch component's placeholder to ensure it's a string. - Cast selectIcon in MultiSelect as React JSX element for consistency. - Update OGDialogTemplate to cast selectText as React JSX element. - Initialize animationRef in PixelCard with undefined for clarity. - Add TypeScript ignore comments in Select and SelectDropDown components for Radix UI type conflicts. - Ensure title in SelectDropDown is a string and adjust rendering of options. - Update useLocalize hook to cast options as any for compatibility. refactor: code structure; chore: translations cleanup chore: remove unused imports and clean up code in NewChat component refactor: enhance Menu component to support custom render functions for menu items style: update itemClassName in ToolsDropdown for improved UI consistency fix: merge conflicts chore: update @radix-ui/react-accordion to version 1.2.11 * refactor: remove unnecessary TypeScript type assertions in AnimatedTabs, Label, Separator, and Slider components * feat: enhance theme system with localStorage persistence and new theme atoms * chore: bump version of @librechat/client to 0.1.7 * chore: fix ci/cd warnings/errors related to linting and unused localization keys * chore: update dependencies for class-variance-authority, clsx, and match-sorter * chore: bump @librechat/client to v0.1.8 * feat: add utility colors for theme customization and remove unused tailwindConfig * v0.1.9 --------- Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com>
229 lines
8.3 KiB
TypeScript
229 lines
8.3 KiB
TypeScript
import { useForm } from 'react-hook-form';
|
|
import React, { useContext, useState } from 'react';
|
|
import { Turnstile } from '@marsidev/react-turnstile';
|
|
import { ThemeContext, Spinner, Button } from '@librechat/client';
|
|
import { useNavigate, useOutletContext, useLocation } from 'react-router-dom';
|
|
import { useRegisterUserMutation } from 'librechat-data-provider/react-query';
|
|
import type { TRegisterUser, TError } from 'librechat-data-provider';
|
|
import type { TLoginLayoutContext } from '~/common';
|
|
import { useLocalize, TranslationKeys } from '~/hooks';
|
|
import { ErrorMessage } from './ErrorMessage';
|
|
|
|
const Registration: React.FC = () => {
|
|
const navigate = useNavigate();
|
|
const localize = useLocalize();
|
|
const { theme } = useContext(ThemeContext);
|
|
const { startupConfig, startupConfigError, isFetching } = useOutletContext<TLoginLayoutContext>();
|
|
|
|
const {
|
|
watch,
|
|
register,
|
|
handleSubmit,
|
|
formState: { errors },
|
|
} = useForm<TRegisterUser>({ mode: 'onChange' });
|
|
const password = watch('password');
|
|
|
|
const [errorMessage, setErrorMessage] = useState<string>('');
|
|
const [isSubmitting, setIsSubmitting] = useState(false);
|
|
const [countdown, setCountdown] = useState<number>(3);
|
|
const [turnstileToken, setTurnstileToken] = useState<string | null>(null);
|
|
|
|
const location = useLocation();
|
|
const queryParams = new URLSearchParams(location.search);
|
|
const token = queryParams.get('token');
|
|
const validTheme = theme === 'dark' ? 'dark' : 'light';
|
|
|
|
// only require captcha if we have a siteKey
|
|
const requireCaptcha = Boolean(startupConfig?.turnstile?.siteKey);
|
|
|
|
const registerUser = useRegisterUserMutation({
|
|
onMutate: () => {
|
|
setIsSubmitting(true);
|
|
},
|
|
onSuccess: () => {
|
|
setIsSubmitting(false);
|
|
setCountdown(3);
|
|
const timer = setInterval(() => {
|
|
setCountdown((prevCountdown) => {
|
|
if (prevCountdown <= 1) {
|
|
clearInterval(timer);
|
|
navigate('/c/new', { replace: true });
|
|
return 0;
|
|
} else {
|
|
return prevCountdown - 1;
|
|
}
|
|
});
|
|
}, 1000);
|
|
},
|
|
onError: (error: unknown) => {
|
|
setIsSubmitting(false);
|
|
if ((error as TError).response?.data?.message) {
|
|
setErrorMessage((error as TError).response?.data?.message ?? '');
|
|
}
|
|
},
|
|
});
|
|
|
|
const renderInput = (id: string, label: TranslationKeys, type: string, validation: object) => (
|
|
<div className="mb-4">
|
|
<div className="relative">
|
|
<input
|
|
id={id}
|
|
type={type}
|
|
autoComplete={id}
|
|
aria-label={localize(label)}
|
|
{...register(
|
|
id as 'name' | 'email' | 'username' | 'password' | 'confirm_password',
|
|
validation,
|
|
)}
|
|
aria-invalid={!!errors[id]}
|
|
className="webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none"
|
|
placeholder=" "
|
|
data-testid={id}
|
|
/>
|
|
<label
|
|
htmlFor={id}
|
|
className="absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus: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-red-500">
|
|
{String(errors[id]?.message) ?? ''}
|
|
</span>
|
|
)}
|
|
</div>
|
|
);
|
|
|
|
return (
|
|
<>
|
|
{errorMessage && (
|
|
<ErrorMessage>
|
|
{localize('com_auth_error_create')} {errorMessage}
|
|
</ErrorMessage>
|
|
)}
|
|
{registerUser.isSuccess && countdown > 0 && (
|
|
<div
|
|
className="rounded-md border border-green-500 bg-green-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"
|
|
role="alert"
|
|
>
|
|
{localize(
|
|
startupConfig?.emailEnabled
|
|
? 'com_auth_registration_success_generic'
|
|
: 'com_auth_registration_success_insecure',
|
|
) +
|
|
' ' +
|
|
localize('com_auth_email_verification_redirecting', { 0: countdown.toString() })}
|
|
</div>
|
|
)}
|
|
{!startupConfigError && !isFetching && (
|
|
<>
|
|
<form
|
|
className="mt-6"
|
|
aria-label="Registration form"
|
|
method="POST"
|
|
onSubmit={handleSubmit((data: TRegisterUser) =>
|
|
registerUser.mutate({ ...data, token: token ?? undefined }),
|
|
)}
|
|
>
|
|
{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: string) =>
|
|
value === password || localize('com_auth_password_not_match'),
|
|
})}
|
|
|
|
{startupConfig?.turnstile?.siteKey && (
|
|
<div className="my-4 flex justify-center">
|
|
<Turnstile
|
|
siteKey={startupConfig.turnstile.siteKey}
|
|
options={{
|
|
...startupConfig.turnstile.options,
|
|
theme: validTheme,
|
|
}}
|
|
onSuccess={(token) => setTurnstileToken(token)}
|
|
onError={() => setTurnstileToken(null)}
|
|
onExpire={() => setTurnstileToken(null)}
|
|
/>
|
|
</div>
|
|
)}
|
|
|
|
<div className="mt-6">
|
|
<Button
|
|
disabled={
|
|
Object.keys(errors).length > 0 ||
|
|
isSubmitting ||
|
|
(requireCaptcha && !turnstileToken)
|
|
}
|
|
type="submit"
|
|
aria-label="Submit registration"
|
|
variant="submit"
|
|
className="h-12 w-full rounded-2xl"
|
|
>
|
|
{isSubmitting ? <Spinner /> : 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="inline-flex p-1 text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
|
|
>
|
|
{localize('com_auth_login')}
|
|
</a>
|
|
</p>
|
|
</>
|
|
)}
|
|
</>
|
|
);
|
|
};
|
|
|
|
export default Registration;
|