b

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -4,6 +4,7 @@ import axios from 'axios';
 import {getImageUrl, trigger, on, off} from 'educoder';
 import { Tooltip, message,Popover} from 'antd';
 import CoursesListType from '../coursesPublic/CoursesListType';
+import AccountProfile from"../../user/AccountProfile";
 import Addcourses from '../coursesPublic/Addcourses';
 import '../css/Courses.css';
 import Modals from "../../modals/Modals";
@@ -88,6 +89,13 @@ class CoursesBanner extends Component {
     }
 
     tojoinclass = (val) => {
+			if(this.props.current_user&&this.props.current_user.profile_completed===false){
+				this.setState({
+					AccountProfiletype:true
+				})
+				return
+			}
+
         if (val === 1) {
             this.setState({
                 Addcoursestypes: true,
@@ -326,15 +334,30 @@ class CoursesBanner extends Component {
   postsettings=()=>{
     window.location.href = "/courses/" + this.props.match.params.coursesId + "/settings";
   }
+
+
+	hideAccountProfile=()=>{
+		this.setState({
+			AccountProfiletype:false
+		})
+	}
+
     render() {
-        let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide} = this.state;
+        let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide,AccountProfiletype} = this.state;
 
         return (
           <div>
             {
               is_guide && <Guide></Guide>
             }
-            
+
+						{AccountProfiletype===true?<AccountProfile
+							hideAccountProfile={()=>this.hideAccountProfile()}
+							{...this.state}
+							{...this.props}
+						/>:""}
+
+
             {
               coursedata === undefined || coursedata.status===401? <div id="course_info_1309" className="courseHead" style={{height: '206px'}}></div>:<div id="course_info_1309" className="courseHead" style={{height: '206px'}}>
 

public/react/src/modules/tpm/NewHeader.js

@@ -182,7 +182,15 @@ class NewHeader extends Component {
       })
       return;
     }
-    this.setState({
+
+		if(user&&user.profile_completed===false){
+			this.setState({
+				AccountProfiletype:true
+			})
+			return;
+		}
+
+		this.setState({
       Addcoursestypes:true,
     })
   }
@@ -201,7 +209,15 @@ class NewHeader extends Component {
       })
       return;
     }
-    this.setState({
+
+		if(user&&user.profile_completed===false){
+			this.setState({
+				AccountProfiletype:true
+			})
+			return;
+		}
+
+		this.setState({
       tojoinitemtype:true
     })
   }