Merge pull request #151 from Prodeko/main

Move db call outside of client component
Prodeko · Nov 20, 2023 · 793628c · 793628c
2 parents f265215 + d6d380f
commit 793628c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/app/components/ui/Header/HeaderTitle.tsx b/app/components/ui/Header/HeaderTitle.tsx
@@ -1,24 +1,23 @@
 import { ComponentProps } from 'react'
 
-import { getCurrentSeason } from '@server/db/seasons'
+import { Season } from '@common/types'
 
 import styles from './Header.module.scss'
 
 type h1Props = ComponentProps<'h1'>
 
 interface Props extends h1Props {
   title: string
-  seasonal?: boolean
+  currentSeason?: Season | null
 }
 
-const HeaderTitle = async ({ title, seasonal, ...props }: Props) => {
-  const currentSeason = await getCurrentSeason()
+const HeaderTitle = async ({ title, currentSeason, ...props }: Props) => {
   return (
     <div className={styles.titleContainer}>
       <h1 {...props} className={styles.title}>
         {title}
       </h1>
-      {currentSeason && seasonal && <h2 className={styles.seasonTitle}>{currentSeason.name}</h2>}
+      {currentSeason && <h2 className={styles.seasonTitle}>{currentSeason.name}</h2>}
     </div>
   )
 }

diff --git a/app/components/ui/Header/Main/index.tsx b/app/components/ui/Header/Main/index.tsx
@@ -4,6 +4,7 @@ import { ComponentProps } from 'react'
 
 import billiardPic from '@public/images/billiard-balls.jpg'
 import { getRandomPlayer } from '@server/db/players'
+import { getCurrentSeason } from '@server/db/seasons'
 
 import styles from '../Header.module.scss'
 import HeaderTitle from '../HeaderTitle'
@@ -16,6 +17,7 @@ type Props = HeaderProps & {
 
 export const Header = async ({ seasonal, ...props }: Props) => {
   const randomPlayer = await getRandomPlayer().then(player => player?.toJSON())
+  const currentSeason = await getCurrentSeason()
   return (
     <header {...props} className={styles.header}>
       <Image
@@ -26,7 +28,11 @@ export const Header = async ({ seasonal, ...props }: Props) => {
         priority={true}
       />
       <div className={styles.layout}>
-        <HeaderTitle seasonal={seasonal} title="Biliskilke" style={{ gridColumn: '1 / 2' }} />
+        <HeaderTitle
+          currentSeason={currentSeason}
+          title="Biliskilke"
+          style={{ gridColumn: '1 / 2' }}
+        />
         <RandomPlayer randomPlayer={randomPlayer} />
       </div>
     </header>