Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@siarheiy
siarheiy committed Mar 22, 2024
1 parent 4007ec3 commit 8440cc8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 102 deletions.
102 changes: 7 additions & 95 deletions app/src/documents/structure.ts
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
import {
ButtonDoc, LinkButtonDoc, PickerInputDoc, PickerModalDoc, IconButtonDoc, TabButtonDoc, TextInputDoc,
CheckboxDoc, RadioInputDoc, SwitchDoc, CheckboxGroupDoc, RadioGroupDoc, MultiSwitchDoc, NumericInputDoc,
RatingDoc, SearchInputDoc, TextAreaDoc, AccordionDoc, ContextProviderDoc, ApiContextDoc, ModalContextDoc,
NotificationContextDoc, DropdownDoc, MainMenuDoc, ModalsDoc, BadgeDoc, FiltersPanelDoc, TagDoc,
PaginatorDoc, SpinnerDoc, RichTextViewDoc, TextDoc, TextPlaceholderDoc, DatePickerDoc, RangeDatePickerDoc,
TimePickerDoc, ControlGroupDoc, NotificationCardDoc, TooltipDoc, LabeledInputDoc,
AlertDoc, IconContainerDoc, BlockerDoc, IconsDoc, DownloadsDoc, ProjectsDoc, ReleaseNotesDoc,
FlexRowDoc, FlexCellDoc, FlexSpacerDoc, PanelDoc, GettingStartedForDesignersDoc, RichTextEditorDoc, FormDoc,
LockContextDoc, AvatarDoc, InternationalizationDoc, FileUploadDoc, SliderDoc, SliderRatingDoc,
AvatarStackDoc, PickerListDoc, TeamDoc, AnalyticsContextDoc, DragAndDropDoc, VirtualListDoc,
EmptyStatesDoc, LayoutsDoc, LoadersDoc, ValidationDoc, VisualExamplesDoc, DropdownMenuDoc, ProgressBarDoc,
VerticalTabButtonDoc, ScrollSpyDoc, DropdownContainerDoc, AdaptivePanelDoc, EditableTablesDoc,
TablesOverviewDoc, AdvancedTablesDoc, PresetsPanelDoc, GettingStartedDoc, UtGuideBasicsDoc, UtGuideToolsDoc,
ContextProviderDoc, ApiContextDoc, ModalContextDoc,
NotificationContextDoc, IconsDoc, DownloadsDoc, ProjectsDoc, ReleaseNotesDoc,
GettingStartedForDesignersDoc,
LockContextDoc, InternationalizationDoc, TeamDoc, AnalyticsContextDoc, DragAndDropDoc,
EmptyStatesDoc, LayoutsDoc, LoadersDoc, ValidationDoc, VisualExamplesDoc, GettingStartedDoc, UtGuideBasicsDoc, UtGuideToolsDoc,
UtGuideCookbookDoc, DataSourcesGettingStartedDoc, DataSourcesRowOptionsDoc, DataSourcesBaseDataSourcePropsDoc,
DataSourcesDataSourceStateDoc, DataSourcesArrayDataSourceDoc, DataSourcesAsyncDataSourceDoc,
DataSourcesLazyDataSourceDoc, DataSourcesUsageDoc, useTableStateDoc, CountIndicatorDoc, OverviewDoc, StatusIndicatorDoc,
DataSourcesLazyDataSourceDoc, DataSourcesUsageDoc, OverviewDoc,
ThemingOverview, Tokens, AccessibilityDoc, UtGuideGettingStartedDoc, LensesDoc,

} from '../docs';
import sortBy from 'lodash.sortby';
import { CoreConceptsDoc } from '../docs/CoreConcepts';
import { AnchorDoc } from '../docs/anchor/Anchor.doc';
import { RichTextEditorSerializersDoc } from '../docs/RichTextEditorSerializers.doc';
import { componentsStructure } from './structureComponents';

