Skip to content

Commit

Permalink
Added Pictures Part 1 and begun testing with transitions
Browse files Browse the repository at this point in the history
  • Loading branch information
sean-lai-sh committed Nov 7, 2024
1 parent e189420 commit b2bd2e7
Show file tree
Hide file tree
Showing 15 changed files with 68 additions and 35 deletions.
4 changes: 3 additions & 1 deletion app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Inter } from "next/font/google";

import "./globals.css";
import { ThemeProvider } from "./provider";
import Transition from "@/components/transition";

const inter = Inter({ subsets: ["latin"] });

Expand All @@ -19,7 +20,8 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<head>
<link rel="icon" href="/logo.png" sizes="any" />
<meta name="description" content="Tech@NYU" />
<link rel="icon" href="/favicon.ico" sizes="any" />
</head>
<body className={inter.className}>
<ThemeProvider
Expand Down
5 changes: 0 additions & 5 deletions app/mentorship/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
import { navItems } from "@/data";

import { FloatingNav } from "@/components/ui/FloatingNavbar";
import {
TeamGridSection,
CloseIcon,
} from "@/components/blocks/teamgridorientation";
import TeamTitle from "@/components/TeamTitle";
import SWPage from "@/components/StartupWeek";
import Footer from "@/components/Footer";
import MentorPage from "@/components/Mentorship";

Expand Down
22 changes: 11 additions & 11 deletions app/startup-week/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
import { navItems } from "@/data";

import { FloatingNav } from "@/components/ui/FloatingNavbar";
import {
TeamGridSection,
CloseIcon,
} from "@/components/blocks/teamgridorientation";
import TeamTitle from "@/components/TeamTitle";
import SWPage from "@/components/StartupWeek";
import Footer from "@/components/Footer";

const Home = () => {
return (
<main
className=" w-full dark:bg-black-200 bg-white dark:bg-grid-white/[0.03] bg-grid-black-100/[0.2]
<main className="">
<div className="max-w-7xl w-full">
<FloatingNav navItems={navItems} />
<div
className=" w-full dark:bg-black-200 bg-white dark:bg-grid-white/[0.03] bg-grid-black-100/[0.2]
absolute top-0 left-0 flex justify-center items-center flex-col overflow-clip"
>
<FloatingNav navItems={navItems} />
<TeamTitle titleContent="Startup Committee" />
<SWPage />
<Footer />
>
<TeamTitle titleContent="Startup Committee" />
<SWPage />
<Footer />
</div>
</div>
</main>
);
};
Expand Down
5 changes: 0 additions & 5 deletions app/tech-treks/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
import { navItems } from "@/data";

import { FloatingNav } from "@/components/ui/FloatingNavbar";
import {
TeamGridSection,
CloseIcon,
} from "@/components/blocks/teamgridorientation";
import TeamTitle from "@/components/TeamTitle";
import SWPage from "@/components/StartupWeek";
import TechTreksPage from "@/components/TechTreks";
import Footer from "@/components/Footer";

Expand Down
6 changes: 6 additions & 0 deletions app/template.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import Transition from "../components/transition";
import { navItems } from "../data";
import { FloatingNav } from "../components/ui/FloatingNavbar";
export default function Template({ children }: { children: React.ReactNode }) {
return <>{children}</>;
}
6 changes: 2 additions & 4 deletions components/Mentorship.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const MentorPage = () => {
<h1 className="text-xl font-medium text-center pt-5 leading-snug tracking-wide">
How it works
</h1>
<div className="grid grid-cols-1 md:grid-cols-2 relative z-10 py-10 mx-auto justify-center">
<div className="grid grid-cols-1 md:grid-cols-2 relative z-10 py-10 mx-auto justify-center lg:max-w-[60%]">
{MGridItems.map((feature, tindex) => (
<Feature key={feature.title} {...feature} index={tindex} />
))}
Expand Down Expand Up @@ -262,9 +262,7 @@ const MentorPage = () => {
))}
</ProgramPicGrid>
{/* Some component that showcases past sponsors */}
<h1 className="heading py-10">
<span className="text-purple">Syllabus</span>
</h1>

<Timeline data={data} />
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion components/TechTreks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const TechTreksPage = () => {
<h1 className="text-xl font-medium text-center pt-5 leading-snug tracking-wide">
Two Tracks
</h1>
<div className="grid grid-cols-1 md:grid-cols-2 relative z-10 py-10 mx-auto justify-center">
<div className="grid grid-cols-1 md:grid-cols-2 relative z-10 py-10 mx-auto justify-center lg:max-w-[60%]">
{TTGridIterm.map((feature, tindex) => (
<Feature key={feature.title} {...feature} index={tindex} />
))}
Expand Down
37 changes: 37 additions & 0 deletions components/transition.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
"use client";

import { motion } from "framer-motion";

const variants = {
initial: { x: "100vw", opacity: 0 },
animate: {
x: 0,
opacity: 1,
transition: { duration: 0.6, ease: "easeInOut" },
},
exit: {
x: "-100vw",
opacity: 0,
transition: { duration: 0.6, ease: "easeInOut" },
},
};

export default function Transition({
children,
}: {
children: React.ReactNode;
}) {
return (
<motion.div
initial="initial"
animate="animate"
exit="exit"
variants={variants}
transition={{ duration: 0.5, ease: "easeInOut" }}
className="w-full dark:bg-black-200 bg-white dark:bg-grid-white/[0.03] bg-grid-black-100/[0.2]
"
>
{children}
</motion.div>
);
}
2 changes: 1 addition & 1 deletion components/ui/Feature.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function FeaturesSectionDemo() {
},
];
return (
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 relative z-10 py-10 max-w-7xl mx-auto">
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 relative z-10 py-5 max-w-7xl mx-auto">
{features.map((feature, index) => (
<Feature key={feature.title} {...feature} index={index} />
))}
Expand Down
14 changes: 7 additions & 7 deletions data/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,23 @@ export const selectEvents = [
id: 1,
title: "StartupWeek",
des: "A week of panels, workshops and networking events for aspiring entrepreneurs or those interested in the startup world.",
img: "/p1.svg",
img: "/event-pics/swkeynote24.jpg",
iconLists: ["/re.svg", "/tail.svg", "/ts.svg", "/three.svg", "/fm.svg"],
link: "/ui.earth.com",
},
{
id: 2,
title: "Leetcode Social!",
des: "Simplify your video conferencing experience with Yoom. Seamlessly connect with colleagues and friends.",
img: "/p2.svg",
title: "Kickoff!",
des: "The event to learn about our signature programs with Eboard!",
img: "/event-pics/leetcodesocial.png",
iconLists: ["/next.svg", "/tail.svg", "/ts.svg", "/stream.svg", "/c.svg"],
link: "/ui.yoom.com",
},
{
id: 3,
title: "Mentor & Meet with Supermomos",
des: "10 Mentors, 40 Students, 4:1 Ratio, 2 Hours, 2 Goal: Mentorship & Networking.",
img: "/p3.svg",
title: "Mentor & Meet",
des: "10 Mentors, 2 Hours, 2 Goals: Mentorship & Networking.",
img: "/event-pics/Mentor_And_Meet.jpg",
iconLists: ["/re.svg", "/tail.svg", "/ts.svg", "/three.svg", "/c.svg"],
link: "/ui.aiimg.com",
},
Expand Down
Binary file added public/event-pics/Mentor_And_Meet.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/event-pics/kickoff24.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/event-pics/leetcodesocial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/event-pics/swkeynote24.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/favicon.ico
Binary file not shown.

0 comments on commit b2bd2e7

Please sign in to comment.