diff options
Diffstat (limited to 'makima/frontend/src/routes')
| -rw-r--r-- | makima/frontend/src/routes/contracts.tsx | 23 | ||||
| -rw-r--r-- | makima/frontend/src/routes/orders.tsx | 34 |
2 files changed, 37 insertions, 20 deletions
diff --git a/makima/frontend/src/routes/contracts.tsx b/makima/frontend/src/routes/contracts.tsx index acb6789..6d838ab 100644 --- a/makima/frontend/src/routes/contracts.tsx +++ b/makima/frontend/src/routes/contracts.tsx @@ -524,15 +524,9 @@ function ContractsPageContent() { return ( <div className="relative z-10 min-h-screen flex flex-col bg-[#0a1628]"> <Masthead showNav /> - <main className="flex-1 flex flex-col p-4 pt-2 gap-4 overflow-hidden"> - {error && ( - <div className="p-3 bg-red-400/10 border border-red-400/30 text-red-400 font-mono text-sm"> - {error} - </div> - )} - - <div className="flex-1 grid grid-cols-[350px_1fr] gap-4 min-h-0"> - {/* Contract list */} + <main className="flex-1 flex overflow-hidden" style={{ height: "calc(100vh - 80px)" }}> + {/* Left: Contract list */} + <div className="w-[350px] shrink-0 border-r border-dashed border-[rgba(117,170,252,0.2)] overflow-hidden flex flex-col"> <ContractList contracts={contracts} loading={loading} @@ -545,8 +539,18 @@ function ContractsPageContent() { onDelete={handleContextDelete} onGoToSupervisor={handleContextGoToSupervisor} /> + </div> + + {/* Right: Detail or Create */} + <div className="flex-1 overflow-hidden flex flex-col"> + {error && ( + <div className="p-3 bg-red-400/10 border border-red-400/30 text-red-400 font-mono text-sm"> + {error} + </div> + )} {/* Contract detail, creation form, or empty state */} + <div className="flex-1 min-h-0 overflow-hidden"> {isCreating ? ( <div className="p-4 max-w-lg overflow-y-auto h-full bg-[#0a1628]"> <h3 className="font-mono text-[10px] text-[#9bc3ff] uppercase tracking-wide mb-4"> @@ -873,6 +877,7 @@ function ContractsPageContent() { </div> </div> )} + </div> </div> </main> </div> diff --git a/makima/frontend/src/routes/orders.tsx b/makima/frontend/src/routes/orders.tsx index 735c557..deca77f 100644 --- a/makima/frontend/src/routes/orders.tsx +++ b/makima/frontend/src/routes/orders.tsx @@ -16,7 +16,7 @@ export default function OrdersPage() { const [statusFilter, setStatusFilter] = useState<OrderStatus | undefined>(undefined); const [typeFilter, setTypeFilter] = useState<OrderType | undefined>(undefined); const { orders, loading: listLoading, create, refresh: refreshList } = useOrders(statusFilter, typeFilter); - const { order, refresh: refreshDetail, update, remove: removeOrder, linkDirective, linkContract, convertToStep } = useOrder(selectedId); + const { order, refresh: refreshDetail, update, remove: removeOrder, linkDirective, convertToStep } = useOrder(selectedId); const { directives } = useDirectives(); const [showCreate, setShowCreate] = useState(false); @@ -24,6 +24,7 @@ export default function OrdersPage() { const [newDesc, setNewDesc] = useState(""); const [newPriority, setNewPriority] = useState<OrderPriority>("medium"); const [newType, setNewType] = useState<OrderType>("feature"); + const [newDirectiveId, setNewDirectiveId] = useState<string>(""); useEffect(() => { if (!authLoading && isAuthConfigured && !isAuthenticated) { @@ -43,19 +44,21 @@ export default function OrdersPage() { } const handleCreate = async () => { - if (!newTitle.trim()) return; + if (!newTitle.trim() || !newDirectiveId) return; try { const o = await create({ title: newTitle.trim(), description: newDesc.trim() || undefined, priority: newPriority, orderType: newType, + directiveId: newDirectiveId, }); setShowCreate(false); setNewTitle(""); setNewDesc(""); setNewPriority("medium"); setNewType("feature"); + setNewDirectiveId(""); navigate(`/orders/${o.id}`); } catch (e) { console.error("Failed to create order:", e); @@ -84,13 +87,8 @@ export default function OrdersPage() { await refreshList(); }; - const handleLinkContract = async (contractId: string) => { - await linkContract(contractId); - await refreshList(); - }; - - const handleConvertToStep = async (directiveId: string) => { - await convertToStep(directiveId); + const handleConvertToStep = async () => { + await convertToStep(); await refreshList(); }; @@ -162,6 +160,21 @@ export default function OrdersPage() { className="w-full bg-[#0a1628] border border-[rgba(117,170,252,0.2)] rounded px-2 py-1.5 text-[12px] font-mono text-white resize-y" /> </div> + <div> + <label className="text-[10px] font-mono text-[#9bc3ff] uppercase tracking-wide block mb-1"> + Directive * + </label> + <select + value={newDirectiveId} + onChange={(e) => setNewDirectiveId(e.target.value)} + className="w-full bg-[#0a1628] border border-[rgba(117,170,252,0.2)] rounded px-2 py-1.5 text-[12px] font-mono text-white" + > + <option value="">Select directive...</option> + {directives.map((d) => ( + <option key={d.id} value={d.id}>{d.title}</option> + ))} + </select> + </div> <div className="flex gap-4"> <div className="flex-1"> <label className="text-[10px] font-mono text-[#9bc3ff] uppercase tracking-wide block mb-1"> @@ -196,7 +209,7 @@ export default function OrdersPage() { <button type="button" onClick={handleCreate} - disabled={!newTitle.trim()} + disabled={!newTitle.trim() || !newDirectiveId} className="text-[11px] font-mono text-emerald-400 hover:text-emerald-300 border border-emerald-800 rounded px-3 py-1 disabled:opacity-50" > Create @@ -218,7 +231,6 @@ export default function OrdersPage() { onUpdate={handleUpdate} onDelete={handleDelete} onLinkDirective={handleLinkDirective} - onLinkContract={handleLinkContract} onConvertToStep={handleConvertToStep} onRefresh={refreshDetail} /> |