Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ import { SettlementSummaryPage } from "./pages/SettlementSummaryPage";
import AdoptionTimelinePage from "./pages/AdoptionTimelinePage";
import ModalPreview from "./pages/ModalPreview";
import StatusPollingDemo from "./pages/StatusPollingDemo";
<<<<<<< feat/custody-timeline-page
import CustodyTimelinePage from "./pages/CustodyTimelinePage";
=======
>>>>>>> main
import DisputeDetailPage from "./pages/DisputeDetailPage";

function App() {

Expand All @@ -47,6 +45,7 @@ function App() {
<Route path="/notifications" element={<NotificationPage />} />
<Route path="/adoption/:adoptionId/settlement" element={<SettlementSummaryPage />} />
<Route path="/adoption/:adoptionId/timeline" element={<AdoptionTimelinePage />} />
<Route path="/disputes/:disputeId" element={<DisputeDetailPage />} />

{/* Custody Routes */}
<Route path="/custody/:custodyId/timeline" element={<CustodyTimelinePage />} />
Expand Down
8 changes: 0 additions & 8 deletions src/api/custodyService.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { apiClient } from "../lib/api-client";
<<<<<<< feat/custody-timeline-page

export interface CustodyTimelineEvent {
type: string;
Expand All @@ -25,12 +24,5 @@ export const custodyService = {
return apiClient.get<CustodyTimelineEvent[]>(
`/custody/${custodyId}/timeline`,
);
=======
import type { CustodyDetails } from "../types/adoption";

export const custodyService = {
async getDetails(custodyId: string): Promise<CustodyDetails> {
return apiClient.get(`/custody/${custodyId}`);
>>>>>>> main
},
};
8 changes: 8 additions & 0 deletions src/api/disputeService.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { apiClient } from "../lib/api-client";
import type { DisputeDetails } from "../types/dispute";

export const disputeService = {
async getDetails(disputeId: string): Promise<DisputeDetails> {
return apiClient.get<DisputeDetails>(`/disputes/${disputeId}`);
},
};
Loading
Loading