From 32a1048fddd68dd526494431b38bf47c2fd74fba Mon Sep 17 00:00:00 2001 From: nonylene Date: Fri, 9 Feb 2024 01:04:36 +0900 Subject: [PATCH] ScrapBox -> Scrapbox --- app/navbar.tsx | 2 +- app/routes/search.scrapbox/els-client.ts | 6 +++--- app/routes/search.scrapbox/page-list.tsx | 4 ++-- app/routes/search.scrapbox/route.tsx | 8 ++++---- app/routes/search.scrapbox/utils.ts | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/navbar.tsx b/app/navbar.tsx index cee4139..4b7bc96 100644 --- a/app/navbar.tsx +++ b/app/navbar.tsx @@ -26,7 +26,7 @@ export default function Navbar() { PukiWiki - ScrapBox + Scrapbox Mail diff --git a/app/routes/search.scrapbox/els-client.ts b/app/routes/search.scrapbox/els-client.ts index 2e4ae3d..6f4218c 100644 --- a/app/routes/search.scrapbox/els-client.ts +++ b/app/routes/search.scrapbox/els-client.ts @@ -23,7 +23,7 @@ export function createPageResultFromResponse(json: any): PageResult { }; } -export function buildScrapBoxSearch( +export function buildScrapboxSearch( order: string, page: number, useRawQuery: boolean, @@ -43,7 +43,7 @@ export function buildScrapBoxSearch( }; } -interface ScrapBoxSearch { +interface ScrapboxSearch { query: string; size: number; from: number; @@ -55,7 +55,7 @@ export async function requestSearch({ size, from, order, -}: ScrapBoxSearch) { +}: ScrapboxSearch) { // eslint-disable-next-line @typescript-eslint/no-explicit-any const queryJson: any = { query: { diff --git a/app/routes/search.scrapbox/page-list.tsx b/app/routes/search.scrapbox/page-list.tsx index 78c0c24..0a4e351 100644 --- a/app/routes/search.scrapbox/page-list.tsx +++ b/app/routes/search.scrapbox/page-list.tsx @@ -1,6 +1,6 @@ import { Page, PageResult } from "./models"; import styles from "./page-list.css"; -import { createScrapBoxUrl } from "./utils"; +import { createScrapboxUrl } from "./utils"; import { faCalendar } from "@fortawesome/free-regular-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { LinksFunction } from "@remix-run/node"; @@ -20,7 +20,7 @@ function PageListItem(props: PageListItemProps) { return (
- +

{props.page.title}

diff --git a/app/routes/search.scrapbox/route.tsx b/app/routes/search.scrapbox/route.tsx index ed4ef5b..5954189 100644 --- a/app/routes/search.scrapbox/route.tsx +++ b/app/routes/search.scrapbox/route.tsx @@ -1,4 +1,4 @@ -import { SEARCH_SIZE, buildScrapBoxSearch, requestSearch } from "./els-client"; +import { SEARCH_SIZE, buildScrapboxSearch, requestSearch } from "./els-client"; import { PageResult } from "./models"; import { PageList, links as pageListLinks } from "./page-list"; import { SearchBox, links as searchBoxLinks } from "./search-box"; @@ -33,7 +33,7 @@ const sortOrderOptions = [ export const meta: MetaFunction = ({ location }) => { const { query } = parseSearchParams(new URLSearchParams(location.search)); - return [{ title: `${query ? `${query} - ` : ""}ScrapBox - Heineken` }]; + return [{ title: `${query ? `${query} - ` : ""}Scrapbox - Heineken` }]; }; export const links: LinksFunction = () => [ @@ -47,7 +47,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => { const { query, page, order, advanced } = parseSearchParams(searchParams); // async 内で throw Response すると Errorboundary の Error がうまくとれないのでパースは non-async でやる - const search = buildScrapBoxSearch(order, page, advanced, query); + const search = buildScrapboxSearch(order, page, advanced, query); const pageResult = requestSearch(search); const scrapboxBaseURL = process.env.HEINEKEN_SCRAPBOX_BASE_URL!; @@ -124,7 +124,7 @@ export function ErrorBoundary() { ); } -export default function ScrapBox() { +export default function Scrapbox() { const navigation = useNavigation(); // Susponse の fallback は search params の変化では起こらないので、 // ページ変更などのときは 自前で navigation.state を見る必要がある diff --git a/app/routes/search.scrapbox/utils.ts b/app/routes/search.scrapbox/utils.ts index 56f3166..510a9d8 100644 --- a/app/routes/search.scrapbox/utils.ts +++ b/app/routes/search.scrapbox/utils.ts @@ -1,4 +1,4 @@ -export function createScrapBoxUrl(baseUrl: string, title: string) { +export function createScrapboxUrl(baseUrl: string, title: string) { const titleUrlEncoded = encodeURIComponent(title); const url = new URL(titleUrlEncoded, baseUrl); return url.toString();