diff --git a/next.config.mjs b/next.config.mjs index 4678774..3811d3f 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,4 +1,17 @@ /** @type {import('next').NextConfig} */ -const nextConfig = {}; +const nextConfig = { + + images: { + remotePatterns: [ + { + protocol: 'https', + hostname: 'tedx-sjec.github.io', + port: '', + pathname: '/**', + }, + ], + }, + +}; export default nextConfig; diff --git a/package-lock.json b/package-lock.json index 85a7ae8..b84e39e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "tedx", "version": "0.1.0", "dependencies": { + "@gsap/react": "^2.1.1", "@hookform/resolvers": "^3.9.0", "@libsql/client": "^0.8.1", "@next-auth/prisma-adapter": "^1.0.7", @@ -41,8 +42,10 @@ "clsx": "^2.1.1", "crypto": "^1.0.1", "framer-motion": "^11.9.0", + "gsap": "^3.12.5", "ioredis": "^5.4.1", "jest": "^29.7.0", + "lenis": "^1.1.13", "lodash.debounce": "^4.0.8", "lucide-react": "^0.441.0", "next": "14.2.6", @@ -720,6 +723,11 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "license": "MIT" }, + "node_modules/@darkroom.engineering/tempus": { + "version": "0.0.46", + "resolved": "https://registry.npmjs.org/@darkroom.engineering/tempus/-/tempus-0.0.46.tgz", + "integrity": "sha512-s5vav3KMHYezvUCl4ee5epg0oimF6M8C9gAaKxFnFaTvX2q3ywFDryIv6XLd0mRFUt3S1uHDJqKaiEcs2ZVSvw==" + }, "node_modules/@effect/platform": { "version": "0.63.2", "resolved": "https://registry.npmjs.org/@effect/platform/-/platform-0.63.2.tgz", @@ -1204,6 +1212,15 @@ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz", "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==" }, + "node_modules/@gsap/react": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@gsap/react/-/react-2.1.1.tgz", + "integrity": "sha512-apGPRrmpqxvl1T6Io1KgT8tFU+IuACI6z4zmT7t8+PASserJeLVRFJdSNUFA2Xb/eVkZI1noE8LIrY/w/oJECw==", + "dependencies": { + "gsap": "^3.12.5", + "react": ">=16" + } + }, "node_modules/@hookform/resolvers": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.9.0.tgz", @@ -7184,6 +7201,11 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, + "node_modules/gsap": { + "version": "3.12.5", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.12.5.tgz", + "integrity": "sha512-srBfnk4n+Oe/ZnMIOXt3gT605BX9x5+rh/prT2F1SsNJsU1XuMiP0E2aptW481OnonOGACZWBqseH5Z7csHxhQ==" + }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -9098,6 +9120,30 @@ "url": "https://ko-fi.com/killymxi" } }, + "node_modules/lenis": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/lenis/-/lenis-1.1.13.tgz", + "integrity": "sha512-iny+vWwUHcZGbJz+p2I75H1muLBRZqSG7t04jnhA+CWOQDFL1vt9bsZDwPPtYEmYVVvqAdo5MbXVFzNOlbgUkQ==", + "dependencies": { + "@darkroom.engineering/tempus": "^0.0.46" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/darkroomengineering" + }, + "peerDependencies": { + "react": ">=17.0.0", + "react-dom": ">=17.0.0" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + }, + "react-dom": { + "optional": true + } + } + }, "node_modules/leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", diff --git a/package.json b/package.json index 748273b..651c5a0 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "migrate-latest-w": "wsl sh -c \"export $(grep -v '^#' .env.local | xargs) && LATEST_MIGRATION=$(find prisma/migrations/*/ -type d -name '[0-9]*_*' | sort -r | head -n 1) && turso db shell $TURSO_DB_NAME < '${LATEST_MIGRATION}migration.sql'\"" }, "dependencies": { + "@gsap/react": "^2.1.1", "@hookform/resolvers": "^3.9.0", "@libsql/client": "^0.8.1", "@next-auth/prisma-adapter": "^1.0.7", @@ -46,8 +47,10 @@ "clsx": "^2.1.1", "crypto": "^1.0.1", "framer-motion": "^11.9.0", + "gsap": "^3.12.5", "ioredis": "^5.4.1", "jest": "^29.7.0", + "lenis": "^1.1.13", "lodash.debounce": "^4.0.8", "lucide-react": "^0.441.0", "next": "14.2.6", diff --git a/src/app/globals.css b/src/app/globals.css index f4447b4..115e38f 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -86,3 +86,27 @@ @apply bg-background text-foreground; } } + +.about{ + background-color:rgb(255,255,255,0.3) +} +html.lenis, +html.lenis body { + height: auto !important; +} + +.lenis.lenis-smooth { + scroll-behavior: auto !important; +} + +.lenis.lenis-smooth [data-lenis-prevent] { + overscroll-behavior: contain !important; +} + +.lenis.lenis-stopped { + overflow: hidden !important; +} + +.lenis.lenis-scrolling iframe { + pointer-events: none !important; +} \ No newline at end of file diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 2c76e09..4b813b6 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -3,7 +3,8 @@ import type { Metadata } from "next"; import { Inter } from "next/font/google"; import "./globals.css"; import { StarsCanvas } from "@/components/ui/stars"; - +import Nav from "@/components/widget/header"; +// import ScrollProgress from "@/components/ui/progressBar"; const inter = Inter({ subsets: ["latin"] }); export const metadata: Metadata = { @@ -18,8 +19,9 @@ export default function RootLayout({ }>) { return ( -
-