Skip to content

Commit

Permalink
Merge pull request #294 from Sawan-Kushwah/order/modelComponent
Browse files Browse the repository at this point in the history
Corrected the order of Modal component
  • Loading branch information
Jaishree2310 authored Oct 29, 2024
2 parents 9ed3902 + 0a78058 commit 32c0f24
Show file tree
Hide file tree
Showing 6 changed files with 408 additions and 71 deletions.
7 changes: 4 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ const ThemeToggle: React.FC = () => {
);
};

const App: React.FC = () => {
return (
const App: React.FC = () => {
return (

<Router>
<Header />
<ThemeToggle />
Expand Down Expand Up @@ -114,7 +115,7 @@ const App: React.FC = () => {
<Route path='/gallery-details' element={<GalleryDetailsPage />} />
<Route path='*' element={<NotFoundPage />} />
</Routes>
<ConditionalFooter />
<ConditionalFooter />
</Router>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/CheckboxDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const CheckboxDetailsPage: React.FC = () => {
</p>
<Checkbox
checked={false}
onChange={() => {}}
onChange={() => { }}
label='Disabled Checkbox'
/>
</div>
Expand Down
6 changes: 4 additions & 2 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const Footer: React.FC = () => {
</Link>
<GoogleTranslate />
</div>

</div>
<div className='footer-bottom'>
<a
Expand All @@ -38,7 +39,7 @@ const Footer: React.FC = () => {
</a>
<p>&copy; 2023 GlassyUI. All rights reserved.</p>
</div>

<style jsx>{`
.glass-footer {
backdrop-filter: blur(10px) saturate(180%);
Expand Down Expand Up @@ -127,8 +128,9 @@ const Footer: React.FC = () => {
gap: 10px;
}
}
`}</style>
<div>
<div>
<p
style={{
fontSize: '14px',
Expand Down
20 changes: 13 additions & 7 deletions src/components/GlassyUIComponentsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
ThumbsUpIcon,
Contact,
Search,

Calendar,
AlignStartVertical,
ShoppingCart,
Expand All @@ -24,7 +25,7 @@ import {
import { HiOutlineWrenchScrewdriver } from 'react-icons/hi2';
import AOS from 'aos';
import 'aos/dist/aos.css';

// Define the ComponentCardProps interface

interface ComponentCardProps {
Expand Down Expand Up @@ -226,23 +227,26 @@ const GlassyUIComponentsPage: React.FC = () => {
onClick: () => navigate('/contact-details'),
},
{
title: 'E-Commerce Product Card',
description:
'E-Commerce Product Card component with glassmorphic styling.',

title: 'E-Commerce Product Card',
description: 'E-Commerce Product Card component with glassmorphic styling.',

icon: <ShoppingCart size={24} />,
onClick: () => navigate('/product-details'),
},
{

title: 'Statistic',
description: 'Statistic component with glassmorphic styling.',
icon: <AlignStartVertical size={24} />,
icon: <AlignStartVertical size={24} />,
onClick: () => navigate('/statistic-details'),
},
{

title: 'Gallery',
description: 'Gallery component with glassmorphic styling.',
icon: <GalleryThumbnails size={24} />,
onClick: () => navigate('/gallery-details'),
onClick: () => navigate('/gallery-details'),
},
{
title: 'Glassmorphism Effect Generator',
Expand Down Expand Up @@ -362,6 +366,7 @@ const GlassyUIComponentsPage: React.FC = () => {
/>
<Search className='mx-4 cursor-pointer text-pink-300 hover:text-pink-400 transition-all duration-300' />
</div>

</header>

<main>
Expand Down Expand Up @@ -441,12 +446,13 @@ const GlassyUIComponentsPage: React.FC = () => {
</span>
<button
onClick={nextPage}

className={`px-4 py-2 mx-2 rounded-lg ${
currentPage === totalPages
? 'opacity-50 cursor-not-allowed'
: 'hover:bg-white/20'
}`}
disabled={currentPage === totalPages}
disabled={currentPage === totalPages}
>
Next
</button>
Expand Down
1 change: 1 addition & 0 deletions src/components/GlassyUILandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const GlassyUILandingPage: React.FC = () => {
/>

<div className='homeGSap relative z-10 w-full max-w-4xl'>

<header className='w-full flex justify-between items-center mb-4'>
{' '}
{/* Adjusted mb-8 to mb-4 */}
Expand Down
Loading

0 comments on commit 32c0f24

Please sign in to comment.