Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add components to homepage #22

Merged
merged 6 commits into from
Mar 17, 2024
Merged

chore: add components to homepage #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72e912b
chore: add components to homepage
ashutosh-rath02 Mar 17, 2024
6bd09e5
Merge branch 'main' into chore/homepage
Shurtu-gal Mar 17, 2024
3c2aa2b
chore: float the navbar
Shurtu-gal Mar 17, 2024
cfd0771
chore: set hero z-index to -ve index
Shurtu-gal Mar 17, 2024
222effe
chore: set position to relative
Shurtu-gal Mar 17, 2024
f994622
chore: use tailwind
Shurtu-gal Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Hero.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { imgURLs } from '../data/eventsData';

const Hero = () => {
return (
<div className='mx-5 lg:mx-14 xl:max-w-[1483px]'>
<div className='mx-5 lg:mx-14 xl:max-w-[1483px] -z-1 relative'>
<div className='flex flex-col md:flex-row justify-center items-center min-h-screen gap-20 lg:gap-10'>
<div className='w-[100%] md:w-1/2 h-fit'>
<div className='flex flex-col justify-end ml-2' style={{ color: '#FF4409' }}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/shared/NavBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ function NavBar() {
};

return (
<nav style={{ position: 'sticky', top: '0' }}>
<nav className='sticky top-0 z-20'>
<div
className='navbar flex justify-between items-center opacity-53 bg-hard-light bg-center bg-cover bg-[#F9F5F2] h-[73.8px] overflow-hidden pl-10 '
className='navbar flex justify-between items-center opacity-53 bg-hard-light bg-center bg-cover bg-[#F9F5F2] h-[73.8px] overflow-hidden pl-10'
style={{ backgroundImage: `url(${image})` }}>
<Logo src={logo.src} alt={logo.alt} />
<div className={`navitem md:flex ${isNavOpen ? 'hidden' : 'flex'} hidden`}>
Expand Down
39 changes: 11 additions & 28 deletions src/pages/home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,17 @@
import { Link } from 'react-router-dom';
import { Button } from '../components/ui/button';
import AboutUs from '../components/AboutUs';
import FAQ from '../components/FaqSection/faq';
import Hero from '../components/Hero';
import Navbar from '../components/shared/NavBar';
import Footer from '../components/shared/marginals/footer';

export default function Home() {
return (
<div className='container py-6'>
<h1 className='text-3xl font-bold'>1999 Reunion Tour</h1>
<div className='mt-4'>
<h2 className='text-xl font-bold'>How to contribute</h2>
<p>
1. Store content and other data in <code className='bg-gray-200 p-1 rounded-sm'>data</code> folder.
</p>
<p>
2. Store reusable components in <code className='bg-gray-200 p-1'>components</code> folder.
</p>
<p>
3. Store pages in <code className='bg-gray-200 p-1'>pages</code> folder.
</p>
<p>
4. Add custom styles in <code className='bg-gray-200 p-1'>tailwind.config.css</code> file.
</p>
<p>
5. Add shared ui in <code className='bg-gray-200 p-1'>ui</code> folder.
</p>
<p>
6. Add images and other assets in <code className='bg-gray-200 p-1'>assets</code> folder.
</p>
</div>
<Link to='/play'>
<Button>Go to playground</Button>
</Link>
<div className=''>
<Navbar />
<Hero />
<AboutUs />
<FAQ />
<Footer />
</div>
);
}
Loading