xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-11-12 09:03:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge upstream

Browse Source 
Signed-off-by: wozulong <>
This commit is contained in:
wozulong
2024-07-19 10:58:21 +08:00
parent 0cc7f5cca6 733b374596
commit 7a249b206d
72 changed files with 1989 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/LogsTable.js
View File

@@ -367,7 +367,7 @@ const LogsTable = () => {
dataIndex: 'content',
render: (text, record, index) => {
let other = getLogOther(record.other);
if (other == null) {
if (other == null || record.type !== 2) {
return (
<Paragraph
ellipsis={{

214
web/src/components/RegisterForm.js
View File

@@ -1,16 +1,10 @@
import React, { useEffect, useState } from 'react';
import {
Button,
Form,
Grid,
Header,
Image,
Message,
Segment,
} from 'semantic-ui-react';
import { Link, useNavigate } from 'react-router-dom';
import { API, getLogo, showError, showInfo, showSuccess } from '../helpers';
import Turnstile from 'react-turnstile';
import { Button, Card, Form, Layout } from '@douyinfe/semi-ui';
import Title from '@douyinfe/semi-ui/lib/es/typography/title';
import Text from '@douyinfe/semi-ui/lib/es/typography/text';
const RegisterForm = () => {
const [inputs, setInputs] = useState({
@@ -46,9 +40,7 @@ const RegisterForm = () => {
let navigate = useNavigate();
function handleChange(e) {
const { name, value } = e.target;
console.log(name, value);
function handleChange(name, value) {
setInputs((inputs) => ({ ...inputs, [name]: value }));
}
@@ -108,96 +100,116 @@ const RegisterForm = () => {
};
return (
<Grid textAlign='center' style={{ marginTop: '48px' }}>
<Grid.Column style={{ maxWidth: 450 }}>
<Header as='h2' color='' textAlign='center'>
<Image src={logo} /> 新用户注册
</Header>
<Form size='large'>
<Segment>
<Form.Input
fluid
icon='user'
iconPosition='left'
placeholder='输入用户名，最长 12 位'
onChange={handleChange}
name='username'
/>
<Form.Input
fluid
icon='lock'
iconPosition='left'
placeholder='输入密码，最短 8 位，最长 20 位'
onChange={handleChange}
name='password'
type='password'
/>
<Form.Input
fluid
icon='lock'
iconPosition='left'
placeholder='输入密码，最短 8 位，最长 20 位'
onChange={handleChange}
name='password2'
type='password'
/>
{showEmailVerification ? (
<>
<Form.Input
fluid
icon='mail'
iconPosition='left'
placeholder='输入邮箱地址'
onChange={handleChange}
name='email'
type='email'
action={
<Button onClick={sendVerificationCode} disabled={loading}>
获取验证码
</Button>
}
<div>
<Layout>
<Layout.Header></Layout.Header>
<Layout.Content>
<div
style={{
justifyContent: 'center',
display: 'flex',
marginTop: 120,
}}
>
<div style={{ width: 500 }}>
<Card>
<Title heading={2} style={{ textAlign: 'center' }}>
新用户注册
</Title>
<Form size='large'>
<Form.Input
field={'username'}
label={'用户名'}
placeholder='用户名'
name='username'
onChange={(value) => handleChange('username', value)}
/>
<Form.Input
field={'password'}
label={'密码'}
placeholder='密码，最短 8 位，最长 20 位'
name='password'
type='password'
onChange={(value) => handleChange('password', value)}
/>
<Form.Input
field={'password2'}
label={'确认密码'}
placeholder='确认密码'
name='password2'
type='password'
onChange={(value) => handleChange('password2', value)}
/>
{showEmailVerification ? (
<>
<Form.Input
field={'email'}
label={'邮箱'}
placeholder='输入邮箱地址'
onChange={(value) => handleChange('email', value)}
name='email'
type='email'
suffix={
<Button
onClick={sendVerificationCode}
disabled={loading}
>
获取验证码
</Button>
}
/>
<Form.Input
field={'verification_code'}
label={'验证码'}
placeholder='输入验证码'
onChange={(value) =>
handleChange('verification_code', value)
}
name='verification_code'
/>
</>
) : (
<></>
)}
<Button
theme='solid'
style={{ width: '100%' }}
type={'primary'}
size='large'
htmlType={'submit'}
onClick={handleSubmit}
>
注册
</Button>
</Form>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
marginTop: 20,
}}
>
<Text>
已有账户？
<Link to='/login'>点击登录</Link>
</Text>
</div>
</Card>
{turnstileEnabled ? (
<Turnstile
sitekey={turnstileSiteKey}
onVerify={(token) => {
setTurnstileToken(token);
}}
/>
<Form.Input
fluid
icon='lock'
iconPosition='left'
placeholder='输入验证码'
onChange={handleChange}
name='verification_code'
/>
</>
) : (
<></>
)}
{turnstileEnabled ? (
<Turnstile
sitekey={turnstileSiteKey}
onVerify={(token) => {
setTurnstileToken(token);
}}
/>
) : (
<></>
)}
<Button
color='green'
fluid
size='large'
onClick={handleSubmit}
loading={loading}
>
注册
</Button>
</Segment>
</Form>
<Message>
已有账户？
<Link to='/login' className='btn btn-link'>
点击登录
</Link>
</Message>
</Grid.Column>
</Grid>
) : (
<></>
)}
</div>
</div>
</Layout.Content>
</Layout>
</div>
);
};

7
web/src/constants/channel.constants.js
View File

@@ -99,6 +99,13 @@ export const CHANNEL_OPTIONS = [
color: 'orange',
label: 'Google PaLM2',
},
{
key: 39,
text: 'Cloudflare',
value: 39,
color: 'grey',
label: 'Cloudflare',
},
{ key: 25, text: 'Moonshot', value: 25, color: 'green', label: 'Moonshot' },
{ key: 19, text: '360 智脑', value: 19, color: 'blue', label: '360 智脑' },
{ key: 23, text: '腾讯混元', value: 23, color: 'teal', label: '腾讯混元' },

18
web/src/pages/Channel/EditChannel.js
View File

@@ -601,6 +601,24 @@ const EditChannel = (props) => {
/>
</>
)}
{inputs.type === 39 && (
<>
<div style={{ marginTop: 10 }}>
<Typography.Text strong>Account ID：</Typography.Text>
</div>
<Input
name='other'
placeholder={
'请输入Account ID，例如：d6b5da8hk1awo8nap34ube6gh'
}
onChange={(value) => {
handleInputChange('other', value);
}}
value={inputs.other}
autoComplete='new-password'
/>
</>
)}
<div style={{ marginTop: 10 }}>
<Typography.Text strong>模型：</Typography.Text>
</div>