Skip to content
Merged
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
26 changes: 1 addition & 25 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"class-variance-authority": "^0.7.1",
"cloudinary": "^2.8.0",
"clsx": "^2.1.1",
"embla-carousel": "^8.6.0",
"embla-carousel-react": "^8.6.0",
"framer-motion": "^12.23.6",
"lucide-react": "^0.539.0",
Expand Down
5 changes: 5 additions & 0 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

--font-jost: var(--font-jost);
--font-space-grotesk: var(--font-space-grotesk);
--font-bebas-neue: var(--font-bebas-neue);

--text-body: rgba(250, 250, 250, 0.562);
--detail-medium-contrast: rgba(89, 83, 172, 0.452);
Expand Down Expand Up @@ -283,6 +284,10 @@ html {
animation: pulse-subtle 5s ease-in-out infinite;
}

.cta-border-spin {
background: conic-gradient(from 90deg at 50% 50%, #04000f 0%, #dadadaa9 35%, #905aee 40%, #04000f 100%);
}

.animate-sparkle-1 {
animation: sparkle-1 8s ease-in-out infinite;
}
Expand Down
11 changes: 9 additions & 2 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Metadata } from "next";
import "./globals.css";
import connectMongoDB from "@/lib/mongodb";
import { Jost, Space_Grotesk } from "next/font/google";
import { Jost, Space_Grotesk, Bebas_Neue } from "next/font/google";
import { Analytics } from "@vercel/analytics/next";
import { SpeedInsights } from "@vercel/speed-insights/next";

Expand All @@ -19,6 +19,13 @@ const spaceGrotesk = Space_Grotesk({
display: "swap",
});

const bebasNeue = Bebas_Neue({
subsets: ["latin"],
weight: "400",
variable: "--font-bebas-neue",
display: "swap",
});

import { config } from "@fortawesome/fontawesome-svg-core";
import "@fortawesome/fontawesome-svg-core/styles.css";
config.autoAddCss = false;
Expand Down Expand Up @@ -108,7 +115,7 @@ export default function RootLayout({
<html
lang="en-CA"
dir="ltr"
className={`${jost.variable} ${spaceGrotesk.variable}`}
className={`${jost.variable} ${spaceGrotesk.variable} ${bebasNeue.variable}`}
data-scroll-behavior="smooth"
>
<head>
Expand Down
2 changes: 0 additions & 2 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
Hero,
OceanSurface,
Particles,
LoadingScreen,
SmoothFollower,
Navbar,
About,
Expand All @@ -19,7 +18,6 @@ const Home = () => {
return (
<div className="bg-linear-[180deg] from-sea from-0% via-sea via-20% to-dark-mode to-100% bg-cover bg-center h-full">
<div className="overflow-x-hidden w-full h-full bg-linear-[45deg] from-accent/25 from-0% via-accent/5 via-10% to-dark-mode/0 to-100%">
<LoadingScreen />
<div className="relative">
<Particles desktopParticleCount={400} sizeMultiplier={1.5} />
<Navbar />
Expand Down
3 changes: 1 addition & 2 deletions src/components/general/LoadingScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ export default function LoadingScreen() {

// checks if we need to show splashpage (only shows on intial load)
if (typeof window !== "undefined") {
const splashShown = sessionStorage.getItem("splashShown");
if (!splashShown) {
if (false) { // if (!sessionStorage.getItem("splashShown"))
setShowSplash(true);
sessionStorage.setItem("splashShown", "true");
lockScroll();
Expand Down
8 changes: 4 additions & 4 deletions src/components/general/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ const Navbar: React.FC = () => {

// Filter nav items based on enabled features
const navItems: Record<string, string> = {
Home: "/#Hero",
// Home: "/#Hero",
About: "/#About",
Gallery: "/#Gallery",
// Gallery: "/#Gallery",
Sponsors: "/#Sponsors",
Pricing: "/#Pricing",
Faq: "/#Faq",
// Pricing: "/#Pricing",
// Faq: "/#Faq",
Speakers: "/speakers",
"The Team": "/team",
};
Expand Down
25 changes: 18 additions & 7 deletions src/components/home/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

import React from "react";
import Image from "next/image";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faMicrophone } from "@fortawesome/free-solid-svg-icons";
import { faUserPlus } from "@fortawesome/free-solid-svg-icons";
import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
import Link from "next/link";

const Hero: React.FC = () => {
return (
Expand Down Expand Up @@ -60,7 +55,7 @@ const Hero: React.FC = () => {
</h3>
</div>
<div className="px-4 md:justify-center text-xl md:text-2xl flex flex-col lg:flex-row gap-6 lg:gap-12 items-center">
<div className="text-sm md:text-2xl flex flex-wrap justify-center gap-2 xs:gap-6 bg-transparent">
{/* <div className="text-sm md:text-2xl flex flex-wrap justify-center gap-2 xs:gap-6 bg-transparent">
<a
className="font-space-grotesk! w-fit lg:p-2 border-b-2 border-light-mode/40 email-hover"
href="mailto:talks@cusec.net"
Expand Down Expand Up @@ -100,7 +95,23 @@ const Hero: React.FC = () => {
size="xs"
className="ml-2"
/>
</Link>
</Link> */}
<a
className="relative inline-flex w-full overflow-hidden rounded-2xl p-[1.5px] focus-visible:outline-none"
href="https://forms.gle/SLSRzfstSLETexj4A"
target="_blank"
rel="noopener noreferrer"
>
<span
className="absolute inset-[-1000%] animate-[spin_5s_linear_infinite] cta-border-spin"
aria-hidden="true"
/>
<span className="relative inline-flex w-full items-center justify-center rounded-[14px] bg-[#4433a1ee] px-6 py-3 overflow-hidden">
<span className="font-bebas-neue! relative z-10 text-2xl tracking-[0.3em] text-white">
Join the 2027 CUSEC team
</span>
</span>
</a>
</div>
</div>
);
Expand Down
3 changes: 2 additions & 1 deletion src/components/home/gallery/Gallery.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
"use server";

import EmblaCarousel from "./embla/EmblaCarousel";
import React from "react";
import { EmblaOptionsType } from "embla-carousel";
import EmblaCarousel from "./embla/EmblaCarousel";
import "../../../app/embla.css";

const slideImages: string[] = [
Expand Down
3 changes: 2 additions & 1 deletion src/components/home/gallery/embla/EmblaCarousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const EmblaCarousel: React.FC<PropType> = (props) => {
.on("reInit", tweenParallax)
.on("scroll", tweenParallax)
.on("slideFocus", tweenParallax);
}, [emblaApi, tweenParallax]);
}, [emblaApi, tweenParallax, setTweenFactor, setTweenNodes]);

return (
<div className="embla">
Expand All @@ -111,6 +111,7 @@ const EmblaCarousel: React.FC<PropType> = (props) => {
<div className="embla__slide" key={index}>
<div className="embla__parallax">
<div className="embla__parallax__layer">
{/* eslint-disable-next-line @next/next/no-img-element */}
<img
className="embla__slide__img embla__parallax__img"
src={slideImages[index]}
Expand Down