From 85faab2078d1f4a940b34b82a1ff747e4bba4380 Mon Sep 17 00:00:00 2001 From: Ivan <8611739+IRBorisov@users.noreply.github.com> Date: Wed, 12 Mar 2025 12:12:45 +0300 Subject: [PATCH] R: Migrate to snake-case pt3 --- .vscode/settings.json | 2 ++ rsconcept/frontend/src/app/index.tsx | 4 ++-- rsconcept/frontend/src/components/dropdown/index.tsx | 2 +- rsconcept/frontend/src/components/input/index.tsx | 2 +- rsconcept/frontend/src/components/input/text-area.tsx | 2 +- rsconcept/frontend/src/components/input/text-input.tsx | 2 +- rsconcept/frontend/src/components/view/index.tsx | 2 +- .../src/components/view/{indicator1.tsx => indicator.tsx} | 0 .../frontend/src/features/help/components/topic-item.tsx | 3 ++- .../frontend/src/features/oss/pages/oss-page/oss-tabs.tsx | 2 +- .../src/features/rsform/pages/rsform-page/rstabs1.tsx | 2 +- .../rsform-page/view-constituents/constituents-search.tsx | 2 +- 12 files changed, 14 insertions(+), 11 deletions(-) rename rsconcept/frontend/src/components/view/{indicator1.tsx => indicator.tsx} (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 202e8ac2..0f92a4b3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -154,6 +154,8 @@ "rsforms", "rsgraph", "rslang", + "rslist", + "rstabs", "rstemplates", "setexpr", "SIDELIST", diff --git a/rsconcept/frontend/src/app/index.tsx b/rsconcept/frontend/src/app/index.tsx index 9ae74cb6..8f4263c4 100644 --- a/rsconcept/frontend/src/app/index.tsx +++ b/rsconcept/frontend/src/app/index.tsx @@ -1,5 +1,5 @@ -export { useConceptNavigation } from './navigation1/navigation-context'; -export { useBlockNavigation } from './navigation1/navigation-context'; +export { useConceptNavigation } from './navigation/navigation-context'; +export { useBlockNavigation } from './navigation/navigation-context'; export { urls } from './urls'; import { RouterProvider } from 'react-router'; diff --git a/rsconcept/frontend/src/components/dropdown/index.tsx b/rsconcept/frontend/src/components/dropdown/index.tsx index c0dd4aa1..ced5b3a7 100644 --- a/rsconcept/frontend/src/components/dropdown/index.tsx +++ b/rsconcept/frontend/src/components/dropdown/index.tsx @@ -1,4 +1,4 @@ +export { Dropdown } from './dropdown'; export { DropdownButton } from './dropdown-button'; export { DropdownCheckbox } from './dropdown-checkbox'; -export { Dropdown } from './dropdown'; export { useDropdown } from './use-dropdown'; diff --git a/rsconcept/frontend/src/components/input/index.tsx b/rsconcept/frontend/src/components/input/index.tsx index af613602..6e0f1d3c 100644 --- a/rsconcept/frontend/src/components/input/index.tsx +++ b/rsconcept/frontend/src/components/input/index.tsx @@ -1,5 +1,5 @@ -export { CheckboxTristate } from './checkbox-tristate'; export { Checkbox, type CheckboxProps } from './checkbox'; +export { CheckboxTristate } from './checkbox-tristate'; export { ErrorField } from './error-field'; export { FileInput } from './file-input'; export { Label } from './label'; diff --git a/rsconcept/frontend/src/components/input/text-area.tsx b/rsconcept/frontend/src/components/input/text-area.tsx index 13a44976..991118bd 100644 --- a/rsconcept/frontend/src/components/input/text-area.tsx +++ b/rsconcept/frontend/src/components/input/text-area.tsx @@ -1,9 +1,9 @@ import clsx from 'clsx'; -import { Label } from './label'; import { type Editor, type ErrorProcessing, type Titled } from '../props'; import { ErrorField } from './error-field'; +import { Label } from './label'; export interface TextAreaProps extends Editor, ErrorProcessing, Titled, React.ComponentProps<'textarea'> { /** Indicates that the input should be transparent. */ diff --git a/rsconcept/frontend/src/components/input/text-input.tsx b/rsconcept/frontend/src/components/input/text-input.tsx index 0c4bce43..a56951d9 100644 --- a/rsconcept/frontend/src/components/input/text-input.tsx +++ b/rsconcept/frontend/src/components/input/text-input.tsx @@ -1,9 +1,9 @@ import clsx from 'clsx'; -import { Label } from './label'; import { type Editor, type ErrorProcessing, type Titled } from '../props'; import { ErrorField } from './error-field'; +import { Label } from './label'; interface TextInputProps extends Editor, ErrorProcessing, Titled, React.ComponentProps<'input'> { /** Indicates that the input should be transparent. */ diff --git a/rsconcept/frontend/src/components/view/index.tsx b/rsconcept/frontend/src/components/view/index.tsx index 0dc55bdc..d31f8704 100644 --- a/rsconcept/frontend/src/components/view/index.tsx +++ b/rsconcept/frontend/src/components/view/index.tsx @@ -1,5 +1,5 @@ export { EmbedYoutube } from './embed-youtube'; -export { Indicator } from './indicator1'; +export { Indicator } from './indicator'; export { NoData } from './no-data'; export { PDFViewer } from './pdf-viewer'; export { PrettyJson } from './pretty-json'; diff --git a/rsconcept/frontend/src/components/view/indicator1.tsx b/rsconcept/frontend/src/components/view/indicator.tsx similarity index 100% rename from rsconcept/frontend/src/components/view/indicator1.tsx rename to rsconcept/frontend/src/components/view/indicator.tsx diff --git a/rsconcept/frontend/src/features/help/components/topic-item.tsx b/rsconcept/frontend/src/features/help/components/topic-item.tsx index da6cd12a..95db2c76 100644 --- a/rsconcept/frontend/src/features/help/components/topic-item.tsx +++ b/rsconcept/frontend/src/features/help/components/topic-item.tsx @@ -1,9 +1,10 @@ import { removeTags } from '@/utils/utils'; -import { LinkTopic } from './link-topic'; import { describeHelpTopic, labelHelpTopic } from '../labels'; import { type HelpTopic } from '../models/help-topic'; +import { LinkTopic } from './link-topic'; + interface TopicItemProps { topic: HelpTopic; } diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx index 8fcbe8c2..00d7cce5 100644 --- a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx +++ b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx @@ -2,7 +2,7 @@ import { useLayoutEffect } from 'react'; -import { useConceptNavigation } from '@/app/navigation1/navigation-context'; +import { useConceptNavigation } from '@/app/navigation/navigation-context'; import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs'; import { useAppLayoutStore } from '@/stores/app-layout'; diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rstabs1.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rstabs1.tsx index a62d085c..25c184f7 100644 --- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rstabs1.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rstabs1.tsx @@ -2,7 +2,7 @@ import { useLayoutEffect } from 'react'; -import { useConceptNavigation } from '@/app/navigation1/navigation-context'; +import { useConceptNavigation } from '@/app/navigation/navigation-context'; import { TabLabel, TabList, TabPanel, Tabs } from '@/components/tabs'; import { useAppLayoutStore } from '@/stores/app-layout'; diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/constituents-search.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/constituents-search.tsx index 3e84aa2f..2c5bc875 100644 --- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/constituents-search.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/constituents-search.tsx @@ -4,11 +4,11 @@ import { MiniButton } from '@/components/control'; import { IconChild } from '@/components/icons'; import { SearchBar } from '@/components/input'; -import { SelectMatchMode } from './select-match-mode'; import { useCstSearchStore } from '../../../stores/cst-search'; import { useRSEdit } from '../rsedit-context'; import { SelectGraphFilter } from './select-graph-filter'; +import { SelectMatchMode } from './select-match-mode'; interface ConstituentsSearchProps { dense?: boolean;