Sorting Issue Solved

diablo1408 · Jan 1, 2021 · f5e95ec · f5e95ec
1 parent e23b034
commit f5e95ec
Show file tree

Hide file tree

Showing 4 changed files with 256 additions and 194 deletions.
diff --git a/controller/image/getGenre.js b/controller/image/getGenre.js
@@ -2,8 +2,9 @@ const Vision = require("../../models/vision");
 
 
 function compare( a, b ) {
-    if(a.label.length === b.label.length){return 0;}
-    return a.label.length > b.label.length;
+    if(a.label.length < b.label.length) return 1;
+    if(a.label.length > b.label.length) return -1;
+    return 0;
   }
 
 class GetGenre{
@@ -13,9 +14,17 @@ class GetGenre{
       Vision.find({user_id : req.params.user_id})
       .then((user) =>{ 
           let labels = user[0].image_labels;
-          labels.sort(compare);  
-          labels = labels.slice(0,5);
-          // console.log(labels);
+          labels.sort(compare);
+
+          // labels.forEach(element => {
+          //   console.log(element.name,element.label.length);
+          // });
+
+
+          labels = labels.slice(0,6);
+
+          // console.log("asd",labels);
+          // return res.status(200);
         return res.status(200).json(labels);
         }
       )

diff --git a/frontend/src/pages/MainPage/index.js b/frontend/src/pages/MainPage/index.js
@@ -29,7 +29,7 @@ class MainPage extends React.Component{
             showOptions: false,
             userInput: '',
             isGenreDisplay : false,
-
+            enableName : '',
 
         };
 
@@ -54,8 +54,8 @@ onPageChange = (page) => {
 
   onOpenGenre = (e) => {
     // console.log(e.target.id);
-    this.setState({userInput : e.target.id});
-    this.setState({isGenreDisplay : true});
+    this.setState({enableName : e.target.id});
+    this.setState({isGenreDisplay : true,showOptions : false});
     this.props.getImages(e.target.id);
   }
 
@@ -117,12 +117,19 @@ changeSearchList = (e) =>{
             optionName.toLowerCase().indexOf(userInput.toLowerCase()) > -1
         );
         // console.log(filteredGenres);
-
+        if(filteredGenres.length === 0){
+            this.setState({
+                filteredGenres : [],
+                showOptions : false,
+              });
+        }
+        else{
         this.setState({
           filteredGenres,
           showOptions: true,
           userInput
         });
+    }
 
 }
 
@@ -146,11 +153,11 @@ render(){
                 <div className="container-fluid mt-5">
                 <div className="card mb-4 wow fadeIn">
                     <div className="card-body d-sm-flex justify-content-between">
-                    <h4 className="mb-2 mb-sm-0 pt-1">
-                        {/* <a href="https://mdbootstrap.com/docs/jquery/" target="_blank">Home Page</a>
-                        <span>/</span> */}
-                        <span>Dashboard</span>
-                    </h4>
+                        <h4 className="mb-2 mb-sm-0 pt-1">
+                            {/* <a href="https://mdbootstrap.com/docs/jquery/" target="_blank">Home Page</a>
+                            <span>/</span> */}
+                            <span>Dashboard</span>
+                        </h4>
                     <div>
                         <form className="d-flex justify-content-center">
 
@@ -179,7 +186,7 @@ render(){
                         <div key = {"all"} className="p-2 bd-highlight ">
                             <button type="button" 
                             className={"btn btn-outline-info waves-effect"}>
-                                {this.state.userInput}
+                                {this.state.enableName}
                             </button>
                         </div>
                     </div>

diff --git a/frontend/src/pages/Profile/index.js b/frontend/src/pages/Profile/index.js
@@ -116,10 +116,10 @@ class Profile extends React.Component {
     const { authMessage,userData} = this.props;
     const { username, email, password, otp} = this.state.data;
     const {errors} = this.state;
-    console.log("user",userData.user_image);
+    // console.log("user",userData);
     if(localStorage.getItem('loggedIn') === 'false'){
       return <Redirect to = {"/login"} />
-    }
+  }
 
   let coverImage;