From dd55f798f8959cd1d558ea6092de6825f32ad123 Mon Sep 17 00:00:00 2001 From: Alexandre Marques Date: Sat, 8 Mar 2025 18:25:32 +0000 Subject: [PATCH 01/13] feat: enhance footer and navbar with improved layout and logo import --- .vscode/settings.json | 3 +- apps/web/src/components/Footer.tsx | 102 +++++++++++++++++++++++++---- apps/web/src/components/Navbar.tsx | 3 +- 3 files changed, 93 insertions(+), 15 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c280855..aa08770 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,6 @@ "editor.codeActionsOnSave": { "source.organizeImports": "always", "source.fixAll.biome": "explicit", - } + }, + "typescript.tsdk": "node_modules/typescript/lib" } diff --git a/apps/web/src/components/Footer.tsx b/apps/web/src/components/Footer.tsx index f5d5d18..2b9bf34 100644 --- a/apps/web/src/components/Footer.tsx +++ b/apps/web/src/components/Footer.tsx @@ -1,18 +1,94 @@ +import Image from "next/image"; +import logo from "../../public/assets/images/logo.png"; + export default function Footer() { return ( - ); } + +const getCompanyLocationLabel = (location: string) => { + if (location.toLowerCase() === "remote") { + return ( +
+ {location} + +
+ ); + } + return location; +}; diff --git a/apps/web/src/components/HotFeaturedBadge.tsx b/apps/web/src/components/HotFeaturedBadge.tsx index 7ab208e..83a91b6 100644 --- a/apps/web/src/components/HotFeaturedBadge.tsx +++ b/apps/web/src/components/HotFeaturedBadge.tsx @@ -1,7 +1,16 @@ -export const HotFeaturedBadge = () => { +import { cn } from "@/lib/utils"; + +type HotFeaturedBadgeProps = { + className?: string; +}; + +export const HotFeaturedBadge = ({ className }: HotFeaturedBadgeProps) => { return ( HOT{" "} diff --git a/apps/web/src/lib/utils.ts b/apps/web/src/lib/utils.ts index dceb015..a4e9d42 100644 --- a/apps/web/src/lib/utils.ts +++ b/apps/web/src/lib/utils.ts @@ -1,4 +1,4 @@ -import { type ClassValue, clsx } from "clsx"; +import { clsx, type ClassValue } from "clsx"; import { twMerge } from "tailwind-merge"; import { Company } from "./types"; From 103da080bfc62fab4c60a49ff10dafc62dbed8d2 Mon Sep 17 00:00:00 2001 From: Alexandre Marques Date: Tue, 11 Mar 2025 08:34:28 +0000 Subject: [PATCH 05/13] fix: update category page params type with NextParams --- apps/web/src/app/category/[category]/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/app/category/[category]/page.tsx b/apps/web/src/app/category/[category]/page.tsx index fa47366..3c1e745 100644 --- a/apps/web/src/app/category/[category]/page.tsx +++ b/apps/web/src/app/category/[category]/page.tsx @@ -30,7 +30,7 @@ export async function generateStaticParams() { export default async function CategoryPage({ params, }: { - params: { category: string }; + params: NextParams<{ category: string }>; }) { const { category: categoryParam } = await params; From 1b9a43765df52d401feca2dc6190ad73234265c3 Mon Sep 17 00:00:00 2001 From: Alexandre Marques Date: Fri, 21 Mar 2025 16:36:55 +0000 Subject: [PATCH 06/13] feat: integrate Footer component into various layouts and enhance Breadcrumb styling --- apps/web/src/app/(companies-list)/layout.tsx | 16 +++-- .../src/app/category/[category]/layout.tsx | 12 ++++ apps/web/src/app/category/[category]/page.tsx | 57 ++++++++++++++---- apps/web/src/app/company/[slug]/layout.tsx | 8 ++- apps/web/src/app/layout.tsx | 3 - .../src/app/location/[location]/layout.tsx | 12 ++++ apps/web/src/app/location/[location]/page.tsx | 58 +++++++++++++++---- apps/web/src/components/Breadcrumb.tsx | 14 ++++- apps/web/src/components/ExploreButton.tsx | 2 +- apps/web/src/components/SimpleFooter.tsx | 36 ++++++++++++ 10 files changed, 184 insertions(+), 34 deletions(-) create mode 100644 apps/web/src/app/category/[category]/layout.tsx create mode 100644 apps/web/src/app/location/[location]/layout.tsx create mode 100644 apps/web/src/components/SimpleFooter.tsx diff --git a/apps/web/src/app/(companies-list)/layout.tsx b/apps/web/src/app/(companies-list)/layout.tsx index 68c3c03..8d09661 100644 --- a/apps/web/src/app/(companies-list)/layout.tsx +++ b/apps/web/src/app/(companies-list)/layout.tsx @@ -1,16 +1,20 @@ import CompaniesHeader from "@/components/CompaniesHeader"; +import Footer from "@/components/Footer"; import { Skeleton } from "@/components/ui/skeleton"; import { LayoutProps } from "@/lib/types"; import { Suspense } from "react"; export default function AppLayout({ children }: LayoutProps) { return ( -
- - }> -
{children}
- -
+ <> +
+ + }> +
{children}
+ +
+