Merge branch 'stage/dev' into ft/image-webp

This commit is contained in:
samueloh99
2023-06-29 15:39:04 -03:00
2 changed files with 31 additions and 37 deletions

View File

@@ -52,11 +52,11 @@ export default function IndexPage() {
</h1>
</div>
<h1 className="text-xl font-[500]">
Sangria: a Folding Scheme for PLONK
Diving into Plonk accumulation via aPlonk by Ralph Toledo
</h1>
</div>
<NextLink
href={"https://www.youtube.com/watch?v=MounVPj6tjg"}
href={"https://www.youtube.com/live/hRXgf6T2yb8?feature=share"}
target="_blank"
rel="noreferrer"
className="flex items-center justify-start gap-5 md:justify-center"
@@ -81,14 +81,14 @@ export default function IndexPage() {
</div>
<NextLink
href={
"https://discord.com/invite/kuUkQNtS?event=1113461922847789176"
"https://www.youtube.com/live/jb6HDEtY4CI?feature=share"
}
target="_blank"
rel="noreferrer"
className="flex items-center justify-start gap-5 md:justify-center"
>
<h1 className="border-b-2 border-orange text-base font-[500] uppercase">
Atttend
Watch
</h1>
<ArrowRightUp color="black" />
</NextLink>
@@ -101,10 +101,10 @@ export default function IndexPage() {
Event
</h1>
</div>
<h1 className="text-xl font-[500]">PSE @ETHCC</h1>
<h1 className="text-xl font-[500]">PSE @ETH Global Paris</h1>
</div>
<NextLink
href={"https://www.ethcc.io/"}
href={"https://ethglobal.com/events/paris2023"}
target="_blank"
rel="noreferrer"
className="flex items-center justify-start gap-5 md:justify-center"

View File

@@ -1,11 +1,5 @@
"use client"
import { useEffect } from "react"
import NextImage from "next/image"
import PSELogoCircle from "@/public/pse-logo-circle.svg"
import { gsap } from "gsap"
import { ScrollTrigger } from "gsap/ScrollTrigger"
import { cn } from "@/lib/utils"
const content = [
@@ -30,33 +24,33 @@ const content = [
]
const WhatWeDo = () => {
useEffect(() => {
const mm = gsap.matchMedia()
// useEffect(() => {
// const mm = gsap.matchMedia()
mm.add("(min-width: 1024px)", () => {
gsap.registerPlugin(ScrollTrigger)
const tl = gsap.timeline({
scrollTrigger: {
trigger: ".badge-start-trigger",
start: "top center",
end: "+=550",
scrub: 1,
// markers: true,
},
})
// mm.add("(min-width: 1024px)", () => {
// gsap.registerPlugin(ScrollTrigger)
// const tl = gsap.timeline({
// scrollTrigger: {
// trigger: ".badge-start-trigger",
// start: "top center",
// end: "+=550",
// scrub: 1,
// // markers: true,
// },
// })
tl.from("#privacy", { fill: "#E1523A" }, "+=0.5")
.to(".badge-right", { y: 50, ease: "ease-out" }, "+=1")
.to("#privacy", { fill: "#111827", ease: "ease-out" }, "+=0.5")
.to(".badge-right", { y: 100, ease: "ease-out" })
.to("#scaling", { fill: "#E1523A", ease: "ease-in" })
.to(".badge-right", { y: 250, ease: "ease-out" }, "+=1")
.to(".badge-right", { y: 350, ease: "ease-out" })
.to("#scaling", { fill: "#111827", ease: "ease-out" })
.to("#explorations", { fill: "#E1523A", ease: "ease-in" })
.to(".badge-right", { y: 550, ease: "ease-out" })
})
}, [])
// tl.from("#privacy", { fill: "#E1523A" }, "+=0.5")
// .to(".badge-right", { y: 50, ease: "ease-out" }, "+=1")
// .to("#privacy", { fill: "#111827", ease: "ease-out" }, "+=0.5")
// .to(".badge-right", { y: 100, ease: "ease-out" })
// .to("#scaling", { fill: "#E1523A", ease: "ease-in" })
// .to(".badge-right", { y: 250, ease: "ease-out" }, "+=1")
// .to(".badge-right", { y: 350, ease: "ease-out" })
// .to("#scaling", { fill: "#111827", ease: "ease-out" })
// .to("#explorations", { fill: "#E1523A", ease: "ease-in" })
// .to(".badge-right", { y: 550, ease: "ease-out" })
// })
// }, [])
return (
<section className="badge-start-trigger relative flex flex-col gap-4 lg:grid lg:grid-cols-4 lg:gap-0">