From ef96cb477801882fb73626495858eb068b3a20d3 Mon Sep 17 00:00:00 2001 From: MehrdadAdabi <126083584+mehrdadAdabi@users.noreply.github.com> Date: Sun, 28 Sep 2025 22:41:04 +0330 Subject: [PATCH] fix: ui bugs --- .../project-management/green-innovation-page.tsx | 9 ++++++--- .../innovation-built-inside-page.tsx | 2 +- app/components/dashboard/strategic-alignment-popup.tsx | 10 +++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/components/dashboard/project-management/green-innovation-page.tsx b/app/components/dashboard/project-management/green-innovation-page.tsx index 17fe76f..b15acd3 100644 --- a/app/components/dashboard/project-management/green-innovation-page.tsx +++ b/app/components/dashboard/project-management/green-innovation-page.tsx @@ -1,6 +1,5 @@ // import moment from "moment-jalaali"; import { useCallback, useEffect, useRef, useState } from "react"; -import { formatNumber } from "~/lib/utils"; import { Bar, BarChart, @@ -27,6 +26,7 @@ import { TableHeader, TableRow, } from "~/components/ui/table"; +import { formatNumber } from "~/lib/utils"; import { Building2, @@ -602,7 +602,7 @@ export function GreenInnovationPage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} - className="text-emerald-400 hover:text-emerald-300 hover:bg-emerald-500/20 p-2 h-auto cursor-pointer" + className="text-pr-green hover:text-emerald-300 underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" > جزئیات بیشتر @@ -813,7 +813,10 @@ export function GreenInnovationPage() {
{Object.entries(recycleParams).map((el, index) => { return ( -
+
{el[1].icon} diff --git a/app/components/dashboard/project-management/innovation-built-inside-page.tsx b/app/components/dashboard/project-management/innovation-built-inside-page.tsx index d5c6196..28947fc 100644 --- a/app/components/dashboard/project-management/innovation-built-inside-page.tsx +++ b/app/components/dashboard/project-management/innovation-built-inside-page.tsx @@ -624,7 +624,7 @@ export function InnovationBuiltInsidePage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} - className="text-emerald-500 hover:text-emerald-300 hover:bg-emerald-500/20 p-2 h-auto cursor-pointer" + className="text-pr-green hover:text-emerald-300 underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" > جزئیات بیشتر diff --git a/app/components/dashboard/strategic-alignment-popup.tsx b/app/components/dashboard/strategic-alignment-popup.tsx index 9e3fcae..2c56752 100644 --- a/app/components/dashboard/strategic-alignment-popup.tsx +++ b/app/components/dashboard/strategic-alignment-popup.tsx @@ -252,8 +252,16 @@ export function StrategicAlignmentPopup({ setData(dataWithPercentage || []); }; + const dialogHandler = (status: boolean) => { + if (onOpenChange) onOpenChange(status); + dispatch({ + type: "SELECT", + value: "همه مضامین", + }); + }; + return ( - +