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

登录页完善

Browse Source
This commit is contained in:
CaIon 2023-11-07 23:32:43 +08:00
parent a0b975fc3d
commit 83050646f9
6 changed files with 237 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/public/index.html
View File

@ -9,7 +9,7 @@
name="description" name="description"
content="OpenAI 接口聚合管理，支持多种渠道包括 Azure，可用于二次分发管理 key，仅单可执行文件，已打包好 Docker 镜像，一键部署，开箱即用" content="OpenAI 接口聚合管理，支持多种渠道包括 Azure，可用于二次分发管理 key，仅单可执行文件，已打包好 Docker 镜像，一键部署，开箱即用"
/> />
<title>MiaoKo API</title> <title>New API</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>

85
web/src/components/HeaderBar.js
View File

@ -57,9 +57,6 @@ const HeaderBar = () => {
navigate('/login'); navigate('/login');
} }
const toggleSidebar = () => {
setShowSidebar(!showSidebar);
};
const renderButtons = (isMobile) => { const renderButtons = (isMobile) => {
return headerButtons.map((button) => { return headerButtons.map((button) => {
@ -84,82 +81,6 @@ const HeaderBar = () => {
); );
}); });
}; };
// if (isMobile()) {
// return (
// <>
// <Menu
// borderless
// size='large'
// style={
// showSidebar
// ? {
// borderBottom: 'none',
// marginBottom: '0',
// borderTop: 'none',
// height: '51px'
// }
// : {borderTop: 'none', height: '52px'}
// }
// >
// <Container>
// <Menu.Item as={Link} to='/'>
// <img
// src={logo}
// alt='logo'
// style={{marginRight: '0.75em'}}
// />
// <div style={{fontSize: '20px'}}>
// <b>{systemName}</b>
// </div>
// </Menu.Item>
// <Menu.Menu position='right'>
// <Menu.Item onClick={toggleSidebar}>
// <Icon name={showSidebar ? 'close' : 'sidebar'}/>
// </Menu.Item>
// </Menu.Menu>
// </Container>
// </Menu>
//
// {showSidebar ? (
// <Segment style={{marginTop: 0, borderTop: '0'}}>
// <Menu secondary vertical style={{ width: '100%', margin: 0 }}>
// {renderButtons(true)}
// <Menu.Item>
// {userState.user ? (
// <Button onClick={logout}>注销</Button>
// ) : (
// <>
// <Button
// onClick={() => {
// setShowSidebar(false);
// navigate('/login');
// }}
// >
// 登录
// </Button>
// <Button
// onClick={() => {
// setShowSidebar(false);
// navigate('/register');
// }}
// >
// 注册
// </Button>
// </>
// )}
// </Menu.Item>
// </Menu>
//
// </Segment>
// ) : (
// <></>
// )}
//
//
// </>
// );
// }
const switchMode = (model) => { const switchMode = (model) => {
const body = document.body; const body = document.body;
if (!model) { if (!model) {
@ -178,6 +99,8 @@ const HeaderBar = () => {
renderWrapper={({itemElement, isSubNav, isInSubNav, props}) => { renderWrapper={({itemElement, isSubNav, isInSubNav, props}) => {
const routerMap = { const routerMap = {
about: "/about", about: "/about",
login: "/login",
register: "/register",
}; };
return ( return (
<Link <Link
@ -190,7 +113,9 @@ const HeaderBar = () => {
}} }}
selectedKeys={[]} selectedKeys={[]}
// items={headerButtons} // items={headerButtons}
onSelect={key => console.log(key)} onSelect={key => {
}}
footer={ footer={
<> <>
<Nav.Item itemKey={'about'} icon={<IconHelpCircle />} /> <Nav.Item itemKey={'about'} icon={<IconHelpCircle />} />

438
web/src/components/LoginForm.js
View File

@ -1,219 +1,237 @@
import React, { useContext, useEffect, useState } from 'react'; import React, {useContext, useEffect, useState} from 'react';
import { Button, Divider, Form, Grid, Header, Image, Message, Modal, Segment } from 'semantic-ui-react'; import {
import { Link, useNavigate, useSearchParams } from 'react-router-dom'; Modal,
import { UserContext } from '../context/User'; } from 'semantic-ui-react';
import {API, getLogo, showError, showInfo, showSuccess, showWarning} from '../helpers'; import {Link, useNavigate, useSearchParams} from 'react-router-dom';
import { onGitHubOAuthClicked } from './utils'; import {UserContext} from '../context/User';
import {API, getLogo, isMobile, showError, showInfo, showSuccess, showWarning} from '../helpers';
import {onGitHubOAuthClicked} from './utils';
import Turnstile from "react-turnstile"; import Turnstile from "react-turnstile";
import {Layout, Card, Image, Form, Button, Divider} from "@douyinfe/semi-ui";
import Title from "@douyinfe/semi-ui/lib/es/typography/title";
import Text from "@douyinfe/semi-ui/lib/es/typography/text";
import {IconGithubLogo} from '@douyinfe/semi-icons';
const LoginForm = () => { const LoginForm = () => {
const [inputs, setInputs] = useState({ const [inputs, setInputs] = useState({
username: '', username: '',
password: '', password: '',
wechat_verification_code: '' wechat_verification_code: ''
}); });
const [searchParams, setSearchParams] = useSearchParams(); const [searchParams, setSearchParams] = useSearchParams();
const [submitted, setSubmitted] = useState(false); const [submitted, setSubmitted] = useState(false);
const { username, password } = inputs; const {username, password} = inputs;
const [userState, userDispatch] = useContext(UserContext); const [userState, userDispatch] = useContext(UserContext);
const [turnstileEnabled, setTurnstileEnabled] = useState(false); const [turnstileEnabled, setTurnstileEnabled] = useState(false);
const [turnstileSiteKey, setTurnstileSiteKey] = useState(''); const [turnstileSiteKey, setTurnstileSiteKey] = useState('');
const [turnstileToken, setTurnstileToken] = useState(''); const [turnstileToken, setTurnstileToken] = useState('');
let navigate = useNavigate(); let navigate = useNavigate();
const [status, setStatus] = useState({}); const [status, setStatus] = useState({});
const logo = getLogo(); const logo = getLogo();
useEffect(() => { useEffect(() => {
if (searchParams.get('expired')) { if (searchParams.get('expired')) {
showError('未登录或登录已过期，请重新登录！'); showError('未登录或登录已过期，请重新登录！');
}
let status = localStorage.getItem('status');
if (status) {
status = JSON.parse(status);
setStatus(status);
if (status.turnstile_check) {
setTurnstileEnabled(true);
setTurnstileSiteKey(status.turnstile_site_key);
}
}
}, []);
const [showWeChatLoginModal, setShowWeChatLoginModal] = useState(false);
const onWeChatLoginClicked = () => {
setShowWeChatLoginModal(true);
};
const onSubmitWeChatVerificationCode = async () => {
if (turnstileEnabled && turnstileToken === '') {
showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
return;
}
const res = await API.get(
`/api/oauth/wechat?code=${inputs.wechat_verification_code}`
);
const { success, message, data } = res.data;
if (success) {
userDispatch({ type: 'login', payload: data });
localStorage.setItem('user', JSON.stringify(data));
navigate('/');
showSuccess('登录成功！');
setShowWeChatLoginModal(false);
} else {
showError(message);
}
};
function handleChange(e) {
const { name, value } = e.target;
setInputs((inputs) => ({ ...inputs, [name]: value }));
}
async function handleSubmit(e) {
if (turnstileEnabled && turnstileToken === '') {
showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
return;
}
setSubmitted(true);
if (username && password) {
const res = await API.post(`/api/user/login?turnstile=${turnstileToken}`, {
username,
password
});
const { success, message, data } = res.data;
if (success) {
userDispatch({ type: 'login', payload: data });
localStorage.setItem('user', JSON.stringify(data));
if (username === 'root' && password === '123456') {
navigate('/user/edit');
showSuccess('登录成功！');
showWarning('请立刻修改默认密码！');
} else {
navigate('/token');
showSuccess('登录成功！');
} }
} else { let status = localStorage.getItem('status');
showError(message); if (status) {
} status = JSON.parse(status);
} setStatus(status);
} if (status.turnstile_check) {
setTurnstileEnabled(true);
setTurnstileSiteKey(status.turnstile_site_key);
}
}
}, []);
return ( const [showWeChatLoginModal, setShowWeChatLoginModal] = useState(false);
<Grid textAlign='center' style={{ marginTop: '48px' }}>
<Grid.Column style={{ maxWidth: 450 }}> const onWeChatLoginClicked = () => {
<Header as='h2' color='' textAlign='center'> setShowWeChatLoginModal(true);
<Image src={logo} /> 用户登录 };
</Header>
<Form size='large'> const onSubmitWeChatVerificationCode = async () => {
<Segment> if (turnstileEnabled && turnstileToken === '') {
<Form.Input showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
fluid return;
icon='user' }
iconPosition='left' const res = await API.get(
placeholder='用户名' `/api/oauth/wechat?code=${inputs.wechat_verification_code}`
name='username' );
value={username} const {success, message, data} = res.data;
onChange={handleChange} if (success) {
/> userDispatch({type: 'login', payload: data});
<Form.Input localStorage.setItem('user', JSON.stringify(data));
fluid navigate('/');
icon='lock' showSuccess('登录成功！');
iconPosition='left' setShowWeChatLoginModal(false);
placeholder='密码' } else {
name='password' showError(message);
type='password' }
value={password} };
onChange={handleChange}
/> function handleChange(name, value) {
{turnstileEnabled ? ( setInputs((inputs) => ({...inputs, [name]: value}));
<Turnstile }
sitekey={turnstileSiteKey}
onVerify={(token) => { async function handleSubmit(e) {
setTurnstileToken(token); if (turnstileEnabled && turnstileToken === '') {
}} showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
/> return;
) : ( }
<></> setSubmitted(true);
)} if (username && password) {
<Button color='green' fluid size='large' onClick={handleSubmit}> const res = await API.post(`/api/user/login?turnstile=${turnstileToken}`, {
登录 username,
</Button> password
</Segment> });
</Form> const {success, message, data} = res.data;
<Message> if (success) {
忘记密码？ userDispatch({type: 'login', payload: data});
<Link to='/reset' className='btn btn-link'> localStorage.setItem('user', JSON.stringify(data));
点击重置 if (username === 'root' && password === '123456') {
</Link> navigate('/user/edit');
； 没有账户？ showSuccess('登录成功！');
<Link to='/register' className='btn btn-link'> showWarning('请立刻修改默认密码！');
点击注册 } else {
</Link> navigate('/token');
</Message> showSuccess('登录成功！');
{status.github_oauth || status.wechat_login ? ( }
<> } else {
<Divider horizontal>Or</Divider> showError(message);
{status.github_oauth ? ( }
<Button } else {
circular showError('请输入用户名和密码！');
color='black' }
icon='github' }
onClick={() => onGitHubOAuthClicked(status.github_client_id)}
/> return (
) : ( <div>
<></> <Layout>
)} <Layout.Header>
{status.wechat_login ? ( </Layout.Header>
<Button <Layout.Content>
circular <div style={{justifyContent: 'center', display: "flex", marginTop: 120}}>
color='green' <div style={{width: 500}}>
icon='wechat' <Card>
onClick={onWeChatLoginClicked} <Title heading={2} style={{textAlign: 'center'}}>
/> 用户登录
) : ( </Title>
<></> <Form>
)} <Form.Input
</> field={'username'}
) : ( label={'用户名'}
<></> placeholder='用户名'
)} name='username'
<Modal onChange={(value) => handleChange('username', value)}
onClose={() => setShowWeChatLoginModal(false)} />
onOpen={() => setShowWeChatLoginModal(true)} <Form.Input
open={showWeChatLoginModal} field={'password'}
size={'mini'} label={'密码'}
> placeholder='密码'
<Modal.Content> name='password'
<Modal.Description> type='password'
<Image src={status.wechat_qrcode} fluid /> onChange={(value) => handleChange('password', value)}
<div style={{ textAlign: 'center' }}> />
<p>
微信扫码关注公众号，输入「验证码」获取验证码（三分钟内有效） <Button theme='solid' style={{width: '100%'}} type={'primary'} size='large'
</p> htmlType={'submit'} onClick={handleSubmit}>
</div> 登录
<Form size='large'> </Button>
<Form.Input </Form>
fluid <div style={{display: 'flex', justifyContent: 'space-between', marginTop: 20}}>
placeholder='验证码' <Text>
name='wechat_verification_code' 没有账号请先 <Link to='/register'>注册账号</Link>
value={inputs.wechat_verification_code} </Text>
onChange={handleChange} <Text>
/> 忘记密码 <Link to='/reset'>点击重置</Link>
<Button </Text>
color='' </div>
fluid {status.github_oauth || status.wechat_login ? (
size='large' <>
onClick={onSubmitWeChatVerificationCode} <Divider margin='12px' align='center'>
> 第三方登录
登录 </Divider>
</Button> <div style={{display: 'flex', justifyContent: 'center', marginTop: 20}}>
</Form> {status.github_oauth ? (
</Modal.Description> <Button
</Modal.Content> type='primary'
</Modal> icon={<IconGithubLogo/>}
</Grid.Column> onClick={() => onGitHubOAuthClicked(status.github_client_id)}
</Grid> />
); ) : (
<></>
)}
{status.wechat_login ? (
<Button
circular
color='green'
icon='wechat'
onClick={onWeChatLoginClicked}
/>
) : (
<></>
)}
</div>
</>
) : (
<></>
)}
<Modal
onClose={() => setShowWeChatLoginModal(false)}
onOpen={() => setShowWeChatLoginModal(true)}
open={showWeChatLoginModal}
size={'mini'}
>
<Modal.Content>
<Modal.Description>
<Image src={status.wechat_qrcode} fluid/>
<div style={{textAlign: 'center'}}>
<p>
微信扫码关注公众号，输入「验证码」获取验证码（三分钟内有效）
</p>
</div>
<Form size='large'>
<Form.Input
field={'wechat_verification_code'}
placeholder='验证码'
name='wechat_verification_code'
value={inputs.wechat_verification_code}
onChange={handleChange}
/>
<Button
color=''
fluid
size='large'
onClick={onSubmitWeChatVerificationCode}
>
登录
</Button>
</Form>
</Modal.Description>
</Modal.Content>
</Modal>
</Card>
{turnstileEnabled ? (
<div style={{display: 'flex', justifyContent: 'center', marginTop: 20}}>
<Turnstile
sitekey={turnstileSiteKey}
onVerify={(token) => {
setTurnstileToken(token);
}}
/>
</div>
) : (
<></>
)}
</div>
</div>
</Layout.Content>
</Layout>
</div>
);
}; };
export default LoginForm; export default LoginForm;

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

@ -179,7 +179,7 @@ const HeaderBar = () => {
}} }}
header={{ header={{
logo: <img src={logo} alt='logo' style={{marginRight: '0.75em'}}/>, logo: <img src={logo} alt='logo' style={{marginRight: '0.75em'}}/>,
text: 'MiaoKoAPI' text: systemName,
}} }}
// footer={{ // footer={{
// text: '© 2021 NekoAPI', // text: '© 2021 NekoAPI',

1
web/src/components/TokensTable.js
View File

@ -457,6 +457,7 @@ const TokensTable = () => {
total: tokenCount, total: tokenCount,
showSizeChanger: true, showSizeChanger: true,
pageSizeOptions: [10, 20, 50, 100], pageSizeOptions: [10, 20, 50, 100],
formatPageText: (page) => `第 ${page.currentStart} - ${page.currentEnd} 条，共 ${tokens.length} 条`,
onPageSizeChange: (size) => { onPageSizeChange: (size) => {
setPageSize(size); setPageSize(size);
setActivePage(1); setActivePage(1);

2
web/src/helpers/utils.js
View File

@ -23,7 +23,7 @@ export function isRoot() {
export function getSystemName() { export function getSystemName() {
let system_name = localStorage.getItem('system_name'); let system_name = localStorage.getItem('system_name');
if (!system_name) return 'Neko API'; if (!system_name) return 'New API';
return system_name; return system_name;
} }