From 76793e0c21c565b20f7e1263a0a522998b93343c Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Tue, 15 Mar 2022 18:43:51 +0000 Subject: [PATCH 1/3] refactor: Move core site source code into 'src' folder --- site/.storybook/preview.js | 2 +- site/{ => src}/Main.tsx | 0 site/{ => src}/api.ts | 0 site/{ => src}/app.tsx | 0 site/{ => src}/components/Button/CopyButton.tsx | 0 site/{ => src}/components/Button/LoadingButton.stories.tsx | 0 site/{ => src}/components/Button/LoadingButton.test.tsx | 0 site/{ => src}/components/Button/LoadingButton.tsx | 0 site/{ => src}/components/Button/SplitButton.test.tsx | 0 site/{ => src}/components/Button/SplitButton.tsx | 0 site/{ => src}/components/Button/index.ts | 0 site/{ => src}/components/CodeBlock/index.stories.tsx | 0 site/{ => src}/components/CodeBlock/index.test.tsx | 0 site/{ => src}/components/CodeBlock/index.tsx | 0 site/{ => src}/components/CodeExample/CodeExample.stories.tsx | 0 site/{ => src}/components/CodeExample/CodeExample.test.tsx | 0 site/{ => src}/components/CodeExample/CodeExample.tsx | 0 site/{ => src}/components/CodeExample/index.ts | 0 site/{ => src}/components/EmptyState/index.test.tsx | 0 site/{ => src}/components/EmptyState/index.tsx | 0 site/{ => src}/components/ErrorSummary/index.test.tsx | 0 site/{ => src}/components/ErrorSummary/index.tsx | 0 site/{ => src}/components/Form/FormCloseButton.stories.tsx | 0 site/{ => src}/components/Form/FormCloseButton.test.tsx | 0 site/{ => src}/components/Form/FormCloseButton.tsx | 0 site/{ => src}/components/Form/FormDropdownField.tsx | 0 site/{ => src}/components/Form/FormSection.tsx | 0 site/{ => src}/components/Form/FormTextField.test.tsx | 0 site/{ => src}/components/Form/FormTextField.tsx | 0 site/{ => src}/components/Form/FormTitle.tsx | 0 site/{ => src}/components/Form/PasswordField.test.tsx | 0 site/{ => src}/components/Form/PasswordField.tsx | 0 site/{ => src}/components/Form/index.ts | 0 site/{ => src}/components/Header/HeaderButton.tsx | 0 site/{ => src}/components/Header/index.test.tsx | 0 site/{ => src}/components/Header/index.tsx | 0 site/{ => src}/components/Icons/Close.tsx | 0 site/{ => src}/components/Icons/CoderIcon.tsx | 0 site/{ => src}/components/Icons/FileCopy.tsx | 0 site/{ => src}/components/Icons/Logo.tsx | 0 site/{ => src}/components/Icons/Logout.tsx | 0 site/{ => src}/components/Icons/WorkspacesIcon.tsx | 0 site/{ => src}/components/Icons/index.test.tsx | 0 site/{ => src}/components/Icons/index.ts | 0 site/{ => src}/components/Loader/FullScreenLoader.test.tsx | 0 site/{ => src}/components/Loader/FullScreenLoader.tsx | 0 site/{ => src}/components/Navbar/BorderedMenu.tsx | 0 site/{ => src}/components/Navbar/UserDropdown.tsx | 0 site/{ => src}/components/Navbar/index.test.tsx | 0 site/{ => src}/components/Navbar/index.tsx | 0 site/{ => src}/components/Page/Footer.test.tsx | 0 site/{ => src}/components/Page/Footer.tsx | 0 site/{ => src}/components/Page/index.tsx | 0 site/{ => src}/components/SignIn/CliAuthToken.stories.tsx | 0 site/{ => src}/components/SignIn/CliAuthToken.test.tsx | 0 site/{ => src}/components/SignIn/CliAuthToken.tsx | 0 site/{ => src}/components/SignIn/SignInForm.stories.tsx | 0 site/{ => src}/components/SignIn/SignInForm.test.tsx | 0 site/{ => src}/components/SignIn/SignInForm.tsx | 4 ++-- site/{ => src}/components/SignIn/Welcome.tsx | 0 site/{ => src}/components/SignIn/index.tsx | 0 site/{ => src}/components/Table/Table.test.tsx | 0 site/{ => src}/components/Table/Table.tsx | 0 site/{ => src}/components/Table/TableHeaders.tsx | 0 site/{ => src}/components/Table/TableTitle.tsx | 0 site/{ => src}/components/Table/index.tsx | 0 site/{ => src}/components/User/UserAvatar.tsx | 0 site/{ => src}/components/User/UserProfileCard.tsx | 0 site/{ => src}/components/User/index.ts | 0 site/{ => src}/components/Workspace/Workspace.stories.tsx | 0 site/{ => src}/components/Workspace/Workspace.test.tsx | 0 site/{ => src}/components/Workspace/Workspace.tsx | 0 site/{ => src}/components/Workspace/WorkspaceSection.tsx | 0 site/{ => src}/components/Workspace/constants.ts | 0 site/{ => src}/components/Workspace/index.ts | 0 site/{ => src}/components/index.tsx | 0 site/{ => src}/contexts/UserContext.test.tsx | 0 site/{ => src}/contexts/UserContext.tsx | 0 site/{ => src}/forms/CreateProjectForm.test.tsx | 0 site/{ => src}/forms/CreateProjectForm.tsx | 2 +- site/{ => src}/forms/CreateWorkspaceForm.test.tsx | 0 site/{ => src}/forms/CreateWorkspaceForm.tsx | 0 site/{ => src}/pages/404.tsx | 0 site/{ => src}/pages/cli-auth.tsx | 0 site/{ => src}/pages/index.tsx | 0 site/{ => src}/pages/login.tsx | 2 +- .../pages/projects/[organization]/[project]/create.tsx | 0 .../pages/projects/[organization]/[project]/index.tsx | 0 site/{ => src}/pages/projects/index.tsx | 2 +- site/{ => src}/pages/workspaces/[workspace].tsx | 0 site/{ => src}/test_helpers/index.tsx | 0 site/{ => src}/test_helpers/mocks.ts | 0 site/{ => src}/theme/constants.ts | 0 site/{ => src}/theme/index.ts | 0 site/{ => src}/theme/palettes.ts | 0 site/{ => src}/theme/theme.tsx | 0 site/{ => src}/theme/typography.ts | 0 site/{ => src}/util/array.test.ts | 0 site/{ => src}/util/array.ts | 0 site/{ => src}/util/index.ts | 0 site/{ => src}/util/swr.ts | 0 site/webpack.common.ts | 2 +- 102 files changed, 7 insertions(+), 7 deletions(-) rename site/{ => src}/Main.tsx (100%) rename site/{ => src}/api.ts (100%) rename site/{ => src}/app.tsx (100%) rename site/{ => src}/components/Button/CopyButton.tsx (100%) rename site/{ => src}/components/Button/LoadingButton.stories.tsx (100%) rename site/{ => src}/components/Button/LoadingButton.test.tsx (100%) rename site/{ => src}/components/Button/LoadingButton.tsx (100%) rename site/{ => src}/components/Button/SplitButton.test.tsx (100%) rename site/{ => src}/components/Button/SplitButton.tsx (100%) rename site/{ => src}/components/Button/index.ts (100%) rename site/{ => src}/components/CodeBlock/index.stories.tsx (100%) rename site/{ => src}/components/CodeBlock/index.test.tsx (100%) rename site/{ => src}/components/CodeBlock/index.tsx (100%) rename site/{ => src}/components/CodeExample/CodeExample.stories.tsx (100%) rename site/{ => src}/components/CodeExample/CodeExample.test.tsx (100%) rename site/{ => src}/components/CodeExample/CodeExample.tsx (100%) rename site/{ => src}/components/CodeExample/index.ts (100%) rename site/{ => src}/components/EmptyState/index.test.tsx (100%) rename site/{ => src}/components/EmptyState/index.tsx (100%) rename site/{ => src}/components/ErrorSummary/index.test.tsx (100%) rename site/{ => src}/components/ErrorSummary/index.tsx (100%) rename site/{ => src}/components/Form/FormCloseButton.stories.tsx (100%) rename site/{ => src}/components/Form/FormCloseButton.test.tsx (100%) rename site/{ => src}/components/Form/FormCloseButton.tsx (100%) rename site/{ => src}/components/Form/FormDropdownField.tsx (100%) rename site/{ => src}/components/Form/FormSection.tsx (100%) rename site/{ => src}/components/Form/FormTextField.test.tsx (100%) rename site/{ => src}/components/Form/FormTextField.tsx (100%) rename site/{ => src}/components/Form/FormTitle.tsx (100%) rename site/{ => src}/components/Form/PasswordField.test.tsx (100%) rename site/{ => src}/components/Form/PasswordField.tsx (100%) rename site/{ => src}/components/Form/index.ts (100%) rename site/{ => src}/components/Header/HeaderButton.tsx (100%) rename site/{ => src}/components/Header/index.test.tsx (100%) rename site/{ => src}/components/Header/index.tsx (100%) rename site/{ => src}/components/Icons/Close.tsx (100%) rename site/{ => src}/components/Icons/CoderIcon.tsx (100%) rename site/{ => src}/components/Icons/FileCopy.tsx (100%) rename site/{ => src}/components/Icons/Logo.tsx (100%) rename site/{ => src}/components/Icons/Logout.tsx (100%) rename site/{ => src}/components/Icons/WorkspacesIcon.tsx (100%) rename site/{ => src}/components/Icons/index.test.tsx (100%) rename site/{ => src}/components/Icons/index.ts (100%) rename site/{ => src}/components/Loader/FullScreenLoader.test.tsx (100%) rename site/{ => src}/components/Loader/FullScreenLoader.tsx (100%) rename site/{ => src}/components/Navbar/BorderedMenu.tsx (100%) rename site/{ => src}/components/Navbar/UserDropdown.tsx (100%) rename site/{ => src}/components/Navbar/index.test.tsx (100%) rename site/{ => src}/components/Navbar/index.tsx (100%) rename site/{ => src}/components/Page/Footer.test.tsx (100%) rename site/{ => src}/components/Page/Footer.tsx (100%) rename site/{ => src}/components/Page/index.tsx (100%) rename site/{ => src}/components/SignIn/CliAuthToken.stories.tsx (100%) rename site/{ => src}/components/SignIn/CliAuthToken.test.tsx (100%) rename site/{ => src}/components/SignIn/CliAuthToken.tsx (100%) rename site/{ => src}/components/SignIn/SignInForm.stories.tsx (100%) rename site/{ => src}/components/SignIn/SignInForm.test.tsx (100%) rename site/{ => src}/components/SignIn/SignInForm.tsx (97%) rename site/{ => src}/components/SignIn/Welcome.tsx (100%) rename site/{ => src}/components/SignIn/index.tsx (100%) rename site/{ => src}/components/Table/Table.test.tsx (100%) rename site/{ => src}/components/Table/Table.tsx (100%) rename site/{ => src}/components/Table/TableHeaders.tsx (100%) rename site/{ => src}/components/Table/TableTitle.tsx (100%) rename site/{ => src}/components/Table/index.tsx (100%) rename site/{ => src}/components/User/UserAvatar.tsx (100%) rename site/{ => src}/components/User/UserProfileCard.tsx (100%) rename site/{ => src}/components/User/index.ts (100%) rename site/{ => src}/components/Workspace/Workspace.stories.tsx (100%) rename site/{ => src}/components/Workspace/Workspace.test.tsx (100%) rename site/{ => src}/components/Workspace/Workspace.tsx (100%) rename site/{ => src}/components/Workspace/WorkspaceSection.tsx (100%) rename site/{ => src}/components/Workspace/constants.ts (100%) rename site/{ => src}/components/Workspace/index.ts (100%) rename site/{ => src}/components/index.tsx (100%) rename site/{ => src}/contexts/UserContext.test.tsx (100%) rename site/{ => src}/contexts/UserContext.tsx (100%) rename site/{ => src}/forms/CreateProjectForm.test.tsx (100%) rename site/{ => src}/forms/CreateProjectForm.tsx (99%) rename site/{ => src}/forms/CreateWorkspaceForm.test.tsx (100%) rename site/{ => src}/forms/CreateWorkspaceForm.tsx (100%) rename site/{ => src}/pages/404.tsx (100%) rename site/{ => src}/pages/cli-auth.tsx (100%) rename site/{ => src}/pages/index.tsx (100%) rename site/{ => src}/pages/login.tsx (91%) rename site/{ => src}/pages/projects/[organization]/[project]/create.tsx (100%) rename site/{ => src}/pages/projects/[organization]/[project]/index.tsx (100%) rename site/{ => src}/pages/projects/index.tsx (98%) rename site/{ => src}/pages/workspaces/[workspace].tsx (100%) rename site/{ => src}/test_helpers/index.tsx (100%) rename site/{ => src}/test_helpers/mocks.ts (100%) rename site/{ => src}/theme/constants.ts (100%) rename site/{ => src}/theme/index.ts (100%) rename site/{ => src}/theme/palettes.ts (100%) rename site/{ => src}/theme/theme.tsx (100%) rename site/{ => src}/theme/typography.ts (100%) rename site/{ => src}/util/array.test.ts (100%) rename site/{ => src}/util/array.ts (100%) rename site/{ => src}/util/index.ts (100%) rename site/{ => src}/util/swr.ts (100%) diff --git a/site/.storybook/preview.js b/site/.storybook/preview.js index eba3d0d74d8da..aba800b5cd3da 100644 --- a/site/.storybook/preview.js +++ b/site/.storybook/preview.js @@ -1,6 +1,6 @@ import ThemeProvider from "@material-ui/styles/ThemeProvider" import { withThemes } from "@react-theming/storybook-addon" -import { light, dark } from "../theme" +import { light, dark } from "../src/theme" import { addDecorator } from "node_modules/@storybook/react" import { createMemoryHistory } from "history" import { unstable_HistoryRouter as HistoryRouter } from "react-router-dom" diff --git a/site/Main.tsx b/site/src/Main.tsx similarity index 100% rename from site/Main.tsx rename to site/src/Main.tsx diff --git a/site/api.ts b/site/src/api.ts similarity index 100% rename from site/api.ts rename to site/src/api.ts diff --git a/site/app.tsx b/site/src/app.tsx similarity index 100% rename from site/app.tsx rename to site/src/app.tsx diff --git a/site/components/Button/CopyButton.tsx b/site/src/components/Button/CopyButton.tsx similarity index 100% rename from site/components/Button/CopyButton.tsx rename to site/src/components/Button/CopyButton.tsx diff --git a/site/components/Button/LoadingButton.stories.tsx b/site/src/components/Button/LoadingButton.stories.tsx similarity index 100% rename from site/components/Button/LoadingButton.stories.tsx rename to site/src/components/Button/LoadingButton.stories.tsx diff --git a/site/components/Button/LoadingButton.test.tsx b/site/src/components/Button/LoadingButton.test.tsx similarity index 100% rename from site/components/Button/LoadingButton.test.tsx rename to site/src/components/Button/LoadingButton.test.tsx diff --git a/site/components/Button/LoadingButton.tsx b/site/src/components/Button/LoadingButton.tsx similarity index 100% rename from site/components/Button/LoadingButton.tsx rename to site/src/components/Button/LoadingButton.tsx diff --git a/site/components/Button/SplitButton.test.tsx b/site/src/components/Button/SplitButton.test.tsx similarity index 100% rename from site/components/Button/SplitButton.test.tsx rename to site/src/components/Button/SplitButton.test.tsx diff --git a/site/components/Button/SplitButton.tsx b/site/src/components/Button/SplitButton.tsx similarity index 100% rename from site/components/Button/SplitButton.tsx rename to site/src/components/Button/SplitButton.tsx diff --git a/site/components/Button/index.ts b/site/src/components/Button/index.ts similarity index 100% rename from site/components/Button/index.ts rename to site/src/components/Button/index.ts diff --git a/site/components/CodeBlock/index.stories.tsx b/site/src/components/CodeBlock/index.stories.tsx similarity index 100% rename from site/components/CodeBlock/index.stories.tsx rename to site/src/components/CodeBlock/index.stories.tsx diff --git a/site/components/CodeBlock/index.test.tsx b/site/src/components/CodeBlock/index.test.tsx similarity index 100% rename from site/components/CodeBlock/index.test.tsx rename to site/src/components/CodeBlock/index.test.tsx diff --git a/site/components/CodeBlock/index.tsx b/site/src/components/CodeBlock/index.tsx similarity index 100% rename from site/components/CodeBlock/index.tsx rename to site/src/components/CodeBlock/index.tsx diff --git a/site/components/CodeExample/CodeExample.stories.tsx b/site/src/components/CodeExample/CodeExample.stories.tsx similarity index 100% rename from site/components/CodeExample/CodeExample.stories.tsx rename to site/src/components/CodeExample/CodeExample.stories.tsx diff --git a/site/components/CodeExample/CodeExample.test.tsx b/site/src/components/CodeExample/CodeExample.test.tsx similarity index 100% rename from site/components/CodeExample/CodeExample.test.tsx rename to site/src/components/CodeExample/CodeExample.test.tsx diff --git a/site/components/CodeExample/CodeExample.tsx b/site/src/components/CodeExample/CodeExample.tsx similarity index 100% rename from site/components/CodeExample/CodeExample.tsx rename to site/src/components/CodeExample/CodeExample.tsx diff --git a/site/components/CodeExample/index.ts b/site/src/components/CodeExample/index.ts similarity index 100% rename from site/components/CodeExample/index.ts rename to site/src/components/CodeExample/index.ts diff --git a/site/components/EmptyState/index.test.tsx b/site/src/components/EmptyState/index.test.tsx similarity index 100% rename from site/components/EmptyState/index.test.tsx rename to site/src/components/EmptyState/index.test.tsx diff --git a/site/components/EmptyState/index.tsx b/site/src/components/EmptyState/index.tsx similarity index 100% rename from site/components/EmptyState/index.tsx rename to site/src/components/EmptyState/index.tsx diff --git a/site/components/ErrorSummary/index.test.tsx b/site/src/components/ErrorSummary/index.test.tsx similarity index 100% rename from site/components/ErrorSummary/index.test.tsx rename to site/src/components/ErrorSummary/index.test.tsx diff --git a/site/components/ErrorSummary/index.tsx b/site/src/components/ErrorSummary/index.tsx similarity index 100% rename from site/components/ErrorSummary/index.tsx rename to site/src/components/ErrorSummary/index.tsx diff --git a/site/components/Form/FormCloseButton.stories.tsx b/site/src/components/Form/FormCloseButton.stories.tsx similarity index 100% rename from site/components/Form/FormCloseButton.stories.tsx rename to site/src/components/Form/FormCloseButton.stories.tsx diff --git a/site/components/Form/FormCloseButton.test.tsx b/site/src/components/Form/FormCloseButton.test.tsx similarity index 100% rename from site/components/Form/FormCloseButton.test.tsx rename to site/src/components/Form/FormCloseButton.test.tsx diff --git a/site/components/Form/FormCloseButton.tsx b/site/src/components/Form/FormCloseButton.tsx similarity index 100% rename from site/components/Form/FormCloseButton.tsx rename to site/src/components/Form/FormCloseButton.tsx diff --git a/site/components/Form/FormDropdownField.tsx b/site/src/components/Form/FormDropdownField.tsx similarity index 100% rename from site/components/Form/FormDropdownField.tsx rename to site/src/components/Form/FormDropdownField.tsx diff --git a/site/components/Form/FormSection.tsx b/site/src/components/Form/FormSection.tsx similarity index 100% rename from site/components/Form/FormSection.tsx rename to site/src/components/Form/FormSection.tsx diff --git a/site/components/Form/FormTextField.test.tsx b/site/src/components/Form/FormTextField.test.tsx similarity index 100% rename from site/components/Form/FormTextField.test.tsx rename to site/src/components/Form/FormTextField.test.tsx diff --git a/site/components/Form/FormTextField.tsx b/site/src/components/Form/FormTextField.tsx similarity index 100% rename from site/components/Form/FormTextField.tsx rename to site/src/components/Form/FormTextField.tsx diff --git a/site/components/Form/FormTitle.tsx b/site/src/components/Form/FormTitle.tsx similarity index 100% rename from site/components/Form/FormTitle.tsx rename to site/src/components/Form/FormTitle.tsx diff --git a/site/components/Form/PasswordField.test.tsx b/site/src/components/Form/PasswordField.test.tsx similarity index 100% rename from site/components/Form/PasswordField.test.tsx rename to site/src/components/Form/PasswordField.test.tsx diff --git a/site/components/Form/PasswordField.tsx b/site/src/components/Form/PasswordField.tsx similarity index 100% rename from site/components/Form/PasswordField.tsx rename to site/src/components/Form/PasswordField.tsx diff --git a/site/components/Form/index.ts b/site/src/components/Form/index.ts similarity index 100% rename from site/components/Form/index.ts rename to site/src/components/Form/index.ts diff --git a/site/components/Header/HeaderButton.tsx b/site/src/components/Header/HeaderButton.tsx similarity index 100% rename from site/components/Header/HeaderButton.tsx rename to site/src/components/Header/HeaderButton.tsx diff --git a/site/components/Header/index.test.tsx b/site/src/components/Header/index.test.tsx similarity index 100% rename from site/components/Header/index.test.tsx rename to site/src/components/Header/index.test.tsx diff --git a/site/components/Header/index.tsx b/site/src/components/Header/index.tsx similarity index 100% rename from site/components/Header/index.tsx rename to site/src/components/Header/index.tsx diff --git a/site/components/Icons/Close.tsx b/site/src/components/Icons/Close.tsx similarity index 100% rename from site/components/Icons/Close.tsx rename to site/src/components/Icons/Close.tsx diff --git a/site/components/Icons/CoderIcon.tsx b/site/src/components/Icons/CoderIcon.tsx similarity index 100% rename from site/components/Icons/CoderIcon.tsx rename to site/src/components/Icons/CoderIcon.tsx diff --git a/site/components/Icons/FileCopy.tsx b/site/src/components/Icons/FileCopy.tsx similarity index 100% rename from site/components/Icons/FileCopy.tsx rename to site/src/components/Icons/FileCopy.tsx diff --git a/site/components/Icons/Logo.tsx b/site/src/components/Icons/Logo.tsx similarity index 100% rename from site/components/Icons/Logo.tsx rename to site/src/components/Icons/Logo.tsx diff --git a/site/components/Icons/Logout.tsx b/site/src/components/Icons/Logout.tsx similarity index 100% rename from site/components/Icons/Logout.tsx rename to site/src/components/Icons/Logout.tsx diff --git a/site/components/Icons/WorkspacesIcon.tsx b/site/src/components/Icons/WorkspacesIcon.tsx similarity index 100% rename from site/components/Icons/WorkspacesIcon.tsx rename to site/src/components/Icons/WorkspacesIcon.tsx diff --git a/site/components/Icons/index.test.tsx b/site/src/components/Icons/index.test.tsx similarity index 100% rename from site/components/Icons/index.test.tsx rename to site/src/components/Icons/index.test.tsx diff --git a/site/components/Icons/index.ts b/site/src/components/Icons/index.ts similarity index 100% rename from site/components/Icons/index.ts rename to site/src/components/Icons/index.ts diff --git a/site/components/Loader/FullScreenLoader.test.tsx b/site/src/components/Loader/FullScreenLoader.test.tsx similarity index 100% rename from site/components/Loader/FullScreenLoader.test.tsx rename to site/src/components/Loader/FullScreenLoader.test.tsx diff --git a/site/components/Loader/FullScreenLoader.tsx b/site/src/components/Loader/FullScreenLoader.tsx similarity index 100% rename from site/components/Loader/FullScreenLoader.tsx rename to site/src/components/Loader/FullScreenLoader.tsx diff --git a/site/components/Navbar/BorderedMenu.tsx b/site/src/components/Navbar/BorderedMenu.tsx similarity index 100% rename from site/components/Navbar/BorderedMenu.tsx rename to site/src/components/Navbar/BorderedMenu.tsx diff --git a/site/components/Navbar/UserDropdown.tsx b/site/src/components/Navbar/UserDropdown.tsx similarity index 100% rename from site/components/Navbar/UserDropdown.tsx rename to site/src/components/Navbar/UserDropdown.tsx diff --git a/site/components/Navbar/index.test.tsx b/site/src/components/Navbar/index.test.tsx similarity index 100% rename from site/components/Navbar/index.test.tsx rename to site/src/components/Navbar/index.test.tsx diff --git a/site/components/Navbar/index.tsx b/site/src/components/Navbar/index.tsx similarity index 100% rename from site/components/Navbar/index.tsx rename to site/src/components/Navbar/index.tsx diff --git a/site/components/Page/Footer.test.tsx b/site/src/components/Page/Footer.test.tsx similarity index 100% rename from site/components/Page/Footer.test.tsx rename to site/src/components/Page/Footer.test.tsx diff --git a/site/components/Page/Footer.tsx b/site/src/components/Page/Footer.tsx similarity index 100% rename from site/components/Page/Footer.tsx rename to site/src/components/Page/Footer.tsx diff --git a/site/components/Page/index.tsx b/site/src/components/Page/index.tsx similarity index 100% rename from site/components/Page/index.tsx rename to site/src/components/Page/index.tsx diff --git a/site/components/SignIn/CliAuthToken.stories.tsx b/site/src/components/SignIn/CliAuthToken.stories.tsx similarity index 100% rename from site/components/SignIn/CliAuthToken.stories.tsx rename to site/src/components/SignIn/CliAuthToken.stories.tsx diff --git a/site/components/SignIn/CliAuthToken.test.tsx b/site/src/components/SignIn/CliAuthToken.test.tsx similarity index 100% rename from site/components/SignIn/CliAuthToken.test.tsx rename to site/src/components/SignIn/CliAuthToken.test.tsx diff --git a/site/components/SignIn/CliAuthToken.tsx b/site/src/components/SignIn/CliAuthToken.tsx similarity index 100% rename from site/components/SignIn/CliAuthToken.tsx rename to site/src/components/SignIn/CliAuthToken.tsx diff --git a/site/components/SignIn/SignInForm.stories.tsx b/site/src/components/SignIn/SignInForm.stories.tsx similarity index 100% rename from site/components/SignIn/SignInForm.stories.tsx rename to site/src/components/SignIn/SignInForm.stories.tsx diff --git a/site/components/SignIn/SignInForm.test.tsx b/site/src/components/SignIn/SignInForm.test.tsx similarity index 100% rename from site/components/SignIn/SignInForm.test.tsx rename to site/src/components/SignIn/SignInForm.test.tsx diff --git a/site/components/SignIn/SignInForm.tsx b/site/src/components/SignIn/SignInForm.tsx similarity index 97% rename from site/components/SignIn/SignInForm.tsx rename to site/src/components/SignIn/SignInForm.tsx index 6f48f61058d5e..a7929abd660e4 100644 --- a/site/components/SignIn/SignInForm.tsx +++ b/site/src/components/SignIn/SignInForm.tsx @@ -8,8 +8,8 @@ import * as Yup from "yup" import { Welcome } from "./Welcome" import { FormTextField } from "../Form" -import * as API from "./../../api" -import { LoadingButton } from "./../Button" +import * as API from "../../api" +import { LoadingButton } from "../Button" /** * BuiltInAuthFormValues describes a form using built-in (email/password) diff --git a/site/components/SignIn/Welcome.tsx b/site/src/components/SignIn/Welcome.tsx similarity index 100% rename from site/components/SignIn/Welcome.tsx rename to site/src/components/SignIn/Welcome.tsx diff --git a/site/components/SignIn/index.tsx b/site/src/components/SignIn/index.tsx similarity index 100% rename from site/components/SignIn/index.tsx rename to site/src/components/SignIn/index.tsx diff --git a/site/components/Table/Table.test.tsx b/site/src/components/Table/Table.test.tsx similarity index 100% rename from site/components/Table/Table.test.tsx rename to site/src/components/Table/Table.test.tsx diff --git a/site/components/Table/Table.tsx b/site/src/components/Table/Table.tsx similarity index 100% rename from site/components/Table/Table.tsx rename to site/src/components/Table/Table.tsx diff --git a/site/components/Table/TableHeaders.tsx b/site/src/components/Table/TableHeaders.tsx similarity index 100% rename from site/components/Table/TableHeaders.tsx rename to site/src/components/Table/TableHeaders.tsx diff --git a/site/components/Table/TableTitle.tsx b/site/src/components/Table/TableTitle.tsx similarity index 100% rename from site/components/Table/TableTitle.tsx rename to site/src/components/Table/TableTitle.tsx diff --git a/site/components/Table/index.tsx b/site/src/components/Table/index.tsx similarity index 100% rename from site/components/Table/index.tsx rename to site/src/components/Table/index.tsx diff --git a/site/components/User/UserAvatar.tsx b/site/src/components/User/UserAvatar.tsx similarity index 100% rename from site/components/User/UserAvatar.tsx rename to site/src/components/User/UserAvatar.tsx diff --git a/site/components/User/UserProfileCard.tsx b/site/src/components/User/UserProfileCard.tsx similarity index 100% rename from site/components/User/UserProfileCard.tsx rename to site/src/components/User/UserProfileCard.tsx diff --git a/site/components/User/index.ts b/site/src/components/User/index.ts similarity index 100% rename from site/components/User/index.ts rename to site/src/components/User/index.ts diff --git a/site/components/Workspace/Workspace.stories.tsx b/site/src/components/Workspace/Workspace.stories.tsx similarity index 100% rename from site/components/Workspace/Workspace.stories.tsx rename to site/src/components/Workspace/Workspace.stories.tsx diff --git a/site/components/Workspace/Workspace.test.tsx b/site/src/components/Workspace/Workspace.test.tsx similarity index 100% rename from site/components/Workspace/Workspace.test.tsx rename to site/src/components/Workspace/Workspace.test.tsx diff --git a/site/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx similarity index 100% rename from site/components/Workspace/Workspace.tsx rename to site/src/components/Workspace/Workspace.tsx diff --git a/site/components/Workspace/WorkspaceSection.tsx b/site/src/components/Workspace/WorkspaceSection.tsx similarity index 100% rename from site/components/Workspace/WorkspaceSection.tsx rename to site/src/components/Workspace/WorkspaceSection.tsx diff --git a/site/components/Workspace/constants.ts b/site/src/components/Workspace/constants.ts similarity index 100% rename from site/components/Workspace/constants.ts rename to site/src/components/Workspace/constants.ts diff --git a/site/components/Workspace/index.ts b/site/src/components/Workspace/index.ts similarity index 100% rename from site/components/Workspace/index.ts rename to site/src/components/Workspace/index.ts diff --git a/site/components/index.tsx b/site/src/components/index.tsx similarity index 100% rename from site/components/index.tsx rename to site/src/components/index.tsx diff --git a/site/contexts/UserContext.test.tsx b/site/src/contexts/UserContext.test.tsx similarity index 100% rename from site/contexts/UserContext.test.tsx rename to site/src/contexts/UserContext.test.tsx diff --git a/site/contexts/UserContext.tsx b/site/src/contexts/UserContext.tsx similarity index 100% rename from site/contexts/UserContext.tsx rename to site/src/contexts/UserContext.tsx diff --git a/site/forms/CreateProjectForm.test.tsx b/site/src/forms/CreateProjectForm.test.tsx similarity index 100% rename from site/forms/CreateProjectForm.test.tsx rename to site/src/forms/CreateProjectForm.test.tsx diff --git a/site/forms/CreateProjectForm.tsx b/site/src/forms/CreateProjectForm.tsx similarity index 99% rename from site/forms/CreateProjectForm.tsx rename to site/src/forms/CreateProjectForm.tsx index a930cf487e054..17612ebda7418 100644 --- a/site/forms/CreateProjectForm.tsx +++ b/site/src/forms/CreateProjectForm.tsx @@ -13,7 +13,7 @@ import { FormCloseButton, } from "../components/Form" import { LoadingButton } from "../components/Button" -import { Organization, Project, Provisioner, CreateProjectRequest } from "./../api" +import { Organization, Project, Provisioner, CreateProjectRequest } from "../api" export interface CreateProjectFormProps { provisioners: Provisioner[] diff --git a/site/forms/CreateWorkspaceForm.test.tsx b/site/src/forms/CreateWorkspaceForm.test.tsx similarity index 100% rename from site/forms/CreateWorkspaceForm.test.tsx rename to site/src/forms/CreateWorkspaceForm.test.tsx diff --git a/site/forms/CreateWorkspaceForm.tsx b/site/src/forms/CreateWorkspaceForm.tsx similarity index 100% rename from site/forms/CreateWorkspaceForm.tsx rename to site/src/forms/CreateWorkspaceForm.tsx diff --git a/site/pages/404.tsx b/site/src/pages/404.tsx similarity index 100% rename from site/pages/404.tsx rename to site/src/pages/404.tsx diff --git a/site/pages/cli-auth.tsx b/site/src/pages/cli-auth.tsx similarity index 100% rename from site/pages/cli-auth.tsx rename to site/src/pages/cli-auth.tsx diff --git a/site/pages/index.tsx b/site/src/pages/index.tsx similarity index 100% rename from site/pages/index.tsx rename to site/src/pages/index.tsx diff --git a/site/pages/login.tsx b/site/src/pages/login.tsx similarity index 91% rename from site/pages/login.tsx rename to site/src/pages/login.tsx index eb404f04f5a01..46630c7abe3f4 100644 --- a/site/pages/login.tsx +++ b/site/src/pages/login.tsx @@ -1,6 +1,6 @@ import { makeStyles } from "@material-ui/core/styles" import React from "react" -import { SignInForm } from "./../components/SignIn" +import { SignInForm } from "../components/SignIn" export const useStyles = makeStyles((theme) => ({ root: { diff --git a/site/pages/projects/[organization]/[project]/create.tsx b/site/src/pages/projects/[organization]/[project]/create.tsx similarity index 100% rename from site/pages/projects/[organization]/[project]/create.tsx rename to site/src/pages/projects/[organization]/[project]/create.tsx diff --git a/site/pages/projects/[organization]/[project]/index.tsx b/site/src/pages/projects/[organization]/[project]/index.tsx similarity index 100% rename from site/pages/projects/[organization]/[project]/index.tsx rename to site/src/pages/projects/[organization]/[project]/index.tsx diff --git a/site/pages/projects/index.tsx b/site/src/pages/projects/index.tsx similarity index 98% rename from site/pages/projects/index.tsx rename to site/src/pages/projects/index.tsx index 7c5aa8d957be8..520a035f4013c 100644 --- a/site/pages/projects/index.tsx +++ b/site/src/pages/projects/index.tsx @@ -11,7 +11,7 @@ import { Column, Table } from "../../components/Table" import { useUser } from "../../contexts/UserContext" import { FullScreenLoader } from "../../components/Loader/FullScreenLoader" -import { Organization, Project } from "./../../api" +import { Organization, Project } from "../../api" import useSWR from "swr" import { CodeExample } from "../../components/CodeExample/CodeExample" diff --git a/site/pages/workspaces/[workspace].tsx b/site/src/pages/workspaces/[workspace].tsx similarity index 100% rename from site/pages/workspaces/[workspace].tsx rename to site/src/pages/workspaces/[workspace].tsx diff --git a/site/test_helpers/index.tsx b/site/src/test_helpers/index.tsx similarity index 100% rename from site/test_helpers/index.tsx rename to site/src/test_helpers/index.tsx diff --git a/site/test_helpers/mocks.ts b/site/src/test_helpers/mocks.ts similarity index 100% rename from site/test_helpers/mocks.ts rename to site/src/test_helpers/mocks.ts diff --git a/site/theme/constants.ts b/site/src/theme/constants.ts similarity index 100% rename from site/theme/constants.ts rename to site/src/theme/constants.ts diff --git a/site/theme/index.ts b/site/src/theme/index.ts similarity index 100% rename from site/theme/index.ts rename to site/src/theme/index.ts diff --git a/site/theme/palettes.ts b/site/src/theme/palettes.ts similarity index 100% rename from site/theme/palettes.ts rename to site/src/theme/palettes.ts diff --git a/site/theme/theme.tsx b/site/src/theme/theme.tsx similarity index 100% rename from site/theme/theme.tsx rename to site/src/theme/theme.tsx diff --git a/site/theme/typography.ts b/site/src/theme/typography.ts similarity index 100% rename from site/theme/typography.ts rename to site/src/theme/typography.ts diff --git a/site/util/array.test.ts b/site/src/util/array.test.ts similarity index 100% rename from site/util/array.test.ts rename to site/src/util/array.test.ts diff --git a/site/util/array.ts b/site/src/util/array.ts similarity index 100% rename from site/util/array.ts rename to site/src/util/array.ts diff --git a/site/util/index.ts b/site/src/util/index.ts similarity index 100% rename from site/util/index.ts rename to site/src/util/index.ts diff --git a/site/util/swr.ts b/site/src/util/swr.ts similarity index 100% rename from site/util/swr.ts rename to site/src/util/swr.ts diff --git a/site/webpack.common.ts b/site/webpack.common.ts index b341ece8407b3..edf9baed3e091 100644 --- a/site/webpack.common.ts +++ b/site/webpack.common.ts @@ -22,7 +22,7 @@ export const commonWebpackConfig: Configuration = { // entry defines each "page" or "chunk". Currently, for v2, we only have one bundle - // a bundle that is shared across all of the UI. However, we may need to eventually split // like in v1, where there is a separate entry piont for dashboard & terminal. - entry: path.join(__dirname, "Main.tsx"), + entry: path.join(__dirname, "src/Main.tsx"), // modules specify how different modules are loaded // See: https://webpack.js.org/concepts/modules/ From 8a6f0c964c3ecd8472a60792250ade012bb4e917 Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Tue, 15 Mar 2022 18:49:15 +0000 Subject: [PATCH 2/3] Revert unnecessary path changes in imports --- site/src/components/SignIn/SignInForm.tsx | 4 ++-- site/src/forms/CreateProjectForm.tsx | 2 +- site/src/pages/login.tsx | 2 +- site/src/pages/projects/index.tsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/src/components/SignIn/SignInForm.tsx b/site/src/components/SignIn/SignInForm.tsx index a7929abd660e4..6f48f61058d5e 100644 --- a/site/src/components/SignIn/SignInForm.tsx +++ b/site/src/components/SignIn/SignInForm.tsx @@ -8,8 +8,8 @@ import * as Yup from "yup" import { Welcome } from "./Welcome" import { FormTextField } from "../Form" -import * as API from "../../api" -import { LoadingButton } from "../Button" +import * as API from "./../../api" +import { LoadingButton } from "./../Button" /** * BuiltInAuthFormValues describes a form using built-in (email/password) diff --git a/site/src/forms/CreateProjectForm.tsx b/site/src/forms/CreateProjectForm.tsx index 17612ebda7418..a930cf487e054 100644 --- a/site/src/forms/CreateProjectForm.tsx +++ b/site/src/forms/CreateProjectForm.tsx @@ -13,7 +13,7 @@ import { FormCloseButton, } from "../components/Form" import { LoadingButton } from "../components/Button" -import { Organization, Project, Provisioner, CreateProjectRequest } from "../api" +import { Organization, Project, Provisioner, CreateProjectRequest } from "./../api" export interface CreateProjectFormProps { provisioners: Provisioner[] diff --git a/site/src/pages/login.tsx b/site/src/pages/login.tsx index 46630c7abe3f4..eb404f04f5a01 100644 --- a/site/src/pages/login.tsx +++ b/site/src/pages/login.tsx @@ -1,6 +1,6 @@ import { makeStyles } from "@material-ui/core/styles" import React from "react" -import { SignInForm } from "../components/SignIn" +import { SignInForm } from "./../components/SignIn" export const useStyles = makeStyles((theme) => ({ root: { diff --git a/site/src/pages/projects/index.tsx b/site/src/pages/projects/index.tsx index 520a035f4013c..7c5aa8d957be8 100644 --- a/site/src/pages/projects/index.tsx +++ b/site/src/pages/projects/index.tsx @@ -11,7 +11,7 @@ import { Column, Table } from "../../components/Table" import { useUser } from "../../contexts/UserContext" import { FullScreenLoader } from "../../components/Loader/FullScreenLoader" -import { Organization, Project } from "../../api" +import { Organization, Project } from "./../../api" import useSWR from "swr" import { CodeExample } from "../../components/CodeExample/CodeExample" From f31da9917d3d7ade8423abf24cf0dc2392425bc9 Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Tue, 15 Mar 2022 20:28:14 +0000 Subject: [PATCH 3/3] Scope storybook to src folder --- site/.storybook/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/.storybook/main.js b/site/.storybook/main.js index 75e6befad9157..cf3dc730d92d6 100644 --- a/site/.storybook/main.js +++ b/site/.storybook/main.js @@ -1,7 +1,7 @@ const path = require("path") module.exports = { - stories: ["../**/*.stories.mdx", "../**/*.stories.@(js|jsx|ts|tsx)"], + stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"], addons: ["@storybook/addon-links", "@storybook/addon-essentials"], babel: async (options) => ({ ...options,