Refactor project and contract forms for improved UI and functionality

- Updated NewProjectPage to use PageContainer and PageHeader for better layout.
- Enhanced ProjectListPage to display project data in a responsive table format.
- Refactored ContractForm to use Card components and improved loading state handling.
- Refactored ProjectForm to use Card components, added loading state, and improved form structure and styling.
This commit is contained in:
Chop
2025-06-19 18:59:03 +02:00
parent 85f18825ad
commit 0acb203ef8
8 changed files with 1465 additions and 523 deletions

View File

@@ -3,6 +3,12 @@
import { useEffect, useState } from "react";
import Link from "next/link";
import { useParams } from "next/navigation";
import { Card, CardHeader, CardContent } from "@/components/ui/Card";
import Button from "@/components/ui/Button";
import Badge from "@/components/ui/Badge";
import PageContainer from "@/components/ui/PageContainer";
import PageHeader from "@/components/ui/PageHeader";
import { LoadingState } from "@/components/ui/States";
export default function ContractDetailsPage() {
const params = useParams();
@@ -41,166 +47,352 @@ export default function ContractDetailsPage() {
fetchContractDetails();
}
}, [contractId]);
if (loading) {
return (
<div className="p-4 max-w-4xl mx-auto">
<div className="text-center">Ładowanie szczegółów umowy...</div>
</div>
<PageContainer>
<LoadingState message="Loading contract details..." />
</PageContainer>
);
}
if (!contract) {
return (
<div className="p-4 max-w-4xl mx-auto">
<div className="text-center text-red-600">Nie znaleziono umowy.</div>
<div className="text-center mt-4">
<Link href="/contracts" className="text-blue-600 hover:underline">
Powrót do listy umów
</Link>
</div>
</div>
<PageContainer>
<Card>
<CardContent className="text-center py-12">
<p className="text-red-600 text-lg mb-4">Contract not found.</p>
<Link href="/contracts">
<Button variant="primary">Back to Contracts</Button>
</Link>
</CardContent>
</Card>
</PageContainer>
);
}
return (
<div className="p-4 max-w-4xl mx-auto">
{/* Header */}
<div className="flex justify-between items-center mb-6">
<h1 className="text-2xl font-bold">Umowa {contract.contract_number}</h1>
<Link href="/contracts" className="text-blue-600 hover:underline">
Powrót do listy umów
</Link>
</div>
<PageContainer>
<PageHeader
title={`Contract ${contract.contract_number}`}
description={contract.contract_name || "Contract Details"}
action={
<div className="flex items-center gap-3">
<Link href="/contracts">
<Button variant="outline" size="sm">
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M15 19l-7-7 7-7"
/>
</svg>
Back to Contracts
</Button>
</Link>
<Link href={`/projects/new?contract_id=${contractId}`}>
<Button variant="primary" size="sm">
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M12 4v16m8-8H4"
/>
</svg>
Add Project
</Button>
</Link>
</div>
}
/>
{/* Contract Details */}
<div className="bg-white border border-gray-200 rounded-lg p-6 mb-6">
<h2 className="text-xl font-semibold mb-4">Szczegóły umowy</h2>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div>
<label className="block text-sm font-medium text-gray-600">
Numer umowy
</label>
<p className="text-lg">{contract.contract_number}</p>
</div>
{contract.contract_name && (
<div>
<label className="block text-sm font-medium text-gray-600">
Nazwa umowy
</label>
<p className="text-lg">{contract.contract_name}</p>
</div>
)}
{contract.customer_contract_number && (
<div>
<label className="block text-sm font-medium text-gray-600">
Numer umowy (Klienta)
</label>
<p>{contract.customer_contract_number}</p>
</div>
)}
{contract.customer && (
<div>
<label className="block text-sm font-medium text-gray-600">
Zleceniodawca
</label>
<p>{contract.customer}</p>
</div>
)}
{contract.investor && (
<div>
<label className="block text-sm font-medium text-gray-600">
Inwestor
</label>
<p>{contract.investor}</p>
</div>
)}
{contract.date_signed && (
<div>
<label className="block text-sm font-medium text-gray-600">
Data zawarcia
</label>
<p>
{new Date(contract.date_signed).toLocaleDateString("pl-PL")}
</p>
</div>
)}
{contract.finish_date && (
<div>
<label className="block text-sm font-medium text-gray-600">
Data zakończenia
</label>
<p>
{new Date(contract.finish_date).toLocaleDateString("pl-PL")}
</p>
</div>
)}
</div>
</div>
{/* Linked Projects */}
<div className="bg-white border border-gray-200 rounded-lg p-6">
<div className="flex justify-between items-center mb-4">
<h2 className="text-xl font-semibold">
Projekty w ramach umowy ({projects.length})
</h2>
<Link
href={`/projects/new?contract_id=${contractId}`}
className="bg-blue-600 text-white px-4 py-2 rounded hover:bg-blue-700 text-sm"
>
Dodaj projekt
</Link>
</div>
{projects.length === 0 ? (
<p className="text-gray-500 text-center py-8">
Brak projektów przypisanych do tej umowy.
</p>
) : (
<div className="space-y-3">
{projects.map((project) => (
<div
key={project.project_id}
className="border border-gray-100 rounded p-4 hover:bg-gray-50"
>
<div className="flex justify-between items-start">
<div>
<h3 className="font-medium">{project.project_name}</h3>
<p className="text-sm text-gray-600">
{project.project_number}
</p>
{project.address && (
<p className="text-sm text-gray-500">
📍 {project.address}
</p>
)}
{project.finish_date && (
<p className="text-sm text-gray-500">
Termin:{" "}
{new Date(project.finish_date).toLocaleDateString(
"pl-PL"
)}
</p>
)}
</div>
<Link
href={`/projects/${project.project_id}`}
className="text-blue-600 hover:underline text-sm"
>
Szczegóły
</Link>
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6 mb-8">
<div className="lg:col-span-2">
<Card>
<CardHeader>
<h2 className="text-xl font-semibold text-gray-900">
Contract Information
</h2>
</CardHeader>
<CardContent className="space-y-6">
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Contract Number
</span>
<p className="text-gray-900 font-medium">
{contract.contract_number}
</p>
</div>
{contract.contract_name && (
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Contract Name
</span>
<p className="text-gray-900 font-medium">
{contract.contract_name}
</p>
</div>
)}
{contract.customer_contract_number && (
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Customer Contract Number
</span>
<p className="text-gray-900 font-medium">
{contract.customer_contract_number}
</p>
</div>
)}
{contract.customer && (
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Customer
</span>
<p className="text-gray-900 font-medium">
{contract.customer}
</p>
</div>
)}
{contract.investor && (
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Investor
</span>
<p className="text-gray-900 font-medium">
{contract.investor}
</p>
</div>
)}
{contract.date_signed && (
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Date Signed
</span>
<p className="text-gray-900 font-medium">
{new Date(contract.date_signed).toLocaleDateString(
"en-US"
)}
</p>
</div>
)}
{contract.finish_date && (
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Finish Date
</span>
<p className="text-gray-900 font-medium">
{new Date(contract.finish_date).toLocaleDateString(
"en-US"
)}
</p>
</div>
)}
</div>
))}
</div>
)}
</CardContent>
</Card>
</div>
{/* Contract Summary Sidebar */}
<div>
<Card>
<CardHeader>
<h2 className="text-lg font-semibold text-gray-900">Summary</h2>
</CardHeader>
<CardContent className="space-y-4">
<div>
<span className="text-sm font-medium text-gray-500 block mb-2">
Projects Count
</span>
<Badge variant="primary" size="lg">
{projects.length} Projects
</Badge>
</div>
{contract.finish_date && (
<div className="border-t pt-4">
<span className="text-sm font-medium text-gray-500 block mb-2">
Contract Status
</span>
<Badge
variant={
new Date(contract.finish_date) > new Date()
? "success"
: "warning"
}
size="md"
>
{new Date(contract.finish_date) > new Date()
? "Active"
: "Expired"}
</Badge>
</div>
)}
</CardContent>
</Card>
</div>
</div>
</div>
{/* Associated Projects */}
<Card>
<CardHeader>
<div className="flex justify-between items-center">
<h2 className="text-xl font-semibold text-gray-900">
Associated Projects ({projects.length})
</h2>
<Link href={`/projects/new?contract_id=${contractId}`}>
<Button variant="outline" size="sm">
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M12 4v16m8-8H4"
/>
</svg>
Add Project
</Button>
</Link>
</div>
</CardHeader>
<CardContent>
{projects.length === 0 ? (
<div className="text-center py-12">
<div className="text-gray-400 mb-4">
<svg
className="w-16 h-16 mx-auto"
fill="currentColor"
viewBox="0 0 20 20"
>
<path
fillRule="evenodd"
d="M3 4a1 1 0 011-1h12a1 1 0 011 1v2a1 1 0 01-1 1H4a1 1 0 01-1-1V4zm0 4a1 1 0 011-1h12a1 1 0 011 1v2a1 1 0 01-1 1H4a1 1 0 01-1-1V8zm0 4a1 1 0 011-1h12a1 1 0 011 1v2a1 1 0 01-1 1H4a1 1 0 01-1-1v-2z"
clipRule="evenodd"
/>
</svg>
</div>
<h3 className="text-lg font-medium text-gray-900 mb-2">
No projects yet
</h3>
<p className="text-gray-500 mb-6">
Get started by creating your first project for this contract
</p>
<Link href={`/projects/new?contract_id=${contractId}`}>
<Button variant="primary">Create First Project</Button>
</Link>
</div>
) : (
<div className="grid grid-cols-1 gap-4">
{projects.map((project) => (
<div
key={project.project_id}
className="border border-gray-200 rounded-lg p-4 hover:bg-gray-50 transition-colors"
>
<div className="flex justify-between items-start">
<div className="flex-1">
<div className="flex items-center gap-3 mb-2">
<h3 className="font-medium text-gray-900">
{project.project_name}
</h3>
<Badge variant="secondary" size="sm">
{project.project_number}
</Badge>
</div>
<div className="grid grid-cols-1 sm:grid-cols-3 gap-2 text-sm text-gray-600">
{project.address && (
<div className="flex items-center">
<svg
className="w-4 h-4 mr-1"
fill="currentColor"
viewBox="0 0 20 20"
>
<path
fillRule="evenodd"
d="M5.05 4.05a7 7 0 119.9 9.9L10 18.9l-4.95-4.95a7 7 0 010-9.9zM10 11a2 2 0 100-4 2 2 0 000 4z"
clipRule="evenodd"
/>
</svg>
{project.address}
</div>
)}
{project.finish_date && (
<div className="flex items-center">
<svg
className="w-4 h-4 mr-1"
fill="currentColor"
viewBox="0 0 20 20"
>
<path
fillRule="evenodd"
d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
clipRule="evenodd"
/>
</svg>
{new Date(project.finish_date).toLocaleDateString(
"en-US"
)}
</div>
)}
<div className="flex items-center">
<Badge
variant={
project.project_status === "fulfilled"
? "success"
: project.project_status === "registered"
? "secondary"
: "primary"
}
size="sm"
>
{project.project_status === "registered"
? "Registered"
: project.project_status === "in_progress_design"
? "In Progress (Design)"
: project.project_status ===
"in_progress_construction"
? "In Progress (Construction)"
: project.project_status === "fulfilled"
? "Completed"
: "Unknown"}
</Badge>
</div>
</div>
</div>
<Link href={`/projects/${project.project_id}`}>
<Button variant="outline" size="sm">
View Details
</Button>
</Link>
</div>
</div>
))}
</div>
)}
</CardContent>
</Card>
</PageContainer>
);
}

