feat: config logo

taskany-inc · Feb 29, 2024 · 6089542 · 6089542
1 parent 77746e5
commit 6089542
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "@sentry/nextjs": "7.92.0",
     "@tanstack/react-query": "4.29.5",
     "@tanstack/react-query-devtools": "4.29.6",
-    "@taskany/bricks": "5.16.2",
+    "@taskany/bricks": "5.17.0",
     "@taskany/colors": "1.11.0",
     "@taskany/icons": "2.0.1",
     "@tippyjs/react": "4.2.6",

diff --git a/prisma/migrations/20240228135246_config_logo/migration.sql b/prisma/migrations/20240228135246_config_logo/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "AppConfig" ADD COLUMN     "favicon" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -406,6 +406,7 @@ model Team {
 }
 
 model AppConfig {
-  id   String @id @default(cuid())
-  logo String?
+  id      String  @id @default(cuid())
+  favicon String?
+  logo    String?
 }
diff --git a/src/components/Page/Page.tsx b/src/components/Page/Page.tsx
@@ -63,7 +63,7 @@ export const Page: React.FC<PageProps> = ({ user, ssrTime, title = 'Untitled', c
     return (
         <pageContext.Provider value={{ user, theme, themeId: mapThemeOnId[theme], ssrTime }}>
             <Head>
-                <link rel="icon" href={config?.logo || '/favicon.png'} />
+                <link rel="icon" href={config?.favicon || '/favicon.png'} />
                 <title>{title}</title>
                 <link rel="stylesheet" id="themeVariables" href={`/theme/${theme}.css`} />
             </Head>
@@ -83,7 +83,7 @@ export const Page: React.FC<PageProps> = ({ user, ssrTime, title = 'Untitled', c
                 position="bottom-right"
             />
 
-            <PageHeader />
+            <PageHeader logo={config?.logo ?? undefined} />
 
             <main className={s.PageMain} {...attrs}>
                 {children}

diff --git a/src/components/PageHeader/PageHeader.tsx b/src/components/PageHeader/PageHeader.tsx
@@ -1,4 +1,4 @@
-import { FC, useCallback } from 'react';
+import { ComponentProps, FC, useCallback } from 'react';
 import NextLink from 'next/link';
 import {
     Header,
@@ -22,7 +22,7 @@ import { BetaBadge } from '../BetaBadge';
 import { tr } from './PageHeader.i18n';
 import s from './PageHeader.module.css';
 
-export const PageHeader: FC = () => {
+export const PageHeader: FC<{ logo?: ComponentProps<typeof PageHeaderLogo>['logo'] }> = ({ logo }) => {
     const { userSettings, signIn } = useRouter();
     const { user } = usePageContext();
 
@@ -52,7 +52,7 @@ export const PageHeader: FC = () => {
             className={s.PageHeader}
             logo={
                 <HeaderLogo>
-                    <PageHeaderLogo />
+                    <PageHeaderLogo logo={logo} />
                 </HeaderLogo>
             }
             menu={

diff --git a/src/components/PageHeaderLogo.tsx b/src/components/PageHeaderLogo.tsx
@@ -1,14 +1,10 @@
 import NextLink from 'next/link';
-import { TaskanyLogo } from '@taskany/bricks';
+import { TaskanyLogo } from '@taskany/bricks/harmony';
 
 import { routes } from '../hooks/router';
 
-export const PageHeaderLogo: React.FC = () => {
-    // TODO: resolve custom logo from settings in db
-
-    return (
-        <NextLink href={routes.index()} passHref>
-            <TaskanyLogo />
-        </NextLink>
-    );
-};
+export const PageHeaderLogo: React.FC<{ logo?: string }> = ({ logo }) => (
+    <NextLink href={routes.index()} passHref>
+        <TaskanyLogo src={logo} />
+    </NextLink>
+);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "AppConfig" ADD COLUMN "favicon" TEXT;