Skip to content

2
2021-049
Commit 39d604a3 authored by Hansaka97's avatar Hansaka97
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents a97b097b 09e07a18
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 35 deletions
BackEnd/WebBackEnd/routes/userAccount.route.js
View file @ 39d604a3
...@@ -58,13 +58,14 @@ router.route('/getCredentials').post((req, res) => { ...@@ -58,13 +58,14 @@ router.route('/getCredentials').post((req, res) => {
res.json(payload) res.json(payload)
}) })
} }
else if(User.user_type === "Tutor"){ else if(User[0].user_type === "Tutor"){
console.log("inside Tutor")
TutorAccount.findById(User[0].user_id).then(result=>{ TutorAccount.findById(User[0].user_id).then(result=>{
payload.user_name = result.tutor_name payload.user_name = result.tutor_name
res.json(payload) res.json(payload)
}) })
} }
else if(User.user_type === "Institute"){ else if(User[0].user_type === "Institute"){
InstituteAccount.findById(User[0].user_id).then(result=>{ InstituteAccount.findById(User[0].user_id).then(result=>{
payload.user_name = result.institute_name payload.user_name = result.institute_name
res.json(payload) res.json(payload)
......
WebFrontEnd/smartcoach-frontend/src/Components/Admin/Dashboard.js
View file @ 39d604a3
...@@ -7,8 +7,45 @@ import ViewFinance from './view_financial_details'; ...@@ -7,8 +7,45 @@ import ViewFinance from './view_financial_details';
import EditFinance from './edit_financial_details'; import EditFinance from './edit_financial_details';
import AddClass from './add_class_details'; import AddClass from './add_class_details';
import studentRequest from './StudentRequestForClass'; import studentRequest from './StudentRequestForClass';
import TestTeacher from "../../Images/defaultimageicon.jpg";
export default class Dashboard extends Component { export default class Dashboard extends Component {
constructor(props) {
super(props);
this.state = {
user_email : '',
user_id : '',
user_name :'',
user_type :'',
isLogged : false
}
}
componentDidMount() {
const user_email = localStorage.getItem("email");
const user_id = localStorage.getItem("userID");
const user_name = localStorage.getItem("userName");
const user_type = localStorage.getItem("userType");
if(user_id !== " "){
this.setState({
isLogged : true
})
}
this.setState({
user_email: user_email,
user_id : user_id,
user_name : user_name,
user_type : user_type
})
}
render() { render() {
return ( return (
...@@ -72,19 +109,20 @@ export default class Dashboard extends Component { ...@@ -72,19 +109,20 @@ export default class Dashboard extends Component {
<div className="widget-content-left"> <div className="widget-content-left">
<div className="btn-group"> <div className="btn-group">
<div className="dropdown1"> <div className="dropdown1">
<img width="42" className="rounded-circle" src="DashboardAssets/images/user.jpg" alt=""/> <img src={TestTeacher} className="rounded-circle" style={{width:'50px', height:'50px', float:'left', margin:'0px'}}/>
{/*<img width="42" className="rounded-circle" src="DashboardAssets/images/user.jpg" alt=""/>*/}
<i className="fa fa-angle-down ml-2 opacity-8"/> <i className="fa fa-angle-down ml-2 opacity-8"/>
<div className="dropdown-content1 dropdown-menu-right"> <div className="dropdown-content1 dropdown-menu-right">
<button type="button" className="dropdown-item">User Account</button> <button type="button" className="dropdown-item">User Account</button>
<button type="button" className="dropdown-item" style={{color:"red"}}>Sign Out</button> <button type="button" className="dropdown-item" style={{color:"red"}} onClick={()=>{window.location.replace("/UserLogin");}}>Sign Out</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div className="widget-content-left ml-3 header-user-info"> <div className="widget-content-left ml-3 header-user-info">
<div className="widget-heading"> <div className="widget-heading">
Bandara Dissanayake {this.state.user_name}
</div> </div>
<div className="widget-subheading"> <div className="widget-subheading">
Tutor Tutor
......
WebFrontEnd/smartcoach-frontend/src/Components/Admin/StudentRequestForClass.js
View file @ 39d604a3
...@@ -33,6 +33,11 @@ export default class StudentRequestForClass extends Component{ ...@@ -33,6 +33,11 @@ export default class StudentRequestForClass extends Component{
labelClassID:'', labelClassID:'',
typedNIC:'', typedNIC:'',
ClassStudentList:[], ClassStudentList:[],
user_email : '',
user_id : '',
user_name :'',
user_type :'',
isLogged : false
} }
this.onChangeClassMethod = this.onChangeClassMethod.bind(this); this.onChangeClassMethod = this.onChangeClassMethod.bind(this);
...@@ -45,38 +50,59 @@ export default class StudentRequestForClass extends Component{ ...@@ -45,38 +50,59 @@ export default class StudentRequestForClass extends Component{
} }
componentDidMount() { componentDidMount() {
axios.get(configs.BASE_URL + '/tutorSingUp/'+this.state.tutorID ) const user_email = localStorage.getItem("email");
.then(response =>{ const user_id = localStorage.getItem("userID");
console.log(response.data); const user_name = localStorage.getItem("userName");
//console.log(response.data); const user_type = localStorage.getItem("userType");
if(user_id !== " "){
this.setState({
isLogged : true
})
}
this.setState({
user_email: user_email,
user_id : user_id,
tutorID: user_id,
user_name : user_name,
user_type : user_type
},()=>{
axios.get(configs.BASE_URL + '/tutorSingUp/'+this.state.tutorID )
.then(response =>{
console.log(response.data);
//console.log(response.data);
this.setState({
instituteList : response.data.tutor_instituteIDList,
ClassMethods : response.data.tutor_class_type,
subjectList : response.data.tutor_subjects,
}, ()=>{ this.setState({
axios.get(configs.BASE_URL + '/createClass/tutorClass/'+this.state.tutorID ) instituteList : response.data.tutor_instituteIDList,
.then(response =>{ ClassMethods : response.data.tutor_class_type,
console.log(response.data); subjectList : response.data.tutor_subjects,
}, ()=>{
axios.get(configs.BASE_URL + '/createClass/tutorClass/'+this.state.tutorID )
.then(response =>{
console.log(response.data);
this.setState({
TutorClassList : response.data
}, ()=>{
})
this.setState({
TutorClassList : response.data
}, ()=>{
}) })
})
})
}) })
})
})
} }
GetStudentList(){ GetStudentList(){
......
WebFrontEnd/smartcoach-frontend/src/Components/Admin/add_class_details.js
View file @ 39d604a3
...@@ -10,7 +10,7 @@ export default class AddClassDetails extends Component { ...@@ -10,7 +10,7 @@ export default class AddClassDetails extends Component {
super(props); super(props);
this.state = { this.state = {
tutorID: '6127b1d7ed4ff23bb0344538', tutorID: '',
instituteList: [], instituteList: [],
ClassMethods: [], ClassMethods: [],
subjectList: [], subjectList: [],
...@@ -35,6 +35,11 @@ export default class AddClassDetails extends Component { ...@@ -35,6 +35,11 @@ export default class AddClassDetails extends Component {
selectedDay:'', selectedDay:'',
HoursTime :'', HoursTime :'',
AdmissionFee : '', AdmissionFee : '',
user_email : '',
user_id : '',
user_name :'',
user_type :'',
isLogged : false
} }
this.onChangeClassMethod = this.onChangeClassMethod.bind(this); this.onChangeClassMethod = this.onChangeClassMethod.bind(this);
...@@ -57,24 +62,45 @@ export default class AddClassDetails extends Component { ...@@ -57,24 +62,45 @@ export default class AddClassDetails extends Component {
componentDidMount() { componentDidMount() {
axios.get(configs.BASE_URL + '/tutorSingUp/' + this.state.tutorID) const user_email = localStorage.getItem("email");
.then(response => { const user_id = localStorage.getItem("userID");
console.log(response.data); const user_name = localStorage.getItem("userName");
//console.log(response.data); const user_type = localStorage.getItem("userType");
if(user_id !== " "){
this.setState({
isLogged : true
})
}
this.setState({ this.setState({
instituteList: response.data.tutor_instituteIDList, user_email: user_email,
ClassMethods: response.data.tutor_class_type, user_id : user_id,
subjectList: response.data.tutor_subjects, tutorID: user_id,
user_name : user_name,
user_type : user_type
},()=>{
axios.get(configs.BASE_URL + '/tutorSingUp/' + this.state.tutorID)
.then(response => {
console.log(response.data);
//console.log(response.data);
this.setState({
instituteList: response.data.tutor_instituteIDList,
ClassMethods: response.data.tutor_class_type,
subjectList: response.data.tutor_subjects,
}, () => {
this.GetTutorClasses();
})
}, () => {
this.GetTutorClasses();
}) })
})
})
} }
GetTutorClasses(){ GetTutorClasses(){
......
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