Merge branch 'front-end' into dev

This commit is contained in:
Sosokker 2024-11-11 12:15:44 +07:00
commit 7039e5be4e
3 changed files with 45 additions and 12 deletions

View File

@ -29,7 +29,7 @@ async function getLatestInvestment(
deals: { project_id: number; deal_amount: number; created_time: Date;}[]
) {
const llist = [];
const count = 8;
const count = 5;
// select project name from the given id
for (let i = deals.length - 1; i >= 0 && llist.length < count; --i) {
let { data: project, error } = await supabase.from("project").select("project_name").eq("id", deals[i].project_id);

View File

@ -0,0 +1,22 @@
import React from "react";
import { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider } from "./ui/tooltip";
interface CustomTooltipProps {
message: string;
children: React.ReactNode;
}
const CustomTooltip: React.FC<CustomTooltipProps> = ({ message, children }) => {
return (
<TooltipProvider delayDuration={0.5}>
<Tooltip>
<TooltipTrigger asChild>{children}</TooltipTrigger>
<TooltipContent>
<p>{message}</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
);
};
export default CustomTooltip;

View File

@ -10,9 +10,10 @@ import {
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Bell, Heart, Wallet } from "lucide-react";
import { Bell, Heart, Wallet, ChartPie } from "lucide-react";
import { LogoutButton } from "@/components/auth/logoutButton";
import { useUserRole } from "@/hooks/useUserRole";
import CustomTooltip from "../customToolTip";
interface AuthenticatedComponentsProps {
uid: string;
@ -28,6 +29,7 @@ export const AuthenticatedComponents = ({ uid, avatarUrl, notificationCount }: A
return (
<div className={`flex gap-3 pl-2 items-center ${businessClass}`}>
<CustomTooltip message="Notification">
<Link href={"/notification"}>
<div className="relative inline-block">
<Bell className="h-6 w-6 " />
@ -38,12 +40,21 @@ export const AuthenticatedComponents = ({ uid, avatarUrl, notificationCount }: A
)}
</div>
</Link>
</CustomTooltip>
<Link href="/follow">
<Heart />
</Link>
<Link href={"/portfolio/" + uid}>
<Wallet className="cursor-pointer" />
</Link>
{/*chart pie icon for bussiness's dashboard */}
{data?.role === "business" && (
<CustomTooltip message="Dashboard">
<Link href="/dashboard">
<ChartPie />
</Link>
</CustomTooltip>
)}
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="outline" size="icon" className="overflow-hidden rounded-full">