Skip to content

Commit 73d6634

Browse files
Mtb 365 upgrade version antd (#377)
* update: update version antd * feat: fix UI Color Picker and refactor UI update tag * refactor: scss in user page * refactor: SCSS * chore * chore * update version antd to latest --------- Co-authored-by: Quang Dai Thien <daithien2004@gmail.com>
1 parent 22aa7ef commit 73d6634

File tree

46 files changed

+944
-1182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+944
-1182
lines changed

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"gen-api": "cd ./src/services && npx @rtk-query/codegen-openapi openapiConfig.ts"
1515
},
1616
"dependencies": {
17-
"@ant-design/icons": "^5.6.1",
17+
"@ant-design/icons": "^6.1.0",
1818
"@ctrl/tinycolor": "^4.1.0",
1919
"@hookform/resolvers": "^4.0.0",
2020
"@reduxjs/toolkit": "^2.5.1",
2121
"@rtk-query/codegen-openapi": "^2.0.0",
2222
"@tailwindcss/vite": "^4.0.6",
23-
"antd": "^5.24.0",
23+
"antd": "^6.2.1",
2424
"axios": "^1.8.1",
2525
"class-variance-authority": "^0.7.1",
2626
"dotenv": "^16.4.7",

frontend/src/App.tsx

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,53 @@
11
import { Bounce, ToastContainer } from 'react-toastify'
22
import { renderRoutes } from './navigation/router'
33
import { Routes } from 'react-router-dom'
4-
import { ConfigProvider, theme as antTheme } from 'antd'
4+
import { ConfigProvider, theme as antTheme } from 'antd'
55
import { useTheme } from '@app/hook/useTheme'
66
import { useMemo } from 'react'
77

88
function App() {
99
const { theme, primaryColorHex } = useTheme()
10-
10+
1111
const themeConfig = useMemo(() => ({
1212
algorithm: theme === 'dark' ? antTheme.darkAlgorithm : antTheme.defaultAlgorithm,
1313
token: {
1414
fontFamily: 'Open Sans, sans-serif',
15-
colorPrimary: primaryColorHex,
15+
colorPrimary: primaryColorHex,
1616
colorBgBase: 'var(--bg-body)',
1717
colorTextBase: 'var(--text-primary)',
1818
colorBgContainer: 'var(--bg-container)',
19+
colorBgElevated: 'var(--bg-container)',
1920
colorText: 'var(--text-primary)',
2021
colorTextSecondary: 'var(--text-secondary)',
2122
colorBorder: 'var(--border-color)'
23+
},
24+
components: {
25+
Carousel: {
26+
dotWidth: 5,
27+
dotHeight: 5,
28+
dotActiveWidth: 12,
29+
dotGap: 5,
30+
},
2231
}
23-
}), [theme, primaryColorHex])
24-
32+
}), [theme, primaryColorHex])
33+
2534
return (
2635
<ConfigProvider theme={themeConfig}>
2736
<div className={`app-container ${theme}`}>
28-
<Routes>{renderRoutes()}</Routes>
29-
<ToastContainer
30-
position='top-center'
31-
autoClose={5000}
32-
hideProgressBar={false}
33-
newestOnTop={false}
34-
closeOnClick={false}
35-
rtl={false}
36-
pauseOnFocusLoss
37-
draggable
38-
pauseOnHover
39-
theme={theme === 'dark' ? 'dark' : 'light'}
40-
transition={Bounce}
41-
/>
37+
<Routes>{renderRoutes()}</Routes>
38+
<ToastContainer
39+
position='top-center'
40+
autoClose={5000}
41+
hideProgressBar={false}
42+
newestOnTop={false}
43+
closeOnClick={false}
44+
rtl={false}
45+
pauseOnFocusLoss
46+
draggable
47+
pauseOnHover
48+
theme={theme === 'dark' ? 'dark' : 'light'}
49+
transition={Bounce}
50+
/>
4251
</div>
4352
</ConfigProvider>
4453
)

0 commit comments

Comments
 (0)