From 9e43d37bacc11f8c064a8b7287dbb826ca3dee2d Mon Sep 17 00:00:00 2001
From: McKayla Washburn <mckayla@hey.com>
Date: Thu, 16 Jan 2025 23:38:35 +0000
Subject: [PATCH 1/2] pick colors good

---
 .../AnnouncementBannerDialog.tsx              | 93 +++++++++++++------
 .../AnnouncementBannerSettings.tsx            |  2 +-
 2 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx b/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx
index d5a160d2e7a94..2e8e597ba3ae8 100644
--- a/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx
+++ b/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx
@@ -1,4 +1,5 @@
 import { type Interpolation, type Theme, useTheme } from "@emotion/react";
+import { Button } from "components/Button/Button";
 import DialogActions from "@mui/material/DialogActions";
 import TextField from "@mui/material/TextField";
 import type { BannerConfig } from "api/typesGenerated";
@@ -6,8 +7,8 @@ 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 */}
@@ -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>
diff --git a/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerSettings.tsx b/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerSettings.tsx
index 6c1f36ca65e83..fd16d0dca36dc 100644
--- 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);
 	};

From d133910c9ca4c2fc241ef7ed3721650069564929 Mon Sep 17 00:00:00 2001
From: McKayla Washburn <mckayla@hey.com>
Date: Thu, 16 Jan 2025 23:45:42 +0000
Subject: [PATCH 2/2] :|

---
 .../AppearanceSettingsPage/AnnouncementBannerDialog.tsx       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx b/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx
index 2e8e597ba3ae8..510a369c85807 100644
--- a/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx
+++ b/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx
@@ -1,13 +1,13 @@
 import { type Interpolation, type Theme, useTheme } from "@emotion/react";
-import { Button } from "components/Button/Button";
 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 { useState, type FC } from "react";
+import { type FC, useState } from "react";
 import { SliderPicker, TwitterPicker } from "react-color";
 import { getFormHelpers } from "utils/formUtils";