Merge branch 'main' into tool8

HimanshuNarware · Aug 10, 2024 · c0e2a54 · c0e2a54
2 parents 88a6a08 + 9c0a3f0
commit c0e2a54
Show file tree

Hide file tree

Showing 23 changed files with 1,069 additions and 1,291 deletions.
diff --git a/.github/workflows/check_duplicate_tools.yml b/.github/workflows/check_duplicate_tools.yml
@@ -13,14 +13,14 @@ jobs:
 
     - name: Check for duplicate entries in product.json
       run: |
-        # Check for duplicate entries in product.json
-        jq -r '.[].productName' product.json | sort | uniq -d > duplicates.txt
+        # Check for duplicate entries based on the 'link' field in product.json
+        jq -r '.[].link' product.json | sort | uniq -d > duplicates.txt
         if [ -s duplicates.txt ]; then
-          echo "Duplicate entries found in product.json:"
+          echo "Duplicate entries found in product.json based on 'link':"
           cat duplicates.txt
           exit 1
         else
-          echo "No duplicate entries found."
+          echo "No duplicate entries found based on 'link'."
         fi
 
   close-issues:
@@ -46,4 +46,4 @@ jobs:
                -H "Accept: application/vnd.github.v3+json" \
                https://api.github.com/repos/${{ github.repository }}/issues/$ISSUE \
                -d '{"state":"closed"}'
-        done
+        done
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+<a id="top"></a>
 <div align="center">
   <h1><img src="https://raw.githubusercontent.com/Tarikul-Islam-Anik/Animated-Fluent-Emojis/master/Emojis/Objects/Laptop.png" alt="Laptop" width="50" height="50" /> DevLabs</h1>
   <p>Welcome to DevLabs, a website where you can search for free tools that are useful for your daily needs. This application is created by the incredible open-source community. On DevLabs, you can discover a collection of free tools that can assist you in various aspects of your life. Moreover, you have the opportunity to contribute to this project by adding more tools to the database.</p>
