Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Set logo for dark mode (#2104)
Luke Vellae642ef4879b2
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex e9979a999..98eb0b789 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -575,5 +575,6 @@"logos": "Logos","logosDescription": "Logo images used throughout the application","logo": "Logo",- "logoIcon": "Logo Icon"+ "logoIcon": "Logo Icon",+ "logoDark": "Logo (Dark Mode)"}diff --git a/apps/web/public/static/logo-dark.svg b/apps/web/public/static/logo-dark.svgnew file mode 100644index 000000000..9ace2f344--- /dev/null+++ b/apps/web/public/static/logo-dark.svg@@ -0,0 +1,3 @@+<svg xmlns="http://www.w3.org/2000/svg" fill="white" viewBox="0 0 97 18">+ <path fill-rule="evenodd" d="M1.565 0C.701 0 0 .7 0 1.565v14.87C0 17.299.7 18 1.565 18h14.87c.864 0 1.565-.7 1.565-1.565V1.565C18 .701 17.3 0 16.435 0H1.565zm14.799 4.09H1.636v12.274h14.728V4.09zm-2.277-1.742a.783.783 0 11-1.565 0 .783.783 0 011.565 0zM3.913 3.13a.783.783 0 100-1.565.783.783 0 000 1.565zm1.06 7.32a.391.391 0 010-.553l.553-.553a.391.391 0 01.553 0l1.974 1.973 4.321-4.321a.391.391 0 01.553 0l.554.553c.153.153.153.401 0 .554L8.332 13.25a.391.391 0 01-.553 0l-2.806-2.8zm27.246-7.825h-4.133V14h2.148V9.703h2.053L34.507 14h2.306v-.11l-2.51-4.702c.325-.142.617-.314.877-.516.38-.292.674-.654.883-1.086.208-.432.312-.943.312-1.531 0-.745-.167-1.373-.5-1.883-.333-.51-.81-.896-1.43-1.156-.62-.26-1.362-.391-2.226-.391zm-1.985 5.383h2.008c.443 0 .81-.078 1.102-.235.291-.156.51-.372.656-.648.151-.276.227-.591.227-.945 0-.38-.073-.709-.22-.985a1.482 1.482 0 00-.663-.648c-.297-.151-.672-.227-1.125-.227h-1.985v3.688zM45.97 2.625h.531L50.773 14h-2.28l-.855-2.531H43.39L42.54 14h-2.274l4.25-11.375h1.453zm-2.01 7.148h3.106l-1.556-4.61-1.55 4.61zm18.205 2.54V14h-7.219V2.625h2.149v9.688h5.07zM73.82 14v-1.688h-5.07V2.626h-2.148V14h7.218zm11.657-1.688V14H78.257V2.625h2.15v9.688h5.07zM91.71 7.93l-2.5-5.305h-2.375l3.789 7.21V14h2.18V9.836l3.78-7.211h-2.358L91.71 7.93z" clip-rule="evenodd" />+</svg>diff --git a/apps/web/src/app/[locale]/(auth)/components/auth-page.tsx b/apps/web/src/app/[locale]/(auth)/components/auth-page.tsxindex 7e58db403..a27bb3f33 100644--- a/apps/web/src/app/[locale]/(auth)/components/auth-page.tsx+++ b/apps/web/src/app/[locale]/(auth)/components/auth-page.tsx@@ -3,8 +3,8 @@ import { Logo } from "@/components/logo";export function AuthPageContainer({ children }: { children: React.ReactNode }) {return (<div className="space-y-8 lg:space-y-10">- <div className="mb-12">- <Logo className="mx-auto" />+ <div className="mb-12 flex justify-center">+ <Logo /></div>{children}</div>diff --git a/apps/web/src/app/[locale]/control-panel/branding/page.tsx b/apps/web/src/app/[locale]/control-panel/branding/page.tsxindex 9184e3fd6..71fb3960c 100644--- a/apps/web/src/app/[locale]/control-panel/branding/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/branding/page.tsx@@ -18,22 +18,24 @@ import {} from "@/app/components/settings-layout";import { requireAdmin } from "@/auth/data";import { Trans } from "@/components/trans";-import { env } from "@/env";import {getLogoIconUrl,getLogoUrl,getPrimaryColor,- hasWhiteLabelAddon,} from "@/features/branding/queries";+import { loadInstanceLicense } from "@/features/licensing/data";import { getTranslation } from "@/i18n/server";async function loadData() {- await requireAdmin();+ const [license] = await Promise.all([loadInstanceLicense(), requireAdmin()]);+ const logoUrls = getLogoUrl();+ const primaryColors = getPrimaryColor();return {- primaryColor: getPrimaryColor(),- primaryColorDark: env.PRIMARY_COLOR_DARK,- logoUrl: getLogoUrl(),- hasWhiteLabelAddon: await hasWhiteLabelAddon(),+ primaryColorLight: primaryColors.light,+ primaryColorDark: primaryColors.dark,+ logoUrlLight: logoUrls.light,+ logoUrlDark: logoUrls.dark,+ hasWhiteLabelAddon: !!license?.whiteLabelAddon,logoIconUrl: getLogoIconUrl(),};}@@ -59,9 +61,10 @@ function SetEnvironmentVariableAlert({ variable }: { variable: string }) {export default async function BrandingPage() {const {- primaryColor,+ primaryColorLight,primaryColorDark,- logoUrl,+ logoUrlLight,+ logoUrlDark,logoIconUrl,hasWhiteLabelAddon,} = await loadData();@@ -115,32 +118,32 @@ export default async function BrandingPage() {<div className="flex items-center gap-2"><divclassName="size-8 rounded border"- style={{ backgroundColor: primaryColor }}+ style={{ backgroundColor: primaryColorLight }}/>- <span className="font-mono text-sm">{primaryColor}</span>+ <span className="font-mono text-sm">+ {primaryColorLight}+ </span></div><SetEnvironmentVariableAlert variable="PRIMARY_COLOR" /></div>- {primaryColorDark ? (- <div className="space-y-2">- <div className="text-muted-foreground text-xs">- <Trans- i18nKey="primaryColorDark"- defaults="Primary Color (Dark Mode)"- />- </div>- <div className="flex items-center gap-2">- <div- className="size-8 rounded border"- style={{ backgroundColor: primaryColorDark }}- />- <span className="font-mono text-sm">- {primaryColorDark}- </span>- </div>- <SetEnvironmentVariableAlert variable="PRIMARY_COLOR_DARK" />+ <div className="space-y-2">+ <div className="text-muted-foreground text-xs">+ <Trans+ i18nKey="primaryColorDark"+ defaults="Primary Color (Dark Mode)"+ />+ </div>+ <div className="flex items-center gap-2">+ <div+ className="size-8 rounded border"+ style={{ backgroundColor: primaryColorDark }}+ />+ <span className="font-mono text-sm">+ {primaryColorDark}+ </span></div>- ) : null}+ <SetEnvironmentVariableAlert variable="PRIMARY_COLOR_DARK" />+ </div></div></PageSectionContent></PageSection>@@ -163,10 +166,10 @@ export default async function BrandingPage() {<Trans i18nKey="logo" defaults="Logo" /></div><div className="flex items-center gap-4">- <div className="flex w-48 items-center justify-center overflow-hidden rounded border">+ <div className="flex w-48 items-center justify-center overflow-hidden rounded border bg-white">{/* biome-ignore lint/performance/noImgElement: external URLs may not work with Next.js Image */}<img- src={logoUrl}+ src={logoUrlLight}alt="Logo"className="max-h-full max-w-full object-contain p-2"/>@@ -174,12 +177,28 @@ export default async function BrandingPage() {</div><SetEnvironmentVariableAlert variable="LOGO_URL" /></div>+ <div className="space-y-2">+ <div className="text-muted-foreground text-xs">+ <Trans i18nKey="logoDark" defaults="Logo (Dark Mode)" />+ </div>+ <div className="flex items-center gap-4">+ <div className="flex w-48 items-center justify-center overflow-hidden rounded border bg-gray-900">+ {/* biome-ignore lint/performance/noImgElement: external URLs may not work with Next.js Image */}+ <img+ src={logoUrlDark}+ alt="Logo (Dark Mode)"+ className="max-h-full max-w-full object-contain p-2"+ />+ </div>+ </div>+ <SetEnvironmentVariableAlert variable="LOGO_URL_DARK" />+ </div><div className="space-y-2"><div className="text-muted-foreground text-xs"><Trans i18nKey="logoIcon" defaults="Logo Icon" /></div><div className="flex items-center gap-4">- <div className="flex size-16 items-center justify-center overflow-hidden rounded border">+ <div className="flex size-16 items-center justify-center overflow-hidden rounded border bg-white">{/* biome-ignore lint/performance/noImgElement: external URLs may not work with Next.js Image */}<imgsrc={logoIconUrl}diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsxindex 53ee0141e..a511b68ee 100644--- a/apps/web/src/app/[locale]/setup/page.tsx+++ b/apps/web/src/app/[locale]/setup/page.tsx@@ -19,8 +19,8 @@ export default async function SetupPage() {<div className="flex min-h-dvh justify-center bg-background p-4 sm:items-center"><div className="w-full max-w-sm"><article className="space-y-8 lg:space-y-10">- <div className="py-8">- <Logo className="mx-auto" />+ <div className="flex justify-center py-8">+ <Logo /></div><header className="text-center"><h1 className="font-bold text-2xl">diff --git a/apps/web/src/components/logo.tsx b/apps/web/src/components/logo.tsxindex d31550cb6..5ee613202 100644--- a/apps/web/src/components/logo.tsx+++ b/apps/web/src/components/logo.tsx@@ -1,3 +1,4 @@+import { cn } from "@rallly/ui";import { env } from "@/env";import { getLogoUrl } from "@/features/branding/queries";@@ -17,17 +18,31 @@ export const Logo = async ({className?: string;size?: keyof typeof sizes;}) => {- const logoUrl = getLogoUrl();+ const { light, dark } = getLogoUrl();return (- // biome-ignore lint/performance/noImgElement: we don't need Image component here- <img- className={className}- src={logoUrl}- style={{- height: sizes[size].height,- }}- alt={env.APP_NAME}- />+ <div+ className={cn("inline-block", className)}+ style={{ height: sizes[size].height }}+ >+ {/* biome-ignore lint/performance/noImgElement: we don't need Image component here */}+ <img+ src={light}+ alt={env.APP_NAME}+ className="block h-full w-auto object-contain dark:hidden"+ style={{+ height: sizes[size].height,+ }}+ />+ {/* biome-ignore lint/performance/noImgElement: we don't need Image component here */}+ <img+ src={dark}+ alt={env.APP_NAME}+ className="hidden h-full w-auto object-contain dark:block"+ style={{+ height: sizes[size].height,+ }}+ />+ </div>);};diff --git a/apps/web/src/env.ts b/apps/web/src/env.tsindex d60a8d3b8..57436d497 100644--- a/apps/web/src/env.ts+++ b/apps/web/src/env.ts@@ -122,6 +122,7 @@ export const env = createEnv({.regex(/^#[0-9a-fA-F]{6}$/, "Invalid hex color").optional(),LOGO_URL: z.url().optional(),+ LOGO_URL_DARK: z.url().optional(),LOGO_ICON_URL: z.url().optional(),/***@@ -200,6 +201,7 @@ export const env = createEnv({PRIMARY_COLOR: process.env.PRIMARY_COLOR,PRIMARY_COLOR_DARK: process.env.PRIMARY_COLOR_DARK,LOGO_URL: process.env.LOGO_URL,+ LOGO_URL_DARK: process.env.LOGO_URL_DARK,LOGO_ICON_URL: process.env.LOGO_ICON_URL,APP_NAME: process.env.APP_NAME,KV_REST_API_URL: process.env.KV_REST_API_URL,diff --git a/apps/web/src/features/branding/constants.ts b/apps/web/src/features/branding/constants.tsindex 1058daa38..26f497ffe 100644--- a/apps/web/src/features/branding/constants.ts+++ b/apps/web/src/features/branding/constants.ts@@ -2,6 +2,7 @@ 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_URL_DARK = absoluteUrl("/static/logo-dark.svg");export const DEFAULT_LOGO_ICON_URL = absoluteUrl("/images/rallly-logo-mark.png",);diff --git a/apps/web/src/features/branding/queries.ts b/apps/web/src/features/branding/queries.tsindex 843c49c04..51f0dd73d 100644--- a/apps/web/src/features/branding/queries.ts+++ b/apps/web/src/features/branding/queries.ts@@ -2,19 +2,28 @@ import "server-only";import type React from "react";import { env } from "@/env";-import { loadInstanceLicense } from "@/features/licensing/data";import { adjustColorForContrast, getForegroundColor } from "@/utils/color";import {DARK_MODE_BACKGROUND,DEFAULT_APP_NAME,DEFAULT_LOGO_ICON_URL,DEFAULT_LOGO_URL,+ DEFAULT_LOGO_URL_DARK,DEFAULT_PRIMARY_COLOR,LIGHT_MODE_BACKGROUND,} from "./constants";export function getPrimaryColor() {- return env.PRIMARY_COLOR ?? DEFAULT_PRIMARY_COLOR;+ const baseColor = env.PRIMARY_COLOR ?? DEFAULT_PRIMARY_COLOR;+ const light = adjustColorForContrast(baseColor, LIGHT_MODE_BACKGROUND);+ const dark =+ env.PRIMARY_COLOR_DARK ??+ adjustColorForContrast(baseColor, DARK_MODE_BACKGROUND);++ return {+ light,+ dark,+ };}export function getAppName() {@@ -22,34 +31,23 @@ export function getAppName() {}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);+ const { light, dark } = getPrimaryColor();return {- "--primary-light": primaryColorLight,- "--primary-light-foreground": getForegroundColor(primaryColorLight),- "--primary-dark": primaryColorDark,- "--primary-dark-foreground": getForegroundColor(primaryColorDark),+ "--primary-light": light,+ "--primary-light-foreground": getForegroundColor(light),+ "--primary-dark": dark,+ "--primary-dark-foreground": getForegroundColor(dark),} as React.CSSProperties;}export function getLogoUrl() {- return env.LOGO_URL ?? DEFAULT_LOGO_URL;+ return {+ light: env.LOGO_URL ?? DEFAULT_LOGO_URL,+ dark: env.LOGO_URL_DARK ?? env.LOGO_URL ?? DEFAULT_LOGO_URL_DARK,+ };}export function getLogoIconUrl() {return env.LOGO_ICON_URL ?? DEFAULT_LOGO_ICON_URL;}--export async function hasWhiteLabelAddon() {- const license = await loadInstanceLicense();- return license?.whiteLabelAddon ?? false;-}diff --git a/apps/web/src/utils/emails.ts b/apps/web/src/utils/emails.tsindex 30eb6d164..4552af38a 100644--- a/apps/web/src/utils/emails.ts+++ b/apps/web/src/utils/emails.ts@@ -26,7 +26,7 @@ export const getEmailClient = (locale?: string) => {baseUrl: absoluteUrl(),domain: absoluteUrl().replace(/(^\w+:|^)\/\//, ""),supportEmail: env.SUPPORT_EMAIL,- primaryColor: getPrimaryColor(),+ primaryColor: getPrimaryColor().light,appName: getAppName(),},locale,