Skip to content

Commit baca1aa

Browse files
kylecarbskylecarbs
authored
Merge branch 'main' into dependabot/go_modules/github.com/pion/webrtc/v3-3.1.25
2 parents d833f3a + 27749ce commit baca1aa

File tree

108 files changed

+58
-4
lines changed

Some content is hidden

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

108 files changed

+58
-4
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
site @coder/coder-frontend

‎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/e2e/pom/HealthzPage.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Locator, Page } from "@playwright/test"
2+
import { BasePom } from "./BasePom"
3+
4+
export class HealthzPage extends BasePom {
5+
constructor(baseURL: string | undefined, page: Page) {
6+
super(baseURL, "/healthz", page)
7+
}
8+
9+
getOk(): Locator {
10+
const locator = this.page.locator("text=ok")
11+
return locator
12+
}
13+
}

‎site/e2e/tests/healthz.spec.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { test } from "@playwright/test"
2+
import { HealthzPage } from "../pom/HealthzPage"
3+
4+
test("Healthz is available without authentication", async ({ baseURL, page }) => {
5+
const healthzPage = new HealthzPage(baseURL, page)
6+
await page.goto(healthzPage.url, { waitUntil: "networkidle" })
7+
await healthzPage.getOk().waitFor({ state: "visible" })
8+
})

‎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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { ProjectsPage } from "./pages/projects"
1414
import { ProjectPage } from "./pages/projects/[organization]/[project]"
1515
import { CreateWorkspacePage } from "./pages/projects/[organization]/[project]/create"
1616
import { WorkspacePage } from "./pages/workspaces/[workspace]"
17+
import { HealthzPage } from "./pages/healthz"
1718

1819
export const App: React.FC = () => {
1920
return (
@@ -45,6 +46,7 @@ export const App: React.FC = () => {
4546
<Route index element={<IndexPage />} />
4647

4748
<Route path="login" element={<SignInPage />} />
49+
<Route path="healthz" element={<HealthzPage />} />
4850
<Route path="cli-auth" element={<CliAuthenticationPage />} />
4951

5052
<Route path="projects">

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

File renamed without changes.

0 commit comments

Comments
 (0)