Merge pull request #102 from elsoul/new/style

new/style

src/components/pages/user/chat/ChatBox.tsx

@@ -16,7 +16,7 @@ import { GPTModel, chatContentSchema, getGptChatModelName } from '@/utils/form'
 import { fetchSkeetFunctions } from '@/lib/skeet'
 import Image from 'next/image'
 import { ChatRoom } from './ChatMenu'
-import { CreateStreamChatMessageParams } from '@common/types/http/skeet/createStreamChatMessageParams'
+import { CreateStreamChatMessageParams } from '@common/types/http/createStreamChatMessageParams'
 import { z } from 'zod'
 import { useForm, Controller } from 'react-hook-form'
 import { zodResolver } from '@hookform/resolvers/zod'

src/components/pages/user/vertex-ai/VertexChatBox.tsx

@@ -38,7 +38,7 @@ import {
   VertexChatBoxQuery$variables,
 } from '@/__generated__/VertexChatBoxQuery.graphql'
 import { sleep } from '@/utils/time'
-import { CreateVertexMessageParams } from '@common/types/http/skeet/createVertexMessageParams'
+import { CreateVertexMessageParams } from '@common/types/http/createVertexMessageParams'
 import VertexChatExamples from './VertexChatExamples'
 
 type ChatMessage = {

src/layouts/auth/AuthLayout.tsx

@@ -2,13 +2,11 @@ import type { ReactNode } from 'react'
 import { useEffect, useCallback } from 'react'
 import CommonFooter from '@/layouts/common/CommonFooter'
 import { User, signOut } from 'firebase/auth'
-import { fetchQuery, graphql } from 'react-relay'
+import { graphql } from 'react-relay'
 import AuthHeader from './AuthHeader'
 import { useRecoilState } from 'recoil'
 import { defaultUser, userState } from '@/store/user'
 import { auth } from '@/lib/firebase'
-import { createEnvironment } from '@/lib/relayEnvironment'
-import { AuthLayoutQuery } from '@/__generated__/AuthLayoutQuery.graphql'
 import useI18nRouter from '@/hooks/useI18nRouter'
 
 type Props = {
@@ -54,27 +52,13 @@ export default function AuthLayout({ children }: Props) {
   const onAuthStateChanged = useCallback(
     async (fbUser: User | null) => {
       if (auth && fbUser && fbUser.emailVerified) {
-        const user = await fetchQuery<AuthLayoutQuery>(
-          createEnvironment(),
-          authLayoutQuery,
-          {},
-        ).toPromise()
-        if (user?.me?.id) {
-          setUser({
-            id: user.me.id,
-            uid: fbUser.uid,
-            email: fbUser.email ?? '',
-            username: user.me.username ?? '',
-            iconUrl: user.me.iconUrl ?? '',
-            emailVerified: fbUser.emailVerified,
-          })
+        try {
           await routerPush('/user/vertex-ai')
-        } else {
+        } catch (e) {
+          console.error(e)
           setUser(defaultUser)
           await signOut(auth)
         }
-      } else {
-        setUser(defaultUser)
       }
     },
     [setUser, routerPush],

src/layouts/user/UserLayout.tsx

@@ -87,8 +87,11 @@ export default function UserLayout({ children }: Props) {
           await routerPush('/auth/login')
         }
       } else {
-        setUser(defaultUser)
-        await routerPush('/auth/login')
+        if (auth && !fbUser) {
+          setUser(defaultUser)
+          await signOut(auth)
+          await routerPush('/auth/login')
+        }
       }
     },
     [setUser, routerPush],

tsconfig.json

@@ -18,7 +18,8 @@
     "paths": {
       "@/*": ["src/*"],
       "@lib/*": ["lib/*"],
-      "@root/*": ["./*"]
+      "@root/*": ["./*"],
+      "@common/*": ["./common/*"]
     }
   },
   "ts-node": {
@@ -32,7 +33,8 @@
     "**/*.ts",
     "**/*.tsx",
     "build.ts",
-    "devBuild.ts"
+    "devBuild.ts",
+    "common/**/*"
   ],
   "exclude": [
     "node_modules",