Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into docs/standardize-commands

Browse Source
This commit is contained in:
Hieu 2023-12-25 16:02:16 +09:00 committed by GitHub
commit 55ef47c5c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -70,7 +70,7 @@ Jan is an open-source ChatGPT alternative that runs 100% offline on your compute
<tr style="text-align: center"> <tr style="text-align: center">
<td style="text-align:center"><b>Experimental (Nighlty Build)</b></td> <td style="text-align:center"><b>Experimental (Nighlty Build)</b></td>
<td style="text-align:center" colspan="4"> <td style="text-align:center" colspan="4">
<a href='https://github.com/janhq/jan/actions/runs/7310214854'> <a href='https://github.com/janhq/jan/actions/runs/7316594225'>
<b>Github action artifactory</b> <b>Github action artifactory</b>
</a> </a>
</td> </td>

2
web/app/layout.tsx
View File

@ -15,7 +15,7 @@ export const metadata: Metadata = {
export default function RootLayout({ children }: PropsWithChildren) { export default function RootLayout({ children }: PropsWithChildren) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<body className="bg-white font-sans text-sm antialiased dark:bg-background/50"> <body className="bg-white font-sans text-sm antialiased dark:bg-background">
<div className="title-bar" /> <div className="title-bar" />
<Providers>{children}</Providers> <Providers>{children}</Providers>
</body> </body>

2
web/containers/Layout/index.tsx
View File

@ -24,7 +24,7 @@ const BaseLayout = (props: PropsWithChildren) => {
return ( return (
<div className="flex h-screen w-screen flex-1 overflow-hidden"> <div className="flex h-screen w-screen flex-1 overflow-hidden">
<RibbonNav /> <RibbonNav />
<div className=" relative top-12 flex h-[calc(100vh-96px)] w-full overflow-hidden bg-background/50"> <div className=" relative top-12 flex h-[calc(100vh-96px)] w-full overflow-hidden bg-background">
<div className="w-full"> <div className="w-full">
<TopBar /> <TopBar />
<m.div <m.div

2
web/screens/Chat/index.tsx
View File

@ -99,7 +99,7 @@ const ChatScreen = () => {
return ( return (
<div className="flex h-full w-full"> <div className="flex h-full w-full">
<div className="flex h-full w-60 flex-shrink-0 flex-col overflow-y-auto border-r border-border bg-background dark:bg-background/50"> <div className="flex h-full w-60 flex-shrink-0 flex-col overflow-y-auto border-r border-border bg-background">
<ThreadList /> <ThreadList />
</div> </div>
<div <div

2
web/screens/ExploreModels/ExploreModelItemHeader/index.tsx
View File

@ -81,7 +81,7 @@ const ExploreModelItemHeader: React.FC<Props> = ({ model, onClick, open }) => {
return ( return (
<div <div
className="cursor-pointer rounded-t-md bg-background/50" className="cursor-pointer rounded-t-md bg-background"
onClick={onClick} onClick={onClick}
> >
{model.metadata.cover && ( {model.metadata.cover && (

2
web/screens/Settings/index.tsx
View File

@ -176,7 +176,7 @@ const SettingsScreen = () => {
</ScrollArea> </ScrollArea>
</div> </div>
<div className="h-full w-full bg-background/50"> <div className="h-full w-full bg-background">
<ScrollArea className="h-full w-full"> <ScrollArea className="h-full w-full">
<div className="p-4"> <div className="p-4">
{handleShowOptions(activeStaticMenu || activePreferenceExtension)} {handleShowOptions(activeStaticMenu || activePreferenceExtension)}

6
web/screens/SystemMonitor/index.tsx
View File

@ -21,7 +21,7 @@ export default function SystemMonitorScreen() {
const { activeModel, stateModel, stopModel } = useActiveModel() const { activeModel, stateModel, stopModel } = useActiveModel()
return ( return (
<div className="flex h-full w-full bg-background dark:bg-background/50"> <div className="flex h-full w-full bg-background dark:bg-background">
<ScrollArea className="h-full w-full"> <ScrollArea className="h-full w-full">
<div className="h-full p-8" data-test-id="testid-system-monitor"> <div className="h-full p-8" data-test-id="testid-system-monitor">
<div className="grid grid-cols-2 gap-8 lg:grid-cols-3"> <div className="grid grid-cols-2 gap-8 lg:grid-cols-3">
@ -59,7 +59,9 @@ export default function SystemMonitorScreen() {
{activeModel && ( {activeModel && (
<div className="mt-8 overflow-hidden rounded-xl border border-border shadow-sm"> <div className="mt-8 overflow-hidden rounded-xl border border-border shadow-sm">
<div className="px-6 py-5"> <div className="px-6 py-5">
<h4 className="text-base font-medium">Actively Running Models</h4> <h4 className="text-base font-medium">
Actively Running Models
</h4>
</div> </div>
<div className="relative overflow-x-auto shadow-md"> <div className="relative overflow-x-auto shadow-md">
<table className="w-full px-8"> <table className="w-full px-8">