diff --git a/app/[lang]/projects/page.tsx b/app/[lang]/projects/page.tsx index 2856e31..63e2b27 100644 --- a/app/[lang]/projects/page.tsx +++ b/app/[lang]/projects/page.tsx @@ -22,9 +22,9 @@ export default async function ProjectsPage({ params: { lang } }: any) { -
-
-
+
+
+
diff --git a/app/[lang]/resources/page.tsx b/app/[lang]/resources/page.tsx index a3ef58e..b0eed65 100644 --- a/app/[lang]/resources/page.tsx +++ b/app/[lang]/resources/page.tsx @@ -11,6 +11,7 @@ import { AppContent } from "@/components/ui/app-content" import { Button } from "@/components/ui/button" import { Label } from "@/components/ui/label" import { Icons } from "@/components/icons" +import { PageHeader } from "@/components/page-header" import { useTranslation } from "@/app/i18n/client" import ResourcesContent from "../content/resources.md" @@ -166,35 +167,40 @@ const ResourceNav = ({ lang }: LangProps["params"]) => { })}
- - -
) } export default function ResourcePage({ params: { lang } }: LangProps) { const { t } = useTranslation(lang, "resources-page") + const { t: common } = useTranslation(lang, "common") return ( -
+
+ + + + } + />
-
- -

- {t("subtitle")} -

-
( ( = { } const projectCardVariants = cva( - "flex w-[310px] cursor-pointer flex-col overflow-hidden rounded-lg transition duration-150 ease-in hover:scale-105", + "flex w-[310px] cursor-pointer flex-col overflow-hidden rounded-lg transition duration-150 ease-in hover:scale-105", { variants: { showLinks: { - true: "min-h-[460px]", + true: "min-h-[450px]", false: "min-h-[200px]", }, border: { @@ -51,9 +52,13 @@ export default function ProjectCard({ className, lang, }: ProjectCardProps & { lang: LocaleTypes }) { + const { t } = useTranslation(lang, "common") const router = useRouter() - const { id, image, links, name, tldr, tags, imageAlt } = project + const { id, image, links, name, tldr, tags, imageAlt, projectStatus } = + project + + const projectNotActive = projectStatus !== "active" return (
)} -
+
{tags?.themes?.map((theme, index) => { @@ -94,21 +99,30 @@ export default function ProjectCard({ })}

{name}

-

{tldr}

-
- {showLinks && ( -
- {Object.entries(links ?? {})?.map(([website, url], index) => { - return ( - - ) - })} +
+

{tldr}

- )} +
+
+ {showLinks && ( +
+ {Object.entries(links ?? {})?.map(([website, url], index) => { + return ( + + ) + })} +
+ )} + {projectNotActive && ( + + {t("notCurrentlyActive")} + + )} +
) diff --git a/components/project/project-link.tsx b/components/project/project-link.tsx index ffadbee..e8a81d5 100644 --- a/components/project/project-link.tsx +++ b/components/project/project-link.tsx @@ -25,15 +25,13 @@ export function ProjectLink({ website, url }: ProjectLinkProps) { target="_blank" rel="noopener noreferrer" > -
- {`${website}Vector`} -
+ {`${website}Vector`} ) } diff --git a/public/social-medias/github-fill.svg b/public/social-medias/github-fill.svg index 691c786..e5ca733 100644 --- a/public/social-medias/github-fill.svg +++ b/public/social-medias/github-fill.svg @@ -1,10 +1,10 @@ - - - - - - - - - + + + + + + + + + diff --git a/public/social-medias/global-line.svg b/public/social-medias/global-line.svg index 3056f5d..16f6555 100644 --- a/public/social-medias/global-line.svg +++ b/public/social-medias/global-line.svg @@ -1,10 +1,10 @@ - - - - - - - - - + + + + + + + + + diff --git a/tailwind.config.js b/tailwind.config.js index f2ce887..a24e104 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -45,6 +45,7 @@ module.exports = { tuatara: { 100: "#E5E6E8", 200: "#CDCFD4", + 400: "#808590", 500: "#656A75", 600: "#565964", 700: "#4A4C54",