diff --git a/libs/ui/assets/fonts/GT-America-Mono-Medium.woff b/app/ui/assets/fonts/GT-America-Mono-Medium.woff similarity index 100% rename from libs/ui/assets/fonts/GT-America-Mono-Medium.woff rename to app/ui/assets/fonts/GT-America-Mono-Medium.woff diff --git a/libs/ui/assets/fonts/GT-America-Mono-Medium.woff2 b/app/ui/assets/fonts/GT-America-Mono-Medium.woff2 similarity index 100% rename from libs/ui/assets/fonts/GT-America-Mono-Medium.woff2 rename to app/ui/assets/fonts/GT-America-Mono-Medium.woff2 diff --git a/libs/ui/assets/fonts/GT-America-Mono-Regular-OCC.woff b/app/ui/assets/fonts/GT-America-Mono-Regular-OCC.woff similarity index 100% rename from libs/ui/assets/fonts/GT-America-Mono-Regular-OCC.woff rename to app/ui/assets/fonts/GT-America-Mono-Regular-OCC.woff diff --git a/libs/ui/assets/fonts/GT-America-Mono-Regular-OCC.woff2 b/app/ui/assets/fonts/GT-America-Mono-Regular-OCC.woff2 similarity index 100% rename from libs/ui/assets/fonts/GT-America-Mono-Regular-OCC.woff2 rename to app/ui/assets/fonts/GT-America-Mono-Regular-OCC.woff2 diff --git a/libs/ui/assets/fonts/SuisseIntl-Book-WebS.woff b/app/ui/assets/fonts/SuisseIntl-Book-WebS.woff similarity index 100% rename from libs/ui/assets/fonts/SuisseIntl-Book-WebS.woff rename to app/ui/assets/fonts/SuisseIntl-Book-WebS.woff diff --git a/libs/ui/assets/fonts/SuisseIntl-Book-WebS.woff2 b/app/ui/assets/fonts/SuisseIntl-Book-WebS.woff2 similarity index 100% rename from libs/ui/assets/fonts/SuisseIntl-Book-WebS.woff2 rename to app/ui/assets/fonts/SuisseIntl-Book-WebS.woff2 diff --git a/libs/ui/assets/fonts/SuisseIntl-Light-WebS.woff b/app/ui/assets/fonts/SuisseIntl-Light-WebS.woff similarity index 100% rename from libs/ui/assets/fonts/SuisseIntl-Light-WebS.woff rename to app/ui/assets/fonts/SuisseIntl-Light-WebS.woff diff --git a/libs/ui/assets/fonts/SuisseIntl-Light-WebS.woff2 b/app/ui/assets/fonts/SuisseIntl-Light-WebS.woff2 similarity index 100% rename from libs/ui/assets/fonts/SuisseIntl-Light-WebS.woff2 rename to app/ui/assets/fonts/SuisseIntl-Light-WebS.woff2 diff --git a/libs/ui/assets/fonts/SuisseIntl-Regular-WebS.woff b/app/ui/assets/fonts/SuisseIntl-Regular-WebS.woff similarity index 100% rename from libs/ui/assets/fonts/SuisseIntl-Regular-WebS.woff rename to app/ui/assets/fonts/SuisseIntl-Regular-WebS.woff diff --git a/libs/ui/assets/fonts/SuisseIntl-Regular-WebS.woff2 b/app/ui/assets/fonts/SuisseIntl-Regular-WebS.woff2 similarity index 100% rename from libs/ui/assets/fonts/SuisseIntl-Regular-WebS.woff2 rename to app/ui/assets/fonts/SuisseIntl-Regular-WebS.woff2 diff --git a/libs/ui/assets/fonts/SuisseIntl-RegularItalic-WebS.woff b/app/ui/assets/fonts/SuisseIntl-RegularItalic-WebS.woff similarity index 100% rename from libs/ui/assets/fonts/SuisseIntl-RegularItalic-WebS.woff rename to app/ui/assets/fonts/SuisseIntl-RegularItalic-WebS.woff diff --git a/libs/ui/assets/fonts/SuisseIntl-RegularItalic-WebS.woff2 b/app/ui/assets/fonts/SuisseIntl-RegularItalic-WebS.woff2 similarity index 100% rename from libs/ui/assets/fonts/SuisseIntl-RegularItalic-WebS.woff2 rename to app/ui/assets/fonts/SuisseIntl-RegularItalic-WebS.woff2 diff --git a/app/ui/index.ts b/app/ui/index.ts new file mode 100644 index 0000000000..3e7d054913 --- /dev/null +++ b/app/ui/index.ts @@ -0,0 +1,55 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, you can obtain one at https://mozilla.org/MPL/2.0/. + * + * Copyright Oxide Computer Company + */ +import useInterval from './lib/use-interval' +import useTimeout from './lib/use-timeout' + +import './styles/index.css' + +export { useInterval, useTimeout } + +export * from './lib/ActionMenu' +export * from './lib/AuthCodeInput' +export * from './lib/Badge' +export * from './lib/Button' +export * from './lib/Checkbox' +export * from './lib/CopyToClipboard' +export * from './lib/DateRangePicker' +export * from './lib/Divider' +export * from './lib/DropdownMenu' +export * from './lib/FileInput' +export * from './lib/EmptyMessage' +export * from './lib/FieldLabel' + +export * from './lib/Identicon' +export * from './lib/Message' +export * from './lib/Listbox' +export * from './lib/Message' +export * from './lib/Modal' +export * from './lib/ModalLinks' +export * as MiniTable from './lib/MiniTable' +export * from './lib/NumberInput' +export * from './lib/PageHeader' +export * from './lib/Pagination' +export * from './lib/Progress' +export * from './lib/PropertiesTable' +export * from './lib/RadioGroup' +export * from './lib/Radio' +export * from './lib/ResourceMeter' +export * from './lib/SettingsGroup' +export * from './lib/SideModal' +export * from './lib/SkipLink' +export * from './lib/Spinner' +export * from './lib/Table' +export * from './lib/Tabs' +export * from './lib/TextInput' +export * from './lib/Toast' +export * from './lib/Tooltip' +export * from './lib/Truncate' +export * from './util/wrap' + +export * from '@oxide/design-system/icons/react' diff --git a/libs/ui/lib/action-menu/ActionMenu.stories.tsx b/app/ui/lib/ActionMenu.stories.tsx similarity index 95% rename from libs/ui/lib/action-menu/ActionMenu.stories.tsx rename to app/ui/lib/ActionMenu.stories.tsx index a3f596a8e1..9901b52bca 100644 --- a/libs/ui/lib/action-menu/ActionMenu.stories.tsx +++ b/app/ui/lib/ActionMenu.stories.tsx @@ -7,8 +7,8 @@ */ import { useState } from 'react' -import { Button } from '../button/Button' import { ActionMenu } from './ActionMenu' +import { Button } from './Button' const makeItem = (value: string) => ({ value, diff --git a/libs/ui/lib/action-menu/ActionMenu.tsx b/app/ui/lib/ActionMenu.tsx similarity index 99% rename from libs/ui/lib/action-menu/ActionMenu.tsx rename to app/ui/lib/ActionMenu.tsx index 09a67c08c8..3c88e9b15f 100644 --- a/libs/ui/lib/action-menu/ActionMenu.tsx +++ b/app/ui/lib/ActionMenu.tsx @@ -13,7 +13,7 @@ import React, { useState } from 'react' import { Close12Icon } from '@oxide/design-system/icons/react' import { classed, groupBy } from '@oxide/util' -import { useSteppedScroll } from '../hooks/use-stepped-scroll' +import { useSteppedScroll } from './use-stepped-scroll' export interface QuickActionItem { value: string diff --git a/libs/ui/lib/auth-code/AuthCodeInput.tsx b/app/ui/lib/AuthCodeInput.tsx similarity index 100% rename from libs/ui/lib/auth-code/AuthCodeInput.tsx rename to app/ui/lib/AuthCodeInput.tsx diff --git a/libs/ui/lib/badge/Badge.stories.tsx b/app/ui/lib/Badge.stories.tsx similarity index 94% rename from libs/ui/lib/badge/Badge.stories.tsx rename to app/ui/lib/Badge.stories.tsx index bbeb241f40..394b3f5080 100644 --- a/libs/ui/lib/badge/Badge.stories.tsx +++ b/app/ui/lib/Badge.stories.tsx @@ -5,7 +5,7 @@ * * Copyright Oxide Computer Company */ -import { Section } from '../../util/story-section' +import { Section } from '../util/story-section' import { Badge, badgeColors, type BadgeColor, type BadgeVariant } from './Badge' export const All = () => { diff --git a/libs/ui/lib/badge/Badge.tsx b/app/ui/lib/Badge.tsx similarity index 100% rename from libs/ui/lib/badge/Badge.tsx rename to app/ui/lib/Badge.tsx diff --git a/libs/ui/lib/bulk-action-menu/BulkActionMenu.stories.tsx b/app/ui/lib/BulkActionMenu.stories.tsx similarity index 100% rename from libs/ui/lib/bulk-action-menu/BulkActionMenu.stories.tsx rename to app/ui/lib/BulkActionMenu.stories.tsx diff --git a/libs/ui/lib/bulk-action-menu/BulkActionMenu.tsx b/app/ui/lib/BulkActionMenu.tsx similarity index 95% rename from libs/ui/lib/bulk-action-menu/BulkActionMenu.tsx rename to app/ui/lib/BulkActionMenu.tsx index a6e7add18d..8a8e3d88db 100644 --- a/libs/ui/lib/bulk-action-menu/BulkActionMenu.tsx +++ b/app/ui/lib/BulkActionMenu.tsx @@ -7,7 +7,7 @@ */ import { flattenChildren } from '@oxide/util' -import { Button, type ButtonProps } from '../button/Button' +import { Button, type ButtonProps } from './Button' export interface BulkActionMenuProps { selectedCount: number diff --git a/libs/ui/lib/button/Button.stories.tsx b/app/ui/lib/Button.stories.tsx similarity index 95% rename from libs/ui/lib/button/Button.stories.tsx rename to app/ui/lib/Button.stories.tsx index 5695877a55..a178aac90b 100644 --- a/libs/ui/lib/button/Button.stories.tsx +++ b/app/ui/lib/Button.stories.tsx @@ -5,7 +5,7 @@ * * Copyright Oxide Computer Company */ -import { Section } from '../../util/story-section' +import { Section } from '../util/story-section' import { Button, variants } from './Button' // TODO: sizes (I guess) diff --git a/libs/ui/lib/button/Button.tsx b/app/ui/lib/Button.tsx similarity index 100% rename from libs/ui/lib/button/Button.tsx rename to app/ui/lib/Button.tsx diff --git a/libs/ui/lib/date-picker/Calendar.tsx b/app/ui/lib/Calendar.tsx similarity index 100% rename from libs/ui/lib/date-picker/Calendar.tsx rename to app/ui/lib/Calendar.tsx diff --git a/libs/ui/lib/date-picker/CalendarCell.tsx b/app/ui/lib/CalendarCell.tsx similarity index 100% rename from libs/ui/lib/date-picker/CalendarCell.tsx rename to app/ui/lib/CalendarCell.tsx diff --git a/libs/ui/lib/date-picker/CalendarGrid.tsx b/app/ui/lib/CalendarGrid.tsx similarity index 100% rename from libs/ui/lib/date-picker/CalendarGrid.tsx rename to app/ui/lib/CalendarGrid.tsx diff --git a/libs/ui/lib/checkbox/Checkbox.stories.tsx b/app/ui/lib/Checkbox.stories.tsx similarity index 100% rename from libs/ui/lib/checkbox/Checkbox.stories.tsx rename to app/ui/lib/Checkbox.stories.tsx diff --git a/libs/ui/lib/checkbox/Checkbox.tsx b/app/ui/lib/Checkbox.tsx similarity index 100% rename from libs/ui/lib/checkbox/Checkbox.tsx rename to app/ui/lib/Checkbox.tsx diff --git a/libs/ui/lib/__stories__/Colors.stories.tsx b/app/ui/lib/Colors.stories.tsx similarity index 100% rename from libs/ui/lib/__stories__/Colors.stories.tsx rename to app/ui/lib/Colors.stories.tsx diff --git a/libs/ui/lib/copy-to-clipboard/CopyToClipboard.stories.tsx b/app/ui/lib/CopyToClipboard.stories.tsx similarity index 100% rename from libs/ui/lib/copy-to-clipboard/CopyToClipboard.stories.tsx rename to app/ui/lib/CopyToClipboard.stories.tsx diff --git a/libs/ui/lib/copy-to-clipboard/CopyToClipboard.tsx b/app/ui/lib/CopyToClipboard.tsx similarity index 100% rename from libs/ui/lib/copy-to-clipboard/CopyToClipboard.tsx rename to app/ui/lib/CopyToClipboard.tsx diff --git a/libs/ui/lib/date-picker/DateField.tsx b/app/ui/lib/DateField.tsx similarity index 100% rename from libs/ui/lib/date-picker/DateField.tsx rename to app/ui/lib/DateField.tsx diff --git a/libs/ui/lib/date-picker/DatePicker.stories.tsx b/app/ui/lib/DatePicker.stories.tsx similarity index 100% rename from libs/ui/lib/date-picker/DatePicker.stories.tsx rename to app/ui/lib/DatePicker.stories.tsx diff --git a/libs/ui/lib/date-picker/DatePicker.tsx b/app/ui/lib/DatePicker.tsx similarity index 100% rename from libs/ui/lib/date-picker/DatePicker.tsx rename to app/ui/lib/DatePicker.tsx diff --git a/libs/ui/lib/date-picker/DateRangePicker.tsx b/app/ui/lib/DateRangePicker.tsx similarity index 100% rename from libs/ui/lib/date-picker/DateRangePicker.tsx rename to app/ui/lib/DateRangePicker.tsx diff --git a/libs/ui/lib/date-picker/Dialog.tsx b/app/ui/lib/Dialog.tsx similarity index 100% rename from libs/ui/lib/date-picker/Dialog.tsx rename to app/ui/lib/Dialog.tsx diff --git a/libs/ui/lib/divider/Divider.tsx b/app/ui/lib/Divider.tsx similarity index 100% rename from libs/ui/lib/divider/Divider.tsx rename to app/ui/lib/Divider.tsx diff --git a/libs/ui/lib/dropdown-menu/DropdownMenu.tsx b/app/ui/lib/DropdownMenu.tsx similarity index 100% rename from libs/ui/lib/dropdown-menu/DropdownMenu.tsx rename to app/ui/lib/DropdownMenu.tsx diff --git a/libs/ui/lib/empty-message/EmptyMessage.stories.tsx b/app/ui/lib/EmptyMessage.stories.tsx similarity index 100% rename from libs/ui/lib/empty-message/EmptyMessage.stories.tsx rename to app/ui/lib/EmptyMessage.stories.tsx diff --git a/libs/ui/lib/empty-message/EmptyMessage.tsx b/app/ui/lib/EmptyMessage.tsx similarity index 96% rename from libs/ui/lib/empty-message/EmptyMessage.tsx rename to app/ui/lib/EmptyMessage.tsx index 047debacbe..d568b884cf 100644 --- a/libs/ui/lib/empty-message/EmptyMessage.tsx +++ b/app/ui/lib/EmptyMessage.tsx @@ -9,7 +9,7 @@ import cn from 'classnames' import type { ReactElement } from 'react' import { Link } from 'react-router-dom' -import { Button, buttonStyle } from '../button/Button' +import { Button, buttonStyle } from './Button' const buttonStyleProps = { variant: 'ghost', size: 'sm', color: 'secondary' } as const diff --git a/libs/ui/lib/field-label/FieldLabel.stories.tsx b/app/ui/lib/FieldLabel.stories.tsx similarity index 100% rename from libs/ui/lib/field-label/FieldLabel.stories.tsx rename to app/ui/lib/FieldLabel.stories.tsx diff --git a/libs/ui/lib/field-label/FieldLabel.tsx b/app/ui/lib/FieldLabel.tsx similarity index 100% rename from libs/ui/lib/field-label/FieldLabel.tsx rename to app/ui/lib/FieldLabel.tsx diff --git a/libs/ui/lib/file-input/FileInput.spec.tsx b/app/ui/lib/FileInput.spec.tsx similarity index 100% rename from libs/ui/lib/file-input/FileInput.spec.tsx rename to app/ui/lib/FileInput.spec.tsx diff --git a/libs/ui/lib/file-input/FileInput.stories.tsx b/app/ui/lib/FileInput.stories.tsx similarity index 100% rename from libs/ui/lib/file-input/FileInput.stories.tsx rename to app/ui/lib/FileInput.stories.tsx diff --git a/libs/ui/lib/file-input/FileInput.tsx b/app/ui/lib/FileInput.tsx similarity index 100% rename from libs/ui/lib/file-input/FileInput.tsx rename to app/ui/lib/FileInput.tsx diff --git a/libs/ui/lib/identicon/Identicon.stories.tsx b/app/ui/lib/Identicon.stories.tsx similarity index 100% rename from libs/ui/lib/identicon/Identicon.stories.tsx rename to app/ui/lib/Identicon.stories.tsx diff --git a/libs/ui/lib/identicon/Identicon.tsx b/app/ui/lib/Identicon.tsx similarity index 100% rename from libs/ui/lib/identicon/Identicon.tsx rename to app/ui/lib/Identicon.tsx diff --git a/libs/ui/lib/listbox/Listbox.stories.tsx b/app/ui/lib/Listbox.stories.tsx similarity index 100% rename from libs/ui/lib/listbox/Listbox.stories.tsx rename to app/ui/lib/Listbox.stories.tsx diff --git a/libs/ui/lib/listbox/Listbox.tsx b/app/ui/lib/Listbox.tsx similarity index 100% rename from libs/ui/lib/listbox/Listbox.tsx rename to app/ui/lib/Listbox.tsx diff --git a/libs/ui/lib/message/Message.stories.tsx b/app/ui/lib/Message.stories.tsx similarity index 100% rename from libs/ui/lib/message/Message.stories.tsx rename to app/ui/lib/Message.stories.tsx diff --git a/libs/ui/lib/message/Message.tsx b/app/ui/lib/Message.tsx similarity index 100% rename from libs/ui/lib/message/Message.tsx rename to app/ui/lib/Message.tsx diff --git a/libs/ui/lib/mini-table/MiniTable.stories.tsx b/app/ui/lib/MiniTable.stories.tsx similarity index 100% rename from libs/ui/lib/mini-table/MiniTable.stories.tsx rename to app/ui/lib/MiniTable.stories.tsx diff --git a/libs/ui/lib/mini-table/MiniTable.tsx b/app/ui/lib/MiniTable.tsx similarity index 94% rename from libs/ui/lib/mini-table/MiniTable.tsx rename to app/ui/lib/MiniTable.tsx index 0cbdc79bbe..f153e4ebf2 100644 --- a/libs/ui/lib/mini-table/MiniTable.tsx +++ b/app/ui/lib/MiniTable.tsx @@ -7,7 +7,7 @@ */ import { classed } from '@oxide/util' -import { Table as BigTable } from '../table/Table' +import { Table as BigTable } from './Table' import './mini-table.css' diff --git a/libs/ui/lib/modal/Modal.stories.tsx b/app/ui/lib/Modal.stories.tsx similarity index 92% rename from libs/ui/lib/modal/Modal.stories.tsx rename to app/ui/lib/Modal.stories.tsx index 72562e1006..9135775274 100644 --- a/libs/ui/lib/modal/Modal.stories.tsx +++ b/app/ui/lib/Modal.stories.tsx @@ -7,11 +7,11 @@ */ import { useState } from 'react' -import { Button } from '../button/Button' -import { FieldLabel } from '../field-label/FieldLabel' -import { ModalLink, ModalLinks } from '../ModalLinks' -import { TextInput, TextInputHint } from '../text-input/TextInput' +import { Button } from './Button' +import { FieldLabel } from './FieldLabel' import { Modal } from './Modal' +import { ModalLink, ModalLinks } from './ModalLinks' +import { TextInput, TextInputHint } from './TextInput' export function Default() { const [isOpen, setIsOpen] = useState(false) diff --git a/libs/ui/lib/modal/Modal.tsx b/app/ui/lib/Modal.tsx similarity index 99% rename from libs/ui/lib/modal/Modal.tsx rename to app/ui/lib/Modal.tsx index d23e447d3c..2353cb536d 100644 --- a/libs/ui/lib/modal/Modal.tsx +++ b/app/ui/lib/Modal.tsx @@ -12,7 +12,7 @@ import React, { createContext, forwardRef, useContext, useId } from 'react' import { Close12Icon } from '@oxide/design-system/icons/react' import { classed } from '@oxide/util' -import { Button } from '../button/Button' +import { Button } from './Button' const ModalContext = createContext(false) diff --git a/libs/ui/lib/ModalLinks.tsx b/app/ui/lib/ModalLinks.tsx similarity index 100% rename from libs/ui/lib/ModalLinks.tsx rename to app/ui/lib/ModalLinks.tsx diff --git a/libs/ui/lib/number-input/NumberInput.stories.tsx b/app/ui/lib/NumberInput.stories.tsx similarity index 100% rename from libs/ui/lib/number-input/NumberInput.stories.tsx rename to app/ui/lib/NumberInput.stories.tsx diff --git a/libs/ui/lib/number-input/NumberInput.tsx b/app/ui/lib/NumberInput.tsx similarity index 100% rename from libs/ui/lib/number-input/NumberInput.tsx rename to app/ui/lib/NumberInput.tsx diff --git a/libs/ui/lib/page-header/PageHeader.stories.tsx b/app/ui/lib/PageHeader.stories.tsx similarity index 100% rename from libs/ui/lib/page-header/PageHeader.stories.tsx rename to app/ui/lib/PageHeader.stories.tsx diff --git a/libs/ui/lib/page-header/PageHeader.tsx b/app/ui/lib/PageHeader.tsx similarity index 100% rename from libs/ui/lib/page-header/PageHeader.tsx rename to app/ui/lib/PageHeader.tsx diff --git a/libs/ui/lib/pagination/Pagination.stories.tsx b/app/ui/lib/Pagination.stories.tsx similarity index 100% rename from libs/ui/lib/pagination/Pagination.stories.tsx rename to app/ui/lib/Pagination.stories.tsx diff --git a/libs/ui/lib/pagination/Pagination.tsx b/app/ui/lib/Pagination.tsx similarity index 100% rename from libs/ui/lib/pagination/Pagination.tsx rename to app/ui/lib/Pagination.tsx diff --git a/libs/ui/lib/date-picker/Popover.tsx b/app/ui/lib/Popover.tsx similarity index 100% rename from libs/ui/lib/date-picker/Popover.tsx rename to app/ui/lib/Popover.tsx diff --git a/libs/ui/lib/progress/Progress.stories.tsx b/app/ui/lib/Progress.stories.tsx similarity index 100% rename from libs/ui/lib/progress/Progress.stories.tsx rename to app/ui/lib/Progress.stories.tsx diff --git a/libs/ui/lib/progress/Progress.tsx b/app/ui/lib/Progress.tsx similarity index 94% rename from libs/ui/lib/progress/Progress.tsx rename to app/ui/lib/Progress.tsx index 31cac6539b..0bd2e1dee0 100644 --- a/libs/ui/lib/progress/Progress.tsx +++ b/app/ui/lib/Progress.tsx @@ -7,7 +7,7 @@ */ import cn from 'classnames' -import { ariaLabel, type AriaLabel } from '../../util/aria' +import { ariaLabel, type AriaLabel } from '../util/aria' export type ProgressProps = { value: number // always out of 100 diff --git a/libs/ui/lib/properties-table/PropertiesTable.stories.tsx b/app/ui/lib/PropertiesTable.stories.tsx similarity index 100% rename from libs/ui/lib/properties-table/PropertiesTable.stories.tsx rename to app/ui/lib/PropertiesTable.stories.tsx diff --git a/libs/ui/lib/properties-table/PropertiesTable.tsx b/app/ui/lib/PropertiesTable.tsx similarity index 98% rename from libs/ui/lib/properties-table/PropertiesTable.tsx rename to app/ui/lib/PropertiesTable.tsx index 6154e7a883..b7351cbab3 100644 --- a/libs/ui/lib/properties-table/PropertiesTable.tsx +++ b/app/ui/lib/PropertiesTable.tsx @@ -10,7 +10,7 @@ import type { ReactNode } from 'react' import { invariant, isOneOf } from '@oxide/util' -import { Badge } from '../badge/Badge' +import { Badge } from './Badge' import './properties-table.css' diff --git a/libs/ui/lib/radio/Radio.stories.tsx b/app/ui/lib/Radio.stories.tsx similarity index 100% rename from libs/ui/lib/radio/Radio.stories.tsx rename to app/ui/lib/Radio.stories.tsx diff --git a/libs/ui/lib/radio/Radio.tsx b/app/ui/lib/Radio.tsx similarity index 100% rename from libs/ui/lib/radio/Radio.tsx rename to app/ui/lib/Radio.tsx diff --git a/libs/ui/lib/radio-group/RadioGroup.stories.tsx b/app/ui/lib/RadioGroup.stories.tsx similarity index 96% rename from libs/ui/lib/radio-group/RadioGroup.stories.tsx rename to app/ui/lib/RadioGroup.stories.tsx index 61f42c1eb9..6106a0dfdd 100644 --- a/libs/ui/lib/radio-group/RadioGroup.stories.tsx +++ b/app/ui/lib/RadioGroup.stories.tsx @@ -5,7 +5,7 @@ * * Copyright Oxide Computer Company */ -import { Radio, RadioCard } from '../radio/Radio' +import { Radio, RadioCard } from './Radio' import { RadioGroup } from './RadioGroup' export const Default = () => ( diff --git a/libs/ui/lib/radio-group/RadioGroup.tsx b/app/ui/lib/RadioGroup.tsx similarity index 100% rename from libs/ui/lib/radio-group/RadioGroup.tsx rename to app/ui/lib/RadioGroup.tsx diff --git a/libs/ui/lib/date-picker/RangeCalendar.tsx b/app/ui/lib/RangeCalendar.tsx similarity index 100% rename from libs/ui/lib/date-picker/RangeCalendar.tsx rename to app/ui/lib/RangeCalendar.tsx diff --git a/libs/ui/lib/resource-meter/ResourceMeter.stories.tsx b/app/ui/lib/ResourceMeter.stories.tsx similarity index 100% rename from libs/ui/lib/resource-meter/ResourceMeter.stories.tsx rename to app/ui/lib/ResourceMeter.stories.tsx diff --git a/libs/ui/lib/resource-meter/ResourceMeter.tsx b/app/ui/lib/ResourceMeter.tsx similarity index 97% rename from libs/ui/lib/resource-meter/ResourceMeter.tsx rename to app/ui/lib/ResourceMeter.tsx index d48dfd318e..539ff995c5 100644 --- a/libs/ui/lib/resource-meter/ResourceMeter.tsx +++ b/app/ui/lib/ResourceMeter.tsx @@ -8,7 +8,7 @@ import cn from 'classnames' -import { Tooltip } from '../tooltip/Tooltip' +import { Tooltip } from './Tooltip' type ResourceMeterProps = { value: number diff --git a/libs/ui/lib/settings-group/SettingsGroup.stories.tsx b/app/ui/lib/SettingsGroup.stories.tsx similarity index 100% rename from libs/ui/lib/settings-group/SettingsGroup.stories.tsx rename to app/ui/lib/SettingsGroup.stories.tsx diff --git a/libs/ui/lib/settings-group/SettingsGroup.tsx b/app/ui/lib/SettingsGroup.tsx similarity index 100% rename from libs/ui/lib/settings-group/SettingsGroup.tsx rename to app/ui/lib/SettingsGroup.tsx diff --git a/libs/ui/lib/side-modal/SideModal.stories.tsx b/app/ui/lib/SideModal.stories.tsx similarity index 91% rename from libs/ui/lib/side-modal/SideModal.stories.tsx rename to app/ui/lib/SideModal.stories.tsx index b52b7f5a39..db68546b87 100644 --- a/libs/ui/lib/side-modal/SideModal.stories.tsx +++ b/app/ui/lib/SideModal.stories.tsx @@ -7,8 +7,8 @@ */ import { useState } from 'react' -import { Button } from '../button/Button' -import { ModalLink, ModalLinks } from '../ModalLinks' +import { Button } from './Button' +import { ModalLink, ModalLinks } from './ModalLinks' import { SideModal } from './SideModal' // TODO: styling on modal mostly doesn't work diff --git a/libs/ui/lib/side-modal/SideModal.tsx b/app/ui/lib/SideModal.tsx similarity index 100% rename from libs/ui/lib/side-modal/SideModal.tsx rename to app/ui/lib/SideModal.tsx diff --git a/libs/ui/lib/skip-link/SkipLink.stories.tsx b/app/ui/lib/SkipLink.stories.tsx similarity index 100% rename from libs/ui/lib/skip-link/SkipLink.stories.tsx rename to app/ui/lib/SkipLink.stories.tsx diff --git a/libs/ui/lib/skip-link/SkipLink.tsx b/app/ui/lib/SkipLink.tsx similarity index 100% rename from libs/ui/lib/skip-link/SkipLink.tsx rename to app/ui/lib/SkipLink.tsx diff --git a/libs/ui/lib/spinner/Spinner.stories.tsx b/app/ui/lib/Spinner.stories.tsx similarity index 100% rename from libs/ui/lib/spinner/Spinner.stories.tsx rename to app/ui/lib/Spinner.stories.tsx diff --git a/libs/ui/lib/spinner/Spinner.tsx b/app/ui/lib/Spinner.tsx similarity index 100% rename from libs/ui/lib/spinner/Spinner.tsx rename to app/ui/lib/Spinner.tsx diff --git a/libs/ui/lib/table/Table.stories.tsx b/app/ui/lib/Table.stories.tsx similarity index 100% rename from libs/ui/lib/table/Table.stories.tsx rename to app/ui/lib/Table.stories.tsx diff --git a/libs/ui/lib/table/Table.tsx b/app/ui/lib/Table.tsx similarity index 100% rename from libs/ui/lib/table/Table.tsx rename to app/ui/lib/Table.tsx diff --git a/libs/ui/lib/tabs/Tabs.css b/app/ui/lib/Tabs.css similarity index 100% rename from libs/ui/lib/tabs/Tabs.css rename to app/ui/lib/Tabs.css diff --git a/libs/ui/lib/tabs/Tabs.stories.tsx b/app/ui/lib/Tabs.stories.tsx similarity index 100% rename from libs/ui/lib/tabs/Tabs.stories.tsx rename to app/ui/lib/Tabs.stories.tsx diff --git a/libs/ui/lib/tabs/Tabs.tsx b/app/ui/lib/Tabs.tsx similarity index 100% rename from libs/ui/lib/tabs/Tabs.tsx rename to app/ui/lib/Tabs.tsx diff --git a/libs/ui/lib/tag/Tag.stories.tsx b/app/ui/lib/Tag.stories.tsx similarity index 98% rename from libs/ui/lib/tag/Tag.stories.tsx rename to app/ui/lib/Tag.stories.tsx index dd55be05b9..633e9f27da 100644 --- a/libs/ui/lib/tag/Tag.stories.tsx +++ b/app/ui/lib/Tag.stories.tsx @@ -5,7 +5,7 @@ * * Copyright Oxide Computer Company */ -import { Section } from '../../util/story-section' +import { Section } from '../util/story-section' import { Tag, tagColors, type TagColor, type TagVariant } from './Tag' export const Default = () => { diff --git a/libs/ui/lib/tag/Tag.tsx b/app/ui/lib/Tag.tsx similarity index 100% rename from libs/ui/lib/tag/Tag.tsx rename to app/ui/lib/Tag.tsx diff --git a/libs/ui/lib/text-input/TextInput.stories.tsx b/app/ui/lib/TextInput.stories.tsx similarity index 100% rename from libs/ui/lib/text-input/TextInput.stories.tsx rename to app/ui/lib/TextInput.stories.tsx diff --git a/libs/ui/lib/text-input/TextInput.tsx b/app/ui/lib/TextInput.tsx similarity index 100% rename from libs/ui/lib/text-input/TextInput.tsx rename to app/ui/lib/TextInput.tsx diff --git a/libs/ui/lib/timeout-indicator/TimeoutIndicator.tsx b/app/ui/lib/TimeoutIndicator.tsx similarity index 95% rename from libs/ui/lib/timeout-indicator/TimeoutIndicator.tsx rename to app/ui/lib/TimeoutIndicator.tsx index 38ffc6278b..e88468c134 100644 --- a/libs/ui/lib/timeout-indicator/TimeoutIndicator.tsx +++ b/app/ui/lib/TimeoutIndicator.tsx @@ -8,7 +8,7 @@ import { animated, Globals, useTransition } from '@react-spring/web' import cn from 'classnames' -import useTimeout from '../hooks/use-timeout' +import useTimeout from './use-timeout' export interface TimeoutIndicatorProps { timeout: number diff --git a/libs/ui/lib/toast/Toast.stories.tsx b/app/ui/lib/Toast.stories.tsx similarity index 100% rename from libs/ui/lib/toast/Toast.stories.tsx rename to app/ui/lib/Toast.stories.tsx diff --git a/libs/ui/lib/toast/Toast.tsx b/app/ui/lib/Toast.tsx similarity index 96% rename from libs/ui/lib/toast/Toast.tsx rename to app/ui/lib/Toast.tsx index 2d013ba1c6..44119b2267 100644 --- a/libs/ui/lib/toast/Toast.tsx +++ b/app/ui/lib/Toast.tsx @@ -17,8 +17,8 @@ import { Warning12Icon, } from '@oxide/design-system/icons/react' -import { TimeoutIndicator } from '../timeout-indicator/TimeoutIndicator' -import { Truncate } from '../truncate/Truncate' +import { TimeoutIndicator } from './TimeoutIndicator' +import { Truncate } from './Truncate' type Variant = 'success' | 'error' | 'info' diff --git a/libs/ui/lib/tooltip/Tooltip.stories.tsx b/app/ui/lib/Tooltip.stories.tsx similarity index 100% rename from libs/ui/lib/tooltip/Tooltip.stories.tsx rename to app/ui/lib/Tooltip.stories.tsx diff --git a/libs/ui/lib/tooltip/Tooltip.tsx b/app/ui/lib/Tooltip.tsx similarity index 100% rename from libs/ui/lib/tooltip/Tooltip.tsx rename to app/ui/lib/Tooltip.tsx diff --git a/libs/ui/lib/truncate/Truncate.stories.tsx b/app/ui/lib/Truncate.stories.tsx similarity index 100% rename from libs/ui/lib/truncate/Truncate.stories.tsx rename to app/ui/lib/Truncate.stories.tsx diff --git a/libs/ui/lib/truncate/Truncate.tsx b/app/ui/lib/Truncate.tsx similarity index 93% rename from libs/ui/lib/truncate/Truncate.tsx rename to app/ui/lib/Truncate.tsx index 6bc0c65cda..c1b1df3d5c 100644 --- a/libs/ui/lib/truncate/Truncate.tsx +++ b/app/ui/lib/Truncate.tsx @@ -6,8 +6,8 @@ * Copyright Oxide Computer Company */ -import { CopyToClipboard } from '../copy-to-clipboard/CopyToClipboard' -import { Tooltip } from '../tooltip/Tooltip' +import { CopyToClipboard } from './CopyToClipboard' +import { Tooltip } from './Tooltip' type TruncatePosition = 'middle' | 'end' diff --git a/libs/ui/lib/__stories__/Typography.stories.tsx b/app/ui/lib/Typography.stories.tsx similarity index 96% rename from libs/ui/lib/__stories__/Typography.stories.tsx rename to app/ui/lib/Typography.stories.tsx index 92c6164d0d..126ffac93c 100644 --- a/libs/ui/lib/__stories__/Typography.stories.tsx +++ b/app/ui/lib/Typography.stories.tsx @@ -5,7 +5,7 @@ * * Copyright Oxide Computer Company */ -import { Section } from '../../util/story-section' +import { Section } from '../util/story-section' export const Default = () => ( <> diff --git a/libs/ui/lib/button/button.css b/app/ui/lib/button.css similarity index 100% rename from libs/ui/lib/button/button.css rename to app/ui/lib/button.css diff --git a/libs/ui/lib/mini-table/mini-table.css b/app/ui/lib/mini-table.css similarity index 100% rename from libs/ui/lib/mini-table/mini-table.css rename to app/ui/lib/mini-table.css diff --git a/libs/ui/lib/properties-table/properties-table.css b/app/ui/lib/properties-table.css similarity index 100% rename from libs/ui/lib/properties-table/properties-table.css rename to app/ui/lib/properties-table.css diff --git a/libs/ui/lib/side-modal/side-modal.css b/app/ui/lib/side-modal.css similarity index 100% rename from libs/ui/lib/side-modal/side-modal.css rename to app/ui/lib/side-modal.css diff --git a/libs/ui/lib/spinner/spinner.css b/app/ui/lib/spinner.css similarity index 100% rename from libs/ui/lib/spinner/spinner.css rename to app/ui/lib/spinner.css diff --git a/libs/ui/lib/table/table.css b/app/ui/lib/table.css similarity index 100% rename from libs/ui/lib/table/table.css rename to app/ui/lib/table.css diff --git a/libs/ui/lib/tooltip/tooltip.css b/app/ui/lib/tooltip.css similarity index 100% rename from libs/ui/lib/tooltip/tooltip.css rename to app/ui/lib/tooltip.css diff --git a/libs/ui/lib/hooks/use-interval.ts b/app/ui/lib/use-interval.ts similarity index 100% rename from libs/ui/lib/hooks/use-interval.ts rename to app/ui/lib/use-interval.ts diff --git a/libs/ui/lib/hooks/use-stepped-scroll.ts b/app/ui/lib/use-stepped-scroll.ts similarity index 100% rename from libs/ui/lib/hooks/use-stepped-scroll.ts rename to app/ui/lib/use-stepped-scroll.ts diff --git a/libs/ui/lib/hooks/use-timeout.ts b/app/ui/lib/use-timeout.ts similarity index 100% rename from libs/ui/lib/hooks/use-timeout.ts rename to app/ui/lib/use-timeout.ts diff --git a/libs/ui/styles/.gitignore b/app/ui/styles/.gitignore similarity index 100% rename from libs/ui/styles/.gitignore rename to app/ui/styles/.gitignore diff --git a/libs/ui/styles/components/dialog.css b/app/ui/styles/components/dialog.css similarity index 100% rename from libs/ui/styles/components/dialog.css rename to app/ui/styles/components/dialog.css diff --git a/libs/ui/styles/components/loading-bar.css b/app/ui/styles/components/loading-bar.css similarity index 100% rename from libs/ui/styles/components/loading-bar.css rename to app/ui/styles/components/loading-bar.css diff --git a/libs/ui/styles/components/menu-button.css b/app/ui/styles/components/menu-button.css similarity index 100% rename from libs/ui/styles/components/menu-button.css rename to app/ui/styles/components/menu-button.css diff --git a/libs/ui/styles/components/menu-list.css b/app/ui/styles/components/menu-list.css similarity index 100% rename from libs/ui/styles/components/menu-list.css rename to app/ui/styles/components/menu-list.css diff --git a/libs/ui/styles/fonts.css b/app/ui/styles/fonts.css similarity index 100% rename from libs/ui/styles/fonts.css rename to app/ui/styles/fonts.css diff --git a/libs/ui/styles/index.css b/app/ui/styles/index.css similarity index 100% rename from libs/ui/styles/index.css rename to app/ui/styles/index.css diff --git a/libs/ui/styles/themes/selection.css b/app/ui/styles/themes/selection.css similarity index 100% rename from libs/ui/styles/themes/selection.css rename to app/ui/styles/themes/selection.css diff --git a/libs/ui/util/aria.ts b/app/ui/util/aria.ts similarity index 100% rename from libs/ui/util/aria.ts rename to app/ui/util/aria.ts diff --git a/libs/ui/util/keys.ts b/app/ui/util/keys.ts similarity index 100% rename from libs/ui/util/keys.ts rename to app/ui/util/keys.ts diff --git a/libs/ui/util/story-section.tsx b/app/ui/util/story-section.tsx similarity index 100% rename from libs/ui/util/story-section.tsx rename to app/ui/util/story-section.tsx diff --git a/libs/ui/util/wrap.tsx b/app/ui/util/wrap.tsx similarity index 100% rename from libs/ui/util/wrap.tsx rename to app/ui/util/wrap.tsx diff --git a/libs/ui/index.ts b/libs/ui/index.ts deleted file mode 100644 index 831b2de4af..0000000000 --- a/libs/ui/index.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * Copyright Oxide Computer Company - */ -import useInterval from './lib/hooks/use-interval' -import useTimeout from './lib/hooks/use-timeout' - -import './styles/index.css' - -export { useInterval, useTimeout } - -export * from './lib/action-menu/ActionMenu' -export * from './lib/auth-code/AuthCodeInput' -export * from './lib/badge/Badge' -export * from './lib/button/Button' -export * from './lib/checkbox/Checkbox' -export * from './lib/copy-to-clipboard/CopyToClipboard' -export * from './lib/date-picker/DateRangePicker' -export * from './lib/divider/Divider' -export * from './lib/dropdown-menu/DropdownMenu' -export * from './lib/file-input/FileInput' -export * from './lib/empty-message/EmptyMessage' -export * from './lib/field-label/FieldLabel' - -export * from './lib/identicon/Identicon' -export * from './lib/message/Message' -export * from './lib/listbox/Listbox' -export * from './lib/message/Message' -export * from './lib/modal/Modal' -export * from './lib/ModalLinks' -export * as MiniTable from './lib/mini-table/MiniTable' -export * from './lib/number-input/NumberInput' -export * from './lib/page-header/PageHeader' -export * from './lib/pagination/Pagination' -export * from './lib/progress/Progress' -export * from './lib/properties-table/PropertiesTable' -export * from './lib/radio-group/RadioGroup' -export * from './lib/radio/Radio' -export * from './lib/resource-meter/ResourceMeter' -export * from './lib/settings-group/SettingsGroup' -export * from './lib/side-modal/SideModal' -export * from './lib/skip-link/SkipLink' -export * from './lib/spinner/Spinner' -export * from './lib/table/Table' -export * from './lib/tabs/Tabs' -export * from './lib/text-input/TextInput' -export * from './lib/toast/Toast' -export * from './lib/tooltip/Tooltip' -export * from './lib/truncate/Truncate' -export * from './util/wrap' - -export * from '@oxide/design-system/icons/react' diff --git a/tsconfig.json b/tsconfig.json index 69b8fc99bd..c5694b3a54 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,7 +17,7 @@ "@oxide/gen/*": ["libs/api/__generated__/*"], "@oxide/api": ["libs/api/index.ts"], "@oxide/api-mocks": ["libs/api-mocks/index.ts"], - "@oxide/ui": ["libs/ui/index.ts"], + "@oxide/ui": ["app/ui/index.ts"], "@oxide/util": ["libs/util/index.ts"], "@oxide/table": ["app/table/index.ts"] },