Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Logo upload through the branding page (#2946)
Luke Vella040679c772b3
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex 5d35fae99..03e9be53d 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -101,6 +101,7 @@"brandingPreviewEventTitle": "Team Offsite","brandingPreviewLocation": "The Old Fire Station","brandingSettingsDescription": "Customize your instance branding",+ "brandingStorageNotConfigured": "Logo uploads require object storage, which has not been configured on this instance.","calendar": "Calendar","calendarDisconnectedError": "Failed to disconnect calendar","calendarDisconnectedSuccess": "Calendar disconnected successfully",diff --git a/apps/web/src/app/[locale]/(auth)/components/already-logged-in.tsx b/apps/web/src/app/[locale]/(auth)/components/already-logged-in.tsxindex 16d568106..5e3277b97 100644--- a/apps/web/src/app/[locale]/(auth)/components/already-logged-in.tsx+++ b/apps/web/src/app/[locale]/(auth)/components/already-logged-in.tsx@@ -18,9 +18,6 @@ import { SignOutButton } from "./sign-out-button";* / ↔ /login redirect loop — a loop needs two automated legs,* so the user must click to continue. The sign out button is the escape* hatch when the session only looks alive (stale cookie cache).- *- * Server component: AuthPageContainer renders the async server-only Logo,- * so this must not be a client module.*/export async function AlreadyLoggedIn({ redirectTo }: { redirectTo?: string }) {const { t, i18n } = await getTranslation();diff --git a/apps/web/src/app/[locale]/(auth)/components/auth-footer.tsx b/apps/web/src/app/[locale]/(auth)/components/auth-footer.tsxnew file mode 100644index 000000000..a88624d2d--- /dev/null+++ b/apps/web/src/app/[locale]/(auth)/components/auth-footer.tsx@@ -0,0 +1,29 @@+"use client";++import { useRouter } from "next/navigation";+import { LanguageSelect } from "@/components/language-selector";+import { ThemeSwitcher } from "@/components/theme-switcher";+import { useTranslation } from "@/i18n/client";+import { setLocaleCookie, useLocale } from "@/lib/locale/client";++export function AuthFooter() {+ const { t } = useTranslation();+ const router = useRouter();+ const { locale } = useLocale();++ return (+ // h-40 mirrors the header's 160px logo slot so the vertically centered+ // content sits at the true middle of the page+ <footer className="flex h-40 items-end justify-center gap-x-4">+ <LanguageSelect+ aria-label={t("language", { defaultValue: "Language" })}+ value={locale}+ onChange={(language) => {+ setLocaleCookie(language);+ router.refresh();+ }}+ />+ <ThemeSwitcher />+ </footer>+ );+}diff --git a/apps/web/src/app/[locale]/(auth)/components/auth-page.tsx b/apps/web/src/app/[locale]/(auth)/components/auth-page.tsxindex 67bdbeb93..9ad91999a 100644--- a/apps/web/src/app/[locale]/(auth)/components/auth-page.tsx+++ b/apps/web/src/app/[locale]/(auth)/components/auth-page.tsx@@ -1,14 +1,5 @@-import { Logo } from "@/features/branding/components/logo";-export function AuthPageContainer({ children }: { children: React.ReactNode }) {- return (- <div className="space-y-8">- <div className="mb-12 flex justify-center">- <Logo />- </div>- {children}- </div>- );+ return <div className="space-y-8">{children}</div>;}export function AuthPageHeader({ children }: { children: React.ReactNode }) {diff --git a/apps/web/src/app/[locale]/(auth)/layout.tsx b/apps/web/src/app/[locale]/(auth)/layout.tsxindex e98b1dc68..b44e8998c 100644--- a/apps/web/src/app/[locale]/(auth)/layout.tsx+++ b/apps/web/src/app/[locale]/(auth)/layout.tsx@@ -1,3 +1,5 @@+import { AuthFooter } from "@/app/[locale]/(auth)/components/auth-footer";+import { Logo } from "@/features/branding/components/logo";import { QuickCreateButton } from "@/features/quick-create/components/quick-create-button";import { QuickCreateWidget } from "@/features/quick-create/components/quick-create-widget";import { isQuickCreateEnabled } from "@/features/quick-create/constants";@@ -24,6 +26,9 @@ export default async function Layout({<div className="relative flex min-h-dvh flex-col items-center justify-center bg-background"><div className="z-10 flex w-full flex-1 lg:p-4"><div className="flex flex-1 flex-col gap-4 p-6">+ <header className="flex justify-center">+ <Logo size="fit" />+ </header><div className="my-auto"><mainid="main-content"@@ -38,6 +43,7 @@ export default async function Layout({<QuickCreateButton /></div>) : null}+ <AuthFooter /></div>{isQuickCreateEnabled ? (<div className="relative hidden flex-1 flex-col justify-center rounded-lg border bg-muted/50 lg:flex lg:p-16">diff --git a/apps/web/src/app/[locale]/control-panel/branding/actions.ts b/apps/web/src/app/[locale]/control-panel/branding/actions.tsindex 422fb1f58..17a9342ba 100644--- a/apps/web/src/app/[locale]/control-panel/branding/actions.ts+++ b/apps/web/src/app/[locale]/control-panel/branding/actions.ts@@ -1,10 +1,31 @@"use server";-import { updateInstanceSettings } from "@/features/instance-settings/mutations";-import { brandingSettingsSchema } from "@/features/instance-settings/schema";+import {+ updateInstanceLogo,+ updateInstanceSettings,+} from "@/features/instance-settings/mutations";+import type { BrandingLogoType } from "@/features/instance-settings/schema";+import {+ brandingLogoUploadSchema,+ brandingSettingsSchema,+ removeBrandingLogoSchema,+ updateBrandingLogoSchema,+} from "@/features/instance-settings/schema";import { getWhiteLabelAddon } from "@/features/licensing/data";import { AppError } from "@/lib/errors/app-error";import { adminActionClient } from "@/lib/safe-action/server";+import { getImageUploadUrl } from "@/lib/storage/image-upload";++async function requireWhiteLabelAddon() {+ const hasWhiteLabelAddon = await getWhiteLabelAddon();++ if (!hasWhiteLabelAddon) {+ throw new AppError({+ code: "PAYMENT_REQUIRED",+ message: "Custom branding requires the white label add-on.",+ });+ }+}export const updateBrandingSettingsAction = adminActionClient.metadata({@@ -12,14 +33,64 @@ export const updateBrandingSettingsAction = adminActionClient}).inputSchema(brandingSettingsSchema.partial()).action(async ({ parsedInput }) => {- const hasWhiteLabelAddon = await getWhiteLabelAddon();+ await requireWhiteLabelAddon();++ await updateInstanceSettings(parsedInput);+ });++const logoEntityIds: Record<BrandingLogoType, string> = {+ logo: "logo",+ logoDark: "logo-dark",+ logoIcon: "logo-icon",+};++export const getBrandingLogoUploadUrlAction = adminActionClient+ .metadata({+ actionName: "get_branding_logo_upload_url",+ })+ .inputSchema(brandingLogoUploadSchema)+ .action(async ({ parsedInput }) => {+ await requireWhiteLabelAddon();++ return await getImageUploadUrl({+ keyPrefix: "branding",+ entityId: logoEntityIds[parsedInput.logoType],+ fileType: parsedInput.fileType,+ fileSize: parsedInput.fileSize,+ });+ });- if (!hasWhiteLabelAddon) {+export const updateBrandingLogoAction = adminActionClient+ .metadata({+ actionName: "update_branding_logo",+ })+ .inputSchema(updateBrandingLogoSchema)+ .action(async ({ parsedInput }) => {+ await requireWhiteLabelAddon();++ if (!parsedInput.imageKey.startsWith("branding/")) {throw new AppError({- code: "PAYMENT_REQUIRED",- message: "Custom branding requires the white label add-on.",+ code: "FORBIDDEN",+ message: "Invalid image key",});}- await updateInstanceSettings(parsedInput);+ await updateInstanceLogo({+ logoType: parsedInput.logoType,+ imageKey: parsedInput.imageKey,+ });+ });++export const removeBrandingLogoAction = adminActionClient+ .metadata({+ actionName: "remove_branding_logo",+ })+ .inputSchema(removeBrandingLogoSchema)+ .action(async ({ parsedInput }) => {+ await requireWhiteLabelAddon();++ await updateInstanceLogo({+ logoType: parsedInput.logoType,+ imageKey: null,+ });});diff --git a/apps/web/src/app/[locale]/control-panel/branding/components/branding-settings.tsx b/apps/web/src/app/[locale]/control-panel/branding/components/branding-settings.tsxindex 9f4a2ca2f..f6f7a8e9b 100644--- a/apps/web/src/app/[locale]/control-panel/branding/components/branding-settings.tsx+++ b/apps/web/src/app/[locale]/control-panel/branding/components/branding-settings.tsx@@ -6,7 +6,7 @@ import {FieldLabel,FieldTitle,} from "@rallly/ui/field";-import { CodeIcon, ContainerIcon, GemIcon } from "lucide-react";+import { CodeIcon, ContainerIcon, GemIcon, HardDriveIcon } from "lucide-react";import { Trans } from "react-i18next/TransWithoutContext";import {PageSection,@@ -18,8 +18,10 @@ import {} from "@/components/page-layout";import { loadBrandingSettings } from "@/features/branding/loaders";import { getTranslation } from "@/i18n/server";+import { isStorageEnabled } from "@/lib/storage/constants";import { AppNameField } from "./app-name-field";import { HideAttributionField } from "./hide-attribution-field";+import { LogoUploadField } from "./logo-upload-field";import { PrimaryColorField } from "./primary-color-field";async function ConfiguredByEnvironmentVariableAlert() {@@ -40,6 +42,42 @@ async function ConfiguredByEnvironmentVariableAlert() {);}+async function StorageNotConfiguredAlert() {+ const { t, i18n } = await getTranslation();+ return (+ <Alert>+ <HardDriveIcon />+ <AlertDescription className="flex gap-2">+ <p className="flex-1">+ <Trans+ t={t}+ i18n={i18n}+ ns="app"+ i18nKey="brandingStorageNotConfigured"+ defaults="Logo uploads require object storage, which has not been configured on this instance."+ />+ </p>+ <p>+ <a+ href="https://support.rallly.co/self-hosting/configuration#external-object-storage"+ target="_blank"+ className="underline"+ rel="noreferrer"+ >+ <Trans+ t={t}+ i18n={i18n}+ ns="app"+ i18nKey="learnMore"+ defaults="Learn more"+ />+ </a>+ </p>+ </AlertDescription>+ </Alert>+ );+}+async function SetEnvironmentVariableAlert({ variable }: { variable: string }) {const { t, i18n } = await getTranslation();return (@@ -73,6 +111,7 @@ export async function BrandingSettings() {logoUrlLight,logoUrlDark,logoIconUrl,+ logoConfigured,envConfigured,} = await loadBrandingSettings();const { t, i18n } = await getTranslation();@@ -256,9 +295,10 @@ export async function BrandingSettings() {</PageSectionDescription></PageSectionHeader><PageSectionContent>+ {!isStorageEnabled ? <StorageNotConfiguredAlert /> : null}<FieldGroup variant="divided"><Field>- <Field orientation="responsive">+ <Field><FieldContent><FieldTitle><Trans@@ -270,21 +310,22 @@ export async function BrandingSettings() {/></FieldTitle></FieldContent>- <div className="flex items-center">- <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={logoUrlLight}- alt={t("logo", { ns: "app", defaultValue: "Logo" })}- className="max-h-full max-w-full object-contain p-2"- />- </div>- </div>+ <LogoUploadField+ logoType="logo"+ previewUrl={logoUrlLight}+ previewAlt={t("logo", { ns: "app", defaultValue: "Logo" })}+ hasCustomLogo={logoConfigured.logo}+ disabled={!hasWhiteLabelAddon}+ /></Field>- <SetEnvironmentVariableAlert variable="LOGO_URL" />+ {envConfigured.logo ? (+ <ConfiguredByEnvironmentVariableAlert />+ ) : !isStorageEnabled ? (+ <SetEnvironmentVariableAlert variable="LOGO_URL" />+ ) : null}</Field><Field>- <Field orientation="responsive">+ <Field><FieldContent><FieldTitle><Trans@@ -296,24 +337,25 @@ export async function BrandingSettings() {/></FieldTitle></FieldContent>- <div className="flex items-center">- <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={t("logoDark", {- ns: "app",- defaultValue: "Logo (dark mode)",- })}- className="max-h-full max-w-full object-contain p-2"- />- </div>- </div>+ <LogoUploadField+ logoType="logoDark"+ previewUrl={logoUrlDark}+ previewAlt={t("logoDark", {+ ns: "app",+ defaultValue: "Logo (dark mode)",+ })}+ hasCustomLogo={logoConfigured.logoDark}+ disabled={!hasWhiteLabelAddon}+ /></Field>- <SetEnvironmentVariableAlert variable="LOGO_URL_DARK" />+ {envConfigured.logoDark ? (+ <ConfiguredByEnvironmentVariableAlert />+ ) : !isStorageEnabled ? (+ <SetEnvironmentVariableAlert variable="LOGO_URL_DARK" />+ ) : null}</Field><Field>- <Field orientation="responsive">+ <Field><FieldContent><FieldTitle><Trans@@ -325,21 +367,22 @@ export async function BrandingSettings() {/></FieldTitle></FieldContent>- <div className="flex items-center">- <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 */}- <img- src={logoIconUrl}- alt={t("logoIcon", {- ns: "app",- defaultValue: "Logo icon",- })}- className="max-h-full max-w-full object-contain p-2"- />- </div>- </div>+ <LogoUploadField+ logoType="logoIcon"+ previewUrl={logoIconUrl}+ previewAlt={t("logoIcon", {+ ns: "app",+ defaultValue: "Logo icon",+ })}+ hasCustomLogo={logoConfigured.logoIcon}+ disabled={!hasWhiteLabelAddon}+ /></Field>- <SetEnvironmentVariableAlert variable="LOGO_ICON_URL" />+ {envConfigured.logoIcon ? (+ <ConfiguredByEnvironmentVariableAlert />+ ) : !isStorageEnabled ? (+ <SetEnvironmentVariableAlert variable="LOGO_ICON_URL" />+ ) : null}</Field></FieldGroup></PageSectionContent>diff --git a/apps/web/src/app/[locale]/control-panel/branding/components/logo-upload-field.tsx b/apps/web/src/app/[locale]/control-panel/branding/components/logo-upload-field.tsxnew file mode 100644index 000000000..1b8cb07ed--- /dev/null+++ b/apps/web/src/app/[locale]/control-panel/branding/components/logo-upload-field.tsx@@ -0,0 +1,155 @@+"use client";++import { cn } from "@rallly/ui";+import { ImageUploadControl } from "@/components/image-upload";+import type { BrandingLogoType } from "@/features/instance-settings/schema";+import { useSafeAction } from "@/lib/safe-action/client";+import {+ getBrandingLogoUploadUrlAction,+ removeBrandingLogoAction,+ updateBrandingLogoAction,+} from "../actions";++const previewVariants: Record<+ BrandingLogoType,+ { container: string; line: string; label: string }+> = {+ logo: {+ container: "bg-white",+ line: "border-gray-200",+ label: "text-gray-400",+ },+ logoDark: {+ container: "bg-gray-900",+ line: "border-gray-700",+ label: "text-gray-500",+ },+ logoIcon: {+ container: "bg-white",+ line: "border-gray-200",+ label: "text-gray-400",+ },+};++export function LogoUploadField({+ logoType,+ previewUrl,+ previewAlt,+ hasCustomLogo,+ disabled = false,+}: {+ logoType: BrandingLogoType;+ previewUrl: string;+ previewAlt: string;+ hasCustomLogo: boolean;+ disabled?: boolean;+}) {+ const updateLogo = useSafeAction(updateBrandingLogoAction);+ const removeLogo = useSafeAction(removeBrandingLogoAction);++ const handleGetUploadUrl = async (input: {+ fileType: "image/jpeg" | "image/png";+ fileSize: number;+ }) => {+ const result = await getBrandingLogoUploadUrlAction({+ logoType,+ ...input,+ });++ if (!result?.data) {+ throw new Error("Failed to get upload URL");+ }++ return result.data;+ };++ return (+ <div className="w-full space-y-3">+ {/* Full-width preview of the 200x160 slot the logo renders in. The+ cell's guide lines are oversized and clipped by the strip, so they+ run edge to edge. */}+ <div+ className={cn(+ "flex w-full items-center justify-center overflow-hidden rounded-lg border py-10",+ previewVariants[logoType].container,+ )}+ >+ <div className="relative flex h-40 w-50 items-center justify-center">+ {logoType !== "logoIcon" ? (+ <>+ <div+ aria-hidden="true"+ className={cn(+ "absolute -inset-x-[100vw] top-0 border-t border-dashed",+ previewVariants[logoType].line,+ )}+ />+ <div+ aria-hidden="true"+ className={cn(+ "absolute -inset-x-[100vw] bottom-0 border-t border-dashed",+ previewVariants[logoType].line,+ )}+ />+ <div+ aria-hidden="true"+ className={cn(+ "absolute -inset-y-[100vh] left-0 border-l border-dashed",+ previewVariants[logoType].line,+ )}+ />+ <div+ aria-hidden="true"+ className={cn(+ "absolute -inset-y-[100vh] right-0 border-l border-dashed",+ previewVariants[logoType].line,+ )}+ />+ <span+ aria-hidden="true"+ className={cn(+ "absolute top-full left-1/2 mt-1.5 -translate-x-1/2 text-[10px] tabular-nums",+ previewVariants[logoType].label,+ )}+ >+ 200px+ </span>+ <span+ aria-hidden="true"+ className={cn(+ "absolute top-1/2 left-full ml-1.5 -translate-y-1/2 text-[10px] tabular-nums",+ previewVariants[logoType].label,+ )}+ >+ 160px+ </span>+ </>+ ) : null}+ {/* biome-ignore lint/performance/noImgElement: external URLs may not work with Next.js Image */}+ <img+ src={previewUrl}+ alt={previewAlt}+ className="max-h-full max-w-full object-contain"+ />+ </div>+ </div>+ <ImageUploadControl+ crop={false}+ disabled={disabled}+ getUploadUrl={handleGetUploadUrl}+ onUploadSuccess={async (imageKey) => {+ const result = await updateLogo.executeAsync({ logoType, imageKey });+ // executeAsync resolves on server errors; throw so the control+ // reports the failure instead of completing+ if (result?.serverError || result?.validationErrors) {+ throw new Error("Failed to save logo");+ }+ }}+ onRemoveSuccess={async () => {+ await removeLogo.executeAsync({ logoType });+ }}+ hasCurrentImage={hasCustomLogo}+ />+ </div>+ );+}diff --git a/apps/web/src/components/image-upload/image-upload.tsx b/apps/web/src/components/image-upload/image-upload.tsxindex fbc69e183..925c935ea 100644--- a/apps/web/src/components/image-upload/image-upload.tsx+++ b/apps/web/src/components/image-upload/image-upload.tsx@@ -30,6 +30,8 @@ export function ImageUploadControl({onUploadSuccess,onRemoveSuccess,hasCurrentImage = false,+ crop = true,+ disabled = false,}: ImageUploadControlProps) {const isStorageEnabled = useFeatureFlag("storage");@@ -91,6 +93,12 @@ export function ImageUploadControl({return;}+ if (!crop) {+ startUpload(file);+ event.target.value = "";+ return;+ }+// Create preview URL and show cropping dialogconst { url, cleanup } = createImagePreviewUrl(file);setOriginalFile(file);@@ -102,26 +110,24 @@ export function ImageUploadControl({event.target.value = "";};- const handleCropComplete = async (croppedFile: File) => {- if (!originalFile) return;-- const parsedFileType = allowedMimeTypes.parse(croppedFile.type);+ const startUpload = (file: File, onUploaded?: () => void) => {+ const parsedFileType = allowedMimeTypes.parse(file.type);startUploading(async () => {try {const { url, fields } = await getUploadUrl({fileType: parsedFileType,- fileSize: croppedFile.size,+ fileSize: file.size,});await uploadImage({- file: croppedFile,+ file,url,fileType: parsedFileType,});- onUploadSuccess(fields.key);- handleCloseCropDialog();+ await onUploadSuccess(fields.key);+ onUploaded?.();} catch {toast.error(t("errorUploadPicture", {@@ -138,6 +144,12 @@ export function ImageUploadControl({});};+ const handleCropComplete = async (croppedFile: File) => {+ if (!originalFile) return;++ startUpload(croppedFile, handleCloseCropDialog);+ };+const handleCloseCropDialog = () => {setShowCropDialog(false);setImageToCrop(null);@@ -162,7 +174,7 @@ export function ImageUploadControl({<div className="flex gap-2"><Buttonloading={isUploading}- disabled={!isStorageEnabled}+ disabled={disabled || !isStorageEnabled}onClick={() => {fileInputRef.current?.click();}}@@ -170,7 +182,12 @@ export function ImageUploadControl({<Trans i18nKey="chooseImage" defaults="Choose…" /></Button>{hasCurrentImage ? (- <Button loading={isRemoving} variant="ghost" onClick={handleRemove}>+ <Button+ loading={isRemoving}+ disabled={disabled}+ variant="ghost"+ onClick={handleRemove}+ ><Trans i18nKey="removeImage" defaults="Remove" /></Button>) : null}diff --git a/apps/web/src/components/image-upload/types.ts b/apps/web/src/components/image-upload/types.tsindex e6e35dc3f..e60b8a98a 100644--- a/apps/web/src/components/image-upload/types.ts+++ b/apps/web/src/components/image-upload/types.ts@@ -11,6 +11,12 @@ export interface ImageUploadControlProps {onUploadSuccess: (imageKey: string) => Promise<void> | void;onRemoveSuccess: () => Promise<void> | void;hasCurrentImage?: boolean;+ /**+ * When false, the selected file is uploaded as-is instead of going through+ * the 1:1 crop dialog. Use for images with a free aspect ratio (e.g. logos).+ */+ crop?: boolean;+ disabled?: boolean;}export interface ImageUploadPreviewProps {diff --git a/apps/web/src/components/language-selector.tsx b/apps/web/src/components/language-selector.tsxindex 7babbad28..a867d3b28 100644--- a/apps/web/src/components/language-selector.tsx+++ b/apps/web/src/components/language-selector.tsx@@ -14,6 +14,7 @@ export const LanguageSelect: React.FunctionComponent<{className?: string;value?: string;onChange?: (language: string) => void;+ "aria-label"?: string;"aria-labelledby"?: string;"aria-describedby"?: string;}> = ({ id, className, value, onChange, ...ariaProps }) => {diff --git a/apps/web/src/features/branding/components/logo.tsx b/apps/web/src/features/branding/components/logo.tsxindex c119e756c..7503175d5 100644--- a/apps/web/src/features/branding/components/logo.tsx+++ b/apps/web/src/features/branding/components/logo.tsx@@ -16,10 +16,31 @@ export const Logo = async ({size = "md",}: {className?: string;- size?: keyof typeof sizes;+ size?: keyof typeof sizes | "fit";}) => {const { logo } = await getInstanceBrandingConfig();+ if (size === "fit") {+ return (+ <div+ className={cn("flex h-40 w-50 items-center justify-center", className)}+ >+ {/* biome-ignore lint/performance/noImgElement: we don't need Image component here */}+ <img+ src={logo.light}+ alt={env.APP_NAME}+ className="block max-h-full max-w-full object-contain dark:hidden"+ />+ {/* biome-ignore lint/performance/noImgElement: we don't need Image component here */}+ <img+ src={logo.dark}+ alt={env.APP_NAME}+ className="hidden max-h-full max-w-full object-contain dark:block"+ />+ </div>+ );+ }+return (<divclassName={cn("inline-block", className)}diff --git a/apps/web/src/features/branding/loaders.ts b/apps/web/src/features/branding/loaders.tsindex be5e8be84..02288443f 100644--- a/apps/web/src/features/branding/loaders.ts+++ b/apps/web/src/features/branding/loaders.ts@@ -38,6 +38,12 @@ export const loadBrandingSettings = cache(async () => {logoUrlLight: resolved.logo.light,logoUrlDark: resolved.logo.dark,logoIconUrl: resolved.logoIcon,+ // A stored value exists that can be removed to fall back to env/default+ logoConfigured: {+ logo: db.logo !== null,+ logoDark: db.logoDark !== null,+ logoIcon: db.logoIcon !== null,+ },// Checked against process.env because the parsed env applies defaults// (APP_NAME, HIDE_ATTRIBUTION), which would read as operator-setenvConfigured: {@@ -48,6 +54,9 @@ export const loadBrandingSettings = cache(async () => {db.primaryColorDark === null && Boolean(process.env.PRIMARY_COLOR_DARK),hideAttribution:db.hideAttribution === null && Boolean(process.env.HIDE_ATTRIBUTION),+ logo: db.logo === null && Boolean(process.env.LOGO_URL),+ logoDark: db.logoDark === null && Boolean(process.env.LOGO_URL_DARK),+ logoIcon: db.logoIcon === null && Boolean(process.env.LOGO_ICON_URL),},};});diff --git a/apps/web/src/features/instance-settings/mutations.ts b/apps/web/src/features/instance-settings/mutations.tsindex bae32c834..cb9b7a25b 100644--- a/apps/web/src/features/instance-settings/mutations.ts+++ b/apps/web/src/features/instance-settings/mutations.ts@@ -2,7 +2,11 @@ import "server-only";import { prisma } from "@rallly/database";import { updateTag } from "next/cache";+import { after } from "next/server";+import { deleteImageFromS3 } from "@/lib/storage/image-upload";+import { isStorageKey } from "@/lib/storage/resolve-storage-url";import { instanceSettingsTag } from "./constants";+import type { BrandingLogoType } from "./schema";export async function updateInstanceSettings(data: {disableUserRegistration?: boolean;@@ -21,3 +25,41 @@ export async function updateInstanceSettings(data: {updateTag(instanceSettingsTag);}++export async function updateInstanceLogo({+ logoType,+ imageKey,+}: {+ logoType: BrandingLogoType;+ imageKey: string | null;+}) {+ const instanceSettings = await prisma.instanceSettings.findUnique({+ where: {+ id: 1,+ },+ select: {+ logo: true,+ logoDark: true,+ logoIcon: true,+ },+ });++ const oldValue = instanceSettings?.[logoType];++ await prisma.instanceSettings.update({+ where: {+ id: 1,+ },+ data: {+ [logoType]: imageKey,+ },+ });++ updateTag(instanceSettingsTag);++ // Only delete objects we own; a URL value points at externally hosted+ // media, and a retry can resubmit the key that is now stored+ if (oldValue && oldValue !== imageKey && isStorageKey(oldValue)) {+ after(() => deleteImageFromS3(oldValue));+ }+}diff --git a/apps/web/src/features/instance-settings/schema.ts b/apps/web/src/features/instance-settings/schema.tsindex ea7a24093..c6308119c 100644--- a/apps/web/src/features/instance-settings/schema.ts+++ b/apps/web/src/features/instance-settings/schema.ts@@ -14,3 +14,26 @@ export const brandingSettingsSchema = z.object({});export type BrandingSettings = z.infer<typeof brandingSettingsSchema>;++export const brandingLogoTypeSchema = z.enum(["logo", "logoDark", "logoIcon"]);++export type BrandingLogoType = z.infer<typeof brandingLogoTypeSchema>;++export const brandingLogoUploadSchema = z.object({+ logoType: brandingLogoTypeSchema,+ fileType: z.enum(["image/jpeg", "image/png"]),+ fileSize: z+ .number()+ .int()+ .positive()+ .max(2 * 1024 * 1024),+});++export const updateBrandingLogoSchema = z.object({+ logoType: brandingLogoTypeSchema,+ imageKey: z.string().max(255),+});++export const removeBrandingLogoSchema = z.object({+ logoType: brandingLogoTypeSchema,+});diff --git a/apps/web/src/lib/storage/resolve-storage-url.ts b/apps/web/src/lib/storage/resolve-storage-url.tsindex 59b73c4b0..c22406cab 100644--- a/apps/web/src/lib/storage/resolve-storage-url.ts+++ b/apps/web/src/lib/storage/resolve-storage-url.ts@@ -13,12 +13,20 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";* bundle, which crashes self-hosted builds where `NEXT_PUBLIC_BASE_URL` is set* at runtime and is therefore absent on the client.*/+/**+ * Whether a stored image value is a key in our storage bucket, as opposed to+ * an external URL or data URI.+ */+export function isStorageKey(value: string): boolean {+ return !(+ value.startsWith("https://") ||+ value.startsWith("http://") ||+ value.startsWith("data:")+ );+}+export function resolveStorageUrl(key: string): string {- if (- key.startsWith("https://") ||- key.startsWith("http://") ||- key.startsWith("data:")- ) {+ if (!isStorageKey(key)) {return key;}