Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

[I2-29] Smooth-scroll#59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
TR-04 wants to merge3 commits intomaster
base:master
Choose a base branch
Loading
fromI2-29/smooth-scroll
Open
Show file tree
Hide file tree
Changes fromall 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
43 changes: 39 additions & 4 deletionsfrontend/package-lock.json
View file
Open in desktop

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

4 changes: 3 additions & 1 deletionfrontend/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
"dependencies": {
"@radix-ui/react-dropdown-menu": "^2.1.15",
"@splinetool/react-spline": "^2.2.6",
"@studio-freight/lenis": "^1.0.42",
"@types/node": "20.5.9",
"@types/react": "18.2.21",
"@types/react-dom": "18.2.7",
Expand All@@ -23,7 +24,8 @@
"clsx": "^2.1.1",
"eslint-config-next": "13.4.19",
"framer-motion": "^11.2.13",
"lucide-react": "^0.511.0",
"lenis": "^1.3.4",
"lucide-react": "^0.523.0",
"next": "13.4.12",
"next-emoji-rain": "^1.0.2",
"postcss": "8.4.29",
Expand Down
35 changes: 22 additions & 13 deletionsfrontend/src/components/Navbar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,24 +6,33 @@ import Terminal from './Terminal';

const Navbar = () => {
const [path, setPath] = useState<string[]>([]);
const [isScrolled, setIsScrolled] = useState(false);

useEffect(() => {
const pathSegments: string[] | undefined = window.location.pathname.split('/').filter(segment => segment);
if (pathSegments === undefined) setPath([]);
else setPath(pathSegments.map(segment => segment.toUpperCase()));
}, []);

useEffect(() => {
const handleScroll = () => {
setIsScrolled(window.scrollY > 0);
};

window.addEventListener('scroll', handleScroll);
return () =>window.removeEventListener('scroll', handleScroll);
}, []);

return (
<nav className="sticky top-0 flex justify-between items-center relative z-10 shadow-lg rounded-md bg-black/15 backdrop-blur-md xl:px-24 md:px-10 px-5 py-6">
<div>
<Link href="/">
<Image
src="/assets/csesoc_logo.svg"
alt="CSESoc Logo"
width={200}
height={200}
draggable={false}
/>
</Link>
<nav className={`sticky top-0 flex justify-between items-center relative z-10 rounded-md bg-black/15 backdrop-blur-md xl:px-24 md:px-10 px-5 py-6 duration-500 ${isScrolled ? 'shadow-xl' : 'shadow-none'}`}>
<Link href="/">
<Image
src="/assets/csesoc_logo.svg"
alt="CSESoc Logo"
width={200}
height={200}
draggable={false}
/>
<p className="font-mono mt-3 font-bold">
<span className="text-green-500">csesoc@unsw</span>
<span>:</span>
Expand All@@ -32,7 +41,7 @@ const Navbar = () => {
{/* The interactive terminal that allows changing pages using 'cd' */}
<Terminal/>
</p>
</div>
</Link>
<div>
<div className="md:flex xl:gap-18 lg:gap-10 md:gap-5 text-right font-bold hidden">
<Link href="/about">
Expand DownExpand Up@@ -60,7 +69,7 @@ const Navbar = () => {
/>
</a>
</div>
<div className="md:hidden xl:hidden lg:hidden text-right font-bold block">
<div className="sm:hidden xl:hidden lg:hidden text-right font-bold block">
<Hamburger />
</div>
</div>
Expand Down
19 changes: 19 additions & 0 deletionsfrontend/src/pages/_app.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,25 @@ import '@/styles/globals.css';
import type { AppProps } from 'next/app';
import 'next-emoji-rain/dist/index.css';

import Lenis from '@studio-freight/lenis';
import { useEffect } from 'react';

export default function App({ Component, pageProps }: AppProps) {

// Basic lenis setup
// Basically updates on every frame to stay synchronised with browser refresh rate
useEffect(() => {
const lenis = new Lenis();

function raf(time : number) {
lenis.raf(time);
requestAnimationFrame(raf);
}

requestAnimationFrame(raf);

return () => lenis.destroy();
}, []);

return <Component {...pageProps} />;
}
5 changes: 1 addition & 4 deletionsfrontend/src/styles/globals.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,14 +2,11 @@
@tailwind components;
@tailwind utilities;

html, body {
scroll-behavior: smooth;
}

body {
color: white;
background: #000031;
font-family: 'Raleway', sans-serif;

}

@keyframes blink {
Expand Down
Loading

[8]ページ先頭

©2009-2025 Movatter.jp