Merge branch 'master' of https://github.com/diablo1408/PhotoCategorizer

diablo1408 · Jan 2, 2021 · 8f9cabb · 8f9cabb
2 parents b7ae52f + 5bd2c55
commit 8f9cabb
Show file tree

Hide file tree

Showing 13 changed files with 502 additions and 556 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@
 /.pnp
 .pnp.js
 node_modules/
+uploads/
+images/
 
 
 # testing

diff --git a/frontend/public/css/custom.css b/frontend/public/css/custom.css
@@ -1,4 +1,4 @@
-.row {
+/* .row {
     display: flex;
     flex-wrap: wrap;
     padding: 5em;
@@ -13,7 +13,7 @@
     width: 100%;
     display: none;
     border: 2px solid #e5e6e6;
-  }
+  } */
   .avatar{
 
     max-width: 80px;
@@ -31,7 +31,8 @@
     background-image: url("https://images.unsplash.com/photo-1469212044023-0e55b4b9745a?ixlib=rb-1.2.1&ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&auto=format&fit=crop&w=1510&q=8");
     background-repeat: no-repeat;
     background-size:cover;
-    background-position: center center;   
+    background-position: center center;  
+    height: 100vh;
 
   }
   .bg-image-login{
@@ -40,6 +41,7 @@
     background-size:cover;
     background-position: center center;  
     height: 100vh;
+
   }
 
 
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -1,52 +1,49 @@
 <!DOCTYPE html>
 <html lang="en">
-
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>Vision</title>
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="css/mdb.min.css" rel="stylesheet">
-    <!-- Your custom styles (optional) -->
-    <link href="css/style.min.css" rel="stylesheet">
-    <link href="css/custom.css" rel="stylesheet">
-    <link href="css/bootstrap.css" rel="stylesheet">
-    <link href="css/mdb.css" rel="stylesheet">
-    <link href="css/mdb.lite.css" rel="stylesheet">
-    <link href="css/mdb.lite.min.css" rel="stylesheet">
-    <link href="css/mdb.min.css" rel="stylesheet">
-
-
-    <style>
-      .map-container {
-        overflow: hidden;
-        padding-bottom: 56.25%;
-        position: relative;
-        height: 0;
-      }
-
-      .map-container iframe {
-        left: 0;
-        top: 0;
-        height: 100%;
-        width: 100%;
-        position: absolute;
-      }
-    </style>
-  </head>
-
-
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root">
-    </div>
-  </body>
-  <script type="text/javascript" src="./js/jquery-3.4.1.min.js" ></script>          
-  <script type="text/javascript" src="./js/popper.min.js"></script>
-  <script type="text/javascript" src="./js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="./js/mdb.min.js"></script>
-
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta http-equiv="x-ua-compatible" content="ie=edge">
+  <title>Vision</title>
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
+  <link href="css/bootstrap.min.css" rel="stylesheet">
+  <!-- Material Design Bootstrap -->
+  <!-- Your custom styles (optional) -->
+  <link href="css/style.min.css" rel="stylesheet">
+  <link href="css/custom.css" rel="stylesheet">
+  <link href="css/mdb.lite.min.css" rel="stylesheet">
+  <link href="css/mdb.min.css" rel="stylesheet">
+
+
+  <style>
+    .map-container {
+      overflow: hidden;
+      padding-bottom: 56.25%;
+      position: relative;
+      height: 0;
+    }
+
+    .map-container iframe {
+      left: 0;
+      top: 0;
+      height: 100%;
+      width: 100%;
+      position: absolute;
+    }
+  </style>
+</head>
+
+
+<body>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <div id="root">
+  </div>
+</body>
+<script type="text/javascript" src="./js/jquery-3.4.1.min.js"></script>
+<script type="text/javascript" src="./js/popper.min.js"></script>
+<script type="text/javascript" src="./js/bootstrap.min.js"></script>
+<script type="text/javascript" src="./js/mdb.min.js"></script>
+
+
 </html>
diff --git a/frontend/src/components/ImageTable/ImageCard/CardFront/index.js b/frontend/src/components/ImageTable/ImageCard/CardFront/index.js
diff --git a/frontend/src/components/ImageTable/ImageCard/CardFront/style.css b/frontend/src/components/ImageTable/ImageCard/CardFront/style.css
diff --git a/frontend/src/components/ImageTable/ImageCard/index.js b/frontend/src/components/ImageTable/ImageCard/index.js
diff --git a/frontend/src/components/ImageTable/ImageCard/style.css b/frontend/src/components/ImageTable/ImageCard/style.css
diff --git a/frontend/src/components/ImageTable/index.js b/frontend/src/components/ImageTable/index.js
@@ -1,27 +1,35 @@
 import React from "react";
 
-import ImageCard from "./ImageCard";
+
 import "./style.css";
 
-export default function ImageTable({ images, currentPage, pageSize ,genre}) {
+export default function ImageTable({ images, currentPage, pageSize, genre }) {
   // console.log("genreimages");
   // console.log(images);
   const currentImages = images.slice(
     (currentPage - 1) * pageSize,
     pageSize * currentPage
   );
-
 
   // console.log("images present in image table ");
   // console.log(currentImages);
-  return (
-    <div className="movies-grid">
+  return ( 
+    <div className="row">
       {!!images &&
-        currentImages.map((image) => (
-          <ImageCard image={image} key={image._id} />
-        ))}
+        currentImages.map((image) => {
+          const encodedImage = new Buffer(image.img_buffer, "binary").toString(
+            "base64"
+          );
+          const coverImage = "data:image/jpeg;base64," + encodedImage;
+         return( <div className="col-3  ">
+                <img src={coverImage} className="gallery-img" alt={"cover"} />
+         </div>
+
+
+
+          )
+        })}
 
     </div>
   );
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ @@
     /.pnp
     .pnp.js
     node_modules/
+    uploads/
+    images/
     # testing
@@ Expand Down @@