Skip to content

Commit

Permalink
Merged dev into Footer
Browse files Browse the repository at this point in the history
  • Loading branch information
Vivek-68 committed Aug 30, 2023
2 parents 028f415 + f6f7532 commit 86c6b5d
Show file tree
Hide file tree
Showing 16 changed files with 487 additions and 77 deletions.
6 changes: 5 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Srijan 2023</title>
<link
rel="icon"
href="https://res.cloudinary.com/dp92qug2f/image/upload/v1692721416/SriGen4.0/coming%20soon/6-removebg-preview_bnogvg.webp"
/>
<title>SriGen 2023</title>
</head>
<body>
<div id="root"></div>
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"dependencies": {
"@vitejs/plugin-react": "^2.2.0",
"aos": "3.0.0-beta.6",
"hamburger-react": "^2.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.7.1",
Expand Down
42 changes: 11 additions & 31 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions public/logos/srijan-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions src/Components/About/About.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,33 @@
display: flex;
flex-direction: column;
width: 50%;
margin: 0 auto;
}
.abt_event,
.abt_nits {
margin: 7% 0;
}
.abt_head {
font-family: var(--srijan4-font-2);
font-weight: bold;
font-size: 1.5rem;
line-height: 50px;
font-weight: 600;
font-size: 4vh;
line-height: 4vh;
margin-bottom: 5vh;
}

.aboutti {
color: #fff;
}

