diff --git a/package-lock.json b/package-lock.json index e24c56e..a961618 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,11 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.2.1", - "@fortawesome/free-brands-svg-icons": "^6.2.1", + "@fortawesome/fontawesome-svg-core": "^6.7.2", + "@fortawesome/free-brands-svg-icons": "^6.7.2", "@fortawesome/free-regular-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", - "@fortawesome/react-fontawesome": "^0.2.0", + "@fortawesome/react-fontawesome": "^0.2.2", "@headlessui/react": "^1.7.2", "@mapbox/rehype-prism": "^0.8.0", "@mdx-js/loader": "^2.3.0", @@ -85,29 +85,47 @@ } }, "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz", - "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==", - "hasInstallScript": true, + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz", + "integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==", + "license": "MIT", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.2.1" + "@fortawesome/fontawesome-common-types": "6.7.2" }, "engines": { "node": ">=6" } }, + "node_modules/@fortawesome/fontawesome-svg-core/node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.2.tgz", + "integrity": "sha512-Zs+YeHUC5fkt7Mg1l6XTniei3k4bwG/yo3iFUtZWd/pMx9g3fdvkSK9E0FOC+++phXOka78uJcYb8JaFkW52Xg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/@fortawesome/free-brands-svg-icons": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.1.tgz", - "integrity": "sha512-L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig==", - "hasInstallScript": true, + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.7.2.tgz", + "integrity": "sha512-zu0evbcRTgjKfrr77/2XX+bU+kuGfjm0LbajJHVIgBWNIDzrhpRxiCPNT8DW5AdmSsq7Mcf9D1bH0aSeSUSM+Q==", + "license": "(CC-BY-4.0 AND MIT)", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.2.1" + "@fortawesome/fontawesome-common-types": "6.7.2" }, "engines": { "node": ">=6" } }, + "node_modules/@fortawesome/free-brands-svg-icons/node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.2.tgz", + "integrity": "sha512-Zs+YeHUC5fkt7Mg1l6XTniei3k4bwG/yo3iFUtZWd/pMx9g3fdvkSK9E0FOC+++phXOka78uJcYb8JaFkW52Xg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/@fortawesome/free-regular-svg-icons": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz", @@ -133,9 +151,10 @@ } }, "node_modules/@fortawesome/react-fontawesome": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", - "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.2.tgz", + "integrity": "sha512-EnkrprPNqI6SXJl//m29hpaNzOp1bruISWaOiRtkMi/xSvHJlzc2j2JAYS7egxt/EbjSNV/k6Xy0AQI6vB2+1g==", + "license": "MIT", "dependencies": { "prop-types": "^15.8.1" }, diff --git a/package.json b/package.json index 6552e20..3b0700b 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,11 @@ "license": "ISC", "browserslist": "defaults, not ie <= 11", "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.2.1", - "@fortawesome/free-brands-svg-icons": "^6.2.1", + "@fortawesome/fontawesome-svg-core": "^6.7.2", + "@fortawesome/free-brands-svg-icons": "^6.7.2", "@fortawesome/free-regular-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", - "@fortawesome/react-fontawesome": "^0.2.0", + "@fortawesome/react-fontawesome": "^0.2.2", "@headlessui/react": "^1.7.2", "@mapbox/rehype-prism": "^0.8.0", "@mdx-js/loader": "^2.3.0", diff --git a/src/components/Card.jsx b/src/components/Card.jsx index 910d199..0b34969 100644 --- a/src/components/Card.jsx +++ b/src/components/Card.jsx @@ -1,5 +1,5 @@ -import Link from 'next/link' -import clsx from 'clsx' +import Link from 'next/link'; +import clsx from 'clsx'; function ChevronRightIcon(props) { return ( @@ -11,57 +11,81 @@ function ChevronRightIcon(props) { strokeLinejoin="round" /> - ) + ); } + export function Card({ as: Component = 'div', className, children }) { return ( {children} - ) + ); } Card.Link = function CardLink({ children, ...props }) { return ( <> -
+
{children} - ) -} + ); +}; Card.Title = function CardTitle({ as: Component = 'h2', href, children }) { return ( - + {href ? {children} : children} - ) -} + ); +}; Card.Description = function CardDescription({ children }) { return ( -

+

{children}

- ) -} + ); +}; Card.Cta = function CardCta({ children }) { return ( - ) -} + ); +}; Card.Eyebrow = function CardEyebrow({ as: Component = 'p', @@ -77,6 +101,9 @@ Card.Eyebrow = function CardEyebrow({ 'relative z-10 order-first mb-3 flex items-center text-sm text-zinc-400 dark:text-zinc-500', decorate && 'pl-3.5' )} + style={{ + marginBottom: '0.75rem', + }} {...props} > {decorate && ( @@ -89,5 +116,5 @@ Card.Eyebrow = function CardEyebrow({ )} {children}
- ) -} + ); +}; diff --git a/src/components/ContainerPattern.jsx b/src/components/ContainerPattern.jsx index 03e0d63..f44b45a 100644 --- a/src/components/ContainerPattern.jsx +++ b/src/components/ContainerPattern.jsx @@ -1,12 +1,28 @@ -import clsx from 'clsx' - +import clsx from 'clsx'; const styles = { - xs: 'mx-auto px-4 sm:px-6 md:max-w-2xl md:px-4 lg:px-2', - sm: 'mx-auto px-4 sm:px-6 md:max-w-2xl md:px-4 lg:max-w-4xl lg:px-12', - md: 'mx-auto px-4 sm:px-6 md:max-w-2xl md:px-4 lg:max-w-6xl lg:px-8', - lg: 'mx-auto px-4 sm:px-6 md:max-w-2xl md:px-4 lg:max-w-7xl lg:px-8', -} + xs: 'mx-auto px-4 sm:px-6 md:max-w-2xl md:px-6 lg:px-4', + sm: 'mx-auto px-4 sm:px-6 md:max-w-2xl md:px-6 lg:max-w-4xl lg:px-14', + md: 'mx-auto px-4 sm:px-6 md:max-w-2xl md:px-6 lg:max-w-6xl lg:px-10', + lg: 'mx-auto px-4 sm:px-6 md:max-w-2xl md:px-6 lg:max-w-7xl lg:px-10', +}; +// Updated ContainerPattern component export function ContainerPattern({ size = 'sm', className, ...props }) { - return
+ return ( +
+ ); +} + +// Example usage for "Active Projects" button with custom styling +export function ActiveProjectsButton() { + return ( + + + + ); } diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index a036da7..0565b1b 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -1,9 +1,9 @@ import Link from 'next/link' - import { Container } from '@/components/Container' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { faEnvelope } from '@fortawesome/free-solid-svg-icons' -import { faDiscord, faGithub, faGitlab, faTwitter } from '@fortawesome/free-brands-svg-icons' +import { faDiscord, faGithub, faGitlab } from '@fortawesome/free-brands-svg-icons' +import { faXTwitter } from '@fortawesome/free-brands-svg-icons' // Import faXTwitter function NavLink({ href, children }) { return ( @@ -33,20 +33,20 @@ export function Footer() { © 2016-2023 AOSSIE. All rights reserved.

- - + + - - + + - - + + - - + + - - + + {/* Use faXTwitter here */}
diff --git a/src/components/SectionHeading.jsx b/src/components/SectionHeading.jsx index 7a61600..e8a8ced 100644 --- a/src/components/SectionHeading.jsx +++ b/src/components/SectionHeading.jsx @@ -1,4 +1,4 @@ -import clsx from 'clsx' +import clsx from 'clsx'; export function SectionHeading({ number, children, className, ...props }) { return ( @@ -7,14 +7,25 @@ export function SectionHeading({ number, children, className, ...props }) { className, 'inline-flex items-center rounded-full py-1 px-4 text-[#00843D] dark:text-yellow-400 ring-1 ring-inset ring-[#00843D] dark:ring-yellow-400' )} + style={{ + marginBottom: '1rem', // Adds spacing below the heading for better layout flow + paddingLeft: '1.25rem', // Slight adjustment for better content alignment + paddingRight: '1.25rem', + }} {...props} > -