loading bar added,image grid added & some cleanup

diablo1408 · Jan 2, 2021 · 5bd2c55 · 5bd2c55
2 parents 25e11e7 + f5e95ec
commit 5bd2c55
Show file tree

Hide file tree

Showing 4 changed files with 247 additions and 191 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
@@ -154,6 +154,8 @@ class MainPage extends React.Component {
   Loading...
 </button>
 </div>
+
+
             {this.state.isGenreDisplay ? (
               <div className="card">
 
@@ -183,10 +185,11 @@ class MainPage extends React.Component {
                 {!!filteredImages.length ? `${filteredImages.length} ` : "0 "}
                 Images found.
               </p>
-
+              <hr></hr>
+            <div className="row">
 
 
-                 <hr/>
+
 
 
                   {!!filteredImages ? (
@@ -202,7 +205,7 @@ class MainPage extends React.Component {
                   : (
                     <h1 className="text-white">No Images</h1>
                   )}
-
+                  
 
               <br />
               <Pagination
@@ -211,7 +214,7 @@ class MainPage extends React.Component {
                 onPageChange={this.onPageChange}
                 currentPage={currentPage}
               />
-
+            </div>
           </div>
         </main>
         <Footer />

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;