Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"humanize-duration": "3.32.2",
"jszip": "3.10.1",
"lodash": "4.17.21",
"lucide-react": "0.474.0",
"lucide-react": "0.545.0",
"monaco-editor": "0.53.0",
"pretty-bytes": "6.1.1",
"react": "19.1.1",
Expand Down
10 changes: 5 additions & 5 deletions site/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 9 additions & 7 deletions site/src/modules/resources/AppLink/ShareIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import BusinessIcon from "@mui/icons-material/Business";
import GroupOutlinedIcon from "@mui/icons-material/GroupOutlined";
import PublicOutlinedIcon from "@mui/icons-material/PublicOutlined";
import Tooltip from "@mui/material/Tooltip";
import type * as TypesGen from "api/typesGenerated";
import { SquareArrowOutUpRightIcon } from "lucide-react";
import {
Building2Icon,
GlobeIcon,
SquareArrowOutUpRightIcon,
UsersIcon,
} from "lucide-react";

interface ShareIconProps {
app: TypesGen.WorkspaceApp;
Expand All @@ -20,21 +22,21 @@ export const ShareIcon = ({ app }: ShareIconProps) => {
if (app.sharing_level === "authenticated") {
return (
<Tooltip title="Shared with all authenticated users">
<GroupOutlinedIcon />
<UsersIcon />
</Tooltip>
);
}
if (app.sharing_level === "organization") {
return (
<Tooltip title="Shared with organization members">
<BusinessIcon />
<Building2Icon />
</Tooltip>
);
}
if (app.sharing_level === "public") {
return (
<Tooltip title="Shared publicly">
<PublicOutlinedIcon />
<GlobeIcon />
</Tooltip>
);
}
Expand Down
16 changes: 8 additions & 8 deletions site/src/modules/resources/PortForwardButton.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
import BusinessIcon from "@mui/icons-material/Business";
import LockIcon from "@mui/icons-material/Lock";
import LockOpenIcon from "@mui/icons-material/LockOpen";
import SensorsIcon from "@mui/icons-material/Sensors";
import FormControl from "@mui/material/FormControl";
import Link from "@mui/material/Link";
import MenuItem from "@mui/material/MenuItem";
Expand Down Expand Up @@ -45,8 +41,12 @@ import {
} from "components/Tooltip/Tooltip";
import { useFormik } from "formik";
import {
BuildingIcon,
ChevronDownIcon,
ExternalLinkIcon,
LockIcon,
LockOpenIcon,
RadioIcon,
ShareIcon,
X as XIcon,
} from "lucide-react";
Expand Down Expand Up @@ -385,7 +385,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
target="_blank"
rel="noreferrer"
>
<SensorsIcon css={{ width: 14, height: 14 }} />
<RadioIcon className="size-icon-sm" />
{port.port}
</Link>
<Link
Expand Down Expand Up @@ -475,11 +475,11 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
rel="noreferrer"
>
{share.share_level === "public" ? (
<LockOpenIcon css={{ width: 14, height: 14 }} />
<LockOpenIcon className="size-icon-sm" />
) : share.share_level === "organization" ? (
<BusinessIcon css={{ width: 14, height: 14 }} />
<BuildingIcon className="size-icon-sm" />
) : (
<LockIcon css={{ width: 14, height: 14 }} />
<LockIcon className="size-icon-sm" />
)}
{label}
</Link>
Expand Down
12 changes: 7 additions & 5 deletions site/src/modules/templates/TemplateFiles/TemplateFileTree.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { css } from "@emotion/react";
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import FormatAlignLeftOutlined from "@mui/icons-material/FormatAlignLeftOutlined";
import Menu from "@mui/material/Menu";
import MenuItem from "@mui/material/MenuItem";
import { SimpleTreeView, TreeItem } from "@mui/x-tree-view";
import { DockerIcon } from "components/Icons/DockerIcon";
import { ChevronRightIcon } from "lucide-react";
import {
ChevronDownIcon,
ChevronRightIcon,
TextAlignStartIcon,
} from "lucide-react";
import {
type CSSProperties,
type ElementType,
Expand Down Expand Up @@ -90,7 +92,7 @@ export const TemplateFileTree: FC<TemplateFilesTreeProps> = ({

let icon: ElementType | undefined;
if (isFolder(content)) {
icon = FormatAlignLeftOutlined;
icon = TextAlignStartIcon;
} else if (filename.endsWith(".tf")) {
icon = FileTypeTerraform;
} else if (filename.endsWith(".md")) {
Expand Down Expand Up @@ -201,7 +203,7 @@ export const TemplateFileTree: FC<TemplateFilesTreeProps> = ({

return (
<SimpleTreeView
slots={{ collapseIcon: ExpandMoreIcon, expandIcon: ChevronRightIcon }}
slots={{ collapseIcon: ChevronDownIcon, expandIcon: ChevronRightIcon }}
aria-label="Files"
defaultExpandedItems={activePath ? expandablePaths(activePath) : []}
defaultSelectedItems={activePath}
Expand Down
23 changes: 10 additions & 13 deletions site/src/modules/templates/TemplateFiles/TemplateFiles.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
import EditOutlined from "@mui/icons-material/EditOutlined";
import RadioButtonCheckedOutlined from "@mui/icons-material/RadioButtonCheckedOutlined";
import { SyntaxHighlighter } from "components/SyntaxHighlighter/SyntaxHighlighter";
import set from "lodash/set";
import { EditIcon } from "lucide-react";
import { linkToTemplate, useLinks } from "modules/navigation";
import { type FC, useCallback, useMemo } from "react";
import { Link } from "react-router";
import { cn } from "utils/cn";
import type { FileTree } from "utils/filetree";
import type { TemplateVersionFiles } from "utils/templateVersion";
import { TemplateFileTree } from "./TemplateFileTree";
Expand Down Expand Up @@ -94,16 +94,13 @@ export const TemplateFiles: FC<TemplateFilesProps> = ({
return (
<div key={filename} css={styles.filePanel} id={filename}>
<header css={styles.fileHeader}>
{filename}
{info.hasDiff && (
<RadioButtonCheckedOutlined
css={{
width: 14,
height: 14,
color: theme.roles.warning.fill.outline,
}}
/>
)}
<span
className={cn({
"text-content-warning": info.hasDiff,
})}
>
{filename}
</span>

<div css={{ marginLeft: "auto" }}>
<Link
Expand All @@ -121,7 +118,7 @@ export const TemplateFiles: FC<TemplateFilesProps> = ({
},
}}
>
<EditOutlined css={{ fontSize: "inherit" }} />
<EditIcon className="text-inherit size-icon-xs" />
Edit
</Link>
</div>
Expand Down
7 changes: 3 additions & 4 deletions site/src/pages/HealthPage/DismissWarningButton.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import NotificationsOffOutlined from "@mui/icons-material/NotificationsOffOutlined";
import NotificationOutlined from "@mui/icons-material/NotificationsOutlined";
import Skeleton from "@mui/material/Skeleton";
import { healthSettings, updateHealthSettings } from "api/queries/debug";
import type { HealthSection } from "api/typesGenerated";
import { Button } from "components/Button/Button";
import { displaySuccess } from "components/GlobalSnackbar/utils";
import { Spinner } from "components/Spinner/Spinner";
import { BellIcon, BellOffIcon } from "lucide-react";
import { useMutation, useQuery, useQueryClient } from "react-query";

export const DismissWarningButton = (props: { healthcheck: HealthSection }) => {
Expand Down Expand Up @@ -49,7 +48,7 @@ export const DismissWarningButton = (props: { healthcheck: HealthSection }) => {
}}
>
<Spinner loading={enableMutation.isPending}>
<NotificationsOffOutlined />
<BellOffIcon />
</Spinner>
Enable warnings
</Button>
Expand All @@ -69,7 +68,7 @@ export const DismissWarningButton = (props: { healthcheck: HealthSection }) => {
}}
>
<Spinner loading={dismissMutation.isPending}>
<NotificationOutlined />
<BellIcon />
</Spinner>
Dismiss warnings
</Button>
Expand Down
15 changes: 3 additions & 12 deletions site/src/pages/HealthPage/HealthLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import { useTheme } from "@emotion/react";
import NotificationsOffOutlined from "@mui/icons-material/NotificationsOffOutlined";
import ReplayIcon from "@mui/icons-material/Replay";
import CircularProgress from "@mui/material/CircularProgress";
import IconButton from "@mui/material/IconButton";
import Tooltip from "@mui/material/Tooltip";
Expand All @@ -9,6 +6,7 @@ import type { HealthSeverity } from "api/typesGenerated";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { Loader } from "components/Loader/Loader";
import kebabCase from "lodash/fp/kebabCase";
import { BellOffIcon, RotateCcwIcon } from "lucide-react";
import { DashboardFullPage } from "modules/dashboard/DashboardLayout";
import { type FC, Suspense } from "react";
import { useMutation, useQuery, useQueryClient } from "react-query";
Expand All @@ -28,7 +26,6 @@ const linkStyles = {
};

export const HealthLayout: FC = () => {
const theme = useTheme();
const queryClient = useQueryClient();
const {
data: healthStatus,
Expand Down Expand Up @@ -91,7 +88,7 @@ export const HealthLayout: FC = () => {
{isRefreshing ? (
<CircularProgress size={16} />
) : (
<ReplayIcon className="size-5" />
<RotateCcwIcon className="size-5" />
)}
</IconButton>
</Tooltip>
Expand Down Expand Up @@ -155,13 +152,7 @@ export const HealthLayout: FC = () => {
/>
{label}
{healthSection.dismissed && (
<NotificationsOffOutlined
css={{
fontSize: 14,
marginLeft: "auto",
color: theme.palette.text.disabled,
}}
/>
<BellOffIcon className="size-icon-sm ml-auto text-content-disabled" />
)}
</NavLink>
);
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/HealthPage/WorkspaceProxyPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useTheme } from "@emotion/react";
import Tooltip from "@mui/material/Tooltip";
import type { HealthcheckReport } from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { EarthIcon, HashIcon } from "lucide-react";
import { GlobeIcon, HashIcon } from "lucide-react";
import type { FC } from "react";
import { useOutletContext } from "react-router";
import { createDayString } from "utils/createDayString";
Expand Down Expand Up @@ -107,7 +107,7 @@ const WorkspaceProxyPage: FC = () => {
<div css={{ display: "flex", flexWrap: "wrap", gap: 12 }}>
{region.wildcard_hostname && (
<Tooltip title="Wildcard Hostname">
<Pill icon={<EarthIcon />}>
<Pill icon={<GlobeIcon />}>
{region.wildcard_hostname}
</Pill>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/LoginPage/OAuthSignInForm.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import GitHubIcon from "@mui/icons-material/GitHub";
import KeyIcon from "@mui/icons-material/VpnKey";
import { visuallyHidden } from "@mui/utils";
import type { AuthMethods } from "api/typesGenerated";
import { Button } from "components/Button/Button";
import { KeyIcon } from "lucide-react";
import { type FC, useId } from "react";
import { Language } from "./Language";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import CheckOutlined from "@mui/icons-material/CheckOutlined";
import FileCopyOutlined from "@mui/icons-material/FileCopyOutlined";
import { API } from "api/api";
import { DetailedError } from "api/errors";
import type {
Expand All @@ -18,6 +16,7 @@ import { Skeleton } from "components/Skeleton/Skeleton";
import { useAuthenticated } from "hooks";
import { useEffectEvent } from "hooks/hookPolyfills";
import { useClipboard } from "hooks/useClipboard";
import { CheckIcon, CopyIcon } from "lucide-react";
import {
Diagnostics,
DynamicParameter,
Expand Down Expand Up @@ -308,8 +307,8 @@ const ButtonPreview: FC<ButtonPreviewProps> = ({ template, buttonValues }) => {
clipboard.copyToClipboard(textToCopy);
}}
>
{clipboard.showCopiedSuccess ? <CheckOutlined /> : <FileCopyOutlined />}{" "}
Copy button code
{clipboard.showCopiedSuccess ? <CheckIcon /> : <CopyIcon />} Copy button
code
</Button>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const TemplateVersionPageView: FC<TemplateVersionPageViewProps> = ({
)}
<Button variant="outline" asChild>
<RouterLink to={`${templateLink}/versions/${versionName}/edit`}>
<EditIcon />
<EditIcon className="!size-icon-sm" />
Edit
</RouterLink>
</Button>
Expand Down
Loading
Loading