From 7b9c3f0c3083cecef03e0005303c17c166bbf545 Mon Sep 17 00:00:00 2001 From: tali-creator Date: Sat, 5 Jul 2025 00:50:07 +0100 Subject: [PATCH 1/2] About us page created --- frontend/src/components/landingPage/hero.tsx | 7 ++- .../src/components/landingPage/howitWorks.tsx | 1 + .../src/components/landingPage/navBar.tsx | 55 ++++++++++--------- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/frontend/src/components/landingPage/hero.tsx b/frontend/src/components/landingPage/hero.tsx index c745a1b..8971539 100644 --- a/frontend/src/components/landingPage/hero.tsx +++ b/frontend/src/components/landingPage/hero.tsx @@ -6,8 +6,13 @@ import Button from "../ui/Button"; import { ArrowRight } from "lucide-react"; import Link from "next/link"; import { useModalStore } from "@/stores/modalStore"; +import { useAuth } from "@/context/authContext"; + export default function Hero() { + + const {user} = useAuth() + const onLoginModal = useModalStore((state) => state.onLoginPrompt); return ( @@ -30,7 +35,7 @@ export default function Hero() {

- diff --git a/frontend/src/components/landingPage/howitWorks.tsx b/frontend/src/components/landingPage/howitWorks.tsx index 0eeab89..0f237be 100644 --- a/frontend/src/components/landingPage/howitWorks.tsx +++ b/frontend/src/components/landingPage/howitWorks.tsx @@ -1,5 +1,6 @@ import Button from "../ui/Button"; import Card from "../ui/Card"; + import { Gem, Home, diff --git a/frontend/src/components/landingPage/navBar.tsx b/frontend/src/components/landingPage/navBar.tsx index 6e6765d..6cc80d5 100644 --- a/frontend/src/components/landingPage/navBar.tsx +++ b/frontend/src/components/landingPage/navBar.tsx @@ -4,7 +4,7 @@ import Link from "next/link"; import React, { useState } from "react"; import { usePathname, useRouter } from "next/navigation"; import Button from "../ui/Button"; -import { LogOut, User } from "lucide-react"; +import { Building, LogOut, User } from "lucide-react"; import { useAuth } from "@/context/authContext"; import { useModalStore } from "@/stores/modalStore"; @@ -14,34 +14,34 @@ export default function NavBar() { const [toggleMiniDropdown, setToggleMiniDropdown] = useState(false); const pathname = usePathname(); const router = useRouter(); - + const { user, isLoading, signOut } = useAuth(); const toggleMenu = () => setToggle(!toggle); const miniDropdowntoggle = () => setToggleMiniDropdown(!toggleMiniDropdown); -const handleLogout = async () => { - try { - await signOut(); - window.location.href = '/'; - } catch (error) { - console.error("Logout failed:", error); - } -}; + const handleLogout = async () => { + try { + await signOut(); + window.location.href = "/"; + } catch (error) { + console.error("Logout failed:", error); + } + }; - const links = user + const links = user ? ["Home", "Properties", "Dashboard", "About", "Contact"] : ["Home", "Properties", "About", "Contact"]; - const walletAddress = user?.email + const walletAddress = user?.email ? `${user.email.substring(0, 3)}...${user.email.split("@")[1]}` : "Not connected"; const getRoutePath = (item: string) => { if (item === "Home") return "/"; if (item === "Dashboard") { - return user?.user_metadata?.user_type === "realtor" - ? "/realtor-dashboard" + return user?.user_metadata?.user_type === "realtor" + ? "/realtor-dashboard" : "/investor-dashboard"; } return `/${item.toLowerCase().replace(" ", "")}`; @@ -51,8 +51,13 @@ const handleLogout = async () => { ); -} \ No newline at end of file +} From f48fa74f7b734debd29f57e374e99c6d05392692 Mon Sep 17 00:00:00 2001 From: tali-creator Date: Sat, 5 Jul 2025 08:58:15 +0100 Subject: [PATCH 2/2] font updated --- frontend/src/app/globals.css | 3 ++- frontend/src/app/layout.tsx | 32 +++++++++++++++++--------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css index 337c5ea..4bdbd87 100644 --- a/frontend/src/app/globals.css +++ b/frontend/src/app/globals.css @@ -24,7 +24,8 @@ body { color: var(--background); background: var(--foreground); - font-family: Arial, Helvetica, sans-serif; + font-family: var(--font-montserrat), sans-serif; + } diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx index bc59279..724b635 100644 --- a/frontend/src/app/layout.tsx +++ b/frontend/src/app/layout.tsx @@ -1,19 +1,23 @@ import type { Metadata } from "next"; -import { Geist, Geist_Mono } from "next/font/google"; +import { Inter, Montserrat } from "next/font/google"; import "./globals.css"; import NavBar from "../components/landingPage/navBar"; import FooterSection from "../components/landingPage/footer"; import { AddPropertyModal } from "../components/AddProperty/add-property-modal"; import { AuthProvider } from "@/context/authContext"; -const geistSans = Geist({ - variable: "--font-geist-sans", + +const montserrat = Montserrat({ subsets: ["latin"], + variable: "--font-montserrat", + display: 'swap' }); -const geistMono = Geist_Mono({ - variable: "--font-geist-mono", + +const inter = Inter({ subsets: ["latin"], + variable: "--font-inter", + display: 'swap' }); export const metadata: Metadata = { @@ -27,17 +31,15 @@ export default function RootLayout({ children: React.ReactNode; }>) { return ( - - - - - {children} - - + + + + + {children} + + ); -} +} \ No newline at end of file