Merge branch 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank

public/react/src/modules/courses/new/CoursesNew.js

@@ -443,7 +443,9 @@ class CoursesNew extends Component {
     };
 
     handleSearchschool=(value)=>{
-
+			this.setState({
+				smallspinning:true
+			})
 			if(value!="") {
 				// this.props.form.setFieldsValue({
 				// 	// school: value,
@@ -452,10 +454,13 @@ class CoursesNew extends Component {
 				this.setState({
 					fetching: true,
 					school: value,
-					smallspinning:true
 				})
 
 				this.getschool(value)
+			}else{
+				this.setState({
+					smallspinning:false
+				})
 			}
     };
 

public/react/src/modules/courses/new/Goldsubject.js

@@ -563,7 +563,9 @@ class Goldsubject extends Component {
 	};
 
 	handleSearchschool=(value)=>{
-
+		this.setState({
+			smallspinning:true
+		})
 		if(value!="") {
 			// this.props.form.setFieldsValue({
 			// 	// school: value,
@@ -572,9 +574,12 @@ class Goldsubject extends Component {
 			this.setState({
 				fetching: true,
 				school: value,
-				smallspinning:true
 			})
 			this.getschool(value)
+		}else{
+			this.setState({
+				smallspinning:false
+			})
 		}
 	};
 

public/react/src/modules/user/usersInfo/banks/BanksIndex.js

@@ -72,16 +72,32 @@ class BanksIndex extends Component{
   constructor(props){
     super(props);
     this.state={
-      crumbData:undefined
+      crumbData:undefined,
+      publicly:undefined
     }
   }
 
+  componentDidMount = () =>{
+    let pathname = this.props.location.pathname;
+    this.setState({
+      publicly:pathname.indexOf("/publicly") > -1
+    })
+  }
+
   initPublic = (crumbData) =>{
     this.setState({
       crumbData
     })
   }
 
+  componentDidUpdate=()=>{
+    let { publicly }=this.state
+    
+    if(this.props.current_user && this.props.current_user.professional_certification == false && publicly){
+      this.props.history.push(`/topicbank/${this.props.current_user.login}/publicly`);
+    }
+  }
+
   render(){
     let { crumbData }=this.state
     const common = {

public/react/src/modules/user/usersInfo/usersInfo.css

@@ -340,11 +340,14 @@
 .topicsbtn{
     padding: 3px 15px;
     border-radius: 2px;
-    color: #4C4C4C;
+    /*color: #4C4C4C;*/
     cursor: pointer;
     display: inline-block;
-    background-color: #4CACFF!important;
+    /*background-color: #4CACFF!important;*/
-    color: #fff!important;
+    /*color: #fff!important;*/
+    border-radius: 11px;
+    border: 1px solid rgba(76,172,255,1);
+    color: rgba(76,172,255,1);
 }
 
 .pd1323{