Skip to content

Commit b9933d4

Browse files
refactor: camel case files (coder#1081)
1 parent 5ce0676 commit b9933d4

Some content is hidden

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

43 files changed

+37
-37
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ coderd/database/generate: fmt/sql coderd/database/dump.sql $(wildcard coderd/dat
2020
.PHONY: coderd/database/generate
2121

2222
apitypings/generate: site/src/api/types.ts
23-
go run scripts/apitypings/main.go > site/src/api/types-generated.ts
23+
go run scripts/apitypings/main.go > site/src/api/typesGenerated.ts
2424
cd site && yarn run format:types
2525
.PHONY: apitypings/generate
2626

site/.storybook/preview.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { createMemoryHistory } from "history"
55
import { addDecorator } from "node_modules/@storybook/react"
66
import { unstable_HistoryRouter as HistoryRouter } from "react-router-dom"
77
import { dark, light } from "../src/theme"
8-
import "../src/theme/global-fonts"
8+
import "../src/theme/globalFonts"
99

1010
const providerFn = ({ children, theme }) => (
1111
<ThemeProvider theme={theme}>
File renamed without changes.

site/jest.setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { server } from "./src/test_helpers/server"
1+
import { server } from "./src/testHelpers/server"
22

33
// Establish API mocking before all tests through MSW.
44
beforeAll(() =>

site/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"chromatic": "chromatic",
1111
"dev": "webpack-dev-server --config=webpack.dev.ts",
1212
"format:check": "prettier --check '**/*.{css,html,js,json,jsx,md,ts,tsx,yaml,yml}'",
13-
"format:types": "prettier --write 'src/api/types-generated.ts'",
13+
"format:types": "prettier --write 'src/api/typesGenerated.ts'",
1414
"format:write": "prettier --write '**/*.{css,html,js,json,jsx,md,ts,tsx,yaml,yml}'",
1515
"lint": "jest --selectProjects lint",
1616
"lint:fix": "FIX=true yarn lint",

site/src/AppRouter.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { HealthzPage } from "./pages/healthz"
1010
import { SignInPage } from "./pages/login"
1111
import { OrganizationsPage } from "./pages/orgs"
1212
import { PreferencesAccountPage } from "./pages/preferences/account"
13-
import { PreferencesLinkedAccountsPage } from "./pages/preferences/linked-accounts"
13+
import { PreferencesLinkedAccountsPage } from "./pages/preferences/linkedAccounts"
1414
import { PreferencesSecurityPage } from "./pages/preferences/security"
15-
import { PreferencesSSHKeysPage } from "./pages/preferences/ssh-keys"
15+
import { PreferencesSSHKeysPage } from "./pages/preferences/sshKeys"
1616
import { SettingsPage } from "./pages/settings"
1717
import { TemplatesPage } from "./pages/templates"
1818
import { TemplatePage } from "./pages/templates/[organization]/[template]"

site/src/api/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import axios, { AxiosRequestHeaders } from "axios"
22
import { mutate } from "swr"
3-
import { MockPager, MockUser, MockUser2 } from "../test_helpers/entities"
3+
import { MockPager, MockUser, MockUser2 } from "../testHelpers/entities"
44
import * as Types from "./types"
55

66
const CONTENT_TYPE_JSON: AxiosRequestHeaders = {
File renamed without changes.

site/src/app.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { SWRConfig } from "swr"
66
import { AppRouter } from "./AppRouter"
77
import { GlobalSnackbar } from "./components/Snackbar/GlobalSnackbar"
88
import { light } from "./theme"
9-
import "./theme/global-fonts"
9+
import "./theme/globalFonts"
1010
import { XServiceProvider } from "./xServices/StateContext"
1111

1212
export const App: React.FC = () => {

site/src/components/AdminDropdown/AdminDropdown.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { history, render } from "../../test_helpers"
3+
import { history, render } from "../../testHelpers"
44
import { AdminDropdown, Language } from "./AdminDropdown"
55

66
const renderAndClick = async () => {

site/src/components/CodeBlock/index.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { render } from "../../test_helpers"
3+
import { render } from "../../testHelpers"
44
import { CodeBlock } from "./index"
55

66
describe("CodeBlock", () => {

site/src/components/CodeExample/CodeExample.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { render } from "../../test_helpers"
3+
import { render } from "../../testHelpers"
44
import { CodeExample } from "./CodeExample"
55

66
describe("CodeExample", () => {

site/src/components/EmptyState/index.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { render } from "../../test_helpers"
3+
import { render } from "../../testHelpers"
44
import { EmptyState } from "./index"
55

66
describe("EmptyState", () => {

site/src/components/Header/index.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { render } from "./../../test_helpers"
3+
import { render } from "../../testHelpers"
44
import { Header } from "./index"
55

66
describe("Header", () => {

site/src/components/Icons/index.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import SvgIcon from "@material-ui/core/SvgIcon"
22
import React from "react"
3-
import { render } from "./../../test_helpers"
3+
import { render } from "../../testHelpers"
44
import * as Icons from "./index"
55

66
const getAllIcons = (): [string, typeof SvgIcon][] => {

site/src/components/Navbar/NavbarView/NavbarView.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
33
import { NavbarView } from "."
4-
import { render } from "../../../test_helpers"
5-
import { MockUser } from "../../../test_helpers/entities"
4+
import { render } from "../../../testHelpers"
5+
import { MockUser } from "../../../testHelpers/entities"
66

77
describe("NavbarView", () => {
88
const noop = () => {

site/src/components/Navbar/UserDropdown/UserDropdown.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
33
import { Language, UserDropdown, UserDropdownProps } from "."
4-
import { render } from "../../../test_helpers"
5-
import { MockUser } from "../../../test_helpers/entities"
4+
import { render } from "../../../testHelpers"
5+
import { MockUser } from "../../../testHelpers/entities"
66

77
const renderAndClick = async (props: Partial<UserDropdownProps> = {}) => {
88
render(<UserDropdown user={props.user ?? MockUser} onSignOut={props.onSignOut ?? jest.fn()} />)

site/src/components/Page/Footer.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { MockBuildInfo, render } from "../../test_helpers"
3+
import { MockBuildInfo, render } from "../../testHelpers"
44
import { Footer, Language } from "./Footer"
55

66
describe("Footer", () => {

site/src/components/SignIn/CliAuthToken.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { render } from "../../test_helpers"
3+
import { render } from "../../testHelpers"
44
import { CliAuthToken } from "./CliAuthToken"
55

66
describe("CliAuthToken", () => {

site/src/components/Table/Cells/UserCell.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ComponentMeta, Story } from "@storybook/react"
22
import React from "react"
3-
import { MockUser, MockUserAgent } from "../../../test_helpers"
3+
import { MockUser, MockUserAgent } from "../../../testHelpers"
44
import { UserCell, UserCellProps } from "./UserCell"
55

66
export default {

site/src/components/Table/Cells/UserCell.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { fireEvent, render, screen } from "@testing-library/react"
22
import React from "react"
3-
import { MockUser, MockUserAgent, WrapperComponent } from "../../../test_helpers"
3+
import { MockUser, MockUserAgent, WrapperComponent } from "../../../testHelpers"
44
import { UserCell, UserCellProps } from "./UserCell"
55

66
namespace Helpers {

site/src/components/Table/Table.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { render } from "./../../test_helpers"
3+
import { render } from "../../testHelpers"
44
import { Column, Table } from "./Table"
55

66
interface TestData {

site/src/components/User/UserAvatar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Avatar from "@material-ui/core/Avatar"
22
import React from "react"
3-
import { firstLetter } from "../../util/first-letter"
3+
import { firstLetter } from "../../util/firstLetter"
44

55
export interface UserAvatarProps {
66
className?: string

site/src/components/UsersTable/UsersTable.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ComponentMeta, Story } from "@storybook/react"
22
import React from "react"
3-
import { MockUser, MockUser2 } from "../../test_helpers"
3+
import { MockUser, MockUser2 } from "../../testHelpers"
44
import { UsersTable, UsersTableProps } from "./UsersTable"
55

66
export default {

site/src/components/Workspace/Workspace.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Story } from "@storybook/react"
22
import React from "react"
3-
import { MockOrganization, MockTemplate, MockWorkspace } from "../../test_helpers"
3+
import { MockOrganization, MockTemplate, MockWorkspace } from "../../testHelpers"
44
import { Workspace, WorkspaceProps } from "./Workspace"
55

66
export default {

site/src/components/Workspace/Workspace.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { MockOrganization, MockTemplate, MockWorkspace, render } from "../../test_helpers"
3+
import { MockOrganization, MockTemplate, MockWorkspace, render } from "../../testHelpers"
44
import { Workspace } from "./Workspace"
55

66
describe("Workspace", () => {

site/src/components/Workspace/WorkspaceSchedule.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Story } from "@storybook/react"
22
import React from "react"
3-
import { MockWorkspaceAutostartEnabled } from "../../test_helpers"
3+
import { MockWorkspaceAutostartEnabled } from "../../testHelpers"
44
import { WorkspaceSchedule, WorkspaceScheduleProps } from "./WorkspaceSchedule"
55

66
export default {

site/src/forms/CreateTemplateForm.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { render, screen } from "@testing-library/react"
22
import React from "react"
3-
import { MockOrganization, MockProvisioner, MockTemplate } from "./../test_helpers"
3+
import { MockOrganization, MockProvisioner, MockTemplate } from "../testHelpers"
44
import { CreateTemplateForm } from "./CreateTemplateForm"
55

66
describe("CreateTemplateForm", () => {

site/src/forms/CreateWorkspaceForm.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { render, screen } from "@testing-library/react"
22
import React from "react"
3-
import { MockTemplate, MockWorkspace } from "./../test_helpers"
3+
import { MockTemplate, MockWorkspace } from "../testHelpers"
44
import { CreateWorkspaceForm } from "./CreateWorkspaceForm"
55

66
describe("CreateWorkspaceForm", () => {

site/src/pages/UsersPage/UsersPage.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { MockPager, render } from "../../test_helpers"
3+
import { MockPager, render } from "../../testHelpers"
44
import { UsersPage } from "./UsersPage"
55
import { Language } from "./UsersPageView"
66

site/src/pages/UsersPage/UsersPageView.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ComponentMeta, Story } from "@storybook/react"
22
import React from "react"
3-
import { MockPager, MockUser, MockUser2 } from "../../test_helpers"
3+
import { MockPager, MockUser, MockUser2 } from "../../testHelpers"
44
import { UsersPageView, UsersPageViewProps } from "./UsersPageView"
55

66
export default {

site/src/pages/login.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import userEvent from "@testing-library/user-event"
33
import { rest } from "msw"
44
import React from "react"
55
import { Language } from "../components/SignIn/SignInForm"
6-
import { history, render } from "../test_helpers"
7-
import { server } from "../test_helpers/server"
6+
import { history, render } from "../testHelpers"
7+
import { server } from "../testHelpers/server"
88
import { SignInPage } from "./login"
99

1010
describe("SignInPage", () => {

site/src/pages/preferences/account.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React from "react"
33
import * as API from "../../api"
44
import * as AccountForm from "../../components/Preferences/AccountForm"
55
import { GlobalSnackbar } from "../../components/Snackbar/GlobalSnackbar"
6-
import { renderWithAuth } from "../../test_helpers"
6+
import { renderWithAuth } from "../../testHelpers"
77
import * as AuthXService from "../../xServices/auth/authXService"
88
import { Language, PreferencesAccountPage } from "./account"
99

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

site/src/util/first-letter.test.ts renamed to site/src/util/firstLetter.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { firstLetter } from "./first-letter"
1+
import { firstLetter } from "./firstLetter"
22

33
describe("first-letter", () => {
44
it.each<[string, string]>([
File renamed without changes.

site/webpack.common.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const dashboardEntrypoint = path.join(__dirname, "src/Main.tsx")
2525
/**
2626
* templatePath is the path to HTML templates for injecting webpack bundles
2727
*/
28-
const templatePath = path.join(__dirname, "html_templates")
28+
const templatePath = path.join(__dirname, "htmlTemplates")
2929

3030
/**
3131
* dashboardHTMLPluginConfig is the HtmlWebpackPlugin configuration for the

0 commit comments

Comments
 (0)