Skip to content

Commit

Permalink
feat: update package version
Browse files Browse the repository at this point in the history
  • Loading branch information
lilonghe authored Jul 3, 2023
1 parent a25ece1 commit 54df2cd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 17 deletions.
20 changes: 9 additions & 11 deletions management-system-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "management-system-react",
"version": "1.0.0",
"version": "1.0.1",
"scripts": {
"start": "vite",
"build": "vite build",
Expand All @@ -12,33 +12,31 @@
}
},
"devDependencies": {
"@vitejs/plugin-react": "^2.1.0",
"@vitejs/plugin-react": "^4.0.1",
"eslint": "^8.23.0",
"eslint-config-standard": "^17.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-n": "^15.2.5",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-promise": "^6.0.1",
"eslint-plugin-react": "^7.31.1",
"eslint-plugin-simple-import-sort": "^8.0.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"husky": "4.3.8",
"less": "^4.1.2",
"mockjs": "^1.1.0",
"standard": "^17.0.0",
"vite": "^3.1.0",
"vite-plugin-mock": "^2.9.6"
"vite": "^4.3.9",
"vite-plugin-mock": "^3.0.0"
},
"dependencies": {
"@rematch/core": "^2.2.0",
"@rematch/loading": "^2.1.2",
"antd": "^4.18.3",
"antd": "^5.6.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.4.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.2.1"
},
"alias": {
"@assets": "src/assets"
"react-router-dom": "^6.2.1",
"redux": "^4.2.1"
}
}
1 change: 0 additions & 1 deletion management-system-react/src/app.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'antd/dist/antd.variable.min.css'
import './app.module.less'

import Loading from '@components/loading'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Avatar, Dropdown, Layout, Menu } from 'antd'
import { useToken } from 'antd/es/theme/internal'
import { useState } from 'react'
import { useSelector } from 'react-redux'

Expand All @@ -8,6 +9,7 @@ import Nav from './nav'
export default function BasicLayout ({ children }) {
const [collapsed, setCollapsed] = useState(false)
const { user } = useSelector(state => state.session)
const [token] = useToken()

const toggleCollapsed = () => {
setCollapsed(!collapsed)
Expand All @@ -34,7 +36,7 @@ export default function BasicLayout ({ children }) {
className={styles.collapseIcon}
/>
<Dropdown overlay={<Menu><Menu.Item key='exit'>Exit</Menu.Item></Menu>}>
<Avatar className={styles.avatar}>{user.name[0]}</Avatar>
<Avatar className={styles.avatar} style={{ background: token.colorPrimary }}>{user.name[0]}</Avatar>
</Dropdown>
</Layout.Header>
<div className={styles.contentWrapper}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
align-items: center;
padding-left: 20px;
height: var(--layout-header-height);
box-shadow: 1px 0 3px #CCC;;
position: relative;
}

.mainContent {
Expand All @@ -18,6 +20,7 @@
flex: 1;
overflow: auto;
padding-top: 16px;
background-color: var(--color-layout-bg);
}

.logo {
Expand All @@ -38,8 +41,4 @@
height: 20px;
cursor: pointer;
visibility: hidden;
}

.avatar {
background-color: var(--primary-color);
}

0 comments on commit 54df2cd

Please sign in to comment.