Skip to content

chore: un-nest components #1090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2022
Merged

chore: un-nest components #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions site/src/AppRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react"
import { Route, Routes } from "react-router-dom"
import { AuthAndFrame } from "./components/AuthAndFrame/AuthAndFrame"
import { RequireAuth } from "./components/Page/RequireAuth"
import { PreferencesLayout } from "./components/Preferences/Layout"
import { PreferencesLayout } from "./components/PreferencesLayout/PreferencesLayout"
import { RequireAuth } from "./components/RequireAuth/RequireAuth"
import { IndexPage } from "./pages"
import { NotFoundPage } from "./pages/404Page/404Page"
import { CliAuthenticationPage } from "./pages/CliAuthPage/CliAuthPage"
Expand Down
2 changes: 1 addition & 1 deletion site/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from "react"
import { BrowserRouter as Router } from "react-router-dom"
import { SWRConfig } from "swr"
import { AppRouter } from "./AppRouter"
import { GlobalSnackbar } from "./components/Snackbar/GlobalSnackbar"
import { GlobalSnackbar } from "./components/GlobalSnackbar/GlobalSnackbar"
import { light } from "./theme"
import "./theme/globalFonts"
import { XServiceProvider } from "./xServices/StateContext"
Expand Down
4 changes: 2 additions & 2 deletions site/src/components/AuthAndFrame/AuthAndFrame.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react"
import { Footer } from "../Footer/Footer"
import { Navbar } from "../Navbar/Navbar"
import { Footer } from "../Page/Footer"
import { RequireAuth } from "../Page/RequireAuth"
import { RequireAuth } from "../RequireAuth/RequireAuth"

