Skip to content
Merged

Dev #75

Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions frontend/src/app/(pages)/AboutTheEventPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ import { cabinetExtraBold } from "@/fonts";
import Laptop from "@/app/assets/icons/Laptop";
import CoffeCup from "@/app/assets/icons/CoffeeCup";
import DarinCup from "@/app/assets/icons/DarinCup";
import DarinRedBull from "../assets/icons/DarinRedBull";
import Guitar from "@/app/assets/icons/Guitar";

import gsap from "gsap";
import { ScrollTrigger } from "gsap/dist/ScrollTrigger";
import { useGSAP } from "@gsap/react";
import DarinCupPhone from "../assets/icons/DarinCupPhone";
import AboutVine from "../assets/icons/AboutVine";
import DarinRedBullPhone from "../assets/icons/DarinRedBullPhone";

if (typeof window !== "undefined") {
gsap.registerPlugin(ScrollTrigger);
Expand Down Expand Up @@ -107,13 +109,19 @@ export default function Home() {
/>

{/* For Large Screens */}
<DarinCup
{/* <DarinCup
height={843}
width={424}
className="darin-anim absolute z-30 -bottom-[100px] right-[-150px] hidden lg:block"
/> */}
<DarinRedBull
height={858}
width={334}
className="darin-anim absolute z-30 -bottom-[100px] right-[-40px] hidden lg:block"
/>
{/* For Phone Screens */}
<DarinCupPhone className="darin-anim-ph absolute z-30 right-0 bottom-[50px] block lg:hidden" />
{/* <DarinCupPhone className="darin-anim-ph absolute z-30 right-0 bottom-[50px] block lg:hidden" /> */}
<DarinRedBullPhone className="darin-anim-ph absolute z-30 right-0 bottom-[50px] block lg:hidden" />

<div className="pb-[280px] pt-[100px]">
<h1
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/app/(pages)/Mentors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import leaf_prizes_right from "@/app/assets/images/leaf_prizes_right.svg";
const Mentors = () => {
return (
<>
{/*

<div key="MentorContainer" className="w-full m-auto py-10 bg-dark-purple">
<div
key="MentorContainer"
className=" relative flex items-center flex-col my-20"
>
<h1 className={`headings ${cabinetExtraBold.className}`}>
Mentors for DeerHack 2025
Mentors for DeerHack 2026
</h1>
<Image
src={leaf_prizes_right}
Expand All @@ -24,7 +24,7 @@ const Mentors = () => {
<MentorsSection />
</div>
</div>
*/}

</>
);
};
Expand Down
144 changes: 144 additions & 0 deletions frontend/src/app/assets/icons/DarinRedBull.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
507 changes: 507 additions & 0 deletions frontend/src/app/assets/icons/DarinRedBull.tsx

Large diffs are not rendered by default.

155 changes: 155 additions & 0 deletions frontend/src/app/assets/icons/DarinRedBullPhone.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
544 changes: 544 additions & 0 deletions frontend/src/app/assets/icons/DarinRedBullPhone.tsx

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions frontend/src/app/assets/images/sponsors/PrabhuBank.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions frontend/src/app/components/About/AboutCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@ export default function AboutCard({
</div>

<h1
className={`text-[16px] md:text-[32px] lg:text-6xl text-main-title w-fit text-primary-gradient-color ${cabinetExtraBold.className} lg:text-[36px] leading-normal tracking-normal text-start`}
className={`text-[32px] md:text-[32px] lg:text-6xl text-main-title w-fit text-primary-gradient-color ${cabinetExtraBold.className} lg:text-[36px] leading-normal tracking-normal text-start`}
>
{title}
</h1>
</div>

<div
className={` text-magnolia text-[12px] md:text-[16px] text-left lg:text-[20px] ${satoshiRegular.className} leading-7 sm:leading-8 tracking-tighter md:tracking-wide md:pr-24 `}
className={` text-magnolia text-[16px] md:text-[16px] text-left lg:text-[20px] ${satoshiRegular.className} leading-7 sm:leading-8 tracking-tighter md:tracking-wide md:pr-24 `}
>
<p>{description}</p>
</div>
Expand Down
103 changes: 55 additions & 48 deletions frontend/src/app/components/Mentors/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,84 +34,91 @@
import Mentors from "@/app/types/mentors"

const Mentors_value: Mentors[] = [
{
name: "Bishal Joshi",
position: "Software Engineer",
linkedin_url: "https://www.linkedin.com/in/bishal-joshi-7a3711203",
image: "https://ghostuf.github.io/static_images/bishal_joshi.jpeg",
},
{
name: "Toshika Ojha",
position: "Client Success Consultant",
linkedin_url: "https://www.linkedin.com/in/toshikaojha/",
image:"https://ghostuf.github.io/static_images/toshika_ojha.jpg"

{
name: "Mamata Maharjan",
position: "Sr. Data Engineer",
linkedin_url: "https://www.linkedin.com/in/mamata-maharjan-b4197b178",
image: "https://enkoki.github.io/static_images/deerhack26/Mamata_Maharjan.jpg"
},
{
name: "Luja Chitrakar",
position: "Blockchain Developer",
linkedin_url: "https://www.linkedin.com/in/luja-chitrakar/",
image:"https://ghostuf.github.io/static_images/luja_chitrakar.jpeg"
{
name: "Rahul Raj Singh",
position: "Robotics Engineer",
linkedin_url: "https://www.linkedin.com/in/rahulrajshah",
image: "https://enkoki.github.io/static_images/deerhack26/Rahul_Raj_Shah.jpg"
},
{

{
name: "Mala Deep Upadhaya",
position: "Data Consultant",
position: "Data Consultant / Dataksha Analytics",
linkedin_url: "https://www.linkedin.com/in/maladeep",
image: "https://ghostuf.github.io/static_images/mala_deep_upadhyaya.jpg"
},
{
name: "Aashutosh Poudel",
position: "Co-Founder of InfoShapers",
linkedin_url: "https://linkedin.com/in/aashutoshpoudel",
image: "https://enkoki.github.io/static_images/deerhack26/Aashutosh_Poudel.JPG"
},
{
name: "Elisha Baniya",
position: "QA Engineer",
linkedin_url: "https://www.linkedin.com/in/elishabaniya",
image: "https://ghostuf.github.io/static_images/elisha_baniya.png"
name: "Shuvam Tiwari",
position: "Sr. Blockchain Engineer",
linkedin_url: "https://www.linkedin.com/in/shubhtiwari5/",
image: "https://enkoki.github.io/static_images/deerhack26/Shubham_Tiwari.jpg",
},
{
name: "Yashaswee Sakha",
position: "UI/UX Engineer",
linkedin_url: "https://www.linkedin.com/in/yashaswee-sakha/",
image: "https://ghostuf.github.io/static_images/yashaswee_sakha.jpg"
name: "Toshika Ojha",
position: "Client Success Consultant ",
linkedin_url: "https://www.linkedin.com/in/toshikaojha/",
image:"https://ghostuf.github.io/static_images/toshika_ojha.jpg"
},
{
name: "Mamata Maharjan",
position: "Senior Software Engineer",
linkedin_url: "https://www.linkedin.com/in/mamata-maharjan-b4197b178",
image: "https://ghostuf.github.io/static_images/mamata_maharjan.jpg"
name: "Luja Chitrakar",
position: "Solana Developer",
linkedin_url: "https://www.linkedin.com/in/lujachitrakar/",
image:"https://ghostuf.github.io/static_images/luja_chitrakar.jpeg"
},




{
name: "Sushan Shakya",
position: "Data Engineer",
position: "Sr. Software Engineer",
linkedin_url: "https://www.linkedin.com/in/er-sushan-shakya-88b78b17b/",
image: "https://ghostuf.github.io/static_images/sushan_shakya.jpg"
},
{
name: "Prashant Malla",
position: "Embedded System Engineer",
linkedin_url: "https://www.linkedin.com/in/prashant-malla-139339b2",
position: "Sr. Embedded Software Engineer",
linkedin_url: "https://www.linkedin.com/in/prashant-malla-139339b2/",
image: "https://ghostuf.github.io/static_images/prashant_malla.jpg"
},
{
name: "Saru Manandhar",
position: "Software Engineer",
linkedin_url: "https://www.linkedin.com/in/saru-manandhar-71222614a",
linkedin_url: "https://www.linkedin.com/in/saru-manandhar-71222614a/",
image: "https://ghostuf.github.io/static_images/saru_manandhar.jpg"
},
// {
// name: "Labbi Karmacharya",
// position: "Data Scientist & Lecturer - Equitech Futures / Islington College",
// linkedin_url: "https://www.linkedin.com/in/labbi-karmacharya/",
// image: "https://ghostuf.github.io/static_images/labbi_karmacharya.png"
// },
{
name: "Labbi Karmacharya",
position: "Data Research Fellow / Equitech Futures, Lecturer ",
linkedin_url: "https://www.linkedin.com/in/labbi-karmacharya/",
image: "https://enkoki.github.io/static_images/deerhack26/Labbi.jpg"
},
{
name: "Rojan Upreti",
position: "Machine Learning Engineer",
linkedin_url: "https://www.linkedin.com/in/rojanupreti/", // No LinkedIn URL provided
image: "https://ghostuf.github.io/static_images/rojan_upreti.jpg"
name: "Sarun Luitel",
position: "Owner at Dormo Solutions Pvt. Ltd.",
linkedin_url: "https://www.linkedin.com/in/sarunluitel/",
image: "https://enkoki.github.io/static_images/deerhack26/Sarun_Luitel.jpg"
},
{
name: "Avinash Mishra",
position: "Lead Engineer",
linkedin_url: "https://www.linkedin.com/in/avinash-mishra-np/", // No LinkedIn URL provided
image: "https://ghostuf.github.io/static_images/avinash_mishra.png"
name: "Minalma Basnet",
position: "Customer Success Manager",
linkedin_url: "https://www.linkedin.com/in/minalma-basnet/",
image: "https://enkoki.github.io/static_images/deerhack26/Minamla_Basnet.jpeg"
},

]

export { Mentors_value }
2 changes: 2 additions & 0 deletions frontend/src/app/components/Navbar/NavbarMob.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ const Navbar = () => {
icon={organizersIcon}
/>*/}
<SidebarButton href="/legacy" label="Legacy" icon={legacyIcon} />
<SidebarButton href="/organizers" label="Organizers" icon={organizersIcon} />

</nav>
</div>

Expand Down
2 changes: 2 additions & 0 deletions frontend/src/app/components/Navbar/NavbarPC.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ const NavbarPC = () => {
)}
</div>
{/* <Link href="/winners" className={`hover:text-secondary text-base ${cabinetBold.className}`}>Winners</Link> */}
<Link href="/organizers" className={`hover:text-secondary text-base ${cabinetBold.className}`}>Organizers</Link>

<Link href="/legacy" className={`hover:text-secondary text-base ${cabinetBold.className}`}>Legacy</Link>
</div>
{/* <Counter_wrapper /> */}
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/app/components/Sponsors/Sponsor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,23 @@ export default function Sponsor({
image,
alt,
url,
className = "",
}: {
image: StaticImageData;
alt: string;
url: string;
className: string;
}) {
return (
<div className="flex flex-row justify-center items-center w-[15rem] h-[11rem] rounded-full mb-10">
<div className={`flex flex-row justify-center items-center w-[15rem] h-[11rem] rounded-full mb-10`}>
<Link href={url} target="_blank">
<Image
src={image}
alt={alt}
width={150}
height={150}
loading="lazy"
className="object-cover w-full h-full"
className={`object-cover w-full h-full ${className}`}
/>
</Link>
</div>
Expand Down
10 changes: 10 additions & 0 deletions frontend/src/app/components/Sponsors/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ import SnowBerryLogo from "@/app/assets/images/sponsors/SnowBerry_Logo.png";
import ThirdFactorLogo from "@/app/assets/images/sponsors/TF Logo - White.png";
import EcoSathiLogo from "@/app/assets/images/sponsors/EcoSathi_Logo.svg";
import KTMONELOGO from "@/app/assets/images/sponsors/Ktmone_Logo.svg";
import PRABHUBANKLOGO from "@/app/assets/images/sponsors/PrabhuBank.svg"

const sponsors: SponsorType[] = [
// {
Expand Down Expand Up @@ -260,6 +261,7 @@ const sponsors: SponsorType[] = [
url: "https://www.dailokrishi.com/",
image: DailoKrishiLogo,
imageAlt: "DailoKrishiLogo",
// className: "bg-white rounded-lg"
},
{
name: "KathmanduKoKatha",
Expand All @@ -281,12 +283,20 @@ const sponsors: SponsorType[] = [
image: KTMONELOGO,
imageAlt: "KTMONELOGO",
},

{
name: "KTMONE",
url: "https://www.prabhubank.com",
image: PRABHUBANKLOGO,
imageAlt: "PRABHUBANKLOGO",
},

{
name: "SandukAi",
url: "https://sanduk.ai/",
image: SandukAILogo,
imageAlt: "SandukAILogo",
className: "bg-white rounded-lg"
},

],
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/app/components/core/UserCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ const UserCard = ({ name, position, image, linkedin_url }: UserEntity) => {
<p className={`text-white font-[150] text-sm`}>{position}</p>
</div>
<div key="icon">
<Link href={linkedin_url}>
<Link href={linkedin_url}
target="_blank"
rel="noopener noreferrer">
<LinkedInSVG />
</Link>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/sections/LegacySection/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const LegacySection = () => {

<LegacyFlowerCard
logo={<Deerhack24 className="w-[200px] h-[75px] lg:w-[208px] lg:h-[92px] md:h-[92px] sm:[88px]"/>}
eventLead="Aasutosh Pudasaini"
eventLead="Aashutosh Pudasaini"
eventColead="Sampanna Gautam"
date="May 8, 9, 10: 2024"
application={786}
Expand Down
Loading
Loading