Skip to content

Commit e256898

Browse files
webmasterdevlinwebmasterdevlin
committed
updated
1 parent db9f002 commit e256898

File tree

6 files changed

+40
-50
lines changed

6 files changed

+40
-50
lines changed

‎chapter-13/src/app/layouts/dashboard-layout/dashboard-sidebar-navigation.tsx

+11-20
Original file line numberDiff line numberDiff line change
@@ -90,29 +90,21 @@ const DashboardSidebarNavigation = () => {
9090
{mobileDevice ? (
9191
<div className={classes.drawerContainer}>
9292
<List>
93-
{mobileDevice ? (
94-
<Divider />
95-
) : (
96-
<ListSubheader>Management</ListSubheader>
97-
)}
9893
<Link className={classes.link} to={`${url}`}>
9994
<ListItem button>
10095
<ListItemIcon>
10196
<PieChartIcon />
10297
</ListItemIcon>
10398
</ListItem>
10499
</Link>
105-
{mobileDevice ? (
106-
<Divider />
107-
) : (
108-
<ListSubheader>Management</ListSubheader>
109-
)}
100+
<Divider />
110101
<ListItem button onClick={handleClick}>
111102
<ListItemIcon>
112103
<ShoppingCartIcon />
113104
</ListItemIcon>
114105
{open ? <ChevronUpIcon /> : <ChevronDownIcon />}
115106
</ListItem>
107+
<Divider />
116108
<Collapse in={open} timeout="auto" unmountOnExit>
117109
<List component="div" disablePadding>
118110
<Link className={classes.link} to={`${url}/list-products`}>
@@ -131,37 +123,31 @@ const DashboardSidebarNavigation = () => {
131123
</Link>
132124
</List>
133125
</Collapse>
134-
{mobileDevice ? (
135-
<Divider />
136-
) : (
137-
<ListSubheader>Applications</ListSubheader>
138-
)}
126+
<Divider />
139127
<Link className={classes.link} to={`${url}/calendar`}>
140128
<ListItem button>
141129
<ListItemIcon>
142130
<CalendarIcon />
143131
</ListItemIcon>
144132
</ListItem>
145133
</Link>
146-
{mobileDevice ? (
147-
<Divider />
148-
) : (
149-
<ListSubheader>Pages</ListSubheader>
150-
)}
134+
<Divider />
151135
<Link className={classes.link} to={`${url}/account`}>
152136
<ListItem button>
153137
<ListItemIcon>
154138
<UserIcon />
155139
</ListItemIcon>
156140
</ListItem>
157141
</Link>
142+
<Divider />
158143
<Link className={classes.link} to={`/pricing`}>
159144
<ListItem button>
160145
<ListItemIcon>
161146
<DollarSignIcon />
162147
</ListItemIcon>
163148
</ListItem>
164149
</Link>
150+
<Divider />
165151
<a className={classes.link} href={'/'}>
166152
<ListItem button onClick={handleLogout}>
167153
<ListItemIcon>
@@ -170,6 +156,7 @@ const DashboardSidebarNavigation = () => {
170156
</ListItem>
171157
</a>
172158
</List>
159+
<Divider />
173160
</div>
174161
) : (
175162
<div className={classes.drawerContainer}>
@@ -183,6 +170,7 @@ const DashboardSidebarNavigation = () => {
183170
<ListItemText primary={'Dashboard'} />
184171
</ListItem>
185172
</Link>
173+
186174
<ListSubheader>Management</ListSubheader>
187175
<ListItem button onClick={handleClick}>
188176
<ListItemIcon>
@@ -211,6 +199,7 @@ const DashboardSidebarNavigation = () => {
211199
</Link>
212200
</List>
213201
</Collapse>
202+
214203
<ListSubheader>Applications</ListSubheader>
215204
<Link className={classes.link} to={`${url}/calendar`}>
216205
<ListItem button>
@@ -220,6 +209,7 @@ const DashboardSidebarNavigation = () => {
220209
<ListItemText primary={'Calendar'} />
221210
</ListItem>
222211
</Link>
212+
223213
<ListSubheader>Pages</ListSubheader>
224214
<Link className={classes.link} to={`${url}/account`}>
225215
<ListItem button>
@@ -237,6 +227,7 @@ const DashboardSidebarNavigation = () => {
237227
<ListItemText primary={'Pricing'} />
238228
</ListItem>
239229
</Link>
230+
240231
<a className={classes.link} href={'/'}>
241232
<ListItem button onClick={handleLogout}>
242233
<ListItemIcon>

‎chapter-13/src/app/layouts/main-layout/navigation-bar.tsx

+8-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ import React from 'react';
22
import { Link } from 'react-router-dom';
33
import { useSelector } from 'react-redux';
44
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
5-
import AppBar from '@material-ui/core/AppBar';
6-
import Toolbar from '@material-ui/core/Toolbar';
7-
import Button from '@material-ui/core/Button';
8-
import { colors, useMediaQuery } from '@material-ui/core';
95
import { RootState } from 'store/reducers';
106
import HeaderProfile from 'app/components/header-profile';
117

8+
import {
9+
AppBar,
10+
Toolbar,
11+
Button,
12+
useMediaQuery,
13+
colors,
14+
} from '@material-ui/core';
15+
1216
export default function NavigationBar() {
1317
const classes = useStyles();
1418
const { claims } = useSelector((state: RootState) => state.auth);

‎chapter-13/src/app/views/pages/HomePage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState, useEffect } from 'react';
1+
import React from 'react';
22
import { Box, Container, Typography, useMediaQuery } from '@material-ui/core';
33
import Page from 'app/components/page';
44

‎chapter-15/src/app/layouts/dashboard-layout/dashboard-sidebar-navigation.tsx

+11-20
Original file line numberDiff line numberDiff line change
@@ -90,29 +90,21 @@ const DashboardSidebarNavigation = () => {
9090
{mobileDevice ? (
9191
<div className={classes.drawerContainer}>
9292
<List>
93-
{mobileDevice ? (
94-
<Divider />
95-
) : (
96-
<ListSubheader>Management</ListSubheader>
97-
)}
9893
<Link className={classes.link} to={`${url}`}>
9994
<ListItem button>
10095
<ListItemIcon>
10196
<PieChartIcon />
10297
</ListItemIcon>
10398
</ListItem>
10499
</Link>
105-
{mobileDevice ? (
106-
<Divider />
107-
) : (
108-
<ListSubheader>Management</ListSubheader>
109-
)}
100+
<Divider />
110101
<ListItem button onClick={handleClick}>
111102
<ListItemIcon>
112103
<ShoppingCartIcon />
113104
</ListItemIcon>
114105
{open ? <ChevronUpIcon /> : <ChevronDownIcon />}
115106
</ListItem>
107+
<Divider />
116108
<Collapse in={open} timeout="auto" unmountOnExit>
117109
<List component="div" disablePadding>
118110
<Link className={classes.link} to={`${url}/list-products`}>
@@ -131,37 +123,31 @@ const DashboardSidebarNavigation = () => {
131123
</Link>
132124
</List>
133125
</Collapse>
134-
{mobileDevice ? (
135-
<Divider />
136-
) : (
137-
<ListSubheader>Applications</ListSubheader>
138-
)}
126+
<Divider />
139127
<Link className={classes.link} to={`${url}/calendar`}>
140128
<ListItem button>
141129
<ListItemIcon>
142130
<CalendarIcon />
143131
</ListItemIcon>
144132
</ListItem>
145133
</Link>
146-
{mobileDevice ? (
147-
<Divider />
148-
) : (
149-
<ListSubheader>Pages</ListSubheader>
150-
)}
134+
<Divider />
151135
<Link className={classes.link} to={`${url}/account`}>
152136
<ListItem button>
153137
<ListItemIcon>
154138
<UserIcon />
155139
</ListItemIcon>
156140
</ListItem>
157141
</Link>
142+
<Divider />
158143
<Link className={classes.link} to={`/pricing`}>
159144
<ListItem button>
160145
<ListItemIcon>
161146
<DollarSignIcon />
162147
</ListItemIcon>
163148
</ListItem>
164149
</Link>
150+
<Divider />
165151
<a className={classes.link} href={'/'}>
166152
<ListItem button onClick={handleLogout}>
167153
<ListItemIcon>
@@ -170,6 +156,7 @@ const DashboardSidebarNavigation = () => {
170156
</ListItem>
171157
</a>
172158
</List>
159+
<Divider />
173160
</div>
174161
) : (
175162
<div className={classes.drawerContainer}>
@@ -183,6 +170,7 @@ const DashboardSidebarNavigation = () => {
183170
<ListItemText primary={'Dashboard'} />
184171
</ListItem>
185172
</Link>
173+
186174
<ListSubheader>Management</ListSubheader>
187175
<ListItem button onClick={handleClick}>
188176
<ListItemIcon>
@@ -211,6 +199,7 @@ const DashboardSidebarNavigation = () => {
211199
</Link>
212200
</List>
213201
</Collapse>
202+
214203
<ListSubheader>Applications</ListSubheader>
215204
<Link className={classes.link} to={`${url}/calendar`}>
216205
<ListItem button>
@@ -220,6 +209,7 @@ const DashboardSidebarNavigation = () => {
220209
<ListItemText primary={'Calendar'} />
221210
</ListItem>
222211
</Link>
212+
223213
<ListSubheader>Pages</ListSubheader>
224214
<Link className={classes.link} to={`${url}/account`}>
225215
<ListItem button>
@@ -237,6 +227,7 @@ const DashboardSidebarNavigation = () => {
237227
<ListItemText primary={'Pricing'} />
238228
</ListItem>
239229
</Link>
230+
240231
<a className={classes.link} href={'/'}>
241232
<ListItem button onClick={handleLogout}>
242233
<ListItemIcon>

‎chapter-15/src/app/layouts/main-layout/navigation-bar.tsx

+8-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ import React from 'react';
22
import { Link } from 'react-router-dom';
33
import { useSelector } from 'react-redux';
44
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
5-
import AppBar from '@material-ui/core/AppBar';
6-
import Toolbar from '@material-ui/core/Toolbar';
7-
import Button from '@material-ui/core/Button';
8-
import { colors, useMediaQuery } from '@material-ui/core';
95
import { RootState } from 'store/reducers';
106
import HeaderProfile from 'app/components/header-profile';
117

8+
import {
9+
AppBar,
10+
Toolbar,
11+
Button,
12+
useMediaQuery,
13+
colors,
14+
} from '@material-ui/core';
15+
1216
export default function NavigationBar() {
1317
const classes = useStyles();
1418
const { claims } = useSelector((state: RootState) => state.auth);

‎chapter-15/src/app/views/pages/HomePage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState, useEffect } from 'react';
1+
import React from 'react';
22
import { Box, Container, Typography, useMediaQuery } from '@material-ui/core';
33
import Page from 'app/components/page';
44

0 commit comments

Comments
 (0)