diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 57403f7..13c5e74 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,10 +1,10 @@
-import type { Metadata } from "next";
+import type {Metadata} from "next";
import "@/ui/globals.css";
import Script from "next/script";
export const metadata: Metadata = {
- title: "任务管理",
- description: "任务管理小助手",
+ title: "任务管理",
+ description: "任务管理小助手",
};
/**
* Root Layout (Required)
@@ -12,19 +12,19 @@ export const metadata: Metadata = {
* @constructor
*/
export default function RootLayout({
- children,
-}: Readonly<{
- children: React.ReactNode;
+ children,
+ }: Readonly<{
+ children: React.ReactNode;
}>) {
- return (
-
-
-
-
- 任务管理
- 任务管理
+ /Loading...
;
+}
\ No newline at end of file
diff --git a/src/app/login/loading.tsx b/src/app/login/loading.tsx
new file mode 100644
index 0000000..eeef040
--- /dev/null
+++ b/src/app/login/loading.tsx
@@ -0,0 +1,3 @@
+export default function Loading() {
+ return /login/Loading...
;
+}
\ No newline at end of file
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
index 0ccdb2e..4818bd2 100644
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -1,365 +1,16 @@
'use client'
-import {
- AlipayOutlined,
- LockOutlined, MailOutlined,
- MobileOutlined,
- TaobaoOutlined,
- UserOutlined,
- WeiboOutlined,
-} from '@ant-design/icons';
-import {
- LoginForm,
- LoginFormPage,
- ProConfigProvider,
- ProFormCaptcha,
- ProFormCheckbox,
- ProFormText,
-} from '@ant-design/pro-components';
-import {Divider, Space, Tabs, message, theme, Modal, Button} from 'antd';
-import {CSSProperties, useCallback} from 'react';
-import {useState} from 'react';
-import {CaptchaLoginSuccess, LoginObject} from "@/lib/login/definitions";
-import {httpReq} from "@/utils/axiosReq";
-import {useRouter} from 'next/navigation'
-
-type LoginType = 'email' | 'account';
-
-const iconStyles: CSSProperties = {
- color: 'rgba(0, 0, 0, 0.2)',
- fontSize: '18px',
- verticalAlign: 'middle',
- cursor: 'pointer',
-};
-
-
-const Page = () => {
- const [loginType, setLoginType] = useState('account');
- const {token} = theme.useToken();
- const router = useRouter()
- const [messageApi, contextHolder] = message.useMessage();
- const [loading, setLoading] = useState(false);
- const [open, setOpen] = useState(false);
- const [captchaLoginSuccessList, setCaptchaLoginSuccessList] = useState([]);
- const captchaUserNameConfirm = (captchaLoginSuccess:CaptchaLoginSuccess)=>{
- messageApi.open({
- type: 'info',
- content: "使用帐号"+captchaLoginSuccess.username+"登录成功"
- })
- localStorage.setItem('platform-security', captchaLoginSuccess.token)
- router.push('/task/project')
- setOpen(false)
- setLoading(false)
- }
- return (
-
- {contextHolder}
-
(
- captchaUserNameConfirm(label)}>
- {label.username}
-
- ))
- }
- >
-
-
{
- console.log("登录信息：" + formData.username + ";" + formData.password)
- if (loginType === "account") {
- httpReq.post(process.env.NEXT_PUBLIC_SECURITY_REQUEST_URL + "/stateless/login/username", {
- username: formData.username,
- password: formData.password
- }).then(response => {
- console.log(response);
- if (response.data.status.code === 200) {
- // localStorage.removeItem("platform-security")
- localStorage.setItem('platform-security', response.data.data)
- // 删除名为 'platform-security' 的Cookie
- // Cookies.remove('platform-security');
- // 设置一个有效期为7天的Cookie
- // Cookies.set('platform-security', response.data.data, { expires: 7 });
- // 登录成功，跳转到首页或者回调
- router.push('/task/project')
- } else {
- messageApi.open({
- type: 'error',
- content: response.data.status.message,
- })
- }
- ;
- })
- } else if (loginType === "email") {
- httpReq.post(process.env.NEXT_PUBLIC_SECURITY_REQUEST_URL + "/stateless/login/email", {
- email: formData.email,
- captcha: formData.captcha
- }).then(response => {
- console.log(response);
- if (response.data.status.code === 200) {
- // localStorage.removeItem("platform-security")
- if (response.data.data.length > 1) {
- setCaptchaLoginSuccessList(response.data.data)
- setOpen(true)
- } else {
- localStorage.setItem('platform-security', response.data.data)
- // 删除名为 'platform-security' 的Cookie
- // Cookies.remove('platform-security');
- // 设置一个有效期为7天的Cookie
- // Cookies.set('platform-security', response.data.data, { expires: 7 });
- // 登录成功，跳转到首页或者回调
- router.push('/task/project')
- }
- } else {
- messageApi.open({
- type: 'error',
- content: response.data.status.message,
- })
- }
- ;
- })
- }
-
- }}
- // actions={
- //
- //
- //
- // 其他登录方式
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
setLoginType(activeKey as LoginType)}
- >
-
-
-
- {loginType === 'account' && (
- <>
-
-
-
+ }>
+
+
+
);
};
\ No newline at end of file
diff --git a/src/ui/login/Page.tsx b/src/ui/login/Page.tsx
new file mode 100644
index 0000000..45c67d6
--- /dev/null
+++ b/src/ui/login/Page.tsx
@@ -0,0 +1,364 @@
+'use client'
+import {
+ AlipayOutlined,
+ LockOutlined, MailOutlined,
+ MobileOutlined,
+ TaobaoOutlined,
+ UserOutlined,
+ WeiboOutlined,
+} from '@ant-design/icons';
+import {
+ LoginForm,
+ LoginFormPage,
+ ProConfigProvider,
+ ProFormCaptcha,
+ ProFormCheckbox,
+ ProFormText,
+} from '@ant-design/pro-components';
+
+import {Divider, Space, Tabs, message, theme, Modal, Button} from 'antd';
+import React, {CSSProperties, Suspense, useCallback, useEffect, useLayoutEffect} from 'react';
+import {useState} from 'react';
+import {CaptchaLoginSuccess, LoginObject} from "@/lib/login/definitions";
+import {httpReq} from "@/utils/axiosReq";
+import {useRouter} from 'next/navigation'
+import {use} from 'react';
+import Loading from "@/app/loading";
+
+type LoginType = 'email' | 'account';
+
+const iconStyles: CSSProperties = {
+ color: 'rgba(0, 0, 0, 0.2)',
+ fontSize: '18px',
+ verticalAlign: 'middle',
+ cursor: 'pointer',
+};
+
+export default function Page() {
+ const [loaded, setLoaded] = useState(false);
+ useLayoutEffect(() => {
+ console.log('页面所有资源加载完毕');
+ setLoaded(true);
+ })
+ const [loginType, setLoginType] = useState('account');
+ const {token} = theme.useToken();
+ const router = useRouter()
+ const [messageApi, contextHolder] = message.useMessage();
+ const [loading, setLoading] = useState(false);
+ const [open, setOpen] = useState(false);
+ const [captchaLoginSuccessList, setCaptchaLoginSuccessList] = useState([]);
+ const captchaUserNameConfirm = (captchaLoginSuccess: CaptchaLoginSuccess) => {
+ messageApi.open({
+ type: 'info',
+ content: "使用帐号" + captchaLoginSuccess.username + "登录成功"
+ })
+ localStorage.setItem('platform-security', captchaLoginSuccess.token)
+ router.push('/task/project')
+ setOpen(false)
+ setLoading(false)
+ }
+ return (
+
+ {contextHolder}
+
(
+ captchaUserNameConfirm(label)}>
+ {label.username}
+
+ ))
+ }
+ >
+
+ {loaded?
{
+ console.log("登录信息：" + formData.username + ";" + formData.password)
+ if (loginType === "account") {
+ httpReq.post(process.env.NEXT_PUBLIC_SECURITY_REQUEST_URL + "/stateless/login/username", {
+ username: formData.username,
+ password: formData.password
+ }).then(response => {
+ console.log(response);
+ if (response.data.status.code === 200) {
+ // localStorage.removeItem("platform-security")
+ localStorage.setItem('platform-security', response.data.data)
+ // 删除名为 'platform-security' 的Cookie
+ // Cookies.remove('platform-security');
+ // 设置一个有效期为7天的Cookie
+ // Cookies.set('platform-security', response.data.data, { expires: 7 });
+ // 登录成功，跳转到首页或者回调
+ router.push('/task/project')
+ } else {
+ messageApi.open({
+ type: 'error',
+ content: response.data.status.message,
+ })
+ }
+ ;
+ })
+ } else if (loginType === "email") {
+ httpReq.post(process.env.NEXT_PUBLIC_SECURITY_REQUEST_URL + "/stateless/login/email", {
+ email: formData.email,
+ captcha: formData.captcha
+ }).then(response => {
+ console.log(response);
+ if (response.data.status.code === 200) {
+ // localStorage.removeItem("platform-security")
+ if (response.data.data.length > 1) {
+ setCaptchaLoginSuccessList(response.data.data)
+ setOpen(true)
+ } else {
+ localStorage.setItem('platform-security', response.data.data)
+ // 删除名为 'platform-security' 的Cookie
+ // Cookies.remove('platform-security');
+ // 设置一个有效期为7天的Cookie
+ // Cookies.set('platform-security', response.data.data, { expires: 7 });
+ // 登录成功，跳转到首页或者回调
+ router.push('/task/project')
+ }
+ } else {
+ messageApi.open({
+ type: 'error',
+ content: response.data.status.message,
+ })
+ }
+ ;
+ })
+ }
+
+ }}
+ // actions={
+ //
+ //
+ //
+ // 其他登录方式
+ //
+ //
+ //
+ //
+ //
+ //
+ //
+ //
+ //
+ //
setLoginType(activeKey as LoginType)}
+ >
+
+
+
+ {loginType === 'account' && (
+ <>
+ :
}
+