Skip to content

2
2021-049
Commit 58d0e534 authored by Hasitha Samarasekara's avatar Hasitha Samarasekara
Browse files
Options

Home Page advertismenet added

parent 76c2c708
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 84 deletions
WebFrontEnd/smartcoach-frontend/src/Components/Home.js
View file @ 58d0e534
......@@ -15,6 +15,7 @@ import * as Icon from 'react-bootstrap-icons';
import axios from "axios";
import * as configs from "../Config/config";
import TutorCard from "./HomePage/TutorCard";
import RightSideAdd from "./HomePage/AdvertisementRightSide";
import swal from "sweetalert";
import Carousel from "react-bootstrap/Carousel";
......@@ -414,20 +415,7 @@ export default class Home extends Component {
let FinalStudentCountScore = (valueForStudentCount * Number(this.state.RVStudentCount)) / 100;
let FinalScore = finalReviewScore + FinalRatingScore + FinalStudentCountScore;
const temp = {
tutor_id: tutor.teacher,
tutor_name: tutor.tutor_name,
tutor_subjects: tutor.tutor_subjects,
tutor_class_type: tutor.tutor_class_type,
tutor_main_district: tutor.tutor_main_district,
tutor_main_city: tutor.tutor_main_city,
tutor_medium: tutor.tutor_medium,
tutor_qualification: tutor.tutor_qualification,
tutor_reviewValue: tutor.tutor_reviewValue,
tutor_avg_rating: tutor.tutor_avg_rating,
tutor_finalScore: FinalScore,
tutor_review_count: tutor.tutor_review_count
}
let oneday = 24 * 60 * 60 * 1000;
let NoOFDays = (todayDate - new Date(tutor.tutor_registered_date));
let NoOFDaysRegistered = Math.ceil(NoOFDays / oneday);
......@@ -437,8 +425,39 @@ export default class Home extends Component {
//
// }
if (NoOFDaysRegistered >= 365 && Number(tutor.tutor_review_count) > 10) {
const temp = {
tutor_id: tutor.teacher,
tutor_name: tutor.tutor_name,
tutor_subjects: tutor.tutor_subjects,
tutor_class_type: tutor.tutor_class_type,
tutor_main_district: tutor.tutor_main_district,
tutor_main_city: tutor.tutor_main_city,
tutor_medium: tutor.tutor_medium,
tutor_qualification: tutor.tutor_qualification,
tutor_reviewValue: tutor.tutor_reviewValue,
tutor_avg_rating: tutor.tutor_avg_rating,
tutor_finalScore: FinalScore,
tutor_review_count: tutor.tutor_review_count,
recommended_ : true
}
TutorRecommendedFinalList.push(temp);
} else {
const temp = {
tutor_id: tutor.teacher,
tutor_name: tutor.tutor_name,
tutor_subjects: tutor.tutor_subjects,
tutor_class_type: tutor.tutor_class_type,
tutor_main_district: tutor.tutor_main_district,
tutor_main_city: tutor.tutor_main_city,
tutor_medium: tutor.tutor_medium,
tutor_qualification: tutor.tutor_qualification,
tutor_reviewValue: tutor.tutor_reviewValue,
tutor_avg_rating: tutor.tutor_avg_rating,
tutor_finalScore: FinalScore,
tutor_review_count: tutor.tutor_review_count,
recommended_ : false
}
TutorOnlyFilterFinalList.push(temp);
}
......@@ -880,50 +899,63 @@ export default class Home extends Component {
}
</div>
<div className="row"
style={{background: '#F5F4ED', marginLeft: '50px', marginRight: '50px', marginTop: '10px'}}>
<h5 style={{margin: '10px'}}>{this.state.TutorFilteredList.length} Results</h5>
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.TutorFilteredRecommendedListFinal.length > 0 ?
<div className="row"
style={{
background: '#F5F4ED',
marginLeft: '50px',
marginRight: '50px',
marginTop: '10px'
}}>
<h4>Recommended List</h4>
</div>
:
<div>
</div>
}
<div className="">
{this.state.TutorFilteredRecommendedListFinal.length > 0 ? this.state.TutorFilteredRecommendedListFinal.map((card) => {
return (<TutorCard data={card}/>)
}) : <div></div>}
<div className="row">
<div className="col-8">
{this.state.TutorFilteredRecommendedListFinal.length > 0 ?
<div className="row"
style={{
background: '#1E4258',
marginLeft: '50px',
marginRight: '0px',
marginTop: '10px'
}}>
<h4 style={{color: "white", float: 'left',margin: '15px'}}>Recommended List</h4>
</div>
:
<div>
</div>
}
<div className="" style={{marginLeft:'50px',marginRight:'0px'}}>
{this.state.TutorFilteredRecommendedListFinal.length > 0 ? this.state.TutorFilteredRecommendedListFinal.map((card) => {
return (<TutorCard data={card}/>)
}) : <div></div>}
</div>
</div>
{this.state.TutorOnlyFilteredListFinal.length > 0 ?
<div className="row" style={{
background: '#F5F4ED',
marginLeft: '50px',
marginRight: '50px',
marginTop: '10px'
}}>
<h4>Filtered List</h4>
</div>
:
<div>
</div>
}
{this.state.TutorOnlyFilteredListFinal.length > 0 ?
<div className="row" style={{
background: '#1E4258',
marginLeft: '50px',
marginRight: '0px',
marginTop: '10px'
}}>
<h4 style={{color: "white", float: 'left',margin: '15px'}}>Filtered List</h4>
</div>
:
<div>
</div>
}
<div className="">
{this.state.TutorOnlyFilteredListFinal.length > 0 ? this.state.TutorOnlyFilteredListFinal.map((card) => {
return (<TutorCard data={card}/>)
}) : <div></div>}
<div className="" style={{marginLeft:'50px',marginRight:'0px'}}>
{this.state.TutorOnlyFilteredListFinal.length > 0 ? this.state.TutorOnlyFilteredListFinal.map((card) => {
return (<TutorCard data={card}/>)
}) : <div></div>}
</div>
</div>
<div className="col-3">
{this.state.TutorOnlyFilteredListFinal.length > 0 ?
<RightSideAdd></RightSideAdd>
:
<div>
</div>
}
</div>
</div>
<div className="app-main__outer">
<HomeFooter/>
......
WebFrontEnd/smartcoach-frontend/src/Components/HomePage/AdvertisementRightSide.js 0 → 100644
View file @ 58d0e534
import React, {Component} from "react";
import Carousel from "react-bootstrap/Carousel";
import AddR1 from "../../Images/ad_r1.jpg";
import AddR2 from "../../Images/ad_r2.jpg";
export default class AdvertisementRightSide extends Component{
constructor(props) {
super(props);
this.state = {
};
//this.FindTutor = this.FindTutor.bind(this);
}
render() {
return(
<div>
<Carousel style={{width:'100%'}} nextLabel={false} prevLabel={false} indicators={false} >
<Carousel.Item>
<img
className="toast-bottom-full-width"
src={AddR1}
alt="First slide"
/>
<Carousel.Caption>
</Carousel.Caption>
</Carousel.Item>
<Carousel.Item>
<img
className="d-block w-100"
src={AddR2}
alt="Second slide"
/>
<Carousel.Caption>
</Carousel.Caption>
</Carousel.Item>
{/*<Carousel.Item>*/}
{/* <img*/}
{/* className="d-block w-100"*/}
{/* src={AddR1}*/}
{/* alt="Third slide"*/}
{/* />*/}
{/* <Carousel.Caption>*/}
{/* </Carousel.Caption>*/}
{/*</Carousel.Item>*/}
</Carousel>
</div>
)
}
}
\ No newline at end of file
WebFrontEnd/smartcoach-frontend/src/Components/HomePage/TutorCard.js
View file @ 58d0e534
......@@ -15,8 +15,8 @@ export default class TutorCard extends Component{
render() {
return(
<div className="main-card mb-3 card">
<div className="row" style={{background:'#F5F4ED', marginLeft:'50px', marginRight:'50px', marginTop:'10px', marginBottom:'10px'}}>
<div className="col-9">
<div className="row" style={{background:'#F5F4ED', marginLeft:'10px', marginRight:'10px', marginTop:'10px', marginBottom:'10px'}}>
<div className="col">
<div className="row" style={{background:'#F8F8F8'}}>
<div className="col-8" style={{margin:'5px', border:'solid', padding:'10px', borderColor:'#216E9B'}}>
<div className="row">
......@@ -61,44 +61,53 @@ export default class TutorCard extends Component{
</div>
<div className="col" style={{margin:'5px', border:'solid', padding:'10px', borderColor:'#216E9B'}}>
<div className="row">
<div className="col-1">
<img src={Star} style={{width:'20px', height:'20px'}}/>
</div>
<div className="col" >
<h5 style={{float:"left"}}>{this.props.data.tutor_avg_rating.toFixed(1)}</h5>
</div>
</div>
<div className="row">
<div className="col-1">
<img src={ReviewImg} style={{width:'20px', height:'20px'}}/>
</div>
<div className="col">
<h5 style={{float:"left"}}>{this.props.data.tutor_review_count} reviews</h5>
</div>
</div>
<div className="row">
<div className="col-1">
<br/>
{/*<img src={Calender} style={{width:'20px', height:'20px'}}/>*/}
<div className="row">
<div className="col-1">
<img src={Star} style={{width:'20px', height:'20px'}}/>
</div>
<div className="col" >
<h5 style={{float:"left"}}>{this.props.data.tutor_avg_rating.toFixed(1)}</h5>
</div>
</div>
<div className="row">
<div className="col-1">
<img src={ReviewImg} style={{width:'20px', height:'20px'}}/>
</div>
<div className="col">
<h5 style={{float:"left"}}>{this.props.data.tutor_review_count} reviews</h5>
</div>
</div>
<div className="row">
<div className="col-1">
<br/>
{/*<img src={Calender} style={{width:'20px', height:'20px'}}/>*/}
</div>
<div className="col">
{/*<h5 style={{float:"left"}}>6y experience</h5>*/}
</div>
</div>
<div className="row">
<Link to={`/Home/ViewProfile/${this.props.data.tutor_id}`}> <button className="form-control"
style={{background:"#216E9B", color:"white", marginLeft:'15px', marginRight:'15px'}}><b>View Profile</b></button></Link>
</div>
</div>
<div className="col">
{/*<h5 style={{float:"left"}}>6y experience</h5>*/}
<div className="col-">
{this.props.data.recommended_ ?
<img src={RecommendIcon} style={{width:'80px', height:'70px', float:'left', margin:'10px'}}/>
:
<div>
</div>
}
</div>
</div>
<div className="row">
<Link to={`/Home/ViewProfile/${this.props.data.tutor_id}`}> <button className="form-control"
style={{background:"#216E9B", color:"white", marginLeft:'15px', marginRight:'15px'}}><b>View Profile</b></button></Link>
</div>
</div>
</div>
</div>
<div className="col" style={{background:'#F8F8F8'}}>
<div>
<br/>
</div>
<img src={RecommendIcon} style={{width:'100px', height:'90px', float:'left', margin:'10px'}}/>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment