Skip to content

Commit

Permalink
landing page prepare for algo2025, event page enhancecments
Browse files Browse the repository at this point in the history
  • Loading branch information
sabzdotpy committed Dec 26, 2024
1 parent b01f739 commit 0acfde3
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 39 deletions.
8 changes: 5 additions & 3 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export default function App() {
<Route path="/events" element={<EventTemplate />}></Route>
<Route path="/contact" element={<Contact />}></Route>
<Route path="/algo2025" element={<EventRegister />}></Route>
<Route path="/Algorithmist25" element={<EventRegister />}></Route>


{
Expand All @@ -96,11 +97,8 @@ export default function App() {
<Route path="/hero" element={<Landing />}></Route>

{/* EVENTS */}
<Route path="/events/project-expo" element={ <ProjectExpo /> }></Route>
{/* <Route path="/events/project-expo/register" element={ <ProjectExpoRegister /> }></Route> */}
<Route path="/events/prajnotsavah" element={ <ProjectExpo /> }></Route>
{/* <Route path="/events/prajnotsavah/register" element={ <ProjectExpoRegister /> }></Route> */}
<Route path="/events/prajnotsavah/success" element={ <ProjectExpoRegistrationSuccess /> }></Route>

<Route path="/geekfest24/results" element={ <GeekfestResults /> }></Route>

Expand All @@ -113,6 +111,10 @@ export default function App() {
{/* <Route path="/co/decraft" element={<CodeClash />}></Route> */}
{/* <Route path="/enrollment" element={ <StudentEnrollment /> }></Route> */}
{/* <Route path="/enrollment/form" element={<Student_enroll_form />}></Route> */}
{/* <Route path="/events/project-expo" element={ <ProjectExpo /> }></Route> */}
<Route path="/events/prajnotsavah" element={ <ProjectExpo /> }></Route>
{/* <Route path="/events/prajnotsavah/success" element={ <ProjectExpoRegistrationSuccess /> }></Route> */}



{/* DASHBOARD */}
Expand Down
12 changes: 6 additions & 6 deletions src/pages/Main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ export default function Main() {
<NavLink to="/" className={({ isActive }) => (isActive ? 'menuLink hideOnMobile noStyle active' : 'menuLink hideOnMobile noStyle')}>
Home
</NavLink>

{/*
<NavLink to="/events" className={({ isActive }) => (isActive ? 'menuLink hideOnMobile noStyle active' : 'menuLink hideOnMobile noStyle')}>
Events
</NavLink>
<NavLink to="/contact" className={({ isActive }) => (isActive ? 'menuLink hideOnMobile noStyle active' : 'menuLink hideOnMobile noStyle')}>
Contact
</NavLink>
</NavLink> */}

{
(USER_PRESENT()) ?
Expand Down Expand Up @@ -98,13 +98,13 @@ export default function Main() {
<Link to="/events">Events</Link>
</span> */}
<span>
<Link to="/dashboard">Dashboard</Link>
<Link to="/">Home</Link>
</span>
<span>
{/* <span>
<Link to="/members">Members</Link>
</span>
</span> */}
<span>
<Link to="/events/prajnotsavah">Prajnotsavah 2K24</Link>
<Link to="/events/algo2024">Algorithmist '25</Link>
</span>
{/* <span>Contact</span> */}
{/* <span>
Expand Down
18 changes: 18 additions & 0 deletions src/styles/EventRegister.scss
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ strong {


.roundDesc {
padding-right: .5rem !important;
// background-color: yellow;
}
}
Expand Down Expand Up @@ -537,6 +538,10 @@ strong {
.registerBtn {
background-color: rgb(2, 123, 10);
color: white;

&.loading {
background-color: rgb(49, 32, 11) !important;
}
}
}

Expand Down Expand Up @@ -695,6 +700,19 @@ strong {
margin: 1rem auto 2rem auto;
border-radius: 10px;
transition: all .3s ease;
display: flex;
justify-content: center;
align-items: center;
gap: 0.5rem;

svg {
animation: rotate 1s ease infinite;
}

&.loading {
background-color: rgb(49, 32, 11);
cursor: not-allowed !important;
}

&:hover {
border-color: transparent;
Expand Down
21 changes: 18 additions & 3 deletions src/styles/Landing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ $text: #e0e1e1;
display: flex;
gap: 1rem;

button.menuButton {
.menuButton {
all: unset;
z-index: 9 !important;
cursor: pointer;
Expand All @@ -91,10 +91,21 @@ $text: #e0e1e1;
font-size: .9rem;
transition: all .3s ease;


&:hover {
background-color: $background;
color: $text;
color: $text !important;
}

&.highlight {
background-color: rgb(255, 152, 152);

&:hover {
background-color: rgb(65, 13, 13);
color: rgb(255, 206, 206) !important;
}
}

}
}
}
Expand All @@ -113,6 +124,7 @@ $text: #e0e1e1;
backdrop-filter: blur(8px);

transition: all .25s cubic-bezier(1 , 0 , 0 , 1);
overflow: hidden;

&.open {
transform: translateY(0);
Expand Down Expand Up @@ -171,6 +183,7 @@ $text: #e0e1e1;
padding: 1rem 2rem;
margin-left: 2rem;
font-size: 2rem;
max-width: max-content;

transition: all .4s ease ;

Expand Down Expand Up @@ -839,7 +852,9 @@ $text: #e0e1e1;


.chapterIntro {
height: 80vh;
height: 90vh;
margin-top: 5rem;
padding-bottom: 7rem;

.subText {
margin-bottom: 1rem;
Expand Down
35 changes: 20 additions & 15 deletions src/views/EventRegister.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { useState, useEffect, useRef } from "react";

import eventCoverImage from "../assets/events_cover.jpeg";
import quiz from "../assets/quiz.avif";
import seminar from "../assets/seminar.avif";
import qna from "../assets/qna.avif";
import debug from "../assets/debug.jpg";
import coding from "../assets/coding.png";

// -----------------------------------

Expand All @@ -16,6 +11,7 @@ import { AiOutlineLoading, AiOutlineCheck } from "react-icons/ai";
import { BiSolidPhoneCall, BiLinkExternal } from "react-icons/bi";
import { CiCircleInfo, CiWarning } from "react-icons/ci";
import { PiSparkleThin } from "react-icons/pi";
import { FiLoader } from "react-icons/fi";

import { TfiMoney } from "react-icons/tfi";

Expand Down Expand Up @@ -195,7 +191,7 @@ export default function EventRegister() {
}, []);

useEffect(() => {
if (modalOpen || !usingKluMail) {
if (modalOpen) {
window.scrollTo(0, 0);
document.body.style.overflowY = "hidden";
} else document.body.style.overflowY = "auto";
Expand Down Expand Up @@ -273,9 +269,14 @@ export default function EventRegister() {
different algorithms and gain practical
skills to apply them in real-world
scenarios.
<strong>Cash prizes and exciting rewards
from GeeksforGeeks are provided for the top
three performers in each round.</strong>
<br />
<br />
<p>
<strong>Registration Fee: 200/- per person.</strong>
<br /><br />
<strong>2 Credits under EE</strong> will be provided for all participants.
Cash prizes and exciting swags from GeeksforGeeks for the top three performers in each round.
</p>
</div>

<div className="startsIn">
Expand Down Expand Up @@ -390,7 +391,7 @@ export default function EventRegister() {
Registration Deadline
</div>
<div className="content">
26th Dec 2025, 6PM
02 Jan 2025, 12:59PM
</div>
</div>
</div>
Expand Down Expand Up @@ -510,7 +511,7 @@ export default function EventRegister() {
More info about the 30 algorithms can be found <a href="https://gfgkare.github.io/Algorithmist25" target="_blank">here. <BiLinkExternal /></a>
</span>
<span className="external">
More info about all the 5 rounds can be found <a href="https://gfgkare.github.io/Algorithmist2024Rounds/" target="_blank">here. <BiLinkExternal /></a>
More info about all the 5 rounds can be found <a href="https://gfgkare.github.io/Algorithmist2025Rounds/" target="_blank">here. <BiLinkExternal /></a>
</span>

</div>
Expand All @@ -525,8 +526,8 @@ export default function EventRegister() {
<div className="registerBtnContainer">
{USER_PRESENT() ? (
eventRegisteringInProgress ? (
<div className="registerBtn">
Registering...
<div className="registerBtn loading">
<FiLoader className="icon" /> Registering
</div>
) : eventRegisterStatus === "registered" ? (
<div className="registerBtn">
Expand All @@ -535,7 +536,11 @@ export default function EventRegister() {
) : (
<div
className="registerBtn"
onClick={() => setModalOpen(true)}
onClick={
() => {
setModalOpen(true);
prefillRegistrationFields();
}}
>
Register!
</div>
Expand Down Expand Up @@ -733,7 +738,7 @@ export default function EventRegister() {
<div className="row">
<button>
{eventRegisteringInProgress
? "Registering..."
? <> <FiLoader /> Registering </>
: "Register"}
</button>
</div>
Expand Down
30 changes: 18 additions & 12 deletions src/views/Landing.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import eventPlaceholderImage from "../assets/pinkAndWhiteMovement.gif"
// Hero section images
import kluTeam from "../assets/klu_team.jpg"
import algo2024 from "../assets/prajnotsavah/4.jpg"
import geekfest24 from "../assets/prajnotsavah/3.jpg"

import prajnotsavah_guest from "../assets/landing_page_elements/landing_pe.png"

Expand Down Expand Up @@ -56,6 +57,7 @@ export default function Landing() {
const { scrollY } = useScroll();

const fullScreenNav = useRef(null);
const [fullScreenNavOpen, setFullScreenNavOpen] = useState(false);

const [pageLoading, setPageLoading] = useState(true);
const [direction, setDirection] = useState('up');
Expand Down Expand Up @@ -85,13 +87,13 @@ export default function Landing() {
},[])

useEffect(() => {
if (pageLoading) {
if (pageLoading || fullScreenNavOpen) {
document.body.style.overflow = "hidden";
}
else {
document.body.style.overflow = "auto"
}
}, [pageLoading])
}, [pageLoading, fullScreenNavOpen])

useEffect(() => {
if (rocketAnimationOver) {
Expand All @@ -114,27 +116,31 @@ export default function Landing() {

{/* FULL SCREEN NAV, OPENS ONLY IN MOBILE VIEW. */}
<ScrollContainer>
<div className="fullScreenNav" ref={fullScreenNav} >
<button className="closeMenuButton" onClick={() => fullScreenNav.current.classList.remove("open")} >
<nav className={`${(fullScreenNavOpen ? "fullScreenNav open": "fullScreenNav")}`} ref={fullScreenNav} >
<button className="closeMenuButton" onClick={() => setFullScreenNavOpen(false)}>
<MdCloseFullscreen />
</button>
<div className="fullScreenItemsContainer">
<div className="fullScreenItem">
{/* <div className="fullScreenItem">
<CLink to="/events">Events</CLink>
</div>
<div className="fullScreenItem">
<CLink to="/contact">Contact</CLink>
</div> */}
<div className="fullScreenItem">
<CLink to="/algo2025">Algorithmist '25</CLink>
</div>
</div>
</div>
</nav>

{/* NORMAL NAV, VISIBLE IN DESKTOP */}
<nav className={"nav"}>
<div className="logoContainer">
<img className="gfgLogo" src={gfgLogo} alt="Gfg Kare's logo"/>
</div>
<div className="rightMenu">
<button className="menuButton" onClick={() => fullScreenNav.current.classList.toggle("open")} >Menu</button>
<CLink to={"/algo2025"} className="menuButton highlight hideOnMobile">Algorithmist 25</CLink>
<button className="menuButton" onClick={() => setFullScreenNavOpen(true)} >Menu</button>
</div>
</nav>

Expand Down Expand Up @@ -210,7 +216,7 @@ export default function Landing() {
<div className="pin"><IoPin size={"25px"} /></div>
<div className="cardContent">
<div className="cardImage">
<img src={kluTeam} alt="" />
<img src={geekfest24} alt="" />
</div>
<div className="cardText">
06/09/2022
Expand Down Expand Up @@ -258,11 +264,11 @@ export default function Landing() {


<section className="divider" id="events">
<div className="bigText">Events</div>
<div className="subText">Our incredible works!</div>
{/* <div className="bigText">MORE STUFF COMING SOON!</div> */}
<div className="subText">MORE STUFF COMING SOON!</div>
</section>

<section className="fullScreenSection eventsDiv">
{/* <section className="fullScreenSection eventsDiv">
<div className="eventsContainer">
<div className="eventNamesContainer">
Expand Down Expand Up @@ -342,7 +348,7 @@ export default function Landing() {
<section className="fullScreenSection eventsDiv">
</section>
</section> */}
</ScrollContainer>


Expand Down

0 comments on commit 0acfde3

Please sign in to comment.