From 6b611d7200b20f9e7558c8d3381842f78c01899a Mon Sep 17 00:00:00 2001 From: MehrdadAdabi <126083584+mehrdadAdabi@users.noreply.github.com> Date: Sat, 4 Oct 2025 18:45:24 +0330 Subject: [PATCH 1/4] fix:change styles and update color --- .../digital-innovation-page.tsx | 22 +++++++-------- .../green-innovation-page.tsx | 10 +++---- .../innovation-built-inside-page.tsx | 27 +++++++++---------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/app/components/dashboard/project-management/digital-innovation-page.tsx b/app/components/dashboard/project-management/digital-innovation-page.tsx index 1b5b35b..91a6f84 100644 --- a/app/components/dashboard/project-management/digital-innovation-page.tsx +++ b/app/components/dashboard/project-management/digital-innovation-page.tsx @@ -212,7 +212,7 @@ export function DigitalInnovationPage() { value: formatNumber(stats.reduceCosts.toFixed?.(1) ?? stats.reduceCosts), description: "میلیون ریال کاهش یافته", icon: , - color: "text-emerald-400", + color: "text-pr-green", }, { id: "bottleneck-removal", @@ -220,7 +220,7 @@ export function DigitalInnovationPage() { value: formatNumber(stats.increasedRevenue), description: "میلیون ریال افزایش یافته", icon: , - color: "text-emerald-400", + color: "text-pr-green", }, { @@ -231,7 +231,7 @@ export function DigitalInnovationPage() { ), description: "هزار تن صرفه جوریی شده", icon: , - color: "text-emerald-400", + color: "text-pr-green", }, { id: "frequent-failures-reduction", @@ -242,7 +242,7 @@ export function DigitalInnovationPage() { ), description: "مگاوات کاهش یافته", icon: , - color: "text-emerald-400", + color: "text-pr-green", }, ]; @@ -599,14 +599,14 @@ export function DigitalInnovationPage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} - className="text-pr-green hover:text-emerald-300 underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" + className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" > جزئیات بیشتر ); case "amount_currency_reduction": return ( - + {formatCurrency(String(value))} ); @@ -709,7 +709,7 @@ export function DigitalInnovationPage() {

{card.value}

