Skip to content

Commit 2d00c62

Browse files
committed
fixed navbar warning
1 parent 56ae478 commit 2d00c62

File tree

4 files changed

+24
-62
lines changed

4 files changed

+24
-62
lines changed

client/src/components/add-student/AddStudent.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ export default class AddStudent extends Component {
179179
value={this.state.date}
180180
/>
181181
</Modal>
182+
182183
</div>
183184
)}
184185
</AuthContext.Consumer>

client/src/components/fees/Fee.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const Fee = (props) => {
2525

2626
useEffect(()=> getStudents(),[])
2727

28-
const getStudents= ()=>{
28+
const getStudents = ()=>{
2929
setLoading(true)
3030
fetch('/api/students',{
3131
method: 'GET',
@@ -133,9 +133,8 @@ const Fee = (props) => {
133133

134134
const {fees} = selectedStudent;
135135

136-
return (loading) ?<div className='container spinner-container'>
137-
<MyLoader loading={loading} />
138-
</div>:
136+
return (loading) ?
137+
<MyLoader loading={loading} />:
139138
<div className="container">
140139
<h1 className='main-heading'>Fees</h1>
141140
<div className="row">

client/src/components/navigation/AppNav.js

Lines changed: 19 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -31,70 +31,32 @@ export default class AppNavbar extends Component {
3131
<Navbar color='dark' dark expand='md'>
3232
{context.state.isAuth && <Redirect from='/login' to='/' />}
3333
{!context.state.isAuth && <Redirect from='/' to='/login' />}
34-
<NavbarBrand>
35-
<Link to='/'>
34+
<NavbarBrand tag={Link} to='/'>
3635
<span className='navbar-brand'>NitMoi</span>
37-
</Link>
3836
</NavbarBrand>
3937
<NavbarToggler onClick={this.toggle} />
4038
<Collapse isOpen={this.state.isOpen} navbar>
4139
<Nav className="mr-auto" navbar>
42-
<NavItem>
43-
<React.Fragment>
44-
<NavLink>
45-
<Link to='/list' className='nav-link'>
46-
Students
47-
</Link>
48-
</NavLink>
49-
</React.Fragment>
50-
</NavItem>
51-
<NavItem>
52-
<React.Fragment>
53-
<NavLink>
54-
<Link to='/add' className='nav-link'>
55-
Add
56-
</Link>
57-
</NavLink>
58-
</React.Fragment>
59-
</NavItem>
60-
<NavItem>
61-
<React.Fragment>
62-
<NavLink>
63-
<Link to='/attendance' className='nav-link'>
64-
Attendance
65-
</Link>
66-
</NavLink>
67-
</React.Fragment>
68-
</NavItem>
69-
<NavItem>
70-
<React.Fragment>
71-
<NavLink>
72-
<Link to='/fees' className='nav-link'>
73-
Fee
74-
</Link>
75-
</NavLink>
76-
</React.Fragment>
77-
</NavItem>
40+
<NavLink tag={Link} to='/list' className='nav-link'>
41+
Students
42+
</NavLink>
43+
<NavLink tag={Link} to='/add' className='nav-link'>
44+
Add
45+
</NavLink>
46+
<NavLink tag={Link} to='/attendance' className='nav-link'>
47+
Attendance
48+
</NavLink>
49+
<NavLink tag={Link} to='/fees' className='nav-link'>
50+
Fee
51+
</NavLink>
7852
</Nav>
7953
<Nav className="ml-auto" navbar>
80-
<NavItem>
81-
<React.Fragment>
82-
<NavLink>
83-
{!context.state.isAuth&&<Link to='/login' className='nav-link'>
84-
Login
85-
</Link>}
86-
</NavLink>
87-
</React.Fragment>
88-
</NavItem>
89-
<NavItem>
90-
<React.Fragment>
91-
<NavLink>
92-
{context.state.isAuth && <Link to='/logout' className='nav-link' onClick={context.handleLogout}>
93-
Logout
94-
</Link>}
95-
</NavLink>
96-
</React.Fragment>
97-
</NavItem>
54+
{!context.state.isAuth && <NavLink tag={Link} to='/login' className='nav-link'>
55+
Login
56+
</NavLink>}
57+
{context.state.isAuth && <NavLink tag={Link} to='/logout' className='nav-link'>
58+
Logout
59+
</NavLink>}
9860
</Nav>
9961
</Collapse>
10062
</Navbar>

client/src/components/student-list/Student.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
}
4040

4141
@media screen and (min-width: 1px) and (max-width: 767px){
42-
.stud-card {
42+
.stud-card{
4343
min-width: 350px;
4444
}
4545
}

0 commit comments

Comments
 (0)