Skip to content

Commit 56ae478

Browse files
archies-coderarchies-coder
committed
minor changes, bug fixes
1 parent 40e19fc commit 56ae478

File tree

7 files changed

+61
-42
lines changed

7 files changed

+61
-42
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@ export default class AddStudent extends Component {
8585
this.setState({loading: false})
8686
this.props.history.push('/login')
8787
}
88+
this.setState({loading: false})
8889
throw new Error(res.status)
8990
}
91+
this.setState({loading:false})
9092
return res.json();
9193
})
9294
.then(resData => {
@@ -104,7 +106,7 @@ export default class AddStudent extends Component {
104106
return (this.state.loading) ? <MyLoader loading={this.state.loading} /> :
105107
<AuthContext.Consumer>
106108
{context =>(
107-
<div className="d-lg-flex border justify-content-center p-3 hello">
109+
<div className="d-lg-flex border justify-content-center p-3">
108110
<form onSubmit={this.handleAddForm}>
109111
<div className="row py-3">
110112
<div className="col">
@@ -146,11 +148,11 @@ export default class AddStudent extends Component {
146148
</div>
147149
<div className="form-group">
148150
<label htmlFor="InputPhysics">Physics Marks</label>
149-
<input type="text" className="form-control" ref={this.physicsEl} id="InputPhysics" placeholder="Physics" required/>
151+
<input type="number" className="form-control" ref={this.physicsEl} id="InputPhysics" placeholder="Physics" required/>
150152
<label htmlFor="InputEnglish">English Marks</label>
151-
<input type="text" className="form-control" ref={this.englishEl} id="InputEnglish" placeholder="English" required/>
153+
<input type="number" className="form-control" ref={this.englishEl} id="InputEnglish" placeholder="English" required/>
152154
<label htmlFor="InputMaths">Maths Marks</label>
153-
<input type="text" className="form-control" ref={this.mathsEl} id="InputMaths" placeholder="Maths" required/>
155+
<input type="number" className="form-control" ref={this.mathsEl} id="InputMaths" placeholder="Maths" required/>
154156
</div>
155157
<div className="form-group">
156158
<label htmlFor="InputSex">Sex</label>
@@ -170,6 +172,7 @@ export default class AddStudent extends Component {
170172
onRequestClose={this.closeModal}
171173
style={customStyles}
172174
contentLabel="Date Picker Modal"
175+
ariaHideApp={false}
173176
>
174177
<MyCalendar
175178
onChange={this.onChange}

‎client/src/components/attendance/Attendance.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const customStylesContainer = {
1111
'textAlign' : 'left',
1212
'height' : 'auto',
1313
'width' : '50%',
14+
'minWidth' : '350px',
1415
'top' : '50%',
1516
'margin' : '100px auto 0 auto',
1617
'padding' : '20px',
@@ -19,6 +20,7 @@ const customStylesContainer = {
1920

2021
const customStyles = {
2122
content : {
23+
width : '500px',
2224
top : '50%',
2325
left : '50%',
2426
right : 'auto',
@@ -268,6 +270,7 @@ export default class AddAttendance extends Component {
268270
onRequestClose={this.closeModal}
269271
style={customStyles}
270272
contentLabel="Date Picker Modal"
273+
ariaHideApp={false}
271274
>
272275
<MyCalendar
273276
onChange={this.onChange}

‎client/src/components/fees/Fee.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ const Fee = (props) => {
139139
<div className="container">
140140
<h1 className='main-heading'>Fees</h1>
141141
<div className="row">
142-
<div className="col-4">
142+
<div className="col-md-4">
143143
<table className="table table-dark">
144144
<thead onClick={e=> setSelectedStudent({})}>
145145
<tr>
@@ -160,19 +160,19 @@ const Fee = (props) => {
160160
</table>
161161
</div>
162162
{!isEmpty(selectedStudent) && <div className="col bg-dark text-white pt-3 fees">
163-
<div className="col total">
163+
<div className="col-md total">
164164
<h5>Total Fees</h5>
165165
<hr className='border'/>
166166
{!isEmpty(selectedStudent) && <h6>{fees.total}</h6>}
167167
</div>
168168
<div className="col rem">
169169
<h5>Remaining Fees</h5>
170170
<hr className='border'/>
171-
{!isEmpty(selectedStudent) && <h5>{remainingFees()}</h5>}
171+
{!isEmpty(selectedStudent) && <span>{remainingFees()}</span>}
172172
</div>
173173
</div>}
174174
<div className="h-100 border"></div>
175-
{!isEmpty(selectedStudent) && <div className="col bg-dark text-white pt-3 fees">
175+
{!isEmpty(selectedStudent) && <div className="col-md bg-dark text-white pt-3 fees">
176176
<div className="col paid">
177177
<h5>Installments Paid</h5>
178178
<hr className='border'/>
@@ -202,6 +202,7 @@ const Fee = (props) => {
202202
onRequestClose={closeModal}
203203
style={customStyles}
204204
contentLabel="Date Picker Modal"
205+
ariaHideApp={false}
205206
>
206207
<MyCalendar
207208
onChange={onChange}

‎client/src/components/navigation/AppNav.js‎

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ import {
1515
export default class AppNavbar extends Component {
1616
constructor(props) {
1717
super(props);
18-
this.toggle = this.toggle.bind(this);
1918
this.state = {
2019
isOpen: false
2120
};
2221
}
23-
toggle() {
22+
toggle = ()=> {
2423
this.setState({
2524
isOpen: !this.state.isOpen
2625
});
@@ -41,49 +40,61 @@ export default class AppNavbar extends Component {
4140
<Collapse isOpen={this.state.isOpen} navbar>
4241
<Nav className="mr-auto" navbar>
4342
<NavItem>
44-
<NavLink onClick={this.toggle}>
45-
<Link to='/list' className='nav-link'>
46-
Students
47-
</Link>
48-
</NavLink>
43+
<React.Fragment>
44+
<NavLink>
45+
<Link to='/list' className='nav-link'>
46+
Students
47+
</Link>
48+
</NavLink>
49+
</React.Fragment>
4950
</NavItem>
5051
<NavItem>
51-
<NavLink onClick={this.toggle}>
52-
<Link to='/add' className='nav-link'>
53-
Add
54-
</Link>
55-
</NavLink>
52+
<React.Fragment>
53+
<NavLink>
54+
<Link to='/add' className='nav-link'>
55+
Add
56+
</Link>
57+
</NavLink>
58+
</React.Fragment>
5659
</NavItem>
5760
<NavItem>
58-
<NavLink onClick={this.toggle}>
59-
<Link to='/attendance' className='nav-link'>
60-
Attendance
61-
</Link>
62-
</NavLink>
61+
<React.Fragment>
62+
<NavLink>
63+
<Link to='/attendance' className='nav-link'>
64+
Attendance
65+
</Link>
66+
</NavLink>
67+
</React.Fragment>
6368
</NavItem>
6469
<NavItem>
65-
<NavLink onClick={this.toggle}>
66-
<Link to='/fees' className='nav-link'>
67-
Fee
68-
</Link>
69-
</NavLink>
70+
<React.Fragment>
71+
<NavLink>
72+
<Link to='/fees' className='nav-link'>
73+
Fee
74+
</Link>
75+
</NavLink>
76+
</React.Fragment>
7077
</NavItem>
7178
</Nav>
7279
<Nav className="ml-auto" navbar>
7380
<NavItem>
74-
<NavLink onClick={this.toggle}>
81+
<React.Fragment>
82+
<NavLink>
7583
{!context.state.isAuth&&<Link to='/login' className='nav-link'>
7684
Login
7785
</Link>}
7886
</NavLink>
87+
</React.Fragment>
7988
</NavItem>
80-
<NavItem>
81-
<NavLink onClick={this.toggle}>
82-
{context.state.isAuth&&<Link to='/logout' className='nav-link' onClick={context.handleLogout}>
83-
Logout
84-
</Link>}
85-
</NavLink>
86-
</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>
8798
</Nav>
8899
</Collapse>
89100
</Navbar>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
width: 100%;
33
background-color: #ababe6 !important;
44
font: 16px/100% Ebrima !important;
5-
min-width: 230px;
5+
min-width: 225px;
66
display: inline-block;
77
margin: 6px;
88
text-align: center;

‎client/src/components/student-list/Student.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ export default class Student extends Component {
7373
onRequestClose={this.closeModal}
7474
style={customStyles}
7575
contentLabel="Details Modal"
76+
ariaHideApp={false}
7677
>
7778
<div className="container">
7879
<header>
@@ -101,6 +102,7 @@ export default class Student extends Component {
101102
onRequestClose={this.closeModal}
102103
style={customStylesDelete}
103104
contentLabel="Edit Modal"
105+
ariaHideApp={false}
104106
>
105107
<div className="panel panel-danger">
106108
<div className="panel-heading"><b>Alert!</b><span className="float-right" style={{cursor:'pointer'}} onClick={this.closeModal}>X</span></div>

‎client/src/components/student-list/StudentList.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,14 @@ export default class StudentList extends Component {
8484
return (this.state.loading) ?
8585
<MyLoader loading={this.state.loading} />
8686
:
87-
<div className="container">
87+
<div className="container d-lg-flex">
8888
<div className='row w-100 justify-content-left justify-content-sm-center'>
8989
{this.state.students.length === 0 ? <div>No Students To Display</div>
9090
:this.state.students.sort((a,b)=>{
9191
return a.standard - b.standard;
9292
}).map(stud => {
93-
return <div className='col col-md-auto col-sm-auto'>
93+
return <div key={stud._id} className='col col-md-auto col-sm-auto'>
9494
<Student className=''
95-
key={stud._id}
9695
id={stud._id}
9796
fName={stud.firstName}
9897
lName={stud.lastName}

0 commit comments

Comments
 (0)