interface AuthAndFrameProps {
children: JSX.Element
Expand Down
0 ...omponents/SignIn/CliAuthToken.stories.tsx → ...nts/CliAuthToken/CliAuthToken.stories.tsx
View file
Open in desktop
File renamed without changes.
0 ...c/components/SignIn/CliAuthToken.test.tsx → ...onents/CliAuthToken/CliAuthToken.test.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/SignIn/CliAuthToken.tsx → .../components/CliAuthToken/CliAuthToken.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion site/src/components/CodeExample/CodeExample.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { makeStyles } from "@material-ui/core/styles"
import React from "react"
import { MONOSPACE_FONT_FAMILY } from "../../theme/constants"
import { CopyButton } from "../Button/CopyButton"
import { CopyButton } from "../CopyButton/CopyButton"

export interface CodeExampleProps {
code: string
Expand Down
0 site/src/components/Button/CopyButton.tsx → .../src/components/CopyButton/CopyButton.tsx
View file
Open in desktop
File renamed without changes.
0 ...s/Snackbar/EnterpriseSnackbar.stories.tsx → ...seSnackbar/EnterpriseSnackbar.stories.tsx
View file
Open in desktop
File renamed without changes.
0 ...omponents/Snackbar/EnterpriseSnackbar.tsx → ...EnterpriseSnackbar/EnterpriseSnackbar.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/Page/Footer.test.tsx → site/src/components/Footer/Footer.test.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/Page/Footer.tsx → site/src/components/Footer/Footer.tsx
View file
Open in desktop
File renamed without changes.
0 ...mponents/Form/FormCloseButton.stories.tsx → ...rmCloseButton/FormCloseButton.stories.tsx
View file
Open in desktop
File renamed without changes.
0 .../components/Form/FormCloseButton.test.tsx → .../FormCloseButton/FormCloseButton.test.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/Form/FormCloseButton.tsx → ...nents/FormCloseButton/FormCloseButton.tsx
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...src/components/Form/FormDropdownField.tsx → ...s/FormDropdownField/FormDropdownField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ import MenuItem from "@material-ui/core/MenuItem"
import { makeStyles } from "@material-ui/core/styles"
import Typography from "@material-ui/core/Typography"
import React from "react"
import { FormTextField, FormTextFieldProps } from "./FormTextField"
import { FormTextField, FormTextFieldProps } from "../FormTextField/FormTextField"

export interface DropdownItem {
export interface FormDropdownItem {
value: string
name: string
description?: string
}

export interface FormDropdownFieldProps<T> extends FormTextFieldProps<T> {
items: DropdownItem[]
items: FormDropdownItem[]
}

export const FormDropdownField = <T,>({ items, ...props }: FormDropdownFieldProps<T>): React.ReactElement => {
const styles = useStyles()
return (
<FormTextField select {...props}>
{items.map((item: DropdownItem) => (
{items.map((item: FormDropdownItem) => (
<MenuItem key={item.value} value={item.value}>
<Box alignItems="center" display="flex">
<Box ml={1}>
Expand Down
0 site/src/components/Form/FormSection.tsx → ...rc/components/FormSection/FormSection.tsx
View file
Open in desktop
File renamed without changes.
0 ...rc/components/Form/FormTextField.test.tsx → ...ents/FormTextField/FormTextField.test.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion site/src/components/Form/FormTextField.tsx → ...omponents/FormTextField/FormTextField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import TextField, { TextFieldProps } from "@material-ui/core/TextField"
import { FormikContextType } from "formik"
import React from "react"
import { PasswordField } from "./PasswordField"
import { PasswordField } from "../PasswordField/PasswordField"

/**
* FormFieldProps are required props for creating form fields using a factory.
Expand Down
0 site/src/components/Form/FormTitle.tsx → site/src/components/FormTitle/FormTitle.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rc/components/Snackbar/GlobalSnackbar.tsx → ...ponents/GlobalSnackbar/GlobalSnackbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { makeStyles } from "@material-ui/core/styles"
import React, { useCallback, useState } from "react"
import { useCustomEvent } from "../../hooks/events"
import { CustomEventListener } from "../../util/events"
import { EnterpriseSnackbar } from "../EnterpriseSnackbar/EnterpriseSnackbar"
import { ErrorIcon } from "../Icons/ErrorIcon"
import { Typography } from "../Typography/Typography"
import { EnterpriseSnackbar } from "./EnterpriseSnackbar"
import {
AdditionalMessage,
isNotificationList,
Expand Down
0 site/src/components/Snackbar/utils.test.ts → ...c/components/GlobalSnackbar/utils.test.ts
View file
Open in desktop
File renamed without changes.
0 site/src/components/Snackbar/utils.ts → site/src/components/GlobalSnackbar/utils.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion site/src/components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Box from "@material-ui/core/Box"
import { makeStyles } from "@material-ui/core/styles"
import Typography from "@material-ui/core/Typography"
import React from "react"
import { HeaderButton } from "./HeaderButton"
import { HeaderButton } from "../HeaderButton/HeaderButton"

export interface HeaderAction {
readonly text: string
Expand Down
0 site/src/components/Header/HeaderButton.tsx → .../components/HeaderButton/HeaderButton.tsx
View file
Open in desktop
File renamed without changes.
0 ...mponents/Button/LoadingButton.stories.tsx → ...s/LoadingButton/LoadingButton.stories.tsx
View file
Open in desktop
File renamed without changes.
0 .../components/Button/LoadingButton.test.tsx → ...ents/LoadingButton/LoadingButton.test.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/Button/LoadingButton.tsx → ...omponents/LoadingButton/LoadingButton.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion site/src/components/Navbar/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useActor } from "@xstate/react"
import React, { useContext } from "react"
import { XServiceContext } from "../../xServices/StateContext"
import { NavbarView } from "./NavbarView/NavbarView"
import { NavbarView } from "../NavbarView/NavbarView"

export const Navbar: React.FC = () => {
const xServices = useContext(XServiceContext)
Expand Down
0 .../Navbar/NavbarView/NavbarView.stories.tsx → ...ponents/NavbarView/NavbarView.stories.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...nts/Navbar/NavbarView/NavbarView.test.tsx → ...components/NavbarView/NavbarView.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { screen } from "@testing-library/react"
import React from "react"
import { render } from "../../../testHelpers"
import { MockUser } from "../../../testHelpers/entities"
import { render } from "../../testHelpers"
import { MockUser } from "../../testHelpers/entities"
import { NavbarView } from "./NavbarView"

describe("NavbarView", () => {
Expand Down
8 changes: 4 additions & 4 deletions ...mponents/Navbar/NavbarView/NavbarView.tsx → .../src/components/NavbarView/NavbarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import ListItem from "@material-ui/core/ListItem"
import { fade, makeStyles } from "@material-ui/core/styles"
import React from "react"
import { NavLink } from "react-router-dom"
import { UserResponse } from "../../../api/types"
import { navHeight } from "../../../theme/constants"
import { AdminDropdown } from "../../AdminDropdown/AdminDropdown"
import { Logo } from "../../Icons/Logo"
import { UserResponse } from "../../api/types"
import { navHeight } from "../../theme/constants"
import { AdminDropdown } from "../AdminDropdown/AdminDropdown"
import { Logo } from "../Icons/Logo"
import { UserDropdown } from "../UserDropdown/UsersDropdown"

export interface NavbarViewProps {
Expand Down
0 ...rc/components/Form/PasswordField.test.tsx → ...ents/PasswordField/PasswordField.test.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/Form/PasswordField.tsx → ...omponents/PasswordField/PasswordField.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rc/components/Preferences/AccountForm.tsx → ...cesAccountForm/PreferencesAccountForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import TextField from "@material-ui/core/TextField"
import { FormikContextType, FormikErrors, useFormik } from "formik"
import React from "react"
import * as Yup from "yup"
import { getFormHelpers, onChangeTrimmed } from "../Form/utils"
import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
import { LoadingButton } from "../LoadingButton/LoadingButton"
import { Stack } from "../Stack/Stack"
import { LoadingButton } from "./../Button/LoadingButton"

interface AccountFormValues {
name: string
Expand Down
0 site/src/components/Preferences/Layout.tsx → ...s/PreferencesLayout/PreferencesLayout.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/Page/RequireAuth.tsx → ...rc/components/RequireAuth/RequireAuth.tsx
View file
Open in desktop
File renamed without changes.
0 ...omponents/Section/SectionView.stories.tsx → ...rc/components/Section/Section.stories.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion site/src/components/Section/Section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeStyles } from "@material-ui/core/styles"
import { fade } from "@material-ui/core/styles/colorManipulator"
import Typography from "@material-ui/core/Typography"
import React from "react"
import { SectionAction } from "./Action"
import { SectionAction } from "../SectionAction/SectionAction"

type SectionLayout = "fixed" | "fluid"

Expand Down
0 site/src/components/Section/Action.tsx → ...omponents/SectionAction/SectionAction.tsx
View file
Open in desktop
File renamed without changes.
0 .../components/SignIn/SignInForm.stories.tsx → ...ponents/SignInForm/SignInForm.stories.tsx
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions site/src/components/SignIn/SignInForm.tsx → .../src/components/SignInForm/SignInForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import TextField from "@material-ui/core/TextField"
import { FormikContextType, useFormik } from "formik"
import React from "react"
import * as Yup from "yup"
import { getFormHelpers, onChangeTrimmed } from "../Form/utils"
import { LoadingButton } from "./../Button/LoadingButton"
import { Welcome } from "./Welcome"
import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
import { Welcome } from "../Welcome/Welcome"
import { LoadingButton } from "./../LoadingButton/LoadingButton"

/**
* BuiltInAuthFormValues describes a form using built-in (email/password)
Expand Down
0 ...rc/components/Button/SplitButton.test.tsx → ...mponents/SplitButton/SplitButton.test.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/Button/SplitButton.tsx → ...rc/components/SplitButton/SplitButton.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion site/src/components/TabPanel/TabPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { makeStyles } from "@material-ui/core/styles"
import { fade } from "@material-ui/core/styles/colorManipulator"
import React from "react"
import { TabSidebar, TabSidebarItem } from "./TabSidebar"
import { TabSidebar, TabSidebarItem } from "../TabSidebar/TabSidebar"

export type AdminMenuItemCallback = (menuItem: string) => void

Expand Down
0 ...omponents/TabPanel/TabSidebar.stories.tsx → ...ponents/TabSidebar/TabSidebar.stories.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/TabPanel/TabSidebar.tsx → .../src/components/TabSidebar/TabSidebar.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions site/src/components/Table/Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import TableCell from "@material-ui/core/TableCell"
import TableHead from "@material-ui/core/TableHead"
import TableRow from "@material-ui/core/TableRow"
import React from "react"
import { TableHeaders } from "./TableHeaders"
import { TableTitle } from "./TableTitle"
import { TableHeaders } from "../TableHeaders/TableHeaders"
import { TableTitle } from "../TableTitle/TableTitle"

export interface Column<T> {
/**
Expand Down
0 site/src/components/Table/TableHeaders.tsx → .../components/TableHeaders/TableHeaders.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/Table/TableTitle.tsx → .../src/components/TableTitle/TableTitle.tsx
View file
Open in desktop
File renamed without changes.
0 site/src/components/User/UserAvatar.tsx → .../src/components/UserAvatar/UserAvatar.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...mponents/Table/Cells/UserCell.stories.tsx → .../components/UserCell/UserCell.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ComponentMeta, Story } from "@storybook/react"
import React from "react"
import { MockUser, MockUserAgent } from "../../../testHelpers"
import { MockUser, MockUserAgent } from "../../testHelpers"
import { UserCell, UserCellProps } from "./UserCell"

export default {
Expand Down
2 changes: 1 addition & 1 deletion .../components/Table/Cells/UserCell.test.tsx → ...src/components/UserCell/UserCell.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { fireEvent, render, screen } from "@testing-library/react"
import React from "react"
import { MockUser, MockUserAgent, WrapperComponent } from "../../../testHelpers"
import { MockUser, MockUserAgent, WrapperComponent } from "../../testHelpers"
import { UserCell, UserCellProps } from "./UserCell"

namespace Helpers {
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/Table/Cells/UserCell.tsx → site/src/components/UserCell/UserCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Link from "@material-ui/core/Link"
import { makeStyles } from "@material-ui/core/styles"
import Typography from "@material-ui/core/Typography"
import React from "react"
import { UserAvatar, UserAvatarProps } from "../../User/UserAvatar"
import { UserAvatar, UserAvatarProps } from "../UserAvatar/UserAvatar"

export interface UserCellProps {
Avatar: UserAvatarProps
Expand Down
0 ...bar/UserDropdown/UserDropdown.stories.tsx → ...nts/UserDropdown/UserDropdown.stories.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...Navbar/UserDropdown/UserDropdown.test.tsx → ...onents/UserDropdown/UserDropdown.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { screen } from "@testing-library/react"
import React from "react"
import { render } from "../../../testHelpers"
import { MockUser } from "../../../testHelpers/entities"
import { render } from "../../testHelpers"
import { MockUser } from "../../testHelpers/entities"
import { Language, UserDropdown, UserDropdownProps } from "./UsersDropdown"

const renderAndClick = async (props: Partial<UserDropdownProps> = {}) => {
Expand Down
14 changes: 7 additions & 7 deletions ...nts/Navbar/UserDropdown/UsersDropdown.tsx → ...components/UserDropdown/UsersDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import { fade, makeStyles } from "@material-ui/core/styles"
import AccountIcon from "@material-ui/icons/AccountCircleOutlined"
import React, { useState } from "react"
import { Link } from "react-router-dom"
import { UserResponse } from "../../../api/types"
import { BorderedMenu } from "../../BorderedMenu/BorderedMenu"
import { CloseDropdown, OpenDropdown } from "../../DropdownArrows/DropdownArrows"
import { DocsIcon } from "../../Icons/DocsIcon"
import { LogoutIcon } from "../../Icons/LogoutIcon"
import { UserAvatar } from "../../User/UserAvatar"
import { UserProfileCard } from "../../User/UserProfileCard"
import { UserResponse } from "../../api/types"
import { BorderedMenu } from "../BorderedMenu/BorderedMenu"
import { CloseDropdown, OpenDropdown } from "../DropdownArrows/DropdownArrows"
import { DocsIcon } from "../Icons/DocsIcon"
import { LogoutIcon } from "../Icons/LogoutIcon"
import { UserAvatar } from "../UserAvatar/UserAvatar"
import { UserProfileCard } from "../UserProfileCard/UserProfileCard"

export const Language = {
accountLabel: "Account",
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/User/UserProfileCard.tsx → ...nents/UserProfileCard/UserProfileCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeStyles } from "@material-ui/core/styles"
import Typography from "@material-ui/core/Typography"
import React from "react"
import { UserResponse } from "../../api/types"
import { UserAvatar } from "./UserAvatar"
import { UserAvatar } from "../UserAvatar/UserAvatar"

interface UserProfileCardProps {
user: UserResponse
Expand Down
4 changes: 2 additions & 2 deletions site/src/components/UsersTable/UsersTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react"
import { UserResponse } from "../../api/types"
import { Column, Table } from "../../components/Table/Table"
import { EmptyState } from "../EmptyState/EmptyState"
import { UserCell } from "../Table/Cells/UserCell"
import { Column, Table } from "../Table/Table"
import { UserCell } from "../UserCell/UserCell"

const Language = {
pageTitle: "Users",
Expand Down
0 site/src/components/SignIn/Welcome.tsx → site/src/components/Welcome/Welcome.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions site/src/components/Workspace/Workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import CloudCircleIcon from "@material-ui/icons/CloudCircle"
import React from "react"
import { Link } from "react-router-dom"
import * as Types from "../../api/types"
import { WorkspaceSchedule } from "../WorkspaceSchedule/WorkspaceSchedule"
import { WorkspaceSection } from "../WorkspaceSection/WorkspaceSection"
import * as Constants from "./constants"
import { WorkspaceSchedule } from "./WorkspaceSchedule"
import { WorkspaceSection } from "./WorkspaceSection"

export interface WorkspaceProps {
organization: Types.Organization
Expand Down
0 ...s/Workspace/WorkspaceSchedule.stories.tsx → ...aceSchedule/WorkspaceSchedule.stories.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...omponents/Workspace/WorkspaceSchedule.tsx → ...s/WorkspaceSchedule/WorkspaceSchedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Typography from "@material-ui/core/Typography"
import cronstrue from "cronstrue"
import React from "react"
import { extractTimezone, stripTimezone } from "../../util/schedule"
import { WorkspaceSection } from "./WorkspaceSection"
import { WorkspaceSection } from "../WorkspaceSection/WorkspaceSection"

const Language = {
autoStartLabel: (schedule: string): string => {
Expand Down
2 changes: 1 addition & 1 deletion ...components/Workspace/WorkspaceSection.tsx → ...nts/WorkspaceSection/WorkspaceSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Paper from "@material-ui/core/Paper"
import { makeStyles } from "@material-ui/core/styles"
import Typography from "@material-ui/core/Typography"
import React from "react"
import { CardPadding, CardRadius } from "./constants"
import { CardPadding, CardRadius } from "../Workspace/constants"

export interface WorkspaceSectionProps {
title: string
Expand Down
16 changes: 8 additions & 8 deletions site/src/forms/CreateTemplateForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import { FormikContextType, useFormik } from "formik"
import React from "react"
import * as Yup from "yup"
import { CreateTemplateRequest, Organization, Provisioner, Template } from "../api/types"
import { LoadingButton } from "../components/Button/LoadingButton"
import { FormCloseButton } from "../components/Form/FormCloseButton"
import { DropdownItem, FormDropdownField } from "../components/Form/FormDropdownField"
import { FormSection } from "../components/Form/FormSection"
import { FormTextField } from "../components/Form/FormTextField"
import { FormTitle } from "../components/Form/FormTitle"
import { FormCloseButton } from "../components/FormCloseButton/FormCloseButton"
import { FormDropdownField, FormDropdownItem } from "../components/FormDropdownField/FormDropdownField"
import { FormSection } from "../components/FormSection/FormSection"
import { FormTextField } from "../components/FormTextField/FormTextField"
import { FormTitle } from "../components/FormTitle/FormTitle"
import { LoadingButton } from "../components/LoadingButton/LoadingButton"

export interface CreateTemplateFormProps {
provisioners: Provisioner[]
Expand Down Expand Up @@ -45,14 +45,14 @@ export const CreateTemplateForm: React.FC<CreateTemplateFormProps> = ({
},
})

const organizationDropDownItems: DropdownItem[] = organizations.map((org) => {
const organizationDropDownItems: FormDropdownItem[] = organizations.map((org) => {
return {
value: org.name,
name: org.name,
}
})

const provisionerDropDownItems: DropdownItem[] = provisioners.map((provisioner) => {
const provisionerDropDownItems: FormDropdownItem[] = provisioners.map((provisioner) => {
return {
value: provisioner.id,
name: provisioner.name,
Expand Down
10 changes: 5 additions & 5 deletions site/src/forms/CreateWorkspaceForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { FormikContextType, useFormik } from "formik"
import React from "react"
import * as Yup from "yup"
import { CreateWorkspaceRequest, Template, Workspace } from "../api/types"
import { LoadingButton } from "../components/Button/LoadingButton"
import { FormCloseButton } from "../components/Form/FormCloseButton"
import { FormSection } from "../components/Form/FormSection"
import { FormTextField } from "../components/Form/FormTextField"
import { FormTitle } from "../components/Form/FormTitle"
import { FormCloseButton } from "../components/FormCloseButton/FormCloseButton"
import { FormSection } from "../components/FormSection/FormSection"
import { FormTextField } from "../components/FormTextField/FormTextField"
import { FormTitle } from "../components/FormTitle/FormTitle"
import { LoadingButton } from "../components/LoadingButton/LoadingButton"

export interface CreateWorkspaceForm {
template: Template
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/CliAuthPage/CliAuthPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { makeStyles } from "@material-ui/core/styles"
import { useActor } from "@xstate/react"
import React, { useContext, useEffect, useState } from "react"
import { getApiKey } from "../../api"
import { CliAuthToken } from "../../components/CliAuthToken/CliAuthToken"
import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
import { CliAuthToken } from "../../components/SignIn/CliAuthToken"
import { XServiceContext } from "../../xServices/StateContext"

export const CliAuthenticationPage: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/LoginPage/LoginPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { act, screen } from "@testing-library/react"
import userEvent from "@testing-library/user-event"
import { rest } from "msw"
import React from "react"
import { Language } from "../../components/SignIn/SignInForm"
import { Language } from "../../components/SignInForm/SignInForm"
import { history, render } from "../../testHelpers"
import { server } from "../../testHelpers/server"
import { LoginPage } from "./LoginPage"
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { makeStyles } from "@material-ui/core/styles"
import { useActor } from "@xstate/react"
import React, { useContext } from "react"
import { Navigate, useLocation } from "react-router-dom"
import { Footer } from "../../components/Page/Footer"
import { SignInForm } from "../../components/SignIn/SignInForm"
import { Footer } from "../../components/Footer/Footer"
import { SignInForm } from "../../components/SignInForm/SignInForm"
import { retrieveRedirect } from "../../util/redirect"
import { XServiceContext } from "../../xServices/StateContext"

Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/PreferencesPages/AccountPage/AccountPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { fireEvent, screen, waitFor } from "@testing-library/react"
import React from "react"
import * as API from "../../../api"
import * as AccountForm from "../../../components/Preferences/AccountForm"
import { GlobalSnackbar } from "../../../components/Snackbar/GlobalSnackbar"
import { GlobalSnackbar } from "../../../components/GlobalSnackbar/GlobalSnackbar"
import * as AccountForm from "../../../components/PreferencesAccountForm/PreferencesAccountForm"
import { renderWithAuth } from "../../../testHelpers"
import * as AuthXService from "../../../xServices/auth/authXService"
import { AccountPage, Language } from "./AccountPage"
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/PreferencesPages/AccountPage/AccountPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useActor } from "@xstate/react"
import React, { useContext } from "react"
import { isApiError, mapApiErrorToFieldErrors } from "../../../api/errors"
import { AccountForm } from "../../../components/Preferences/AccountForm"
import { AccountForm } from "../../../components/PreferencesAccountForm/PreferencesAccountForm"
import { Section } from "../../../components/Section/Section"
import { XServiceContext } from "../../../xServices/StateContext"

Expand Down
Loading