Merge branch 'HimanshuNarware:main' into tools_add

HimanshuNarware · Jun 14, 2024 · b24cc5e · b24cc5e
2 parents eeeeaca + c33372a
commit b24cc5e
Show file tree

Hide file tree

Showing 13 changed files with 281 additions and 62 deletions.
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -30,7 +30,7 @@
 
   gtag('config', 'G-6WS166VH7E');
 </script>
-    <title>DEVLAPS</title>
+    <title>DEVLABS</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -1,4 +1,3 @@
-
 // App.js
 import React, { useState, useEffect } from "react";
 import { Route, Routes, BrowserRouter } from "react-router-dom";
@@ -19,15 +18,18 @@ import Review from "./Component/Review";
 
 import AOS from "aos";
 import "aos/dist/aos.css";
-import { Toaster } from "react-hot-toast";
 
-import "aos/dist/aos.css";
 
-import { Toaster } from "react-hot-toast";
 
+import Review from "./Component/Review.js";
+
+
+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 Faq from "./Component/Faq";
@@ -40,21 +42,60 @@ import Extension from "./pages/Extension";
 import UI from "./pages/UI";
 import FrontendTools from "./pages/FrontendTools";
 import EthicalHacking from "./pages/EthicalHacking";
+import CodingPlateform from "./pages/CodingPlatform.jsx";
+import CourcesPlatform from "./pages/CoursesPlatform.jsx";
+
+
+import Faq from "./Component/Faq";
+
+function App() {
+  const [searchQuery, setSearchQuery] = useState("");
+  AOS.init();  
+
+  return (
+      <>
+        <ScrollToTop />
+        <Navbar setSearchQuery={setSearchQuery} />
+        <Routes>
+          <Route path='/' element={<Home searchQuery={searchQuery} />}></Route>
+          <Route path='/bookmark' element={<BookMark />}></Route>
+          <Route path='/about' element={<About />}></Route>
+          <Route path='/open-source' element={<OpenSource />}></Route>
+          <Route path='/review' element={<Review />} />
+          <Route path='*' element={<NotFound />} /> {/* 404 route */}
+          <Route path="/faq" element={<Faq />}></Route>
+
+          <Route path="/remote-jobs" element={<RemoteJobs />}></Route>
+          <Route path="/ai" element={<AI />}></Route>
+          <Route path="/movies-series" element={<Movie />}></Route>
+          <Route path="/extension" element={<Extension />}></Route>
+          <Route path="/ui-design" element={<UI />}></Route>
+          <Route path="/front-end-tools" element={<FrontendTools />}></Route>
+          <Route path="/ethical-hacking" element={<EthicalHacking />}></Route>
+          <Route path="/coding-platform" element={<CodingPlateform />}></Route>
+          <Route path="/cources-platform" element={<CourcesPlatform />}></Route>
+        </Routes>
+        <BackToTopButton />
+        <Toaster />
+        <ChatAssistant />        <Footer />
+      </>
+
 import CoursesPlatform from "./pages/CoursesPlatform";
 import Productivity from "./pages/Productivity";
 import Collaboration from "./pages/Collaboration";
 import CodingPlatform from "./pages/CodingPlateform";
 
 
+
 import "aos/dist/aos.css";
 
+function App() {
+
 import CodingPlateform from "./pages/CodingPlateform";
-import Productivity from "./pages/Productivity";
-import Collaboration from "./pages/Collaboration";
 
   function App() {
   const [searchQuery, setSearchQuery] = useState("");
-  AOS.init();  
+  AOS.init();
   return (
     <>
       <ScrollToTop />
@@ -67,18 +108,19 @@ import Collaboration from "./pages/Collaboration";
         <Route path="/review" element={<Review />} />
         <Route path="/faq" element={<Faq />} />
         <Route path="/rateus" element={<Rateus />} />
-
         <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="/cources-platform" element={<CoursesPlatform />} />
-        <Route path="/coding-platform" element={<CodingPlateform />} />
+        <Route path="/coding-platform" element={<CodingPlatform />} />
+
+
+        <Route path="/courses-platform" element={<CoursesPlatform />} />
 
         <Route path="/productivity-tools" element={<Productivity />} />
         <Route path="/collaboration-tools" element={<Collaboration />} />
@@ -88,10 +130,8 @@ import Collaboration from "./pages/Collaboration";
       <Toaster />
       <Footer />
       <ChatAssistant />
-
-      <Toaster />
-
     </>
+
   );
 }
 

diff --git a/frontend/src/ChatAssistant/ChatAssistant.jsx b/frontend/src/ChatAssistant/ChatAssistant.jsx
@@ -21,9 +21,25 @@ const ChatAssistant = () => {
   };
 
   return (
+    <div className='chatbot'>
+
+      <img
+        className='Logo'
+        src={chatbotLogo}
+        alt='Logo'
+        onClick={toggleChatbot}
+        onMouseEnter={() => (document.querySelector(".Logo").src = chatbotLogo1)}
+        onMouseLeave={() => (document.querySelector(".Logo").src = chatbotLogo)}
+      />
+
+      {/* {!isOpen && ( // Conditionally render the logo if the chatbot is closed
     <div className='chatbot'>l
       {!isOpen && ( // Conditionally render the logo if the chatbot is closed
-      {!isOpen && (
+
+
+      //{!isOpen && (
+
+
 
         <img
           className='Logo'
@@ -33,7 +49,7 @@ const ChatAssistant = () => {
           onMouseEnter={() => setLogoSrc(chatbotLogo1)}
           onMouseLeave={() => setLogoSrc(chatbotLogo)}
         />
-      )}
+      )} */}
       {isOpen && (
         <div className={`chatbot-wrapper ${isOpen ? 'chatbot-animation' : 'chatbot-close-animation'}`}>
           <button className='close-button' onClick={closeChatbot}>

diff --git a/frontend/src/Component/BookMark.js b/frontend/src/Component/BookMark.js
@@ -38,8 +38,8 @@ function BookMark() {
   return (
     <div className="containerBK">
       <div className="container-bk">
-        {currentBookmarks.length > 0 ? (
-          currentBookmarks.map((data, index) => (
+        {currentBookmarks?.length > 0 ? (
+          currentBookmarks?.map((data, index) => (
             <div className="box-bk" key={index}>
               <img className="logo" src={data.image} alt={data.name} />
               <h2>{data.name}</h2>

diff --git a/frontend/src/Component/Faq.js b/frontend/src/Component/Faq.js
@@ -53,7 +53,7 @@ export default function Faq() {
                       <div className="custom-flex-container2">
                         {item.icon}
                       </div>
-                      <span style={{color:'black'}}>
+                      <span className='font-bold'>
                         {item.heading}
                       </span>
                       <div className="custom-container2" onClick={() => {
@@ -70,7 +70,7 @@ export default function Faq() {
                 </AccordionItemHeading>
                 <AccordionItemPanel>
                   <p className="custom-text1">
-                   {item.detail}
+                    {item.detail}
                   </p>
                 </AccordionItemPanel>
               </AccordionItem>

diff --git a/frontend/src/Component/Footer.js b/frontend/src/Component/Footer.js
@@ -2,6 +2,8 @@ import React from "react";
 import logo from "../image/logo.png";
 import "../style/Footer.css";
 
+import { FaGithubSquare, FaTwitter } from "react-icons/fa";
+import { BsLinkedin } from "react-icons/bs";
 
 import { FaGithubSquare, FaLinkedin, FaTwitter } from "react-icons/fa";
 import { SiGmail } from "react-icons/si";
@@ -10,22 +12,6 @@ import { Link } from "react-router-dom";
 function Footer() {
   return (
     <footer>
-      <div className="Footer">
-        <div className="container">
-          <div className="row">
-            <div className="col-md-6 col-lg-4 col-12 ft-1">
-              <a href="https://www.devlabsstore.tech/">
-                <img width={209} src={logo} alt="devlaps" />
-              </a>
-              <h5>
-                Facing an issue or just <br />
-                enjoying the site?
-
-                </h5>
-              </div>
-            </div>
-          </div>
-        </div>
       <div className='Footer'>
         <div className='container'>
           <div className='row'>
@@ -36,7 +22,6 @@ function Footer() {
               <h5>
                 Facing an issue or just <br />
                 enjoying the site?{" "}
-
               </h5>
               <button>
                 <Link to="/review">Tell us now</Link>
@@ -80,6 +65,7 @@ function Footer() {
                 <li className='nav-item'>
                   <a href='https://www.devlabsstore.tech/open-source'>Open Source</a>
 
+
                 </li>
               </ul>
             </div>
@@ -107,6 +93,7 @@ function Footer() {
                     UI Design
                   </a>
                 </li>
+
                 <li className='nav-item'>
                   <a href='/remote-jobs'>Remote Jobs</a>
                 </li>
@@ -141,7 +128,9 @@ function Footer() {
 
                   <a href="/courses-platform">Course Platforms</a>
                   <Link className="" to="/courses-platform">
+
                   <a className="" href="/course-platform">
+
                     Course Platforms
                   </a>
                   </Link>
@@ -164,18 +153,7 @@ function Footer() {
           </div>
         </div>
       </div>
-      <div className="Last-footer">
-        <div className="container">
-          <div className="row justify-content-center">
-            <div className="col-md-6 col-12 ft-1">
-              <p className="text-center fs-6">
-                COPYRIGHT © Devlaps 2024 | <br /> MAINTAINED BY HIMANSHU NARWARE
-              </p>
 
-            </div>
-          </div>
-        </div>
-      </div>
       <div className="Last-footer">
         <div className="container">
           <div className="row justify-content-center">

diff --git a/frontend/src/Component/accordion.js b/frontend/src/Component/accordion.js
@@ -9,15 +9,15 @@ const data = [
   },
   {
     icon: <MdAnalytics />,
-    heading: 'how to get a new Tool ?',
+    heading: 'How do I get a new tool?',
     detail:
-      'The Link of Evry tool is given from where you can click on the linki to get the link and also add it to the bookmark .',
+      'Each tool has a link that you can click to access it and also add it to your bookmarks.',
   },
   {
     icon: <MdCancel />,
-    heading: 'How do I get started with contributing to DevLabs ?',
+    heading: 'How do I get started with contributing to DevLabs?',
     detail:
-      "For Contributing you need to go on the github repository and then create a new repository clone the project and start Contributing",
+      "To contribute, go to the GitHub repository, create a new repository, clone the project, and start contributing",
   },
 ];
 export default data;
diff --git a/frontend/src/index.css b/frontend/src/index.css
@@ -43,7 +43,7 @@ code {
 img {
   background: #ffffff;
   padding: 3px;
-  margin: 5px;
+  /* margin: 5px; */
   border-radius: 40px;
 }
 

diff --git a/frontend/src/index.js b/frontend/src/index.js
@@ -10,9 +10,13 @@ import "react-toastify/dist/ReactToastify.css";
 import App from "./App";
 import { BrowserRouter } from "react-router-dom";
 
+ // Ensure BrowserRouter is imported here
+
+
 
 import Preloader from "./Component/Preloader";
 
+
 const root = ReactDOM.createRoot(document.getElementById("root"));
 
 const options = {
@@ -32,9 +36,12 @@ const darkmode = new Darkmode(options);
 darkmode.showWidget();
 
 root.render(
-  <Provider store={store}>
+  <Provider store={store}>p
+    <BrowserRouter> {/* Ensure BrowserRouter is only here */}
+      <App /> 
     <BrowserRouter>
       <App />
+
       <ToastContainer />
     </BrowserRouter>
   </Provider>