Merge pull request HimanshuNarware#761 from enzorod10/main

Fixed import issues and other syntax issues that wouldn't allow the frontend server to start properly
krishnas2004 · Jun 12, 2024 · 15e5fcb · 15e5fcb
2 parents cde37a2 + 9f958a2
commit 15e5fcb
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 82 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -1,7 +1,5 @@
 
 // App.js
-import React, { useState } from "react";
-import { Route, Routes } from "react-router-dom";
 import React, { useState, useEffect } from "react";
 import { Route, Routes, BrowserRouter } from "react-router-dom";
 
@@ -21,17 +19,13 @@ import BackToTopButton from "./Component/BackToTopButton";
 import OpenSource from "./Component/OpenSource";
 import Review from "./Component/Review";
 
-import Review from "./Component/Review.js";
-import AOS from "aos";
 import "aos/dist/aos.css";
 
 import { Toaster } from "react-hot-toast";
 
 
-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";
@@ -49,38 +43,11 @@ import EthicalHacking from "./pages/EthicalHacking";
 import CodingPlatform from "./pages/CodingPlatform";
 import CoursesPlatform from "./pages/CoursesPlatform";
 
-import AOS from "aos";
 import "aos/dist/aos.css";
-import { Toaster } from "react-hot-toast";
-
-function App() {
-  const [searchQuery, setSearchQuery] = useState("");
-
-  useEffect(() => {
-    AOS.init();
-  }, []);
-
-  return (
-    <div>
 
 import CodingPlateform from "./pages/CodingPlateform";
-import CourcesPlatform from "./pages/CourcesPlatform";
-
-import ScrollToTop from "./Component/ScrollToTop";
-import Faq from "./Component/Faq";
-
-function App() {
-  const [searchQuery, setSearchQuery] = useState("");
-  AOS.init();
-
-  return (
-import CodingPlateform from "./pages/CodingPlatform.jsx";
-import CourcesPlatform from "./pages/CoursesPlatform";
-import Faq from "./Component/Faq";
 import Productivity from "./pages/Productivity";
 import Collaboration from "./pages/Collaboration";
-import CodingPlatform from "./pages/CodingPlatform.jsx";
-import CoursesPlatform from "./pages/CoursesPlatform";
 
 function App() {
   const [searchQuery, setSearchQuery] = useState("");
@@ -105,7 +72,6 @@ function App() {
         <Route path="/front-end-tools" element={<FrontendTools />} />
         <Route path="/ethical-hacking" element={<EthicalHacking />} />
         <Route path="/coding-platform" element={<CodingPlateform />} />
-        <Route path="/cources-platform" element={<CourcesPlatform />} />
         <Route path="/productivity-tools" element={<Productivity />} />
         <Route path="/collaboration-tools" element={<Collaboration />} />
         <Route path="/coding-platform" element={<CodingPlatform />} />
@@ -119,8 +85,6 @@ function App() {
 
       <Toaster />
 
-    </div>
-
     </>
   );
 }

diff --git a/frontend/src/ChatAssistant/ChatAssistant.jsx b/frontend/src/ChatAssistant/ChatAssistant.jsx
@@ -23,28 +23,6 @@ const ChatAssistant = () => {
   return (
     <div className='chatbot'>
       {!isOpen && (
-
-    <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 && (
-        <div className={`chatbot-wrapper ${isOpen ? "chatbot-animation" : "chatbot-close-animation"}`}>
-          <button className="close-button" onClick={closeChatbot}>
-            X
-          </button>
-          <Chatbot
-            config={config}
-            messageParser={MessageParser}
-            actionProvider={ActionProvider}
-          />
-    <div className='chatbot'>
-      {!isOpen && ( // Conditionally render the logo if the chatbot is closed
         <img
           className='Logo'
           src={logoSrc}
@@ -55,18 +33,15 @@ const ChatAssistant = () => {
         />
       )}
       {isOpen && (
-        <div className='chatbot-wrapper'>
+        <div className={`chatbot-wrapper ${isOpen ? 'chatbot-animation' : 'chatbot-close-animation'}`}>
           <button className='close-button' onClick={closeChatbot}>
             X
           </button>
-          <div className='chatbot-animation'>
-            <Chatbot
-              config={config}
-              messageParser={MessageParser}
-              actionProvider={ActionProvider}
-            />
-          </div>
-
+          <Chatbot
+            config={config}
+            messageParser={MessageParser}
+            actionProvider={ActionProvider}
+          />
         </div>
       )}
     </div>

diff --git a/frontend/src/Component/Footer.js b/frontend/src/Component/Footer.js
@@ -2,7 +2,6 @@ import React from "react";
 import logo from "../image/logo.png";
 import "../style/Footer.css";
 
-import { FaGithubSquare, FaTwitter } from "react-icons/fa";
 import { FaGithubSquare, FaLinkedin, FaTwitter } from "react-icons/fa";
 import { BsLinkedin } from "react-icons/bs";
 import { SiGmail } from "react-icons/si";
@@ -22,7 +21,11 @@ function Footer() {
                 Facing an issue or just <br />
 
                 enjoying the site?
-
+                </h5>
+              </div>
+            </div>
+          </div>
+        </div>
       <div className='Footer'>
         <div className='container'>
           <div className='row'>
@@ -69,7 +72,7 @@ function Footer() {
                   <a className="" href="https://www.devlabsstore.tech/open-source">
                     Open Source
                   </a>
-
+                  </li>
                 <li className='nav-item'>
                   <a href='https://www.devlabsstore.tech/'>Home</a>
                 </li>
@@ -120,7 +123,7 @@ function Footer() {
                   <a className="" href="/ui-design">
                     UI Design
                   </a>
-
+                </li>
                 <li className='nav-item'>
                   <a href='/remote-jobs'>Remote Jobs</a>
                 </li>
@@ -135,8 +138,6 @@ function Footer() {
                 </li>
                 <li className='nav-item'>
                   <a href='/ui-design'>UI Design</a>
-
-
                 </li>
               </ul>
             </div>
@@ -164,7 +165,8 @@ function Footer() {
                   <a className="" href="/course-platform">
                     Course Platforms
                   </a>
-
+                  </Link>
+                </li>
                 <li className='nav-item'>
                   <a href='/front-end-tools'>Frontend Tools</a>
                 </li>
@@ -178,8 +180,6 @@ function Footer() {
                   <a href='/courses-platform'>Course Platforms</a>
                 </li>
               </ul>
-
-
             </div>
           </div>
         </div>
@@ -191,8 +191,10 @@ function Footer() {
               <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/index.js b/frontend/src/index.js
@@ -9,10 +9,7 @@ import { ToastContainer } from "react-toastify";
 import "react-toastify/dist/ReactToastify.css";
 import App from "./App";
 import { BrowserRouter } from "react-router-dom";
-
-
-import App from './App'; // Import the App component
-
+import Preloader from "./Component/Preloader";
 
 const root = ReactDOM.createRoot(document.getElementById("root"));