fix the bugs

Jaishree2310 · Oct 27, 2024 · e5f4682 · e5f4682
1 parent 801b88f
commit e5f4682
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 570 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,30 +1,24 @@
- upd-feature-branch
 import React, { useState, useEffect } from 'react';
-import PricingDetailPage from './components/PricingDetailPage';
-
-import React from 'react';
-
 import {
   BrowserRouter as Router,
   Route,
   Routes,
   useLocation,
 } from 'react-router-dom';
 
- main
-import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
-import ScrollProgressBar from './components/ScrollProgress'; // Import your ScrollProgressBar component
-import PricingDetailPage from './components/PricingDetailPage';
+import ScrollProgressBar from './components/ScrollProgress';
+import Header from './components/Header';
+import Footer from './components/Footer';
 
 import GlassyUILandingPage from './components/GlassyUILandingPage';
 import GlassyUIComponentsPage from './components/GlassyUIComponentsPage';
+import PricingDetailPage from './components/PricingDetailPage';
 import ButtonDetailsPage from './components/ButtonDetailsPage';
 import CardDetailsPage from './components/CardDetailsPage';
 import ProgressBarDetailPage from './components/ProgressBarDetailPage';
 import PopupDetailPage from './components/PopupDetailPage';
 import InputDetailPage from './components/InputDetailPage';
 import TextareaDetailPage from './components/TextareaDetailPage';
-import NotFoundPage from './components/NotFoundPage';
 import TooltipDetailsPage from './components/TooltipDetailsPage';
 import SpeedDialDetailsPage from './components/SpeedDialDetailsPage';
 import ModalDetailsPage from './components/ModalDetailsPage';
@@ -34,7 +28,6 @@ import SliderDetailsPage from './components/SliderDetailsPage';
 import ContributorsPage from './components/ContributorsPage';
 import DonationPage from './components/DonationPage';
 import AboutUsPage from './components/AboutUsPage';
-import Header from './components/Header';
 import BackToTopDetailsPage from './components/BackToTopDetailsPage';
 import DropdowndetailsPage from './components/DropdowndetailsPage';
 import AuthenticationCard from './components/AuthenticationCards';
@@ -43,25 +36,15 @@ import AccordionDetails from './components/AccordionDetails';
 import ContactUsDetailsPage from './components/ContactUsDetailsPage';
 import PaginationDetails from './components/PaginationDetails';
 import TestimonialDetails from './components/TestimonialDetails';
-import Footer from './components/Footer';
-
-
-
 import CalendarDetails from './components/CalendarDetails';
 import Checkbox from './components/Checkbox';
 import Statistic from './components/StatisticDetails';
 import GalleryDetailsPage from './components/GalleryDetailsPage';
-import Checkbox from './components/Checkbox';
 import SpinnerDetailsPage from './components/SpinnerDetailsPage';
-
 import ProductCardDetailsPage from './components/ProductCardDetailsPage';
-import Statistic from './components/StatisticDetails';
-import GalleryDetailsPage from './components/GalleryDetailsPage';
-import Checkbox from './components/Checkbox';
-
- import SpinnerDetailsPage from './components/SpinnerDetailsPage';
+import NotFoundPage from './components/NotFoundPage';
 
- upd-feature-branch
+// Theme Toggle Component
 const ThemeToggle: React.FC = () => {
   const [theme, setTheme] = useState(localStorage.getItem('theme') || 'light');
 
@@ -81,30 +64,29 @@ const ThemeToggle: React.FC = () => {
   return (
     <button
       onClick={toggleTheme}
-      className="p-2 bg-gray-200 dark:bg-gray-800 text-black dark:text-white rounded"
+      className='p-2 bg-gray-200 dark:bg-gray-800 text-black dark:text-white rounded'
     >
       {theme === 'light' ? 'Switch to Dark Mode' : 'Switch to Light Mode'}
     </button>
   );
 };
 
+// Conditional Footer Component
+const ConditionalFooter: React.FC = () => {
+  const location = useLocation();
+  return location.pathname === '/' ? <Footer /> : null;
+};
 
+// Main App Component
 const App: React.FC = () => {
   return (
     <Router>
       <Header />
-      {/* Theme Toggle Button */}
-       className="theme-toggle-container p-4"
+      <div className='theme-toggle-container p-4'>
         <ThemeToggle />
-
-
- const App: React.FC = () => {
+      </div>
+      <ScrollProgressBar />
 
-  return (
-    <Router>
-      <Header />
-      <ScrollProgressBar /> {/* Add the ScrollProgressBar component here */}
- main
       <Routes>
         <Route path='/' element={<GlassyUILandingPage />} />
         <Route path='/components' element={<GlassyUIComponentsPage />} />
@@ -130,51 +112,23 @@ const App: React.FC = () => {
         <Route path='/authentication-card' element={<AuthenticationCard />} />
         <Route path='/accordion-details' element={<AccordionDetails />} />
         <Route path='/contributors' element={<ContributorsPage />} />
-
         <Route path='/donate' element={<DonationPage />} />
         <Route path='/about' element={<AboutUsPage />} />
         <Route path='/contact-details' element={<ContactUsDetailsPage />} />
         <Route path='/pagination-details' element={<PaginationDetails />} />
         <Route path='/testimonial-details' element={<TestimonialDetails />} />
-
-
         <Route path='/calendar-details' element={<CalendarDetails />} />
         <Route path='/checkbox' element={<Checkbox />} />
-
-          <Route path='/statistic-details' element={<Statistic />} />
-          <Route path='/gallery-details' element={<GalleryDetailsPage />} />
-
-
-
-        <Route path='/checkbox' element={<Checkbox />} />
-
-
+        <Route path='/statistic-details' element={<Statistic />} />
+        <Route path='/gallery-details' element={<GalleryDetailsPage />} />
         <Route path='/spinner' element={<SpinnerDetailsPage />} />
-
-           <Route path='/product-details' element={<ProductCardDetailsPage />} />
-          <Route path='/gallery-details' element={<GalleryDetailsPage />} />
-
-
-           <Route path='/statistic-details' element={<Statistic />} />
-          <Route path='/gallery-details' element={<GalleryDetailsPage />} />
-
-
-         <Route path='/checkbox' element={<Checkbox />} />
-
-         <Route path='/spinner' element={<SpinnerDetailsPage />} />
-
-
-         <Route path='*' element={<NotFoundPage />} />
+        <Route path='/product-details' element={<ProductCardDetailsPage />} />
+        <Route path='*' element={<NotFoundPage />} />
       </Routes>
 
       <ConditionalFooter />
-
     </Router>
   );
 };
-const ConditionalFooter: React.FC = () => {
-  const location = useLocation();
 
-  return location.pathname === '/' ? <Footer /> : null;
-};
 export default App;