Added advanced branding

components/common/EmptyPlaceholder.js

@@ -7,7 +7,11 @@ import styles from './EmptyPlaceholder.module.css';
 function EmptyPlaceholder({ msg, children }) {
   return (
     <div className={styles.placeholder}>
-      <Icon className={styles.icon} icon={<Logo />} size="xlarge" />
+      <Icon
+        icon={process.env.NEXT_PUBLIC_CUSTOM_LOGO_URL || <Logo />}
+        size="xlarge"
+        className={styles.icon}
+      />
       <h2 className={styles.msg}>{msg}</h2>
       {children}
     </div>

components/common/Icon.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import Image from 'next/image';
 import styles from './Icon.module.css';
 
 function Icon({ icon, className, size = 'medium', ...props }) {
@@ -15,7 +16,7 @@ function Icon({ icon, className, size = 'medium', ...props }) {
       })}
       {...props}
     >
-      {icon}
+      {typeof icon === 'string' ? <Image src={icon} width={20} height={20} /> : icon}
     </div>
   );
 }

components/forms/LoginForm.js

@@ -76,7 +76,11 @@ export default function LoginForm() {
         {() => (
           <Form>
             <div className={styles.header}>
-              <Icon icon={<Logo />} size="xlarge" className={styles.icon} />
+              <Icon
+                icon={process.env.NEXT_PUBLIC_CUSTOM_LOGO_URL || <Logo />}
+                size="xlarge"
+                className={styles.icon}
+              />
               <h1 className="center">{process.env.NEXT_PUBLIC_CUSTOM_TITLE || 'umami'}</h1>
             </div>
             <FormRow>

components/layout/Header.js

@@ -26,7 +26,11 @@ export default function Header() {
       {allowUpdate && <UpdateNotice />}
       <header className={classNames(styles.header, 'row')}>
         <div className={styles.title}>
-          <Icon icon={<Logo />} size="large" className={styles.logo} />
+          <Icon
+            icon={process.env.NEXT_PUBLIC_CUSTOM_FAVICON_URL || <Logo />}
+            size="large"
+            className={styles.logo}
+          />
           <Link
             href={isSharePage ? process.env.NEXT_PUBLIC_CUSTOM_HOMEPAGE_URL || HOMEPAGE_URL : '/'}
           >