Skip to content

Commit

Permalink
Merge branch 'main' into hero/arya
Browse files Browse the repository at this point in the history
  • Loading branch information
Srish-ty authored Mar 13, 2024
2 parents 25b1a1a + a853ba0 commit 355620d
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@
"contributions": [
"code"
]
},
{
"login": "Mixel2004",
"name": "Mixel2004",
"avatar_url": "https://avatars.githubusercontent.com/u/84668201?v=4",
"profile": "https://github.com/Mixel2004",
"contributions": [
"code"
]
}
]
}
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->

[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-)

<!-- ALL-CONTRIBUTORS-BADGE:END -->

Expand Down Expand Up @@ -235,6 +235,7 @@ Your appreciation makes us grow and glow up. ⭐
<td align="center" valign="top" width="14.28%"><a href="http://ashishpadhy.live"><img src="https://avatars.githubusercontent.com/u/100484401?v=4?s=100" width="100px;" alt="Ashish Padhy"/><br /><sub><b>Ashish Padhy</b></sub></a><br /><a href="https://github.com/dscnitrourkela/project-udon/commits?author=Shurtu-gal" title="Code">💻</a> <a href="#projectManagement-Shurtu-gal" title="Project Management">📆</a> <a href="https://github.com/dscnitrourkela/project-udon/commits?author=Shurtu-gal" title="Tests">⚠️</a> <a href="#maintenance-Shurtu-gal" title="Maintenance">🚧</a> <a href="#infra-Shurtu-gal" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/starkjay21"><img src="https://avatars.githubusercontent.com/u/100998898?v=4?s=100" width="100px;" alt="Jayesh Nayak"/><br /><sub><b>Jayesh Nayak</b></sub></a><br /><a href="https://github.com/dscnitrourkela/project-udon/commits?author=starkjay21" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/anmol5936"><img src="https://avatars.githubusercontent.com/u/127973342?v=4?s=100" width="100px;" alt="anmol5936"/><br /><sub><b>anmol5936</b></sub></a><br /><a href="https://github.com/dscnitrourkela/project-udon/commits?author=anmol5936" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Mixel2004"><img src="https://avatars.githubusercontent.com/u/84668201?v=4?s=100" width="100px;" alt="Mixel2004"/><br /><sub><b>Mixel2004</b></sub></a><br /><a href="https://github.com/dscnitrourkela/project-udon/commits?author=Mixel2004" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
53 changes: 53 additions & 0 deletions src/components/AboutUs.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { PersonalizedText, Paragraph } from './shared/typography/index.jsx';
import aboutUsData from '../data/aboutUsData.js';

export default function AboutUs() {
return (
<section>
<div className='container py-6 flex flex-col items-center md:pb-[30px] sm:pb-[51px]'>
<Paragraph variant='body2' className='text-center text-xs sm:text-2xl font-semibold'>
{aboutUsData.tag1}
<br />
{aboutUsData.tag2}
<span className='font-syne text-left text-base sm:text-3.5xl font-extrabold'>
{aboutUsData.tag3_char1}
<span className='relative underline decoration-wavy decoration-1 sm:decoration-2 underline-offset-4 sm:underline-offset-8 decoration-primary-foreground -z-50'>
{aboutUsData.tag3_wavy}
</span>
{aboutUsData.tag3}
</span>
</Paragraph>
</div>

<div className='flex justify-between px-[0px] sm:px-[77px] md:px-[115px] lg:px-[175px] grid grid-cols-1 sm:grid-cols-3 gap-3 pb-[70px] sm:pb-[130px] md:pb-[135px]'>
{aboutUsData.lists.map((list, index) => (
<div key={index} className='flex flex-col pb-[10px]'>
<img src={list.img_url} alt={list.title} className='mx-auto md:w-[85px] sm:w-[70px] w-[55px] pb-[15px]' />
<Paragraph variant='body2' className='text-center font-bold text-xs sm:text-2xl'>
{list.title}
</Paragraph>
</div>
))}
</div>

<PersonalizedText
className='relative pl-[20px] sm:pl-[90px] md:pl-[80px] lg:pl-[90px] xl:pl-[100px] 2xl:pl-[300px] pb-[50px] sm:pb-[32px] md:pb-[23px] lg:pb-[33px] text-[8px] sm:text-base xl:text-base 2xl:text-lg -z-50'
style={{ transform: 'rotate(-10.62deg)', transformOrigin: '0 0', color: '#FF6108', fontWeight: '400' }}>
You all are coming right ??...
</PersonalizedText>

<Paragraph
variant='body2'
className='text-center mx-auto px-[30px] sm:px-[135px] mt-[-60px] pb-[25px] sm:pb-[40px] md:pb-[55px] lg:pb-[80px] text-xs sm:text-2xl'>
{aboutUsData.content1}{' '}
<span className='font-syne text-left text-base sm:text-3.5xl font-bold mr-[15px]'> {aboutUsData.content2}</span>
<img
src={aboutUsData.star_img_url}
alt='star'
className='sm:h-[76px] sm:w-[76px] h-[45px]'
style={{ display: 'inline-block', verticalAlign: 'top' }}
/>
</Paragraph>
</section>
);
}
28 changes: 28 additions & 0 deletions src/data/aboutUsData.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
const aboutUsData = {
tag1: "Let's relive & celebrate ",
tag2: 'our ',
tag3_char1: 'g',
tag3_wavy: 'ood day',
tag3: 's Together',
lists: [
{
title: 'Rewind',
img_url: 'https://res.cloudinary.com/dkivz06xv/image/upload/v1710089259/xqpydhigob3opgpzyv1a.png',
},
{
title: 'Reunite',
img_url: 'https://res.cloudinary.com/dkivz06xv/image/upload/v1710089483/kkubnibzjiyaevv6m2gr.png',
},
{
title: 'Rejoice',
img_url: 'https://res.cloudinary.com/dkivz06xv/image/upload/v1710089259/j9zi48resont3yqnudmm.png',
},
],
content1:
'Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur',
content2:
'aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem',
star_img_url: 'https://res.cloudinary.com/dkivz06xv/image/upload/v1710089645/rvqsfd4sqaclbthidnxl.png',
};

export default aboutUsData;

0 comments on commit 355620d

Please sign in to comment.