Skip to content
Closed
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
36 changes: 18 additions & 18 deletions frontend/src/app/(pages)/SponsorsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ import SponsorsSection from "../sections/Sponsors/SponsorsSection";
import Image from "next/image";
import { ReactElement } from "react";
export default function SponsorPage(): ReactElement {


return (
<>
{/*
<div className="overflow-hidden py-20">
<div className="relative">
<Image
src={leaf_deerhack2023_right}
alt="leaf"
height={250}
className="absolute right-3 top-52 hidden xl:block"
/>
</div>
<div>
<SponsorsSection />
<>

<div className="overflow-hidden py-20">
<div className="relative">
<Image
src={leaf_deerhack2023_right}
alt="leaf"
height={250}
className="absolute right-3 top-52 hidden xl:block"
/>
</div>
<div>
<SponsorsSection />
</div>
</div>
</div>
*/}
</>

</>
);

}
2 changes: 1 addition & 1 deletion frontend/src/app/MainPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function Home() {
<Judges />
<Mentors />
<FAQ />
{/* <SponsorPage /> */}
<SponsorPage />
{/* <RegisterPage /> */}
<Footer />
</>
Expand Down
33 changes: 22 additions & 11 deletions frontend/src/app/assets/icons/Devfolio.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
export default function DevfolioSVG() {
interface DevfolioSVGProps {
className?: string;
}

export default function DevfolioSVG({ className }: DevfolioSVGProps) {
return (
<svg width="33" height="34" viewBox="0 0 33 34" fill="none" xmlns="http://www.w3.org/2000/svg">
<mask id="mask0_1247_429" maskUnits="userSpaceOnUse" x="0" y="0" width="33" height="34">
<path d="M32.9728 0.878906H0.376465V33.4753H32.9728V0.878906Z" fill="white"/>
</mask>
<g mask="url(#mask0_1247_429)">
<path d="M31.6507 18.827C31.682 22.4469 30.3568 25.9473 27.9359 28.6387C25.5151 31.3302 22.1742 33.0176 18.5713 33.3686C18.5713 33.3686 9.18151 33.6085 6.07441 33.3686C5.50546 33.3003 4.96473 33.0825 4.50725 32.7374C4.04978 32.3923 3.69188 31.9322 3.46997 31.4038C3.90706 31.5964 4.37527 31.7086 4.85216 31.7351C5.8688 31.8265 7.60511 31.8722 10.0268 31.8722C13.5794 31.8722 17.4518 31.7694 17.4861 31.7694H17.5546C21.4255 31.4407 25.025 29.647 27.6184 26.7547C29.8427 24.3033 31.2516 21.2221 31.6507 17.936V18.827Z" fill="white"/>
<path d="M30.5085 15.64C30.5364 19.2616 29.2067 22.7621 26.7814 25.4517C24.3561 28.1413 21.0113 29.8247 17.4062 30.1702C17.4062 30.1702 8.01643 30.4101 4.90937 30.1702C4.07023 30.04 3.30718 29.6089 2.76272 28.9572C2.21827 28.3056 1.92965 27.478 1.95079 26.629V4.50256C1.94031 3.64926 2.24236 2.82161 2.79996 2.17562C3.35757 1.52964 4.13223 1.10995 4.97791 0.995675C8.0964 0.732945 17.4747 0.995675 17.4747 0.995675C21.0873 1.35886 24.4318 3.06556 26.8457 5.77773C29.2595 8.48988 30.5668 12.0097 30.5085 15.64Z" fill="white"/>
</g>
</svg>
);
<svg
className={className}
width="33"
height="34"
viewBox="0 0 33 34"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<mask id="mask0_1247_429" maskUnits="userSpaceOnUse" x="0" y="0" width="33" height="34">
<path d="M32.9728 0.878906H0.376465V33.4753H32.9728V0.878906Z" fill="white" />
</mask>
<g mask="url(#mask0_1247_429)">
<path d="M31.6507 18.827C31.682 22.4469 30.3568 25.9473 27.9359 28.6387C25.5151 31.3302 22.1742 33.0176 18.5713 33.3686C18.5713 33.3686 9.18151 33.6085 6.07441 33.3686C5.50546 33.3003 4.96473 33.0825 4.50725 32.7374C4.04978 32.3923 3.69188 31.9322 3.46997 31.4038C3.90706 31.5964 4.37527 31.7086 4.85216 31.7351C5.8688 31.8265 7.60511 31.8722 10.0268 31.8722C13.5794 31.8722 17.4518 31.7694 17.4861 31.7694H17.5546C21.4255 31.4407 25.025 29.647 27.6184 26.7547C29.8427 24.3033 31.2516 21.2221 31.6507 17.936V18.827Z" fill="white" />
<path d="M30.5085 15.64C30.5364 19.2616 29.2067 22.7621 26.7814 25.4517C24.3561 28.1413 21.0113 29.8247 17.4062 30.1702C17.4062 30.1702 8.01643 30.4101 4.90937 30.1702C4.07023 30.04 3.30718 29.6089 2.76272 28.9572C2.21827 28.3056 1.92965 27.478 1.95079 26.629V4.50256C1.94031 3.64926 2.24236 2.82161 2.79996 2.17562C3.35757 1.52964 4.13223 1.10995 4.97791 0.995675C8.0964 0.732945 17.4747 0.995675 17.4747 0.995675C21.0873 1.35886 24.4318 3.06556 26.8457 5.77773C29.2595 8.48988 30.5668 12.0097 30.5085 15.64Z" fill="white" />
</g>
</svg>
);
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions frontend/src/app/assets/images/sponsors/Devfolio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 32 additions & 17 deletions frontend/src/app/components/Navbar/NavbarMob.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { useState, useEffect } from "react";
import Link from "next/link";
import Image from "next/image";
import { cabinetMedium } from "@/app/utils/fonts";
import { cabinetMedium, cabinetExtraBold } from "@/app/utils/fonts";
import Counter_wrapper from "../counter/Counter";

import DeerhackLogo from "@/app/assets/icons/DeerHackLogoMob.svg";
Expand Down Expand Up @@ -62,10 +62,9 @@ const Navbar = () => {

<aside
className={`fixed top-0 bottom-0 z-50 bg-[#110C24CC] backdrop-blur-[12px] border-r border-[#646265] flex flex-col shadow-2xl transition-all duration-500 ease-in-out
${
isOpen
? "left-0 w-[85vw] md:w-[450px] opacity-100"
: "left-[-500px] w-[85vw] md:w-[450px] opacity-0 pointer-events-none"
${isOpen
? "left-0 w-[85vw] md:w-[450px] opacity-100"
: "left-[-500px] w-[85vw] md:w-[450px] opacity-0 pointer-events-none"
}`}
>
<div
Expand Down Expand Up @@ -105,15 +104,29 @@ const Navbar = () => {
</div>
</div>

<nav className={`flex flex-col gap-4 ${cabinetMedium.className}`}>
<SidebarButton href="/" route="/" label="Home" icon={homeIcon} />
{/* <SidebarButton
<div className="flex flex-col gap-4">
<Link
href="https://forms.gle/2dhBc9DEN5a43qVY9"
target="_blank"
>
<div className="border-[1.03px] border-[#FDE7B3] opacity-100 flex h-[60px] justify-center items-center py-4 rounded-[15px] text-[#311863] bg-secondary">
<p className={`text-[#311863] ${cabinetExtraBold.className} font-extrabold text-xm md:text-xl`}>
Pre-Register Now
</p>
</div>
</Link>

<nav className={`flex flex-col gap-4 ${cabinetMedium.className}`}>

<SidebarButton href="/" route="/" label="Home" icon={homeIcon} />
{/* <SidebarButton
href="/organizers"
label="Organizers"
icon={organizersIcon}
/>
<SidebarButton href="/legacy" label="Legacy" icon={legacyIcon} /> */}
</nav>
</nav>
</div>

<div className="mt-10 flex flex-col gap-4">
<div className="relative flex items-center mb-1">
Expand Down Expand Up @@ -162,14 +175,16 @@ const Navbar = () => {
</div>
</aside>

{isOpen && (
<div
className="fixed inset-0 bg-black/30 backdrop-blur-[3px] z-40"
onClick={() => setIsOpen(false)}
/>
)}
</div>
</nav>
{
isOpen && (
<div
className="fixed inset-0 bg-black/30 backdrop-blur-[3px] z-40"
onClick={() => setIsOpen(false)}
/>
)
}
</div >
</nav >
);
};

Expand Down
21 changes: 17 additions & 4 deletions frontend/src/app/components/Navbar/NavbarPC.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
import { useState, useEffect, useRef } from "react"
import Link from "next/link"
import DeerhackLogo from "@/app/assets/icons/DeerhackLogo"
import { cabinetBold, cabinetMedium } from "@/app/utils/fonts"
import { cabinetBold, cabinetMedium, cabinetExtraBold } from "@/app/utils/fonts"
import Counter_wrapper from "../counter/Counter"


const NavbarPC = () => {
const [isResourceOpen, setIsResourceOpen] = useState(false)
const resourceRef = useRef<HTMLDivElement>(null)
Expand All @@ -28,16 +29,17 @@ const NavbarPC = () => {
<div className="hidden lg:flex w-full justify-center z-[100] relative">
<header className="bg-[#110C24A6] w-[95%] mt-7 relativerounded-xl fixed isolate shadow-lg backdrop-blur-sm">
<nav className="flex items-center justify-between h-[6rem] py-4 px-20">
<div className="flex items-center gap-[7.5rem]">
<div className="flex items-center gap-[48px]">
<Link href="/" className="flex-shrink-0 flex items-center">
<DeerhackLogo width={50} height={50} />
</Link>
<Counter_wrapper />
</div>

<div className="flex items-center gap-[3rem]">
<div className="flex items-center gap-8 text-magnolia">
<div className="relative" ref={resourceRef}>
<span
<span
className={`hover:text-secondary cursor-pointer block text-base ${cabinetBold.className}`}
onClick={handleResourceClick}
>
Expand All @@ -62,7 +64,18 @@ const NavbarPC = () => {
</div>
{/* <Link href="/winners" className={`hover:text-secondary text-base ${cabinetBold.className}`}>Winners</Link> */}
</div>
<Counter_wrapper />
{/* <Counter_wrapper /> */}
<Link
href="https://forms.gle/2dhBc9DEN5a43qVY9"
className="w-full flex justify-center items-center"
target="_blank"
>
<div className="border-[1.03px] border-[#FDE7B3] opacity-100 hover:opacity-90 hover:scale-110 transition-all duration-200 flex h-[60px] md:h-[60px] lg:w-[250px] w-[95%] justify-center items-center py-4 md:py-7 rounded-[8px] text-[#311863] bg-secondary cursor-pointer">
<p className={`text-[#311863] ${cabinetExtraBold.className} font-extrabold text-xm md:text-xl`}>
Pre-Register Now
</p>
</div>
</Link>
</div>
</nav>
</header>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/app/components/Sponsors/Sponsor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ export default function Sponsor({
url: string;
}) {
return (
<div className="flex flex-row justify-center items-center w-[11rem] 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={100}
height={100}
width={150}
height={150}
loading="lazy"
className="object-cover w-full h-full"
/>
Expand Down
Loading
Loading