Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 1 addition & 1 deletion site/e2e/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ export async function createUser(
await page.goto("/deployment/users", { waitUntil: "domcontentloaded" });
await expect(page).toHaveTitle("Users - Coder");

await page.getByRole("button", { name: "Create user" }).click();
await page.getByRole("link", { name: "Create user" }).click();
await expect(page).toHaveTitle("Create User - Coder");

const username = userValues.username ?? randomName();
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/EmptyState/EmptyState.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Button from "@mui/material/Button";
import type { Meta, StoryObj } from "@storybook/react";
import { Button } from "components/Button/Button";
import { EmptyState } from "./EmptyState";

const meta: Meta<typeof EmptyState> = {
Expand Down
20 changes: 9 additions & 11 deletions site/src/components/Paywall/Paywall.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import type { Interpolation, Theme } from "@emotion/react";
import TaskAltIcon from "@mui/icons-material/TaskAlt";
import Button from "@mui/material/Button";
import Link from "@mui/material/Link";
import { PremiumBadge } from "components/Badges/Badges";
import { Button } from "components/Button/Button";
import { Stack } from "components/Stack/Stack";
import type { FC, ReactNode } from "react";
import { docs } from "utils/docs";

export interface PaywallProps {
message: string;
Expand Down Expand Up @@ -57,15 +56,14 @@ export const Paywall: FC<PaywallProps> = ({
</li>
</ul>
<div css={styles.learnButton}>
<Button
href="https://coder.com/pricing#compare-plans"
target="_blank"
rel="noreferrer"
startIcon={<span css={{ fontSize: 22 }}>&rarr;</span>}
variant="outlined"
color="neutral"
>
Learn about Premium
<Button variant="outline" asChild>
<a
href="https://coder.com/pricing#compare-plans"
target="_blank"
rel="noreferrer"
>
Learn about Premium
</a>
</Button>
</div>
</Stack>
Expand Down
20 changes: 9 additions & 11 deletions site/src/components/Paywall/PopoverPaywall.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import type { Interpolation, Theme } from "@emotion/react";
import TaskAltIcon from "@mui/icons-material/TaskAlt";
import Button from "@mui/material/Button";
import Link from "@mui/material/Link";
import { PremiumBadge } from "components/Badges/Badges";
import { Button } from "components/Button/Button";
import { Stack } from "components/Stack/Stack";
import type { FC, ReactNode } from "react";
import { docs } from "utils/docs";

export interface PopoverPaywallProps {
message: string;
Expand Down Expand Up @@ -61,15 +60,14 @@ export const PopoverPaywall: FC<PopoverPaywallProps> = ({
</li>
</ul>
<div css={styles.learnButton}>
<Button
href="https://coder.com/pricing#compare-plans"
target="_blank"
rel="noreferrer"
startIcon={<span css={{ fontSize: 22 }}>&rarr;</span>}
variant="outlined"
color="neutral"
>
Learn about Premium
<Button variant="outline" asChild>
<a
href="https://coder.com/pricing#compare-plans"
target="_blank"
rel="noreferrer"
>
Learn about Premium
</a>
</Button>
</div>
</Stack>
Expand Down
15 changes: 7 additions & 8 deletions site/src/components/SettingsHeader/SettingsHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { useTheme } from "@emotion/react";
import LaunchOutlined from "@mui/icons-material/LaunchOutlined";
import Button from "@mui/material/Button";
import { Button } from "components/Button/Button";
import { Stack } from "components/Stack/Stack";
import { SquareArrowOutUpRightIcon } from "lucide-react";
import type { FC, ReactNode } from "react";

interface HeaderProps {
Expand Down Expand Up @@ -62,13 +63,11 @@ export const SettingsHeader: FC<HeaderProps> = ({
</div>

{docsHref && (
<Button
startIcon={<LaunchOutlined />}
component="a"
href={docsHref}
target="_blank"
>
Read the docs
<Button asChild variant="outline">
<a href={docsHref} target="_blank" rel="noreferrer">
<SquareArrowOutUpRightIcon />
Read the docs
</a>
</Button>
)}
</Stack>
Expand Down
4 changes: 2 additions & 2 deletions site/src/modules/dashboard/DashboardLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import InfoOutlined from "@mui/icons-material/InfoOutlined";
import Button from "@mui/material/Button";
import Link from "@mui/material/Link";
import Snackbar from "@mui/material/Snackbar";
import { Button } from "components/Button/Button";
import { Loader } from "components/Loader/Loader";
import { useAuthenticated } from "contexts/auth/RequireAuth";
import { AnnouncementBanners } from "modules/dashboard/AnnouncementBanners/AnnouncementBanners";
Expand Down Expand Up @@ -92,7 +92,7 @@ export const DashboardLayout: FC = () => {
</div>
}
action={
<Button variant="text" size="small" onClick={updateCheck.dismiss}>
<Button variant="subtle" size="sm" onClick={updateCheck.dismiss}>
Dismiss
</Button>
}
Expand Down
15 changes: 5 additions & 10 deletions site/src/modules/resources/XRayScanAlert.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Interpolation, Theme } from "@emotion/react";
import Button from "@mui/material/Button";
import type { JFrogXrayScan } from "api/typesGenerated";
import { Button } from "components/Button/Button";
import { ExternalImage } from "components/ExternalImage/ExternalImage";
import type { FC } from "react";

Expand Down Expand Up @@ -39,15 +39,10 @@ export const XRayScanAlert: FC<XRayScanAlertProps> = ({ scan }) => {
</ul>
</div>
<div css={styles.link}>
<Button
component="a"
size="small"
variant="text"
href={scan.results_url}
target="_blank"
rel="noreferrer"
>
Review results
<Button size="sm" variant="subtle" asChild>
<a href={scan.results_url} target="_blank" rel="noreferrer">
Review results
</a>
</Button>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { type CSSObject, useTheme } from "@emotion/react";
import AddIcon from "@mui/icons-material/AddOutlined";
import Button from "@mui/material/Button";
import Link from "@mui/material/Link";
import Table from "@mui/material/Table";
import TableBody from "@mui/material/TableBody";
Expand All @@ -9,9 +7,11 @@ import TableContainer from "@mui/material/TableContainer";
import TableHead from "@mui/material/TableHead";
import TableRow from "@mui/material/TableRow";
import type { BannerConfig } from "api/typesGenerated";
import { Button } from "components/Button/Button";
import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog";
import { EmptyState } from "components/EmptyState/EmptyState";
import { Stack } from "components/Stack/Stack";
import { PlusIcon } from "lucide-react";
import { type FC, useState } from "react";
import { AnnouncementBannerDialog } from "./AnnouncementBannerDialog";
import { AnnouncementBannerItem } from "./AnnouncementBannerItem";
Expand Down Expand Up @@ -86,11 +86,8 @@ export const AnnouncementBannerSettings: FC<
>
Announcement Banners
</h3>
<Button
disabled={!isEntitled}
onClick={() => addBanner()}
startIcon={<AddIcon />}
>
<Button disabled={!isEntitled} onClick={() => addBanner()}>
<PlusIcon />
New
</Button>
</Stack>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import KeyboardArrowLeft from "@mui/icons-material/KeyboardArrowLeft";
import Button from "@mui/material/Button";
import TextField from "@mui/material/TextField";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { Button } from "components/Button/Button";
import { FileUpload } from "components/FileUpload/FileUpload";
import { displayError } from "components/GlobalSnackbar/utils";
import { SettingsHeader } from "components/SettingsHeader/SettingsHeader";
import { Stack } from "components/Stack/Stack";
import { ChevronLeftIcon } from "lucide-react";
import type { FC } from "react";
import { Link as RouterLink } from "react-router-dom";
import { Fieldset } from "../Fieldset";
Expand Down Expand Up @@ -54,12 +54,11 @@ export const AddNewLicensePageView: FC<AddNewLicenseProps> = ({
title="Add a license"
description="Get access to high availability, RBAC, quotas, and more."
/>
<Button
component={RouterLink}
startIcon={<KeyboardArrowLeft />}
to="/deployment/licenses"
>
All Licenses
<Button asChild variant="outline">
<RouterLink to="/deployment/licenses">
<ChevronLeftIcon />
All Licenses
</RouterLink>
</Button>
</Stack>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { useWindowSize } from "hooks/useWindowSize";
import type { FC } from "react";
import Confetti from "react-confetti";
import { Link } from "react-router-dom";
import { license } from "../../../../e2e/constants";
import { LicenseCard } from "./LicenseCard";
import { LicenseSeatConsumptionChart } from "./LicenseSeatConsumptionChart";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import KeyboardArrowLeft from "@mui/icons-material/KeyboardArrowLeft";
import Button from "@mui/material/Button";
import type * as TypesGen from "api/typesGenerated";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { Button } from "components/Button/Button";
import { SettingsHeader } from "components/SettingsHeader/SettingsHeader";
import { Stack } from "components/Stack/Stack";
import { ChevronLeftIcon } from "lucide-react";
import type { FC } from "react";
import { Link } from "react-router-dom";
import { OAuth2AppForm } from "./OAuth2AppForm";
Expand All @@ -30,12 +31,11 @@ export const CreateOAuth2AppPageView: FC<CreateOAuth2AppProps> = ({
title="Add an OAuth2 application"
description="Configure an application to use Coder as an OAuth2 provider."
/>
<Button
component={Link}
startIcon={<KeyboardArrowLeft />}
to="/deployment/oauth2-provider/apps"
>
All OAuth2 Applications
<Button variant="outline" asChild>
<Link to="/deployment/oauth2-provider/apps">
<ChevronLeftIcon />
All OAuth2 Applications
</Link>
</Button>
</Stack>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { type Interpolation, type Theme, useTheme } from "@emotion/react";
import CopyIcon from "@mui/icons-material/FileCopyOutlined";
import KeyboardArrowLeft from "@mui/icons-material/KeyboardArrowLeft";
import LoadingButton from "@mui/lab/LoadingButton";
import Button from "@mui/material/Button";
import Divider from "@mui/material/Divider";
import Table from "@mui/material/Table";
import TableBody from "@mui/material/TableBody";
Expand All @@ -13,6 +12,7 @@ import TableRow from "@mui/material/TableRow";
import type * as TypesGen from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { Button } from "components/Button/Button";
import { CodeExample } from "components/CodeExample/CodeExample";
import { CopyableValue } from "components/CopyableValue/CopyableValue";
import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog";
Expand All @@ -21,6 +21,7 @@ import { Loader } from "components/Loader/Loader";
import { SettingsHeader } from "components/SettingsHeader/SettingsHeader";
import { Stack } from "components/Stack/Stack";
import { TableLoader } from "components/TableLoader/TableLoader";
import { ChevronLeftIcon } from "lucide-react";
import { type FC, useState } from "react";
import { Link, useSearchParams } from "react-router-dom";
import { createDayString } from "utils/createDayString";
Expand Down Expand Up @@ -79,12 +80,11 @@ export const EditOAuth2AppPageView: FC<EditOAuth2AppProps> = ({
title="Edit OAuth2 application"
description="Configure an application to use Coder as an OAuth2 provider."
/>
<Button
component={Link}
startIcon={<KeyboardArrowLeft />}
to="/deployment/oauth2-provider/apps"
>
All OAuth2 Applications
<Button variant="outline">
<Link to="/deployment/oauth2-provider/apps">
<ChevronLeftIcon />
All OAuth2 Applications
</Link>
</Button>
</Stack>

Expand Down Expand Up @@ -171,9 +171,7 @@ export const EditOAuth2AppPageView: FC<EditOAuth2AppProps> = ({
error={error}
actions={
<Button
variant="outlined"
type="button"
color="error"
variant="destructive"
onClick={() => setShowDelete(true)}
>
Delete&hellip;
Expand Down Expand Up @@ -303,12 +301,7 @@ const OAuth2SecretRow: FC<OAuth2SecretRowProps> = ({
</>
}
/>
<Button
variant="outlined"
type="button"
color="error"
onClick={() => setShowDelete(true)}
>
<Button variant="destructive" onClick={() => setShowDelete(true)}>
Delete&hellip;
</Button>
</TableCell>
Expand Down
14 changes: 4 additions & 10 deletions site/src/pages/UsersPage/UsersPageView.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import PersonAdd from "@mui/icons-material/PersonAdd";
import Button from "@mui/material/Button";
import type { GroupsByUserId } from "api/queries/groups";
import type * as TypesGen from "api/typesGenerated";
import { Button } from "components/Button/Button";
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
import {
PaginationContainer,
type PaginationResult,
} from "components/PaginationWidget/PaginationContainer";
import type { ComponentProps, FC } from "react";
import { useNavigate } from "react-router-dom";
import { Link } from "react-router-dom";
import { UsersFilter } from "./UsersFilter";
import { UsersTable } from "./UsersTable/UsersTable";

Expand Down Expand Up @@ -65,19 +64,14 @@ export const UsersPageView: FC<UsersPageViewProps> = ({
usersQuery,
canCreateUser,
}) => {
const navigate = useNavigate();

return (
<>
<PageHeader
css={{ paddingTop: 0 }}
actions={
canCreateUser && (
<Button
onClick={() => navigate("create")}
startIcon={<PersonAdd />}
>
Create user
<Button asChild>
<Link to="create">Create user</Link>
</Button>
)
}
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/WorkspacePage/WorkspaceDeletedBanner.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Button from "@mui/material/Button";
import { Alert } from "components/Alert/Alert";
import { Button } from "components/Button/Button";
import type { FC } from "react";

export interface WorkspaceDeletedBannerProps {
Expand All @@ -10,7 +10,7 @@ export const WorkspaceDeletedBanner: FC<WorkspaceDeletedBannerProps> = ({
handleClick,
}) => {
const NewWorkspaceButton = (
<Button onClick={handleClick} size="small" variant="text">
<Button onClick={handleClick} size="sm" variant="subtle">
Create new workspace
</Button>
);
Expand Down
Loading
Loading