Skip to content

Commit 72fb704

Browse files
greyscaledgreyscaled
committed
Merge origin/main
2 parents 5bbcec1 + d8e530e commit 72fb704

File tree

106 files changed

+164
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+164
-178
lines changed

‎README.md

Lines changed: 23 additions & 1 deletion

‎site/.storybook/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require("path")
22

33
module.exports = {
4-
stories: ["../**/*.stories.mdx", "../**/*.stories.@(js|jsx|ts|tsx)"],
4+
stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
55
addons: ["@storybook/addon-links", "@storybook/addon-essentials"],
66
babel: async (options) => ({
77
...options,

‎site/.storybook/preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import ThemeProvider from "@material-ui/styles/ThemeProvider"
22
import { withThemes } from "@react-theming/storybook-addon"
3-
import { light, dark } from "../theme"
3+
import { light, dark } from "../src/theme"
44
import { addDecorator } from "node_modules/@storybook/react"
55
import { createMemoryHistory } from "history"
66
import { unstable_HistoryRouter as HistoryRouter } from "react-router-dom"

‎site/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
"@types/react": "17.0.40",
4747
"@types/react-dom": "17.0.13",
4848
"@types/superagent": "4.1.15",
49-
"@typescript-eslint/eslint-plugin": "4.33.0",
50-
"@typescript-eslint/parser": "4.33.0",
49+
"@typescript-eslint/eslint-plugin": "5.15.0",
50+
"@typescript-eslint/parser": "5.15.0",
5151
"copy-webpack-plugin": "10.2.4",
52-
"eslint": "7.32.0",
52+
"eslint": "8.11.0",
5353
"eslint-config-prettier": "8.5.0",
5454
"eslint-import-resolver-alias": "1.1.2",
5555
"eslint-import-resolver-typescript": "2.5.0",

‎site/Main.tsx renamed to ‎site/src/Main.tsx

File renamed without changes.

‎site/api.ts renamed to ‎site/src/api.ts

File renamed without changes.

‎site/app.tsx renamed to ‎site/src/app.tsx

File renamed without changes.

‎site/components/Button/CopyButton.tsx renamed to ‎site/src/components/Button/CopyButton.tsx

File renamed without changes.

‎site/components/Button/LoadingButton.stories.tsx renamed to ‎site/src/components/Button/LoadingButton.stories.tsx

File renamed without changes.

‎site/components/Button/LoadingButton.test.tsx renamed to ‎site/src/components/Button/LoadingButton.test.tsx

File renamed without changes.

‎site/components/Button/LoadingButton.tsx renamed to ‎site/src/components/Button/LoadingButton.tsx

File renamed without changes.

‎site/components/Button/SplitButton.test.tsx renamed to ‎site/src/components/Button/SplitButton.test.tsx

File renamed without changes.

‎site/components/Button/SplitButton.tsx renamed to ‎site/src/components/Button/SplitButton.tsx

File renamed without changes.

‎site/components/Button/index.ts renamed to ‎site/src/components/Button/index.ts

File renamed without changes.

‎site/components/CodeBlock/index.stories.tsx renamed to ‎site/src/components/CodeBlock/index.stories.tsx

File renamed without changes.

‎site/components/CodeBlock/index.test.tsx renamed to ‎site/src/components/CodeBlock/index.test.tsx

File renamed without changes.

‎site/components/CodeBlock/index.tsx renamed to ‎site/src/components/CodeBlock/index.tsx

File renamed without changes.

‎site/components/CodeExample/CodeExample.stories.tsx renamed to ‎site/src/components/CodeExample/CodeExample.stories.tsx

File renamed without changes.

‎site/components/CodeExample/CodeExample.test.tsx renamed to ‎site/src/components/CodeExample/CodeExample.test.tsx

File renamed without changes.

‎site/components/CodeExample/CodeExample.tsx renamed to ‎site/src/components/CodeExample/CodeExample.tsx

File renamed without changes.

‎site/components/CodeExample/index.ts renamed to ‎site/src/components/CodeExample/index.ts

File renamed without changes.

‎site/components/EmptyState/index.test.tsx renamed to ‎site/src/components/EmptyState/index.test.tsx

File renamed without changes.

‎site/components/EmptyState/index.tsx renamed to ‎site/src/components/EmptyState/index.tsx

File renamed without changes.

‎site/components/ErrorSummary/index.test.tsx renamed to ‎site/src/components/ErrorSummary/index.test.tsx

File renamed without changes.

‎site/components/ErrorSummary/index.tsx renamed to ‎site/src/components/ErrorSummary/index.tsx

File renamed without changes.

‎site/components/Form/FormCloseButton.stories.tsx renamed to ‎site/src/components/Form/FormCloseButton.stories.tsx

File renamed without changes.

‎site/components/Form/FormCloseButton.test.tsx renamed to ‎site/src/components/Form/FormCloseButton.test.tsx

File renamed without changes.

‎site/components/Form/FormCloseButton.tsx renamed to ‎site/src/components/Form/FormCloseButton.tsx

File renamed without changes.

‎site/components/Form/FormDropdownField.tsx renamed to ‎site/src/components/Form/FormDropdownField.tsx

File renamed without changes.

‎site/components/Form/FormSection.tsx renamed to ‎site/src/components/Form/FormSection.tsx

File renamed without changes.

‎site/components/Form/FormTextField.test.tsx renamed to ‎site/src/components/Form/FormTextField.test.tsx

File renamed without changes.

‎site/components/Form/FormTextField.tsx renamed to ‎site/src/components/Form/FormTextField.tsx

File renamed without changes.

‎site/components/Form/FormTitle.tsx renamed to ‎site/src/components/Form/FormTitle.tsx

File renamed without changes.

‎site/components/Form/PasswordField.test.tsx renamed to ‎site/src/components/Form/PasswordField.test.tsx

File renamed without changes.

‎site/components/Form/PasswordField.tsx renamed to ‎site/src/components/Form/PasswordField.tsx

File renamed without changes.

‎site/components/Form/index.ts renamed to ‎site/src/components/Form/index.ts

File renamed without changes.

‎site/components/Header/HeaderButton.tsx renamed to ‎site/src/components/Header/HeaderButton.tsx

File renamed without changes.

‎site/components/Header/index.test.tsx renamed to ‎site/src/components/Header/index.test.tsx

File renamed without changes.

‎site/components/Header/index.tsx renamed to ‎site/src/components/Header/index.tsx

File renamed without changes.

‎site/components/Icons/Close.tsx renamed to ‎site/src/components/Icons/Close.tsx

File renamed without changes.

‎site/components/Icons/CoderIcon.tsx renamed to ‎site/src/components/Icons/CoderIcon.tsx

File renamed without changes.

‎site/components/Icons/FileCopy.tsx renamed to ‎site/src/components/Icons/FileCopy.tsx

File renamed without changes.

‎site/components/Icons/Logo.tsx renamed to ‎site/src/components/Icons/Logo.tsx

File renamed without changes.

‎site/components/Icons/Logout.tsx renamed to ‎site/src/components/Icons/Logout.tsx

File renamed without changes.

‎site/components/Icons/WorkspacesIcon.tsx renamed to ‎site/src/components/Icons/WorkspacesIcon.tsx

File renamed without changes.

‎site/components/Icons/index.test.tsx renamed to ‎site/src/components/Icons/index.test.tsx

File renamed without changes.

‎site/components/Icons/index.ts renamed to ‎site/src/components/Icons/index.ts

File renamed without changes.

‎site/components/Loader/FullScreenLoader.test.tsx renamed to ‎site/src/components/Loader/FullScreenLoader.test.tsx

File renamed without changes.

‎site/components/Loader/FullScreenLoader.tsx renamed to ‎site/src/components/Loader/FullScreenLoader.tsx

File renamed without changes.

‎site/components/Navbar/BorderedMenu.tsx renamed to ‎site/src/components/Navbar/BorderedMenu.tsx

File renamed without changes.

‎site/components/Navbar/UserDropdown.tsx renamed to ‎site/src/components/Navbar/UserDropdown.tsx

File renamed without changes.

‎site/components/Navbar/index.test.tsx renamed to ‎site/src/components/Navbar/index.test.tsx

File renamed without changes.

‎site/components/Navbar/index.tsx renamed to ‎site/src/components/Navbar/index.tsx

File renamed without changes.

‎site/components/Page/Footer.test.tsx renamed to ‎site/src/components/Page/Footer.test.tsx

File renamed without changes.

‎site/components/Page/Footer.tsx renamed to ‎site/src/components/Page/Footer.tsx

File renamed without changes.

‎site/components/Page/index.tsx renamed to ‎site/src/components/Page/index.tsx

File renamed without changes.

‎site/components/SignIn/CliAuthToken.stories.tsx renamed to ‎site/src/components/SignIn/CliAuthToken.stories.tsx

File renamed without changes.

‎site/components/SignIn/CliAuthToken.test.tsx renamed to ‎site/src/components/SignIn/CliAuthToken.test.tsx

File renamed without changes.

‎site/components/SignIn/CliAuthToken.tsx renamed to ‎site/src/components/SignIn/CliAuthToken.tsx

File renamed without changes.

‎site/components/SignIn/SignInForm.stories.tsx renamed to ‎site/src/components/SignIn/SignInForm.stories.tsx

File renamed without changes.

‎site/components/SignIn/SignInForm.test.tsx renamed to ‎site/src/components/SignIn/SignInForm.test.tsx

File renamed without changes.

‎site/components/SignIn/SignInForm.tsx renamed to ‎site/src/components/SignIn/SignInForm.tsx

File renamed without changes.

‎site/components/SignIn/Welcome.tsx renamed to ‎site/src/components/SignIn/Welcome.tsx

File renamed without changes.

‎site/components/SignIn/index.tsx renamed to ‎site/src/components/SignIn/index.tsx

File renamed without changes.

‎site/components/Table/Table.test.tsx renamed to ‎site/src/components/Table/Table.test.tsx

File renamed without changes.

‎site/components/Table/Table.tsx renamed to ‎site/src/components/Table/Table.tsx

File renamed without changes.

‎site/components/Table/TableHeaders.tsx renamed to ‎site/src/components/Table/TableHeaders.tsx

File renamed without changes.

‎site/components/Table/TableTitle.tsx renamed to ‎site/src/components/Table/TableTitle.tsx

File renamed without changes.

‎site/components/Table/index.tsx renamed to ‎site/src/components/Table/index.tsx

File renamed without changes.

‎site/components/User/UserAvatar.tsx renamed to ‎site/src/components/User/UserAvatar.tsx

File renamed without changes.

‎site/components/User/UserProfileCard.tsx renamed to ‎site/src/components/User/UserProfileCard.tsx

File renamed without changes.

‎site/components/User/index.ts renamed to ‎site/src/components/User/index.ts

File renamed without changes.

‎site/components/Workspace/Workspace.stories.tsx renamed to ‎site/src/components/Workspace/Workspace.stories.tsx

File renamed without changes.

‎site/components/Workspace/Workspace.test.tsx renamed to ‎site/src/components/Workspace/Workspace.test.tsx

File renamed without changes.

‎site/components/Workspace/Workspace.tsx renamed to ‎site/src/components/Workspace/Workspace.tsx

File renamed without changes.

‎site/components/Workspace/WorkspaceSection.tsx renamed to ‎site/src/components/Workspace/WorkspaceSection.tsx

File renamed without changes.

‎site/components/Workspace/constants.ts renamed to ‎site/src/components/Workspace/constants.ts

File renamed without changes.

‎site/components/Workspace/index.ts renamed to ‎site/src/components/Workspace/index.ts

File renamed without changes.

‎site/components/index.tsx renamed to ‎site/src/components/index.tsx

File renamed without changes.

‎site/contexts/UserContext.test.tsx renamed to ‎site/src/contexts/UserContext.test.tsx

File renamed without changes.

‎site/contexts/UserContext.tsx renamed to ‎site/src/contexts/UserContext.tsx

File renamed without changes.

‎site/forms/CreateProjectForm.test.tsx renamed to ‎site/src/forms/CreateProjectForm.test.tsx

File renamed without changes.

‎site/forms/CreateProjectForm.tsx renamed to ‎site/src/forms/CreateProjectForm.tsx

File renamed without changes.

‎site/forms/CreateWorkspaceForm.test.tsx renamed to ‎site/src/forms/CreateWorkspaceForm.test.tsx

File renamed without changes.

‎site/forms/CreateWorkspaceForm.tsx renamed to ‎site/src/forms/CreateWorkspaceForm.tsx

File renamed without changes.

‎site/pages/404.tsx renamed to ‎site/src/pages/404.tsx

File renamed without changes.

‎site/pages/cli-auth.tsx renamed to ‎site/src/pages/cli-auth.tsx

File renamed without changes.

‎site/pages/index.tsx renamed to ‎site/src/pages/index.tsx

File renamed without changes.

‎site/pages/login.tsx renamed to ‎site/src/pages/login.tsx

File renamed without changes.

‎site/pages/projects/[organization]/[project]/create.tsx renamed to ‎site/src/pages/projects/[organization]/[project]/create.tsx

File renamed without changes.

‎site/pages/projects/[organization]/[project]/index.tsx renamed to ‎site/src/pages/projects/[organization]/[project]/index.tsx

File renamed without changes.

‎site/pages/projects/index.tsx renamed to ‎site/src/pages/projects/index.tsx

File renamed without changes.

‎site/pages/workspaces/[workspace].tsx renamed to ‎site/src/pages/workspaces/[workspace].tsx

File renamed without changes.

‎site/test_helpers/index.tsx renamed to ‎site/src/test_helpers/index.tsx

File renamed without changes.

‎site/test_helpers/mocks.ts renamed to ‎site/src/test_helpers/mocks.ts

File renamed without changes.

‎site/theme/constants.ts renamed to ‎site/src/theme/constants.ts

File renamed without changes.

‎site/theme/index.ts renamed to ‎site/src/theme/index.ts

File renamed without changes.

‎site/theme/palettes.ts renamed to ‎site/src/theme/palettes.ts

File renamed without changes.

‎site/theme/theme.tsx renamed to ‎site/src/theme/theme.tsx

File renamed without changes.

‎site/theme/typography.ts renamed to ‎site/src/theme/typography.ts

File renamed without changes.

‎site/util/array.test.ts renamed to ‎site/src/util/array.test.ts

File renamed without changes.

‎site/util/array.ts renamed to ‎site/src/util/array.ts

File renamed without changes.

‎site/util/index.ts renamed to ‎site/src/util/index.ts

File renamed without changes.

‎site/util/swr.ts renamed to ‎site/src/util/swr.ts

File renamed without changes.

‎site/webpack.common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const commonWebpackConfig: Configuration = {
2222
// entry defines each "page" or "chunk". Currently, for v2, we only have one bundle -
2323
// a bundle that is shared across all of the UI. However, we may need to eventually split
2424
// like in v1, where there is a separate entry piont for dashboard & terminal.
25-
entry: path.join(__dirname, "Main.tsx"),
25+
entry: path.join(__dirname, "src/Main.tsx"),
2626

2727
// modules specify how different modules are loaded
2828
// See: https://webpack.js.org/concepts/modules/

‎site/yarn.lock

Lines changed: 135 additions & 171 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)