| @@ -1,4 +1,4 @@ | |||
| import React from "react"; | |||
| import React from 'react' | |||
| import type { FC } from 'react' | |||
| import GA, { GaType } from '@/app/components/base/ga' | |||
| @@ -6,13 +6,11 @@ const Layout: FC<{ | |||
| children: React.ReactNode | |||
| }> = ({ children }) => { | |||
| return ( | |||
| <div className="overflow-x-auto"> | |||
| <div className="w-screen h-screen min-w-[300px]"> | |||
| <GA gaType={GaType.webapp} /> | |||
| {children} | |||
| </div> | |||
| <div className="min-w-[300px]"> | |||
| <GA gaType={GaType.webapp} /> | |||
| {children} | |||
| </div> | |||
| ) | |||
| } | |||
| export default Layout | |||
| export default Layout | |||
| @@ -574,7 +574,7 @@ const Main: FC<IMainProps> = ({ | |||
| return <Loading type='app' /> | |||
| return ( | |||
| <div className='bg-gray-100'> | |||
| <div className='bg-gray-100 flex w-full h-full'> | |||
| {!isInstalledApp && ( | |||
| <Header | |||
| title={siteInfo.title} | |||
| @@ -588,7 +588,7 @@ const Main: FC<IMainProps> = ({ | |||
| <div | |||
| className={cn( | |||
| 'flex rounded-t-2xl bg-white overflow-hidden', | |||
| 'flex rounded-t-2xl bg-white overflow-hidden h-full w-full', | |||
| isInstalledApp && 'rounded-b-2xl', | |||
| )} | |||
| style={isInstalledApp | |||
| @@ -611,7 +611,7 @@ const Main: FC<IMainProps> = ({ | |||
| )} | |||
| {/* main */} | |||
| <div className={cn( | |||
| isInstalledApp ? s.installedApp : 'h-[calc(100vh_-_3rem)]', | |||
| isInstalledApp ? s.installedApp : '', | |||
| 'flex-grow flex flex-col overflow-y-auto', | |||
| ) | |||
| }> | |||
| @@ -85,7 +85,7 @@ const Sidebar: FC<ISidebarProps> = ({ | |||
| <div | |||
| className={ | |||
| cn( | |||
| (isInstalledApp || isUniversalChat) ? 'tablet:h-[calc(100vh_-_74px)]' : 'tablet:h-[calc(100vh_-_3rem)]', | |||
| (isInstalledApp || isUniversalChat) ? 'tablet:h-[calc(100vh_-_74px)]' : '', | |||
| 'shrink-0 flex flex-col bg-white pc:w-[244px] tablet:w-[192px] mobile:w-[240px] border-r border-gray-200 mobile:h-screen', | |||
| ) | |||
| } | |||
| @@ -510,7 +510,7 @@ const Main: FC<IMainProps> = ({ | |||
| <div className={'flex bg-white overflow-hidden'}> | |||
| <div className={cn( | |||
| isInstalledApp ? s.installedApp : 'h-[calc(100vh_-_3rem)]', | |||
| isInstalledApp ? s.installedApp : '', | |||
| 'flex-grow flex flex-col overflow-y-auto', | |||
| ) | |||
| }> | |||