Skip to content

chore: improve announcement banner color picker #16158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 16, 2025
Merged

chore: improve announcement banner color picker #16158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e43d37
pick colors good
aslilac Jan 16, 2025
d133910
:|
aslilac Jan 16, 2025
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
93 changes: 67 additions & 26 deletions site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import { type Interpolation, type Theme, useTheme } from "@emotion/react";
import DialogActions from "@mui/material/DialogActions";
import TextField from "@mui/material/TextField";
import type { BannerConfig } from "api/typesGenerated";
import { Button } from "components/Button/Button";
import { Dialog, DialogActionButtons } from "components/Dialogs/Dialog";
import { Stack } from "components/Stack/Stack";
import { useFormik } from "formik";
import { AnnouncementBannerView } from "modules/dashboard/AnnouncementBanners/AnnouncementBannerView";
import type { FC } from "react";
import { BlockPicker } from "react-color";
import { type FC, useState } from "react";
import { SliderPicker, TwitterPicker } from "react-color";
import { getFormHelpers } from "utils/formUtils";

interface AnnouncementBannerDialogProps {
Expand All @@ -29,12 +30,14 @@ export const AnnouncementBannerDialog: FC<AnnouncementBannerDialogProps> = ({
}>({
initialValues: {
message: banner.message ?? "",
background_color: banner.background_color ?? "#004852",
background_color: banner.background_color ?? "#ABB8C3",
},
onSubmit: (banner) => onUpdate(banner),
});
const bannerFieldHelpers = getFormHelpers(bannerForm);

const [showHuePicker, setShowHuePicker] = useState(false);

return (
<Dialog css={styles.dialogWrapper} open onClose={onCancel}>
{/* Banner preview */}
Expand Down Expand Up @@ -64,29 +67,67 @@ export const AnnouncementBannerDialog: FC<AnnouncementBannerDialogProps> = ({
</div>
<div>
<h4 css={styles.settingName}>Background color</h4>
<BlockPicker
color={bannerForm.values.background_color}
onChange={async (color) => {
await bannerForm.setFieldValue("background_color", color.hex);
}}
triangle="hide"
colors={["#004852", "#D65D0F", "#4CD473", "#D94A5D", "#5A00CF"]}
styles={{
default: {
input: {
color: "white",
backgroundColor: theme.palette.background.default,
},
body: {
backgroundColor: "black",
color: "white",
},
card: {
backgroundColor: "black",
},
},
}}
/>
<Stack spacing={2}>
{showHuePicker ? (
<SliderPicker
color={bannerForm.values.background_color}
onChange={async (color) => {
await bannerForm.setFieldValue(
"background_color",
color.hex,
);
}}
/>
) : (
<TwitterPicker
color={bannerForm.values.background_color}
onChange={async (color) => {
await bannerForm.setFieldValue(
"background_color",
color.hex,
);
}}
triangle="hide"
colors={[
"#8b5cf6",
"#d94a5d",
"#f78da7",
"#d65d0f",
"#ff6900",
"#fcb900",
"#0693e3",

"#8ed1fc",
"#4cd473",
"#abb8c3",
]}
styles={{
default: {
input: {
color: "white",
backgroundColor: theme.palette.background.default,
},
body: {
backgroundColor: "transparent",
color: "white",
padding: 0,
},
card: {
backgroundColor: "transparent",
},
},
}}
/>
)}
<div>
<Button
variant="outline"
onClick={() => setShowHuePicker((it) => !it)}
>
Show {showHuePicker ? "palette" : "slider"}
</Button>
</div>
</Stack>
</div>
</Stack>
</div>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const AnnouncementBannerSettings: FC<
const addBanner = () => {
setBanners([
...banners,
{ enabled: true, message: "", background_color: "#004852" },
{ enabled: true, message: "", background_color: "#ABB8C3" },
]);
setEditingBannerId(banners.length);
};
Expand Down
Loading