diff --git a/config/defaultSettings.ts b/config/defaultSettings.ts index 6e47385..d627ccd 100644 --- a/config/defaultSettings.ts +++ b/config/defaultSettings.ts @@ -7,22 +7,19 @@ const Settings: ProLayoutProps & { pwa?: boolean; logo?: string; } = { - navTheme: 'light', + navTheme: 'realDark', // 拂晓蓝 - colorPrimary: '#1890ff', - layout: 'mix', + colorPrimary: '#2F54EB', + layout: 'side', contentWidth: 'Fluid', fixedHeader: false, fixSiderbar: true, - colorWeak: false, + // colorWeak: false, title: 'AI Pipeline', pwa: true, logo: false, iconfontUrl: '', - token: { - // 参见ts声明,demo 见文档,通过token 修改样式 - //https://procomponents.ant.design/components/layout#%E9%80%9A%E8%BF%87-token-%E4%BF%AE%E6%94%B9%E6%A0%B7%E5%BC%8F - }, + token: {}, }; export default Settings; diff --git a/public/favicon.ico b/public/favicon.ico index e2e9325..eee15f5 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/logo.svg b/public/logo.svg deleted file mode 100644 index 239bf69..0000000 --- a/public/logo.svg +++ /dev/null @@ -1 +0,0 @@ -Group 28 Copy 5Created with Sketch. \ No newline at end of file diff --git a/public/pro_icon.svg b/public/pro_icon.svg deleted file mode 100644 index e075b78..0000000 --- a/public/pro_icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/app.tsx b/src/app.tsx index 599b811..a7ae802 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -66,7 +66,7 @@ export const layout: RunTimeLayoutConfig = ({ }) => { return { actionsRender: () => [ - , + // , , ], avatarProps: { diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx index da8ee6b..1252686 100644 --- a/src/pages/Welcome.tsx +++ b/src/pages/Welcome.tsx @@ -1,164 +1,15 @@ -import { PageContainer } from '@ant-design/pro-components'; +import { PageContainer, ProCard } from '@ant-design/pro-components'; import { useModel } from '@umijs/max'; import { Card, theme } from 'antd'; import React from 'react'; -/** - * 每个单独的卡片,为了复用样式抽成了组件 - * @param param0 - * @returns - */ -const InfoCard: React.FC<{ - title: string; - index: number; - desc: string; - href: string; -}> = ({ title, href, index, desc }) => { - const { useToken } = theme; - - const { token } = useToken(); - - return ( -
-
-
- {index} -
-
- {title} -
-
-
- {desc} -
- - 了解更多 {'>'} - -
- ); -}; const Welcome: React.FC = () => { const { token } = theme.useToken(); const { initialState } = useModel('@@initialState'); return ( - -
-
- 欢迎使用 AI Pipeline -
-

- AI Pipeline 是一个整合了 umi,AI Pipeline 和 ProComponents - 的脚手架方案。致力于在设计规范和基础组件的基础上,继续向上构建,提炼出典型模板/业务组件/配套设计资源,进一步提升企业级中后台产品设计研发过程中的『用户』和『设计者』的体验。 -

-
- - - -
-
-
+
); }; diff --git a/src/pages/user/login/__snapshots__/login.test.tsx.snap b/src/pages/user/login/__snapshots__/login.test.tsx.snap deleted file mode 100644 index ab36431..0000000 --- a/src/pages/user/login/__snapshots__/login.test.tsx.snap +++ /dev/null @@ -1,1088 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Login Page should login success 1`] = ` - -
-
-
- - - - - -
-
- -
- -`; - -exports[`Login Page should show login form 1`] = ` - -
-
-
- - - - - -
-
- -
- -`; diff --git a/src/pages/user/login/login.test.tsx b/src/pages/user/login/login.test.tsx deleted file mode 100644 index 78eab41..0000000 --- a/src/pages/user/login/login.test.tsx +++ /dev/null @@ -1,102 +0,0 @@ -// @ts-ignore -import { startMock } from '@@/requestRecordMock'; -import { TestBrowser } from '@@/testBrowser'; -import { fireEvent, render } from '@testing-library/react'; -import React, { act } from 'react'; - -const waitTime = (time: number = 100) => { - return new Promise((resolve) => { - setTimeout(() => { - resolve(true); - }, time); - }); -}; - -let server: { - close: () => void; -}; - -describe('Login Page', () => { - beforeAll(async () => { - server = await startMock({ - port: 8000, - scene: 'login', - }); - }); - - afterAll(() => { - server?.close(); - }); - - it('should show login form', async () => { - const historyRef = React.createRef(); - const rootContainer = render( - , - ); - - await rootContainer.findAllByText('AI Pipeline'); - - act(() => { - historyRef.current?.push('/user/login'); - }); - - expect( - rootContainer.baseElement?.querySelector('.ant-pro-form-login-desc') - ?.textContent, - ).toBe( - 'AI Pipeline is the most influential web design specification in Xihu district', - ); - - expect(rootContainer.asFragment()).toMatchSnapshot(); - - rootContainer.unmount(); - }); - - it('should login success', async () => { - const historyRef = React.createRef(); - const rootContainer = render( - , - ); - - await rootContainer.findAllByText('AI Pipeline'); - - const userNameInput = await rootContainer.findByPlaceholderText( - 'Username: admin or user', - ); - - act(() => { - fireEvent.change(userNameInput, { target: { value: 'admin' } }); - }); - - const passwordInput = await rootContainer.findByPlaceholderText( - 'Password: ant.design', - ); - - act(() => { - fireEvent.change(passwordInput, { target: { value: 'ant.design' } }); - }); - - await (await rootContainer.findByText('Login')).click(); - - // 等待接口返回结果 - await waitTime(5000); - - await rootContainer.findAllByText('AI Pipeline'); - - expect(rootContainer.asFragment()).toMatchSnapshot(); - - await waitTime(2000); - - rootContainer.unmount(); - }); -});