Skip to content

phsl / new-api

Go to a project
Commit 767c7e3e by CaIon
Options

登录页完善

parent f0ba2fec
Showing with 89 additions and 145 deletions
web/public/index.html
...@@ -9,7 +9,7 @@ ...@@ -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>
......
web/src/components/HeaderBar.js
...@@ -57,9 +57,6 @@ const HeaderBar = () => { ...@@ -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 = () => { ...@@ -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 = () => { ...@@ -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 = () => { ...@@ -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 />} />
......
web/src/components/LoginForm.js
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({
...@@ -14,7 +21,7 @@ const LoginForm = () => { ...@@ -14,7 +21,7 @@ const LoginForm = () => {
}); });
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('');
...@@ -52,9 +59,9 @@ const LoginForm = () => { ...@@ -52,9 +59,9 @@ const LoginForm = () => {
const res = await API.get( const res = await API.get(
`/api/oauth/wechat?code=${inputs.wechat_verification_code}` `/api/oauth/wechat?code=${inputs.wechat_verification_code}`
); );
const { success, message, data } = res.data; const {success, message, data} = res.data;
if (success) { if (success) {
userDispatch({ type: 'login', payload: data }); userDispatch({type: 'login', payload: data});
localStorage.setItem('user', JSON.stringify(data)); localStorage.setItem('user', JSON.stringify(data));
navigate('/'); navigate('/');
showSuccess('登录成功！'); showSuccess('登录成功！');
...@@ -64,9 +71,8 @@ const LoginForm = () => { ...@@ -64,9 +71,8 @@ const LoginForm = () => {
} }
}; };
function handleChange(e) { function handleChange(name, value) {
const { name, value } = e.target; setInputs((inputs) => ({...inputs, [name]: value}));
setInputs((inputs) => ({ ...inputs, [name]: value }));
} }
async function handleSubmit(e) { async function handleSubmit(e) {
...@@ -80,9 +86,9 @@ const LoginForm = () => { ...@@ -80,9 +86,9 @@ const LoginForm = () => {
username, username,
password password
}); });
const { success, message, data } = res.data; const {success, message, data} = res.data;
if (success) { if (success) {
userDispatch({ type: 'login', payload: data }); userDispatch({type: 'login', payload: data});
localStorage.setItem('user', JSON.stringify(data)); localStorage.setItem('user', JSON.stringify(data));
if (username === 'root' && password === '123456') { if (username === 'root' && password === '123456') {
navigate('/user/edit'); navigate('/user/edit');
...@@ -95,69 +101,63 @@ const LoginForm = () => { ...@@ -95,69 +101,63 @@ const LoginForm = () => {
} else { } else {
showError(message); showError(message);
} }
} else {
showError('请输入用户名和密码！');
} }
} }
return ( return (
<Grid textAlign='center' style={{ marginTop: '48px' }}> <div>
<Grid.Column style={{ maxWidth: 450 }}> <Layout>
<Header as='h2' color='' textAlign='center'> <Layout.Header>
<Image src={logo} /> 用户登录 </Layout.Header>
</Header> <Layout.Content>
<Form size='large'> <div style={{justifyContent: 'center', display: "flex", marginTop: 120}}>
<Segment> <div style={{width: 500}}>
<Card>
<Title heading={2} style={{textAlign: 'center'}}>
用户登录
</Title>
<Form>
<Form.Input <Form.Input
fluid field={'username'}
icon='user' label={'用户名'}
iconPosition='left'
placeholder='用户名' placeholder='用户名'
name='username' name='username'
value={username} onChange={(value) => handleChange('username', value)}
onChange={handleChange}
/> />
<Form.Input <Form.Input
fluid field={'password'}
icon='lock' label={'密码'}
iconPosition='left'
placeholder='密码' placeholder='密码'
name='password' name='password'
type='password' type='password'
value={password} onChange={(value) => handleChange('password', value)}
onChange={handleChange}
/> />
{turnstileEnabled ? (
<Turnstile <Button theme='solid' style={{width: '100%'}} type={'primary'} size='large'
sitekey={turnstileSiteKey} htmlType={'submit'} onClick={handleSubmit}>
onVerify={(token) => {
setTurnstileToken(token);
}}
/>
) : (
<></>
)}
<Button color='green' fluid size='large' onClick={handleSubmit}>
登录 登录
</Button> </Button>
</Segment>
</Form> </Form>
<Message> <div style={{display: 'flex', justifyContent: 'space-between', marginTop: 20}}>
忘记密码？ <Text>
<Link to='/reset' className='btn btn-link'> 没有账号请先 <Link to='/register'>注册账号</Link>
点击重置 </Text>
</Link> <Text>
； 没有账户？ 忘记密码 <Link to='/reset'>点击重置</Link>
<Link to='/register' className='btn btn-link'> </Text>
点击注册 </div>
</Link>
</Message>
{status.github_oauth || status.wechat_login ? ( {status.github_oauth || status.wechat_login ? (
<> <>
<Divider horizontal>Or</Divider> <Divider margin='12px' align='center'>
第三方登录
</Divider>
<div style={{display: 'flex', justifyContent: 'center', marginTop: 20}}>
{status.github_oauth ? ( {status.github_oauth ? (
<Button <Button
circular type='primary'
color='black' icon={<IconGithubLogo/>}
icon='github'
onClick={() => onGitHubOAuthClicked(status.github_client_id)} onClick={() => onGitHubOAuthClicked(status.github_client_id)}
/> />
) : ( ) : (
...@@ -173,6 +173,7 @@ const LoginForm = () => { ...@@ -173,6 +173,7 @@ const LoginForm = () => {
) : ( ) : (
<></> <></>
)} )}
</div>
</> </>
) : ( ) : (
<></> <></>
...@@ -185,15 +186,15 @@ const LoginForm = () => { ...@@ -185,15 +186,15 @@ const LoginForm = () => {
> >
<Modal.Content> <Modal.Content>
<Modal.Description> <Modal.Description>
<Image src={status.wechat_qrcode} fluid /> <Image src={status.wechat_qrcode} fluid/>
<div style={{ textAlign: 'center' }}> <div style={{textAlign: 'center'}}>
<p> <p>
微信扫码关注公众号，输入「验证码」获取验证码（三分钟内有效） 微信扫码关注公众号，输入「验证码」获取验证码（三分钟内有效）
</p> </p>
</div> </div>
<Form size='large'> <Form size='large'>
<Form.Input <Form.Input
fluid field={'wechat_verification_code'}
placeholder='验证码' placeholder='验证码'
name='wechat_verification_code' name='wechat_verification_code'
value={inputs.wechat_verification_code} value={inputs.wechat_verification_code}
...@@ -211,8 +212,25 @@ const LoginForm = () => { ...@@ -211,8 +212,25 @@ const LoginForm = () => {
</Modal.Description> </Modal.Description>
</Modal.Content> </Modal.Content>
</Modal> </Modal>
</Grid.Column> </Card>
</Grid> {turnstileEnabled ? (
<div style={{display: 'flex', justifyContent: 'center', marginTop: 20}}>
<Turnstile
sitekey={turnstileSiteKey}
onVerify={(token) => {
setTurnstileToken(token);
}}
/>
</div>
) : (
<></>
)}
</div>
</div>
</Layout.Content>
</Layout>
</div>
); );
}; };
......
web/src/components/SiderBar.js
...@@ -179,7 +179,7 @@ const HeaderBar = () => { ...@@ -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',
......
web/src/components/TokensTable.js
...@@ -457,6 +457,7 @@ const TokensTable = () => { ...@@ -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);
......
web/src/helpers/utils.js
...@@ -23,7 +23,7 @@ export function isRoot() { ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment