From f072a28aee71437ecfb24d8e2e5eb332135031e2 Mon Sep 17 00:00:00 2001
From: openhands <openhands@all-hands.dev>
Date: Sun, 26 Jul 2026 17:24:46 +0200
Subject: [PATCH] refactor: remove logo from client toolbar, move language and
 logout to left group

---
 src/app/client/client-view.tsx | 28 ++++------------------------
 src/app/client/page.tsx        |  4 +---
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/app/client/client-view.tsx b/src/app/client/client-view.tsx
index ed3f7e9e..4f024017 100644
--- a/src/app/client/client-view.tsx
+++ b/src/app/client/client-view.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { LogOut } from "lucide-react";
-import Image from "next/image";
 import Link from "next/link";
 import { signOut } from "next-auth/react";
 import { type ReactNode, useCallback, useEffect, useState } from "react";
@@ -52,13 +51,11 @@ export function ClientView({
 	ticket,
 	clientUrl,
 	hotelName,
-	logo,
 	initialOnline,
 }: {
 	ticket: string;
 	clientUrl: string;
 	hotelName: string;
-	logo: string | null;
 	initialOnline: number;
 }) {
 	const [_isFullscreen, setIsFullscreen] = useState(false);
@@ -187,28 +184,7 @@ export function ClientView({
 						</svg>
 						<span className="text-xs font-bold">{onlineCount}</span>
 					</div>
-				</div>
-
-				<div className="flex items-center gap-1 sm:gap-2">
-					{logo ? (
-						<Image
-							src={logo}
-							alt={hotelName}
-							width={32}
-							height={32}
-							className="h-8 w-auto rounded-lg shadow-lg"
-							style={{ objectFit: "contain" }}
-						/>
-					) : (
-						<span
-							className="hidden sm:inline text-sm font-bold drop-shadow-lg px-2"
-							style={{ color: "var(--color-primary, #eeb425)" }}
-						>
-							{hotelName}
-						</span>
-					)}
 					<LanguageSwitcher variant="admin" />
-					<ThemeSwitcher variant="admin" />
 					<ToolbarBtn
 						onClick={() => signOut({ callbackUrl: "/" })}
 						title="Logout"
@@ -216,6 +192,10 @@ export function ClientView({
 						<LogOut size={18} />
 					</ToolbarBtn>
 				</div>
+
+				<div className="flex items-center gap-1 sm:gap-2">
+					<ThemeSwitcher variant="admin" />
+				</div>
 			</div>
 
 			<iframe
diff --git a/src/app/client/page.tsx b/src/app/client/page.tsx
index 33fcd4e2..c84b10af 100644
--- a/src/app/client/page.tsx
+++ b/src/app/client/page.tsx
@@ -16,10 +16,9 @@ export default async function ClientPage() {
 
 	const userId = Number(session.user.id);
 
-	const [hotelName, clientUrl, logo] = await Promise.all([
+	const [hotelName, clientUrl] = await Promise.all([
 		resolveHotelName(),
 		siteSettings.get("nitro_client_url", ""),
-		siteSettings.get("cms_logo", ""),
 	]);
 
 	const ip = (await headers()).get("x-real-client-ip") ?? "0.0.0.0";
@@ -34,7 +33,6 @@ export default async function ClientPage() {
 			ticket={ticket}
 			clientUrl={clientUrl || "/nitro-client/"}
 			hotelName={hotelName}
-			logo={logo}
 			initialOnline={onlineCount}
 		/>
 	);