Merge branch 'IT18063288' into 'master'

It18063288

See merge request !24

WebFrontEnd/smartcoach-frontend/src/Components/Home.js

@@ -18,6 +18,7 @@ import TutorCard from "./HomePage/TutorCard";
 import RightSideAdd from "./HomePage/AdvertisementRightSide";
 import swal from "sweetalert";
 import Carousel from "react-bootstrap/Carousel";
+import {Spinner} from "react-bootstrap";
 
 export default class Home extends Component {
 
@@ -66,7 +67,7 @@ export default class Home extends Component {
                 "https://picsum.photos/200/300/?image=526"],
             selectedImage: "https://picsum.photos/200/300/?image=523",
             in : 0,
-
+            loading : false
         };
 
         this.FindCities = this.FindCities.bind(this);
@@ -322,6 +323,10 @@ export default class Home extends Component {
 
     FindTutor() {
 
+        this.setState({
+            loading: true
+        })
+
         const Filters = {
             selectedStream: this.state.selectedStream,
             selectedSubject: this.state.selectedSubject,
@@ -408,7 +413,7 @@ export default class Home extends Component {
             } else if (Number(tutor.tutor_student_count) === 0) {
                 valueForStudentCount = 0
             } else {
-                valueForStudentCount = 10
+                valueForStudentCount = 0
             }
 
 
@@ -465,6 +470,7 @@ export default class Home extends Component {
         TutorRecommendedFinalList.sort((a, b) => b.tutor_finalScore - a.tutor_finalScore);
         TutorOnlyFilterFinalList.sort((a, b) => b.tutor_finalScore - a.tutor_finalScore);
         this.setState({
+            loading : false,
             TutorFilteredRecommendedListFinal: TutorRecommendedFinalList,
             TutorOnlyFilteredListFinal: TutorOnlyFilterFinalList
         }, () => {
@@ -902,6 +908,15 @@ export default class Home extends Component {
                          style={{background: '#1E4258', marginLeft: '50px', marginRight: '50px', marginTop: '10px'}}>
                         <h5 style={{color: "white", float: 'left',margin: '15px'}}>{this.state.TutorFilteredList.length} Results</h5>
                     </div>
+                    {this.state.loading ?
+                    <div className="row" style={{justifyContent:'center', padding:'20px'}}>
+                        <Spinner animation="border" role="status" size={20}>
+
+                        </Spinner>
+                    </div>
+                        :
+                        <div></div>
+                    }
                     <div className="row">
                         <div className="col-8">
                             {this.state.TutorFilteredRecommendedListFinal.length > 0 ?