diff --git a/package.json b/package.json index abb3c51..589e484 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "eslint-plugin-prettier": "^5.2.1", "lint-staged": "^15.3.0", "postcss": "^8.4.49", + "prettier": "^3.5.2", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.9", "simple-git-hooks": "^2.11.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0d602cc..baa789c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -98,7 +98,7 @@ importers: version: 15.1.3 '@trivago/prettier-plugin-sort-imports': specifier: ^5.2.0 - version: 5.2.0(prettier@3.4.1) + version: 5.2.0(prettier@3.5.2) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -143,19 +143,22 @@ importers: version: 9.1.0(eslint@8.57.1) eslint-plugin-prettier: specifier: ^5.2.1 - version: 5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.4.1) + version: 5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.5.2) lint-staged: specifier: ^15.3.0 version: 15.3.0 postcss: specifier: ^8.4.49 version: 8.4.49 + prettier: + specifier: ^3.5.2 + version: 3.5.2 prettier-plugin-jsdoc: specifier: ^1.3.0 - version: 1.3.0(prettier@3.4.1) + version: 1.3.0(prettier@3.5.2) prettier-plugin-tailwindcss: specifier: ^0.6.9 - version: 0.6.9(@trivago/prettier-plugin-sort-imports@5.2.0(prettier@3.4.1))(prettier-plugin-jsdoc@1.3.0(prettier@3.4.1))(prettier@3.4.1) + version: 0.6.9(@trivago/prettier-plugin-sort-imports@5.2.0(prettier@3.5.2))(prettier-plugin-jsdoc@1.3.0(prettier@3.5.2))(prettier@3.5.2) simple-git-hooks: specifier: ^2.11.1 version: 2.11.1 @@ -3486,8 +3489,8 @@ packages: engines: {node: '>=14'} hasBin: true - prettier@3.4.1: - resolution: {integrity: sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==} + prettier@3.5.2: + resolution: {integrity: sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==} engines: {node: '>=14'} hasBin: true @@ -5196,7 +5199,7 @@ snapshots: '@tanstack/virtual-core@3.11.2': {} - '@trivago/prettier-plugin-sort-imports@5.2.0(prettier@3.4.1)': + '@trivago/prettier-plugin-sort-imports@5.2.0(prettier@3.5.2)': dependencies: '@babel/generator': 7.26.3 '@babel/parser': 7.26.3 @@ -5204,7 +5207,7 @@ snapshots: '@babel/types': 7.26.3 javascript-natural-sort: 0.7.1 lodash: 4.17.21 - prettier: 3.4.1 + prettier: 3.5.2 transitivePeerDependencies: - supports-color @@ -6190,10 +6193,10 @@ snapshots: safe-regex-test: 1.1.0 string.prototype.includes: 2.0.1 - eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.4.1): + eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.5.2): dependencies: eslint: 8.57.1 - prettier: 3.4.1 + prettier: 3.5.2 prettier-linter-helpers: 1.0.0 synckit: 0.9.2 optionalDependencies: @@ -7479,25 +7482,25 @@ snapshots: dependencies: fast-diff: 1.3.0 - prettier-plugin-jsdoc@1.3.0(prettier@3.4.1): + prettier-plugin-jsdoc@1.3.0(prettier@3.5.2): dependencies: binary-searching: 2.0.5 comment-parser: 1.4.1 mdast-util-from-markdown: 2.0.2 - prettier: 3.4.1 + prettier: 3.5.2 transitivePeerDependencies: - supports-color - prettier-plugin-tailwindcss@0.6.9(@trivago/prettier-plugin-sort-imports@5.2.0(prettier@3.4.1))(prettier-plugin-jsdoc@1.3.0(prettier@3.4.1))(prettier@3.4.1): + prettier-plugin-tailwindcss@0.6.9(@trivago/prettier-plugin-sort-imports@5.2.0(prettier@3.5.2))(prettier-plugin-jsdoc@1.3.0(prettier@3.5.2))(prettier@3.5.2): dependencies: - prettier: 3.4.1 + prettier: 3.5.2 optionalDependencies: - '@trivago/prettier-plugin-sort-imports': 5.2.0(prettier@3.4.1) - prettier-plugin-jsdoc: 1.3.0(prettier@3.4.1) + '@trivago/prettier-plugin-sort-imports': 5.2.0(prettier@3.5.2) + prettier-plugin-jsdoc: 1.3.0(prettier@3.5.2) prettier@3.3.3: {} - prettier@3.4.1: {} + prettier@3.5.2: {} pretty-format@3.8.0: {} diff --git a/src/app/layout.tsx b/src/app/layout.tsx index fcbfd31..fd61266 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -40,7 +40,7 @@ export default function RootLayout({ children }: RootLayoutProps) { src="https://umami.csclub.org.au/script.js" data-website-id={env.NEXT_PUBLIC_UMAMI_WEBSITE_ID} /> - +
{children} diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index e2be32c..a9efe49 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -12,7 +12,7 @@ export default function Footer() {

{/* Social Media Links */} -
+
{LINKS.map((link, i) => ( ))} diff --git a/src/components/Header/HeaderMobileClient.tsx b/src/components/Header/HeaderMobileClient.tsx index 26119d4..9f36619 100644 --- a/src/components/Header/HeaderMobileClient.tsx +++ b/src/components/Header/HeaderMobileClient.tsx @@ -2,7 +2,7 @@ import { logout } from '@/lib/actions'; import Link from 'next/link'; -import { useState } from 'react'; +import { useEffect, useState } from 'react'; import { IoMdClose, IoMdMenu } from 'react-icons/io'; import type { HeaderData } from '.'; import FancyRectangle from '../FancyRectangle'; @@ -31,9 +31,20 @@ export default function HeaderMobileClient({ setIsMenuOpen(false); }; + useEffect(() => { + const rootDiv = document.getElementById('root')!; + if (isMenuOpen) { + rootDiv.classList.remove('overflow-y-scroll'); + rootDiv.classList.add('overflow-y-hidden'); + } else { + rootDiv.classList.add('overflow-y-scroll'); + rootDiv.classList.remove('overflow-y-hidden'); + } + }, [isMenuOpen]); + return (
-
+
{data.isSignedIn && data.nextStep === 'signup' && (