pick colors good

aslilac · aslilac · commit ad0a6d8b0ac1 · 2025-01-15T23:28:19.000Z
diff --git a/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx b/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx
@@ -1,13 +1,14 @@
 import { type Interpolation, type Theme, useTheme } from "@emotion/react";
+import { Button } from "@mui/material";
 import DialogActions from "@mui/material/DialogActions";
 import TextField from "@mui/material/TextField";
 import type { BannerConfig } from "api/typesGenerated";
 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 { useState, type FC } from "react";
+import { SliderPicker, TwitterPicker } from "react-color";
 import { getFormHelpers } from "utils/formUtils";
 
 interface AnnouncementBannerDialogProps {
@@ -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 */}
@@ -63,29 +66,62 @@ 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",
+											},
+										},
+									}}
+								/>
+							)}
+							<Button onClick={() => setShowHuePicker((it) => !it)}>
+								Show {showHuePicker ? "palette" : "slider"}
+							</Button>
+						</Stack>
 					</div>
 				</Stack>
 			</div>
diff --git a/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerSettings.tsx b/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerSettings.tsx
@@ -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);
 	};