export interface DocItem {
id: string;
Expand All @@ -32,84 +22,6 @@ export interface DocItem {
tags?: string[];
}

const componentsStructure = sortBy(
[
{ id: 'accordion', name: 'Accordion', component: AccordionDoc, parentId: 'components' },
{ id: 'adaptivePanel', name: 'Adaptive Panel', component: AdaptivePanelDoc, parentId: 'components' },
{ id: 'alert', name: 'Alert', component: AlertDoc, parentId: 'components' },
{ id: 'anchor', name: 'Anchor', component: AnchorDoc, parentId: 'components' },
{ id: 'avatar', name: 'Avatar', component: AvatarDoc, parentId: 'components' },
{ id: 'avatarStack', name: 'Avatar Stack', component: AvatarStackDoc, parentId: 'components' },
{ id: 'badge', name: 'Badge', component: BadgeDoc, parentId: 'components' },
{ id: 'blocker', name: 'Blocker', component: BlockerDoc, parentId: 'components' },
{ id: 'button', name: 'Button', component: ButtonDoc, parentId: 'components' },
{ id: 'checkbox', name: 'Checkbox', component: CheckboxDoc, parentId: 'components' },
{ id: 'checkboxGroup', name: 'Checkbox Group', component: CheckboxGroupDoc, parentId: 'components' },
{ id: 'controlGroup', name: 'Control Group', component: ControlGroupDoc, parentId: 'components' },
{ id: 'datePicker', name: 'Date Picker', component: DatePickerDoc, parentId: 'components' },
{ id: 'dropdown', name: 'Dropdown', component: DropdownDoc, parentId: 'components' },
{ id: 'dropdownMenu', name: 'Dropdown Menu', component: DropdownMenuDoc, parentId: 'components' },
{ id: 'flexItems', name: 'Flex Items', parentId: 'components' },
{ id: 'panel', name: 'Panel', component: PanelDoc, parentId: 'flexItems', order: 1 },
{ id: 'flexRow', name: 'Flex Row', component: FlexRowDoc, parentId: 'flexItems', order: 2 },
{ id: 'flexCell', name: 'Flex Cell', component: FlexCellDoc, parentId: 'flexItems', order: 3 },
{ id: 'flexSpacer', name: 'Flex Spacer', component: FlexSpacerDoc, parentId: 'flexItems', order: 4 },

{ id: 'richTextEditor', name: 'Rich Text Editor', parentId: 'components', tags: ['RTE', 'RichTextEditor'] },
{ id: 'rteOverview', name: 'Overview', component: RichTextEditorDoc, parentId: 'richTextEditor', order: 1, tags: ['RTE', 'RichTextEditor'] },
{ id: 'rteSerializers', name: 'Serializers', component: RichTextEditorSerializersDoc, parentId: 'richTextEditor', order: 2, tags: ['RTE', 'RichTextEditor'] },

{ id: 'iconButton', name: 'Icon Button', component: IconButtonDoc, parentId: 'components' },
{ id: 'iconContainer', name: 'Icon Container', component: IconContainerDoc, parentId: 'components' },
{ id: 'countIndicator', name: 'Count Indicator', component: CountIndicatorDoc, parentId: 'components' },
{ id: 'statusIndicator', name: 'Status Indicator', component: StatusIndicatorDoc, parentId: 'components' },
{ id: 'labeledInput', name: 'Labeled Input', component: LabeledInputDoc, parentId: 'components' },
{ id: 'linkButton', name: 'Link Button', component: LinkButtonDoc, parentId: 'components' },
{ id: 'mainMenu', name: 'Main Menu', component: MainMenuDoc, parentId: 'components' },
{ id: 'modals', name: 'Modals', component: ModalsDoc, parentId: 'components' },
{ id: 'multiSwitch', name: 'MultiSwitch', component: MultiSwitchDoc, parentId: 'components' },
{ id: 'notificationCard', name: 'Notification Card', component: NotificationCardDoc, parentId: 'components' },
{ id: 'numericInput', name: 'Numeric Input', component: NumericInputDoc, parentId: 'components' },
{ id: 'paginator', name: 'Paginator', component: PaginatorDoc, parentId: 'components' },
{ id: 'pickerInput', name: 'Picker Input', component: PickerInputDoc, parentId: 'components', tags: ['PickerInput'] },
{ id: 'pickerModal', name: 'Picker Modal', component: PickerModalDoc, parentId: 'components', tags: ['PickerList'] },
{ id: 'PickerList', name: 'Picker List', component: PickerListDoc, parentId: 'components', tags: ['PickerModal'] },
{ id: 'radioGroup', name: 'Radio Group', component: RadioGroupDoc, parentId: 'components' },
{ id: 'radioInput', name: 'Radio Input', component: RadioInputDoc, parentId: 'components' },
{ id: 'rangeDatePicker', name: 'Range Date Picker', component: RangeDatePickerDoc, parentId: 'components' },
{ id: 'rating', name: 'Rating', component: RatingDoc, parentId: 'components' },
{ id: 'richTextView', name: 'RichTextView', component: RichTextViewDoc, parentId: 'components' },
{ id: 'searchInput', name: 'Search Input', component: SearchInputDoc, parentId: 'components' },
{ id: 'slider', name: 'Slider', component: SliderDoc, parentId: 'components' },
{ id: 'sliderRating', name: 'Slider Rating', component: SliderRatingDoc, parentId: 'components' },
{ id: 'spinner', name: 'Spinner', component: SpinnerDoc, parentId: 'components' },
{ id: 'switch', name: 'Switch', component: SwitchDoc, parentId: 'components' },
{ id: 'tabButton', name: 'Tab Button', component: TabButtonDoc, parentId: 'components' },
{ id: 'tables', name: 'Data Tables', parentId: 'components', tags: ['table'] },
{ id: 'tablesOverview', name: 'Overview', component: TablesOverviewDoc, parentId: 'tables', order: 1, tags: ['tables', 'dataTable'] },
{ id: 'editableTables', name: 'Editable Tables', component: EditableTablesDoc, parentId: 'tables', order: 2, tags: ['tables', 'dataTable'] },
{ id: 'advancedTables', name: 'Advanced', component: AdvancedTablesDoc, parentId: 'tables', order: 3, tags: ['tables', 'dataTable'] },
{ id: 'useTableState', name: 'useTableState', component: useTableStateDoc, parentId: 'tables', order: 4, tags: ['tables', 'dataTable'] },
{ id: 'filtersPanel', name: 'Filters Panel', component: FiltersPanelDoc, parentId: 'tables', order: 5, tags: ['tables', 'dataTable'] },
{ id: 'presetsPanel', name: 'Presets Panel', component: PresetsPanelDoc, parentId: 'tables', order: 6, tags: ['tables', 'dataTable'] },
{ id: 'tag', name: 'Tag', component: TagDoc, parentId: 'components' },
{ id: 'text', name: 'Text', component: TextDoc, parentId: 'components' },
{ id: 'textArea', name: 'Text Area', component: TextAreaDoc, parentId: 'components' },
{ id: 'textInput', name: 'Text Input', component: TextInputDoc, parentId: 'components' },
{ id: 'textPlaceholder', name: 'Text Placeholder', component: TextPlaceholderDoc, parentId: 'components' },
{ id: 'timePicker', name: 'Time Picker', component: TimePickerDoc, parentId: 'components' },
{ id: 'tooltip', name: 'Tooltip', component: TooltipDoc, parentId: 'components' },
{ id: 'form', name: 'Form', component: FormDoc, parentId: 'components', tags: ['useForm'] },
{ id: 'fileUpload', name: 'File Upload', component: FileUploadDoc, parentId: 'components' },
{ id: 'verticalTabButton', name: 'Vertical Tab Button', component: VerticalTabButtonDoc, parentId: 'components' },
{ id: 'virtualList', name: 'Virtual List', component: VirtualListDoc, parentId: 'components' },
{ id: 'progressBar', name: 'Progress Bar', component: ProgressBarDoc, parentId: 'components' },
{ id: 'scrollSpy', name: 'Scroll Spy', component: ScrollSpyDoc, parentId: 'components' },
{ id: 'dropdownContainer', name: 'Dropdown Container', component: DropdownContainerDoc, parentId: 'components' },
],
(item) => (item.order ? item.order + item.name : item.name),
);

export const items: DocItem[] = [
{ id: 'overview', name: 'Overview', component: OverviewDoc },
{ id: 'gettingStarted', name: 'Getting Started', component: GettingStartedDoc },
Expand Down
20 changes: 13 additions & 7 deletions app/src/documents/structureComponents.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ import {
RadioGroupDoc,
RadioInputDoc,
RangeDatePickerDoc,
RatingDoc, RichTextEditorDoc,
RatingDoc,
RichTextEditorDoc,
RichTextViewDoc, ScrollSpyDoc,
SearchInputDoc,
SliderDoc,
Expand All @@ -56,6 +57,7 @@ import {
useTableStateDoc, VerticalTabButtonDoc, VirtualListDoc,
} from '../docs';
import { AnchorDoc } from '../docs/anchor/Anchor.doc';
import { RichTextEditorSerializersDoc } from '../docs/RichTextEditorSerializers.doc';

export const componentsStructure = sortBy(
[
Expand All @@ -79,6 +81,11 @@ export const componentsStructure = sortBy(
{ id: 'flexRow', name: 'Flex Row', component: FlexRowDoc, parentId: 'flexItems', order: 2 },
{ id: 'flexCell', name: 'Flex Cell', component: FlexCellDoc, parentId: 'flexItems', order: 3 },
{ id: 'flexSpacer', name: 'Flex Spacer', component: FlexSpacerDoc, parentId: 'flexItems', order: 4 },

{ id: 'richTextEditor', name: 'Rich Text Editor', parentId: 'components', tags: ['RTE', 'RichTextEditor'] },
{ id: 'rteOverview', name: 'Overview', component: RichTextEditorDoc, parentId: 'richTextEditor', order: 1, tags: ['RTE', 'RichTextEditor'] },
{ id: 'rteSerializers', name: 'Serializers', component: RichTextEditorSerializersDoc, parentId: 'richTextEditor', order: 2, tags: ['RTE', 'RichTextEditor'] },

{ id: 'iconButton', name: 'Icon Button', component: IconButtonDoc, parentId: 'components' },
{ id: 'iconContainer', name: 'Icon Container', component: IconContainerDoc, parentId: 'components' },
{ id: 'countIndicator', name: 'Count Indicator', component: CountIndicatorDoc, parentId: 'components' },
Expand All @@ -91,14 +98,14 @@ export const componentsStructure = sortBy(
{ id: 'notificationCard', name: 'Notification Card', component: NotificationCardDoc, parentId: 'components' },
{ id: 'numericInput', name: 'Numeric Input', component: NumericInputDoc, parentId: 'components' },
{ id: 'paginator', name: 'Paginator', component: PaginatorDoc, parentId: 'components' },
{ id: 'pickerInput', name: 'Picker Input', component: PickerInputDoc, parentId: 'components' },
{ id: 'pickerModal', name: 'Picker Modal', component: PickerModalDoc, parentId: 'components' },
{ id: 'PickerList', name: 'Picker List', component: PickerListDoc, parentId: 'components' },
{ id: 'pickerInput', name: 'Picker Input', component: PickerInputDoc, parentId: 'components', tags: ['PickerInput'] },
{ id: 'pickerModal', name: 'Picker Modal', component: PickerModalDoc, parentId: 'components', tags: ['PickerList'] },
{ id: 'PickerList', name: 'Picker List', component: PickerListDoc, parentId: 'components', tags: ['PickerModal'] },
{ id: 'radioGroup', name: 'Radio Group', component: RadioGroupDoc, parentId: 'components' },
{ id: 'radioInput', name: 'Radio Input', component: RadioInputDoc, parentId: 'components' },
{ id: 'rangeDatePicker', name: 'Range Date Picker', component: RangeDatePickerDoc, parentId: 'components' },
{ id: 'rating', name: 'Rating', component: RatingDoc, parentId: 'components' },
{ id: 'richTextView', name: 'Rich Text View', component: RichTextViewDoc, parentId: 'components' },
{ id: 'richTextView', name: 'RichTextView', component: RichTextViewDoc, parentId: 'components' },
{ id: 'searchInput', name: 'Search Input', component: SearchInputDoc, parentId: 'components' },
{ id: 'slider', name: 'Slider', component: SliderDoc, parentId: 'components' },
{ id: 'sliderRating', name: 'Slider Rating', component: SliderRatingDoc, parentId: 'components' },
Expand All @@ -119,8 +126,7 @@ export const componentsStructure = sortBy(
{ id: 'textPlaceholder', name: 'Text Placeholder', component: TextPlaceholderDoc, parentId: 'components' },
{ id: 'timePicker', name: 'Time Picker', component: TimePickerDoc, parentId: 'components' },
{ id: 'tooltip', name: 'Tooltip', component: TooltipDoc, parentId: 'components' },
{ id: 'richTextEditor', name: 'Rich Text Editor', component: RichTextEditorDoc, parentId: 'components' },
{ id: 'form', name: 'Form', component: FormDoc, parentId: 'components' },
{ id: 'form', name: 'Form', component: FormDoc, parentId: 'components', tags: ['useForm'] },
{ id: 'fileUpload', name: 'File Upload', component: FileUploadDoc, parentId: 'components' },
{ id: 'verticalTabButton', name: 'Vertical Tab Button', component: VerticalTabButtonDoc, parentId: 'components' },
{ id: 'virtualList', name: 'Virtual List', component: VirtualListDoc, parentId: 'components' },
Expand Down

0 comments on commit 8440cc8

Please sign in to comment.