diff --git a/apps/pyconkr-admin/src/components/elements/admin_list_filter.tsx b/apps/pyconkr-admin/src/components/elements/admin_list_filter.tsx index e38a55e..142a0da 100644 --- a/apps/pyconkr-admin/src/components/elements/admin_list_filter.tsx +++ b/apps/pyconkr-admin/src/components/elements/admin_list_filter.tsx @@ -2,10 +2,7 @@ import { Add, Clear, FilterList, RestartAlt } from "@mui/icons-material"; import { Box, Button, Chip, FormControl, IconButton, InputLabel, MenuItem, Select, Stack, TextField } from "@mui/material"; import * as React from "react"; -import BackendAdminAPISchemas from "../../../../../packages/common/src/schemas/backendAdminAPI"; - -type OpenAPIParameterSchema = BackendAdminAPISchemas.OpenAPIParameterSchema; -type ChoicesResponse = BackendAdminAPISchemas.ChoicesResponse; +import { ChoicesResponse, OpenAPIParameterSchema } from "../../../../../packages/common/src/schemas/backendAdminAPI"; type AdminListFilterProps = { parameters: OpenAPIParameterSchema[]; diff --git a/apps/pyconkr-admin/src/components/pages/page/editor.tsx b/apps/pyconkr-admin/src/components/pages/page/editor.tsx index e445b1d..c67d2d7 100644 --- a/apps/pyconkr-admin/src/components/pages/page/editor.tsx +++ b/apps/pyconkr-admin/src/components/pages/page/editor.tsx @@ -8,15 +8,12 @@ import { commands } from "@uiw/react-md-editor"; import * as React from "react"; import { useParams } from "react-router-dom"; -// I don't know why, I don't want to know why, I shouldn't have to wonder why, -// but for whatever reason this stupid namespace won't import on Common.Schemas.BackendAdminAPI.PageSectionSchema. -// TODO: FIXME: Remove this hack when the issue is resolved. This is dumb. -import BackendAdminAPISchemas from "../../../../../../packages/common/src/schemas/backendAdminAPI"; +import { PageSectionSchema } from "../../../../../../packages/common/src/schemas/backendAdminAPI"; import { muiTheme } from "../../../styles/globalStyles"; import { addErrorSnackbar } from "../../../utils/snackbar"; import { AdminEditor } from "../../layouts/admin_editor"; -type SectionType = BackendAdminAPISchemas.PageSectionSchema; +type SectionType = PageSectionSchema; type CommonSectionEditorPropType = { disabled?: boolean; diff --git a/apps/pyconkr-admin/src/components/pages/sitemap/list.tsx b/apps/pyconkr-admin/src/components/pages/sitemap/list.tsx index a6cc6f5..002bb81 100644 --- a/apps/pyconkr-admin/src/components/pages/sitemap/list.tsx +++ b/apps/pyconkr-admin/src/components/pages/sitemap/list.tsx @@ -21,13 +21,13 @@ import { enqueueSnackbar, OptionsObject } from "notistack"; import * as React from "react"; import { GroupOptions, ReactSortable, SortableEvent, SortableOptions } from "react-sortablejs"; -import BackendAdminAPISchemas from "../../../../../../packages/common/src/schemas/backendAdminAPI"; +import { FlattenedSiteMapSchema, NestedSiteMapSchema } from "../../../../../../packages/common/src/schemas/backendAdminAPI"; import { BackendAdminSignInGuard } from "../../elements/admin_signin_guard"; import { AdminEditor } from "../../layouts/admin_editor"; -type FlatSiteMap = BackendAdminAPISchemas.FlattenedSiteMapSchema; +type FlatSiteMap = FlattenedSiteMapSchema; type FlatSiteMapObj = Record; -type NestedSiteMap = BackendAdminAPISchemas.NestedSiteMapSchema; +type NestedSiteMap = NestedSiteMapSchema; type FlatNestedSiteMap = Record; const DepthColorMap: React.CSSProperties["backgroundColor"][] = [ diff --git a/apps/pyconkr/src/components/layout/BreadCrumb/index.tsx b/apps/pyconkr/src/components/layout/BreadCrumb/index.tsx index 464b7af..483b786 100644 --- a/apps/pyconkr/src/components/layout/BreadCrumb/index.tsx +++ b/apps/pyconkr/src/components/layout/BreadCrumb/index.tsx @@ -3,11 +3,11 @@ import * as React from "react"; import { Link } from "react-router-dom"; import * as R from "remeda"; -import BackendAPISchemas from "../../../../../../packages/common/src/schemas/backendAPI"; +import { NestedSiteMapSchema } from "../../../../../../packages/common/src/schemas/backendAPI"; type BreadCrumbPropType = { title: string; - parentSiteMaps: (BackendAPISchemas.NestedSiteMapSchema | undefined)[]; + parentSiteMaps: (NestedSiteMapSchema | undefined)[]; }; export const BreadCrumb: React.FC = ({ title, parentSiteMaps }) => { diff --git a/apps/pyconkr/src/components/layout/Header/index.tsx b/apps/pyconkr/src/components/layout/Header/index.tsx index dcdb843..0ecbe1b 100644 --- a/apps/pyconkr/src/components/layout/Header/index.tsx +++ b/apps/pyconkr/src/components/layout/Header/index.tsx @@ -6,7 +6,7 @@ import * as React from "react"; import { Link } from "react-router-dom"; import * as R from "remeda"; -import BackendAPISchemas from "../../../../../../packages/common/src/schemas/backendAPI"; +import { NestedSiteMapSchema } from "../../../../../../packages/common/src/schemas/backendAPI"; import { useAppContext } from "../../../contexts/app_context"; import { CartBadgeButton } from "../CartBadgeButton"; import LanguageSelector from "../LanguageSelector"; @@ -14,7 +14,7 @@ import { SignInButton } from "../SignInButton"; // import { ScanCodeIconButton } from "../UserScanCodeButton"; import { MobileHeader } from "./Mobile/MobileHeader"; -type MenuType = BackendAPISchemas.NestedSiteMapSchema; +type MenuType = NestedSiteMapSchema; type MenuOrUndefinedType = MenuType | undefined; type NavigationStateType = { diff --git a/apps/pyconkr/src/components/pages/sponsor_detail.tsx b/apps/pyconkr/src/components/pages/sponsor_detail.tsx index c9e1632..064aa22 100644 --- a/apps/pyconkr/src/components/pages/sponsor_detail.tsx +++ b/apps/pyconkr/src/components/pages/sponsor_detail.tsx @@ -5,7 +5,7 @@ import * as React from "react"; import { useParams } from "react-router-dom"; import * as R from "remeda"; -import BackendAPISchemas from "../../../../../packages/common/src/schemas/backendAPI"; +import { SponsorTierSchema } from "../../../../../packages/common/src/schemas/backendAPI"; import { useAppContext } from "../../contexts/app_context"; import { PageLayout } from "../layout/PageLayout"; @@ -54,7 +54,7 @@ export const SponsorDetailPage: React.FC = ErrorBoundary.with( Suspense.with({ fallback: }, () => { const { id } = useParams(); const { language, sponsorTiers, setAppContext } = useAppContext(); - const sponsors = sponsorTiers?.reduce((acc, tier) => [...acc, ...tier.sponsors], [] as BackendAPISchemas.SponsorTierSchema["sponsors"]); + const sponsors = sponsorTiers?.reduce((acc, tier) => [...acc, ...tier.sponsors], [] as SponsorTierSchema["sponsors"]); const sponsor = sponsors?.find((s) => s.id === id); const title = language === "ko" ? "후원사" : "Sponsor"; diff --git a/apps/pyconkr/src/contexts/app_context.tsx b/apps/pyconkr/src/contexts/app_context.tsx index 875a772..3c56bb8 100644 --- a/apps/pyconkr/src/contexts/app_context.tsx +++ b/apps/pyconkr/src/contexts/app_context.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import BackendAPISchemas from "../../../../packages/common/src/schemas/backendAPI"; +import { NestedSiteMapSchema, SponsorTierSchema } from "../../../../packages/common/src/schemas/backendAPI"; type LanguageType = "ko" | "en"; @@ -9,10 +9,10 @@ export type AppContextType = { shouldShowTitleBanner: boolean; shouldShowSponsorBanner: boolean; - siteMapNode?: BackendAPISchemas.NestedSiteMapSchema; - sponsorTiers?: BackendAPISchemas.SponsorTierSchema[]; + siteMapNode?: NestedSiteMapSchema; + sponsorTiers?: SponsorTierSchema[]; title: string; - currentSiteMapDepth: (BackendAPISchemas.NestedSiteMapSchema | undefined)[]; + currentSiteMapDepth: (NestedSiteMapSchema | undefined)[]; setAppContext: React.Dispatch>>; };