@@ -212,7 +213,9 @@ If you would like to contribute to the project then kindly go through [Contribut
   <h2>Let's Collaborate and Make DevLabs Even Better! 💻🌟</h2>
 </div>
 
-### ✨ Features
+<details>
+<summary><h2>✨ Features</h2></summary>
+
 
 1. User Authentication:
    Secure user registration and login using JWT.
@@ -255,12 +258,30 @@ If you would like to contribute to the project then kindly go through [Contribut
 ### 📚 Learn
 To know more about project, please go through [Learn](learn.md)
 
+</details>
+
 ### 🌍 Community
 
-### 🏆 Contributors
+<hr>
 
-Recognize the individuals who have contributed to the project. You can use tools like All Contributors to automatically generate a list of contributors.
+<h2 align = "center">Our Contributors ❤️</h2>
+<div align = "center">
+ <h3>Thank you for contributing to our repository</h3>
 
-```bash
-npx all-contributors-cli add <username> <contribution>
-```
+ <a href="https://github.com/HimanshuNarware/Devlabs/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=HimanshuNarware/Devlabs" />
+</a>
+
+</div>
+
+<hr>
+<div>
+  <h2><img src="https://fonts.gstatic.com/s/e/notoemoji/latest/1f64f_1f3fb/512.webp" width="35" height="35"> Support </h2>
+</div>
+
+<div>
+  Don't forget to leave a star<img src="https://fonts.gstatic.com/s/e/notoemoji/latest/1f31f/512.webp" width="35" height="30"> for this project!
+</div> <br>
+
+<a href="#top" style="position: fixed; bottom: 20px; right: 20px; background-color: black ; color: white; padding: 10px 20px; text-align: center; text-decoration: none; display: inline-block; border-radius: 5px; font-family: Arial; font-size: 16px;">Go to Top</a>
+`
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -1,19 +1,10 @@
-* {
-  cursor: none;
-}
-
 .sidebar-content {
   padding: 10px;
-  cursor: none;
+  cursor: pointer;
+
   transition: background-color 0.2s;
-}
-
-.Toastify__toast-container {
-  color: #000;
-}
-
-.Toastify__toast {
-  font-size: 18px;
-  color: black;
-  background-color: rgb(165, 57, 197);
-}
+} 
+
+  cursor: pointer; 
+  transition: background-color 0.2s;
+}
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -1,10 +1,50 @@
-import React, { useState, useEffect, Suspense, lazy } from "react";
+import React, { useState, useEffect } from "react";
 import { Route, Routes } from "react-router-dom"; // Correct import
+import "./App.css"; 
+import About from "./Component/About";  
+import "./App.css";  
+import About from "./Component/About"; 
+import Footer from "./Component/Footer"; 
+import Rateus from "./Component/Rateus"; 
+ import "./App.css"; 
+import About from "./Component/About";
+import Footer from "./Component/Footer";
+import Rateus from "./Component/Rateus";
+import Home from "./Component/Home";
+import Navbar from "./Component/Navbar/Navbar";
+import BookMark from "./Component/BookMark";
+import ChatAssistant from "./ChatAssistant/ChatAssistant";
+import NotFound from "./Component/NotFound";
+import BackToTopButton from "./Component/BackToTopButton";
+import OpenSource from "./Component/OpenSource";
+import Review from "./Component/Review";
 import "./App.css";
+import About from "./Component/About";
+import Footer from "./Component/Footer"; 
+import Rateus from "./Component/Rateus";
+import Home from "./Component/Home";
+import Navbar from "./Component/Navbar/Navbar";
+import BookMark from "./Component/BookMark";
+import ChatAssistant from "./ChatAssistant/ChatAssistant";
+import NotFound from "./Component/NotFound";
+import BackToTopButton from "./Component/BackToTopButton";
+import OpenSource from "./Component/OpenSource";
+import Review from "./Component/Review";
 import AOS from "aos";
 import "aos/dist/aos.css";
 import { Toaster } from "react-hot-toast";
 import ScrollToTop from "./Component/ScrollToTop";
+
+import RemoteJobs from "./pages/RemoteJobs";
+import AI from "./pages/AI";
+import Movie from "./pages/Movie";
+import Extension from "./pages/Extension";
+import UI from "./pages/UI";
+import FrontendTools from "./pages/FrontendTools";
+import EthicalHacking from "./pages/EthicalHacking";
+import Faq from "./Component/Faq";
+import CodingPlatform from "./pages/CodingPlatform"; // Corrected import
+import CoursesPlatform from "./pages/CoursesPlatform";
 import Navbar from "./Component/Navbar/Navbar";
 import BackToTopButton from "./Component/BackToTopButton";
 import Footer from "./Component/Footer";
@@ -16,7 +56,7 @@ import ChatAssistant from "./ChatAssistant/ChatAssistant";
 const About = lazy(() => import("./Component/About"));
 const Rateus = lazy(() => import("./Component/Rateus"));
 const Home = lazy(() => import("./Component/Home"));
-// const NotFound = lazy(() => import("./Component/NotFound"));
+const NotFound = lazy(() => import("./Component/NotFound"));
 const OpenSource = lazy(() => import("./Component/OpenSource"));
 const Review = lazy(() => import("./Component/Review"));
 const BookMark = lazy(() => import("./Component/BookMark"));
@@ -48,11 +88,9 @@ function App() {
   useEffect(() => {
     AOS.init();
   }, []);
-
   return (
     <>
       <ScrollToTop />
-      <TrailingCursor />
       <Navbar setSearchQuery={setSearchQuery} />
       <Routes>
         <Route path="/" element={<Home searchQuery={searchQuery} />} />
@@ -62,7 +100,6 @@ function App() {
         <Route path="/review" element={<Review />} />
         <Route path="/faq" element={<Faq />} />
         <Route path="/rateus" element={<Rateus />} />
-        <Route path="/contact" element={<Contact />} />
         <Route path="/remote-jobs" element={<RemoteJobs />} />
         <Route path="/ai" element={<AI />} />
         <Route path="/movies-series" element={<Movie />} />
@@ -71,48 +108,11 @@ function App() {
         <Route path="/front-end-tools" element={<FrontendTools />} />
         <Route path="/ethical-hacking" element={<EthicalHacking />} />
         <Route path="/coding-platform" element={<CodingPlatform />} />
-        <Route path="/courses-platform" element={<CoursesPlatform />} />
-        <Route path="/collaboration-tools" element={<Collaboration />} />
-        <Route path="/login" element={<Login />} /> {/* New Route */}
-        <Route path="/register" element={<Register />} /> {/* New Route */}
+
+        <Route path="/courses-platform" element={<CoursesPlatform />}/>
         {/* Define other routes as needed */}
-        <Route path="*" element={<NotFound />} /> {/* 404 route */}
+<Route path="*" element={<NotFound />} /> {/* 404 route */}
       </Routes>
-=======
-      <Suspense fallback={<div>Loading...</div>}>
-        <Routes>
-          <Route path="/" element={<Home searchQuery={searchQuery} />} />
-          <Route path="/signup" element={<Signup />} />
-          <Route path="/bookmark" element={<BookMark />} />
-          <Route path="/about" element={<About />} />
-          <Route path="/open-source" element={<OpenSource />} />
-          <Route path="/review" element={<Review />} />
-          <Route path="/faq" element={<Faq />} />
-          <Route path="/rateus" element={<Rateus />} />
-          <Route path="/contact" element={<Contact />} />
-          <Route path="/profile" element={<Profile />} />
-          <Route path="/remote-jobs" element={<RemoteJobs />} />
-          <Route path="/ai" element={<AI />} />
-          <Route path="/movies-series" element={<Movie />} />
-          <Route path="/extension" element={<Extension />} />
-          <Route path="/ui-design" element={<UI />} />
-          <Route path="/front-end-tools" element={<FrontendTools />} />
-          <Route path="/ethical-hacking" element={<EthicalHacking />} />
-          <Route path="/coding-platform" element={<CodingPlatform />} />
-          <Route path="/courses-platform" element={<CoursesPlatform />} />
-          <Route path="/productivity-tools" element={<Productivity />} />
-          <Route path="/collaboration-tools" element={<Collaboration />} />
-          <Route path="/extensions" element={<Extensions />} />
-
-          <Route path="/movies&series" element={<Movies />} />
-
-          <Route path="/ui-designs" element={<Ui />} />
-          <Route path="/remote-job" element={<RemoteJob />} />
-
-          {/* Define other routes as needed */}
-          {/* <Route path="*" element={<NotFound />} /> 404 route */}
-        </Routes>
-      </Suspense>
       <BackToTopButton />
       <Footer />
       <ChatAssistant />

diff --git a/frontend/src/Component/BookMark.js b/frontend/src/Component/BookMark.js
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { deleteSource } from "../Slice/DataSlice";
 import bookmarkAnimation from "../lottie/bookmark.json";
@@ -7,19 +7,18 @@ import Lottie from "lottie-react";
 import toast from "react-hot-toast";
 
 function BookMark() {
-  const sourceData = useSelector((state) => state.SourceReducer.sourceData);
+  const sourceData = useSelector((state) => state.SourceReducer.sourceData); // Adjust the selector to match your state structure
   const dispatch = useDispatch();
   const [currentPage, setCurrentPage] = useState(1);
   const [postPerPage] = useState(8); // Number of bookmarks per page
+
+  useEffect(() => {
+    localStorage.setItem("bookmarks", JSON.stringify(sourceData));
+  }, [sourceData]);
+
   const handleDeleteBookmark = (name) => {
+    console.log("remove", name);
     dispatch(deleteSource({ name }));
-
-    const bookmarksInStorage =
-      JSON.parse(localStorage.getItem("bookmarks")) || [];
-    const updatedBookmarks = bookmarksInStorage.filter(
-      (bookmark) => bookmark.name !== name
-    );
-    localStorage.setItem("bookmarks", JSON.stringify(updatedBookmarks));
     toast.success("Bookmark removed successfully");
   };
 
@@ -39,10 +38,17 @@ function BookMark() {
         {currentBookmarks?.length > 0 ? (
           currentBookmarks?.map((data, index) => (
             <div className="bookmark__box" key={index}>
-              <img className="bookmark__logo" src={data.image} alt={data.name} />
+              <img
+                className="bookmark__logo"
+                src={data.image}
+                alt={data.name}
+              />
               <h2>{data.name}</h2>
               <p className="bookmark__box-text">{data.desc}</p>
-              <button className="bookmark__button" onClick={() => window.open(data.link)}>
+              <button
+                className="bookmark__button"
+                onClick={() => window.open(data.link)}
+              >
                 Link
               </button>
               <button
@@ -103,7 +109,9 @@ function BookMark() {
             style={{ height: "200px" }}
           />
           <h1 className="text-2xl font-semibold">No bookmark Found</h1>
-          <h3 className="mb-4">Explore Devlabs and add them to your bookmark</h3>
+          <h3 className="mb-4">
+            Explore Devlabs and add them to your bookmark
+          </h3>
         </div>
       )}
     </div>

diff --git a/frontend/src/Component/Footer.js b/frontend/src/Component/Footer.js
@@ -233,5 +233,5 @@ function Footer() {
     </footer>
   );
 }
-
 export default Footer;
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -233,5 +233,5 @@ function Footer() { @@
         </footer>
       );
     }
     export default Footer;