Skip to content

Commit

Permalink
Merge branch 'main' into Search-bar-component
Browse files Browse the repository at this point in the history
  • Loading branch information
AdityaInnovates authored Oct 26, 2024
2 parents e5547c9 + 801b88f commit 94026fb
Show file tree
Hide file tree
Showing 9 changed files with 539 additions and 37 deletions.
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,23 @@ git push origin my-feature-branch
- We truly appreciate your incredible contributions to this project! Your dedication and hard work are vital to its continued growth and success. If you’ve found value in it, don’t forget to show your support by giving our repository a star! ⭐

<div align="center">
<a href="https://github.com/Jaishree2310/GlassyUI-Components">
<img src="https://contrib.rocks/image?repo=Jaishree2310/GlassyUI-Components&&max=1000&&cachebust=1" />
</a>

| Contributor | Contributor | Contributor | Contributor |
|--------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|
| <img src="https://github.com/Jaishree2310.png" alt="Jaishree2310" width="80"/> <br> <p align="center">[Jaishree2310](https://github.com/Jaishree2310) 👩‍💻</p> | <img src="https://github.com/Sawan-Kushwah.png" alt="Sawan-Kushwah" width="80"/> <br> <p align="center">[Sawan-Kushwah](https://github.com/Sawan-Kushwah) 👨‍💻</p> | <img src="https://github.com/Gauravtb2253.png" alt="Gauravtb2253" width="80"/> <br> <p align="center">[Gauravtb2253](https://github.com/Gauravtb2253) 👨‍💻</p> | <img src="https://github.com/alo7lika.png" alt="Alolika" width="80"/> <br> <p align="center">[Alolika](https://github.com/alo7lika) 👩‍💻</p> |
| <img src="https://github.com/hritika2409.png" alt="Hritika" width="80"/> <br> <p align="center">[Hritika](https://github.com/hritika2409) 👩‍💻</p> | <img src="https://github.com/AdityaInnovates.png" alt="Aditya Innovates" width="80"/> <br> <p align="center">[Aditya Innovates](https://github.com/AdityaInnovates) 👨‍💻</p> | <img src="https://github.com/neeru24.png" alt="Neeru" width="80"/> <br> <p align="center">[Neeru](https://github.com/neeru24) 👩‍💻</p> | <img src="https://github.com/haseebzaki-07.png" alt="Haseeb Zaki" width="80"/> <br> <p align="center">[Haseeb Zaki](https://github.com/haseebzaki-07) 👨‍💻</p> |
| <img src="https://github.com/gurliv21.png" alt="Gurliv" width="80"/> <br> <p align="center">[Gurliv](https://github.com/gurliv21) 👩‍💻</p> | <img src="https://github.com/abhishekHegde2000.png" alt="Abhishek Hegde" width="80"/> <br> <p align="center">[Abhishek Hegde](https://github.com/abhishekHegde2000) 👨‍💻</p> | <img src="https://github.com/NazTM.png" alt="Naz" width="80"/> <br> <p align="center">[Naz](https://github.com/NazTM) 👩‍💻</p> | <img src="https://github.com/kodeCraze.png" alt="Kode Craze" width="80"/> <br> <p align="center">[Kode Craze](https://github.com/kodeCraze) 👨‍💻</p> |
| <img src="https://github.com/masabinhok.png" alt="Masabin" width="80"/> <br> <p align="center">[Masabin](https://github.com/masabinhok) 👩‍💻</p> | <img src="https://github.com/Ameerjafar.png" alt="Ameer Jafar" width="80"/> <br> <p align="center">[Ameer Jafar](https://github.com/Ameerjafar) 👨‍💻</p> | <img src="https://github.com/devxMani.png" alt="Devx Mani" width="80"/> <br> <p align="center">[Devx Mani](https://github.com/devxMani) 👨‍💻</p> | <img src="https://github.com/ashish-um.png" alt="Ashish" width="80"/> <br> <p align="center">[Ashish](https://github.com/ashish-um) 👨‍💻</p> |
| <img src="https://github.com/VAmanjain.png" alt="Va Manjain" width="80"/> <br> <p align="center">[Va Manjain](https://github.com/VAmanjain) 👩‍💻</p> | <img src="https://github.com/lakshmirajvagu.png" alt="Lakshmi Rajvagu" width="80"/> <br> <p align="center">[Lakshmi Rajvagu](https://github.com/lakshmirajvagu) 👩‍💻</p> | <img src="https://github.com/knighthinata.png" alt="Knight Hinata" width="80"/> <br> <p align="center">[Knight Hinata](https://github.com/knighthinata) 👨‍💻</p> | <img src="https://github.com/ADeshmukh80.png" alt="ADeshmukh" width="80"/> <br> <p align="center">[ADeshmukh](https://github.com/ADeshmukh80) 👨‍💻</p> |

</div>

🌟 **So many talented contributors!** 🎉 Want to meet them all? Click [here](https://github.com/Jaishree2310/GlassyUI-Components/graphs/contributors) to discover the amazing team! 👩‍💻👨‍💻



---

## License

This project is licensed under the MIT License - see the [LICENSE](./LICENSE) file for details.
Expand Down
14 changes: 12 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,17 @@
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
upd-feature-branch
<div class="enhanced-bg">
</div>
<title>GlassyUI</title>
</head>
<body>
<button id="theme-toggle">Toggle Theme</button>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<title>GlassyUI</title>
</head>
Expand All @@ -53,7 +63,7 @@
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
main
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand Down
77 changes: 72 additions & 5 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
upd-feature-branch
import React, { useState, useEffect } from 'react';
import PricingDetailPage from './components/PricingDetailPage';

import React from 'react';

import {
Expand All @@ -7,6 +11,7 @@ import {
useLocation,
} from 'react-router-dom';


import ScrollProgressBar from './components/ScrollProgress'; // Import your ScrollProgressBar component
import PricingDetailPage from './components/PricingDetailPage';

Expand Down Expand Up @@ -38,19 +43,61 @@ 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';

upd-feature-branch
const ThemeToggle: React.FC = () => {
const [theme, setTheme] = useState(localStorage.getItem('theme') || 'light');

useEffect(() => {
if (theme === 'dark') {
document.documentElement.classList.add('dark');
} else {
document.documentElement.classList.remove('dark');
}
localStorage.setItem('theme', theme);
}, [theme]);

const toggleTheme = () => {
setTheme(theme === 'light' ? 'dark' : 'light');
};

return (
<button
onClick={toggleTheme}
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>
);
};

import SpinnerDetailsPage from './components/SpinnerDetailsPage';
import CheckboxDetailsPage from './components/CheckboxDetails';

const App: React.FC = () => {
return (
<Router>
<Header />
{/* Theme Toggle Button */}
className="theme-toggle-container p-4"
<ThemeToggle />


const App: React.FC = () => {
return (
<Router>
<Header />
<ScrollProgressBar /> {/* Add the ScrollProgressBar component here */}
main
<Routes>
<Route path='/' element={<GlassyUILandingPage />} />
<Route path='/components' element={<GlassyUIComponentsPage />} />
Expand Down Expand Up @@ -82,13 +129,33 @@ const App: React.FC = () => {
<Route path='/contact-details' element={<ContactUsDetailsPage />} />
<Route path='/pagination-details' element={<PaginationDetails />} />
<Route path='/testimonial-details' element={<TestimonialDetails />} />
<Route path='/product-details' element={<ProductCardDetailsPage />} />
<Route path='/gallery-details' element={<GalleryDetailsPage />} />

<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='/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='/statistic-details' element={<Statistic />} />
<Route path='/gallery-details' element={<GalleryDetailsPage />} />

<Route path='/checkbox' element={<CheckboxDetailsPage />} />

<Route path='*' element={<NotFoundPage />} />
</Routes>


<Route path='/spinner' element={<SpinnerDetailsPage />} />

Expand Down
Loading

0 comments on commit 94026fb

Please sign in to comment.