@@ -735,25 +735,25 @@ export function DigitalInnovationPage() { { label: DigitalCardLabel.decreasCost, value: stats.reduceCostsPercent || 0, - color: "bg-emerald-400", + color: "bg-pr-green", labelColor: "text-white", }, { label: DigitalCardLabel.increaseRevenue, value: stats.increasedRevenuePercent || 0, - color: "bg-emerald-400", + color: "bg-pr-green", labelColor: "text-white", }, { label: DigitalCardLabel.performance, value: stats.resourceProductivityPercent || 0, - color: "bg-emerald-400", + color: "bg-pr-green", labelColor: "text-white", }, { label: DigitalCardLabel.decreaseEnergy, value: stats.reduceEnergyConsumptionPercent || 0, - color: "bg-emerald-400", + color: "bg-pr-green", labelColor: "text-white", }, ]} diff --git a/app/components/dashboard/project-management/green-innovation-page.tsx b/app/components/dashboard/project-management/green-innovation-page.tsx index b15acd3..d673736 100644 --- a/app/components/dashboard/project-management/green-innovation-page.tsx +++ b/app/components/dashboard/project-management/green-innovation-page.tsx @@ -602,14 +602,14 @@ export function GreenInnovationPage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} - className="text-pr-green hover:text-emerald-300 underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" + className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" > جزئیات بیشتر ); case "amount_currency_reduction": return ( - + {formatCurrency(String(value))} ); @@ -733,7 +733,7 @@ export function GreenInnovationPage() {
- + % {value.percent?.value} @@ -742,7 +742,7 @@ export function GreenInnovationPage() {
- + {value.total?.value} @@ -1113,7 +1113,7 @@ export function GreenInnovationPage() { شرح پروژه -
+
{/* Project Description */}

{selectedProjectDetails?.title}

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 90bb420..097dc69 100644 --- a/app/components/dashboard/project-management/innovation-built-inside-page.tsx +++ b/app/components/dashboard/project-management/innovation-built-inside-page.tsx @@ -152,8 +152,8 @@ enum projectStatus { const columns = [ { key: "select", label: "", sortable: false, width: "50px" }, - { key: "project_no", label: "شماره پروژه", sortable: true, width: "140px" }, - { key: "title", label: "عنوان پروژه", sortable: true, width: "400px" }, + { key: "project_no", label: "شماره پروژه", sortable: true, width: "120px" }, + { key: "title", label: "عنوان پروژه", sortable: true, width: "300px" }, { key: "project_status", label: "وضعیت پروژه", @@ -164,7 +164,7 @@ const columns = [ key: "project_rating", label: "امتیاز پروژه", sortable: true, - width: "140px", + width: "120px", }, { key: "details", label: "جزئیات پروژه", sortable: false, width: "140px" }, ]; @@ -624,14 +624,14 @@ export function InnovationBuiltInsidePage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} - className="text-pr-green hover:text-emerald-300 underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" + className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" > جزئیات بیشتر ); case "amount_currency_reduction": return ( - + {formatCurrency(String(value))} ); @@ -701,10 +701,10 @@ export function InnovationBuiltInsidePage() { return ( -
+
{/* Stats Cards */} -
-
+
+
{statsLoading ? // Loading skeleton for stats cards - matching new design Array.from({ length: 2 }).map((_, index) => ( @@ -748,7 +748,7 @@ export function InnovationBuiltInsidePage() {
- + % {value.percent?.value} @@ -757,7 +757,7 @@ export function InnovationBuiltInsidePage() {
- + {value.total?.value} @@ -867,7 +867,7 @@ export function InnovationBuiltInsidePage() {
- +
{columns.map((column) => ( @@ -1030,7 +1030,7 @@ export function InnovationBuiltInsidePage() { {/* Project Details Dialog */} - + شرح پروژه @@ -1092,7 +1092,6 @@ export function InnovationBuiltInsidePage() {
- {" "} سطح تکنولوژی
@@ -1256,7 +1255,7 @@ export function InnovationBuiltInsidePage() { ))} ) : ( - + Date: Sat, 4 Oct 2025 18:53:20 +0330 Subject: [PATCH 2/4] fix:change styles --- .../project-management/digital-innovation-page.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/components/dashboard/project-management/digital-innovation-page.tsx b/app/components/dashboard/project-management/digital-innovation-page.tsx index 91a6f84..9a8b233 100644 --- a/app/components/dashboard/project-management/digital-innovation-page.tsx +++ b/app/components/dashboard/project-management/digital-innovation-page.tsx @@ -652,7 +652,7 @@ export function DigitalInnovationPage() { return ( -
+
{/* Stats Cards */}
@@ -725,7 +725,7 @@ export function DigitalInnovationPage() {
{/* Process Impacts Chart */} - + {/* */} {/* Data Table */} - +
-
+
{columns.map((column) => ( From 01783dc3deb54708059be32568097e82ed983369 Mon Sep 17 00:00:00 2001 From: MehrdadAdabi <126083584+mehrdadAdabi@users.noreply.github.com> Date: Sat, 4 Oct 2025 18:59:37 +0330 Subject: [PATCH 3/4] fix:change styles --- .../dashboard/project-management/digital-innovation-page.tsx | 4 +++- .../dashboard/project-management/green-innovation-page.tsx | 4 +++- .../project-management/innovation-built-inside-page.tsx | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/components/dashboard/project-management/digital-innovation-page.tsx b/app/components/dashboard/project-management/digital-innovation-page.tsx index 9a8b233..da66cb4 100644 --- a/app/components/dashboard/project-management/digital-innovation-page.tsx +++ b/app/components/dashboard/project-management/digital-innovation-page.tsx @@ -617,7 +617,9 @@ export function DigitalInnovationPage() { ); case "title": - return {String(value)}; + return ( + {String(value)} + ); case "project_status": return (
diff --git a/app/components/dashboard/project-management/green-innovation-page.tsx b/app/components/dashboard/project-management/green-innovation-page.tsx index d673736..a9e013e 100644 --- a/app/components/dashboard/project-management/green-innovation-page.tsx +++ b/app/components/dashboard/project-management/green-innovation-page.tsx @@ -620,7 +620,9 @@ export function GreenInnovationPage() { ); case "title": - return {String(value)}; + return ( + {String(value)} + ); case "project_status": return (
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 097dc69..4c393aa 100644 --- a/app/components/dashboard/project-management/innovation-built-inside-page.tsx +++ b/app/components/dashboard/project-management/innovation-built-inside-page.tsx @@ -642,7 +642,9 @@ export function InnovationBuiltInsidePage() { ); case "title": - return {String(value)}; + return ( + {String(value)} + ); case "project_status": return (
From a14faab82da07fc3009ec8503f8bf6b143633a4c Mon Sep 17 00:00:00 2001 From: mahmoodsht <106068383+mahmoodsht@users.noreply.github.com> Date: Sun, 5 Oct 2025 08:45:46 +0330 Subject: [PATCH 4/4] =?UTF-8?q?=D8=AC=D8=B2=DB=8C=DB=8C=D8=A7=D8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project-management/innovation-built-inside-page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4c393aa..7cd5805 100644 --- a/app/components/dashboard/project-management/innovation-built-inside-page.tsx +++ b/app/components/dashboard/project-management/innovation-built-inside-page.tsx @@ -703,7 +703,7 @@ export function InnovationBuiltInsidePage() { return ( -
+
{/* Stats Cards */}