Merge branch 'feat/screen_update_with_typing_in_search_bar' of https:…

…//github.com/anwesha2002/Devlabs into fix/Attached_proper_Netlify_devtol_link # Conflicts: # .idea/modules.xml
AmruthaPariprolu · May 18, 2024 · 3bec31c · 3bec31c
2 parents 80c5c65 + 888fdad
commit 3bec31c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 16 deletions.
diff --git a/.idea/Devlabs.iml b/.idea/Devlabs.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/frontend/src/Component/Home.js b/frontend/src/Component/Home.js
@@ -78,18 +78,25 @@ useEffect(()=>{
   }
 
   // In case `searchQuery` string is available, filter the data, if not then show all data
+  // const filteredData = !!props.searchQuery
+  //   ? allvalue.filter((datalist) => {
+  //       return (
+  //         datalist.productName
+  //           .toLowerCase()
+  //           .includes(props.searchQuery.toLowerCase())
+  //       );
+  //     })
+  //   : allvalue;
+
   const filteredData = !!props.searchQuery
-    ? allvalue.filter((datalist) => {
+      ? allvalue.filter((datalist) => {
         return (
-          datalist.productName
-            .toLowerCase()
-            .includes(props.searchQuery.toLowerCase()) ||
-          datalist.description
-            .toLowerCase()
-            .includes(props.searchQuery.toLowerCase())
+            datalist.productName
+                .toLowerCase()
+                .includes(props.searchQuery.toLowerCase())
         );
       })
-    : allvalue;
+      : allvalue;
 
   const currentPost =
     filteredData.length > 16

diff --git a/frontend/src/style/About.css b/frontend/src/style/About.css
@@ -26,8 +26,6 @@
     max-width: 600px;
     height: fit-content;
     animation:fade-in;
-    animation-timeline: view();
-
 
 }
 
@@ -42,7 +40,7 @@
         width: 80%;
         max-height: 500px;
         animation:fade-in;
-        animation-timeline: view();
+
 
     }
 
@@ -115,7 +113,7 @@
 
 @media screen and (max-width: 375px) {
     .repo-btn{
-        font: 16px;
+        font-size: 16px;
     }
 }
 
@@ -127,7 +125,6 @@
     max-width: 20vw;
     transition: 0.5s;
     animation:fade-in;
-    animation-timeline: view();
 
 }
 
@@ -259,6 +256,5 @@
 
     }
 }
-    box-shadow: 0 0 7px #8b5cf6;
-}
+
 
diff --git a/frontend/src/style/Footer.css b/frontend/src/style/Footer.css
@@ -28,6 +28,7 @@
 
 .ft-2 {
   margin-top: 3.4375rem;
+}
 
 /* Footer */
 footer {
@@ -125,6 +126,7 @@ footer {
   background: #A3094E;
   color: #fff;
   cursor: pointer;
+}
 
 .card-link:hover {
   color: whitesmoke;