View File

@@ -1,10 +1,39 @@
import ContractForm from "@/components/ContractForm";
import PageContainer from "@/components/ui/PageContainer";
import PageHeader from "@/components/ui/PageHeader";
import Button from "@/components/ui/Button";
import Link from "next/link";
export default function NewContractPage() {
return (
<div className="p-4 max-w-2xl mx-auto">
<h1 className="text-xl font-bold mb-4">Nowa umowa</h1>
<ContractForm />
</div>
<PageContainer>
<PageHeader
title="Create New Contract"
description="Add a new contract to your portfolio"
action={
<Link href="/contracts">
<Button variant="outline" size="sm">
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M15 19l-7-7 7-7"
/>
</svg>
Back to Contracts
</Button>
</Link>
}
/>
<div className="max-w-2xl">
<ContractForm />
</div>
</PageContainer>
);
}

View File

@@ -1,4 +1,8 @@
import ProjectForm from "@/components/ProjectForm";
import PageContainer from "@/components/ui/PageContainer";
import PageHeader from "@/components/ui/PageHeader";
import Button from "@/components/ui/Button";
import Link from "next/link";
export default async function EditProjectPage({ params }) {
const { id } = await params;
@@ -7,10 +11,68 @@ export default async function EditProjectPage({ params }) {
});
const project = await res.json();
if (!project) {
return (
<PageContainer>
<div className="text-center py-12">
<p className="text-red-600 text-lg mb-4">Project not found.</p>
<Link href="/projects">
<Button variant="primary">Back to Projects</Button>
</Link>
</div>
</PageContainer>
);
}
return (
<div className="p-4 max-w-2xl mx-auto">
<h1 className="text-xl font-bold mb-4">Edit Project</h1>
<ProjectForm initialData={project} />
</div>
<PageContainer>
<PageHeader
title="Edit Project"
description={`Editing: ${project.project_name || "Untitled Project"}`}
action={
<div className="flex items-center gap-3">
<Link href={`/projects/${id}`}>
<Button variant="outline" size="sm">
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M6 18L18 6M6 6l12 12"
/>
</svg>
Cancel
</Button>
</Link>
<Link href="/projects">
<Button variant="outline" size="sm">
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M15 19l-7-7 7-7"
/>
</svg>
Back to Projects
</Button>
</Link>
</div>
}
/>
<div className="max-w-2xl">
<ProjectForm initialData={project} />
</div>
</PageContainer>
);
}

