Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit12c5c65

Browse files
refactor: replace MUI buttons on banners, paywalls and a few pages (#16215)
1 parent0c30a11 commit12c5c65

File tree

16 files changed

+79
-110
lines changed

16 files changed

+79
-110
lines changed

‎site/e2e/helpers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ export async function createUser(
10621062
awaitpage.goto("/deployment/users",{waitUntil:"domcontentloaded"});
10631063
awaitexpect(page).toHaveTitle("Users - Coder");
10641064

1065-
awaitpage.getByRole("button",{name:"Create user"}).click();
1065+
awaitpage.getByRole("link",{name:"Create user"}).click();
10661066
awaitexpect(page).toHaveTitle("Create User - Coder");
10671067

10681068
constusername=userValues.username??randomName();

‎site/src/components/EmptyState/EmptyState.stories.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
importButtonfrom"@mui/material/Button";
21
importtype{Meta,StoryObj}from"@storybook/react";
2+
import{Button}from"components/Button/Button";
33
import{EmptyState}from"./EmptyState";
44

55
constmeta:Meta<typeofEmptyState>={

‎site/src/components/Paywall/Paywall.tsx‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
importtype{Interpolation,Theme}from"@emotion/react";
22
importTaskAltIconfrom"@mui/icons-material/TaskAlt";
3-
importButtonfrom"@mui/material/Button";
43
importLinkfrom"@mui/material/Link";
54
import{PremiumBadge}from"components/Badges/Badges";
5+
import{Button}from"components/Button/Button";
66
import{Stack}from"components/Stack/Stack";
77
importtype{FC,ReactNode}from"react";
8-
import{docs}from"utils/docs";
98

109
exportinterfacePaywallProps{
1110
message:string;
@@ -57,15 +56,14 @@ export const Paywall: FC<PaywallProps> = ({
5756
</li>
5857
</ul>
5958
<divcss={styles.learnButton}>
60-
<Button
61-
href="https://coder.com/pricing#compare-plans"
62-
target="_blank"
63-
rel="noreferrer"
64-
startIcon={<spancss={{fontSize:22}}>&rarr;</span>}
65-
variant="outlined"
66-
color="neutral"
67-
>
68-
Learn about Premium
59+
<ButtonasChild>
60+
<a
61+
href="https://coder.com/pricing#compare-plans"
62+
target="_blank"
63+
rel="noreferrer"
64+
>
65+
Learn about Premium
66+
</a>
6967
</Button>
7068
</div>
7169
</Stack>

‎site/src/components/Paywall/PopoverPaywall.tsx‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
importtype{Interpolation,Theme}from"@emotion/react";
22
importTaskAltIconfrom"@mui/icons-material/TaskAlt";
3-
importButtonfrom"@mui/material/Button";
43
importLinkfrom"@mui/material/Link";
54
import{PremiumBadge}from"components/Badges/Badges";
5+
import{Button}from"components/Button/Button";
66
import{Stack}from"components/Stack/Stack";
77
importtype{FC,ReactNode}from"react";
8-
import{docs}from"utils/docs";
98

109
exportinterfacePopoverPaywallProps{
1110
message:string;
@@ -61,15 +60,14 @@ export const PopoverPaywall: FC<PopoverPaywallProps> = ({
6160
</li>
6261
</ul>
6362
<divcss={styles.learnButton}>
64-
<Button
65-
href="https://coder.com/pricing#compare-plans"
66-
target="_blank"
67-
rel="noreferrer"
68-
startIcon={<spancss={{fontSize:22}}>&rarr;</span>}
69-
variant="outlined"
70-
color="neutral"
71-
>
72-
Learn about Premium
63+
<ButtonasChild>
64+
<a
65+
href="https://coder.com/pricing#compare-plans"
66+
target="_blank"
67+
rel="noreferrer"
68+
>
69+
Learn about Premium
70+
</a>
7371
</Button>
7472
</div>
7573
</Stack>

‎site/src/components/SettingsHeader/SettingsHeader.tsx‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import{useTheme}from"@emotion/react";
22
importLaunchOutlinedfrom"@mui/icons-material/LaunchOutlined";
3-
importButtonfrom"@mui/material/Button";
3+
import{Button}from"components/Button/Button";
44
import{Stack}from"components/Stack/Stack";
5+
import{SquareArrowOutUpRightIcon}from"lucide-react";
56
importtype{FC,ReactNode}from"react";
67

78
interfaceHeaderProps{
@@ -62,13 +63,11 @@ export const SettingsHeader: FC<HeaderProps> = ({
6263
</div>
6364

6465
{docsHref&&(
65-
<Button
66-
startIcon={<LaunchOutlined/>}
67-
component="a"
68-
href={docsHref}
69-
target="_blank"
70-
>
71-
Read the docs
66+
<ButtonasChildvariant="outline">
67+
<ahref={docsHref}target="_blank"rel="noreferrer">
68+
<SquareArrowOutUpRightIcon/>
69+
Read the docs
70+
</a>
7271
</Button>
7372
)}
7473
</Stack>

‎site/src/modules/dashboard/DashboardLayout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importInfoOutlinedfrom"@mui/icons-material/InfoOutlined";
2-
importButtonfrom"@mui/material/Button";
32
importLinkfrom"@mui/material/Link";
43
importSnackbarfrom"@mui/material/Snackbar";
4+
import{Button}from"components/Button/Button";
55
import{Loader}from"components/Loader/Loader";
66
import{useAuthenticated}from"contexts/auth/RequireAuth";
77
import{AnnouncementBanners}from"modules/dashboard/AnnouncementBanners/AnnouncementBanners";
@@ -92,7 +92,7 @@ export const DashboardLayout: FC = () => {
9292
</div>
9393
}
9494
action={
95-
<Buttonvariant="text"size="small"onClick={updateCheck.dismiss}>
95+
<Buttonvariant="subtle"size="sm"onClick={updateCheck.dismiss}>
9696
Dismiss
9797
</Button>
9898
}

‎site/src/modules/resources/XRayScanAlert.tsx‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
importtype{Interpolation,Theme}from"@emotion/react";
2-
importButtonfrom"@mui/material/Button";
32
importtype{JFrogXrayScan}from"api/typesGenerated";
3+
import{Button}from"components/Button/Button";
44
import{ExternalImage}from"components/ExternalImage/ExternalImage";
55
importtype{FC}from"react";
66

@@ -39,15 +39,10 @@ export const XRayScanAlert: FC<XRayScanAlertProps> = ({ scan }) => {
3939
</ul>
4040
</div>
4141
<divcss={styles.link}>
42-
<Button
43-
component="a"
44-
size="small"
45-
variant="text"
46-
href={scan.results_url}
47-
target="_blank"
48-
rel="noreferrer"
49-
>
50-
Review results
42+
<Buttonsize="sm"variant="subtle"asChild>
43+
<ahref={scan.results_url}target="_blank"rel="noreferrer">
44+
Review results
45+
</a>
5146
</Button>
5247
</div>
5348
</div>

‎site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerSettings.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import{typeCSSObject,useTheme}from"@emotion/react";
2-
importAddIconfrom"@mui/icons-material/AddOutlined";
3-
importButtonfrom"@mui/material/Button";
42
importLinkfrom"@mui/material/Link";
53
importTablefrom"@mui/material/Table";
64
importTableBodyfrom"@mui/material/TableBody";
@@ -9,9 +7,11 @@ import TableContainer from "@mui/material/TableContainer";
97
importTableHeadfrom"@mui/material/TableHead";
108
importTableRowfrom"@mui/material/TableRow";
119
importtype{BannerConfig}from"api/typesGenerated";
10+
import{Button}from"components/Button/Button";
1211
import{ConfirmDialog}from"components/Dialogs/ConfirmDialog/ConfirmDialog";
1312
import{EmptyState}from"components/EmptyState/EmptyState";
1413
import{Stack}from"components/Stack/Stack";
14+
import{PlusIcon}from"lucide-react";
1515
import{typeFC,useState}from"react";
1616
import{AnnouncementBannerDialog}from"./AnnouncementBannerDialog";
1717
import{AnnouncementBannerItem}from"./AnnouncementBannerItem";
@@ -89,8 +89,9 @@ export const AnnouncementBannerSettings: FC<
8989
<Button
9090
disabled={!isEntitled}
9191
onClick={()=>addBanner()}
92-
startIcon={<AddIcon/>}
92+
variant="outline"
9393
>
94+
<PlusIcon/>
9495
New
9596
</Button>
9697
</Stack>

‎site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/AddNewLicensePageView.tsx‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
importKeyboardArrowLeftfrom"@mui/icons-material/KeyboardArrowLeft";
2-
importButtonfrom"@mui/material/Button";
31
importTextFieldfrom"@mui/material/TextField";
42
import{ErrorAlert}from"components/Alert/ErrorAlert";
3+
import{Button}from"components/Button/Button";
54
import{FileUpload}from"components/FileUpload/FileUpload";
65
import{displayError}from"components/GlobalSnackbar/utils";
76
import{SettingsHeader}from"components/SettingsHeader/SettingsHeader";
87
import{Stack}from"components/Stack/Stack";
8+
import{ChevronLeftIcon}from"lucide-react";
99
importtype{FC}from"react";
1010
import{LinkasRouterLink}from"react-router-dom";
1111
import{Fieldset}from"../Fieldset";
@@ -54,12 +54,11 @@ export const AddNewLicensePageView: FC<AddNewLicenseProps> = ({
5454
title="Add a license"
5555
description="Get access to high availability, RBAC, quotas, and more."
5656
/>
57-
<Button
58-
component={RouterLink}
59-
startIcon={<KeyboardArrowLeft/>}
60-
to="/deployment/licenses"
61-
>
62-
All Licenses
57+
<ButtonasChildvariant="outline">
58+
<RouterLinkto="/deployment/licenses">
59+
<ChevronLeftIcon/>
60+
All Licenses
61+
</RouterLink>
6362
</Button>
6463
</Stack>
6564

‎site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { useWindowSize } from "hooks/useWindowSize";
1414
importtype{FC}from"react";
1515
importConfettifrom"react-confetti";
1616
import{Link}from"react-router-dom";
17-
import{license}from"../../../../e2e/constants";
1817
import{LicenseCard}from"./LicenseCard";
1918
import{LicenseSeatConsumptionChart}from"./LicenseSeatConsumptionChart";
2019

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp