Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Organize code into branding feature (#2099)

Luke Vellaff4d43566aed
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsx
index f9ff26aab..028aa3669 100644
--- a/apps/web/src/app/[locale]/layout.tsx
+++ b/apps/web/src/app/[locale]/layout.tsx
@@ -13,6 +13,7 @@ import { requireUser } from "@/auth/data";
import { UserProvider } from "@/components/user-provider";
import { PreferencesProvider } from "@/contexts/preferences";
import { env } from "@/env";
+import { getBrandingCssProperties } from "@/features/branding/queries";
import { ThemeProvider } from "@/features/theme/client";
import type { UserDTO } from "@/features/user/schema";
import { I18nProvider } from "@/i18n/client";
@@ -22,7 +23,6 @@ import { featureFlagConfig } from "@/lib/feature-flags/config";
import { LocaleSync } from "@/lib/locale/client";
import { TimezoneProvider } from "@/lib/timezone/client/context";
import { TRPCProvider } from "@/trpc/client/provider";
-import { getForegroundColor } from "@/utils/color";
import { ConnectedDayjsProvider } from "@/utils/dayjs";
import { PostHogPageView } from "../posthog-page-view";
import { PostHogIdentify } from "./posthog-identify";
@@ -73,21 +73,14 @@ export default async function Root({
const { locale } = await params;
const { user } = await loadData();
- const primaryColor = env.PRIMARY_COLOR;
+ const brandingStyles = await getBrandingCssProperties();
return (
<html
lang={locale}
className={inter.className}
suppressHydrationWarning={true}
- style={
- primaryColor
- ? ({
- "--primary": primaryColor,
- "--primary-foreground": getForegroundColor(primaryColor),
- } as React.CSSProperties)
- : undefined
- }
+ style={brandingStyles}
>
<body>
<ThemeProvider>
diff --git a/apps/web/src/components/logo.tsx b/apps/web/src/components/logo.tsx
index 547b1a397..d31550cb6 100644
--- a/apps/web/src/components/logo.tsx
+++ b/apps/web/src/components/logo.tsx
@@ -1,4 +1,5 @@
import { env } from "@/env";
+import { getLogoUrl } from "@/features/branding/queries";
const sizes = {
sm: {
@@ -9,18 +10,20 @@ const sizes = {
},
};
-export const Logo = ({
+export const Logo = async ({
className,
size = "md",
}: {
className?: string;
size?: keyof typeof sizes;
}) => {
+ const logoUrl = getLogoUrl();
+
return (
// biome-ignore lint/performance/noImgElement: we don't need Image component here
<img
className={className}
- src={env.LOGO_URL ?? "/static/logo.svg"}
+ src={logoUrl}
style={{
height: sizes[size].height,
}}
diff --git a/apps/web/src/env.ts b/apps/web/src/env.ts
index cd6b5ffb7..d60a8d3b8 100644
--- a/apps/web/src/env.ts
+++ b/apps/web/src/env.ts
@@ -111,11 +111,16 @@ export const env = createEnv({
*/
PRIMARY_COLOR: z
.string()
- .regex(/^#(?:[0-9a-f]{3}){1,2}$/i, "Invalid hex color")
+ .regex(/^#[0-9a-fA-F]{6}$/, "Invalid hex color")
.optional(),
/**
- * Logo URL for the email logo
+ * Primary color for dark mode theming (hex format, e.g., "#6366f1")
+ * If not set, will be computed from PRIMARY_COLOR
*/
+ PRIMARY_COLOR_DARK: z
+ .string()
+ .regex(/^#[0-9a-fA-F]{6}$/, "Invalid hex color")
+ .optional(),
LOGO_URL: z.url().optional(),
LOGO_ICON_URL: z.url().optional(),
/**
@@ -193,6 +198,7 @@ export const env = createEnv({
MICROSOFT_CLIENT_ID: process.env.MICROSOFT_CLIENT_ID,
MICROSOFT_CLIENT_SECRET: process.env.MICROSOFT_CLIENT_SECRET,
PRIMARY_COLOR: process.env.PRIMARY_COLOR,
+ PRIMARY_COLOR_DARK: process.env.PRIMARY_COLOR_DARK,
LOGO_URL: process.env.LOGO_URL,
LOGO_ICON_URL: process.env.LOGO_ICON_URL,
APP_NAME: process.env.APP_NAME,
diff --git a/apps/web/src/features/branding/constants.ts b/apps/web/src/features/branding/constants.ts
new file mode 100644
index 000000000..1058daa38
--- /dev/null
+++ b/apps/web/src/features/branding/constants.ts
@@ -0,0 +1,10 @@
+import { absoluteUrl } from "@rallly/utils/absolute-url";
+
+export const DEFAULT_PRIMARY_COLOR = "#4f46e5";
+export const DEFAULT_LOGO_URL = absoluteUrl("/static/logo.svg");
+export const DEFAULT_LOGO_ICON_URL = absoluteUrl(
+ "/images/rallly-logo-mark.png",
+);
+export const DEFAULT_APP_NAME = "Rallly";
+export const LIGHT_MODE_BACKGROUND = "#ffffff";
+export const DARK_MODE_BACKGROUND = "#171717";
diff --git a/apps/web/src/features/branding/queries.ts b/apps/web/src/features/branding/queries.ts
new file mode 100644
index 000000000..d1eaa02fd
--- /dev/null
+++ b/apps/web/src/features/branding/queries.ts
@@ -0,0 +1,49 @@
+import "server-only";
+
+import type React from "react";
+import { env } from "@/env";
+import { adjustColorForContrast, getForegroundColor } from "@/utils/color";
+import {
+ DARK_MODE_BACKGROUND,
+ DEFAULT_APP_NAME,
+ DEFAULT_LOGO_ICON_URL,
+ DEFAULT_LOGO_URL,
+ DEFAULT_PRIMARY_COLOR,
+ LIGHT_MODE_BACKGROUND,
+} from "./constants";
+
+export function getPrimaryColor() {
+ return env.PRIMARY_COLOR ?? DEFAULT_PRIMARY_COLOR;
+}
+
+export function getAppName() {
+ return env.APP_NAME ?? DEFAULT_APP_NAME;
+}
+
+export async function getBrandingCssProperties() {
+ const primaryColor = getPrimaryColor();
+
+ const primaryColorLight = adjustColorForContrast(
+ primaryColor,
+ LIGHT_MODE_BACKGROUND,
+ );
+
+ const primaryColorDark =
+ env.PRIMARY_COLOR_DARK ??
+ adjustColorForContrast(primaryColor, DARK_MODE_BACKGROUND);
+
+ return {
+ "--primary-light": primaryColorLight,
+ "--primary-light-foreground": getForegroundColor(primaryColorLight),
+ "--primary-dark": primaryColorDark,
+ "--primary-dark-foreground": getForegroundColor(primaryColorDark),
+ } as React.CSSProperties;
+}
+
+export function getLogoUrl() {
+ return env.LOGO_URL ?? DEFAULT_LOGO_URL;
+}
+
+export function getLogoIconUrl() {
+ return env.LOGO_ICON_URL ?? DEFAULT_LOGO_ICON_URL;
+}
diff --git a/apps/web/src/utils/color.ts b/apps/web/src/utils/color.ts
index 9e4fd752e..f1a06fe0f 100644
--- a/apps/web/src/utils/color.ts
+++ b/apps/web/src/utils/color.ts
@@ -9,6 +9,14 @@ function hexToRgb(hex: string): { r: number; g: number; b: number } | null {
: null;
}
+function rgbToHex(r: number, g: number, b: number): string {
+ const toHex = (n: number) => {
+ const hex = Math.round(Math.max(0, Math.min(255, n))).toString(16);
+ return hex.length === 1 ? `0${hex}` : hex;
+ };
+ return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
+}
+
function getRelativeLuminance(r: number, g: number, b: number): number {
const [rs, gs, bs] = [r, g, b].map((c) => {
const sRGB = c / 255;
@@ -17,6 +25,39 @@ function getRelativeLuminance(r: number, g: number, b: number): number {
return 0.2126 * rs + 0.7152 * gs + 0.0722 * bs;
}
+function getContrastRatio(
+ color1: { r: number; g: number; b: number },
+ color2: { r: number; g: number; b: number },
+): number {
+ const lum1 = getRelativeLuminance(color1.r, color1.g, color1.b);
+ const lum2 = getRelativeLuminance(color2.r, color2.g, color2.b);
+ const lighter = Math.max(lum1, lum2);
+ const darker = Math.min(lum1, lum2);
+ return (lighter + 0.05) / (darker + 0.05);
+}
+
+function lightenColor(
+ rgb: { r: number; g: number; b: number },
+ amount: number,
+): { r: number; g: number; b: number } {
+ return {
+ r: rgb.r + (255 - rgb.r) * amount,
+ g: rgb.g + (255 - rgb.g) * amount,
+ b: rgb.b + (255 - rgb.b) * amount,
+ };
+}
+
+function darkenColor(
+ rgb: { r: number; g: number; b: number },
+ amount: number,
+): { r: number; g: number; b: number } {
+ return {
+ r: rgb.r * (1 - amount),
+ g: rgb.g * (1 - amount),
+ b: rgb.b * (1 - amount),
+ };
+}
+
export function getForegroundColor(backgroundColor: string): string {
const rgb = hexToRgb(backgroundColor);
if (!rgb) return "#ffffff";
@@ -24,3 +65,47 @@ export function getForegroundColor(backgroundColor: string): string {
const luminance = getRelativeLuminance(rgb.r, rgb.g, rgb.b);
return luminance > 0.5 ? "#101828" : "#ffffff";
}
+
+/**
+ * Adjusts a color to ensure sufficient contrast with a background color.
+ * Lightens the color for dark backgrounds and darkens it for light backgrounds.
+ *
+ * @param color - The color to adjust (hex format, e.g., "#084eb2")
+ * @param backgroundColor - The background color to ensure contrast against (hex format, e.g., "#ffffff" or "#18181b")
+ * @param minContrastRatio - Minimum contrast ratio to achieve (default: 3.0 for UI elements)
+ * @returns Adjusted color in hex format
+ */
+export function adjustColorForContrast(
+ color: string,
+ backgroundColor: string,
+ minContrastRatio = 3.0,
+): string {
+ const colorRgb = hexToRgb(color);
+ const bgRgb = hexToRgb(backgroundColor);
+
+ if (!colorRgb || !bgRgb) return color;
+
+ const bgLuminance = getRelativeLuminance(bgRgb.r, bgRgb.g, bgRgb.b);
+ const isDarkBackground = bgLuminance < 0.5;
+
+ let adjustedRgb = { ...colorRgb };
+ let contrast = getContrastRatio(adjustedRgb, bgRgb);
+ let iterations = 0;
+ const maxIterations = 20;
+ const step = 0.05;
+
+ while (contrast < minContrastRatio && iterations < maxIterations) {
+ if (isDarkBackground) {
+ adjustedRgb = lightenColor(adjustedRgb, step);
+ } else {
+ adjustedRgb = darkenColor(adjustedRgb, step);
+ }
+
+ contrast = getContrastRatio(adjustedRgb, bgRgb);
+ iterations++;
+
+ if (contrast >= minContrastRatio) break;
+ }
+
+ return rgbToHex(adjustedRgb.r, adjustedRgb.g, adjustedRgb.b);
+}
diff --git a/apps/web/src/utils/emails.ts b/apps/web/src/utils/emails.ts
index 782f44d14..30eb6d164 100644
--- a/apps/web/src/utils/emails.ts
+++ b/apps/web/src/utils/emails.ts
@@ -4,6 +4,11 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";
import * as Sentry from "@sentry/nextjs";
import { env } from "@/env";
+import {
+ getAppName,
+ getLogoIconUrl,
+ getPrimaryColor,
+} from "@/features/branding/queries";
export const getEmailClient = (locale?: string) => {
return new EmailClient({
@@ -17,14 +22,12 @@ export const getEmailClient = (locale?: string) => {
},
},
config: {
- logoUrl: env.LOGO_ICON_URL
- ? env.LOGO_ICON_URL
- : "https://d39ixtfgglw55o.cloudfront.net/images/rallly-logo-mark.png",
+ logoUrl: getLogoIconUrl(),
baseUrl: absoluteUrl(),
domain: absoluteUrl().replace(/(^\w+:|^)\/\//, ""),
supportEmail: env.SUPPORT_EMAIL,
- primaryColor: env.PRIMARY_COLOR ?? "#4f46e5",
- appName: env.APP_NAME,
+ primaryColor: getPrimaryColor(),
+ appName: getAppName(),
},
locale,
onError: (e) => {
diff --git a/packages/tailwind-config/shared-styles.css b/packages/tailwind-config/shared-styles.css
index 821fce7ae..7f63c9be1 100644
--- a/packages/tailwind-config/shared-styles.css
+++ b/packages/tailwind-config/shared-styles.css
@@ -9,8 +9,8 @@
@source "../../packages/ui/src/**/*.{ts,tsx}";
:root {
- --primary: var(--color-indigo-600);
- --primary-foreground: var(--color-white);
+ --primary: var(--primary-light, var(--color-indigo-600));
+ --primary-foreground: var(--primary-light-foreground, var(--color-white));
--border: var(--color-gray-200);
--border-muted: oklch(.871 .006 286.286 / .5);
@@ -61,8 +61,8 @@
--background: var(--color-gray-900);
--foreground: var(--color-gray-300);
- --primary: var(--color-indigo-500);
- --primary-foreground: var(--color-indigo-50);
+ --primary: var(--primary-dark, var(--color-indigo-500));
+ --primary-foreground: var(--primary-dark-foreground, var(--color-indigo-50));
--sidebar: var(--color-gray-900);
--sidebar-foreground: var(--color-gray-100);