Skip to content

Commit 3f58404

Browse files
290352095290352095
committed
添加logo.svg;解决依赖包安装warning警告;更新material-ui版本，支持hooks
1 parent fdfff64 commit 3f58404

File tree

7 files changed

+98
-19
lines changed

7 files changed

+98
-19
lines changed

‎package.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"precommit": "lint-staged"
99
},
1010
"devDependencies": {
11-
"babel-eslint": "^9.0.0",
12-
"eslint": "^5.4.0",
11+
"babel-eslint": "^7.2.3",
12+
"eslint": "^4.19.1",
1313
"eslint-config-umi": "^0.1.5",
1414
"eslint-plugin-flowtype": "^2.50.0",
1515
"eslint-plugin-import": "^2.14.0",
@@ -30,17 +30,23 @@
3030
"node": ">=8.0.0"
3131
},
3232
"dependencies": {
33-
"@material-ui/core": "^3.7.1",
33+
"@material-ui/core": "^3.9.0",
3434
"@material-ui/icons": "^3.0.1",
35+
"@material-ui/styles": "^3.0.0-alpha.8",
3536
"axios": "^0.18.0",
37+
"dva-core": "1.1.0",
3638
"eslint-config-alloy": "^1.4.2",
3739
"eslint-plugin-typescript": "^0.14.0",
40+
"jss": "10.0.0-alpha.3",
3841
"mockjs": "^1.0.1-beta3",
3942
"nprogress": "^0.2.0",
40-
"react": "16.7.0-alpha.0",
41-
"react-dom": "16.7.0-alpha.0",
43+
"react": "16.7.0-alpha.2",
44+
"react-dom": "16.7.0-alpha.2",
45+
"react-router": "4.4.0-beta.1",
46+
"redbox-react": "1.x",
47+
"redux": "3.x",
48+
"typescript": "*",
4249
"typescript-eslint-parser": "^21.0.1",
43-
"typings-for-css-modules-loader": "^1.7.0",
4450
"webpack-bundle-analyzer": "^3.0.3"
4551
}
4652
}

‎src/assets/images/login/loginbg.png‎

151 KB
Loading

‎src/assets/svg/logo@2x.svg‎

Lines changed: 18 additions & 0 deletions
Loading

‎src/component/common/BasicHeader/index.tsx‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import React, { Component } from 'react';
22
import styles from './index.less';
33
import { Menu, Icon } from 'antd';
4-
import logo from 'assets/images/home/logo@2x.png';
4+
import logo from 'assets/svg/logo@2x.svg';
55
import router from 'umi/router';
6+
import Nav from './nav';
7+
import Search from '@material-ui/icons/Search';
68

79
export default class BasicHeader extends Component {
810
state = {
@@ -17,23 +19,24 @@ export default class BasicHeader extends Component {
1719
};
1820

1921
render() {
20-
const Nav = props => (
21-
<Menu onClick={props.handleClick} selectedKeys={[props.current]} mode="horizontal">
22-
<Menu.Item key="home">首页</Menu.Item>
23-
<Menu.Item key="project-center">项目中心</Menu.Item>
24-
<Menu.Item key="talent-plaza">人才广场</Menu.Item>
25-
</Menu>
26-
);
22+
// const Nav = props => (
23+
// <Menu onClick={props.handleClick} selectedKeys={[props.current]} mode="horizontal">
24+
// <Menu.Item key="home">首页</Menu.Item>
25+
// <Menu.Item key="project-center">项目中心</Menu.Item>
26+
// <Menu.Item key="talent-plaza">人才广场</Menu.Item>
27+
// </Menu>
28+
// );
2729
return (
2830
<header className={styles['cr-header']}>
2931
<div className={'cr-logo'}>
3032
<img src={logo} alt="" />
3133
</div>
3234
<div className={'cr-nav'}>
33-
<Nav handleClick={this.handleClick} current={this.state.current} />
35+
{/* <Nav handleClick={this.handleClick} current={this.state.current} /> */}
36+
<Nav />
3437
</div>
3538
<div className={'cr-user'}>
36-
<Icon type="search" />
39+
<Search style={{ width: 30, height: 30, verticalAlign: 'middle' }} />
3740
<span
3841
onClick={() => {
3942
router.push('/user');
@@ -43,7 +46,7 @@ export default class BasicHeader extends Component {
4346
</span>
4447
<span
4548
onClick={() => {
46-
router.push('/user');
49+
router.push('/user/register');
4750
}}
4851
>
4952
注册

‎src/component/common/BasicHeader/nav.tsx‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
import React from 'react';
2+
import { makeStyles, withStyles } from '@material-ui/styles';
3+
import Paper from '@material-ui/core/Paper';
4+
import Tabs from '@material-ui/core/Tabs';
5+
import Tab from '@material-ui/core/Tab';
6+
7+
const useStyles = makeStyles({
8+
root: {
9+
flexGrow: 1,
10+
},
11+
labelFont: {
12+
fontSize: '20px !important',
13+
lineHeight: '60px !important',
14+
color: '#40aea8 !important',
15+
// borderBottom: '4px solid #40aea8 !important',
16+
},
17+
});
18+
19+
const MTabs = withStyles({
20+
indicator: {
21+
height: '4px !important',
22+
backgroundColor: '#40aea8 !important',
23+
},
24+
})(Tabs);
25+
26+
function Nav() {
27+
const classes = useStyles();
28+
const [value, setValue] = React.useState(0);
29+
30+
function handleChange(event, newValue) {
31+
setValue(newValue);
32+
}
33+
34+
return (
35+
<Paper className={classes.root}>
36+
<MTabs
37+
value={value}
38+
onChange={handleChange}
39+
indicatorColor="primary"
40+
textColor="primary"
41+
centered
42+
>
43+
<Tab className={classes.labelFont} label="首页" />
44+
<Tab className={classes.labelFont} label="项目中心" />
45+
<Tab className={classes.labelFont} label="人才广场" />
46+
</MTabs>
47+
</Paper>
48+
);
49+
}
50+
51+
export default Nav;

‎src/index.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
declare module '*.png';
2+
declare module '*.svg';
23
declare module 'component/*';

‎src/pages/coderiver/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import React, { Component } from 'react';
1+
import React, { Component, ReactNode } from 'react';
22
import HomeTitle from 'component/home/HomeTitle';
33
import bgimg from 'assets/images/home/bg@2x(1).png';
44

55
export default class Home extends Component {
6-
render() {
6+
render(): ReactNode {
77
return (
88
<div>
99
<img style={{ width: '100%' }} src={bgimg} alt="" />

0 commit comments

Comments
 (0)