Skip to content

Commit

Permalink
merge changes
Browse files Browse the repository at this point in the history
  • Loading branch information
babitarit committed Mar 13, 2024
2 parents dab8961 + a853ba0 commit ac3bf90
Show file tree
Hide file tree
Showing 12 changed files with 358 additions and 38 deletions.
29 changes: 28 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projectName": "project-unagi",
"projectName": "project-udon",
"projectOwner": "dscnitrourkela",
"repoType": "github",
"repoHost": "https://github.com",
Expand All @@ -25,6 +25,33 @@
"maintenance",
"infra"
]
},
{
"login": "starkjay21",
"name": "Jayesh Nayak",
"avatar_url": "https://avatars.githubusercontent.com/u/100998898?v=4",
"profile": "https://github.com/starkjay21",
"contributions": [
"code"
]
},
{
"login": "anmol5936",
"name": "anmol5936",
"avatar_url": "https://avatars.githubusercontent.com/u/127973342?v=4",
"profile": "https://github.com/anmol5936",
"contributions": [
"code"
]
},
{
"login": "Mixel2004",
"name": "Mixel2004",
"avatar_url": "https://avatars.githubusercontent.com/u/84668201?v=4",
"profile": "https://github.com/Mixel2004",
"contributions": [
"code"
]
}
]
}
77 changes: 40 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[![Starware](https://img.shields.io/badge/Starware-⭐-black?labelColor=f9b00d)](https://github.com/zepfietje/starware)

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-1-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 -->

[![Contributors][contributors-shield]][contributors-url]
Expand Down Expand Up @@ -66,51 +68,50 @@ The UI components are built using [Shadcn/UI](https://shadcn-ui.vercel.app/).

Following technologies and libraries are used for the development of this website

- [React](https://reactjs.org/)
- [Vite](https://vitejs.dev/)
- [Tailwind CSS](https://tailwindcss.com/)
- [Shadcn/UI](https://shadcn-ui.vercel.app/)
- [Cloudflare](https://www.cloudflare.com/)
- [Redux](https://redux.js.org/)
- [Firebase](https://firebase.google.com/)
- [Netlify](https://www.netlify.com/)
- [React](https://reactjs.org/)
- [Vite](https://vitejs.dev/)
- [Tailwind CSS](https://tailwindcss.com/)
- [Shadcn/UI](https://shadcn-ui.vercel.app/)
- [Cloudflare](https://www.cloudflare.com/)
- [Redux](https://redux.js.org/)
- [Firebase](https://firebase.google.com/)
- [Netlify](https://www.netlify.com/)

## Getting Started

To setup the project locally the steps below.

### Prerequisites

- [Node.js](https://nodejs.org/en/download/)

```sh
# homebrew
brew install nodejs
- [Node.js](https://nodejs.org/en/download/)

# sudo apt (Debian based systems)
sudo apt install nodejs
```sh
# homebrew
brew install nodejs

# pacman (Arch Linux)
pacman -S nodejs
# sudo apt (Debian based systems)
sudo apt install nodejs

# module Install (Fedora)
dnf module install nodejs:<stream> # stream is the version
# pacman (Arch Linux)
pacman -S nodejs

# yum (CentOS, Red Hat)
yum install nodejs
# module Install (Fedora)
dnf module install nodejs:<stream> # stream is the version

# windows (chocolatey)
choco install nodejs
# yum (CentOS, Red Hat)
yum install nodejs

```
# windows (chocolatey)
choco install nodejs

- [PNPM](https://pnpm.io/installation)
> [!NOTE]
> Best way to install it is using `corepack`. It is recommended to use pnpm as the package manager for this project. It is faster and more efficient than npm and yarn.
```

- [PNPM](https://pnpm.io/installation)

> [!NOTE]
> Best way to install it is using `corepack`. It is recommended to use pnpm as the package manager for this project. It is faster and more efficient than npm and yarn.
- [Git](https://git-scm.com/downloads)
- [Git](https://git-scm.com/downloads)

```sh
# homebrew
Expand Down Expand Up @@ -139,11 +140,11 @@ Our Slack Community: [Slack Invite](http://bit.ly/NITRDevs) <br>

Please refer to the project's style and contribution guidelines for submitting patches and additions. In general, we follow the "fork-and-pull" Git workflow.

1. **Fork** the repo on GitHub
2. **Clone** the project to your local system
3. **Commit** changes to your own separate branch
4. **Push** your work back up to your fork
5. Submit a **Pull request** so that we can review your changes
1. **Fork** the repo on GitHub
2. **Clone** the project to your local system
3. **Commit** changes to your own separate branch
4. **Push** your work back up to your fork
5. Submit a **Pull request** so that we can review your changes

NOTE 1: Please abide by the [Contributing Guidelines](https://github.com/dscnitrourkela/project-unagi/blob/master/CONTRIBUTING.md).

Expand Down Expand Up @@ -178,7 +179,6 @@ pnpm dlx shadcn-ui@latest add <component-name>
```


#### Adding/Removing Dependencies

Following are the commands to remove/add new dependencies using yarn
Expand Down Expand Up @@ -232,12 +232,15 @@ Your appreciation makes us grow and glow up. ⭐
<table>
<tbody>
<tr>
<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-unagi/commits?author=Shurtu-gal" title="Code">💻</a> <a href="#projectManagement-Shurtu-gal" title="Project Management">📆</a> <a href="https://github.com/dscnitrourkela/project-unagi/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="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>

<!-- markdownlint-restore -->
<!-- prettier-ignore-end -->

<!-- ALL-CONTRIBUTORS-LIST:END -->
<!-- ALL-CONTRIBUTORS-LIST:END -->
Binary file added src/assets/images/image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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>
);
}
38 changes: 38 additions & 0 deletions src/components/shared/Button.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { cva } from 'class-variance-authority';
import { cn } from '../../lib/utils';

const buttonVariants = cva(['flex', 'items-center', 'justify-center', 'rounded'], {
variants: {
variant: {
primary: [
'bg-[#ff7647]',
'border',
'border-black',
'border-solid',
'rounded-[8px]',
'px-[12px]',
'py-[10px]',
'gap-[10px]',
'text-black',
'font-semibold',
],
},
size: {
large: 'text-xl',
medium: 'text-lg',
small: 'text-base',
},
},
defaultVariants: {
variant: 'primary',
size: 'medium',
},
});

export default function Button({ variant, size, className, children, ...props }) {
return (
<button className={cn(buttonVariants({ variant, size, className }))} {...props}>
{children}
</button>
);
}
45 changes: 45 additions & 0 deletions src/components/shared/Hamburger.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { cn } from '../../lib/utils';
import { cva } from 'class-variance-authority';

const hamburgerVariants = cva(['hamburger-icon', 'flex-col'], {
variants: {
isOpen: {
true: 'open',
false: 'closed',
},
},
defaultVariants: {
isOpen: false,
},
});

export default function Hamburger({ isOpen, onClick }) {
return (
<button className={cn(hamburgerVariants({ isOpen }), 'md:hidden', 'mr-[56.6px]', 'mt-2')} onClick={onClick}>
<div
id='line1'
className='md:w-[52px] w-[44px] md:h-2 h-1 bg-black mb-2 rounded-lg border-black border-solid bg-orange-600'
style={{
boxShadow: '2px 2px 0px 0px #000, 3px 4px 9.2px 0px rgba(222, 222, 222, 0.48) inset',
transition: 'transform 0.3s ease',
transform: isOpen ? 'rotate(-46deg) translateY(19px) translateX(5px)' : 'rotate(0deg)',
}}></div>

<div
id='line2'
className='md:w-[52px] w-[44px] md:h-2 h-1 bg-black mb-2 rounded-lg border-black border-solid bg-orange-600'
style={{
boxShadow: '2px 2px 0px 0px #000, 3px 4px 9.2px 0px rgba(222, 222, 222, 0.48) inset',
transform: isOpen ? 'scaleY(0)' : 'scaleY(1)',
}}></div>
<div
id='line3'
className='md:w-[52px] w-[44px] md:h-2 h-1 bg-black rounded-lg border-black border-solid bg-orange-600'
style={{
boxShadow: '2px 2px 0px 0px #000, 3px 4px 9.2px 0px rgba(222, 222, 222, 0.48) inset',
transition: 'transform 0.3s ease',
transform: isOpen ? 'rotate(45deg) translateY(-26px) translateX(3px)' : 'rotate(0deg)',
}}></div>
</button>
);
}
19 changes: 19 additions & 0 deletions src/components/shared/Logo.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { cva } from 'class-variance-authority';
import { cn } from '../../lib/utils';

const imgVariants = cva(['w-auto'], {
variants: {
size: {
small: ['h-16'],
medium: ['h-20'],
large: ['h-24'],
},
},
defaultVariants: {
size: 'medium',
},
});

export default function Logo({ className, src, alt, size, ...props }) {
return <img className={cn(imgVariants({ size, className }), 'h-[50px] w-[50px]')} src={src} alt={alt} {...props} />;
}
64 changes: 64 additions & 0 deletions src/components/shared/NavBar.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import { useState } from 'react';
import { Link } from 'react-router-dom';
import Text from './typography/Text';
import Navigation from '../../data/Navigation';
import image from '../../assets/images/image.png';
import Button from './Button';
import Logo from './Logo';
import Hamburger from './Hamburger';

function NavBar() {
const { navItems, logo } = Navigation;
const [isNavOpen, setIsNavOpen] = useState(false);

const toggleNav = () => {
setIsNavOpen(!isNavOpen);
};

return (
<nav style={{ position: 'sticky', top: '0' }}>
<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 '
style={{ backgroundImage: `url(${image})` }}>
<Logo src={logo.src} alt={logo.alt} />
<div className={`navitem md:flex ${isNavOpen ? 'hidden' : 'flex'} hidden`}>
{navItems.map((item, index) => (
<Link to={item.link} key={index}>
<Text variant='nav' className='mx-[55px] max-[1100px]:mx-[25px]'>
{item.name}
</Text>
</Link>
))}
</div>
<div>
<Hamburger onClick={toggleNav} isOpen={isNavOpen}></Hamburger>
<Button
variant='primary'
size='medium'
className='mr-[56.6px] hidden md:flex'
style={{
boxShadow: '2px 2px 0px 0px #000, 3px 4px 9.2px 0px rgba(222, 222, 222, 0.48) inset',
}}>
<Text variant='navButton'>Login</Text>
</Button>
</div>
</div>
<div className='w-full' style={{ height: '1px', backgroundColor: 'black' }}></div>
{isNavOpen && (
<div
className='navMobile flex flex-col justify-center bg-[#252525] items-center gap-[41px] h-[376px] text-white md:hidden'
style={{ position: 'absolute', top: '74px', left: '0', right: '0', bottom: '0' }}>
{navItems.map((item, index) => (
<Link to={item.link} key={index}>
<Text variant='nav' className='mx-[55px]'>
{item.name}
</Text>
</Link>
))}
</div>
)}
</nav>
);
}

export default NavBar;
Loading

0 comments on commit ac3bf90

Please sign in to comment.