Skip to content

Commit 26de39f

Browse files
author
Sven
committed
简化结构,删除counter,elapse,404
1 parent c4aca04 commit 26de39f

File tree

16 files changed

+5
-308
lines changed

16 files changed

+5
-308
lines changed

src/layouts/components/CustomHome.js

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,11 @@ import AsyncLoad from '../../components/AsyncLoad'
66
import Navbar from '../containers/NavbarContainer'
77

88
// `import()` 异步加载模块,魔法注释写chunkName
9-
export const AsyncCounter = AsyncLoad({
10-
loader: () => import(/* webpackChunkName: "counter" */'routes/Counter'),
11-
})
12-
13-
const AsyncZen = AsyncLoad({
9+
export const AsyncZen = AsyncLoad({
1410
loader: () => import(/* webpackChunkName: "zen" */'routes/Zen'),
1511
})
1612

17-
const AsyncElapse = AsyncLoad({
18-
loader: () => import(/* webpackChunkName: "elapse" */'routes/Elapse'),
19-
})
20-
21-
const AsyncRoute = AsyncLoad({
22-
loader: () => import(/* webpackChunkName: "route" */'routes/Route'),
23-
})
24-
25-
const AsyncPageNotFound = AsyncLoad({
26-
loader: () => import(/* webpackChunkName: "pageNotFound" */'routes/PageNotFound'),
27-
})
28-
29-
export const AsyncHome = AsyncLoad({
13+
const AsyncHome = AsyncLoad({
3014
loader: () => import(/* webpackChunkName: "home" */'routes/Home'),
3115
})
3216

@@ -37,11 +21,7 @@ export default function CustomHome() {
3721
<Container className="text-center page-layout__viewport">
3822
<Switch>
3923
<Route exact path="/" component={AsyncHome} />
40-
<Route path="/counter" component={AsyncCounter} />
4124
<Route path="/zenPage" component={AsyncZen} />
42-
<Route path="/elapse" component={AsyncElapse} />
43-
<Route path="/route/:id" component={AsyncRoute} />
44-
<Route component={AsyncPageNotFound} />
4525
</Switch>
4626
</Container>
4727
</div>

src/layouts/components/Navbar.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
22
import { func } from 'prop-types'
33
import { Collapse, Navbar, NavbarToggler, NavbarBrand, Nav, NavLink } from 'reactstrap'
44
import { NavLink as Link } from 'react-router-dom'
5-
import { AsyncCounter } from './CustomHome'
5+
import { AsyncZen } from './CustomHome'
66

77
export default class CustomNavbar extends Component {
88
static propTypes = {
@@ -25,7 +25,7 @@ export default class CustomNavbar extends Component {
2525
}
2626

2727
onMouseOver = () => {
28-
AsyncCounter.preload()
28+
AsyncZen.preload()
2929
}
3030

3131
render() {
@@ -35,11 +35,7 @@ export default class CustomNavbar extends Component {
3535
<NavbarBrand exact to="/" tag={Link}>Vortex React</NavbarBrand>
3636
<Collapse isOpen={this.state.isOpen} navbar>
3737
<Nav className="ml-auto" navbar>
38-
<NavLink to="/counter" tag={Link} onMouseOver={this.onMouseOver}>Counter</NavLink>
39-
<NavLink to="/zenPage" tag={Link}>Zen</NavLink>
40-
<NavLink to="/elapse" tag={Link}>Elapse</NavLink>
41-
<NavLink to="/route/8080" tag={Link}>Route</NavLink>
42-
<NavLink to="/pageNotFound" tag={Link}>404</NavLink>
38+
<NavLink to="/zenPage" onMouseOver={this.onMouseOver} tag={Link}>Zen</NavLink>
4339
<NavLink href="javascript:;" onClick={this.signOut}>Sign out</NavLink>
4440
<NavLink href="https://github.com/YutHelloWorld/vortex-react">Github</NavLink>
4541
</Nav>

src/routes/Counter/components/Counter.js

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/routes/Counter/containers/CounterContainer.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/routes/Counter/index.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/routes/Counter/modules/counter.js

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/routes/Elapse/components/Elapse.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/routes/Elapse/containers/ElapseContainer.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/routes/Elapse/index.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/routes/Elapse/modules/elapse.js

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)