-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
and another cleanup pass through the app, which was becoming difficult to work in
- Loading branch information
Showing
37 changed files
with
1,234 additions
and
631 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| import { RouteObject, defer, redirect } from "react-router-dom"; | ||
| import ApiClient, { PartialAccount } from "../ApiClient"; | ||
| import AccountSummary from "./AccountSummary"; | ||
| import AccountForm from "./AccountForm"; | ||
| import AccountList from "./AccountList"; | ||
|
|
||
| export default function accounts( | ||
| apiClient: ApiClient, | ||
| children: RouteObject[] | ||
| ): RouteObject { | ||
| return { | ||
| path: "accounts", | ||
|
|
||
| children: [ | ||
| { | ||
| path: "", | ||
| element: <AccountList />, | ||
| loader() { | ||
| return defer({ accounts: apiClient.accounts() }); | ||
| }, | ||
| index: true, | ||
| }, | ||
| { | ||
| path: ":account_id", | ||
| id: "account", | ||
| loader({ params }) { | ||
| return defer({ | ||
| account: apiClient.account(params.account_id as string), | ||
| }); | ||
| }, | ||
|
|
||
| async action({ params, request }) { | ||
| let data = Object.fromEntries(await request.formData()); | ||
| switch (request.method) { | ||
| case "PATCH": | ||
| return { | ||
| account: await apiClient.updateAccount( | ||
| params.account_id as string, | ||
| data as unknown as PartialAccount | ||
| ), | ||
| }; | ||
| default: | ||
| throw new Error(`unexpected method ${request.method}`); | ||
| } | ||
| }, | ||
|
|
||
| shouldRevalidate(args) { | ||
| return ( | ||
| typeof args.actionResult === "object" && | ||
| args.actionResult !== null && | ||
| "account" in args.actionResult | ||
| ); | ||
| }, | ||
| children: [ | ||
| { | ||
| path: "", | ||
| element: <AccountSummary />, | ||
| }, | ||
| { | ||
| path: "new", | ||
| element: <AccountForm />, | ||
| async action({ request }) { | ||
| let data = Object.fromEntries(await request.formData()); | ||
| switch (request.method) { | ||
| case "POST": | ||
| const account = await apiClient.createAccount( | ||
| data as unknown as PartialAccount | ||
| ); | ||
| return redirect(`/accounts/${account.id}`); | ||
| default: | ||
| throw new Error(`unexpected method ${request.method}`); | ||
| } | ||
| }, | ||
| }, | ||
|
|
||
| ...children, | ||
| ], | ||
| }, | ||
| ], | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import { RouteObject } from "react-router-dom"; | ||
| import ApiClient from "../ApiClient"; | ||
|
|
||
| export default function admin(apiClient: ApiClient): RouteObject { | ||
| return { | ||
| path: "admin", | ||
| children: [ | ||
| { | ||
| path: "queue", | ||
| async lazy() { | ||
| return import("../admin/Queue"); | ||
| }, | ||
| async loader({ request }) { | ||
| const params = new URL(request.url).searchParams; | ||
| return apiClient.queue(params); | ||
| }, | ||
| children: [ | ||
| { | ||
| path: ":job_id", | ||
| async lazy() { | ||
| return import("../admin/QueueJob"); | ||
| }, | ||
|
|
||
| async loader({ params }) { | ||
| if ("job_id" in params && typeof params.job_id === "string") | ||
| return apiClient.queueJob(params.job_id); | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.