Merge pull request #192 from PatilHarshh/revert-163-faqs

Revert "Faqs"
PatilHarshh · Jun 4, 2024 · 47f3d61 · 47f3d61
2 parents d41a79e + 82198e7
commit 47f3d61
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 109 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -25,7 +25,6 @@
     "react-icons": "^4.10.1",
     "react-redux": "^8.1.1",
     "react-router-dom": "^6.14.1",
-    "slugify": "^1.6.6",
     "styled-components": "^6.1.11"
   },
   "devDependencies": {

diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -10,8 +10,7 @@ import {
   UserProfile,
 } from "./pages";
 import { useSelector } from "react-redux";
-import FAQs from "./components/FAQs.jsx";
-// import ApplyForm from "./pages/ApplyForm";
+
 import SectionFirst from "./components/Home/SectionFirst";
 import SectionSecond from "./components/Home/SectionSecond";
 import SectionThird from "./components/Home/SectionThird";
@@ -56,27 +55,9 @@ function App() {
       {loading && <Loader />}
       <Routes>
         <Route element={<Layout />}>
-          <Route path="/" element={<Navigate to="/find-jobs" replace />} />
-          <Route path="/find-jobs" element={<FindJobs />} />
-          <Route path="/companies" element={<Companies />} />
-          <Route path="/FAQ" element={<FAQs />} />
-          {/* <Route path="/apply/:id/:title" element={<ApplyForm />} /> */}
-          <Route path="/about-us" element={<About />} />
-          <Route path="/user-auth" element={<AuthPage />} />
-          <Route path="/job-detail/:id" element={<JobDetail />} />
-          <Route path="/upload-job" element={<UploadJob />} />
-          <Route
-            path={
-              user?.user?.accountType === "seeker"
-                ? "/user-profile"
-                : "/user-profile/:id"
-            }
-            element={<UserProfile />}
-          />
-          <Route path="/company-profile" element={<CompanyProfile />} />
-          <Route path="/company-profile/:id" element={<CompanyProfile />} />
+          <Route element={<About />} path="/about" />
           <Route
-            path="/"
+            path='/'
             element={
               <>
                 <SectionFirst />
@@ -88,6 +69,20 @@ function App() {
               </>
             }
           />
+          <Route path='/companies' element={<Companies />} />
+          <Route path="/find-jobs" element={<FindJobs />} />
+          <Route
+            path={
+              user?.user?.accountType === "seeker"
+                ? "/user-profile"
+                : "/user-profile/:id"
+            }
+            element={<UserProfile />}
+          />
+          <Route path="/company-profile" element={<CompanyProfile />} />
+          <Route path="/company-profile/:id" element={<CompanyProfile />} />
+          <Route path="/upload-job" element={<UploadJob />} />
+          <Route path="/job-detail/:id" element={<JobDetail />} />
         </Route>
         <Route path="/about-us" element={<About />} />
         <Route path="/user-auth" element={<AuthPage />} />

diff --git a/client/src/components/FAQs.jsx b/client/src/components/FAQs.jsx
diff --git a/client/src/components/Footer.jsx b/client/src/components/Footer.jsx
@@ -37,7 +37,7 @@ const Footer = () => {
                   {links.map((link, index) => (
                     <Link
                       key={link + index}
-                      to={`/${link}`}
+                      to="/"
                       className="text-gray-300 text-sm hover:text-white "
                     >
                       {link}