fix: delayed logo update

enMedD · Oct 2, 2024 · 18fae64 · 18fae64
1 parent 5021d62
commit 18fae64
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/web/src/app/ee/admin/whitelabeling/ImageUpload.tsx b/web/src/app/ee/admin/whitelabeling/ImageUpload.tsx
@@ -52,7 +52,7 @@ export function ImageUpload({
             }`}
           >
             <input {...getInputProps()} />
-            <Button>Upload</Button>
+            <Button type="button">Upload</Button>
             <b className="text-emphasis text-sm md:text-base">
               Drag and drop a .png or .jpg file, or click to select a file
             </b>

diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
@@ -1,6 +1,9 @@
 import "./globals.css";
 import { Inter as FontSans } from "next/font/google";
-import { getCombinedSettings } from "@/components/settings/lib";
+import {
+  fetchSettingsSS,
+  getCombinedSettings,
+} from "@/components/settings/lib";
 import { CUSTOM_ANALYTICS_ENABLED } from "@/lib/constants";
 import { SettingsProvider } from "@/components/settings/SettingsProvider";
 import { Metadata } from "next";
@@ -38,7 +41,7 @@ export default async function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
-  const combinedSettings = await getCombinedSettings({});
+  const combinedSettings = await fetchSettingsSS();
 
   return (
     <html lang="en">

diff --git a/web/src/components/Logo.tsx b/web/src/components/Logo.tsx
@@ -46,3 +46,27 @@ export function Logo({
     </div>
   );
 }
+
+/* export function Logo({
+  height,
+  width,
+  className,
+}: {
+  height?: number;
+  width?: number;
+  className?: string;
+}) {
+  height = height || 40;
+  width = width || 40;
+
+  return (
+    <div style={{ height, width }} className={`relative ${className}`}>
+      <img
+        src={`/api/workspace/logo?u=${Date.now()}`}
+        alt="Logo"
+        style={{ objectFit: "contain", height, width, borderRadius: "8px" }}
+      />
+    </div>
+  );
+}
+ */