diff --git a/src/App.tsx b/src/App.tsx index 96072b0..af8d624 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -7,8 +7,8 @@ import { TableDetailsPage } from "./pages/TableDetails"; import { CrossmatchResultsPage } from "./pages/CrossmatchResults"; import { RecordCrossmatchDetailsPage } from "./pages/RecordCrossmatchDetails"; import { TablesPage } from "./pages/Tables"; -import { Layout } from "./components/ui/layout"; -import { SearchBar } from "./components/ui/searchbar"; +import { Layout } from "./components/ui/Layout"; +import { SearchBar } from "./components/ui/Searchbar"; function App() { return ( diff --git a/src/components/ui/aladin.tsx b/src/components/ui/Aladin.tsx similarity index 100% rename from src/components/ui/aladin.tsx rename to src/components/ui/Aladin.tsx diff --git a/src/components/ui/astronomy.tsx b/src/components/ui/Astronomy.tsx similarity index 100% rename from src/components/ui/astronomy.tsx rename to src/components/ui/Astronomy.tsx diff --git a/src/components/ui/badge.tsx b/src/components/ui/Badge.tsx similarity index 94% rename from src/components/ui/badge.tsx rename to src/components/ui/Badge.tsx index 22612d6..22d7343 100644 --- a/src/components/ui/badge.tsx +++ b/src/components/ui/Badge.tsx @@ -1,5 +1,5 @@ import { ReactElement } from "react"; -import { Link } from "./link"; +import { Link } from "./Link"; interface BadgeProps { children: React.ReactNode; diff --git a/src/components/ui/button.tsx b/src/components/ui/Button.tsx similarity index 100% rename from src/components/ui/button.tsx rename to src/components/ui/Button.tsx diff --git a/src/components/ui/catalog-data.tsx b/src/components/ui/CatalogData.tsx similarity index 98% rename from src/components/ui/catalog-data.tsx rename to src/components/ui/CatalogData.tsx index 02f560a..0772629 100644 --- a/src/components/ui/catalog-data.tsx +++ b/src/components/ui/CatalogData.tsx @@ -1,12 +1,12 @@ import { ReactElement } from "react"; -import { CommonTable, Column } from "./common-table"; +import { CommonTable, Column } from "./CommonTable"; import { Catalogs, Schema } from "../../clients/backend/types.gen"; import { Declination, RightAscension, Quantity, QuantityWithError, -} from "./astronomy"; +} from "./Astronomy"; interface CatalogDataProps { catalogs: Catalogs; diff --git a/src/components/ui/common-table.tsx b/src/components/ui/CommonTable.tsx similarity index 98% rename from src/components/ui/common-table.tsx rename to src/components/ui/CommonTable.tsx index 46a38ff..fe1ba3c 100644 --- a/src/components/ui/common-table.tsx +++ b/src/components/ui/CommonTable.tsx @@ -1,7 +1,7 @@ import React, { ReactElement, ReactNode } from "react"; import classNames from "classnames"; -import { Hint } from "./hint"; -import { Loading } from "./loading"; +import { Hint } from "./Hint"; +import { Loading } from "./Loading"; export type CellPrimitive = ReactElement | string | number; diff --git a/src/components/ui/copy-button.tsx b/src/components/ui/CopyButton.tsx similarity index 96% rename from src/components/ui/copy-button.tsx rename to src/components/ui/CopyButton.tsx index b90fab9..0f03110 100644 --- a/src/components/ui/copy-button.tsx +++ b/src/components/ui/CopyButton.tsx @@ -1,5 +1,5 @@ import { ReactElement, useState } from "react"; -import { Button } from "./button"; +import { Button } from "./Button"; import { MdCheck, MdContentCopy } from "react-icons/md"; interface CopyButtonProps { diff --git a/src/components/ui/dropdown-filter.tsx b/src/components/ui/DropdownFilter.tsx similarity index 100% rename from src/components/ui/dropdown-filter.tsx rename to src/components/ui/DropdownFilter.tsx diff --git a/src/components/ui/error-page.tsx b/src/components/ui/ErrorPage.tsx similarity index 97% rename from src/components/ui/error-page.tsx rename to src/components/ui/ErrorPage.tsx index 25dd36a..05a091f 100644 --- a/src/components/ui/error-page.tsx +++ b/src/components/ui/ErrorPage.tsx @@ -1,5 +1,5 @@ import { ReactElement, ReactNode } from "react"; -import { Button } from "./button"; +import { Button } from "./Button"; interface ErrorPageProps { title?: string; diff --git a/src/components/ui/footer.tsx b/src/components/ui/Footer.tsx similarity index 96% rename from src/components/ui/footer.tsx rename to src/components/ui/Footer.tsx index e99c5ef..7deeabe 100644 --- a/src/components/ui/footer.tsx +++ b/src/components/ui/Footer.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { Link as ReactDomLink } from "react-router-dom"; -import { Button } from "./button"; -import { Link } from "./link"; +import { Button } from "./Button"; +import { Link } from "./Link"; import { MdKeyboardArrowDown, MdKeyboardArrowUp } from "react-icons/md"; const footerContent = ( diff --git a/src/components/ui/hint.tsx b/src/components/ui/Hint.tsx similarity index 100% rename from src/components/ui/hint.tsx rename to src/components/ui/Hint.tsx diff --git a/src/components/ui/layout.tsx b/src/components/ui/Layout.tsx similarity index 86% rename from src/components/ui/layout.tsx rename to src/components/ui/Layout.tsx index bfe517b..68e6b40 100644 --- a/src/components/ui/layout.tsx +++ b/src/components/ui/Layout.tsx @@ -1,4 +1,4 @@ -import { Footer } from "./footer"; +import { Footer } from "./Footer"; export function Layout({ children }: { children: React.ReactNode }) { return ( diff --git a/src/components/ui/link.tsx b/src/components/ui/Link.tsx similarity index 100% rename from src/components/ui/link.tsx rename to src/components/ui/Link.tsx diff --git a/src/components/ui/loading.tsx b/src/components/ui/Loading.tsx similarity index 100% rename from src/components/ui/loading.tsx rename to src/components/ui/Loading.tsx diff --git a/src/components/ui/pagination.tsx b/src/components/ui/Pagination.tsx similarity index 95% rename from src/components/ui/pagination.tsx rename to src/components/ui/Pagination.tsx index 029036f..1d6d886 100644 --- a/src/components/ui/pagination.tsx +++ b/src/components/ui/Pagination.tsx @@ -1,5 +1,5 @@ import { ReactElement } from "react"; -import { Button } from "./button"; +import { Button } from "./Button"; type PaginationProps = { page: number; diff --git a/src/components/ui/searchbar.tsx b/src/components/ui/Searchbar.tsx similarity index 98% rename from src/components/ui/searchbar.tsx rename to src/components/ui/Searchbar.tsx index 12876f5..d7b494f 100644 --- a/src/components/ui/searchbar.tsx +++ b/src/components/ui/Searchbar.tsx @@ -1,7 +1,7 @@ import { ReactElement, useState } from "react"; import { Link, NavigateFunction, useNavigate } from "react-router-dom"; import classNames from "classnames"; -import { Button } from "./button"; +import { Button } from "./Button"; interface SearchBarProps { initialValue?: string; diff --git a/src/components/ui/text-filter.tsx b/src/components/ui/TextFilter.tsx similarity index 100% rename from src/components/ui/text-filter.tsx rename to src/components/ui/TextFilter.tsx diff --git a/src/pages/CrossmatchResults.tsx b/src/pages/CrossmatchResults.tsx index 7d12412..0faea51 100644 --- a/src/pages/CrossmatchResults.tsx +++ b/src/pages/CrossmatchResults.tsx @@ -4,10 +4,10 @@ import { CommonTable, Column, CellPrimitive, -} from "../components/ui/common-table"; -import { Badge } from "../components/ui/badge"; -import { DropdownFilter } from "../components/ui/dropdown-filter"; -import { TextFilter } from "../components/ui/text-filter"; +} from "../components/ui/CommonTable"; +import { Badge } from "../components/ui/Badge"; +import { DropdownFilter } from "../components/ui/DropdownFilter"; +import { TextFilter } from "../components/ui/TextFilter"; import { getCrossmatchRecords } from "../clients/admin/sdk.gen"; import type { GetRecordsCrossmatchResponse, @@ -16,12 +16,12 @@ import type { ValidationError, } from "../clients/admin/types.gen"; import { getResource } from "../resources/resources"; -import { Button } from "../components/ui/button"; -import { Loading } from "../components/ui/loading"; -import { ErrorPage } from "../components/ui/error-page"; -import { Link } from "../components/ui/link"; +import { Button } from "../components/ui/Button"; +import { Loading } from "../components/ui/Loading"; +import { ErrorPage } from "../components/ui/ErrorPage"; +import { Link } from "../components/ui/Link"; import { useDataFetching } from "../hooks/useDataFetching"; -import { Pagination } from "../components/ui/pagination"; +import { Pagination } from "../components/ui/Pagination"; import { adminClient } from "../clients/config"; interface CrossmatchFiltersProps { diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index d251bd7..e7a2224 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -1,5 +1,5 @@ import { ReactElement } from "react"; -import { Link } from "../components/ui/link"; +import { Link } from "../components/ui/Link"; const homePageHint: ReactElement = (
diff --git a/src/pages/NotFound.tsx b/src/pages/NotFound.tsx index 2ce8712..d4ac5a9 100644 --- a/src/pages/NotFound.tsx +++ b/src/pages/NotFound.tsx @@ -1,6 +1,6 @@ import { useNavigate } from "react-router-dom"; -import { ErrorPage } from "../components/ui/error-page"; -import { Button } from "../components/ui/button"; +import { ErrorPage } from "../components/ui/ErrorPage"; +import { Button } from "../components/ui/Button"; import { useEffect } from "react"; export function NotFoundPage() { diff --git a/src/pages/ObjectDetails.tsx b/src/pages/ObjectDetails.tsx index efab49a..b6e2c1e 100644 --- a/src/pages/ObjectDetails.tsx +++ b/src/pages/ObjectDetails.tsx @@ -1,10 +1,10 @@ import { ReactElement, useEffect } from "react"; import { useParams } from "react-router-dom"; -import { AladinViewer } from "../components/ui/aladin"; -import { Loading } from "../components/ui/loading"; -import { ErrorPage } from "../components/ui/error-page"; -import { CatalogData } from "../components/ui/catalog-data"; -import { Link } from "../components/ui/link"; +import { AladinViewer } from "../components/ui/Aladin"; +import { Loading } from "../components/ui/Loading"; +import { ErrorPage } from "../components/ui/ErrorPage"; +import { CatalogData } from "../components/ui/CatalogData"; +import { Link } from "../components/ui/Link"; import { querySimple } from "../clients/backend/sdk.gen"; import { PgcObject, Schema } from "../clients/backend/types.gen"; import { useDataFetching } from "../hooks/useDataFetching"; diff --git a/src/pages/RecordCrossmatchDetails.tsx b/src/pages/RecordCrossmatchDetails.tsx index 265898a..94cf807 100644 --- a/src/pages/RecordCrossmatchDetails.tsx +++ b/src/pages/RecordCrossmatchDetails.tsx @@ -1,9 +1,9 @@ import { ReactElement, useEffect } from "react"; import { useParams } from "react-router-dom"; -import { AladinViewer } from "../components/ui/aladin"; -import { Loading } from "../components/ui/loading"; -import { ErrorPage } from "../components/ui/error-page"; -import { CatalogData } from "../components/ui/catalog-data"; +import { AladinViewer } from "../components/ui/Aladin"; +import { Loading } from "../components/ui/Loading"; +import { ErrorPage } from "../components/ui/ErrorPage"; +import { CatalogData } from "../components/ui/CatalogData"; import { getRecordCrossmatch } from "../clients/admin/sdk.gen"; import { GetRecordCrossmatchResponse, @@ -13,7 +13,8 @@ import { } from "../clients/admin/types.gen"; import { Schema as BackendSchema } from "../clients/backend/types.gen"; import { getResource } from "../resources/resources"; -import { Link } from "../components/ui/link"; +import { Link } from "../components/ui/Link"; +import { CopyButton } from "../components/ui/CopyButton"; import { useDataFetching } from "../hooks/useDataFetching"; import { adminClient } from "../clients/config"; @@ -149,6 +150,12 @@ function RecordCrossmatchDetails({ {crossmatch.catalogs.designation.name} )} +

+ Record ID:{" "} + + {crossmatch.record_id} + +

Status:{" "} {getResource(`crossmatch.status.${crossmatch.status}`).Title} diff --git a/src/pages/SearchResults.tsx b/src/pages/SearchResults.tsx index b2aa9b6..b5bc6c7 100644 --- a/src/pages/SearchResults.tsx +++ b/src/pages/SearchResults.tsx @@ -4,16 +4,16 @@ import { useNavigate, useSearchParams, } from "react-router-dom"; -import { SearchBar } from "../components/ui/searchbar"; -import { CommonTable, Column } from "../components/ui/common-table"; -import { Loading } from "../components/ui/loading"; -import { ErrorPage, ErrorPageHomeButton } from "../components/ui/error-page"; +import { SearchBar } from "../components/ui/Searchbar"; +import { CommonTable, Column } from "../components/ui/CommonTable"; +import { Loading } from "../components/ui/Loading"; +import { ErrorPage, ErrorPageHomeButton } from "../components/ui/ErrorPage"; import { useDataFetching } from "../hooks/useDataFetching"; import { querySimple } from "../clients/backend/sdk.gen"; import { QuerySimpleResponse } from "../clients/backend/types.gen"; -import { Link } from "../components/ui/link"; -import { Declination, RightAscension } from "../components/ui/astronomy"; -import { Pagination } from "../components/ui/pagination"; +import { Link } from "../components/ui/Link"; +import { Declination, RightAscension } from "../components/ui/Astronomy"; +import { Pagination } from "../components/ui/Pagination"; import { backendClient } from "../clients/config"; function searchHandler(navigate: NavigateFunction) { diff --git a/src/pages/TableDetails.tsx b/src/pages/TableDetails.tsx index 16f4698..ffffe92 100644 --- a/src/pages/TableDetails.tsx +++ b/src/pages/TableDetails.tsx @@ -10,13 +10,13 @@ import { CellPrimitive, Column, CommonTable, -} from "../components/ui/common-table"; -import { Button } from "../components/ui/button"; -import { CopyButton } from "../components/ui/copy-button"; -import { Badge } from "../components/ui/badge"; -import { Link } from "../components/ui/link"; -import { Loading } from "../components/ui/loading"; -import { ErrorPage } from "../components/ui/error-page"; +} from "../components/ui/CommonTable"; +import { Button } from "../components/ui/Button"; +import { CopyButton } from "../components/ui/CopyButton"; +import { Badge } from "../components/ui/Badge"; +import { Link } from "../components/ui/Link"; +import { Loading } from "../components/ui/Loading"; +import { ErrorPage } from "../components/ui/ErrorPage"; import { getResource } from "../resources/resources"; import { useDataFetching } from "../hooks/useDataFetching"; import { backendClient } from "../clients/config"; diff --git a/src/pages/Tables.tsx b/src/pages/Tables.tsx index b186be6..58187f9 100644 --- a/src/pages/Tables.tsx +++ b/src/pages/Tables.tsx @@ -4,20 +4,20 @@ import { CommonTable, Column, CellPrimitive, -} from "../components/ui/common-table"; -import { DropdownFilter } from "../components/ui/dropdown-filter"; -import { TextFilter } from "../components/ui/text-filter"; +} from "../components/ui/CommonTable"; +import { DropdownFilter } from "../components/ui/DropdownFilter"; +import { TextFilter } from "../components/ui/TextFilter"; import { getTableList } from "../clients/admin/sdk.gen"; import type { GetTableListResponse, TableListItem, ValidationError, } from "../clients/admin/types.gen"; -import { Loading } from "../components/ui/loading"; -import { ErrorPage } from "../components/ui/error-page"; -import { Link } from "../components/ui/link"; +import { Loading } from "../components/ui/Loading"; +import { ErrorPage } from "../components/ui/ErrorPage"; +import { Link } from "../components/ui/Link"; import { useDataFetching } from "../hooks/useDataFetching"; -import { Pagination } from "../components/ui/pagination"; +import { Pagination } from "../components/ui/Pagination"; import { adminClient } from "../clients/config"; const SEARCH_DEBOUNCE_MS = 300;