.abt_span {
// background: linear-gradient(180deg, #b621fe 0%, #1fd1f9 100%);
background: linear-gradient(180deg, #0704b9 0%, #b4015f 100%);
-webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent;
// color: #fff !important;
}
.abt_content {
font-family: var(--srijan4-font-2);
font-weight: 600;
font-weight: 500;
position: relative;
font-size: 1.3rem;
line-height: 35.8px;
Expand All @@ -54,11 +54,11 @@
justify-content: center;
align-items: center;
position: sticky;
top: 25%;
top: 18%;
right: 7%;
height: fit-content;
transition: 0.5s ease;
margin: 0 auto;
margin: 3vh auto;
}
.abt_animRotate {
transform: rotate(180deg);
Expand Down Expand Up @@ -127,7 +127,7 @@
width: 50%;
}
.abt_head {
font-size: 1.25rem;
font-size: 3vh;
}
.abt_content {
font-size: 1.1rem;
Expand Down Expand Up @@ -162,7 +162,7 @@
width: 100vw;
}
.abt_head {
font-size: 1.5rem;
font-size: 2vh;
line-height: 50px;
width: 90%;
margin: auto;
Expand Down
36 changes: 29 additions & 7 deletions src/Components/Hero/Hero.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,43 @@ const Hero = () => {
window.addEventListener("scroll", handleScroll);
return (
<div className={style.container} onScroll={handleScroll}>
<img className={style.bg} src="/images/bg.png" alt="bg" />
<img className={style.rocket} id="rocket" src="/images/rocket.png" alt="rocket" />
<img className={style.rocks} id="rocks" src="/images/rocks.png" alt="rocks" />
<img
className={style.bg}
src="https://res.cloudinary.com/dmvik1vtf/image/upload/v1693216721/bg_hqgu2o.webp"
alt="bg"
/>
<img
className={style.rocket}
id="rocket"
src="https://res.cloudinary.com/dmvik1vtf/image/upload/v1693217742/rocket_lq97jf.webp"
alt="rocket"
/>
<img
className={style.rocks}
id="rocks"
src="https://res.cloudinary.com/dmvik1vtf/image/upload/v1693218694/rocks_l5lams.webp"
alt="rocks"
/>
<img
className={style.srigentext}
id="text"
src="/images/srigentext.png"
src="https://res.cloudinary.com/dmvik1vtf/image/upload/v1693219453/srigentext_pfb2dg.webp"
alt="srigentext"
/>
<img className={style.cliff} src="/images/cliff.png" alt="cliff" />
<img className={style.bridge} src="/images/bridge.png" alt="bridge" />
<img
className={style.cliff}
src="https://res.cloudinary.com/dmvik1vtf/image/upload/v1693217098/cliff_dsg8l2.webp"
alt="cliff"
/>
<img
className={style.bridge}
src="https://res.cloudinary.com/dmvik1vtf/image/upload/v1693216882/bridge_idqs4g.webp"
alt="bridge"
/>
<img
className={style.astronaut}
id="astronaut"
src="/images/astronaut.png"
src="https://res.cloudinary.com/dmvik1vtf/image/upload/v1693216512/astronaut_vhtypt.webp"
alt="astronaut"
/>
</div>
Expand Down
5 changes: 2 additions & 3 deletions src/Components/Hero/Hero.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
height: 100vh;
overflow: hidden;
position: relative;

.bg,
.cliff,
.bridge,
Expand Down Expand Up @@ -63,9 +62,9 @@
}
.astronaut {
width: 15em;
height: 20em;
height: 18em;
position: absolute;
bottom: -9em;
bottom: -10em;
left: 10%;
animation: animate 1.5s ease forwards;

Expand Down
117 changes: 116 additions & 1 deletion src/Components/Navbar/Navbar.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,121 @@
import { useState, useEffect, useRef } from "react";
import { NavLink } from "react-router-dom";
import style from "./Navbar.module.scss";

const Navbar = () => {
return <nav className={style.navbar}>Navbar</nav>;
const [menuActive, setMenuActive] = useState(false);

const toggleMenu = () => {
setMenuActive(!menuActive);
};
const handleKeyDown = (e) => {
if (e.key === "Enter") {
toggleMenu();
}
};

const menuRef = useRef();
const hamRef = useRef();

useEffect(() => {
const handler = (e) => {
if (!menuRef.current.contains(e.target) && !hamRef.current.contains(e.target)) {
setMenuActive(false);
}
};
document.addEventListener("mousedown", handler);
return () => {
document.removeEventListener("mousedown", handler);
};
}, []);

useEffect(() => {
if (menuActive === true) {
document.body.style.height = "100dvh";
document.body.style.overflow = "hidden";
} else {
document.body.style.height = "";
document.body.style.overflow = "";
}
}, [menuActive]);

return (
<nav className={style.navbar}>
<img className={style.logo} src="/logos/srijan-logo.svg" alt="srijan-logo"></img>
<div
className={style.hamburger}
role="button"
tabIndex={0}
onClick={toggleMenu}
onKeyDown={handleKeyDown}
>
<div className={menuActive ? `${style.hamActive}` : `${style.ham}`} ref={hamRef}>
<span className={menuActive ? `${style.barActive}` : `${style.bar}`}></span>
<span className={menuActive ? `${style.barActive}` : `${style.bar}`}></span>
</div>
</div>
<div className={menuActive ? `${style.activate}` : `${style.menu}`} ref={menuRef}>
<ul className={style.mainMenu}>
<li className={`${style.active} ${style.item}`}>
<NavLink
className={({ isActive }) => (isActive ? style.linkActive : style.links)}
to="#!"
>
Home
</NavLink>
</li>
<li className={style.item}>
<NavLink
className={({ isActive }) => (isActive ? style.linkActive : style.links)}
to="#!"
>
Gallery
</NavLink>
</li>
<li className={style.item}>
<NavLink
className={({ isActive }) => (isActive ? style.linkActive : style.links)}
to="#!"
>
Events
</NavLink>
</li>
<li className={style.item}>
<NavLink
className={({ isActive }) => (isActive ? style.linkActive : style.links)}
to="#!"
>
Workshops
</NavLink>
</li>
<li className={style.item}>
<NavLink
className={({ isActive }) => (isActive ? style.linkActive : style.links)}
to="#!"
>
Speakers
</NavLink>
</li>
<li className={style.item}>
<NavLink
className={({ isActive }) => (isActive ? style.linkActive : style.links)}
to="#!"
>
Team
</NavLink>
</li>
<li className={style.item}>
<NavLink
className={({ isActive }) => (isActive ? style.linkActive : style.links)}
to="#!"
>
Contact
</NavLink>
</li>
</ul>
</div>
</nav>
);
};

export default Navbar;
Loading

0 comments on commit 86c6b5d

Please sign in to comment.