View File

@@ -18,7 +18,7 @@ export default async function ProjectViewPage({ params }) {
const { id } = await params;
const project = getProjectWithContract(id);
const notes = getNotesForProject(id);
if (!project) {
return (
<PageContainer>
@@ -34,7 +34,7 @@ export default async function ProjectViewPage({ params }) {
);
}
const daysRemaining = project.finish_date
const daysRemaining = project.finish_date
? differenceInCalendarDays(parseISO(project.finish_date), new Date())
: null;
@@ -50,13 +50,16 @@ export default async function ProjectViewPage({ params }) {
description={`${project.city}${project.address}`}
action={
<div className="flex items-center gap-3">
<Badge variant={getDeadlineVariant(daysRemaining)} size="md">
{daysRemaining === 0
? "Due Today"
: daysRemaining > 0
? `${daysRemaining} days left`
: `${Math.abs(daysRemaining)} days overdue`}
</Badge> <Link href="/projects">
{daysRemaining !== null && (
<Badge variant={getDeadlineVariant(daysRemaining)} size="md">
{daysRemaining === 0
? "Due Today"
: daysRemaining > 0
? `${daysRemaining} days left`
: `${Math.abs(daysRemaining)} days overdue`}
</Badge>
)}
<Link href="/projects">
<Button variant="outline" size="sm">
<svg
className="w-4 h-4 mr-2"
@@ -75,167 +78,346 @@ export default async function ProjectViewPage({ params }) {
</Button>
</Link>
<Link href={`/projects/${id}/edit`}>
<Button variant="secondary">Edit Project</Button>
<Button variant="primary">
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"
/>
</svg>
Edit Project
</Button>
</Link>
</div>
}
/>
/>{" "}
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6 mb-8">
{/* Main Project Information */}
<div className="lg:col-span-2 space-y-6">
<Card>
<CardHeader>
<div className="flex items-center justify-between">
<h2 className="text-xl font-semibold text-gray-900">
Project Information
</h2>
<Badge
variant={
project.project_type === "design"
? "secondary"
: project.project_type === "construction"
? "primary"
: project.project_type === "design+construction"
? "success"
: "default"
}
size="sm"
>
{project.project_type === "design"
? "Design (P)"
: project.project_type === "construction"
? "Construction (R)"
: project.project_type === "design+construction"
? "Design + Construction (P+R)"
: "Unknown"}
</Badge>
</div>
</CardHeader>
<CardContent className="space-y-6">
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Location
</span>
<p className="text-gray-900 font-medium">
{project.city || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Address
</span>
<p className="text-gray-900 font-medium">
{project.address || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Plot
</span>
<p className="text-gray-900 font-medium">
{project.plot || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
District
</span>
<p className="text-gray-900 font-medium">
{project.district || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Unit
</span>
<p className="text-gray-900 font-medium">
{project.unit || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Deadline
</span>
<p className="text-gray-900 font-medium">
{project.finish_date || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
WP
</span>
<p className="text-gray-900 font-medium">
{project.wp || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Investment Number
</span>
<p className="text-gray-900 font-medium">
{project.investment_number || "N/A"}
</p>
</div>
</div>
<div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
<Card>
<CardHeader>
<h2 className="text-xl font-semibold text-gray-900">
Project Information
</h2>
</CardHeader>
<CardContent className="space-y-4">
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
{project.contact && (
<div className="border-t pt-4">
<span className="text-sm font-medium text-gray-500 block mb-1">
Contact
</span>
<p className="text-gray-900 font-medium">{project.contact}</p>
</div>
)}
{project.coordinates && (
<div className="border-t pt-4">
<span className="text-sm font-medium text-gray-500 block mb-1">
Coordinates
</span>
<p className="text-gray-900 font-medium font-mono text-sm">
{project.coordinates}
</p>
</div>
)}
{project.notes && (
<div className="border-t pt-4">
<span className="text-sm font-medium text-gray-500 block mb-1">
Notes
</span>
<p className="text-gray-900">{project.notes}</p>
</div>
)}
</CardContent>
</Card>
{/* Contract Details */}
<Card>
<CardHeader>
<h2 className="text-xl font-semibold text-gray-900">
Contract Details
</h2>
</CardHeader>
<CardContent className="space-y-4">
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Contract Number
</span>
<p className="text-gray-900 font-medium">
{project.contract_number || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Contract Name
</span>
<p className="text-gray-900 font-medium">
{project.contract_name || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Customer
</span>
<p className="text-gray-900 font-medium">
{project.customer || "N/A"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500 block mb-1">
Investor
</span>
<p className="text-gray-900 font-medium">
{project.investor || "N/A"}
</p>
</div>
</div>
</CardContent>
</Card>
</div>
{/* Status Sidebar */}
<div className="space-y-6">
<Card>
<CardHeader>
<h2 className="text-lg font-semibold text-gray-900">
Project Status
</h2>
</CardHeader>
<CardContent className="space-y-4">
<div>
<span className="text-sm font-medium text-gray-500">
Location
<span className="text-sm font-medium text-gray-500 block mb-2">
Current Status
</span>
<p className="text-gray-900">{project.city}</p>
<div className="flex items-center gap-2">
<Badge
variant={
project.project_status === "fulfilled"
? "success"
: project.project_status === "registered"
? "secondary"
: "primary"
}
size="md"
>
{project.project_status === "registered"
? "Registered"
: project.project_status === "in_progress_design"
? "In Progress (Design)"
: project.project_status === "in_progress_construction"
? "In Progress (Construction)"
: project.project_status === "fulfilled"
? "Completed"
: "Unknown"}
</Badge>
</div>
<div className="mt-3">
<ProjectStatusDropdown project={project} />
</div>
</div>
<div>
<span className="text-sm font-medium text-gray-500">
Address
</span>
<p className="text-gray-900">{project.address}</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">Plot</span>
<p className="text-gray-900">{project.plot}</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">
District
</span>
<p className="text-gray-900">{project.district}</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">Unit</span>
<p className="text-gray-900">{project.unit}</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">
Deadline
</span>
<p className="text-gray-900">{project.finish_date}</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">WP</span>
<p className="text-gray-900">{project.wp}</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">
Investment Number
</span>
<p className="text-gray-900">{project.investment_number}</p>
</div>
</div> <div>
<span className="text-sm font-medium text-gray-500">Contact</span>
<p className="text-gray-900">{project.contact}</p>
</div> {project.coordinates && (
<div>
<span className="text-sm font-medium text-gray-500">Coordinates</span>
<p className="text-gray-900">{project.coordinates}</p>
</div>
)}
{project.notes && (
<div>
<span className="text-sm font-medium text-gray-500">Notes</span>
<p className="text-gray-900">{project.notes}</p>
</div>
)}
<div>
<span className="text-sm font-medium text-gray-500">
Typ projektu
</span>
<p className="text-gray-900">
{project.project_type === "design"
? "Projektowanie"
: project.project_type === "construction"
? "Realizacja"
: project.project_type === "design+construction"
? "Projektowanie + Realizacja"
: "-"}
</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">
Status projektu
</span>
<div className="flex items-center gap-2 mt-1">
<span className="text-gray-900">
{project.project_status === "registered"
? "Zarejestrowany"
: project.project_status === "in_progress_design"
? "W realizacji (projektowanie)"
: project.project_status === "in_progress_construction"
? "W realizacji (realizacja)"
: project.project_status === "fulfilled"
? "Zakończony"
: "-"}
</span>
<ProjectStatusDropdown project={project} />
</div>
</div>
</CardContent>
</Card>
<Card>
<CardHeader>
<h2 className="text-xl font-semibold text-gray-900">
Contract Details
</h2>
</CardHeader>
<CardContent className="space-y-4">
<div>
<span className="text-sm font-medium text-gray-500">
Contract Number
</span>
<p className="text-gray-900">{project.contract_number}</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">
Contract Name
</span>
<p className="text-gray-900">{project.contract_name}</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">
Customer
</span>
<p className="text-gray-900">{project.customer}</p>
</div>
<div>
<span className="text-sm font-medium text-gray-500">
Investor
</span>
<p className="text-gray-900">{project.investor}</p>
</div>
</CardContent> </Card>{" "}
</div> {/* Project Location Map */}
{daysRemaining !== null && (
<div className="border-t pt-4">
<span className="text-sm font-medium text-gray-500 block mb-2">
Timeline
</span>
<div className="text-center">
<Badge
variant={getDeadlineVariant(daysRemaining)}
size="lg"
>
{daysRemaining === 0
? "Due Today"
: daysRemaining > 0
? `${daysRemaining} days remaining`
: `${Math.abs(daysRemaining)} days overdue`}
</Badge>
</div>
</div>
)}
</CardContent>
</Card>
{/* Quick Actions */}
<Card>
<CardHeader>
<h2 className="text-lg font-semibold text-gray-900">
Quick Actions
</h2>
</CardHeader>
<CardContent className="space-y-3">
<Link href={`/projects/${id}/edit`} className="block">
<Button
variant="outline"
size="sm"
className="w-full justify-start"
>
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"
/>
</svg>
Edit Project
</Button>
</Link>
<Link href="/projects" className="block">
<Button
variant="outline"
size="sm"
className="w-full justify-start"
>
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M15 19l-7-7 7-7"
/>
</svg>
Back to Projects
</Button>
</Link>
</CardContent>
</Card>
</div>
</div>{" "}
{/* Project Location Map */}
{project.coordinates && (
<Card>
<CardHeader>
<h2 className="text-xl font-semibold text-gray-900">
Project Location
</h2>
</CardHeader>
<CardContent>
<ProjectMap
coordinates={project.coordinates}
projectName={project.project_name}
showLayerControl={true}
mapHeight="h-80"
defaultLayer="Polish Geoportal Orthophoto"
/>
</CardContent>
</Card>
<div className="mb-8">
<Card>
<CardHeader>
<h2 className="text-xl font-semibold text-gray-900">
Project Location
</h2>
</CardHeader>
<CardContent>
<ProjectMap
coordinates={project.coordinates}
projectName={project.project_name}
showLayerControl={true}
mapHeight="h-80"
defaultLayer="Polish Geoportal Orthophoto"
/>
</CardContent>
</Card>
</div>
)}
<ProjectTasksSection projectId={id} />
{/* Project Tasks Section */}
<div className="mb-8">
<ProjectTasksSection projectId={id} />
</div>
{/* Notes Section */}
<Card>
<CardHeader>
<h2 className="text-xl font-semibold text-gray-900">Notes</h2>
@@ -245,8 +427,8 @@ export default async function ProjectViewPage({ params }) {
<NoteForm projectId={id} />
</div>
{notes.length === 0 ? (
<div className="text-center py-8">
<div className="text-gray-400 mb-2">
<div className="text-center py-12">
<div className="text-gray-400 mb-4">
<svg
className="w-12 h-12 mx-auto"
fill="currentColor"
@@ -258,17 +440,26 @@ export default async function ProjectViewPage({ params }) {
/>
</svg>
</div>
<p className="text-gray-500">No notes yet.</p>
<h3 className="text-lg font-medium text-gray-900 mb-2">
No notes yet
</h3>
<p className="text-gray-500">
Add your first note using the form above.
</p>
</div>
) : (
<div className="space-y-3">
<div className="space-y-4">
{notes.map((n) => (
<div
key={n.note_id}
className="border border-gray-200 p-4 rounded-lg bg-gray-50"
className="border border-gray-200 p-4 rounded-lg bg-gray-50 hover:bg-gray-100 transition-colors"
>
<p className="text-sm text-gray-500 mb-2">{n.note_date}</p>
<p className="text-gray-900">{n.note}</p>
<div className="flex items-center justify-between mb-2">
<span className="text-sm font-medium text-gray-500">
{n.note_date}
</span>
</div>
<p className="text-gray-900 leading-relaxed">{n.note}</p>
</div>
))}
</div>

View File

@@ -1,10 +1,39 @@
import ProjectForm from "@/components/ProjectForm";
import PageContainer from "@/components/ui/PageContainer";
import PageHeader from "@/components/ui/PageHeader";
import Button from "@/components/ui/Button";
import Link from "next/link";
export default function NewProjectPage() {
return (
<div className="p-4 max-w-2xl mx-auto">
<h1 className="text-xl font-bold mb-4">New Project</h1>
<ProjectForm />
</div>
<PageContainer>
<PageHeader
title="Create New Project"
description="Add a new project to your portfolio"
action={
<Link href="/projects">
<Button variant="outline" size="sm">
<svg
className="w-4 h-4 mr-2"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M15 19l-7-7 7-7"
/>
</svg>
Back to Projects
</Button>
</Link>
}
/>
<div className="max-w-2xl">
<ProjectForm />
</div>
</PageContainer>
);
}

View File

@@ -145,83 +145,128 @@ export default function ProjectListPage() {
</Card>
) : (
<div className="bg-white rounded-lg shadow overflow-hidden">
{/* Header Row */}
<div className="grid grid-cols-12 gap-4 p-4 bg-gray-100 border-b font-semibold text-sm text-gray-700">
{" "}
<div className="col-span-1">Number</div>
<div className="col-span-3">Project Name</div>
<div className="col-span-2">WP</div>
<div className="col-span-1">City</div>
<div className="col-span-2">Address</div>
<div className="col-span-1">Plot</div>{" "}
<div className="col-span-1">Finish Date</div>
<div className="col-span-1">Actions</div>
</div>{" "}
{/* Data Rows */}
{filteredProjects.map((project, index) => (
<div
key={project.project_id}
className={`grid grid-cols-12 gap-4 p-4 border-b hover:bg-gray-50 transition-colors items-center ${
index % 2 === 0 ? "bg-white" : "bg-gray-25"
}`}
>
<div className="col-span-1">
<Badge variant="primary" size="sm">
{project.project_number}
</Badge>
</div>{" "}
<div className="col-span-3">
<Link
href={`/projects/${project.project_id}`}
className="font-medium text-blue-600 hover:text-blue-800 transition-colors truncate block"
<table className="w-full table-fixed">
<thead>
<tr className="bg-gray-100 border-b">
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700 w-16">
No.
</th>
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700">
Project Name
</th>
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700 w-20">
WP
</th>
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700 w-20">
City
</th>
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700 w-32">
Address
</th>
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700 w-20">
Plot
</th>
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700 w-24">
Finish
</th>
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700 w-12">
Type
</th>
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700 w-24">
Status
</th>
<th className="text-left px-2 py-3 font-semibold text-xs text-gray-700 w-20">
Actions
</th>
</tr>
</thead>{" "}
<tbody>
{filteredProjects.map((project, index) => (
<tr
key={project.project_id}
className={`border-b hover:bg-gray-50 transition-colors ${
index % 2 === 0 ? "bg-white" : "bg-gray-25"
}`}
>
{project.project_name}
</Link>
</div>
<div className="col-span-2 text-sm text-gray-600 truncate">
{project.wp || "N/A"}
</div>
<div className="col-span-1 text-sm text-gray-600 truncate">
{project.city || "N/A"}
</div>
<div className="col-span-2 text-sm text-gray-600 truncate">
{project.address || "N/A"}
</div>
<div className="col-span-1 text-sm text-gray-600 truncate">
{project.plot || "N/A"}
</div>{" "}
<div className="col-span-1 text-sm text-gray-600 truncate">
{project.finish_date || "N/A"}
</div>
<div className="col-span-1 text-sm text-gray-600 truncate">
{project.project_type === "design"
? "Projektowanie"
: project.project_type === "construction"
? "Realizacja"
: project.project_type === "design+construction"
? "Projektowanie + Realizacja"
: "-"}
</div>
<div className="col-span-1 text-sm text-gray-600 truncate">
{project.project_status === "registered"
? "Zarejestrowany"
: project.project_status === "in_progress_design"
? "W realizacji (projektowanie)"
: project.project_status === "in_progress_construction"
? "W realizacji (realizacja)"
: project.project_status === "fulfilled"
? "Zakończony"
: "-"}
</div>
<div className="col-span-1">
<Link href={`/projects/${project.project_id}`}>
<Button variant="outline" size="sm">
View
</Button>
</Link>
</div>{" "}
</div>
))}
<td className="px-2 py-3">
<Badge variant="primary" size="sm" className="text-xs">
{project.project_number}
</Badge>
</td>
<td className="px-2 py-3">
<Link
href={`/projects/${project.project_id}`}
className="font-medium text-blue-600 hover:text-blue-800 transition-colors text-sm truncate block"
title={project.project_name}
>
{project.project_name}
</Link>
</td>
<td
className="px-2 py-3 text-xs text-gray-600 truncate"
title={project.wp}
>
{project.wp || "N/A"}
</td>
<td
className="px-2 py-3 text-xs text-gray-600 truncate"
title={project.city}
>
{project.city || "N/A"}
</td>
<td
className="px-2 py-3 text-xs text-gray-600 truncate"
title={project.address}
>
{project.address || "N/A"}
</td>
<td
className="px-2 py-3 text-xs text-gray-600 truncate"
title={project.plot}
>
{project.plot || "N/A"}
</td>
<td
className="px-2 py-3 text-xs text-gray-600 truncate"
title={project.finish_date}
>
{project.finish_date || "N/A"}
</td>
<td className="px-2 py-3 text-xs text-gray-600 text-center font-semibold">
{project.project_type === "design"
? "P"
: project.project_type === "construction"
? "R"
: project.project_type === "design+construction"
? "P+R"
: "-"}
</td>
<td className="px-2 py-3 text-xs text-gray-600 truncate">
{project.project_status === "registered"
? "Zarejestr."
: project.project_status === "in_progress_design"
? "W real. (P)"
: project.project_status === "in_progress_construction"
? "W real. (R)"
: project.project_status === "fulfilled"
? "Zakończony"
: "-"}
</td>
<td className="px-2 py-3">
<Link href={`/projects/${project.project_id}`}>
<Button
variant="outline"
size="sm"
className="text-xs px-2 py-1"
>
View
</Button>
</Link>
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
</PageContainer>